Skip to content

Automatically generate images #94

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

Open
wants to merge 305 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
305 commits
Select commit Hold shift + click to select a range
fa71db3
Adding CreateRecipe Page, MappedInputFieldsForm, cleaning Header & Ma…
sdutill Mar 22, 2024
835a908
Added recipe-creation-container class & styles
sdutill Mar 22, 2024
2ed4d76
Added SavedMeals to CreateRecipe page
sdutill Mar 22, 2024
ee52448
Refactored CreateRecipe page into new component
sdutill Mar 22, 2024
f7b15cb
Successfuly saves Custom Recipe to User's CustomRecipe Collection
sdutill Mar 22, 2024
eb9e75a
Created UserRecipesViewer
sdutill Mar 22, 2024
bc95f7f
Reformatted File Structure
sdutill Mar 22, 2024
f5fc92a
Merge pull request #11 from Capstone-Projects-2024-Spring/dev/shawn/u…
evandorsey1 Mar 22, 2024
3966bd7
first commit
evandorsey1 Mar 22, 2024
73b50c2
small update
aeskandary Mar 22, 2024
fedbad4
Removed white bar from the top of the screen
sdutill Mar 22, 2024
848bc6d
Merge pull request #12 from Capstone-Projects-2024-Spring/CP-9-White-…
evandorsey1 Mar 23, 2024
4fc1a56
TODO: also refactor to remove showDetails and replace the toggle func…
aeskandary Mar 23, 2024
202762b
savedMeal.instructions kept showing up as null, preventing the recipe…
aeskandary Mar 23, 2024
dc90ddf
adding cart, saving to cart, setting order date, saving orders
aeskandary Mar 24, 2024
237e6a5
Fixed type checking bug
sdutill Mar 24, 2024
64cf52e
Merge pull request #13 from Capstone-Projects-2024-Spring/CP-10-UserR…
sdutill Mar 24, 2024
c23c4c6
Merge remote-tracking branch 'origin/main' into aeCart
aeskandary Mar 25, 2024
7583e43
fixed quick order and saved meals not showing up after clicking, adde…
aeskandary Mar 25, 2024
f2164e6
fixed custom meals not appearing when clicked
aeskandary Mar 25, 2024
4ac6c33
moved cart code to a separate component to simplify the header; made …
aeskandary Mar 25, 2024
7f6f683
made cart items clickable; added check to prevent user from ordering …
aeskandary Mar 25, 2024
73f1268
Removed debugging log of cart contents, Can now submit orders for the…
sdutill Mar 25, 2024
4a52c30
setSelectedMeal to null after saving recipe to close the DetailView
sdutill Mar 25, 2024
3cdcadb
Merge pull request #14 from Capstone-Projects-2024-Spring/aeCart
sdutill Mar 25, 2024
3096f4b
Edited App.jsx and Header.jsx so recommendations
MikeDantuono Mar 25, 2024
9cbfa0b
Fixed GPT Key Issue
rltruth Mar 25, 2024
7080cce
Changed export name to reflect component & formatted with Prettier
sdutill Mar 25, 2024
8520364
Merge pull request #15 from Capstone-Projects-2024-Spring/dev/mike/gp…
sdutill Mar 25, 2024
2abed62
Branch contains code formatter with script
rltruth Mar 25, 2024
a203be1
Merge pull request #17 from Capstone-Projects-2024-Spring/dev/ryan/pr…
sdutill Mar 25, 2024
d135a19
added checks to prevent the application from breaking if the user is …
aeskandary Mar 26, 2024
75c83ae
forgot to run prettier
aeskandary Mar 26, 2024
be4b634
fixed css
evandorsey1 Mar 26, 2024
b40e2de
Merge branch 'main' into aeCart
aeskandary Mar 26, 2024
aa21441
fixing typo
aeskandary Mar 26, 2024
bf13058
/n
evandorsey1 Mar 27, 2024
969c346
Merge pull request #18 from Capstone-Projects-2024-Spring/dev/evan/Ma…
sdutill Mar 27, 2024
c9466e3
Removing useless stuff from Home page
sdutill Mar 27, 2024
3c1695b
Forgot this line
sdutill Mar 27, 2024
9c07a35
Refactored Project, created new page structure maintained across all …
sdutill Mar 27, 2024
d2ecb23
Merge pull request #19 from Capstone-Projects-2024-Spring/CP-49-Enfor…
evandorsey1 Mar 27, 2024
e5689ab
Cloud Functions & SendGrid Work, I can send myself an email as the cu…
sdutill Mar 27, 2024
210b408
Removed console logs
sdutill Mar 27, 2024
ab794f8
Merge pull request #20 from Capstone-Projects-2024-Spring/CP-57-Set-u…
rltruth Mar 27, 2024
b4f46ae
Cart Builds Orders and Sends them to Users
sdutill Mar 28, 2024
d982c53
Re-enabled cart emptying after order submission
sdutill Mar 28, 2024
12e69b8
Merge branch 'main' into aeBranch
aeskandary Mar 28, 2024
16d1dc4
CP-13 Merge branch 'main' into aeCart
aeskandary Mar 28, 2024
b4a9fd1
current work
valvardanyan Mar 28, 2024
74eaf03
changes
valvardanyan Mar 28, 2024
5b31926
Merge branch 'sign-in' into CP-60-Get-user-sign-in-working
valvardanyan Mar 28, 2024
539f8f1
prettier
aeskandary Mar 28, 2024
824c5d3
Merge pull request #21 from Capstone-Projects-2024-Spring/CP-66-Forma…
evandorsey1 Mar 28, 2024
2ee88f4
Merge branch 'main' into aeCart, ran prettier again
aeskandary Mar 28, 2024
273c4eb
all changes weren't properly staged
aeskandary Mar 28, 2024
17a8cee
Merge branch 'main' into aeBranch
aeskandary Mar 28, 2024
3b297a0
Merge branch 'aeBranch' of https://github.com/Capstone-Projects-2024-…
aeskandary Mar 28, 2024
bc99184
Merge pull request #22 from Capstone-Projects-2024-Spring/aeCart
evandorsey1 Mar 28, 2024
b9c68be
Removed Deprecated Component
sdutill Mar 28, 2024
67392b8
added sugar goal, got rid of negative values
evandorsey1 Mar 29, 2024
f83cfda
Merge pull request #23 from Capstone-Projects-2024-Spring/CP-84-Remov…
evandorsey1 Mar 29, 2024
401998b
Merge branch 'main' into CP-53-Disable-negative-nutrition-goal-values…
evandorsey1 Mar 29, 2024
9bc3b89
Merge pull request #24 from Capstone-Projects-2024-Spring/CP-53-Disab…
sdutill Mar 29, 2024
19e63bd
Store user response and gpt response in firebase.
MikeDantuono Mar 29, 2024
5fb82da
Pretty Sript branch, up to date with current main
rltruth Mar 30, 2024
2f6b767
Merge pull request #25 from Capstone-Projects-2024-Spring/ryan/dev/fi…
sdutill Mar 30, 2024
227a729
Response is now a JSON structure
rltruth Apr 1, 2024
b6ff336
trouble shooting signing
valvardanyan Apr 1, 2024
9248059
trouble shooting signing
valvardanyan Apr 1, 2024
807764b
goals remain saved, not stored yet
evandorsey1 Apr 1, 2024
a68ecff
imports
evandorsey1 Apr 2, 2024
0243295
pre-newobject
evandorsey1 Apr 2, 2024
754cbdb
user can save goals to profile, need to fix restrictions with maximum…
evandorsey1 Apr 2, 2024
6169a17
working sign in and out
valvardanyan Apr 2, 2024
a6882cf
Merge pull request #26 from Capstone-Projects-2024-Spring/CP-54-Store…
sdutill Apr 2, 2024
0a32658
Merge branch 'main' of https://github.com/Capstone-Projects-2024-Spri…
rltruth Apr 2, 2024
315e12d
Merge pull request #27 from Capstone-Projects-2024-Spring/CP-77-Enfor…
sdutill Apr 2, 2024
0311b75
CP-80: Calendar should save data to Firebase, calendar now saves data…
aeskandary Apr 2, 2024
ed4b5f3
Merge pull request #28 from Capstone-Projects-2024-Spring/CP-60-Get-u…
MikeDantuono Apr 2, 2024
48df915
added DisplayGoals.jsx
evandorsey1 Apr 3, 2024
489e7d7
prettier
evandorsey1 Apr 3, 2024
bd51824
added Display Goals to MacroGoals, need to read data
evandorsey1 Apr 3, 2024
2797dca
user can see goals, need to make goals display when page is refreshed
evandorsey1 Apr 3, 2024
7df3a52
Merge branch 'CP-55-Display-user-s-stored-nutritional-goals-with-List…
evandorsey1 Apr 3, 2024
ebb71b6
Removed Health.jsx
evandorsey1 Apr 3, 2024
ec06538
Input form set to edit if goals are already filled out, need to preve…
evandorsey1 Apr 3, 2024
bd18aa9
prevented user from entering negative input
evandorsey1 Apr 3, 2024
6960a2d
Merge branch 'main' into aeBranch
aeskandary Apr 4, 2024
d2a532e
CP-101 : making sure plans don't overwrite each other
aeskandary Apr 4, 2024
25cf25c
CP-102 : Fix plan count being incorrectly displayed on calendar
aeskandary Apr 4, 2024
3cf1bb5
removing unnecessary !important statements from css
aeskandary Apr 4, 2024
d4dfb3a
Merge branch 'main' into aeBranch
aeskandary Apr 4, 2024
7b852da
Merge pull request #29 from Capstone-Projects-2024-Spring/CP-55-Displ…
sdutill Apr 5, 2024
175443e
Added "getAllDocuments" function to FirebaseService; Implemented exam…
sdutill Apr 6, 2024
b782609
ChatGPT now gets user saved recipes in system message
rltruth Apr 6, 2024
608d841
removed console logging
rltruth Apr 6, 2024
d521d3a
Merge pull request #31 from Capstone-Projects-2024-Spring/CP-78-Get-S…
sdutill Apr 6, 2024
4a0b57d
Put Logout functionality into UserDropdown
sdutill Apr 6, 2024
2dcfad4
Merge branch 'main' of https://github.com/Capstone-Projects-2024-Spri…
sdutill Apr 6, 2024
b88eccb
Adding userAuth directly instead of passing state from Header unneces…
sdutill Apr 6, 2024
f6bbc10
Adding UserDropdown Component
sdutill Apr 6, 2024
3417559
Merge pull request #32 from Capstone-Projects-2024-Spring/CP-103-Put-…
rltruth Apr 6, 2024
201a5ca
Successfully created OrderHistory components, everything runs without…
sdutill Apr 6, 2024
18871a8
Added OrderHistory to UserDropdown
sdutill Apr 6, 2024
1488b10
I don't know why this has to be this way but it does.
sdutill Apr 6, 2024
58899bb
Moving function definition outside of hook
sdutill Apr 6, 2024
64254ba
Adding ID of each document returned
sdutill Apr 6, 2024
3122049
Adding .data reference to what's returned by getAllDocuments
sdutill Apr 6, 2024
e7868c3
Removing log
sdutill Apr 6, 2024
a9b31a7
Removed placeholder options for dropdown
sdutill Apr 6, 2024
d024b88
Adding shitty styling to tell components apart
sdutill Apr 6, 2024
de01e24
Merge pull request #34 from Capstone-Projects-2024-Spring/CP-85-Add-c…
rltruth Apr 7, 2024
94bfa41
Merge branch 'main' of https://github.com/Capstone-Projects-2024-Spri…
sdutill Apr 7, 2024
a340235
Merge pull request #33 from Capstone-Projects-2024-Spring/CP-65-Creat…
rltruth Apr 7, 2024
69fc20f
Made side-container and content-container have a fixed hight, and add…
sdutill Apr 7, 2024
ef59aed
Changed name to UserDataViewer
sdutill Apr 7, 2024
f6341cf
Enforced new layout so that the UserDataViewer is no longer rendered …
sdutill Apr 7, 2024
2b8e419
Merge pull request #35 from Capstone-Projects-2024-Spring/CP-105-Prev…
rltruth Apr 7, 2024
da60cae
Search results now span the entire width of the container
sdutill Apr 7, 2024
1b01407
Merge pull request #36 from Capstone-Projects-2024-Spring/CP-113-Have…
rltruth Apr 7, 2024
f3f081a
Function to get user saved recipe moved within handlesSubmit block so…
rltruth Apr 7, 2024
6e991d2
Merge branch 'main' of https://github.com/Capstone-Projects-2024-Spri…
rltruth Apr 7, 2024
dcef021
Displayed all the stored data for each recipe and styeld it to be pre…
MikeDantuono Apr 7, 2024
a43b331
Simple Ingredient Search implemented
sdutill Apr 7, 2024
1955078
Merge branch 'main' of https://github.com/Capstone-Projects-2024-Spri…
sdutill Apr 7, 2024
61158ee
Moved MealCard, removed summary / description
sdutill Apr 7, 2024
75d9453
Merge pull request #37 from Capstone-Projects-2024-Spring/CP-89-Chang…
sdutill Apr 7, 2024
4992d57
Merge branch 'main' of https://github.com/Capstone-Projects-2024-Spri…
sdutill Apr 7, 2024
4a5ce0f
Added EmptyCollectionMessage component that redirects the user to whe…
sdutill Apr 7, 2024
14546a1
Merge pull request #38 from Capstone-Projects-2024-Spring/CP-67-Set-u…
rltruth Apr 7, 2024
5bc5f4e
Merge branch 'main' of https://github.com/Capstone-Projects-2024-Spri…
rltruth Apr 7, 2024
c4489d9
Merge pull request #39 from Capstone-Projects-2024-Spring/CP-107-Add-…
rltruth Apr 7, 2024
f15ef4f
Merge branch 'main' of https://github.com/Capstone-Projects-2024-Spri…
sdutill Apr 7, 2024
af64d23
Merge pull request #40 from Capstone-Projects-2024-Spring/CP-112-Put-…
sdutill Apr 7, 2024
eb8a6e9
Merge branch 'main' into aeBranch
aeskandary Apr 9, 2024
46db5b2
removed space under navbar, restructured calendar page for consistenc…
aeskandary Apr 9, 2024
c386cb5
Stored ChatGPT response in a container and made the response readable…
MikeDantuono Apr 9, 2024
c92838d
CP-119: Removing plans from firebase
aeskandary Apr 9, 2024
113fd46
Merge pull request #41 from Capstone-Projects-2024-Spring/aeBranch
sdutill Apr 9, 2024
398c258
Merge branch 'main' of https://github.com/Capstone-Projects-2024-Spri…
sdutill Apr 9, 2024
f793388
Merge pull request #42 from Capstone-Projects-2024-Spring/CP-117-Stor…
sdutill Apr 9, 2024
9b9f2b1
removed home page, login/sign up now leads to search page
aeskandary Apr 10, 2024
0b6ce9e
removed health/nutrition for demo
aeskandary Apr 10, 2024
7daefdd
First minor update to better creation page
sdutill Apr 10, 2024
1d388bc
Added basic loading indication, fixed generated recipes not saving to…
rltruth Apr 10, 2024
5b01b09
minor changes
rltruth Apr 10, 2024
391b04d
Fixed the mapped-input-fields a little bit
sdutill Apr 10, 2024
0387aa7
Extracted Styling to css files
sdutill Apr 11, 2024
a909230
creation page CSS tweaks
sdutill Apr 11, 2024
54d0e84
Extracted all the css for CreateRecipe page
sdutill Apr 11, 2024
4a10d11
updates to style of CreateRecipe page
sdutill Apr 11, 2024
6c326c1
aligning input
sdutill Apr 11, 2024
bff3f1e
Did this fix login?
sdutill Apr 11, 2024
bc43ec9
Attempts to fix loging routing shit
sdutill Apr 11, 2024
c0c7bfa
Fixed link
sdutill Apr 11, 2024
f047bb8
Removed Search Filter
sdutill Apr 11, 2024
7319252
Attempted to change email Subject
sdutill Apr 11, 2024
5afef1b
Merge pull request #43 from Capstone-Projects-2024-Spring/demo-branch
rltruth Apr 12, 2024
42da50c
Refactored GPT component; Now only takes in the selected dish type an…
sdutill Apr 14, 2024
11e98c4
First major update to HTML on Recommendations page
sdutill Apr 14, 2024
076bc29
Merge pull request #44 from Capstone-Projects-2024-Spring/CP-139-Crea…
evandorsey1 Apr 14, 2024
cc917c7
add to cart button animation
valvardanyan Apr 15, 2024
c13f0ce
Modified Certain Aspects of Response
rltruth Apr 15, 2024
0e3fe05
Fixed repetition problem temporarily. NOT A COST EFFECTIVE SOLUTION
rltruth Apr 15, 2024
9d74d79
Merge pull request #45 from Capstone-Projects-2024-Spring/CP-132-Indi…
evandorsey1 Apr 15, 2024
0ed6eab
Save to transition saved works. Need to configure functionality and s…
evandorsey1 Apr 15, 2024
37b583f
Added Ingredients and fake-timestamp (genuinely no idea if GPT has th…
rltruth Apr 15, 2024
0116e14
Turned email into an ingredient checklist.
evandorsey1 Apr 16, 2024
f846a72
meal cards have a minimum size
valvardanyan Apr 16, 2024
9365a60
Merge pull request #48 from Capstone-Projects-2024-Spring/CP-130-Fix-…
evandorsey1 Apr 16, 2024
9e8a468
added color palette
valvardanyan Apr 16, 2024
5d8b562
restricts meal card in less lines of code
valvardanyan Apr 16, 2024
3c37b0c
Added instructions to Home Page, added home page back to header and app
evandorsey1 Apr 16, 2024
24c9aee
Removed Response History, Removed saving GPT document, added new Gene…
sdutill Apr 16, 2024
ceb7b3c
Merge pull request #49 from Capstone-Projects-2024-Spring/CP-130-Fix-…
sdutill Apr 16, 2024
4ab12c8
Merge branch 'main' of https://github.com/Capstone-Projects-2024-Spri…
sdutill Apr 16, 2024
dfdf293
Merge pull request #47 from Capstone-Projects-2024-Spring/CP-136-Rede…
sdutill Apr 16, 2024
adce369
Merge branch 'main' of https://github.com/Capstone-Projects-2024-Spri…
sdutill Apr 16, 2024
6d02752
Fixed some links that would have been misdirected
sdutill Apr 16, 2024
4cc775b
Merge pull request #50 from Capstone-Projects-2024-Spring/CP-126-DRAF…
sdutill Apr 16, 2024
ae3c72c
Merge branch 'main' of https://github.com/Capstone-Projects-2024-Spri…
sdutill Apr 16, 2024
c467092
Merge pull request #46 from Capstone-Projects-2024-Spring/CP-131-Indi…
sdutill Apr 16, 2024
68c8f57
more colors
valvardanyan Apr 16, 2024
9d7926e
Merge remote-tracking branch 'origin/main' into CP-133-Create-Enforce…
valvardanyan Apr 16, 2024
a528110
font added
valvardanyan Apr 16, 2024
4449727
Merge pull request #51 from Capstone-Projects-2024-Spring/CP-141-Rede…
sdutill Apr 16, 2024
403c550
adding shift-click to select date ranges in the planner
aeskandary Apr 18, 2024
dacfad5
Merge pull request #52 from Capstone-Projects-2024-Spring/CP-162-Add-…
sdutill Apr 18, 2024
fa09cf4
Moved CSS file; made calendar smaller, added a button for the Nutriti…
sdutill Apr 18, 2024
c3c133d
added ability to view meals of a date range
aeskandary Apr 18, 2024
7ebb04b
Nutrition Modal opens on button click
sdutill Apr 18, 2024
149ab2c
Merge pull request #53 from Capstone-Projects-2024-Spring/CP-151-Add-…
aeskandary Apr 18, 2024
8628f45
Added meal cards to generated gpt responses.
MikeDantuono Apr 19, 2024
f87b19a
adding font and sidebar design
valvardanyan Apr 19, 2024
f9a1736
Merge remote-tracking branch 'origin/main' into CP-133-Create-Enforce…
valvardanyan Apr 19, 2024
0f904f9
We make images now baby
rltruth Apr 20, 2024
aa83efc
Fixed Box Issues, broke details
rltruth Apr 20, 2024
e3cd33a
unbroke details, removed tool-tips
rltruth Apr 21, 2024
e3393ce
Merge pull request #54 from Capstone-Projects-2024-Spring/CP-148-Put-…
rltruth Apr 21, 2024
c971d95
Full Size Images by removing aspect ratio in CSS
rltruth Apr 21, 2024
0420efa
Handled the case where the ingredient string doesn't have the expecte…
sdutill Apr 21, 2024
f3f3ff7
added initial theme and font for reference
valvardanyan Apr 21, 2024
b6b9468
Fixing CSS of response containers
sdutill Apr 21, 2024
d6e9fbe
Merge pull request #55 from Capstone-Projects-2024-Spring/CP-122-Gene…
sdutill Apr 21, 2024
2a1629e
Merge branch 'main' of https://github.com/Capstone-Projects-2024-Spri…
sdutill Apr 21, 2024
1289bb3
Merge pull request #56 from Capstone-Projects-2024-Spring/CP-133-Crea…
sdutill Apr 21, 2024
33696ba
Merge branch 'main' into CP-152-Generate-Order-from-meals-planned-wit…
aeskandary Apr 22, 2024
977dd6e
added scroll to planned meals section, moved date
aeskandary Apr 22, 2024
8e407be
removed recc meal option, added support for displaying custom meals
aeskandary Apr 22, 2024
a6743ab
changed the way plans are saved in the calendar to include all recipe…
aeskandary Apr 22, 2024
939da07
making it so that recipedetails opens when the details button is clic…
aeskandary Apr 22, 2024
28f2a7d
adding date selector
aeskandary Apr 22, 2024
fd63a0a
meals can now be ordered from the calendar, both for individual days …
aeskandary Apr 22, 2024
964e896
conditionally rendering the order meals button if there are meals to …
aeskandary Apr 22, 2024
cbd863b
/
evandorsey1 Apr 22, 2024
33c4a83
added old Health skeleton
evandorsey1 Apr 22, 2024
7cf5624
fixed logic, need to style with css
evandorsey1 Apr 22, 2024
27c2c21
fixed some functionality, need CSS fixing
evandorsey1 Apr 22, 2024
4b78800
Merge pull request #57 from Capstone-Projects-2024-Spring/CP-156-Add-…
sdutill Apr 22, 2024
4f013dd
small css edit, renamed some classes for clarity + added hover effect…
aeskandary Apr 22, 2024
d411740
formatted syntax
aeskandary Apr 22, 2024
acbb85c
Merge branch 'main' into CP-152-Generate-Order-from-meals-planned-wit…
aeskandary Apr 22, 2024
9cdc73a
Merge branch 'main' into CP-152-Generate-Order-from-meals-planned-wit…
aeskandary Apr 22, 2024
aad71bd
Merge pull request #58 from Capstone-Projects-2024-Spring/CP-152-Gene…
rltruth Apr 23, 2024
a01a2ef
/
evandorsey1 Apr 24, 2024
21cde1e
//
evandorsey1 Apr 24, 2024
0e9a6a5
///
evandorsey1 Apr 24, 2024
32b7323
sending calendar's recipe info to nutrition modal
aeskandary Apr 24, 2024
1c5ec25
running prettier
aeskandary Apr 24, 2024
e551b08
Adding examples on how to access the recipes object passed into the h…
sdutill Apr 24, 2024
88eff5c
Use these two to make the requests to Spoonacular
sdutill Apr 24, 2024
8233ab1
Merge pull request #59 from Capstone-Projects-2024-Spring/send-cal-re…
aeskandary Apr 24, 2024
b7f68dd
merge Ali and Shawn from 4/24
evandorsey1 Apr 24, 2024
74357d3
bug fixed
evandorsey1 Apr 24, 2024
ff27b0e
generate dal-e images all at once
rltruth Apr 24, 2024
e6f7fbe
quick stash
evandorsey1 Apr 24, 2024
3038069
Displays macros, but only by recipe for now
evandorsey1 Apr 25, 2024
d15af16
Displays total macros
evandorsey1 Apr 25, 2024
d30d536
Displays total macros using MealDataManager, I need to go back and re…
evandorsey1 Apr 25, 2024
9e05ee0
Displays total macros using MealDataManager, I need to go back and re…
evandorsey1 Apr 25, 2024
cd92248
Displays total macros using MealDataManager, I need to go back and re…
evandorsey1 Apr 25, 2024
51c5904
Side container established and meals saved to firebase
MikeDantuono Apr 25, 2024
a1b71bc
Displays total macros using MealDataManager, I need to go back and re…
evandorsey1 Apr 25, 2024
d831236
Fixed bug where generated recipes weren't able to be deleted due to w…
sdutill Apr 25, 2024
9b01d94
Merge pull request #60 from Capstone-Projects-2024-Spring/CP-155-Perf…
sdutill Apr 25, 2024
d068899
Merge pull request #61 from Capstone-Projects-2024-Spring/CP-150-Savi…
valvardanyan Apr 25, 2024
95742b5
removing option to select custom recipes on the calendar. simplified …
aeskandary Apr 25, 2024
f8b0b12
Merge pull request #62 from Capstone-Projects-2024-Spring/remove-cust…
rltruth Apr 25, 2024
ab0b99d
Merge branch 'main' into automaticallyGenerateImages
sdutill Apr 26, 2024
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
5 changes: 5 additions & 0 deletions .firebaserc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"projects": {
"default": "cookbook-pro-49b95"
}
}
20 changes: 10 additions & 10 deletions .github/actions/spelling/README.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# check-spelling/check-spelling configuration

