Code

Ryan#244

Code

Open

ShreddedPork wants to merge 67 commits intoFullstackAcademy:mainFullstackAcademy/boilermaker:mainfrom 2201-GraceShopper-CharmanderChargers:ryan2201-GraceShopper-CharmanderChargers/boilermaker-transition-Take2:ryanCopy head branch name to clipboard

+20,186-4,630

Commits

Commits on Mar 3, 2022

• FRIGGIN FINALLY YEEEEEE

  ShreddedPork

  committed
  6cb5308

  Copy full SHA for 6cb5308

• fixed bootstrap issue

  7dunham22

  committed
  016e48b

  Copy full SHA for 016e48b

• single pizza add-to-cart button renders cart

  7dunham22

  committed
  2961db7

  Copy full SHA for 2961db7

• cart total rounds two decimal places

  7dunham22

  committed
  a64f106

  Copy full SHA for a64f106

• cleaned up with authentication

  bgskinner3

  committed
  43d074b

  Copy full SHA for 43d074b

• Merge pull request #2 from 2201-GraceShopper-CharmanderChargers/brennan

  Show description for e256df5
  bgskinner3

  authored
  e256df5

  Copy full SHA for e256df5

• Merge branch 'main' of github.com:2201-GraceShopper-CharmanderChargers/boilermaker-transition-Take2

  7dunham22

  committed
  c1cf3e8

  Copy full SHA for c1cf3e8

• resolving issues in vs code

  bgskinner3

  committed
  2c4a140

  Copy full SHA for 2c4a140

• Merge pull request #3 from 2201-GraceShopper-CharmanderChargers/brennan

  Show description for a357083
  bgskinner3

  authored
  a357083

  Copy full SHA for a357083

• merging

  ShreddedPork

  committed
  a112b07

  Copy full SHA for a112b07

• Merge pull request #4 from 2201-GraceShopper-CharmanderChargers/tester

  Show description for f04220f
  ShreddedPork

  authored
  f04220f

  Copy full SHA for f04220f

• Merge branch 'main' of github.com:2201-GraceShopper-CharmanderChargers/boilermaker-transition-Take2

  7dunham22

  committed
  b465520

  Copy full SHA for b465520

• Merge remote-tracking branch 'origin/main' into David

  7dunham22

  committed
  0c6ba3f

  Copy full SHA for 0c6ba3f

• working on fixing merge

  7dunham22

  committed
  2ba4be1

  Copy full SHA for 2ba4be1

• fixed the cart table styles

  7dunham22

  committed
  53eb70e

  Copy full SHA for 53eb70e

• Merge pull request #7 from 2201-GraceShopper-CharmanderChargers/David

  Show description for 4937c3f
  7dunham22

  authored
  4937c3f

  Copy full SHA for 4937c3f

• changed PizzaCard to react component => button adds to cart

  7dunham22

  committed
  16cb783

  Copy full SHA for 16cb783

• cart formatting and structure

  7dunham22

  committed
  c404505

  Copy full SHA for c404505

• gratekeeping file and more authorization

  bgskinner3

  committed
  b6557bd

  Copy full SHA for b6557bd

• Merge pull request #8 from 2201-GraceShopper-CharmanderChargers/brennan

  Show description for 3713ad2
  bgskinner3

  authored
  3713ad2

  Copy full SHA for 3713ad2

• go to checkout button

  7dunham22

  committed
  ecce043

  Copy full SHA for ecce043

• Merge branch 'main' of github.com:2201-GraceShopper-CharmanderChargers/boilermaker-transition-Take2 into David

  7dunham22

  committed
  9538415

  Copy full SHA for 9538415

• stylized forms

  ShreddedPork

  committed
  43aaa89

  Copy full SHA for 43aaa89

• Merge pull request #9 from 2201-GraceShopper-CharmanderChargers/David

  Show description for 56f9f91
  7dunham22

  authored
  56f9f91

  Copy full SHA for 56f9f91

• added changes

  ShreddedPork

  committed
  1b09802

  Copy full SHA for 1b09802

• Merge pull request #10 from 2201-GraceShopper-CharmanderChargers/ryan

  Show description for d4d4a02
  ShreddedPork

  authored
  d4d4a02

  Copy full SHA for d4d4a02

• Merge branch 'main' of github.com:2201-GraceShopper-CharmanderChargers/boilermaker-transition-Take2 into David

  7dunham22

  committed
  52fe8f6

  Copy full SHA for 52fe8f6

Commits on Mar 4, 2022

• added homepage compoenent and updated the navlink to seperate what a loggedin user can see and what a guest can see

  bgskinner3

  committed
  4306aac

  Copy full SHA for 4306aac

• button on pizzacard shows overlay for 5 seconds

  7dunham22

  committed
  2e85b0a

  Copy full SHA for 2e85b0a

• more work on the cart

  7dunham22

  committed
  0b18ab2

  Copy full SHA for 0b18ab2

• started checkout, fixed routes in navbar to point to a user logged in or not, made homepage

  bgskinner3

  committed
  c04e3c3

  Copy full SHA for c04e3c3

• checkout cart updated

  bgskinner3

  committed
  7f51d49

  Copy full SHA for 7f51d49

