Code

Eivind branch#20

Code

Open

EivindDelFierro wants to merge 83 commits intoStretchly:mainStretchly/Stretch.io:mainfrom Team-Flexios:Eivind-branchTeam-Flexios/Flexios:Eivind-branchCopy head branch name to clipboard

+1,633-292

Commits

Commits on Jul 3, 2023

• backend is ... in existence

  paglenn

  committed
  93679e1

  Copy full SHA for 93679e1

Commits on Jul 4, 2023

• Merge pull request #1 from StabRabbit41/paul-backend-fix

  Show description for 4a64617
  JasonY000

  authored
  4a64617

  Copy full SHA for 4a64617

• initial frontend possible webpack issue

  morahgeist

  committed
  5f836f6

  Copy full SHA for 5f836f6

Commits on Jul 5, 2023

• created userCreate and tests

  paglenn

  committed
  69fe8f6

  Copy full SHA for 69fe8f6

• delete user functionality and associated testing

  paglenn

  committed
  0769e8b

  Copy full SHA for 0769e8b

• Merge pull request #2 from StabRabbit41/paul-user-create

  Show description for 8d256d3
  paglenn

  authored
  8d256d3

  Copy full SHA for 8d256d3

• working website

  EivindDelFierro

  committed
  be45089

  Copy full SHA for be45089

• working website

  EivindDelFierro

  committed
  c4b2b6d

  Copy full SHA for c4b2b6d

• merged tests

  EivindDelFierro

  committed
  d1b0f71

  Copy full SHA for d1b0f71

• Co-authored-by: Morah Geist <[email protected]>

  EivindDelFierro

  committed
  e599aa6

  Copy full SHA for e599aa6

• fixed package.json

  EivindDelFierro

  committed
  f395c8b

  Copy full SHA for f395c8b

• user-auth-tests

  paglenn

  committed
  4587ce8

  Copy full SHA for 4587ce8

• Merge branch 'dev' into paul-user-auth-tests

  paglenn

  committed
  6ed98e1

  Copy full SHA for 6ed98e1

• completed authUser in userController

  JasonY000

  committed
  393faa5

  Copy full SHA for 393faa5

• Merge pull request #4 from StabRabbit41/paul-user-auth-tests

  Show description for 81add06
  dianemoon

  authored
  81add06

  Copy full SHA for 81add06

• Merge branch 'dev' into jasonBranch

  Show description for e625af4
  JasonY000

  committed
  e625af4

  Copy full SHA for e625af4

• authUser passed tests

  JasonY000

  committed
  74eeacd

  Copy full SHA for 74eeacd

• Merge pull request #5 from StabRabbit41/jasonBranch

  Show description for b5942b7
  paglenn

  authored
  b5942b7

  Copy full SHA for b5942b7

• test for adding favorites

  paglenn

  committed
  c143232

  Copy full SHA for c143232

• Added the addFavorite middleware in userController. Added the patch request to update favorites for a user.

  dianemoon

  committed
  5804543

  Copy full SHA for 5804543

• communicating with server, working menu, cards rendering

  EivindDelFierro

  committed
  5673306

  Copy full SHA for 5673306

• Merge pull request #6 from StabRabbit41/paul-favorite-test

  Show description for e37405b
  paglenn

  authored
  e37405b

  Copy full SHA for e37405b

• test passes for addFavorite

  dianemoon

  committed
  a8c3d6a

  Copy full SHA for a8c3d6a

• Merge pull request #7 from StabRabbit41/diane-branch

  Show description for 753d84c
  JasonY000

  authored
  753d84c

  Copy full SHA for 753d84c

• creating middleware for server.js, stepping away for lunch

  dianemoon

  committed
  d41b335

  Copy full SHA for d41b335

• added cors and some statuses

  paglenn

  committed
  b9e4afb

  Copy full SHA for b9e4afb

• Merge pull request #8 from StabRabbit41/paul-cors-and-status

  Show description for 3ba2d14
  EivindDelFierro

  authored
  3ba2d14

  Copy full SHA for 3ba2d14

• updated header files

  EivindDelFierro

  committed
  b3b07c4

  Copy full SHA for b3b07c4

• Merge branch 'dev' into Eivind-branch

  EivindDelFierro

  committed
  c4739a0

  Copy full SHA for c4739a0

• Merge pull request #9 from StabRabbit41/Eivind-branch

  Show description for 7c17ff2
  paglenn

  authored
  7c17ff2

  Copy full SHA for 7c17ff2

• staged

  EivindDelFierro

  committed
  330a1d8

  Copy full SHA for 330a1d8

• Merge branch 'dev' into Eivind-branch

  EivindDelFierro

  committed
  3745565

  Copy full SHA for 3745565

• Merge pull request #10 from StabRabbit41/Eivind-branch

  Show description for c2e3ca4
  dianemoon

  authored
  c2e3ca4

  Copy full SHA for c2e3ca4

• im not sure abotu this commit

  dianemoon

  committed
  2a7e276

  Copy full SHA for 2a7e276

• Merge branch 'dev' into Diane-branch

  dianemoon

  committed
  3dd2d31

  Copy full SHA for 3dd2d31

• update

  JasonY000

  committed
  047e229

  Copy full SHA for 047e229

• Created base login/signup and welcomescreen app

  EivindDelFierro

  committed
  1722c92

  Copy full SHA for 1722c92

• backend request for html

  paglenn

  committed
  497b143

  Copy full SHA for 497b143

• routed to correct file WelcomeScreen

  paglenn

  committed
  ee1db56

  Copy full SHA for ee1db56

• both routes

  paglenn

  committed
  1749187

  Copy full SHA for 1749187

• fixed css parsing error

  JasonY000

  committed
  828c4b6

  Copy full SHA for 828c4b6

