Code

Development#132

Code

Closed

JacinthaDev wants to merge 122 commits intomainResilient-Labs/nourish:mainfrom developmentResilient-Labs/nourish:developmentCopy head branch name to clipboard

+2,209-25,780

Commits

Commits on Dec 21, 2023

• fe-Erik for interactive map to work need: installed "leaflet" , "react-leaflet", client side: "react-router-dom"

  socratic617

  committed
  39efb95

• fe-Erik installed "leaflet" and "leaflet-react" to display interactive map

  socratic617

  committed
  31561e9

• fe-Erik setup basic stylingfor fridgeList component and fridgeMap component section for landing page and psuedo coded

  socratic617

  committed
  9968c37

• fe-Erik cleaned up index.js

  socratic617

  committed
  efdb9ff

• fe-Erik imported FridgeCard component and mapped through card component for each fridge to display w/ test data for fridge list

  socratic617

  committed
  215edfa

• fe-erik imported features to get interactive map going, added philly marker on map, the zoom on location for area of fridges, and divs for basic styling containers for fridge list and fridge map

  socratic617

  committed
  de4bf5e

• fe-erik added data attribute to fridge component to hold all info of community fridges, added dummy data schema on Home Page

  socratic617

  committed
  830b25b

• fe-erik FridgeMap added bound prop, The MapContainer component now includes a bounds prop, which is set to the calculated bounds array. Added img for icon for interactive for fridge

  socratic617

  committed
  2c83b37

• fe-erik added styling for fridgeList to scroll

  socratic617

  committed
  fa549fc

• fe-erik created container for fridgeMap to style

  socratic617

  committed
  296f0b8

• fe-erik added container for fridgelist to be nested in frdige parent container

  socratic617

  committed
  15775e9

• fe-erik added fridge icon to images folder to display on interactive map

  socratic617

  committed
  19e6526

• fe-erik installed dependencies "postcss-present-css" and "react-scripts"

  socratic617

  committed
  3160bec

Commits on Dec 22, 2023

• fe-erik FridgeMap: created variable to reformatData from Schema to fit leaflet interactiveMap and created a bounds that include all markers. Adjusted default center of location of fridges

  socratic617

  committed
  35b90e3

• fe-erik Fridge component: included data attribute to component FridgeMap that holds data for schema

  socratic617

  committed
  cbcbd19

• added more dummy data to test that it dynamically renders all fridge locations w/ name, location once inputted into interactive map w/ "reformatData"

  socratic617

  committed
  cdd52fa

• fe-erik package.json: installed tailwindcss, flowbite-react, react-scripts

  socratic617

  committed
  4c1800b

• fe-erik package.json: installed tailwindcss, flowbite-react, react-scripts, react-leaflet

  socratic617

  committed
  803bc45

• fe-erik tailwind.config.js : configured tailwind css for frontend to use css framework

  socratic617

  committed
  6435f83

• fe-erik index.css : imported tailwind base, components, utilities to access styling

  socratic617

  committed
  93759e8

• fe-erik about landing page: styled and incorperated content

  socratic617

  committed
  5882085

• fe-sarah multple sections landing page: styled and incorperated content

  socratic617

  committed
  db023cd

• fe-erik fridge landing page: basic styling and incorperated content

  socratic617

  committed
  c8d1bc8

• add images to landing pg

  socratic617

  committed
  f0d6df7

• fe-erik import Hero from components

  socratic617

  committed
  c2d1c30

• be set up

  socratic617

  committed
  e2583cc

• be fetch all info for fridges and by zipcode

  socratic617

  committed
  0e81b60

• merge be

  socratic617

  committed
  bce33c6

• merge be

  socratic617

  committed
  71bfd30

• merge be

  socratic617

  committed
  5717458

• merge be

  socratic617

  committed
  616d1f1

• merge be

  socratic617

  committed
  4b80497

• merge be

  socratic617

  committed
  e5894fd

• deleted communitypost.js and fridgeprofile.js

  socratic617

  committed
  131e97d

• fe-erik installed fontawesome <link> to include icons

  socratic617

  committed
  2e1857e

• fe-erik Fridge.js : added styling to div container and added padding

  socratic617

  committed
  4244f71

• fe-erik FridgeList: added css components from tailwind

  socratic617

  committed
  91c0531

• fe-erik clean up for Fridge Map

  socratic617

  committed
  97a7d1b

• Merge pull request #80 from Resilient-Labs/BE-changeENVpathinCloudinary

  Show description for 9e613da
  JacinthaDev

  authored
  9e613da

• Merge remote-tracking branch 'origin/development' into fe-interactive-map-about-me

  socratic617

  committed
  ecf4196

• Merge pull request #85 from Resilient-Labs/fe-interactive-map-about-me

  Show description for 4f41dd9
  anaiscmateus

  authored
  4f41dd9

