-
Notifications
You must be signed in to change notification settings - Fork 36
Ashton Martin #45
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Ashton Martin #45
Changes from 29 commits
3d76748
fc17d76
f1e2d5e
abf2e25
236ae3e
78d3646
20f8768
25982e1
d5a0150
27e37ab
8e1c83c
28c0127
c0cc0dd
0a5e24a
22ac146
d868815
a25fa90
ed88ede
fdc8503
891521b
9c4f823
2240555
ca85f76
9c05769
e991ebf
b085bdd
921241f
a58c56d
19aeeb5
78f5400
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| /node_modules | ||
| app.js | ||
| app.js.map | ||
|
|
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,336 @@ | ||||||
| let fromNumber = 0; | ||||||
| let recordNumberTotal: number; | ||||||
| let count = 0; | ||||||
| let timeout = 0; | ||||||
|
|
||||||
| function checkResponseError(response: Response) { | ||||||
| if (!response.ok) { | ||||||
| throw Error(response.statusText); | ||||||
| } | ||||||
| return response; | ||||||
| } | ||||||
|
|
||||||
| function debounce(func: () => void, delay: number) { | ||||||
| return function () { | ||||||
| clearTimeout(timeout); | ||||||
|
|
||||||
| timeout = setTimeout(() => { | ||||||
| func(); | ||||||
| }, delay); | ||||||
| }; | ||||||
| } | ||||||
|
|
||||||
| function createNavigation() { | ||||||
| let recordNav: HTMLElement | null = document.getElementById("record-navigation-container"); // Navigation area | ||||||
| if (recordNav !== null) { | ||||||
| recordNav.innerHTML = ` | ||||||
| <div id="navigation-btns"> | ||||||
| <button value="first" id="first-page-btn">First Page</button> | ||||||
| <button value="previous" id="previous-records-btn">Previous</button> | ||||||
| <button value="next" id="next-records-btn">Next</button> | ||||||
| <button value="last" id="last-page-btn">Last Page</button> | ||||||
| <button id="confirmation-btn">Get Record</button> | ||||||
| </div> | ||||||
| <div class="current-page-container"> | ||||||
| <p id="current-page"></p> | ||||||
| </div> | ||||||
| `; | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| function getRecords(fromNumber: number, toNumber: number): Promise<void> { | ||||||
| return fetch(`http://localhost:2050/records?from=${fromNumber}&to=${toNumber}`, { | ||||||
| method: "GET", | ||||||
| headers: { "Content-Type": "application/json" }, | ||||||
| }) | ||||||
| .then(checkResponseError) | ||||||
| .then((response: Response) => response.json()) | ||||||
| .then((data: TemplateStringsArray) => { | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
|
|
||||||
| let infoColumns: HTMLElement | null = document.getElementById("info-columns-container"); // Information | ||||||
| let currentPage: HTMLElement | null = document.getElementById("current-page"); | ||||||
|
|
||||||
| if (infoColumns !== null) { | ||||||
| infoColumns.innerHTML = ""; | ||||||
|
|
||||||
| for (let i of data) { | ||||||
| dynamicGrid(i); | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| if (currentPage !== null) { | ||||||
| currentPage.innerHTML = `${fromNumber} / ${toNumber}.`; | ||||||
| } | ||||||
| }) | ||||||
| .catch((error: Error) => { | ||||||
| console.log(error); | ||||||
| }); | ||||||
| } | ||||||
|
|
||||||
| function recordSelection() { | ||||||
| let recordNav: HTMLElement | null = document.getElementById("record-navigation-container"); // Navigation area | ||||||
| if (!recordNav) { | ||||||
| alert("The navigation is not working correctly refresh the page"); | ||||||
| return; | ||||||
|
|
||||||
| } | ||||||
|
|
||||||
| let singleRecordSelection = ` | ||||||
| <button id="return-btn">Return</button> | ||||||
| <div id="user-input-data"> | ||||||
| <div class="navigation-input-area-id" id="id"> | ||||||
| <label class="record-labels" for="record-id">Enter record ID :</label> | ||||||
| <input type="text" name="record-id" id="record-id" class="navigation-input" value="0" /> | ||||||
| </div> | ||||||
| <p class="amount-of-records"></p> | ||||||
| </div> | ||||||
| <button id="get-record-btn">See Record</button>`; | ||||||
|
|
||||||
| recordNav.innerHTML = singleRecordSelection; | ||||||
|
|
||||||
| let returnBtn: HTMLElement | null = document.getElementById("return-btn"); | ||||||
| let recordIdInput = <HTMLInputElement | null>document.getElementById("record-id"); | ||||||
| let numberOfRows = Math.floor(window.innerHeight / 50); | ||||||
| let getSingleRecord: HTMLElement | null = document.getElementById("get-record-btn"); | ||||||
|
|
||||||
| if (returnBtn !== null) { | ||||||
| // Resets to the first page | ||||||
| returnBtn.addEventListener("click", () => { | ||||||
| createNavigation(); | ||||||
| recordCount(); | ||||||
| resizeScreenData() | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Missing |
||||||
| fromNumber = 0; | ||||||
| getRecords(fromNumber, fromNumber + numberOfRows) | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Missing
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You have no guarentee that |
||||||
| new PageNavigation(); | ||||||
| }); | ||||||
| } | ||||||
|
|
||||||
| if (getSingleRecord !== null) { | ||||||
| getSingleRecord.addEventListener("click", () => { | ||||||
| if (recordIdInput !== null) { | ||||||
|
|
||||||
| let recordIdValue = recordIdInput.value; | ||||||
| fromNumber = Number(recordIdValue); | ||||||
|
|
||||||
| let toNumber = fromNumber + numberOfRows; | ||||||
| let finalRecord = recordNumberTotal - 1; | ||||||
|
|
||||||
| if (toNumber > finalRecord) { | ||||||
| toNumber = finalRecord; | ||||||
| fromNumber = toNumber - numberOfRows; | ||||||
| } | ||||||
|
|
||||||
| let check = ["undefined", "string", ""]; | ||||||
|
|
||||||
| if (check.includes(typeof fromNumber) || fromNumber < 0) { | ||||||
| alert("Does not exists"); | ||||||
| recordIdValue = "0"; | ||||||
| } else if (typeof fromNumber === "number" && fromNumber >= 0) { | ||||||
| getRecords(fromNumber, toNumber); | ||||||
| } | ||||||
| } | ||||||
| }); | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| function createHeadingGrid(headings: string) { | ||||||
| let headingColumns: HTMLElement | null = document.getElementById("column-headings-container"); // Headings | ||||||
| let headingsData = `<h1 class="column-heading">${headings}</h1>`; | ||||||
|
|
||||||
| if (headingColumns !== null) { | ||||||
| headingColumns.innerHTML += headingsData; | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| function recordCount(): Promise<void> { | ||||||
| return fetch("http://localhost:2050/recordCount", { | ||||||
| method: "GET", | ||||||
| headers: { "Content-Type": "application/json" }, | ||||||
| }) | ||||||
| .then(checkResponseError) | ||||||
| .then((response: Response) => response.json()) | ||||||
| .then((data: number) => { | ||||||
| recordNumberTotal = data; | ||||||
| }) | ||||||
| .catch((error: Error) => { | ||||||
| console.log(error); | ||||||
| }); | ||||||
| } | ||||||
|
|
||||||
| function headingRowCreation(): Promise<void> { | ||||||
| return fetch("http://localhost:2050/columns", { | ||||||
| method: "GET", | ||||||
| headers: { "Content-Type": "application/json" }, | ||||||
| }) | ||||||
| .then(checkResponseError) | ||||||
| .then((response: Response) => response.json()) | ||||||
| .then((data: TemplateStringsArray) => { | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
| for (let i of data) { | ||||||
| createHeadingGrid(i); | ||||||
| } | ||||||
| resizeScreenData(); | ||||||
| }) | ||||||
| .catch((error: Error) => { | ||||||
| console.log(error); | ||||||
| }); | ||||||
| } | ||||||
|
|
||||||
| function dynamicGrid(columnData: string) { | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Not sure how |
||||||
| let infoColumns: HTMLElement | null = document.getElementById("info-columns-container"); // Information | ||||||
| // Creates the row that the info will display and adds it to the infoColumnsArea. | ||||||
| let infoDataRow = `<div id="info-row-${columnData[0]}" class="info-rows"></div>`; | ||||||
|
|
||||||
| if (infoColumns !== null) { | ||||||
| infoColumns.innerHTML += infoDataRow; | ||||||
| // Gets the created rows. | ||||||
| let finalInfoDataRow = document.getElementById("info-row-" + columnData[0]); | ||||||
| if (finalInfoDataRow !== null) { | ||||||
| // Loops through | ||||||
| for (let x of columnData) { | ||||||
| let infoData = `<p class="info-row-data">${x}</p>`; | ||||||
| finalInfoDataRow.innerHTML += infoData; | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| function resizeScreenData() { | ||||||
| let toNumber: number; | ||||||
| let recordNav: HTMLElement | null = document.getElementById("record-navigation-container"); | ||||||
| let nextBtn = <HTMLButtonElement | null>document.getElementById("next-records-btn"); | ||||||
| let previousBtn = <HTMLButtonElement | null>document.getElementById("previous-records-btn"); | ||||||
| let navBtns = document.getElementById("navigation-btns"); | ||||||
| if (recordNav !== null) { | ||||||
| if (recordNav.contains(navBtns as HTMLDivElement)) { | ||||||
| let numberOfRows = Math.floor(window.innerHeight / 50); | ||||||
|
|
||||||
| nextBtn!.disabled = false; | ||||||
| previousBtn!.disabled = false; | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. How do you know if these two buttons are not |
||||||
|
|
||||||
| let finalRecord = recordNumberTotal - 1; | ||||||
|
|
||||||
| if (fromNumber + numberOfRows >= finalRecord) { | ||||||
| fromNumber = finalRecord - numberOfRows; | ||||||
|
|
||||||
| nextBtn!.disabled = true; | ||||||
| previousBtn!.disabled = false; | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. How do you know if these two buttons are not |
||||||
| } else if (fromNumber <= 0) { | ||||||
| fromNumber = 0; | ||||||
|
|
||||||
| nextBtn!.disabled = false; | ||||||
| previousBtn!.disabled = true; | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. How do you know if these two buttons are not |
||||||
| } | ||||||
|
|
||||||
| toNumber = fromNumber + numberOfRows; | ||||||
|
|
||||||
| getRecords(fromNumber, toNumber); | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| function navigationDebounce(func: (argOne: number, argTwo: number) => void, delay: number) { | ||||||
| return function (argOne: number, argTwo: number) { | ||||||
| clearTimeout(timeout); | ||||||
|
|
||||||
| timeout = setTimeout(() => { | ||||||
| func(argOne, argTwo); | ||||||
| }, delay); | ||||||
| }; | ||||||
| } | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please move this into the class. The more things you put in a class the better. |
||||||
|
|
||||||
| class PageNavigation { | ||||||
| nextBtn: HTMLButtonElement | null; | ||||||
| previousBtn: HTMLButtonElement | null; | ||||||
| firstPageBtn: HTMLButtonElement | null; | ||||||
| lastPageBtn: HTMLButtonElement | null; | ||||||
| confirmationBtn: HTMLButtonElement | null; | ||||||
|
|
||||||
| constructor() { | ||||||
| this.nextBtn = <HTMLButtonElement | null>document.getElementById("next-records-btn"); | ||||||
| this.previousBtn = <HTMLButtonElement | null>document.getElementById("previous-records-btn"); | ||||||
| this.firstPageBtn = <HTMLButtonElement | null>document.getElementById("first-page-btn"); | ||||||
| this.lastPageBtn = <HTMLButtonElement | null>document.getElementById("last-page-btn"); | ||||||
| this.confirmationBtn = <HTMLButtonElement | null>document.getElementById("confirmation-btn"); | ||||||
|
|
||||||
| if (this.confirmationBtn !== null) { | ||||||
| this.confirmationBtn.addEventListener("click", recordSelection); | ||||||
| } | ||||||
|
|
||||||
| if (this.nextBtn !== null && this.previousBtn !== null && this.firstPageBtn !== null && this.lastPageBtn !== null) { | ||||||
| let nextPage = () => { | ||||||
| let numberOfRows = Math.floor(window.innerHeight / 50); | ||||||
| fromNumber = fromNumber + numberOfRows; | ||||||
| let toNumber = fromNumber + numberOfRows; | ||||||
|
|
||||||
| let finalRecord = recordNumberTotal - 1; | ||||||
| this.previousBtn!.disabled = false; | ||||||
|
|
||||||
| if (toNumber >= finalRecord) { | ||||||
| this.nextBtn!.disabled = true; | ||||||
| fromNumber = finalRecord - numberOfRows; | ||||||
| } | ||||||
|
|
||||||
| console.log(fromNumber, toNumber); | ||||||
|
|
||||||
| navigationDebounce(getRecords, 50)(fromNumber, toNumber) | ||||||
| }; | ||||||
|
|
||||||
|
|
||||||
| this.nextBtn.addEventListener("click", nextPage); | ||||||
|
|
||||||
| let previousPage = () => { | ||||||
| let numberOfRows = Math.floor(window.innerHeight / 50); | ||||||
| fromNumber = fromNumber - numberOfRows; | ||||||
| let toNumber = fromNumber + numberOfRows; | ||||||
|
|
||||||
| this.nextBtn!.disabled = false; | ||||||
|
|
||||||
| if (fromNumber <= 0) { | ||||||
| this.previousBtn!.disabled = true; | ||||||
| fromNumber = 0; | ||||||
| } | ||||||
|
|
||||||
| console.log(fromNumber, toNumber); | ||||||
|
|
||||||
| navigationDebounce(getRecords, 50)(fromNumber, toNumber) | ||||||
| }; | ||||||
|
|
||||||
| this.previousBtn.addEventListener("click", previousPage); | ||||||
|
|
||||||
| let firstPage = () => { | ||||||
| fromNumber = 0; | ||||||
| let numberOfRows = Math.floor(window.innerHeight / 50); | ||||||
| let toNumber = fromNumber + numberOfRows; | ||||||
|
|
||||||
| this.nextBtn!.disabled = false; | ||||||
| this.previousBtn!.disabled = true; | ||||||
|
|
||||||
| getRecords(fromNumber, toNumber); | ||||||
| }; | ||||||
|
|
||||||
| this.firstPageBtn.addEventListener("click", firstPage); | ||||||
|
|
||||||
| let lastPage = () => { | ||||||
| let finalRecord = recordNumberTotal - 1; | ||||||
| let numberOfRows = Math.floor(window.innerHeight / 50); | ||||||
| fromNumber = finalRecord - numberOfRows; | ||||||
|
|
||||||
| this.nextBtn!.disabled = true; | ||||||
| this.previousBtn!.disabled = false; | ||||||
|
|
||||||
| getRecords(fromNumber, finalRecord); | ||||||
| }; | ||||||
|
|
||||||
| this.lastPageBtn.addEventListener("click", lastPage); | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| window.onload = () => { | ||||||
| createNavigation(); | ||||||
| recordCount(); | ||||||
| headingRowCreation(); | ||||||
| fromNumber = 0; | ||||||
| new PageNavigation(); | ||||||
| window.addEventListener("resize", debounce(resizeScreenData, 500)); | ||||||
| } | ||||||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,17 @@ | ||
| <!DOCTYPE html> | ||
| <html> | ||
|
|
||
| <head> | ||
| <title>JS Onboard Project</title> | ||
| <script type="text/javascript" charset="utf-8" src="third_party/jquery-2.0.3.min.js"></script> | ||
| <link rel="stylesheet" href="./style.css" /> | ||
| <script src="./app.js"></script> | ||
| </head> | ||
|
|
||
| <body> | ||
| <p>Hello</p> | ||
| <div id="record-navigation-container"></div> | ||
| <div id="column-headings-container"></div> | ||
| <div id="info-columns-container"></div> | ||
| </body> | ||
|
|
||
| </html> | ||
|
|
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| { | ||
| "name": "onboard-javascript", | ||
| "version": "1.0.0", | ||
| "description": "This is a JavaScript project for all new developers to complete before venturing into our web frontend codebase.", | ||
| "main": "index.js", | ||
| "scripts": { | ||
| "test": "echo \"Error: no test specified\" && exit 1", | ||
| "build": "tsc --build" | ||
| }, | ||
| "repository": { | ||
| "type": "git", | ||
| "url": "git+https://github.com/AshtonMar/onboard-javascript.git" | ||
| }, | ||
| "author": "", | ||
| "license": "ISC", | ||
| "bugs": { | ||
| "url": "https://github.com/AshtonMar/onboard-javascript/issues" | ||
| }, | ||
| "homepage": "https://github.com/AshtonMar/onboard-javascript#readme", | ||
| "dependencies": { | ||
| "@types/jquery": "^3.5.14" | ||
| } | ||
| } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please specify a return type.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Bump