Code

Bump tmpl from 1.0.4 to 1.0.5#73

Code

Open

dependabot[bot] wants to merge 78 commits intomasterhildakh/ChicNGlam:masterfrom dependabot/npm_and_yarn/tmpl-1.0.5hildakh/ChicNGlam:dependabot/npm_and_yarn/tmpl-1.0.5Copy head branch name to clipboard

+20,327-12,306

Commits

Commits on Mar 16, 2020

• Bump acorn from 5.7.3 to 5.7.4

  Show description for a1de362
  dependabot[bot]

  authored
  a1de362

  Copy full SHA for a1de362

• Merge pull request #2 from hildakh/homepage/feature

  Show description for 44e41ca
  hildakh

  authored
  44e41ca

  Copy full SHA for 44e41ca

Commits on Mar 17, 2020

• Merge pull request #3 from hildakh/homepage/feature

  Show description for 732a657
  hildakh

  authored
  732a657

  Copy full SHA for 732a657

• Merge pull request #4 from hildakh/homepage/feature

  Show description for a7298d6
  hildakh

  authored
  a7298d6

  Copy full SHA for a7298d6

Commits on Mar 18, 2020

• Merge pull request #5 from hildakh/router/feature

  Show description for 9f4bb36
  hildakh

  authored
  9f4bb36

  Copy full SHA for 9f4bb36

• Merge pull request #6 from hildakh/shop/feature

  Show description for eb75ec8
  hildakh

  authored
  eb75ec8

  Copy full SHA for eb75ec8

Commits on Mar 19, 2020

• Merge pull request #7 from hildakh/previewcollection/feature

  Show description for ca29db7
  hildakh

  authored
  ca29db7

  Copy full SHA for ca29db7

• Merge pull request #8 from hildakh/item/collection

  Show description for 93531ae
  hildakh

  authored
  93531ae

  Copy full SHA for 93531ae

Commits on Mar 20, 2020

• Merge pull request #9 from hildakh/header/feature

  Show description for 53f3442
  hildakh

  authored
  53f3442

  Copy full SHA for 53f3442

Commits on Mar 21, 2020

• Merge pull request #10 from hildakh/signin/signup

  Show description for e054918
  hildakh

  authored
  e054918

  Copy full SHA for e054918

• Merge pull request #11 from hildakh/button/component

  Show description for 4bb8709
  hildakh

  authored
  4bb8709

  Copy full SHA for 4bb8709

• Merge pull request #12 from hildakh/firebase/setting

  Show description for bd616c5
  hildakh

  authored
  bd616c5

  Copy full SHA for bd616c5

• Merge pull request #13 from hildakh/firebase/setting

  Show description for 53f29be
  hildakh

  authored
  53f29be

  Copy full SHA for 53f29be

Commits on Mar 22, 2020

• Merge pull request #14 from hildakh/googleauth/2

  Show description for 79d0285
  hildakh

  authored
  79d0285

  Copy full SHA for 79d0285

Commits on Mar 24, 2020

• Merge pull request #15 from hildakh/firebase/storedata

  Show description for beb9731
  hildakh

  authored
  beb9731

  Copy full SHA for beb9731

Commits on Mar 25, 2020

• Merge pull request #16 from hildakh/firebase/storedata

  Show description for b492d26
  hildakh

  authored
  b492d26

  Copy full SHA for b492d26

Commits on Mar 26, 2020

• Merge pull request #17 from hildakh/userdata-in-app

  Show description for 829ac70
  hildakh

  authored
  829ac70

  Copy full SHA for 829ac70

• Merge pull request #18 from hildakh/userdata-in-app

  Show description for 6b3b636
  hildakh

  authored
  6b3b636

  Copy full SHA for 6b3b636

• Merge pull request #19 from hildakh/signup-feature

  Show description for 564a517
  hildakh

  authored
  564a517

  Copy full SHA for 564a517

Commits on Mar 27, 2020

• Merge pull request #20 from hildakh/signup-feature

  Show description for 255d471
  hildakh

  authored
  255d471

  Copy full SHA for 255d471

Commits on Mar 28, 2020

• Merge pull request #21 from hildakh/signin-feature

  Show description for b033d28
  hildakh

  authored
  b033d28

  Copy full SHA for b033d28

Commits on Apr 3, 2020

