Code

Feat/tc UI UX#426

Code

Open

tconey23 wants to merge 69 commits intoturingschool-examples:mainturingschool-examples/fitlit-starter-kit:mainfrom edwin-chalmers:feat/tc_UI_UXedwin-chalmers/fitlit:feat/tc_UI_UXCopy head branch name to clipboard

+1,726-25,780

Commits

Commits on Feb 5, 2024

• preliminary tests for user data and average step goals. Wireframe HTML input

  Show description for 5ad0e4b
  tconey23

  committed
  5ad0e4b

• Merge pull request #1 from edwin-chalmers/feat/toms_branch

  Show description for 096b47b
  edwin-chalmers

  authored
  096b47b

Commits on Feb 6, 2024

• First run of connecting webpack to HTML

  Show description for dc4f90a
  tconey23

  committed
  dc4f90a

• Merge pull request #2 from edwin-chalmers/feat/toms_branch

  Show description for bdf0543
  edwin-chalmers

  authored
  bdf0543

• bug fixes

  edwin-chalmers

  committed
  581bfd3

• Merge pull request #3 from edwin-chalmers/ed/bugs

  Show description for 0effc84
  edwin-chalmers

  authored
  0effc84

• refactor code and restructure files

  Virulencies

  committed
  ac4c824

• Merge branch 'main' into bugfix/refactor-and-restructure

  edwin-chalmers

  authored
  8dda76f

• Merge pull request #4 from edwin-chalmers/bugfix/refactor-and-restructure

  Show description for 304ad2d
  edwin-chalmers

  authored
  304ad2d

• bug fixes

  Show description for b68c825
  edwin-chalmers

  committed
  b68c825

• Merge pull request #5 from edwin-chalmers/ed/bugs

  Show description for 33d9761
  edwin-chalmers

  authored
  33d9761

• add css styling and paper texture

  Show description for 1084c18
  edwin-chalmers

  committed
  1084c18

• Merge pull request #6 from edwin-chalmers/ed/it1

  Show description for b043fe0
  tconey23

  authored
  b043fe0

Commits on Feb 7, 2024

• Add step goals with displayStepGoal() and compareStepGoalToAverage()

  Show description for 26dfd01
  edwin-chalmers

  committed
  26dfd01

• Merge pull request #7 from edwin-chalmers/ed/it1

  Show description for eec7c62
  tconey23

  authored
  eec7c62

• added respetive functions to display user info

  Show description for 7996a83
  edwin-chalmers

  committed
  7996a83

• Merge pull request #8 from edwin-chalmers/ed/it1

  Show description for ad111fa
  Virulencies

  authored
  ad111fa

• slight CSS adjustments

  Show description for e171bae
  edwin-chalmers

  committed
  e171bae

• Merge pull request #9 from edwin-chalmers/ed/it1

  Show description for 11bce7f
  Virulencies

  authored
  11bce7f

• Improved background image CSS and added dynamic updates to the stepChart. **Note that this will update the webpack bundle as npm chart.js has been installed**

  tconey23

  committed
  931e8a9

• Add files with some respective tests for domUpdates and scriptes

  edwin-chalmers

  committed
  0492a11

• Fixed merge conflicts, installed charts.js, updated CSS and other formatting for stepChart

  tconey23

  committed
  c10f608

• Merge branch 'main' into feat/toms_branch

  tconey23

  authored
  12faa4f

• Fixed merge conflicts

  tconey23

  committed
  01911ce

• Merge pull request #10 from edwin-chalmers/ed/tests

  Show description for 4157242
  Virulencies

  authored
  4157242

• Merge pull request #11 from edwin-chalmers/feat/toms_branch

  Show description for c971294
  Virulencies

  authored
  c971294

Commits on Feb 8, 2024

• Add average hydration function

  Show description for 8c7ff1b
  Virulencies

  committed
  8c7ff1b

• Add hydration functions

  Show description for 8ed3df6
  Virulencies

  committed
  8ed3df6

• Merge pull request #12 from edwin-chalmers/feat/hydration-functions

  Show description for f00ff4a
  Virulencies

  authored
  f00ff4a

• resolved merge conflicts

  tconey23

  committed
  7f293c6

• added new CSS and moved chart set up to its own file

  tconey23

  committed
  35352ad

• updated background image and chart setup file.

  tconey23

  committed
  e03ca4b

• Merge pull request #19 from edwin-chalmers/feat/tc_it2

  Show description for 7536ad8
  edwin-chalmers

  authored
  7536ad8

Commits on Feb 9, 2024

• Adjusted code for hydration data

  tconey23

  committed
  b10abdd

