Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI dev #17

Open
wants to merge 171 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
171 commits
Select commit Hold shift + click to select a range
2d5136c
fixing time and date displaying wrong information
EmilianoHuerta Oct 18, 2021
757c1bf
fixing routing issues
EmilianoHuerta Oct 18, 2021
9e38496
implementing full-calender from api
EmilianoHuerta Oct 18, 2021
81fb55b
updating package lock
EmilianoHuerta Oct 18, 2021
a11c1b7
attempts at fixing profile formatting
EmilianoHuerta Oct 18, 2021
147f081
Deleting Calendar.js
EmilianoHuerta Oct 18, 2021
dfa745c
fixing exports for testing
EmilianoHuerta Oct 18, 2021
a935d7c
Updating event-utils
EmilianoHuerta Oct 18, 2021
4e6f109
removing calendar pic and main jsx
EmilianoHuerta Oct 18, 2021
5c6ffdf
introducing css file
EmilianoHuerta Oct 18, 2021
8adac35
removing on confirm issue, will add in a remove option later
EmilianoHuerta Oct 18, 2021
9a182f1
fixing shrinkage on image hover
EmilianoHuerta Oct 18, 2021
2c9b1cd
updating button font family
EmilianoHuerta Oct 18, 2021
7ab018d
centered text on profile pages
jawhitelaw Oct 18, 2021
dfed6da
fix error
jawhitelaw Oct 20, 2021
d6222bb
updating bug fix for time clock WIP
EmilianoHuerta Oct 20, 2021
165e70f
Updating '/' path to redirect to '/Home' from start
EmilianoHuerta Oct 20, 2021
01cd061
fixing grammar errors
EmilianoHuerta Oct 20, 2021
9877d02
generate recipe title
jawhitelaw Oct 29, 2021
444bc55
fixing timeclock error after 12pm
EmilianoHuerta Nov 1, 2021
b1ea30c
Added instructions to home page
abigailstolp Nov 2, 2021
a653afc
Fixed filteredRecipesData undefined error that came from generating r…
kate2724 Nov 2, 2021
708e755
Fixed home page typo, added Grocery List page again
kate2724 Nov 2, 2021
5e4995c
fixed type
kate2724 Nov 2, 2021
6c3709f
removing context adding to index.html
EmilianoHuerta Nov 3, 2021
dc997f6
removing dateTime implementation in App.js
EmilianoHuerta Nov 3, 2021
9a4527b
adding in a react component for rendering
EmilianoHuerta Nov 3, 2021
b29b4b8
fixing logic with time rendering
EmilianoHuerta Nov 3, 2021
15c0462
updating imports
EmilianoHuerta Nov 3, 2021
e3d0616
added recipe image
jawhitelaw Nov 3, 2021
8dc768d
fixing time format
EmilianoHuerta Nov 3, 2021
d7452df
bullshit
jawhitelaw Nov 3, 2021
5d3cc67
Merge branch 'UI-Dev' of https://github.com/mac-jake225-food/recipe-d…
jawhitelaw Nov 3, 2021
089ac02
attemp at fixing time clock
EmilianoHuerta Nov 3, 2021
efbe8ad
Deleted commented out guidance code
kate2724 Nov 5, 2021
86103ec
changed misnamed recipeId variable, exported savedRecipes
kate2724 Nov 5, 2021
0914676
debugging attempts
kate2724 Nov 5, 2021
63c6f73
code wasn't running, reverted to previous commit
kate2724 Nov 7, 2021
fc8ef8f
Deleted extra code
kate2724 Nov 7, 2021
aed3b3c
formatting
kate2724 Nov 7, 2021
7559224
renamed variables for clarity
kate2724 Nov 7, 2021
c2c6517
Fixed bug, made save and get recipe buttons work
kate2724 Nov 8, 2021
a13cd31
added back save button to profile diet page
kate2724 Nov 8, 2021
7b86661
fixed bug of filtered recipes undefined when profile not filled out
kate2724 Nov 8, 2021
f291f77
Fixed filteredRecipes undefined error (third try)
kate2724 Nov 8, 2021
b837d8c
updating link to recipe page
EmilianoHuerta Nov 8, 2021
35fb377
Merge branch 'UI-Dev' of https://github.com/mac-jake225-food/recipe-d…
EmilianoHuerta Nov 8, 2021
b508d33
debugging Grocery List page (still errors)
kate2724 Nov 9, 2021
2c7c4ed
took out opts, can get ingredients with specific id
kate2724 Nov 9, 2021
b33bd3d
added recipe link with bugs
jawhitelaw Nov 11, 2021
95f6ea7
partially fixed recipe page
jawhitelaw Nov 16, 2021
5bd2b73
finished all recipe page functionality
jawhitelaw Nov 17, 2021
7b405f3
commented out api call on grocery page
jawhitelaw Nov 17, 2021
d2cb451
updating calendar to appear as week only
EmilianoHuerta Nov 28, 2021
d470183
added more to groceryList page, ingredients show up on console
kate2724 Nov 29, 2021
7eb68f8
took out excess code
kate2724 Nov 29, 2021
4077128
debugging attempts to make ingredients show on screen
kate2724 Nov 29, 2021
c950c02
new API key
abigailstolp Nov 29, 2021
67562ed
new API key
abigailstolp Nov 29, 2021
5db2edc
fixed undefined title bug
jawhitelaw Nov 29, 2021
eb4c4ae
adding in css spacing
EmilianoHuerta Nov 29, 2021
0c1c8ed
Merge branch 'UI-Dev' of https://github.com/mac-jake225-food/recipe-d…
EmilianoHuerta Nov 29, 2021
1e7d9ae
fixed recipe formatting
jawhitelaw Nov 29, 2021
83a3abd
fixed image/text disappearing bug
jawhitelaw Nov 30, 2021
80e224d
debugging attempts of grocery list
kate2724 Nov 30, 2021
43ef4fc
Merge branch 'UI-Dev' of https://github.com/mac-jake225-food/recipe-d…
kate2724 Nov 30, 2021
f4b6652
debugging grocery list, added comments
kate2724 Dec 1, 2021
06b6b3f
fixing calendar events to update with INITAL_EVENTS as elements are a…
EmilianoHuerta Dec 2, 2021
2b521d5
Update spoonacular.js
EmilianoHuerta Dec 2, 2021
107cd58
Merge branch 'UI-Dev' of https://github.com/mac-jake225-food/recipe-d…
EmilianoHuerta Dec 2, 2021
aece9af
profile saves checkbox selections and overwrites previous selections
jawhitelaw Dec 3, 2021
46e3c49
Merge branch 'UI-Dev' of https://github.com/mac-jake225-food/recipe-d…
jawhitelaw Dec 3, 2021
ea91075
added clear saved recipes button to Recipes.js, debugging groceryList
kate2724 Dec 3, 2021
f51f7a7
moved functions out of render in groceryList
kate2724 Dec 3, 2021
f41b752
put profile higher in sidebar
kate2724 Dec 3, 2021
446c70f
added user instructions, page doesn't rerender when coming from profi…
kate2724 Dec 3, 2021
887295c
changed api key
kate2724 Dec 3, 2021
c6a81a6
improved user instructions
kate2724 Dec 3, 2021
f0c31f9
more userInstructions
kate2724 Dec 3, 2021
f4fcfc0
README test
abigailstolp Dec 4, 2021
8f779d6
Updated README
abigailstolp Dec 4, 2021
74f0d69
Updated README
abigailstolp Dec 4, 2021
2d01fea
Homepage Instructions
abigailstolp Dec 4, 2021
df5c38c
updating calendar and event-utils api pull methods
EmilianoHuerta Dec 4, 2021
d1a7fd9
Merge branch 'UI-Dev' of https://github.com/mac-jake225-food/recipe-d…
EmilianoHuerta Dec 4, 2021
1e208da
fixed callback issues, list now fills
kate2724 Dec 5, 2021
9ab1b6f
printed grocery list to screen, deleted excess code
kate2724 Dec 5, 2021
2c0a6f6
adding comments to functions
EmilianoHuerta Dec 5, 2021
9988382
adding in comments
EmilianoHuerta Dec 5, 2021
f95d425
Merge branch 'UI-Dev' of https://github.com/mac-jake225-food/recipe-d…
EmilianoHuerta Dec 5, 2021
a5b2f8e
removing user ability to add / change events
EmilianoHuerta Dec 6, 2021
a88c5f3
implmented new array indexing for js object
EmilianoHuerta Dec 6, 2021
36d66d3
grammar fix on homepage
abigailstolp Dec 6, 2021
359d613
Merge branch 'UI-Dev' of https://github.com/mac-jake225-food/recipe-d…
abigailstolp Dec 6, 2021
648c30e
enabled removal of events from the calendar if no longer needed // mu…
EmilianoHuerta Dec 6, 2021
f78a9f4
adding comments for future removal method
EmilianoHuerta Dec 6, 2021
6baa9b5
Merge branch 'UI-Dev' of https://github.com/mac-jake225-food/recipe-d…
EmilianoHuerta Dec 6, 2021
8b7d72d
adding in comments for future removal method
EmilianoHuerta Dec 6, 2021
30c3a26
creating search and remove methods for initial events
EmilianoHuerta Dec 6, 2021
5a974fc
implementing search and remove methods // not fully implemented
EmilianoHuerta Dec 6, 2021
70a5332
adding in comments for functions
EmilianoHuerta Dec 6, 2021
2b14a92
implmenting new search method by title
EmilianoHuerta Dec 8, 2021
86bfe8a
grocery list now displays groceries on new lines
kate2724 Dec 9, 2021
5822539
added some notes
kate2724 Dec 9, 2021
9618022
added style elements to grocery list
kate2724 Dec 9, 2021
fee2519
fixed cuisine bug
jawhitelaw Dec 9, 2021
6161229
Merge branch 'UI-Dev' of https://github.com/mac-jake225-food/recipe-d…
jawhitelaw Dec 9, 2021
729067a
fixed typos
kate2724 Dec 9, 2021
868ba71
fully implement removal on events and current events
EmilianoHuerta Dec 9, 2021
e2604e6
Merge branch 'UI-Dev' of https://github.com/mac-jake225-food/recipe-d…
EmilianoHuerta Dec 9, 2021
3e22170
fixed empty list bug
kate2724 Dec 11, 2021
3143851
implemented button link to recipe, will develop further so that all s…
kate2724 Dec 11, 2021
0ab9756
displays links to saved recipes
kate2724 Dec 11, 2021
446fad7
fixing hour bug before 12pm
jawhitelaw Dec 11, 2021
d42ce1b
changed formatting
kate2724 Dec 12, 2021
a33b4a4
changed formatting to wrap excess buttons
kate2724 Dec 12, 2021
37dc51b
minor README edit
abigailstolp Dec 12, 2021
7f732b7
resized home page photo
abigailstolp Dec 13, 2021
ee276e3
pushing time fix
EmilianoHuerta Dec 13, 2021
59ec526
adding in spacing in title render
EmilianoHuerta Dec 13, 2021
5d0af9b
adding in updating saved recipes method from remove in calendar
EmilianoHuerta Dec 13, 2021
0dca226
pushing -- still render bug issue
EmilianoHuerta Dec 13, 2021
4cfee09
Merge branch 'UI-Dev' of https://github.com/mac-jake225-food/recipe-d…
EmilianoHuerta Dec 13, 2021
4517209
removing cs file
EmilianoHuerta Dec 13, 2021
ff28781
adding in sweet alert and css for it
EmilianoHuerta Dec 13, 2021
0e91d7f
updating node packages
EmilianoHuerta Dec 13, 2021
c757786
adding in comment with source for popup
EmilianoHuerta Dec 13, 2021
a9c613d
pushing time fix
EmilianoHuerta Dec 13, 2021
1a13ac4
installed sweetalert2
kate2724 Dec 13, 2021
d714a9d
fixed render issue on calendar that forced user to click off calendar…
kate2724 Dec 13, 2021
765d4be
update calendar state
kate2724 Dec 13, 2021
e0e6316
small edits
kate2724 Dec 13, 2021
1a90984
fixed bugs and improved user experience + ui
jawhitelaw Dec 14, 2021
6104b74
improved user experience on recipe page
jawhitelaw Dec 14, 2021
4f205c3
fixed too specifc profile bug
jawhitelaw Dec 14, 2021
5ae1780
fixed duplicate recipe bug
jawhitelaw Dec 14, 2021
b6984ff
updating imports alongside changing var states
EmilianoHuerta Dec 14, 2021
78099e2
removing unused code
EmilianoHuerta Dec 14, 2021
7aa4a84
implementing remove method for saved recipes
EmilianoHuerta Dec 14, 2021
df4d057
Merge branch 'UI-Dev' of https://github.com/mac-jake225-food/recipe-d…
EmilianoHuerta Dec 14, 2021
5e0d931
removing funciton
EmilianoHuerta Dec 14, 2021
c83f373
REAME reflects updates
abigailstolp Dec 14, 2021
42df747
Merge branch 'UI-Dev' of https://github.com/mac-jake225-food/recipe-d…
abigailstolp Dec 14, 2021
fa3e1ab
Update README
abigailstolp Dec 14, 2021
7060c82
Update README
abigailstolp Dec 14, 2021
73c39f8
Update README
abigailstolp Dec 14, 2021
f366a3b
adding in npm react success alert on saved button
EmilianoHuerta Dec 14, 2021
ca51524
Merge branch 'UI-Dev' of https://github.com/mac-jake225-food/recipe-d…
EmilianoHuerta Dec 14, 2021
25c2739
adding in source for alert
EmilianoHuerta Dec 14, 2021
58062f6
removing certain functions
EmilianoHuerta Dec 14, 2021
218e78a
updating with comments
EmilianoHuerta Dec 14, 2021
0a0ecfc
adding in space
EmilianoHuerta Dec 14, 2021
c3fa7bc
adding in source for alert
EmilianoHuerta Dec 14, 2021
563e8d3
removing unused imports
EmilianoHuerta Dec 14, 2021
f1b4f77
fixed no recipes on diet page bug
jawhitelaw Dec 14, 2021
c239076
Merge branch 'UI-Dev' of https://github.com/mac-jake225-food/recipe-d…
jawhitelaw Dec 14, 2021
9589177
removing unused file
EmilianoHuerta Dec 14, 2021
a8ab8bf
adding comments to all functions and necessary vars
EmilianoHuerta Dec 14, 2021
d1c81bc
Merge branch 'UI-Dev' of https://github.com/mac-jake225-food/recipe-d…
EmilianoHuerta Dec 14, 2021
af6169b
adding in comments
EmilianoHuerta Dec 14, 2021
4e16fec
fixed link bug
jawhitelaw Dec 14, 2021
3ab8d72
Merge branch 'UI-Dev' of https://github.com/mac-jake225-food/recipe-d…
jawhitelaw Dec 14, 2021
eea7367
adding in comments for app.js
EmilianoHuerta Dec 14, 2021
ac34580
Merge branch 'UI-Dev' of https://github.com/mac-jake225-food/recipe-d…
EmilianoHuerta Dec 14, 2021
d09b6c7
made comments and cleaned up code
jawhitelaw Dec 15, 2021
0d15b21
Merge branch 'UI-Dev' of https://github.com/mac-jake225-food/recipe-d…
jawhitelaw Dec 15, 2021
95c435e
adding comments
EmilianoHuerta Dec 15, 2021
dc114d9
Merge branch 'UI-Dev' of https://github.com/mac-jake225-food/recipe-d…
EmilianoHuerta Dec 15, 2021
8559ba8
fixed linking bug
jawhitelaw Dec 15, 2021
26b1bb8
Merge branch 'UI-Dev' of https://github.com/mac-jake225-food/recipe-d…
jawhitelaw Dec 15, 2021
d11652c
fixed bug
jawhitelaw Dec 15, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified .DS_Store
Binary file not shown.
40 changes: 38 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,40 @@
# Smart meal planner
# Smart Meal Planner