• Merge pull request #22 from hildakh/redux-feature

  Show description for 70f4e34
  hildakh

  authored
  70f4e34

  Copy full SHA for 70f4e34

• Merge pull request #23 from hildakh/redirect

  Show description for cf24a1c
  hildakh

  authored
  cf24a1c

  Copy full SHA for cf24a1c

Commits on Apr 4, 2020

• Merge pull request #24 from hildakh/cart

  Show description for 857afd4
  hildakh

  authored
  857afd4

  Copy full SHA for 857afd4

Commits on Apr 8, 2020

• Merge pull request #25 from hildakh/cart

  Show description for 173abbc
  hildakh

  authored
  173abbc

  Copy full SHA for 173abbc

• Merge pull request #1 from hildakh/dependabot/npm_and_yarn/acorn-5.7.4

  Show description for fb1eb40
  hildakh

  authored
  fb1eb40

  Copy full SHA for fb1eb40

• Merge pull request #26 from hildakh/preview

  Show description for 6272b14
  hildakh

  authored
  6272b14

  Copy full SHA for 6272b14

Commits on Apr 26, 2020

• Merge pull request #27 from hildakh/preview

  Show description for a3b8c0f
  hildakh

  authored
  a3b8c0f

  Copy full SHA for a3b8c0f

• custom button modified to be used on collections items and be visible on hover

  hildakh

  committed
  7130cbe

  Copy full SHA for 7130cbe

• Merge pull request #28 from hildakh/redux-feature

  Show description for 1fd7f1a
  hildakh

  authored
  1fd7f1a

  Copy full SHA for 1fd7f1a

• info added to .env file

  hildakh

  committed
  94a7cd7

  Copy full SHA for 94a7cd7

• modified

  hildakh

  committed
  f0a7f37

  Copy full SHA for f0a7f37

• Delete firebase.utils.js

  hildakh

  authored
  ffac59f

  Copy full SHA for ffac59f

• reducer for adding items to cart added. app data moved to .env file. item was passed as an object to give complete access to it for the cart

  hildakh

  committed
  3eebc1d

  Copy full SHA for 3eebc1d

• conflicts resolved

  hildakh

  committed
  41b91d1

  Copy full SHA for 41b91d1

• Merge pull request #30 from hildakh/cart-reducer

  Show description for a3d8c35
  hildakh

  authored
  a3d8c35

  Copy full SHA for a3d8c35

• add item to cart action added to card button to complete the functionality

  hildakh

  committed
  bebe209

  Copy full SHA for bebe209

• Merge pull request #31 from hildakh/cart-reducer

  Show description for 9dd9878
  hildakh

  authored
  9dd9878

  Copy full SHA for 9dd9878

Commits on May 4, 2020

• function for incrementing item count added to cart reducer

  hildakh

  committed
  c92a990

  Copy full SHA for c92a990

• cart reducer implemented the new function

  hildakh

  committed
  7ef4b90

  Copy full SHA for 7ef4b90

• shop data changed for products to have unique ids

  hildakh

  committed
  1443a90

  Copy full SHA for 1443a90

• inccreasing quantity of cart items implemented in cart reducer

  hildakh

  committed
  a167f76

  Copy full SHA for a167f76

• Merge pull request #32 from hildakh/cart-reducer

  Show description for 80a7e88
  hildakh

  authored
  80a7e88

  Copy full SHA for 80a7e88

Commits on May 8, 2020

• cartItem was created and added to cart drop down

  hildakh

  committed
  506859c

  Copy full SHA for 506859c

• Merge pull request #33 from hildakh/cart-reducer

  Show description for 5b05364
  hildakh

  authored
  5b05364

  Copy full SHA for 5b05364

• used reselect to update cart dropdown and carticon with memoized selectors

  hildakh

  committed
  d64cca8

  Copy full SHA for d64cca8

• Merge pull request #34 from hildakh/cart-reducer

  Show description for c854332
  hildakh

  authored
  c854332

  Copy full SHA for c854332

• added redirects to public for Netlify page refresh

  hildakh

  committed
  38f0d47

  Copy full SHA for 38f0d47

• Merge pull request #35 from hildakh/cart-reducer

  Show description for 2d7ece7
  hildakh

  authored
  2d7ece7

  Copy full SHA for 2d7ece7

• page id removed from shop path

  hildakh

  committed
  e446604

  Copy full SHA for e446604

