Code

Feedback#1

Code

Open

github-classroom[bot] wants to merge 41 commits intofeedbackECE444-2020Fall/project1-webapp-group18-jimwaukees:feedbackfrom masterECE444-2020Fall/project1-webapp-group18-jimwaukees:masterCopy head branch name to clipboard

+19,362

Commits

Commits on Sep 18, 2020

• Setting up GitHub Classroom Feedback

  github-classroom[bot]

  authored
  d47db0c

• Update GitHub Classroom Feedback

  github-classroom[bot]

  authored
  cd76a02

• Setting up GitHub Classroom Feedback

  github-classroom[bot]

  authored
  bff1a16

Commits on Oct 15, 2020

• Create README.md

  devesh-nischal

  authored
  611de5f

Commits on Oct 16, 2020

• Initally setup the application using a react based front end framework which is being serviced by a flask based back end framework. There is no functionality. Currently, I send simple objects throu…

  Show description for 5e0f48d
  devesh-nischal

  committed
  5e0f48d

• Merge pull request #11 from ECE444-2020Fall/flask-react-setup

  Show description for af3b938
  matthewviegas

  authored
  af3b938

Commits on Oct 20, 2020

• Added initial component logic including search input and search dropdown. Also added about us and help tabs which will be filled out at a later date. Waiting for backend changes to connect the newl…

  Show description for 91dcc11
  devesh-nischal

  committed
  91dcc11

• Merge pull request #15 from ECE444-2020Fall/ui-development

  Show description for ee8f625
  matthewviegas

  authored
  ee8f625

Commits on Oct 22, 2020

• * Created environment variables and account for API key to be shared

  Show description for 7834af0
  

  PuaChris

  committed
  7834af0

• Implemented endpoint for frontend to pass queries to for recipe retrieval. Recipes return name and images which are linked to spoontacular's website.

  

  PuaChris

  committed
  297ba24

Commits on Oct 23, 2020

• Merge pull request #16 from ECE444-2020Fall/meal-api-query

  Show description for 593f995
  matthewviegas

  authored
  593f995

• Implemented api query for ingredients based search

  matthewviegas

  committed
  0a35291

Commits on Oct 30, 2020

• Merge pull request #19 from ECE444-2020Fall/ingredients_query_backend

  Show description for a431d44
  devesh-nischal

  authored
  a431d44

• Added simple unit test for main App component to check if tabs and logo are rendered.

  devesh-nischal

  committed
  699f2b4

Commits on Nov 2, 2020

• Fixed api query and connected front and back end for ingredient queries

  matthewviegas

  committed
  3dbb500

• Cleaning up code

  matthewviegas

  committed
  1e86c49

• Merge pull request #21 from ECE444-2020Fall/input_ingredients

  Show description for 45e3197
  devesh-nischal

  authored
  45e3197

Commits on Nov 3, 2020

• Implemented recipe details dialog which renders the image, ingrdients (with searched ingredients highlighted when applicable), and step by step instructions.

  devesh-nischal

  committed
  52f594b

Commits on Nov 5, 2020

• static cardview with dropdown and button for a popup

  

  ryooyoun

  committed
  1593901

Commits on Nov 6, 2020

• Allow users to search for any specific recipe. Need to include similar name search algorithm and do error checking

  

  PuaChris

  committed
  8a49465

• Merge branch 'master' into ui-development

  

  Chris Pua

  authored
  71498b6

• Merge pull request #22 from ECE444-2020Fall/ui-development

  Show description for 9ef9445
  

  Chris Pua

  authored
  9ef9445

• Merge branch 'master' into meal-input

  

  Chris Pua

  authored
  1b69d4d

• Merge pull request #23 from ECE444-2020Fall/meal-input

  Show description for 5a9a17e
  

  Chris Pua

  authored
  5a9a17e

Commits on Nov 12, 2020

• Reformating to deploy with Heroku and Firebase

  matthewviegas

  committed
  33f57af

• Fixing indentation

  matthewviegas

  committed
  91660fb

• Fixing imports that are invalid on heroku

  matthewviegas

  committed
  015b926

• Updating README and imports

  matthewviegas

  committed
  1e8392a

• Connected recipe cards with each search page so search results can now be seen in card form. Additionally, when user clicks on a card, the respective recipe details popup shows up.

  devesh-nischal

  committed
  0110b4f

• Merge pull request #32 from ECE444-2020Fall/ui-development

  Show description for 22aa166
  matthewviegas

  authored
  22aa166

Commits on Nov 13, 2020

• Fixing conflicts and hiding api key

  matthewviegas

  committed
  bbaf1b1

• Fixing typo in importing config and heroku url

  matthewviegas

  committed
  82f5364

• Merge pull request #36 from ECE444-2020Fall/deployments

  Show description for 27707b3
  devesh-nischal

  authored
  27707b3

Commits on Nov 16, 2020

• - Reworked the CSS to match the design in the mockups

  Show description for b65fed6
  

  PuaChris

  committed
  b65fed6

• Cleaned up code and added comments

  

  PuaChris

  committed
  5502f0e

Commits on Nov 17, 2020

• Merge pull request #37 from ECE444-2020Fall/searchbar-ui-enhancements

  Show description for 1895ccf
  devesh-nischal

  authored
  1895ccf

• added backend unit tests

  matthewviegas

  committed
  4a1b3b9

Commits on Nov 19, 2020

• Merge pull request #38 from ECE444-2020Fall/backend_testing

  Show description for 1324f3f
  devesh-nischal

  authored
  1324f3f

• Added UI tests for every component. Made recipe search page consistent with new ingredient search page changes. Added minor UI improvements and alignment fixes to all components. Added loader while…

  Show description for 43262dd
  devesh-nischal

  committed
  43262dd

• Add new files to the commit

  devesh-nischal

  committed
  08735a6

• Merge pull request #39 from ECE444-2020Fall/ui-development

  Show description for e221587
  matthewviegas

  authored
  e221587