A meal planner that gives a customized recipe list based on the user's goals. It also gives the user a grocery list for all of the ingredients for all the meals.
> Welcome to the Smart Meal Planner, a comprehensive meal planner that gives a customized recipe list based on the user's goals. It also gives the user a grocery list for all of the ingredients for all the meals.


## How to use:

### STEP 1 – SET UP

There are some packages that need to be installed before you can get cooking. Type the following into the console, then procede to the next step:

```
npm install
```

### STEP 2- OPEN SITE
Type the following into the console to open the meal planner:

```
cd/recpie-app
npm start
```

### STEP 3 – GENERATE RECIPES

- Step 2 will have opened up the Smart Meal Planner.

- First, navigate to the 'Profile' page (use the side bar on the left) and fill out your dietary restrictions and preferences. Make sure to click 'Save' before continuing through the survey!

- When you have completed the profile to the best of your ability, navigate to the 'Recipe' page. From there, you will be given the choice to generate a single recipe using the 'New Recipe' button and can 'Save Recipe' to add it to your meal plan.

- The 'Calendar' and 'Grocery List' pages will reflect your personal choices and you will be able to explore and format your recipes from here on.

### Final Notes

This project was completed from September-December 2021 for COMP 225 by:
Abigail Stolp,
Emiliano Huerta,
Jason Whitelaw, and
Katelyn Breen
22 changes: 22 additions & 0 deletions node_modules/sweetalert2/LICENSE

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

54 changes: 54 additions & 0 deletions node_modules/sweetalert2/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading