-
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 23 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 |
|---|---|---|
| @@ -0,0 +1,312 @@ | ||
| let fromNumber = 0; | ||
| let recordNumberTotal: number; | ||
| let count = 0; | ||
| let timeout = 0; | ||
|
|
||
| window.onload = () => { | ||
| fromNumber = 0; | ||
| }; | ||
|
|
||
| function checkResponseError(response: Response) { | ||
| if (!response.ok) { | ||
| throw Error(response.statusText); | ||
| } | ||
| return response; | ||
| } | ||
|
|
||
| let debounce = (func: any, 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) { | ||
|
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 specify a return type |
||
| return fetch(`http://localhost:2050/records?from=${fromNumber}&to=${toNumber}`, { | ||
| method: "GET", | ||
| headers: { "Content-Type": "application/json" }, | ||
| }) | ||
| .then(checkResponseError) | ||
| .then((response: Response) => response.text()) | ||
|
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 should rather use |
||
| .then((data) => { | ||
|
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. Either remove the |
||
| let columnDataList = JSON.parse(data); | ||
| let infoColumns: HTMLElement | null = document.getElementById("info-columns-container"); // Information | ||
|
|
||
| console.log("Hello"); | ||
|
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. Stray console log. |
||
| (infoColumns as HTMLDivElement).innerHTML = ""; | ||
|
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 need to check if |
||
| for (let i = 0; i < columnDataList.length; i++) { | ||
|
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 should change this to a |
||
| dynamicGrid(columnDataList[i]); | ||
| } | ||
|
|
||
| let currentPage: HTMLElement | null = document.getElementById("current-page"); | ||
| (currentPage as HTMLParagraphElement).innerHTML = `${fromNumber} / ${toNumber}.`; | ||
|
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. Same comment as before, you need to check if the value is |
||
| }) | ||
| .catch((error: Error) => { | ||
| console.log(error); | ||
| }); | ||
| } | ||
|
|
||
| function recordSelection() { | ||
| let recordNav: HTMLElement | null = document.getElementById("record-navigation-container"); // Navigation area | ||
| if (recordNav !== null) { | ||
|
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. Rather do a if (!recordNav) {
// Error/Return/Alert what happened.
} |
||
| let singleRecordSelection = ` | ||
| <button id="return-btn">Return</button> | ||
| <div id="user-input-data"> | ||
|
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 should put the |
||
| <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> | ||
|
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. Same comment as before, but here is looks like your closing a |
||
| `; | ||
|
|
||
| recordNav.innerHTML = singleRecordSelection; | ||
|
|
||
| let returnBtn: HTMLElement | null = document.getElementById("return-btn"); | ||
| let recordIdInput: HTMLElement | null = document.getElementById("record-id"); | ||
| let numberOfRows = Math.floor(window.innerHeight / 50); | ||
| let getSingleRecord: HTMLElement | null = document.getElementById("get-record-btn"); | ||
|
|
||
| returnBtn?.addEventListener("click", () => { | ||
|
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. The |
||
| console.log("hello"); | ||
|
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. Stray console log. |
||
| createNavigation(); | ||
| fromNumber = 0; | ||
| let toNumber = fromNumber + numberOfRows; | ||
| getRecords(fromNumber, toNumber); | ||
|
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. Add a comment saying that you are resetting the grid back to the starting page and remove the |
||
| }); | ||
|
|
||
| getSingleRecord?.addEventListener("click", () => { | ||
|
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. Same comment about the |
||
| let recordIdValue = (recordIdInput as HTMLInputElement).value; | ||
|
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. Check for |
||
| fromNumber = Number(recordIdValue); | ||
|
|
||
| console.log(fromNumber); | ||
|
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. Stray console log |
||
|
|
||
| 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: any) { | ||
|
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 specify the real type here. |
||
| let headingColumns: HTMLElement | null = document.getElementById("column-headings-container"); // Headings | ||
| let headingsData = `<h1 class="column-heading">${headings}</h1>`; | ||
|
|
||
| (headingColumns as HTMLDivElement).innerHTML += headingsData; | ||
|
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. Check for |
||
| } | ||
|
|
||
| function recordCount() { | ||
|
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 add a return type |
||
| return fetch("http://localhost:2050/recordCount", { | ||
| method: "GET", | ||
| headers: { "Content-Type": "application/json" }, | ||
| }) | ||
| .then(checkResponseError) | ||
| .then((response: Response) => response.text()) | ||
|
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 should rather use |
||
| .then((data) => { | ||
|
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 remove the |
||
| recordNumberTotal = JSON.parse(data); | ||
| }) | ||
| .catch((error: Error) => { | ||
| console.log(error); | ||
| }); | ||
| } | ||
|
|
||
| function headingRowCreation() { | ||
|
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 specify the return type. |
||
| return fetch("http://localhost:2050/columns", { | ||
| method: "GET", | ||
| headers: { "Content-Type": "application/json" }, | ||
| }) | ||
| .then(checkResponseError) | ||
| .then((response: Response) => response.text()) | ||
|
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 should rather use |
||
| .then((data) => { | ||
|
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 remove the |
||
| let headingDataList = JSON.parse(data); | ||
| let headings: string; | ||
|
|
||
| for (let i = 0; i < headingDataList.length; i++) { | ||
|
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. Change this to a |
||
| headings = headingDataList[i]; | ||
| createHeadingGrid(headings); | ||
| } | ||
| resizeScreenData(); | ||
| }) | ||
| .catch((error: Error) => { | ||
| console.log(error); | ||
| }); | ||
| } | ||
|
|
||
| function dynamicGrid(columnData: any) { | ||
|
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. Change the type for |
||
| 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) { | ||
|
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 should probably error or something if this happens, otherwise the user will not know whats wrong. |
||
| infoColumns.innerHTML += infoDataRow; | ||
| // Gets the created rows. | ||
| let finalInfoDataRow = document.getElementById("info-row-" + columnData[0]); | ||
| if (finalInfoDataRow !== null) { | ||
| // Loops through | ||
| for (let x = 0; x < columnData.length; x++) { | ||
| let infoData = `<p class="info-row-data">${columnData[x]}</p>`; | ||
| finalInfoDataRow.innerHTML += infoData; | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| function resizeScreenData() { | ||
| let toNumber: number; | ||
| let recordNav: HTMLElement | null = document.getElementById("record-navigation-container"); | ||
| let nextBtn: HTMLElement | null = document.getElementById("next-records-btn"); | ||
| let previousBtn: HTMLElement | null = document.getElementById("previous-records-btn"); | ||
| let navBtns = document.getElementById("navigation-btns"); | ||
| if (recordNav !== null) { | ||
|
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 should probably error or something if this happens, otherwise the user will not know whats wrong. |
||
| if (recordNav.contains(navBtns as HTMLDivElement)) { | ||
| let numberOfRows = Math.floor(window.innerHeight / 50); | ||
|
|
||
| (nextBtn as HTMLButtonElement).disabled = false; | ||
| (previousBtn as HTMLButtonElement).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. You should check for nulls. |
||
|
|
||
| let finalRecord = recordNumberTotal - 1; | ||
|
|
||
| if (fromNumber + numberOfRows >= finalRecord) { | ||
| fromNumber = finalRecord - numberOfRows; | ||
| (nextBtn as HTMLButtonElement).disabled = true; | ||
| (previousBtn as HTMLButtonElement).disabled = false; | ||
| } else if (fromNumber <= 0) { | ||
| (nextBtn as HTMLButtonElement).disabled = false; | ||
| (previousBtn as HTMLButtonElement).disabled = true; | ||
| fromNumber = 0; | ||
| } | ||
|
|
||
| toNumber = fromNumber + numberOfRows; | ||
|
|
||
| getRecords(fromNumber, toNumber); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| recordCount(); | ||
| window?.addEventListener("resize", debounce(resizeScreenData, 500)); | ||
| createNavigation(); | ||
| headingRowCreation(); | ||
|
|
||
| { | ||
| let confirmationBtn: HTMLElement | null = document.getElementById("confirmation-btn"); | ||
| confirmationBtn?.addEventListener("click", recordSelection); | ||
|
|
||
| let nextBtn: HTMLElement | null = document.getElementById("next-records-btn"); | ||
| let previousBtn: HTMLElement | null = document.getElementById("previous-records-btn"); | ||
| let firstPageBtn: HTMLElement | null = document.getElementById("first-page-btn"); | ||
| let lastPageBtn: HTMLElement | null = document.getElementById("last-page-btn"); | ||
|
|
||
| let nextPage = () => { | ||
| console.log(fromNumber); | ||
| let numberOfRows = Math.floor(window.innerHeight / 50); | ||
| fromNumber = fromNumber + numberOfRows * count; | ||
| let toNumber = fromNumber + numberOfRows; | ||
|
|
||
| let finalRecord = recordNumberTotal - 1; | ||
|
|
||
| (previousBtn as HTMLButtonElement).disabled = false; | ||
|
|
||
| if (toNumber >= finalRecord) { | ||
| (nextBtn as HTMLButtonElement).disabled = true; | ||
| fromNumber = finalRecord - numberOfRows; | ||
| } | ||
|
|
||
| getRecords(fromNumber, toNumber); | ||
| count = 0; | ||
| }; | ||
| nextBtn?.addEventListener("click", () => { | ||
| count++; | ||
| nextPage = debounce(nextPage, 500); | ||
| nextPage(); | ||
| }); | ||
|
|
||
| let previousPage = () => { | ||
| let numberOfRows = Math.floor(window.innerHeight / 50); | ||
| fromNumber = fromNumber - numberOfRows * count; | ||
| let toNumber = fromNumber + numberOfRows; | ||
| (nextBtn as HTMLButtonElement).disabled = false; | ||
|
|
||
| if (fromNumber <= 0) { | ||
| (previousBtn as HTMLButtonElement).disabled = true; | ||
| fromNumber = 0; | ||
| } | ||
|
|
||
| getRecords(fromNumber, toNumber); | ||
| count = 0; | ||
| }; | ||
| previousBtn?.addEventListener("click", () => { | ||
| count++; | ||
| previousPage = debounce(previousPage, 500); | ||
| previousPage(); | ||
| }); | ||
|
|
||
| let firstPage = () => { | ||
| fromNumber = 0; | ||
| let numberOfRows = Math.floor(window.innerHeight / 50); | ||
| let toNumber = fromNumber + numberOfRows; | ||
| (nextBtn as HTMLButtonElement).disabled = false; | ||
| (previousBtn as HTMLButtonElement).disabled = true; | ||
|
|
||
| getRecords(fromNumber, toNumber); | ||
| }; | ||
| firstPageBtn?.addEventListener("click", () => { | ||
| firstPage(); | ||
| }); | ||
|
|
||
| let lastPage = () => { | ||
| let finalRecord = recordNumberTotal - 1; | ||
| let numberOfRows = Math.floor(window.innerHeight / 50); | ||
| fromNumber = finalRecord - numberOfRows; | ||
| (nextBtn as HTMLButtonElement).disabled = true; | ||
| (previousBtn as HTMLButtonElement).disabled = false; | ||
|
|
||
| getRecords(fromNumber, finalRecord); | ||
| }; | ||
| lastPageBtn?.addEventListener("click", () => { | ||
| lastPage(); | ||
| }); | ||
| } | ||
|
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. This is to much logic happening in global space, please either move it into a class, or have it executed somewhere else. |
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,14 @@ | ||
| <!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> | ||
| </head> | ||
|
|
||
| <body> | ||
| <p>Hello</p> | ||
| </body> | ||
|
|
||
| <head> | ||
|
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 convert this file back to using tabs. |
||
| <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" defer></script> | ||
|
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 should not really be using |
||
| </head> | ||
| <body> | ||
| <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" | ||
| } | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,7 +12,6 @@ import ( | |
| "strconv" | ||
| "time" | ||
| ) | ||
|
|
||
|
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. This file should not show up in this PR.
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. bump |
||
| const recordCount = 1000000 | ||
| const columnCount = 11 | ||
| const delayResponse = 500 * time.Millisecond | ||
|
|
||
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