• adding prettier to format code

  briannawillis195

  committed
  14c8805

• adding prettier for formatting

  briannawillis195

  committed
  27c462b

Commits on Dec 23, 2023

• Merge pull request #86 from Resilient-Labs/hideENV

  Show description for fc41257
  JacinthaDev

  authored
  fc41257

• Merge pull request #87 from Resilient-Labs/hideENV

  Show description for 1014d24
  JacinthaDev

  authored
  1014d24

• config postcss

  socratic617

  committed
  d1c66d7

• fe-erik W.I.P set up for getting all fridges info from b-e and connected it to server on local host 8000

  socratic617

  committed
  40e1532

• fe-erik fixed port for server side to client

  socratic617

  committed
  e2c3342

• Merge remote-tracking branch 'origin/development' into fe-interactive-map-about-me

  socratic617

  committed
  dc2938f

• ignore pack-lock.json

  socratic617

  committed
  278ea1d

• stylized individual fridge pages and make interactive and responsive

  codedbycass

  committed
  9ab6425

• Merge remote-tracking branch 'origin/development' into fe-stylized-fridge-pages

  codedbycass

  committed
  1e67457

• fe-erik work in progress, testing

  socratic617

  committed
  41beb79

Commits on Dec 24, 2023

• fe-erik made code more efficient. Making one fetch call for components FridgeList.js and FridgeMap.js. Imported UseState and useEffect. Created Fetch to retrieve all data. Added attribute all fridg…

  Show description for 07d280f
  socratic617

  committed
  07d280f

• fe-erik moved all functionality to fridgelist and got rid of fridge card.js

  socratic617

  committed
  2f52d0d

• fe-erik WorkInProgres FridgeList: moved over logic/fetch functionality to Fridge component. Deleted it from this component.

  socratic617

  committed
  849b488

• fe-erik WorkInProgress FridgeMap: reformatted data to match DB and removed dummy data display and displayed mongo DB data

  socratic617

  committed
  4db168e

• fe-erik Home.js: removed dummy data now that intergreated mongoDb data

  socratic617

  committed
  b50cd1a

• fe-erik app.css: cleaned up css

  socratic617

  committed
  cbf85a6

• changed px to rem

  socratic617

  committed
  dc83560

• fe-erik FridgeList: connected to fridge profile pages individually for each fridge on list

  socratic617

  committed
  1b23979

• fe-style-landing-page

  xsarahyu

  committed
  6e2d58a

Commits on Dec 26, 2023

• updates profile controller and routers, updates user schema and password changing, updates some files to es6

  RoReeceDev

  committed
  a072266

• Merge pull request #91 from Resilient-Labs/be-ro-user-profile-router-controller

  Show description for 96263ec
  briannawillis195

  authored
  96263ec

• fe-erik FridgeList: changed colors of buttons

  socratic617

  committed
  e5d281d

• Merge remote-tracking branch 'origin/development' into fe-landing-page

  socratic617

  committed
  116a388

• Merge pull request #90 from Resilient-Labs/fe-landing-page

  Show description for eb9ef6b
  anaiscmateus

  authored
  eb9ef6b

• Merge remote-tracking branch 'origin/development' into fe-interactive-map-about-me

  socratic617

  committed
  6b1bd74

• fixing issue with server and modules not loading

  RoReeceDev

  committed
  8709043

• fixing bcrypt import issue

  RoReeceDev

  committed
  6321197

• final updates

  RoReeceDev

  committed
  693d7f8

• fix spacing

  RoReeceDev

  committed
  abe0ec6

• Merge remote-tracking branch 'origin/BE-ro-fixing-module-issues' into fe-interactive-map-about-me

  socratic617

  committed
  7d30f00

Commits on Dec 27, 2023

• Merge pull request #95 from Resilient-Labs/BE-ro-fixing-module-issues

  Show description for a46a924
  anaiscmateus

  authored
  a46a924

• added conditional logic for 2 small features (fridge status and donations acceptances)

  codedbycass

  committed
  d7ecf5f

• fridge conditionals

  codedbycass

  committed
  2c158ee

• Merge pull request #89 from Resilient-Labs/fe-stylized-fridge-pages

  Show description for 126bf6a
  anaiscmateus

  authored
  126bf6a

• Merge pull request #96 from Resilient-Labs/fe-fridge-conditionals

  Show description for 8d58a6f
  anaiscmateus

  authored
  8d58a6f

• Merge branch 'development' into fe-interactive-map-about-me

  anaiscmateus

  authored
  e364ede

• Merge pull request #97 from Resilient-Labs/fe-interactive-map-about-me

  Show description for 80a24f3
  anaiscmateus

  authored
  80a24f3