• Merge pull request #20 from edwin-chalmers/feat/tc_it2

  Show description for 5b51b37
  Virulencies

  authored
  5b51b37

• Fix hydration logic and set up dom interaction

  Show description for a99eff7
  Virulencies

  committed
  a99eff7

• Merge branch 'main' into feat/hydration-DOM-interactions

  Virulencies

  authored
  5d498cf

• Merge pull request #21 from edwin-chalmers/feat/hydration-DOM-interactions

  Show description for fbb1993
  tconey23

  authored
  fbb1993

• Add test files, hydration DOM updates, and charts to hydration

  Show description for ea012ba
  Virulencies

  committed
  ea012ba

• Co-authored-by: Edwin Chalmers <[email protected]>

  Show description for a4f96f8
  tconey23

  committed
  a4f96f8

• Merge pull request #22 from edwin-chalmers/feat/hydration-charts-added-and-functionality

  Show description for 96847ca
  tconey23

  authored
  96847ca

• add tests for the first four functions in scripts.js

  edwin-chalmers

  committed
  ea9751e

• Merge pull request #23 from edwin-chalmers/ed/tests

  Show description for b17ebe9
  tconey23

  authored
  b17ebe9

Commits on Feb 10, 2024

• Fixed hydration data scripts and domupdates

  Show description for 0e879e7
  tconey23

  committed
  0e879e7

• Merge pull request #24 from edwin-chalmers/feat/hydration_bug_fix

  Show description for db79ae1
  Virulencies

  authored
  db79ae1

• Finish hydration functionality

  Show description for b7d0650
  Virulencies

  committed
  b7d0650

• Merge pull request #25 from edwin-chalmers/feat/complete-iteration2

  Show description for b7fbf40
  edwin-chalmers

  authored
  b7fbf40

• Add fetch functions to api calls and linked files

  Show description for dd50166
  Virulencies

  committed
  dd50166

• Merge pull request #30 from edwin-chalmers/feat/fetch-implementation

  Show description for bb78a5e
  tconey23

  authored
  bb78a5e

Commits on Feb 11, 2024

• Work towards api call fix

  Show description for 36d6c06
  Virulencies

  committed
  36d6c06

• Merge pull request #31 from edwin-chalmers/bugfix/need-to-fix-calls

  Show description for 1fd8238
  edwin-chalmers

  authored
  1fd8238

• More work towards api call fix

  Show description for 96b7e59
  Virulencies

  committed
  96b7e59

• Merge pull request #32 from edwin-chalmers/bugfix/need-to-fix-calls

  Show description for 62616ef
  edwin-chalmers

  authored
  62616ef

• continue fetch fub fixes, add getAverageSleepQuality, getAverageSleepHours

  Show description for 78ff79b
  edwin-chalmers

  committed
  78ff79b

• Merge pull request #33 from edwin-chalmers/it4/scripts

  Show description for 1dfd6ef
  tconey23

  authored
  1dfd6ef

• continue bug fixes for it3

  Show description for e78efab
  edwin-chalmers

  committed
  e78efab

• Merge pull request #34 from edwin-chalmers/it4/scripts

  Show description for 7a19cba
  tconey23

  authored
  7a19cba

• Add the resptive function for it 4

  Show description for 8e6947b
  edwin-chalmers

  committed
  8e6947b

• Merge pull request #42 from edwin-chalmers/it4/scripts

  Show description for 5399d7b
  Virulencies

  authored
  5399d7b

Commits on Feb 12, 2024

• Start tests or sleep, and continue functionality for sleep charts

  Show description for 5af5122
  edwin-chalmers

  committed
  5af5122

• Merge pull request #47 from edwin-chalmers/ed/it4/tests

  Show description for b3ba696
  tconey23

  authored
  b3ba696

• Adds a dynamic menu bar that moves to the side of the card when scrolled

  Show description for 1391557
  edwin-chalmers

  committed
  1391557

• Merge pull request #48 from edwin-chalmers/ed/it4/tests

  Show description for b9ef0d2
  tconey23

  authored
  b9ef0d2

• Add/clean up UX ad functionality

  tconey23

  committed
  13661d3

• Add further UI/UX updates

  tconey23

  committed
  6b9439f

• Merge branch 'main' into feat/tc_UI_UX

  tconey23

  authored
  4979a79

• Merge pull request #50 from edwin-chalmers/feat/tc_UI_UX

  Show description for 2311f62
  Virulencies

  authored
  2311f62

Commits on Feb 13, 2024

• Cleanup and polish pass

  tconey23

  committed
  148e123

• Code cleanup

  tconey23

  committed
  fe23853