• Merge pull request #36 from hildakh/cart-reducer

  Show description for 83ae44d
  hildakh

  authored
  83ae44d

  Copy full SHA for 83ae44d

Commits on May 9, 2020

• user selectors added and used to replaced mapStateToProps along with createStructuredSelector from reselect. Empty cart check added

  hildakh

  committed
  36e37d4

  Copy full SHA for 36e37d4

• Merge pull request #37 from hildakh/user-selector

  Show description for 3ca5813
  hildakh

  authored
  3ca5813

  Copy full SHA for 3ca5813

• styling added to empty cart

  hildakh

  committed
  11c7ce1

  Copy full SHA for 11c7ce1

• checkout page and link to it from cart added

  hildakh

  committed
  6851f2d

  Copy full SHA for 6851f2d

• Merge pull request #38 from hildakh/checkout

  Show description for b6ce9f8
  hildakh

  authored
  b6ce9f8

  Copy full SHA for b6ce9f8

• checkout page updated with items from the cart and the total price

  hildakh

  committed
  3e44d6a

  Copy full SHA for 3e44d6a

• Merge pull request #39 from hildakh/checkout

  Show description for 8e660af
  hildakh

  authored
  8e660af

  Copy full SHA for 8e660af

• cart hidden on checkout page using dispatch shorthand and connect

  hildakh

  committed
  226469e

  Copy full SHA for 226469e

• Merge pull request #40 from hildakh/checkout

  Show description for bd9b722
  hildakh

  authored
  bd9b722

  Copy full SHA for bd9b722

• cart items details added to checkout page

  hildakh

  committed
  cf1aaba

  Copy full SHA for cf1aaba

• Merge pull request #41 from hildakh/checkout

  Show description for 42aa17b
  hildakh

  authored
  42aa17b

  Copy full SHA for 42aa17b

Commits on May 11, 2020

• remove item from cart finished

  hildakh

  committed
  c78be61

  Copy full SHA for c78be61

• Merge pull request #42 from hildakh/checkout

  Show description for fc38a8a
  hildakh

  authored
  fc38a8a

  Copy full SHA for fc38a8a

• clear, add and remove item from cart completed

  hildakh

  committed
  c47800c

  Copy full SHA for c47800c

• Merge pull request #43 from hildakh/checkout

  Show description for 7138856
  hildakh

  authored
  7138856

  Copy full SHA for 7138856

Commits on May 24, 2020

• Redux persist (#44)

  Show description for 8588028
  hildakh

  authored
  8588028

  Copy full SHA for 8588028

• Redux refactor (#45)

  Show description for 5d72053
  hildakh

  authored
  5d72053

  Copy full SHA for 5d72053

Commits on Oct 30, 2020

• removed yarn lock and used npm instaed

  

  Hilda

  committed
  74a0351

  Copy full SHA for 74a0351

• Add renovate.json (#49)

  Show description for 5f634d2
  renovate[bot]

  authored
  5f634d2

  Copy full SHA for 5f634d2

• moving directory and collection state into redux (#52)

  Show description for 53f5ef3
  

  hildakh

  and

  Hilda

  authored
  53f5ef3

  Copy full SHA for 53f5ef3

• Update dependency react-scripts to v4 (#54)

  Show description for 9059cc1
  

  renovate[bot]

  and

  renovate-bot

  authored
  9059cc1

  Copy full SHA for 9059cc1

Commits on Nov 15, 2020

• Feature/collection overview (#56)

  Show description for fd1f527
  hildakh

  authored
  fd1f527

  Copy full SHA for fd1f527

Commits on Nov 16, 2020

• Feature/collection overview (#57)

  Show description for b4ed05d
  hildakh

  authored
  b4ed05d

  Copy full SHA for b4ed05d

• fix/data-normalization(#58)

  Show description for 52f47fc
  hildakh

  authored
  52f47fc

  Copy full SHA for 52f47fc

• (#59)

  Show description for ba3ca14
  hildakh

  authored
  ba3ca14

  Copy full SHA for ba3ca14

• Add Stripe (#60)

  Show description for 5004cc8
  hildakh

  authored
  5004cc8

  Copy full SHA for 5004cc8

Commits on Sep 22, 2021

• Bump tmpl from 1.0.4 to 1.0.5

  Show description for e3e9cd6
  dependabot[bot]

  authored
  e3e9cd6

  Copy full SHA for e3e9cd6