Skip to content
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

Jonathon #42

Open
wants to merge 51 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
cb65553
I had to delete script from somewhere else to get the map working. Ma…
Jonathonsun03 Oct 2, 2022
f1b5913
Trying to figure out what schools is not uploading
Jonathonsun03 Oct 2, 2022
e71ab40
Disable cache to make things work.
Jonathonsun03 Oct 2, 2022
ffbeb12
Made function to pull each select variables for each stop
Jonathonsun03 Oct 2, 2022
09ea0fe
Added the catchments and changed the color
Jonathonsun03 Oct 2, 2022
b50ee68
All my features pop up now. Good progress!
Jonathonsun03 Oct 2, 2022
cc02238
As of today, we got all the points to show up
Jonathonsun03 Oct 2, 2022
4a04b7a
Circle marker not working. Cant call grade level for unique list.
Jonathonsun03 Oct 3, 2022
d846716
About to Modularize the Javascript.
Jonathonsun03 Oct 3, 2022
879697e
Modularizing
Jonathonsun03 Oct 3, 2022
f3e8c32
This does not work go back commit
Jonathonsun03 Oct 3, 2022
1b0bcb2
Revert "Modularizing"
Jonathonsun03 Oct 3, 2022
08d009d
Added the check boxes back in.
Jonathonsun03 Oct 3, 2022
d6c15a8
UPDATED TO CLASS ALL CAUGHT UP THE TOOL TIPS WORK
Jonathonsun03 Oct 3, 2022
6d59541
Got the names for the schools working on the tool tips
Jonathonsun03 Oct 3, 2022
d8fc4f9
Text input counter works
Jonathonsun03 Oct 3, 2022
4b79685
The text box is now able to search for names. Only lower case
Jonathonsun03 Oct 3, 2022
8a43dee
When I click a check mark everything dissapears
Jonathonsun03 Oct 4, 2022
9cc6fb7
Everything dissapears when I check mark a box
Jonathonsun03 Oct 4, 2022
6399092
Just updating stuff
Jonathonsun03 Oct 4, 2022
6be77a1
Needed to change values in check box to fix
Jonathonsun03 Oct 5, 2022
f30f949
Filtered Map actually works
Jonathonsun03 Oct 7, 2022
1995e4c
.append on schoolList doesn't | 2:45:11 TS
Jonathonsun03 Oct 7, 2022
4c6e8eb
Still haven't figured out why my list isn't working. Will send for help
Jonathonsun03 Oct 7, 2022
5506e9e
I tried making a new schoolList variable did not work.
Jonathonsun03 Oct 10, 2022
aa85098
Revert "Still haven't figured out why my list isn't working. Will sen…
Jonathonsun03 Oct 10, 2022
37ae838
About to mess with the CSS and HTML
Jonathonsun03 Oct 10, 2022
045bcda
Got some HTML working.
Jonathonsun03 Oct 10, 2022
aead5b3
The problem was a syntax error
Jonathonsun03 Oct 10, 2022
d597637
Fixed things
Jonathonsun03 Oct 10, 2022
5fa9b6e
Corrected all the red linting
Jonathonsun03 Oct 11, 2022
f896479
Double Checking check marks
Jonathonsun03 Oct 11, 2022
5f85fad
Revert "Fixed things"
Jonathonsun03 Oct 11, 2022
f960ee7
Fixed things and linted
Jonathonsun03 Oct 11, 2022
02ecdce
Merge branch 'main' of https://github.com/Jonathonsun03/MUSA611-schoo…
Jonathonsun03 Oct 12, 2022
d0c9c3b
Merge branch 'main' of 10-11-2022
Jonathonsun03 Oct 12, 2022
5681b64
Linted css
Jonathonsun03 Oct 12, 2022
f4a1747
more css linting
Jonathonsun03 Oct 12, 2022
ee98e6f
linting part3
Jonathonsun03 Oct 12, 2022
d560c9a
Merge branch 'musa-611-fall-2022:main' into main
Jonathonsun03 Oct 12, 2022
7db9b68
Changed global objects
Jonathonsun03 Oct 12, 2022
c6e7bee
Merge branch 'main' of https://github.com/Jonathonsun03/MUSA611-schoo…
Jonathonsun03 Oct 12, 2022
b318086
Merge branch 'main' of https://github.com/Jonathonsun03/MUSA611-schoo…
Jonathonsun03 Oct 12, 2022
a54a84f
merge update
Jonathonsun03 Oct 12, 2022
db87e6f
Merge branch 'main' of https://github.com/Jonathonsun03/MUSA611-schoo…
Jonathonsun03 Oct 28, 2022
b24e91b
Merge branch 'main' of https://github.com/Jonathonsun03/MUSA611-schoo…
Jonathonsun03 Nov 1, 2022
89ae407
cleaning
Jonathonsun03 Nov 12, 2022
b6b74a8
Puuuush please
Jonathonsun03 Nov 30, 2022
16d9048
Merge branch 'main' of https://github.com/musa-611-fall-2022/school-e…
Jonathonsun03 Nov 30, 2022
6060124
Copy package-lock from upstream
Jonathonsun03 Nov 30, 2022
cf89ac1
SchoolList
Jonathonsun03 Nov 30, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions REQUIREMENTS.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
# Requirements

