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

Feature/readme #384

Open
wants to merge 222 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
222 commits
Select commit Hold shift + click to select a range
a8414f8
Add user class skeleton
cieragrace Dec 3, 2022
cd4d448
Add User test pseudocode
cieragrace Dec 3, 2022
6ae0b7f
Merge pull request #1 from cieragrace/feature/user-class
crgweller Dec 3, 2022
16d19d7
Add UserRepo pseudocode
keenans1 Dec 3, 2022
671a0bb
Add UserRepo test pseudocode
keenans1 Dec 3, 2022
4a5f327
Merge pull request #2 from cieragrace/feature/user_repo
cieragrace Dec 3, 2022
77498bb
Create basic HTML skeleton
AnnaPete Dec 3, 2022
ea1d77b
Comment out alert message
AnnaPete Dec 3, 2022
7c0bc47
is a function test
crgweller Dec 3, 2022
fb33de5
instantiate a user test
crgweller Dec 3, 2022
f9be920
userdata parameter test
crgweller Dec 3, 2022
c2614fa
userdata id test
crgweller Dec 3, 2022
c189d69
Change id numbers to match index positions
AnnaPete Dec 3, 2022
3a08f23
add userdata name test
crgweller Dec 3, 2022
dbfc32b
add user address test
crgweller Dec 3, 2022
cbf0fb5
Merge pull request #3 from cieragrace/feature/basic-html
cieragrace Dec 3, 2022
5724ad2
add user email test
crgweller Dec 3, 2022
389245f
add user stridelength test
crgweller Dec 3, 2022
a54fb50
add user step goal test
crgweller Dec 3, 2022
c7df35b
add user friends test
crgweller Dec 3, 2022
0983f01
update testing parameter names
crgweller Dec 3, 2022
f0dbdd5
update some syntax
crgweller Dec 3, 2022
c01e998
refactor and add beforeeach
crgweller Dec 3, 2022
15916ff
Merge pull request #4 from cieragrace/feature/users.js-testing
keenans1 Dec 3, 2022
046d2f7
Add getFirstName method
cieragrace Dec 3, 2022
a952749
Add new instance test
cieragrace Dec 3, 2022
25c22f6
Add take in data test
cieragrace Dec 3, 2022
c2692bb
Add id supplies data test
cieragrace Dec 3, 2022
8650f22
Add average stap method test
cieragrace Dec 3, 2022
96e0158
Merge pull request #5 from cieragrace/feature/userRepository-testing
AnnaPete Dec 3, 2022
9066a49
Add classes to grid elements
AnnaPete Dec 3, 2022
46a200f
Add css styling to grid items
AnnaPete Dec 3, 2022
7dcfa5d
Merge pull request #6 from cieragrace/feature/basic-css
cieragrace Dec 3, 2022
be97505
Add user1 instance to test file
keenans1 Dec 4, 2022
5c87e16
Add user2 instance to test
keenans1 Dec 4, 2022
bc9c557
Add user3 instance to test file
keenans1 Dec 4, 2022
b645a97
Add skips to all tests and pass first test
keenans1 Dec 4, 2022
f95b201
Add beforeEach
AnnaPete Dec 4, 2022
078abff
Pass class instantiation and parameter testing
keenans1 Dec 4, 2022
0c20f09
Pass test 4
keenans1 Dec 4, 2022
743a9b7
Pass user test number 5
keenans1 Dec 4, 2022
0c08729
Pass address test
keenans1 Dec 4, 2022
2bca2ac
Pass email test
keenans1 Dec 4, 2022
052e015
Pass stride length test
keenans1 Dec 4, 2022
6c7ffa1
Pass step goal test
keenans1 Dec 4, 2022
63f1c90
Pass friends test
keenans1 Dec 4, 2022
f40e2b8
Add getFirstName method and pass corresponding test
keenans1 Dec 4, 2022
a0a8ed8
Remove all comments
keenans1 Dec 4, 2022
270eb5a
Merge pull request #7 from cieragrace/feature/user-test-buildout
crgweller Dec 4, 2022
a4175f2
Add beforeEach to user repo
AnnaPete Dec 4, 2022
de41607
Merge branch 'main' into feature/build-user-repo
cieragrace Dec 4, 2022
c1a589b
Merge pull request #8 from cieragrace/feature/build-user-repo
crgweller Dec 4, 2022
102af27
Pass tests
AnnaPete Dec 4, 2022
11402f2
Write and pass test on line 43
AnnaPete Dec 4, 2022
5f27c9e
Write and pass test for avg step goal
AnnaPete Dec 4, 2022
f73e578
Add methods for getData and stepGoalAverage
AnnaPete Dec 4, 2022
22957ea
Merge pull request #9 from cieragrace/feature/build-user-repo
cieragrace Dec 4, 2022
647d5e5
Add imports and getUser method start
cieragrace Dec 5, 2022
dd7ffc4
Add commented out section names
cieragrace Dec 5, 2022
e29635d
Add infoBox query selector
cieragrace Dec 5, 2022
8951594
Connect HTML to DOM
cieragrace Dec 5, 2022
be1aee5
Add and remove scripts.js
cieragrace Dec 5, 2022
e814a15
Add export
cieragrace Dec 5, 2022
551c2cc
Add formatting
cieragrace Dec 5, 2022
3f21165
Merge pull request #10 from cieragrace/feat/iteration-1-dashboard
AnnaPete Dec 5, 2022
d31a831
Add HTML titles to grid boxes
cieragrace Dec 5, 2022
ff29ac9
Add event listers and query selectors
cieragrace Dec 5, 2022
2ee4588
Write fetch call for all data
AnnaPete Dec 6, 2022
1e48ef4
Write promise all, refactor getUser function
AnnaPete Dec 6, 2022
0834a6e
Move .catch statement to scripts file
AnnaPete Dec 6, 2022
74213ae
Refactor getUser function to get a current user
AnnaPete Dec 6, 2022
41a0876
Merge pull request #11 from cieragrace/layout/query-selectors
crgweller Dec 6, 2022
65658e4
add a user class instantiation
crgweller Dec 6, 2022
72185a0
add user name display
crgweller Dec 6, 2022
1280e0b
update getfirstname function
crgweller Dec 6, 2022
85bb263
display most users info
crgweller Dec 6, 2022
dc027f6
add user repo class instantiation
crgweller Dec 6, 2022
c804384
add users friends function and update getdata function
crgweller Dec 6, 2022
5aa82ef
refactor to remove console logs
crgweller Dec 6, 2022
f007b85
add dynamic step goal display
crgweller Dec 6, 2022
1d2cacf
add average step goal comparison
crgweller Dec 6, 2022
6968f17
Merge pull request #13 from cieragrace/feature/eventhandlers
AnnaPete Dec 6, 2022
40d5045
Merge branch 'main' into feature/fetch-calls
cieragrace Dec 6, 2022
e155976
Merge pull request #12 from cieragrace/feature/fetch-calls
cieragrace Dec 6, 2022
50ad33e
Debug errors in getAllData function
cieragrace Dec 7, 2022
6c80d9b
Comment out file to check API is working
cieragrace Dec 7, 2022
2f6ab87
Clean up formatting
cieragrace Dec 7, 2022
cb11837
Merge pull request #19 from cieragrace/cleanup/iteration2
crgweller Dec 7, 2022
879cbc5
Add parameters in getUser function
cieragrace Dec 7, 2022
3997568
Add tests for Sleep class
cieragrace Dec 7, 2022
1d5257d
Merge pull request #20 from cieragrace/feature/sleep-class
crgweller Dec 7, 2022
0075aa6
Fixed errors
AnnaPete Dec 7, 2022
11ff59a
Fixed errors and refactored code
AnnaPete Dec 7, 2022
4fb0dce
Begin writing code for avg daily water
AnnaPete Dec 7, 2022
1bfe06d
Refactored hydration sample data
AnnaPete Dec 7, 2022
e6bfbd4
Fix semicolons
cieragrace Dec 7, 2022
9a2dff5
Refactor getData method
cieragrace Dec 7, 2022
f7bb23c
Refactor failing methods
cieragrace Dec 7, 2022
e1c4e6b
update tests with API data
cieragrace Dec 7, 2022
9f0a0d9
Update instances
cieragrace Dec 7, 2022
2771cf2
refactor tests with API data
cieragrace Dec 7, 2022
08fa171
Add changes to methods
AnnaPete Dec 7, 2022
3a5f43a
Add changes to method test
AnnaPete Dec 7, 2022
8c310dc
Add minor changes
AnnaPete Dec 7, 2022
cc029b8
Merge pull request #27 from cieragrace/refactor-failing-tests
AnnaPete Dec 7, 2022
0b39f8b
Merge branch 'main' into feature/hydration-class
keenans1 Dec 7, 2022
15128a1
Merge pull request #28 from cieragrace/feature/hydration-class
keenans1 Dec 7, 2022
a065aad
Refactor user test structure
AnnaPete Dec 8, 2022
adb2895
Fix fetch call - promise
AnnaPete Dec 8, 2022
7b7271c
Add functionality to avg daily water method
AnnaPete Dec 8, 2022
a646f3f
Add functionality to getWaterPerDay method
AnnaPete Dec 8, 2022
77e89b0
Modify tests and add expect
AnnaPete Dec 8, 2022
0d4eaea
Add sleep test for avg hours
AnnaPete Dec 8, 2022
475cc9b
Merge pull request #29 from cieragrace/feature/hydration-class
cieragrace Dec 8, 2022
21818e5
Restructure user-repo-test
keenans1 Dec 8, 2022
568c313
fix return first name test
crgweller Dec 8, 2022
54eb656
update user data test
crgweller Dec 8, 2022
f789fb0
fix final user tests
crgweller Dec 8, 2022
5a79342
delete redundant code
crgweller Dec 8, 2022
71cd0bb
Merge pull request #30 from cieragrace/refactor_remaining_tests
cieragrace Dec 8, 2022
457c999
Remove unnecessary import
cieragrace Dec 8, 2022
5c5ff5c
Remove unnecessary import
cieragrace Dec 8, 2022
dfb8562
Add average overall sleep test frame
cieragrace Dec 8, 2022
436ce09
Add specig date hours slept test frame
cieragrace Dec 8, 2022
d789313
Add specific date sleep quality test frame
cieragrace Dec 8, 2022
6746b3f
Add given weekly sleep data test frame
cieragrace Dec 8, 2022
c10a2ab
Add given weekly sleep quality test frame
cieragrace Dec 8, 2022
e340815
Add overall sleep quality average test frame
cieragrace Dec 8, 2022
fc3c614
Refactor getAverageDailySleep method
cieragrace Dec 9, 2022
cc64292
Pass average sleep test
cieragrace Dec 9, 2022
72c246a
Merge pull request #31 from cieragrace/final-broken-test
crgweller Dec 9, 2022
7c0f98a
Create getOverallSleepAvg method
keenans1 Dec 9, 2022
9e6e0cf
Complete getOverallQualityAvg method and pass test
keenans1 Dec 9, 2022
c37e0df
Add sleepOnSpecificDate method and pass corresponding test
keenans1 Dec 9, 2022
13287c7
Complete sleepQualityOnSPecificDate method
keenans1 Dec 9, 2022
525243d
Pass sleepQualityOnSPecificDate test
keenans1 Dec 9, 2022
4cdda30
Complete averageSleepQuality method
keenans1 Dec 9, 2022
3ac7e74
Pass averageSleepQuality
keenans1 Dec 9, 2022
89a9718
Merge pull request #32 from cieragrace/feature/user-sleep-methods
crgweller Dec 9, 2022
d9ed924
Add givenWeekSleepDataByDay method
keenans1 Dec 9, 2022
c64b811
Pass givenWeekSleepDataByDay test
keenans1 Dec 9, 2022
d8ea083
Refactor test for added instances
keenans1 Dec 9, 2022
9beaa4b
Complete givenWeekSleepDataByDay method
keenans1 Dec 9, 2022
f15f684
Pass givenWeekSleepDataByDay test
keenans1 Dec 9, 2022
6e8d477
Complete givenWeeksSleepQualityByDay method
keenans1 Dec 9, 2022
8464934
Pass givenWeeksSleepQualityByDay test
keenans1 Dec 9, 2022
2f75b8d
Pass getWeeklyConsumption test
keenans1 Dec 9, 2022
cb6d66c
Merge pull request #33 from cieragrace/feature/user-sleep-methods
crgweller Dec 9, 2022
28b00ba
add daily water intake display on dashboard
crgweller Dec 9, 2022
3bb496a
update hydration index
crgweller Dec 9, 2022
92c5f8e
refactor code for complex calculus
crgweller Dec 9, 2022
7eb8e56
Merge pull request #34 from cieragrace/feature/hydration-display
cieragrace Dec 9, 2022
b38fa8f
Refactor HTML to include an unordered list
AnnaPete Dec 10, 2022
3244d28
Fix typo in sleep quality method
AnnaPete Dec 10, 2022
e1641d2
Add sleep data to the DOM
AnnaPete Dec 10, 2022
ebc8f62
Modify HTML to include sleep history
AnnaPete Dec 10, 2022
64210c2
Add sleep history to the DOM
AnnaPete Dec 10, 2022
fb6396c
Delete some console logs
AnnaPete Dec 10, 2022
5c69e8d
Merge pull request #35 from cieragrace/feature/dom-manipulation
cieragrace Dec 10, 2022
11cddea
Refactor font size and height/width
keenans1 Dec 10, 2022
16edb7d
Refactor grid display format
keenans1 Dec 10, 2022
855959c
Refactor html organization
keenans1 Dec 10, 2022
8baf848
Refactor query selectors
keenans1 Dec 10, 2022
a3079af
Refactor html organization
keenans1 Dec 10, 2022
b0cf527
Refactor query selectors
keenans1 Dec 10, 2022
ce4e810
Merge pull request #36 from cieragrace/feature/refactor-css
cieragrace Dec 10, 2022
8ca8943
Add charts file
AnnaPete Dec 10, 2022
ba9d022
Add changes
AnnaPete Dec 10, 2022
43f3eb3
Add canvas for first chart
AnnaPete Dec 10, 2022
5ec2c29
Import chart file and invoke chart function
AnnaPete Dec 10, 2022
009a74e
Add size info to step goal chart
AnnaPete Dec 10, 2022
3553726
Delete commented out code
AnnaPete Dec 10, 2022
256dd36
Merge pull request #37 from cieragrace/feature/add-initial-chart
keenans1 Dec 10, 2022
0f10333
Add hydration class
crgweller Dec 10, 2022
17485c8
Add sleep history id
crgweller Dec 10, 2022
7cbfd8d
add weekly hydration id
crgweller Dec 10, 2022
e6ab515
add HTML canvas lines
crgweller Dec 10, 2022
42c5a64
refactor CSS gridbox
crgweller Dec 10, 2022
b4014aa
add step goal import
crgweller Dec 10, 2022
b97192e
add display step goal dynamic functioning
crgweller Dec 10, 2022
3422aa8
Merge pull request #39 from cieragrace/feature/widgets
AnnaPete Dec 10, 2022
2c198f3
Add daily hydration chart
cieragrace Dec 10, 2022
6295ed9
Add load charts function to scripts
cieragrace Dec 10, 2022
1ce11fc
Split daily sleep info
cieragrace Dec 10, 2022
781d240
Add dailySleep chart function
cieragrace Dec 10, 2022
5a3b089
Add data to widget on DOM
cieragrace Dec 10, 2022
f62b927
Refactor HTML ids
cieragrace Dec 11, 2022
b5d8612
Add sleep data to DOM
cieragrace Dec 11, 2022
fe643b7
Merge pull request #40 from cieragrace/feature/dailyHydration-widget
crgweller Dec 11, 2022
58f5d23
add avg sleep bar graph
crgweller Dec 11, 2022
7720008
add basic sleep info
crgweller Dec 11, 2022
fdfa61f
Add bar graph display
crgweller Dec 11, 2022
722a830
Add dynamic bar graph
crgweller Dec 11, 2022
64d9d1f
add avg user sleep function
crgweller Dec 11, 2022
7c13c09
Merge pull request #41 from cieragrace/feature/barGraphs
keenans1 Dec 11, 2022
fc3125f
Add labels to sleep graph
keenans1 Dec 11, 2022
c0b6562
Complete sleep display functions
keenans1 Dec 11, 2022
7b95dc0
Merge pull request #43 from cieragrace/keenans-fun-branch
crgweller Dec 11, 2022
6faef16
add unordered list to user info
crgweller Dec 11, 2022
8b170dd
replace displayUserInfo function
crgweller Dec 11, 2022
30d1d02
add weekly hydration id
crgweller Dec 11, 2022
cd96f2d
add weekly hydration function
crgweller Dec 11, 2022
aa195df
add weekly hydration page load function to DOM
crgweller Dec 11, 2022
c8e78f9
add allTimeSleepHistory function
crgweller Dec 11, 2022
2d3b097
add new canvas for all time sleep data
crgweller Dec 11, 2022
d68a285
refactor graph display ranges
crgweller Dec 11, 2022
258883f
refactor charts for sleep history function
crgweller Dec 11, 2022
2315644
Merge pull request #44 from cieragrace/feature/weekly-hydration
keenans1 Dec 11, 2022
aca6330
Delete all scripts console logs
keenans1 Dec 11, 2022
8c2ea16
Delete all comments on scripts.js
keenans1 Dec 11, 2022
8de4136
Refactor scripts.js functions
keenans1 Dec 11, 2022
f1167c9
Refactor charts.js functions
keenans1 Dec 11, 2022
4ae64a3
Delete all charts.js comments
keenans1 Dec 11, 2022
086ceca
Delete all User.js console logs
keenans1 Dec 11, 2022
97b548b
Delete all User.js comments
keenans1 Dec 11, 2022
7067480
Delete all console logs and comments from UserRepository.js
keenans1 Dec 11, 2022
2b1362c
Delete user repo test comments
keenans1 Dec 11, 2022
b64b6ee
Change charts.js reds to orange
keenans1 Dec 11, 2022
b0701de
Delete comments on apiCalls.js
keenans1 Dec 11, 2022
470a8bc
Mostly finish the README
keenans1 Dec 11, 2022
aeb9958
Update README
keenans1 Dec 11, 2022
24f270d
Update README
keenans1 Dec 11, 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
Prev Previous commit
Next Next commit
Add changes to methods
  • Loading branch information
AnnaPete committed Dec 7, 2022

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 08fa171d5cee0f3697a6a2400de82e1a5afcfb81
2 changes: 1 addition & 1 deletion src/User.js
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ class User {

// Hydration
getAvgDailyWater(userID) {
console.log(this.hydrationData.hydrationData)
console.log('where are you', this.hydrationData)
}
}