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

Refactor/accessibility check #403

Open
wants to merge 161 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
161 commits
Select commit Hold shift + click to select a range
fb1296d
Add the user class
hjawad22 Mar 27, 2023
8d9214a
Add userRepository class and a user test file
hjawad22 Mar 27, 2023
29e2265
Add test for user repository class
hjawad22 Mar 27, 2023
2a739fb
Add base framework and tests for hydration class
asutherland91 Mar 27, 2023
72c3eae
Merge pull request #34 from JWFeatherstone/feature/hydration-class
SamanthaMcElhinney Mar 28, 2023
0aec44a
Add test data file for user repository and tests and method for calcu…
JWFeatherstone Mar 28, 2023
498a446
Add user method and user tests
hjawad22 Mar 28, 2023
52dbc30
Merge pull request #35 from JWFeatherstone/feature/user-class
SamanthaMcElhinney Mar 28, 2023
4aee0a2
Refactor hydration class to include property for hydration data to ta…
SamanthaMcElhinney Mar 28, 2023
f6020a3
Add testing for the length of the user array by finding the user id
SamanthaMcElhinney Mar 28, 2023
01413fb
Refactor calculate average for functionality
SamanthaMcElhinney Mar 28, 2023
18f2c79
Refactor function to include .toFixed to round
SamanthaMcElhinney Mar 28, 2023
daee022
Add test to update hydration property, add test to calculate the aver…
SamanthaMcElhinney Mar 28, 2023
27f0d71
Add test for hydration data property
SamanthaMcElhinney Mar 28, 2023
eea2d63
Add test to find user based on id
SamanthaMcElhinney Mar 28, 2023
342e1aa
Delete unused imports
SamanthaMcElhinney Mar 28, 2023
3884882
Merge branch 'main' into feature/User2
JWFeatherstone Mar 28, 2023
8e1a858
Refactor test for functionality
SamanthaMcElhinney Mar 28, 2023
ee31b83
Merge pull request #36 from JWFeatherstone/feature/User2
hjawad22 Mar 28, 2023
7976bb1
Add semi-colon
SamanthaMcElhinney Mar 28, 2023
cb97529
Adds functions to display an unformatted user card and the average st…
JWFeatherstone Mar 28, 2023
c6d3f97
Merge pull request #37 from JWFeatherstone/feature/hydration-class-ca…
asutherland91 Mar 28, 2023
b14ec41
Add export script to UserRepository.
JWFeatherstone Mar 28, 2023
d98afe1
Add functions for seeing ounces consumed by user and testing of those…
asutherland91 Mar 28, 2023
9b90f3f
Undo minor line changes
asutherland91 Mar 28, 2023
367a1a2
This will fix the merge conflict with the hydration.js file and hydra…
asutherland91 Mar 28, 2023
a064195
Merge pull request #39 from JWFeatherstone/feature/User2
SamanthaMcElhinney Mar 28, 2023
e89f3f1
Merge branch 'main' into feature/hydration-class
hjawad22 Mar 28, 2023
77eee4e
Merge pull request #38 from JWFeatherstone/feature/hydration-class
hjawad22 Mar 28, 2023
d130ca5
Remove duplicate constructor in UserRepository class.
JWFeatherstone Mar 28, 2023
e13b8ea
Merge pull request #40 from JWFeatherstone/fix/duplicateConstructor
JWFeatherstone Mar 28, 2023
39ca1c3
Add proper syntax
hjawad22 Mar 28, 2023
2b3ad0f
Add proper import variable to an it block
hjawad22 Mar 28, 2023
94bcb4e
Add html nav tag and create a function to display greeting
hjawad22 Mar 28, 2023
5ebd000
Add updated index.html file
asutherland91 Mar 28, 2023
52582a5
Add updated index.html file
asutherland91 Mar 28, 2023
d4dc88b
Merge pull request #41 from JWFeatherstone/feature/dom-user-class
SamanthaMcElhinney Mar 29, 2023
1d9f0e3
Merge branch 'main' of github.com:JWFeatherstone/fitlit-adriane-houda…
asutherland91 Mar 29, 2023
6e3f644
Merge pull request #42 from JWFeatherstone/feature/HTML-skeleton
hjawad22 Mar 29, 2023
c2e81cf
Add global variables to access data from fetch calls
SamanthaMcElhinney Mar 29, 2023
7adf61f
Refactor for hydration card
SamanthaMcElhinney Mar 29, 2023
cd2cb76
Update class for hydration container
SamanthaMcElhinney Mar 29, 2023
3301266
Add functionality to display average ounces per day and average overa…
SamanthaMcElhinney Mar 29, 2023
27ebab6
Add sleep class and methods/tests to determine a given user's average…
JWFeatherstone Mar 29, 2023
b601056
Update innerHTML for displaying hydration card
SamanthaMcElhinney Mar 29, 2023
550e73e
Merge pull request #43 from JWFeatherstone/feature/sleep
SamanthaMcElhinney Mar 29, 2023
899ccbe
Add DOM manipulation for the ounces consumed weekly function
asutherland91 Mar 29, 2023
4030a7c
Merge pull request #45 from JWFeatherstone/feature/DOM-for-weekly-ounces
SamanthaMcElhinney Mar 29, 2023
ff60edf
Update files to place classes in the classes folder and refactor asso…
SamanthaMcElhinney Mar 29, 2023
fe0ebd4
Merge pull request #46 from JWFeatherstone/feature/sleep-quality-meth…
hjawad22 Mar 29, 2023
79ff5ff
Add activity class and tests files
asutherland91 Mar 29, 2023
2b0b947
Fetches sleep API data and fixes references in user DOM manipulation …
JWFeatherstone Mar 29, 2023
e8b3bd9
Add basic testing and class setup for activity class
asutherland91 Mar 29, 2023
fd4e478
Merge pull request #47 from JWFeatherstone/feature/sleep
asutherland91 Mar 29, 2023
679a5b1
Merge pull request #48 from JWFeatherstone/feature/activity-class
hjawad22 Mar 29, 2023
accf3bf
Add correct class from HTML to display user greeting
hjawad22 Mar 29, 2023
8486ff1
Add functionality for dailyMinutesActive method
asutherland91 Mar 29, 2023
dcc2258
Add testing for stepGoalMet method
asutherland91 Mar 29, 2023
72eaa22
Add testing and functionality for the dailyMinutesActive and stepGoal…
asutherland91 Mar 29, 2023
58653f3
Merge pull request #49 from JWFeatherstone/feature/activity-class
hjawad22 Mar 29, 2023
f98d059
Add method to calculate the miles walked
hjawad22 Mar 29, 2023
b436d1e
Add test for the calculate miles walked method
hjawad22 Mar 29, 2023
b2a90d4
Merge branch 'main' into feature/activity-class2
hjawad22 Mar 29, 2023
f82a9d3
Merge pull request #50 from JWFeatherstone/feature/activity-class2
SamanthaMcElhinney Mar 29, 2023
905a25f
Add DOM manipulation functions for latest sleep data and all-time sle…
JWFeatherstone Mar 30, 2023
65da97f
method to find sleep quality to specified date
SamanthaMcElhinney Mar 30, 2023
b1a822a
Add testing for finding users sleep quality on specified date
SamanthaMcElhinney Mar 30, 2023
c579f12
Add testing for calculating sleep over a selected week
SamanthaMcElhinney Mar 30, 2023
ba25f74
Merge pull request #51 from JWFeatherstone/feature/sleepDisplay
asutherland91 Mar 30, 2023
852a6a3
Add charts.js usablity and some basic css styling
asutherland91 Mar 30, 2023
364eb0f
Add sample sleep data over a week
SamanthaMcElhinney Mar 30, 2023
8a69a4c
Add method to display weekly sleep
SamanthaMcElhinney Mar 30, 2023
5a2a152
Refactor sleep test data for spacing
SamanthaMcElhinney Mar 30, 2023
7fb31ff
Refactor sleep test for appropriate dates
SamanthaMcElhinney Mar 30, 2023
53d7714
Add metho to find sleep quality on specified date
SamanthaMcElhinney Mar 30, 2023
8bfeb89
Add method to obtain sleep data given specified data
SamanthaMcElhinney Mar 30, 2023
5ebca1c
Add method to calculate weekly sleep quality given a specified date
SamanthaMcElhinney Mar 30, 2023
cf0e1a6
Add testing for methods to calculate weekly sleep quality, storing sl…
SamanthaMcElhinney Mar 30, 2023
9251222
Move API calls to separate file, add export language, and implement p…
JWFeatherstone Mar 30, 2023
43ae399
Fully integrates API calls and fixes Sleep DOM manipulators to render…
JWFeatherstone Mar 30, 2023
6848fbb
Merge pull request #54 from JWFeatherstone/feature/APICalls
SamanthaMcElhinney Mar 30, 2023
d156ed9
Merge pull request #52 from JWFeatherstone/feature/sleep-method-weekl…
JWFeatherstone Mar 30, 2023
20f4bc5
Merge pull request #55 from JWFeatherstone/feature/APICalls
hjawad22 Mar 30, 2023
3f5e3de
Add updated styling to the css
asutherland91 Mar 30, 2023
c4a80f2
Add fetch call for activty data
hjawad22 Mar 30, 2023
a2efb83
Merge branch 'main' of github.com:JWFeatherstone/fitlit-adriane-houda…
asutherland91 Mar 30, 2023
e17ffda
Add completed merge resolution
asutherland91 Mar 30, 2023
10ddfe4
Merge pull request #56 from JWFeatherstone/feature/CSS-styling-one
SamanthaMcElhinney Mar 30, 2023
748a8ce
Add function to display user activity
hjawad22 Mar 30, 2023
5a69aa1
Merge pull request #57 from JWFeatherstone/feature/dom-activity-class
asutherland91 Mar 30, 2023
e55a3d5
Add ids & classes to the buttons to display sleep graphs
SamanthaMcElhinney Mar 30, 2023
6d74fa6
Add class for styling sleep buttons
SamanthaMcElhinney Mar 31, 2023
201383c
Combine method to load sleep card, add method to display weekly sleep…
SamanthaMcElhinney Mar 31, 2023
3c375b5
Update method to return both date and sleep quality/ hours
SamanthaMcElhinney Mar 31, 2023
b2f0547
Add method for displaying weekly sleep hours and chart, and function …
SamanthaMcElhinney Mar 31, 2023
7e2f6e3
Refactor test to include updated method to display dates with functio…
SamanthaMcElhinney Mar 31, 2023
acdf1fe
Update sleep test to display dates
SamanthaMcElhinney Mar 31, 2023
5c02b47
Merge branch 'main' into feature/DOM-manipulation-sleep
SamanthaMcElhinney Mar 31, 2023
28fe4a4
Merge pull request #58 from JWFeatherstone/feature/DOM-manipulation-s…
JWFeatherstone Mar 31, 2023
28de0d6
Adds initial formatting for the navigaiton bar.
JWFeatherstone Mar 31, 2023
5354db4
Merge branch 'main' into feature/nav-bar
JWFeatherstone Mar 31, 2023
82f0991
Merge pull request #59 from JWFeatherstone/feature/nav-bar
asutherland91 Mar 31, 2023
e49c2ea
Fixes issue with charts requiring reload to reset by adding function …
JWFeatherstone Mar 31, 2023
d19e571
Add more styling elements to the cards, and also add images to image …
asutherland91 Mar 31, 2023
9ee9920
Merge branch 'main' into fix/chart-reload
JWFeatherstone Mar 31, 2023
ff8e28e
Merge branch 'main' of github.com:JWFeatherstone/fitlit-adriane-houda…
asutherland91 Mar 31, 2023
a201cda
Merge pull request #64 from JWFeatherstone/feature/CSS-card-styling
JWFeatherstone Mar 31, 2023
8e6252d
Merge pull request #63 from JWFeatherstone/fix/chart-reload
asutherland91 Mar 31, 2023
98c69ce
Adjust alignment of cards, title, and infographic area to replicate w…
JWFeatherstone Mar 31, 2023
53f8927
Merge pull request #65 from JWFeatherstone/feature/CSS-alignment
SamanthaMcElhinney Mar 31, 2023
ae7d4fd
Add logos for the stat cards.
JWFeatherstone Mar 31, 2023
aa61c05
Merge pull request #85 from JWFeatherstone/feature/images
SamanthaMcElhinney Mar 31, 2023
087e6e3
Add import statement to ensure activity data displays correctly.
JWFeatherstone Mar 31, 2023
b2a3f2c
Merge pull request #86 from JWFeatherstone/fix/activity-display
SamanthaMcElhinney Mar 31, 2023
bffb4df
Refactor User class for formatting
SamanthaMcElhinney Mar 31, 2023
fff708c
Add testing for all user properties, import test data and refactor to…
SamanthaMcElhinney Mar 31, 2023
9db5024
Add some styling to the stat card and some minor changes to their inn…
asutherland91 Mar 31, 2023
d53320c
Add more styling elements to stat cards
asutherland91 Apr 1, 2023
9017d14
Add src/class/Ac
SamanthaMcElhinney Apr 1, 2023
d6c09b2
Add method to display user's friend's by name
SamanthaMcElhinney Apr 1, 2023
3adf242
Add larger testing data for required user's id for method to calculat…
SamanthaMcElhinney Apr 1, 2023
af1d3da
Add method for testing returning users by name, refactor functions fo…
SamanthaMcElhinney Apr 1, 2023
5320164
Add testing for all properties of the user and refactor testing to in…
SamanthaMcElhinney Apr 1, 2023
beae5ba
Merge pull request #88 from JWFeatherstone/refactor/classes-tests
asutherland91 Apr 1, 2023
101691a
Add heading to activity card and change name for article
hjawad22 Apr 1, 2023
8030890
Add function to display chart
hjawad22 Apr 1, 2023
d56d57e
Add method to display minutes
hjawad22 Apr 1, 2023
3e6029f
Merge pull request #89 from JWFeatherstone/feature/activity-class-chart
SamanthaMcElhinney Apr 1, 2023
8451f63
Refactor formatting for activity class
SamanthaMcElhinney Apr 1, 2023
a3e3fd1
Refactor formatting and add methodf for testing weekly minutes
SamanthaMcElhinney Apr 1, 2023
d8ffd7a
Refactor for naming and spacing
SamanthaMcElhinney Apr 1, 2023
49a4b3a
Refactor naming and indentation
SamanthaMcElhinney Apr 1, 2023
dc3780d
Refactor for spacing and indentation
SamanthaMcElhinney Apr 1, 2023
0690aa0
Refactor for spacing and indentation
SamanthaMcElhinney Apr 1, 2023
636c7d4
Refactor testing for more robust test
SamanthaMcElhinney Apr 1, 2023
d5ae1dc
Refactor spacing/ indentation
SamanthaMcElhinney Apr 1, 2023
b96a4a5
Refactor for spacing and indentation
SamanthaMcElhinney Apr 1, 2023
b186fe5
Merge pull request #91 from JWFeatherstone/feature/refactor-hydration…
JWFeatherstone Apr 1, 2023
e3375d0
Adds initial user card design, adds function to populate friends list…
JWFeatherstone Apr 2, 2023
8e6de6d
Adds formatting to the user welcome at the top of the page, removes d…
JWFeatherstone Apr 2, 2023
54e6ef8
Merge pull request #92 from JWFeatherstone/feature/user-profile-card
hjawad22 Apr 2, 2023
c58c7ce
Add finalized styling for the stat cards
asutherland91 Apr 2, 2023
05f97f6
Merge branch 'main' into feature/user-welcome
SamanthaMcElhinney Apr 2, 2023
2e17753
Merge pull request #93 from JWFeatherstone/feature/user-welcome
SamanthaMcElhinney Apr 2, 2023
4189343
Merge branch 'main' of github.com:JWFeatherstone/fitlit-adriane-houda…
asutherland91 Apr 2, 2023
eab8cb6
Merge pull request #94 from JWFeatherstone/feature/stat-cards-css
hjawad22 Apr 2, 2023
d2c715a
Add set up activity button with styling
asutherland91 Apr 2, 2023
6ef83cd
Merge pull request #95 from JWFeatherstone/feature/stat-cards-css
hjawad22 Apr 2, 2023
c0c9e05
Add color change to cards and fix formatting
hjawad22 Apr 2, 2023
68897b6
Add changes to step goal test that match the changes made to step goa…
hjawad22 Apr 2, 2023
a4bcd28
Merge pull request #96 from JWFeatherstone/feature/css
SamanthaMcElhinney Apr 2, 2023
592a7a7
Add consistant formatting to HTML classes and ID naming, will also re…
asutherland91 Apr 2, 2023
9523ba0
Add a random user on page load, and use todays date
asutherland91 Apr 2, 2023
810389e
Merge pull request #98 from JWFeatherstone/feature/random-users-and-date
SamanthaMcElhinney Apr 2, 2023
e1f29d8
Matches sizing to outline, removes breaks from scripts, adds or remov…
JWFeatherstone Apr 2, 2023
b6a9747
Merge branch 'main' into feature/CSS-alignment-sizing
JWFeatherstone Apr 2, 2023
7e48bd1
Merge pull request #99 from JWFeatherstone/feature/CSS-alignment-sizing
hjawad22 Apr 2, 2023
4a13538
Fix references in DOM manipulation functions to display cards and cha…
JWFeatherstone Apr 2, 2023
a04a41a
Merge pull request #100 from JWFeatherstone/fix/card-issues
SamanthaMcElhinney Apr 2, 2023
dfb34e7
Update alt text following accessibility check
SamanthaMcElhinney Apr 3, 2023
d61ef30
Add language
SamanthaMcElhinney Apr 3, 2023
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
Prev Previous commit
Next Next commit
Add consistant formatting to HTML classes and ID naming, will also re…
…move hydration and user data files
asutherland91 committed Apr 2, 2023
commit 592a7a72029b6e4884092376434791e425d4029d
4 changes: 2 additions & 2 deletions dist/index.html
Original file line number Diff line number Diff line change
@@ -43,8 +43,8 @@ <h2 class="welcome-header">Hello</h2>
<article class="all-time-sleep-data-js"></article>
<article id="weekly-sleep-hours-data-js"></article>
<div class="button-wrapper">
<button class="sleep-button" id="hours-slept-button">Weekly Hours Slept</button>
<button class="sleep-button" id="weekly-sleep-quality-button">Weekly Sleep Quality</button>
<button class="sleep-button" id="hoursSleptButton">Weekly Hours Slept</button>
<button class="sleep-button" id="weeklySleepQualityButton">Weekly Sleep Quality</button>
</div>
</section>
<section class="user-card">
Loading