• delete fridgedata

  anaiscmateus

  authored
  c4e852c

• cleaning up code

  socratic617

  committed
  da70f30

• cleaning up code

  socratic617

  committed
  7df42ff

• cleaning up code

  socratic617

  committed
  2868b35

• Merge branch 'fe-interactive-map-about-me' of https://github.com/Resilient-Labs/nourish into fe-interactive-map-about-me

  socratic617

  committed
  f3a45bb

• Deleted extra "<Fridge/>" and data={fridgeData}

  socratic617

  committed
  7f22900

• changed tile map for interactive map

  socratic617

  committed
  a27c45b

• Merge pull request #98 from Resilient-Labs/fe-interactive-map-about-me

  Show description for 46dc5b9
  briannawillis195

  authored
  46dc5b9

• cloudinary created for posts

  RoReeceDev

  committed
  63c18f6

• add community board placeholder

  anaiscmateus

  committed
  dad487e

• Merge pull request #100 from Resilient-Labs/BE-kyle-post-cloundinary

  Show description for 17d8d66
  briannawillis195

  authored
  17d8d66

• fe style login and signup pages

  xsarahyu

  committed
  a15f144

• Merge pull request #99 from Resilient-Labs/fe-add-community-placeholder

  Show description for 59e852b
  briannawillis195

  authored
  59e852b

• Merge branch 'development' of https://github.com/Resilient-Labs/nourish into fe-login-signup

  xsarahyu

  committed
  e2212b5

• fe style login and signup pages

  xsarahyu

  committed
  fb22a55

• Merge pull request #102 from Resilient-Labs/fe-login-signup

  Show description for 3413e17
  xsarahyu

  authored
  3413e17

• fixing cloudinary issue and routes for login and signup

  RoReeceDev

  committed
  8ca0e86

• fixing models

  RoReeceDev

  committed
  9513c71

Commits on Dec 28, 2023

• Merge pull request #107 from Resilient-Labs/BE-ro-fix-errors-add-login-signup-route-fix-user-auth

  Show description for 730fa3e
  anaiscmateus

  authored
  730fa3e

• Update login/signup with POST actions. Change signup labels (confirm-password to confirmPassword).

  xsarahyu

  committed
  88df810

• Merge pull request #116 from Resilient-Labs/fe-update-login-signup

  Show description for 0849bc7
  briannawillis195

  authored
  0849bc7

• completed fridge menu styling and logic

  codedbycass

  committed
  2d09e4d

• change login method to POST

  xsarahyu

  committed
  4f5f95d

• change name of function, form method, and form action

  xsarahyu

  committed
  e53aba0

• rewrite code to use async/await instead of callbacks

  xsarahyu

  committed
  01721e6

• rewrite code to use async/await instead of callbacks. change fName/lName variables to firstName/lastName

  xsarahyu

  committed
  363b031

• Merge pull request #120 from Resilient-Labs/fe-fridge-landing-menu

  Show description for 5dd2afd
  briannawillis195

  authored
  5dd2afd

• create terms and conditions and update signup page

  anaiscmateus

  committed
  5bda98f

• Merge pull request #123 from Resilient-Labs/fe-create-terms-modal-and-update-signup

  Show description for b4ad66e
  briannawillis195

  authored
  b4ad66e

Commits on Dec 29, 2023

• Resolves issue with Community Page merge conflict

  JoseDiazCodes

  committed
  cbc0606

• fe-erik Fridge.js: making Fridge Map and Fridge List components web responsive and hiding map on mobile and tablet view

  socratic617

  committed
  3138341

• Merge pull request #126 from Resilient-Labs/FE-JoseCommunityPageComplete

  Show description for fb9c2a7
  briannawillis195

  authored
  fb9c2a7

• Merge pull request #127 from Resilient-Labs/fe-interactive-map-about-me

  Show description for 6de4710
  briannawillis195

  authored
  6de4710

• connect login to server

  xsarahyu

  committed
  1930706

• connect signin to server

  xsarahyu

  committed
  15b79e3

• change fName/lName variables to firstName/lastName

  xsarahyu

  committed
  27fd8d8

• delete comments

  xsarahyu

  committed
  152a4c5

• Merge branch 'development' into fe-be-connect-login-signup

  xsarahyu

  authored
  be13ae7

• Merge pull request #128 from Resilient-Labs/fe-be-connect-login-signup

  Show description for 6f35549
  anaiscmateus

  authored
  6f35549

• updated username field and key names for mongo

  RoReeceDev

  committed
  3bca4ec

• Merge pull request #130 from Resilient-Labs/be-ro-change-userName-fields

  Show description for 0d437ab
  anaiscmateus

  authored
  0d437ab

• Add controller for team member profiles and fix a post route

  JacinthaDev

  committed
  0ae225f