File | Purpose | Format | Info
-|-|-|-
[dictionary.txt](dictionary.txt) | Replacement dictionary (creating this file will override the default dictionary) | one word per line | [dictionary](https://github.com/check-spelling/check-spelling/wiki/Configuration#dictionary)
[allow.txt](allow.txt) | Add words to the dictionary | one word per line (only letters and `'`s allowed) | [allow](https://github.com/check-spelling/check-spelling/wiki/Configuration#allow)
[reject.txt](reject.txt) | Remove words from the dictionary (after allow) | grep pattern matching whole dictionary words | [reject](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-reject)
[excludes.txt](excludes.txt) | Files to ignore entirely | perl regular expression | [excludes](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-excludes)
[only.txt](only.txt) | Only check matching files (applied after excludes) | perl regular expression | [only](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-only)
[patterns.txt](patterns.txt) | Patterns to ignore from checked lines | perl regular expression (order matters, first match wins) | [patterns](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-patterns)
[expect.txt](expect.txt) | Expected words that aren't in the dictionary | one word per line (sorted, alphabetically) | [expect](https://github.com/check-spelling/check-spelling/wiki/Configuration#expect)
[advice.md](advice.md) | Supplement for GitHub comment when unrecognized words are found | GitHub Markdown | [advice](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-advice)
| File | Purpose | Format | Info |
| -------------------------------- | -------------------------------------------------------------------------------- | --------------------------------------------------------- | ---------------------------------------------------------------------------------------------------- |
| [dictionary.txt](dictionary.txt) | Replacement dictionary (creating this file will override the default dictionary) | one word per line | [dictionary](https://github.com/check-spelling/check-spelling/wiki/Configuration#dictionary) |
| [allow.txt](allow.txt) | Add words to the dictionary | one word per line (only letters and `'`s allowed) | [allow](https://github.com/check-spelling/check-spelling/wiki/Configuration#allow) |
| [reject.txt](reject.txt) | Remove words from the dictionary (after allow) | grep pattern matching whole dictionary words | [reject](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-reject) |
| [excludes.txt](excludes.txt) | Files to ignore entirely | perl regular expression | [excludes](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-excludes) |
| [only.txt](only.txt) | Only check matching files (applied after excludes) | perl regular expression | [only](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-only) |
| [patterns.txt](patterns.txt) | Patterns to ignore from checked lines | perl regular expression (order matters, first match wins) | [patterns](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-patterns) |
| [expect.txt](expect.txt) | Expected words that aren't in the dictionary | one word per line (sorted, alphabetically) | [expect](https://github.com/check-spelling/check-spelling/wiki/Configuration#expect) |
| [advice.md](advice.md) | Supplement for GitHub comment when unrecognized words are found | GitHub Markdown | [advice](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-advice) |

Note: you can replace any of these files with a directory by the same name (minus the suffix)
and then include multiple files inside that directory (with that suffix) to merge multiple files together.
12 changes: 6 additions & 6 deletions .github/actions/spelling/advice.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@
<details><summary>If you see a bunch of garbage</summary>

If it relates to a ...

<details><summary>well-formed pattern</summary>

See if there's a [pattern](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-patterns) that would match it.

If not, try writing one and adding it to the `patterns.txt` file.

Patterns are Perl 5 Regular Expressions - you can [test](
https://www.regexplanet.com/advanced/perl/) yours before committing to verify it will match your lines.
Patterns are Perl 5 Regular Expressions - you can [test](https://www.regexplanet.com/advanced/perl/) yours before committing to verify it will match your lines.

Note that patterns can't match multiline strings.

</details>
<details><summary>binary-ish string</summary>

Please add a file path to the `excludes.txt` file instead of just accepting the garbage.

File paths are Perl 5 Regular Expressions - you can [test](
https://www.regexplanet.com/advanced/perl/) yours before committing to verify it will match your files.
File paths are Perl 5 Regular Expressions - you can [test](https://www.regexplanet.com/advanced/perl/) yours before committing to verify it will match your files.

`^` refers to the file's path from the root of the repository, so `^README\.md$` would exclude [README.md](../tree/HEAD/README.md) (on whichever branch you're using).

`^` refers to the file's path from the root of the repository, so `^README\.md$` would exclude [README.md](
../tree/HEAD/README.md) (on whichever branch you're using).
</details>

</details>
24 changes: 12 additions & 12 deletions .github/workflows/contribute.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# disabled
on:
push:
branches: '' # < remove and add 'main' to re enable
push:
branches: "" # < remove and add 'main' to re enable

jobs:
contrib-readme-job:
runs-on: ubuntu-latest
name: A job to automate contrib in readme
steps:
- name: Contribute List
uses: applebaumian/contributors-readme-action@jsx-compatible
with:
comment_style: "link"
env:
GITHUB_TOKEN: ${{ secrets.TOKEN }}
contrib-readme-job:
runs-on: ubuntu-latest
name: A job to automate contrib in readme
steps:
- name: Contribute List
uses: applebaumian/contributors-readme-action@jsx-compatible
with:
comment_style: "link"
env:
GITHUB_TOKEN: ${{ secrets.TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: Deploy Docs

on:
push:
branches: [ "main" ]
branches: ["main"]
jobs:
deploy:
runs-on: ubuntu-latest
Expand Down
40 changes: 19 additions & 21 deletions .github/workflows/spelling.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: Spell checking
on:
push:
branches: ''
branches: ""
# pull_request_target:
# push:
# issue_comment:
Expand All @@ -13,27 +13,26 @@ jobs:
name: Spell checking
runs-on: ubuntu-latest
steps:
- name: checkout-merge
if: "contains(github.event_name, 'pull_request')"
uses: actions/checkout@v2
with:
ref: refs/pull/${{github.event.pull_request.number}}/merge
- name: checkout
if: ${{ github.event_name == 'push' ||
(
- name: checkout-merge
if: "contains(github.event_name, 'pull_request')"
uses: actions/checkout@v2
with:
ref: refs/pull/${{github.event.pull_request.number}}/merge
- name: checkout
if: ${{ github.event_name == 'push' ||
(
contains(github.event.comment.body, '@check-spelling-bot apply')
) }}
uses: actions/checkout@v2
- uses: check-spelling/check-spelling@v0.0.20
id: spelling
if: ${{ github.event_name != 'issue_comment' ||
(
) }}
uses: actions/checkout@v2
- uses: check-spelling/check-spelling@v0.0.20
id: spelling
if: ${{ github.event_name != 'issue_comment' ||
(
contains(github.event.comment.body, '@check-spelling-bot apply')
) }}
with:
experimental_apply_changes_via_bot: 1
extra_dictionaries:
cspell:cpp/cpp.txt
) }}
with:
experimental_apply_changes_via_bot: 1
extra_dictionaries: cspell:cpp/cpp.txt
cspell:html/html.txt
cspell:css/css.txt
cspell:filetypes/filetypes.txt
Expand All @@ -52,4 +51,3 @@ jobs:
cspell:ruby/ruby.txt
cspell:python/python.txt
cspell:node/node.txt

6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,9 @@
.env.development.local
.env.test.local
.env.production.local

# New Ignores
.env
node_modules
build
.firebase
3 changes: 3 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Ignore artifacts:
build
coverage
1 change: 1 addition & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
<div align="center">

# Project Name
# CookBook Pro

[![Report Issue on Jira](https://img.shields.io/badge/Report%20Issues-Jira-0052CC?style=flat&logo=jira-software)](https://temple-cis-projects-in-cs.atlassian.net/jira/software/c/projects/DT/issues)
[![Deploy Docs](https://github.com/ApplebaumIan/tu-cis-4398-docs-template/actions/workflows/deploy.yml/badge.svg)](https://github.com/ApplebaumIan/tu-cis-4398-docs-template/actions/workflows/deploy.yml)
[![Documentation Website Link](https://img.shields.io/badge/-Documentation%20Website-brightgreen)](https://applebaumian.github.io/tu-cis-4398-docs-template/)


</div>


## Keywords

Section #, as well as any words that quickly give your peers insights into the application like programming language, development platform, type of application, etc.
Expand All @@ -35,7 +34,8 @@ Discuss what you need to develop this project. This includes background informat

## Collaborators

[//]: # ( readme: collaborators -start )
[//]: # " readme: collaborators -start "

<table>
<tr>
<td align="center">
Expand All @@ -62,4 +62,4 @@ Discuss what you need to develop this project. This includes background informat
</tr>
</table>

[//]: # ( readme: collaborators -end )
[//]: # " readme: collaborators -end "
1 change: 1 addition & 0 deletions android-app/ComposeGoogleSignInCleanArchitecture
Submodule ComposeGoogleSignInCleanArchitecture added at 6727b9
15 changes: 15 additions & 0 deletions android-app/CookBookPro/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
*.iml
.gradle
/local.properties
/.idea/caches
/.idea/libraries
/.idea/modules.xml
/.idea/workspace.xml
/.idea/navEditor.xml
/.idea/assetWizardSettings.xml
.DS_Store
/build
/captures
.externalNativeBuild
.cxx
local.properties
6 changes: 6 additions & 0 deletions android-app/CookBookPro/.idea/compiler.xml

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

23 changes: 23 additions & 0 deletions android-app/CookBookPro/.idea/deploymentTargetDropDown.xml

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

19 changes: 19 additions & 0 deletions android-app/CookBookPro/.idea/gradle.xml

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

6 changes: 6 additions & 0 deletions android-app/CookBookPro/.idea/kotlinc.xml

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

10 changes: 10 additions & 0 deletions android-app/CookBookPro/.idea/migrations.xml

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

9 changes: 9 additions & 0 deletions android-app/CookBookPro/.idea/misc.xml

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

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

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

6 changes: 6 additions & 0 deletions android-app/CookBookPro/.idea/vcs.xml

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

1 change: 1 addition & 0 deletions android-app/CookBookPro/app/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build
Loading