Code

Missy dev branch#28

Code

Open

yemissy wants to merge 45 commits intoCityMeal:mainCityMeal/CityMealFrontend:mainfrom yemissy:missyDevBranchyemissy/CityMealFrontend:missyDevBranchCopy head branch name to clipboard

+2,035-18,226

Commits

Commits on Apr 23, 2021

• updated the get fav function

  OluwaYemmissy

  committed
  edb52bc

  Copy full SHA for edb52bc

• broke the sign up/in function

  OluwaYemmissy

  committed
  a4b38b1

  Copy full SHA for a4b38b1

• resolved conflicts

  OluwaYemmissy

  committed
  66b164e

  Copy full SHA for 66b164e

• frontend not working

  OluwaYemmissy

  committed
  fa7c0b0

  Copy full SHA for fa7c0b0

• integrating Erwins refactor

  OluwaYemmissy

  committed
  28b7d8e

  Copy full SHA for 28b7d8e

• resolved and merged Erwins changes

  OluwaYemmissy

  committed
  8a98b44

  Copy full SHA for 8a98b44

• deleted the old city client

  OluwaYemmissy

  committed
  38660a8

  Copy full SHA for 38660a8

Commits on Apr 24, 2021

• updated favorite and profile page css

  seolacarrano

  committed
  ff5f1cb

  Copy full SHA for ff5f1cb

• updated footer css

  seolacarrano

  committed
  452230f

  Copy full SHA for 452230f

• Code splitting

  OluwaYemmissy

  committed
  2b94ac5

  Copy full SHA for 2b94ac5

Commits on Apr 25, 2021

• updated sign up and sign in button css

  seolacarrano

  committed
  bf4009b

  Copy full SHA for bf4009b

• updated dropdown css

  seolacarrano

  committed
  3138073

  Copy full SHA for 3138073

• updated sign up ad sign in modal css

  seolacarrano

  committed
  344e4b0

  Copy full SHA for 344e4b0

• updated anoouncement

  seolacarrano

  committed
  c54c222

  Copy full SHA for c54c222

• spliited the navbar and form, only using one form version for mobile & desktop

  OluwaYemmissy

  committed
  d97970c

  Copy full SHA for d97970c

• moved the updated user to profile component

  OluwaYemmissy

  committed
  a0da7fb

  Copy full SHA for a0da7fb

• updated list and announcement css

  seolacarrano

  committed
  8fa2dc1

  Copy full SHA for 8fa2dc1

• resolving conflicts

  seolacarrano

  committed
  966ebd1

  Copy full SHA for 966ebd1

• addding css

  seolacarrano

  committed
  170da4a

  Copy full SHA for 170da4a

• updated navbar css and fixed sign out function

  seolacarrano

  committed
  b21b012

  Copy full SHA for b21b012

• updated css

  seolacarrano

  committed
  598b178

  Copy full SHA for 598b178

• Merge pull request CityMeal#15 from seolacarrano/navUpdate

  Show description for e02f81d
  seolacarrano

  authored
  e02f81d

  Copy full SHA for e02f81d

Commits on Apr 26, 2021

• fixeds sign out function and nav bar css

  seolacarrano

  committed
  e56d2f7

  Copy full SHA for e56d2f7

• Merge pull request CityMeal#16 from seolacarrano/navUpdate

  Show description for 0c31ad9
  seolacarrano

  authored
  0c31ad9

  Copy full SHA for 0c31ad9

• updated the profile function

  OluwaYemmissy

  committed
  329162e

  Copy full SHA for 329162e

• resolved conflicts from dev branch

  OluwaYemmissy

  committed
  04e7a52

  Copy full SHA for 04e7a52

• resolved conflicts

  OluwaYemmissy

  committed
  eba6785

  Copy full SHA for eba6785

• Merge pull request CityMeal#17 from yemissy/missyDevBranch

  Show description for a66fcf8
  seolacarrano

  authored
  a66fcf8

  Copy full SHA for a66fcf8

• updated form.js and sign out

  seolacarrano

  committed
  3a2b750

  Copy full SHA for 3a2b750

• updated list css

  seolacarrano

  committed
  c7f62d9

  Copy full SHA for c7f62d9

• Merge pull request CityMeal#18 from seolacarrano/navUpdate

  Show description for 613fa79
  seolacarrano

  authored
  613fa79

  Copy full SHA for 613fa79

• separated the list loation call from app.js

  OluwaYemmissy

  committed
  2ece936

  Copy full SHA for 2ece936

• pulled from Seola

  OluwaYemmissy

  committed
  7f756aa

  Copy full SHA for 7f756aa

• Merge pull request CityMeal#19 from yemissy/missyDevBranch

  Show description for 34d99d4
  seolacarrano

  authored
  34d99d4

  Copy full SHA for 34d99d4

• added Phoenix filter functions

  RosmaryFC

  committed
  2509488

  Copy full SHA for 2509488

• Merge pull request CityMeal#21 from RosmaryFC/filter

  Show description for 9b73590
  seolacarrano

  authored
  9b73590

  Copy full SHA for 9b73590

• added css filter, aligned footer to bottom Seola/Phoenix

  RosmaryFC

  committed
  267b7bb

  Copy full SHA for 267b7bb

• Merge pull request CityMeal#23 from RosmaryFC/filter

  Show description for 7d2069d
  seolacarrano

  authored
  7d2069d

  Copy full SHA for 7d2069d

• pulled from deployed version

  OluwaYemmissy

  committed
  5811c98

  Copy full SHA for 5811c98

• Merge branch 'dev' of github.com:CityMeal/CityMealFrontend into missyDevBranch

  OluwaYemmissy

  committed
  a514325

  Copy full SHA for a514325

• missy's changes

  OluwaYemmissy

  committed
  cd98ffb

  Copy full SHA for cd98ffb

• removed proxy

  RosmaryFC

  committed
  c04f3cb

  Copy full SHA for c04f3cb

• Merge pull request CityMeal#29 from RosmaryFC/dev

  Show description for 86566d7
  seolacarrano

  authored
  86566d7

  Copy full SHA for 86566d7

• Merge branch 'dev' of github.com:CityMeal/CityMealFrontend into missyDevBranch

  OluwaYemmissy

  committed
  11b3120

  Copy full SHA for 11b3120

• testing out a new map package

  OluwaYemmissy

  committed
  b7993ef

  Copy full SHA for b7993ef