-
Notifications
You must be signed in to change notification settings - Fork 36
Devin Fledermaus #44
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?
Devin Fledermaus #44
Changes from 33 commits
88a0c43
69a305f
95cabc6
5f81214
75bff11
3b59290
6de1c55
7bd7bc8
7991e74
c54940f
3e5eae5
b028cc4
dfc1c75
6c53b8d
6a9233b
708034d
027f290
c4039ef
ecceaf0
5ff3563
405592d
c67502c
7cf9e78
708ef31
1256e0c
93e2511
0b1c2e6
876307b
d2cf1df
e31c2d3
f5fdd2d
951158c
46fc0eb
b581516
4d5c1a5
f2457da
ade9748
cdaf8aa
b72ecd9
7b4e7a6
62417f3
d3ad477
e82ac48
4bdde48
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,274 @@ | ||
| let fromParameter = 0; | ||
| let timer: number; | ||
| let recordCount = 0; | ||
|
|
||
|
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. As Gerald said, global variables are bad. You can move them to their own class. |
||
| //// On Window Load | ||
|
|
||
| window.onload = function () { | ||
| getRecordCount() | ||
| .then(() => { | ||
| return getHeadings(); | ||
| }) | ||
| .then(() => { | ||
| return getTable(); | ||
| }); | ||
| console.log("CALL HECTOR!!!"); | ||
| }; | ||
|
|
||
| const getParameters = (fromParameter: number) => { | ||
|
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 return type |
||
| let toParameter: number; | ||
| let noOfRows = getNoOfRows(); | ||
|
|
||
| toParameter = fromParameter + noOfRows; | ||
| return toParameter; | ||
| }; | ||
|
|
||
| const getNoOfRows = () => { | ||
|
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 return type |
||
| const height = window.innerHeight; | ||
| let noOfRows = Math.floor(height / 40); | ||
| return noOfRows; | ||
| }; | ||
|
|
||
| //// Functions To Create/Clear The HTML | ||
|
|
||
| // Heading Row | ||
|
|
||
| const createHeadingRow = (headingData: 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. Rather remove the empty line between the variable and the comment. |
||
| const heading: any = document.querySelector("#heading"); | ||
|
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 only place you can have an |
||
|
|
||
| let headings = `<div class="headings" id="headings">${headingData}</div>`; | ||
| heading.innerHTML += headings; | ||
| }; | ||
|
|
||
| // Table Content | ||
|
|
||
| const createTableContent = (contentData: string) => { | ||
| const content: any = document.querySelector("#content"); | ||
|
|
||
| let table = `<div id="row-${contentData[0]}" class="rows"></div>`; | ||
| content.innerHTML += table; | ||
|
|
||
| let rows: any = document.querySelector("#row-" + contentData[0] + ".rows"); | ||
| for (let x = 0; x < contentData.length; x++) { | ||
| let rowCols = `<div class="row_cols">${contentData[x]}</div>`; | ||
| rows.innerHTML += rowCols; | ||
| } | ||
| }; | ||
|
|
||
| //// Fetch Requests | ||
|
|
||
| // Heading Row (Getting the columns data) | ||
|
|
||
| const getHeadings = () => { | ||
| fetch("http://localhost:2050/columns", { | ||
|
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 a |
||
| method: "GET", | ||
| headers: { "Content-Type": "application/json" }, | ||
| }) | ||
| .then((res) => res.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 check for an error in |
||
| .then((data) => { | ||
|
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. Implement a catch to catch an error. i.e. At least have logging of what went wrong. |
||
| let headingData = JSON.parse(data); | ||
| for (let i = 0; i < headingData.length; i++) { | ||
| createHeadingRow(headingData[i]); | ||
| } | ||
| getParameters((fromParameter = 0)); | ||
|
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. Was this necessary? getParameters returns your toParameter but you do nothing with the return result since you don't need it?
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. To many braces and I would rather have this as two lines, where you explicitly call |
||
| }) | ||
| .catch((error) => { | ||
|
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 want to remove the |
||
| console.log("Call Hector", error); | ||
|
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. Who's Hector? |
||
| }); | ||
| }; | ||
|
|
||
| // Table Content (Getting the table's data) | ||
|
|
||
| const getTable = () => { | ||
| const content: any = document.querySelector("#content"); | ||
| let toParameter = getParameters(fromParameter); | ||
| const pageStats: any = document.querySelector("#pageStats"); | ||
|
|
||
| // Clears Table | ||
| content.innerHTML = ""; | ||
|
|
||
| // Displays The Current Results Being Shown | ||
| let currentStats = `Showing results from ${fromParameter} to ${toParameter} out of ${recordCount} results.`; | ||
| pageStats.innerHTML = currentStats; | ||
|
|
||
| fetch(`http://localhost:2050/records?from=${fromParameter}&to=${toParameter}`, { | ||
| method: "GET", | ||
| headers: { "Content-Type": "application/json" }, | ||
| }) | ||
| .then((res) => res.text()) | ||
| .then((data) => { | ||
|
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 error catching |
||
| let contentData = JSON.parse(data); | ||
| for (let i = 0; i < contentData.length; i++) { | ||
| createTableContent(contentData[i]); | ||
| } | ||
| }) | ||
| .catch((error) => { | ||
| console.log(error); | ||
| }); | ||
| }; | ||
|
|
||
| let getRecordCount = () => { | ||
| return fetch("http://localhost:2050/recordCount", { | ||
| method: "GET", | ||
| headers: { "Content-Type": "application/json" }, | ||
| }) | ||
| .then((res) => res.text()) | ||
| .then((data) => { | ||
| recordCount = JSON.parse(data); | ||
| }) | ||
| .catch((error) => { | ||
| console.log(error); | ||
| }); | ||
| }; | ||
|
|
||
| // getRecordCount(); | ||
| // getHeadings(); | ||
| // getTable(); | ||
|
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. Remove clutter. |
||
|
|
||
| //// Debounce | ||
|
|
||
| const debounce = (fn: any, delay: number) => { | ||
| return function () { | ||
| clearTimeout(timer); | ||
| timer = setTimeout(() => { | ||
| fn(); | ||
| }, delay); | ||
| }; | ||
| }; | ||
|
|
||
| //// Sizing And Resizing | ||
|
|
||
| let resizing = () => { | ||
| let end = fromParameter + getNoOfRows(); | ||
| let toParameter: number; | ||
|
|
||
| if (end > 999999) { | ||
|
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. Don't use 999999. You have recordCount for the max.. |
||
| toParameter = 999999; | ||
| fromParameter = toParameter - getNoOfRows(); | ||
| } else { | ||
| toParameter = fromParameter + getNoOfRows(); | ||
| } | ||
| getTable(); | ||
| }; | ||
|
|
||
| resizing = debounce(resizing, 500); | ||
|
|
||
| window.addEventListener("resize", resizing); | ||
|
|
||
| //// Navigation | ||
|
|
||
| // Next | ||
| { | ||
| let nextCount = 0; | ||
| const nextButton: any = document.querySelector("#next"); | ||
|
|
||
| const nextDebounce = (fn: any, delay: number) => { | ||
| return function () { | ||
| nextCount++; | ||
| clearTimeout(timer); | ||
| timer = setTimeout(() => { | ||
| fn(); | ||
| }, delay); | ||
| }; | ||
| }; | ||
|
|
||
| let next = () => { | ||
| let toParameter = getParameters(fromParameter); | ||
|
|
||
| if (toParameter === 999999) { | ||
|
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 vibe for recordCount |
||
| alert("You have reached the final page"); | ||
| } | ||
|
|
||
| let nextAmount = toParameter - fromParameter + 1; | ||
| let nextCountAmount = nextAmount * nextCount; | ||
| fromParameter = fromParameter + nextCountAmount; | ||
| toParameter = fromParameter + getNoOfRows(); | ||
|
|
||
| let end = fromParameter + getNoOfRows(); | ||
|
|
||
| if (end > 999999) { | ||
| toParameter = 999999; | ||
|
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 vibe for recordCount |
||
| fromParameter = toParameter - getNoOfRows(); | ||
| } | ||
|
|
||
| nextCount = 0; | ||
|
|
||
| getTable(); | ||
| }; | ||
|
|
||
| nextButton.addEventListener("click", nextDebounce(next, 500)); | ||
| } | ||
|
|
||
| // Previous | ||
| { | ||
| let prevCount = 0; | ||
| const prevButton: any = document.querySelector("#prev"); | ||
|
|
||
| const prevDebounce = (fn: any, delay: number) => { | ||
| return function () { | ||
| prevCount++; | ||
| clearTimeout(timer); | ||
| timer = setTimeout(() => { | ||
| fn(); | ||
| }, delay); | ||
| }; | ||
| }; | ||
|
|
||
| let prev = () => { | ||
| let toParameter = getParameters(fromParameter); | ||
|
|
||
| if (fromParameter === 0) { | ||
| alert("You Are On The First Page"); | ||
| } else { | ||
| let prevAmount = toParameter - fromParameter + 1; | ||
| let prevCountAmount = prevAmount * prevCount; | ||
|
|
||
| let intOne = fromParameter - prevCountAmount; | ||
|
|
||
| if (intOne < 0) { | ||
| fromParameter = 0; | ||
| } else { | ||
| fromParameter = intOne; | ||
| } | ||
|
|
||
| toParameter = fromParameter + getNoOfRows(); | ||
|
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. Is this still necessary? toParameter isn't used after this? |
||
|
|
||
| prevCount = 0; | ||
|
|
||
| getTable(); | ||
| } | ||
| }; | ||
|
|
||
| prevButton.addEventListener("click", prevDebounce(prev, 500)); | ||
| } | ||
|
|
||
| // ID Jump | ||
| { | ||
| const input: any = document.querySelector("input"); | ||
|
|
||
| let idJump = () => { | ||
| let toParameter = getParameters(fromParameter); | ||
| let currentID = fromParameter; | ||
| let search = input.value; | ||
| let end = parseInt(search) + getNoOfRows(); | ||
|
|
||
| if (search !== NaN && search !== "" && search < 1000000 && search >= 0) { | ||
| if (end > 999999) { | ||
| toParameter = 999999; | ||
|
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 vibe for recordCount. |
||
| fromParameter = toParameter - getNoOfRows(); | ||
| } else { | ||
| fromParameter = parseInt(search); | ||
| toParameter = fromParameter + getNoOfRows(); | ||
| } | ||
| } else if (search !== "") { | ||
| alert("Make Sure Your Desired ID Is Not A Negative Number Or Doesn't Exceed 999999"); | ||
| fromParameter = currentID; | ||
| toParameter = fromParameter + getNoOfRows(); | ||
| input.value = ""; | ||
| } | ||
|
|
||
| getTable(); | ||
| }; | ||
|
|
||
| window.addEventListener("input", debounce(idJump, 500)); | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,27 @@ | ||
| <!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> | ||
|
|
||
| <html lang="en"> | ||
| <head> | ||
| <meta charset="UTF-8" /> | ||
| <meta http-equiv="X-UA-Compatible" content="IE=edge" /> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1.0" /> | ||
| <title>Onboarding JavaScript Task</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> | ||
| </head> | ||
| <body> | ||
| <div id="nav"> | ||
| <label id="pageStats"></label> | ||
| <div id="jumpID"> | ||
| <input type="number" id="idJump" placeholder="Input A Starting ID" /> | ||
| <!-- <button>Jump to ID</button> --> | ||
| </div> | ||
| <div id="btns"> | ||
| <button class="prev" id="prev">Prev</button> | ||
| <button class="next" id="next">Next</button> | ||
| </div> | ||
| </div> | ||
| <div id="heading"></div> | ||
| <div id="content"></div> | ||
| </body> | ||
| </html> | ||
|
|
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| { | ||
| "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/Koumori97/onboard-javascript.git" | ||
| }, | ||
| "author": "", | ||
| "license": "ISC", | ||
| "bugs": { | ||
| "url": "https://github.com/Koumori97/onboard-javascript/issues" | ||
| }, | ||
| "homepage": "https://github.com/Koumori97/onboard-javascript#readme", | ||
| "dependencies": { | ||
| "typescript": "^4.6.3" | ||
| }, | ||
| "devDependencies": { | ||
| "@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.
There are too many global variables here which is generally frowned upon. There are few variables that are acceptable as global variables.