## Core
- [ ] An text box on the page that can be used to filter based on the name of a school. When the value of this text box changes, only schools that have the value as a substring of their name should be shown on the map and in the list.
- [X] An text box on the page that can be used to filter based on the name of a school. When the value of this text box changes, only schools that have the value as a substring of their name should be shown on the map and in the list.

**The `input` element should be available on the global `window` object as a variable named `window.schoolNameFilter`.**

- [ ] A set of checkboxes that can be used to filter based on the grades (K-12) served at a school. When a box is checked, only schools that serve the corresponding grade should be shown on the map. (_You can alternatively choose to include filters for grade levels. If you do, only include options for Elementary, Middle, High, and Transition/Overage -- not, for example, `Elementary-Middle`_).
- [X] A set of checkboxes that can be used to filter based on the grades (K-12) served at a school. When a box is checked, only schools that serve the corresponding grade should be shown on the map. (_You can alternatively choose to include filters for grade levels. If you do, only include options for Elementary, Middle, High, and Transition/Overage -- not, for example, `Elementary-Middle`_).

**An array of `input` elements should be available on the global `window` object as a variable named `window.schoolGradeFilters` (or `window.schoolLevelFilters` if using school levels instead of grades).**

- [ ] A marker should be present on the map for each school that meets the current filter criteria, and no markers should be present for schools that _do not_ meet the filter criteria.
- [X] A marker should be present on the map for each school that meets the current filter criteria, and no markers should be present for schools that _do not_ meet the filter criteria.

**The Leaflet Map object that represents the map on the page should be available on the global `window` objects as a variable named `window.schoolMap`.**

- [ ] A list item should be present in the schools list for each school that meets the current filter criteria, and no list items should be present for schools that _do not_ meet the filter criteria. List items should contain at least:
- [X] A list item should be present in the schools list for each school that meets the current filter criteria, and no list items should be present for schools that _do not_ meet the filter criteria. List items should contain at least:
- School name
- Grades served

Expand Down
32 changes: 16 additions & 16 deletions TASKS.md
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
- [ ] Create an _index.html_ with a basic HTML page structure
- [ ] Create an empty CSS file for the project
- [ ] Create an empty JavaScrip file for the project
- [ ] Link to the empty CSS file from the bottom of the `head` of your HTML file
- [ ] Link to the empty JavaScript file from the bottom of the `body` of your HTML file
- [ ] Add a level-1 heading (`h1`) to the body with the app title, just so there's something to see on the page
- [X] Create an _index.html_ with a basic HTML page structure
- [X] Create an empty CSS file for the project
- [X] Create an empty JavaScrip file for the project
- [X] Link to the empty CSS file from the bottom of the `head` of your HTML file
- [X] Link to the empty JavaScript file from the bottom of the `body` of your HTML file
- [X] Add a level-1 heading (`h1`) to the body with the app title, just so there's something to see on the page

Check the app in the browser.

- [ ] Add a Leaflet map for displaying the list of schools to the page
- [X] Add a Leaflet map for displaying the list of schools to the page
* **Tip:** Usually when I'm starting with a new leaflet map, I just Google "leaflet quickstart" and copy a few things from that page. Other times I may use a CDN like
* **Recommendation:** Give your map a meaningful ID -- something like `school-map`, and then name the corresponding JavaScript variable something similar, e.g. `schoolMap`.
- [ ] Import the data from _site/data/schools.js_ into your JavaScript file.
- [ ] Create a function called `makeSchoolFeature` to transform one of the school elements into a GeoJSON-like feature. **This function should be made available globally (on the window object)**.
- [ ] Use the function to display all the `schools` data on the map.
- [ ] Create a function to show an array of schools on the map.
- [X] Import the data from _site/data/schools.js_ into your JavaScript file.
- [X] Create a function called `makeSchoolFeature` to transform one of the school elements into a GeoJSON-like feature. **This function should be made available globally (on the window object)**.
- [X] Use the function to display all the `schools` data on the map.
- [X] Create a function to show an array of schools on the map.

----------

- [ ] Create a list element (unordered -- `ul`) in the HTML give it an id of `school-list`
- [ ] Write a function that fills in the list with list item (`li`) elements for each school in an array
- [ ] Add a checkbox for each grade K-12 to the page.
- [ ] Add a text box to filter schools that contain a given string. The text box should have an id of `school-name-filter`.
- [ ] Write a predicate function called `shouldShowSchool` that will return `true` if a given school should be shown according to the currently selected filters, and will return `false` if a given school should not be shown. For now, ignore the filters and always return `true`.
- [X] Create a list element (unordered -- `ul`) in the HTML give it an id of `school-list`
- [X] Write a function that fills in the list with list item (`li`) elements for each school in an array
- [X] Add a checkbox for each grade K-12 to the page.
- [X] Add a text box to filter schools that contain a given string. The text box should have an id of `school-name-filter`.
- [X] Write a predicate function called `shouldShowSchool` that will return `true` if a given school should be shown according to the currently selcted filters, and will return `false` if a given school should not be shown. For now, ignore the filters and always return `true`.
Loading