• Merge pull request #11 from 2201-GraceShopper-CharmanderChargers/brennan

  Show description for 19dfb57
  bgskinner3

  authored
  19dfb57

  Copy full SHA for 19dfb57

• Merge branch 'main' of github.com:2201-GraceShopper-CharmanderChargers/boilermaker-transition-Take2 into David

  7dunham22

  committed
  3945906

  Copy full SHA for 3945906

• Merge pull request #12 from 2201-GraceShopper-CharmanderChargers/David

  Show description for b0b11c4
  7dunham22

  authored
  b0b11c4

  Copy full SHA for b0b11c4

• checkout button on cart links to checkout page

  7dunham22

  committed
  5923dae

  Copy full SHA for 5923dae

• cart icon on navbar with badge indicating quantity

  7dunham22

  committed
  e61d37c

  Copy full SHA for e61d37c

• added icons to links on navbar

  7dunham22

  committed
  0b70fea

  Copy full SHA for 0b70fea

• more navbar icons

  7dunham22

  committed
  dcb2d45

  Copy full SHA for dcb2d45

• handled edit user page

  ShreddedPork

  committed
  ab16ffb

  Copy full SHA for ab16ffb

• Merge pull request #13 from 2201-GraceShopper-CharmanderChargers/David

  Show description for 7e40c20
  7dunham22

  authored
  7e40c20

  Copy full SHA for 7e40c20

• fixed models added full address, styled the checkoutpage and added link from checkout

  bgskinner3

  committed
  4be6c79

  Copy full SHA for 4be6c79

• merging

  bgskinner3

  committed
  01215b3

  Copy full SHA for 01215b3

• finishing the merge

  bgskinner3

  committed
  aa14606

  Copy full SHA for aa14606

• Merge pull request #14 from 2201-GraceShopper-CharmanderChargers/brennan

  Show description for 76d88d2
  bgskinner3

  authored
  76d88d2

  Copy full SHA for 76d88d2

• added david and brennans changes

  ShreddedPork

  committed
  c148bbb

  Copy full SHA for c148bbb

• modified pkg Json and navbar

  ShreddedPork

  committed
  79c9582

  Copy full SHA for 79c9582

• Merge pull request #15 from 2201-GraceShopper-CharmanderChargers/ryan

  Show description for b36327b
  ShreddedPork

  authored
  b36327b

  Copy full SHA for b36327b

• Merge branch 'main' of github.com:2201-GraceShopper-CharmanderChargers/boilermaker-transition-Take2 into David

  7dunham22

  committed
  9240a2b

  Copy full SHA for 9240a2b

Commits on Mar 5, 2022

• added new products and changed cart to render new button when not logged in

  bgskinner3

  committed
  42f0da6

  Copy full SHA for 42f0da6

• Signup creates new cart as pending order. Adding item to cart creates new OrderItem associated with the order.

  7dunham22

  committed
  40d5e78

  Copy full SHA for 40d5e78

• fixed the allpizzas page, all cards are now the same hieght and width

  bgskinner3

  committed
  358129e

  Copy full SHA for 358129e

• beginning of the filtering, before finsihing going to attempt to convert the all pizzas view to use hooks

  bgskinner3

  committed
  9273c51

  Copy full SHA for 9273c51

Commits on Mar 6, 2022

• added hooks to the all pizzas view and included the filter options as well

  bgskinner3

  committed
  148f532

  Copy full SHA for 148f532

• cart updates orderItems. Cart is unique to each user, loads on login.

  7dunham22

  committed
  51cdfbf

  Copy full SHA for 51cdfbf

• fixed some issues with possible injection attacks, as well as added secret seed, added find user by token

  bgskinner3

  committed
  7b93a22

  Copy full SHA for 7b93a22

• fixed routes associated with linking carts to user profiles

  7dunham22

  committed
  bba8fe5

  Copy full SHA for bba8fe5

• correction: There should be no 'guest' cart. Their orders are only created upon checkout.

  7dunham22

  committed
  562dbea

  Copy full SHA for 562dbea

• changed user.js in store to auth and added a user.js to store

  bgskinner3

  committed
  022503e

  Copy full SHA for 022503e

• minior change to routes page

  bgskinner3

  committed
  1296879

  Copy full SHA for 1296879

Commits on Mar 7, 2022

• link added to confimation of checkout

  bgskinner3

  committed
  c4d477e

  Copy full SHA for c4d477e

• connected to admin page

  bgskinner3

  committed
  a4d59c9

  Copy full SHA for a4d59c9

• Merge pull request #16 from 2201-GraceShopper-CharmanderChargers/brennan

  Show description for 84b3208
  bgskinner3

  authored
  84b3208

  Copy full SHA for 84b3208

• resolved conflicts b/w David and Brennan

  7dunham22

  committed
  c1acea6

  Copy full SHA for c1acea6

• changed the process for loading the cart. Now it happens on loading the homepage.

  7dunham22

  committed
  b2d85c6

  Copy full SHA for b2d85c6

• Merge pull request #17 from 2201-GraceShopper-CharmanderChargers/David

  Show description for 5f73cc8
  7dunham22

  authored
  5f73cc8

  Copy full SHA for 5f73cc8

• order history pages and backend

  ShreddedPork

  committed
  513c1eb

  Copy full SHA for 513c1eb