• Merge pull request #11 from StabRabbit41/paul-backend-hookup

  Show description for ecb939e
  dianemoon

  authored
  ecb939e

  Copy full SHA for ecb939e

• 'merge webpack fix with dev'

  Show description for 3797f91
  JasonY000

  committed
  3797f91

  Copy full SHA for 3797f91

• Merge pull request #12 from StabRabbit41/jasonBranch

  Show description for 8c0b747
  paglenn

  authored
  8c0b747

  Copy full SHA for 8c0b747

• menuContainerTest created

  dianemoon

  committed
  16b3503

  Copy full SHA for 16b3503

• Working login and signup

  EivindDelFierro

  committed
  283fdf0

  Copy full SHA for 283fdf0

• menuContainerTest

  dianemoon

  committed
  1894d97

  Copy full SHA for 1894d97

• Merge branch 'dev' into Eivind-Branch.

  EivindDelFierro

  committed
  88d9707

  Copy full SHA for 88d9707

• Merge pull request #13 from StabRabbit41/Eivind-Branch

  Show description for 8b9caab
  dianemoon

  authored
  8b9caab

  Copy full SHA for 8b9caab

• yea

  dianemoon

  committed
  4d58730

  Copy full SHA for 4d58730

• Merge branch 'dev' into Diane-branch

  dianemoon

  committed
  9874a41

  Copy full SHA for 9874a41

• login component

  EivindDelFierro

  committed
  f06b3cf

  Copy full SHA for f06b3cf

Commits on Jul 6, 2023

• mg initial styles

  morahgeist

  committed
  a2788c4

  Copy full SHA for a2788c4

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

  morahgeist

  committed
  ae2355b

  Copy full SHA for ae2355b

• mg redone styles with fav icon and favorites menu item

  morahgeist

  committed
  05dc01d

  Copy full SHA for 05dc01d

• beginning of last day of iteration project

  dianemoon

  committed
  7caea2f

  Copy full SHA for 7caea2f

• improved exercise menu logic

  EivindDelFierro

  committed
  e899910

  Copy full SHA for e899910

• mg fav menu changed to btn

  morahgeist

  committed
  8e15a97

  Copy full SHA for 8e15a97

• Merge pull request #14 from StabRabbit41/mg-styles

  Show description for 8f55108
  EivindDelFierro

  authored
  8f55108

  Copy full SHA for 8f55108

• overlay working

  morahgeist

  committed
  13b8e11

  Copy full SHA for 13b8e11

• Merge pull request #15 from StabRabbit41/mg-styles

  Show description for 017fe10
  EivindDelFierro

  authored
  017fe10

  Copy full SHA for 017fe10

• Merge branch 'dev' into Eivind-Branch

  EivindDelFierro

  committed
  d919ce9

  Copy full SHA for d919ce9

• Merge pull request #16 from StabRabbit41/Eivind-Branch

  Show description for fe95698
  EivindDelFierro

  authored
  fe95698

  Copy full SHA for fe95698

• logout functionality

  paglenn

  committed
  8e2217b

  Copy full SHA for 8e2217b

• Merge pull request #17 from StabRabbit41/paul-logout

  Show description for 271e72b
  EivindDelFierro

  authored
  271e72b

  Copy full SHA for 271e72b

• Updated favorites buttons logic

  EivindDelFierro

  committed
  04e023a

  Copy full SHA for 04e023a

• Merge branch 'dev' into Eivind-branch

  EivindDelFierro

  committed
  23dc2a2

  Copy full SHA for 23dc2a2

• Merge branch 'dev' into diane-branch

  paglenn

  authored
  bf7d869

  Copy full SHA for bf7d869

• Merge pull request #18 from StabRabbit41/diane-branch

  Show description for b8ea53a
  paglenn

  authored
  b8ea53a

  Copy full SHA for b8ea53a

• Merge branch 'dev' into Eivind-branch

  EivindDelFierro

  committed
  4ec74c2

  Copy full SHA for 4ec74c2

• mg login screen and change font

  morahgeist

  committed
  188c33b

  Copy full SHA for 188c33b

• semi-working favorites render

  EivindDelFierro

  committed
  3eb1598

  Copy full SHA for 3eb1598

• Merge branch 'dev' into mg-styles

  paglenn

  authored
  6d797eb

  Copy full SHA for 6d797eb

• Merge pull request #19 from StabRabbit41/mg-styles

  Show description for 8d133bb
  paglenn

  authored
  8d133bb

  Copy full SHA for 8d133bb

• working timer

  morahgeist

  committed
  4aa6102

  Copy full SHA for 4aa6102

• add fade to welcome screen

  EivindDelFierro

  committed
  36f10ff

  Copy full SHA for 36f10ff

• Co-authored-by: Paul Glenn <[email protected]>

  EivindDelFierro

  committed
  70fa28d

  Copy full SHA for 70fa28d

• Merge pull request #20 from StabRabbit41/Eivind-branch

  Show description for 8c7bdae
  paglenn

  authored
  8c7bdae

  Copy full SHA for 8c7bdae

• Merge branch 'dev' into mgTimer

  EivindDelFierro

  authored
  de8abf2

  Copy full SHA for de8abf2

• Merge pull request #21 from StabRabbit41/mgTimer

  Show description for caf10af
  EivindDelFierro

  authored
  caf10af

  Copy full SHA for caf10af

• fixed some styles and stretch logic

  EivindDelFierro

  committed
  fe81918

  Copy full SHA for fe81918

• Merge branch 'dev' into Eivind-branch

  EivindDelFierro

  committed
  d6f076a

  Copy full SHA for d6f076a

• Clock has full functionality

  EivindDelFierro

  committed
  79b5957

  Copy full SHA for 79b5957