Added CSS Grid#14

Open

FarazA22 wants to merge 108 commits into

wonderpus:mainfrom

Fresh-Fridge-v2-0:main

Commits on Jan 19, 2021

refactored package.json, added new dependencies for react-redux, bcrypt, changed scripts to be compatible for windows
heidiyoora
committed
Merge pull request #1 from heidiyoora/main
heidiyoora
authored
test

Faraz Akhtar
authored and
Faraz Akhtar
committed
Merge branch 'main' of https://github.com/Fresh-Fridge-v2-0/freshfridge into main

Faraz Akhtar
authored and
Faraz Akhtar
committed
reconfigured webpack, moved index.js into client folder
heidiyoora
committed
Merge pull request #2 from heidiyoora/react
heidiyoora
authored
Merge branch 'main' of https://github.com/Fresh-Fridge-v2-0/freshfridge into main

Faraz Akhtar
authored and
Faraz Akhtar
committed
added baseline for routes

Faraz Akhtar
authored and
Faraz Akhtar
committed

Commits on Jan 20, 2021

Merge pull request #3 from FarazA22/main
FarazA22
authored
update to routes

Faraz Akhtar
authored and
Faraz Akhtar
committed
added redux file systems and sample logos into assets
heidiyoora
committed
test

Faraz Akhtar
authored and
Faraz Akhtar
committed
test

Faraz Akhtar
authored and
Faraz Akhtar
committed
Merge branch 'main' of https://github.com/Fresh-Fridge-v2-0/freshfridge into main

Faraz Akhtar
authored and
Faraz Akhtar
committed
refactored file system. working on importing Routes.js into App.jsx and working on organizing containers
heidiyoora
committed
Merge pull request #4 from heidiyoora/redux
heidiyoora
authored
latest

Faraz Akhtar
authored and
Faraz Akhtar
committed
refactored login and signup routes
dasnyder3
committed
added logout route
dasnyder3
committed
test

Faraz Akhtar
authored and
Faraz Akhtar
committed
set-up boilerplate

Faraz Akhtar
authored and
Faraz Akhtar
committed
Merge pull request #5 from dasnyder3/dan-auth-endpoints
FarazA22
authored
Merge pull request #6 from FarazA22/main
FarazA22
authored
Merge branch 'main' of https://github.com/Fresh-Fridge-v2-0/freshfridge into dan-auth-endpoints
dasnyder3
committed
added User Container, Fridge Container, Grocery Container, Fridge Item, Grocery Item
heidiyoora
committed
added household router/controller, updated list controller

Richard
authored and
Richard
committed
editing boilerplates for Fridge Item, Grocery Item, Fridge List, Grocergy List
heidiyoora
committed
moved original files into another folder
heidiyoora
committed
resolved conflict in server.js

Richard
authored and
Richard
committed
test

Faraz Akhtar
authored and
Faraz Akhtar
committed
Merge pull request #7 from FarazA22/main
FarazA22
authored
test

Faraz Akhtar
authored and
Faraz Akhtar
committed
created action types. in the midst of creating action creators/dispatchers
heidiyoora
committed
added session creation and installed bcrypt
dasnyder3
committed
... need to merge app.jsx again
heidiyoora
committed
test

Faraz Akhtar
authored and
Faraz Akhtar
committed
Merge pull request #9 from FarazA22/main
FarazA22
authored
attempting to merge with faraz
heidiyoora
committed
Merge pull request #8 from dasnyder3/dan-auth-endpoints
FarazA22
authored
merged faraz and heidi's frontend. added fridge/grocery containers items. working on redux action types and action creators
heidiyoora
committed
Merge pull request #10 from heidiyoora/upstreamattempts
heidiyoora
authored
added bcrypt to login routers
dasnyder3
committed
added more action types and creating action creators
heidiyoora
committed
changing Id to ID
dasnyder3
committed
Merge pull request #11 from Fresh-Fridge-v2-0/dan-id-fix
klgvillanueva
authored
test

Faraz Akhtar
authored and
Faraz Akhtar
committed
updated Add Item Modal and Fridge/Grocery container to create the correct payload for action creator
heidiyoora
committed
Merge pull request #12 from FarazA22/main
FarazA22
authored

Commits on Jan 21, 2021