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

[CS2113-F10-3] Meal360 #44

Open
wants to merge 402 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 232 commits
Commits
Show all changes
402 commits
Select commit Hold shift + click to select a range
e641c64
match actual & expected output
gurmankalkat Mar 23, 2023
ed0d983
fix json formatting
gurmankalkat Mar 23, 2023
486b3dc
fix actual vs expected bug
gurmankalkat Mar 23, 2023
1caa244
fix formatting of expected.txt
gurmankalkat Mar 23, 2023
0fc3ca6
Changes: Accepting ingredient name in 1 line
TopGun2001 Mar 23, 2023
c47d3bb
add back newline
gurmankalkat Mar 23, 2023
9ed5b90
runtest works
TopGun2001 Mar 23, 2023
3d5e0d5
add another newline
gurmankalkat Mar 23, 2023
bda1379
copy in new expected file
gurmankalkat Mar 23, 2023
7f98a2c
add back file
gurmankalkat Mar 23, 2023
fd161d8
add newline
gurmankalkat Mar 23, 2023
76650e8
delete test
gurmankalkat Mar 23, 2023
c8bf980
Merge branch 'master' of https://github.com/AY2223S2-CS2113-F10-3/tp …
JuneNita Mar 23, 2023
c8495be
Merge pull request #50 from gurmankalkat/master
jaredoong Mar 23, 2023
7e334f5
Merge branch 'master' into master
jaredoong Mar 23, 2023
1c16355
Merge pull request #45 from notbingsu/master
jaredoong Mar 23, 2023
85d8c49
removed assert statement in main
TopGun2001 Mar 23, 2023
47b9785
Fix merge conflicts
jaredoong Mar 23, 2023
44b3e1f
Merge branch 'TopGun2001-branch-level-1'
jaredoong Mar 23, 2023
c36f8ac
Merge branch 'master' into branch-level-1
jaredoong Mar 23, 2023
155f4ec
Merge pull request #51 from TopGun2001/branch-level-1
jaredoong Mar 23, 2023
c18ee6a
Fix merge conflicts
jaredoong Mar 23, 2023
11f155b
Edit sourcing of database
jaredoong Mar 23, 2023
02370d1
Merge pull request #48 from jaredoong/branch-weeklyplanner
JuneNita Mar 23, 2023
be798ad
Merge branch 'master' of https://github.com/AY2223S2-CS2113-F10-3/tp …
JuneNita Mar 23, 2023
f74e406
Fix merge conflicts
jaredoong Mar 23, 2023
d062a0c
update DG (add 'list' and 'tag')
JuneNita Mar 23, 2023
ed3ea1c
Merge pull request #52 from JuneNita/JuneNita-withUpstream
TopGun2001 Mar 24, 2023
e9e4f14
no message
TopGun2001 Mar 24, 2023
af30959
Merge https://github.com/AY2223S2-CS2113-F10-3/tp into branch-level-1
TopGun2001 Mar 24, 2023
c7a331a
update DG & some comments
gurmankalkat Mar 24, 2023
8deb970
DG
TopGun2001 Mar 24, 2023
81b743c
Merge pull request #54 from TopGun2001/branch-level-1
TopGun2001 Mar 24, 2023
96cbb98
Merge branch 'master' into master
gurmankalkat Mar 24, 2023
39abafa
Merge pull request #53 from gurmankalkat/master
gurmankalkat Mar 24, 2023
4158a14
add list and tag UML in DG
JuneNita Mar 24, 2023
61b9661
Merge pull request #56 from JuneNita/JuneNita-withUpstream
TopGun2001 Mar 24, 2023
4febdbe
edit the UML pic format
JuneNita Mar 24, 2023
6aaea52
Merge branch 'master' of https://github.com/AY2223S2-CS2113-F10-3/tp …
JuneNita Mar 25, 2023
2bcb810
Merge branch 'master' of https://github.com/AY2223S2-CS2113-F10-3/tp …
JuneNita Mar 25, 2023
2229d87
Merge branch 'master' of github.com:AY2223S2-CS2113-F10-3/tp
jaredoong Mar 27, 2023
eb273f3
Update Database
jaredoong Mar 28, 2023
cf03e59
add 'random function' and make it more readable
JuneNita Mar 29, 2023
75f9851
update error message
JuneNita Mar 29, 2023
4c743da
update UserGuide
JuneNita Mar 29, 2023
a84fb95
update develop guide
JuneNita Mar 29, 2023
a8ab6d4
Merge pull request #60 from JuneNita/JuneNita-withUpstream
jaredoong Mar 29, 2023
3d8f98f
Merge branch 'master' of github.com:AY2223S2-CS2113-F10-3/tp into enh…
jaredoong Mar 29, 2023
086e12d
no message
notbingsu Mar 29, 2023
6e4262e
Refactor weeklyplan code
jaredoong Mar 29, 2023
f7eea6a
Add commands
jaredoong Mar 29, 2023
3babe35
Merge branch 'master' of https://github.com/notbingsu/tp
notbingsu Mar 29, 2023
4f1862c
Fix JUnit test
jaredoong Mar 29, 2023
a042fec
added function to check available recipes and print available recipes
notbingsu Mar 30, 2023
34801c1
coding standards edit
notbingsu Mar 30, 2023
c9c67a6
add JUnit Test for 'random', and tagging
JuneNita Mar 30, 2023
b3e23b9
update format
JuneNita Mar 30, 2023
bb486a6
Merge pull request #64 from jaredoong/enhancements
JuneNita Mar 30, 2023
d38279b
fix delete syntax bug
gurmankalkat Mar 30, 2023
a8a7ac2
add sequence diagram for delete function
gurmankalkat Mar 30, 2023
1dfbfbd
no message
notbingsu Mar 30, 2023
9e09df1
add to help command
gurmankalkat Mar 30, 2023
392e82d
no message
notbingsu Mar 30, 2023
1d6064b
fix spacing error with delete command
gurmankalkat Mar 30, 2023
2426662
Edited the help commands. Updated user guide.
TopGun2001 Mar 30, 2023
16e9da2
Merge branch 'master' of https://github.com/notbingsu/tp
notbingsu Mar 30, 2023
e0dab7b
.
TopGun2001 Mar 30, 2023
b233f6b
Merge branch 'master' of https://github.com/AY2223S2-CS2113-F10-3/tp …
JuneNita Mar 30, 2023
6006182
no message
notbingsu Mar 30, 2023
a8e13c0
Merge pull request #70 from notbingsu/master
jaredoong Mar 30, 2023
c27d38a
Merge pull request #71 from JuneNita/JuneNita-BeforeSthGoneWrong
jaredoong Mar 30, 2023
0b3b62b
Merge branch 'master' into master
jaredoong Mar 30, 2023
fc4d8ec
Merge pull request #69 from TopGun2001/branch-level-1
jaredoong Mar 30, 2023
4a6f6bf
Add functionality improve user experience
jaredoong Mar 30, 2023
36831bd
Fix minor merge conflicts
jaredoong Mar 30, 2023
40ed60b
Merge pull request #74 from jaredoong/enhancements
notbingsu Mar 31, 2023
668d272
fix formatting of returned string from parseDeleteRecipe
gurmankalkat Mar 31, 2023
b27c750
fix merge conflicts
gurmankalkat Mar 31, 2023
5f6ba69
Merge branch 'master' into master
gurmankalkat Mar 31, 2023
7fde2d2
Merge pull request #68 from gurmankalkat/master
jaredoong Mar 31, 2023
c9418c2
Update parsing of user input
jaredoong Apr 1, 2023
c66f396
Bug fixes and minor updates to commands and user docs
jaredoong Apr 1, 2023
9675257
Update JUnit test and user docs
jaredoong Apr 2, 2023
989d7c4
Fix random errors with checks
jaredoong Apr 2, 2023
91873c7
Update JUnit and user docs
jaredoong Apr 2, 2023
1aaa865
Merge pull request #120 from jaredoong/JUnit-and-docs
jaredoong Apr 6, 2023
ef7c785
Merge branch 'master' of https://github.com/AY2223S2-CS2113-F10-3/tp …
JuneNita Apr 6, 2023
bdef727
Add junenita-PPP
JuneNita Apr 6, 2023
769bcb2
Add Jared-PPP
jaredoong Apr 6, 2023
5ef6e18
update the arrow of the activation bar
JuneNita Apr 6, 2023
f5ec952
Update DG
jaredoong Apr 6, 2023
0985a4f
Merge pull request #121 from JuneNita/JuneNita-BeforeSthGoneWrong
jaredoong Apr 6, 2023
8506220
update 'tag' UML pic
JuneNita Apr 6, 2023
b875663
Merge pull request #122 from JuneNita/JuneNita-updateUML
jaredoong Apr 6, 2023
1ce76a7
Merge pull request #123 from jaredoong/PPP-Jared
JuneNita Apr 6, 2023
d54ca58
fix errors with delete feature & add PPP
gurmankalkat Apr 6, 2023
f4f8982
update PPP
gurmankalkat Apr 6, 2023
074df16
Merge branch 'master' into master
gurmankalkat Apr 6, 2023
4757ebe
...
TopGun2001 Apr 7, 2023
4486b98
update link on aboutUs
JuneNita Apr 7, 2023
fe48d62
update Tag UI message
JuneNita Apr 7, 2023
4e77f23
modifiy tag test
JuneNita Apr 7, 2023
27dcfce
Created PPP. Updated the code based on practical dry run bugs.
TopGun2001 Apr 7, 2023
729c7dc
Merge pull request #126 from TopGun2001/branch-level-1
TopGun2001 Apr 7, 2023
dcb3a8d
Merge branch 'update-tag' into JuneNita-BeforeSthGoneWrong
JuneNita Apr 7, 2023
b993bf4
fix 'random' exception
JuneNita Apr 7, 2023
cffe7cb
fix formatting for error line
gurmankalkat Apr 7, 2023
8d5734b
Merge branch 'master' of https://github.com/gurmankalkat/tp
gurmankalkat Apr 7, 2023
23dd9a9
Merge pull request #124 from gurmankalkat/master
gurmankalkat Apr 7, 2023
f547e32
Merge pull request #125 from JuneNita/update-tag
gurmankalkat Apr 7, 2023
9d090a5
Merge pull request #127 from JuneNita/JuneNita-BeforeSthGoneWrong
gurmankalkat Apr 7, 2023
970005d
Changed PPP file name
TopGun2001 Apr 7, 2023
00f572a
Merge https://github.com/AY2223S2-CS2113-F10-3/tp into branch-level-1
TopGun2001 Apr 7, 2023
85bc5ae
Changed ppp file name.
TopGun2001 Apr 7, 2023
5ae6c61
New changes.
TopGun2001 Apr 7, 2023
6f8cc67
Merge pull request #128 from TopGun2001/branch-level-1
TopGun2001 Apr 7, 2023
8c6a47a
Update DG
jaredoong Apr 7, 2023
7e3284f
Merge branch 'master' of github.com:AY2223S2-CS2113-F10-3/tp into PPP…
jaredoong Apr 7, 2023
6f42a9c
Add manual testing to DG
jaredoong Apr 7, 2023
0ca2d82
Updated expected.txt to pass check
jaredoong Apr 7, 2023
35db581
Fix sequence diagram
jaredoong Apr 7, 2023
55d1a67
Update DG and PPP to reflect new changes
jaredoong Apr 7, 2023
97b62cd
Update Architecture diagram
jaredoong Apr 7, 2023
823b43c
Merge pull request #129 from jaredoong/PPP-Jared
JuneNita Apr 7, 2023
b8bcd73
Update README.md
jaredoong Apr 7, 2023
0e51967
Merge branch 'master' of https://github.com/AY2223S2-CS2113-F10-3/tp …
JuneNita Apr 7, 2023
3c08c62
update file path
JuneNita Apr 7, 2023
40ec18c
update file path
JuneNita Apr 7, 2023
2c7b656
Delete docs/UML/Implementation/randomFunction directory
JuneNita Apr 7, 2023
62f9458
Merge branch 'master' of https://github.com/AY2223S2-CS2113-F10-3/tp …
JuneNita Apr 7, 2023
2a1040a
Update Ui class diagram
notbingsu Apr 7, 2023
23a95ba
Rename Untitled Diagram.drawio to Ui class diagram
notbingsu Apr 7, 2023
51079bd
update Ui component in developer's guide
notbingsu Apr 7, 2023
fa2e037
Added UiClassDiagram.drawio.png
notbingsu Apr 7, 2023
e6df532
Ui component DG update
notbingsu Apr 7, 2023
c2af1c9
Merge branch 'master' of https://github.com/notbingsu/tp
notbingsu Apr 7, 2023
f75de59
Added Ui_sequencediagram.drawio
notbingsu Apr 7, 2023
575eedc
Added commandList.drawio.png
notbingsu Apr 7, 2023
388307a
Updated Ui component DG with UML
notbingsu Apr 7, 2023
ce6baa0
updated UI component in DG
notbingsu Apr 7, 2023
29fab49
Added parseDate.drawio
notbingsu Apr 7, 2023
bcd406b
Update parseDate.drawio
notbingsu Apr 7, 2023
ac26d02
Added parseDate.drawio.png
notbingsu Apr 7, 2023
4a97bf1
updated Parser component for DG
notbingsu Apr 7, 2023
243342f
Update parseDate.drawio
notbingsu Apr 7, 2023
4a77a56
Update parseDate.drawio
notbingsu Apr 7, 2023
84df99e
fixed issue where it is possible to have empty string as ingredient name
notbingsu Apr 7, 2023
3bdf000
checkstyle update
notbingsu Apr 7, 2023
7a5f765
update exception
JuneNita Apr 8, 2023
49c5f3c
Merge branch 'update-exception' into JuneNita-BeforeSthGoneWrong
JuneNita Apr 8, 2023
3500c5d
Merge branch 'JuneNita-BeforeSthGoneWrong' into documentation
JuneNita Apr 8, 2023
828ea84
edit UG, DG, portfolio
JuneNita Apr 8, 2023
4016e5e
Merge pull request #130 from notbingsu/master
jaredoong Apr 8, 2023
0249c2e
add JavaDoc
JuneNita Apr 8, 2023
f28e5e3
Merge branch 'master' of https://github.com/AY2223S2-CS2113-F10-3/tp …
JuneNita Apr 8, 2023
8a81be8
Merge branch 'master' of https://github.com/AY2223S2-CS2113-F10-3/tp …
JuneNita Apr 8, 2023
14ba6a6
edit ppp
JuneNita Apr 8, 2023
5eb47be
edit DG
JuneNita Apr 8, 2023
5a6d399
Merge pull request #133 from JuneNita/JuneNita-BeforeSthGoneWrong
jaredoong Apr 8, 2023
832f983
Merge branch 'master' into documentation
JuneNita Apr 8, 2023
bd8cecc
Merge pull request #134 from JuneNita/documentation
JuneNita Apr 8, 2023
d310558
Update DG
jaredoong Apr 8, 2023
abb7dd5
Fix merge conflicts
jaredoong Apr 8, 2023
1668fa7
Fix filepath for DG images
jaredoong Apr 8, 2023
73bfe53
Refactor adding,deleting of ingredients, and marking recipe as done
jaredoong Apr 8, 2023
27703a9
Update CG to reflect refactored code
jaredoong Apr 8, 2023
bd45e12
fix DeleteFunction diagram in DG
gurmankalkat Apr 8, 2023
70c11ee
Merge pull request #136 from gurmankalkat/master
jaredoong Apr 8, 2023
df4f6c9
Merge pull request #135 from jaredoong/PPP-Jared
gurmankalkat Apr 8, 2023
b998bc6
fix bug with adding recipe & update PPP
gurmankalkat Apr 8, 2023
5f520bc
clean up code
gurmankalkat Apr 8, 2023
4f13ce1
add more clarification to recipe error message
gurmankalkat Apr 8, 2023
c9b61d5
Merge branch 'master' into master
gurmankalkat Apr 8, 2023
8761cbc
add to DG
gurmankalkat Apr 8, 2023
acf08ab
Merge branch 'master' of https://github.com/gurmankalkat/tp
gurmankalkat Apr 8, 2023
588ca99
Merge pull request #137 from gurmankalkat/master
TopGun2001 Apr 9, 2023
59c0aa8
Added UML diagrams for add and edit functions. Updated User guide. Up…
TopGun2001 Apr 9, 2023
f4807d4
Merge branch 'master' into branch-level-1
TopGun2001 Apr 9, 2023
16cf258
Updated the HELP commands.
TopGun2001 Apr 9, 2023
61f182b
Updated my PPP.
TopGun2001 Apr 9, 2023
52b4a1c
Update UserGuide.md
jaredoong Apr 9, 2023
675fcfd
Update UserGuide.md
jaredoong Apr 9, 2023
a0c0e0d
Added documentation for methods.
TopGun2001 Apr 9, 2023
938e678
Merge branch 'master' into branch-level-1
TopGun2001 Apr 9, 2023
fe13354
Added documentation for a few methods.
TopGun2001 Apr 9, 2023
89b2509
Resolved merge conflict.
TopGun2001 Apr 9, 2023
cf3a7db
.
TopGun2001 Apr 9, 2023
1314394
Merge pull request #139 from TopGun2001/branch-level-1
TopGun2001 Apr 9, 2023
32a274c
Revert "Added UML diagrams for add and edit functions. Updated User g…
TopGun2001 Apr 9, 2023
1145635
Merge pull request #140 from AY2223S2-CS2113-F10-3/revert-139-branch-…
TopGun2001 Apr 9, 2023
1c6446b
Updated user guide.
TopGun2001 Apr 9, 2023
41947e5
Merge branch 'master' into branch-level-1
TopGun2001 Apr 9, 2023
edcb0ab
FINAL CHANGES.
TopGun2001 Apr 9, 2023
6eee34d
FINAL CHANGES.
TopGun2001 Apr 9, 2023
7af427a
Last Changes to UG.
TopGun2001 Apr 9, 2023
e8319b2
Last Changes made to UG.
TopGun2001 Apr 9, 2023
b365518
update help function to include "available" function
notbingsu Apr 9, 2023
7f970ca
Added documentation and made changes to user guide.
TopGun2001 Apr 9, 2023
687a447
Merge pull request #143 from TopGun2001/branch-level-1
TopGun2001 Apr 9, 2023
73fa537
Merge pull request #142 from notbingsu/master
TopGun2001 Apr 9, 2023
70a1a7f
Updated DG, UG, PPP.
TopGun2001 Apr 9, 2023
2fff64c
Update topgun2001.md
TopGun2001 Apr 9, 2023
7d64058
Added availableSequenceDiagram.drawio
notbingsu Apr 9, 2023
442e761
Merge pull request #144 from TopGun2001/branch-level-1
TopGun2001 Apr 9, 2023
3061566
DG
TopGun2001 Apr 9, 2023
dccb11a
Merge https://github.com/AY2223S2-CS2113-F10-3/tp into last-branch
TopGun2001 Apr 9, 2023
890d3bb
Merge pull request #145 from TopGun2001/last-branch
TopGun2001 Apr 9, 2023
26934bf
Added availableSequenceDiagram.drawio.png
notbingsu Apr 9, 2023
a0787b9
Delete Untitled Diagram.drawio
notbingsu Apr 9, 2023
344301e
Added availableSequenceDiagram.drawio
notbingsu Apr 9, 2023
626c892
Update availableSequenceDiagram.drawio
notbingsu Apr 9, 2023
13907cb
Update availableSequenceDiagram.drawio
notbingsu Apr 9, 2023
a5bf36b
update Implementation in DG with available function
notbingsu Apr 9, 2023
3939884
Merge branch 'master' of https://github.com/notbingsu/tp
notbingsu Apr 9, 2023
ed20e0c
Merge pull request #147 from notbingsu/master
jaredoong Apr 9, 2023
153c9ae
Update DG
jaredoong Apr 9, 2023
7fe8509
updated notbingsu PPP and link in AboutUs.md
notbingsu Apr 9, 2023
d1b3f87
Merge pull request #148 from jaredoong/DG-update
notbingsu Apr 9, 2023
0de4626
no message
notbingsu Apr 9, 2023
09be101
Merge pull request #149 from notbingsu/master
JuneNita Apr 9, 2023
a0c58ce
add more exception handling & testing for that, update PPP & DG
gurmankalkat Apr 9, 2023
68354d6
Merge branch 'master' into master
gurmankalkat Apr 9, 2023
6bae9ba
Merge pull request #150 from gurmankalkat/master
jaredoong Apr 9, 2023
5e150a6
Update author tgas
jaredoong Apr 9, 2023
8366baa
Merge branch 'master' into DG-Update
jaredoong Apr 9, 2023
7ca57cd
Merge pull request #151 from jaredoong/DG-Update
jaredoong Apr 9, 2023
d02c0ce
Fix visual bugs in UG and DG
jaredoong Apr 9, 2023
cfe9684
Merge branch 'DG-Update' of github.com:jaredoong/tp into DG-Update
jaredoong Apr 9, 2023
41c87ea
Merge branch 'master' of github.com:AY2223S2-CS2113-F10-3/tp into DG-…
jaredoong Apr 9, 2023
bdaaddd
Fix visual bugs in UG and DG
jaredoong Apr 9, 2023
b1c7f71
Merge pull request #152 from jaredoong/DG-Update
jaredoong Apr 9, 2023
4c1a113
Final edits made to add function. Updated help commands.
TopGun2001 Apr 10, 2023
d8ad4c7
Merge pull request #153 from TopGun2001/last-branch
TopGun2001 Apr 10, 2023
4d2827d
update PPP & DG
gurmankalkat Apr 10, 2023
be59e06
Merge pull request #154 from gurmankalkat/master
jaredoong Apr 10, 2023
3189add
Update DeveloperGuide.md
jaredoong Apr 10, 2023
b253c9a
Fix weekly planner bug
jaredoong Apr 10, 2023
80be25b
Merge pull request #155 from jaredoong/bugfixes
jaredoong Apr 10, 2023
b57c63d
Merge branch 'master' of https://github.com/AY2223S2-CS2113-F10-3/tp …
JuneNita Apr 10, 2023
d4aaff8
remove case-sensitive
JuneNita Apr 10, 2023
c453244
Merge pull request #156 from JuneNita/documentation
JuneNita Apr 10, 2023
4d4b558
fix help command for delete
gurmankalkat Apr 10, 2023
7be1971
Merge branch 'AY2223S2-CS2113-F10-3:master' into master
gurmankalkat Apr 10, 2023
9f7de54
Merge pull request #157 from gurmankalkat/master
gurmankalkat Apr 10, 2023
5933d39
Update error messages
jaredoong Apr 10, 2023
1ba76ba
Add graceful force exit
jaredoong Apr 10, 2023
d5b4a5a
Update PPP
jaredoong Apr 10, 2023
540139e
Fix PPP visual bug
jaredoong Apr 10, 2023
50135b2
Update testing to pass checks
jaredoong Apr 10, 2023
2c2df21
Merge pull request #158 from jaredoong/bugfixes
jaredoong Apr 10, 2023
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
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# Gradle build files
/.gradle/
/build/
src/main/resources/docs/
/src/main/resources/

# MacOS custom attributes files created by Finder
.DS_Store
Expand All @@ -15,3 +15,5 @@ bin/

/text-ui-test/ACTUAL.TXT
text-ui-test/EXPECTED-UNIX.TXT


3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"java.configuration.updateBuildConfiguration": "interactive"
}
3 changes: 3 additions & 0 deletions META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Manifest-Version: 1.0
Main-Class: seedu.meal360.Meal360

27 changes: 24 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ repositories {
}

dependencies {
implementation 'com.google.code.gson:gson:2.8.9'
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.5.0'
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.5.0'
}
Expand All @@ -29,18 +30,38 @@ test {
}

application {
mainClass = "seedu.duke.Duke"
mainClass = "seedu.meal360.Meal360"
}

shadowJar {
archiveBaseName = "duke"
archiveBaseName = "meal360"
archiveClassifier = null
}

checkstyle {
toolVersion = '10.2'
}

run{
run {
standardInput = System.in
enableAssertions = true
}

jar {
manifest {
attributes "Main-Class": "seedu.meal360.Meal360"
}

from {
configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
}
}

tasks.withType(Copy).all { duplicatesStrategy 'exclude' }

sourceSets {
main.java.srcDirs 'src/main/java'
main.resources.srcDirs 'src/main/resources'
test.java.srcDirs 'src/test/java'
test.resources.srcDirs 'src/test/resources'
}
1 change: 1 addition & 0 deletions database/recipesDatabase.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"ingredients":{"Salt":1,"Pepper":1,"Chicken":1,"Rice":1},"name":"Chicken Rice"},{"ingredients":{"Plain flour":2,"Breadcrumbs":100,"Vegetable oil":2,"Ripe mixed-colour cherry tomatoes ":250,"Flat-leaf parsley":15,"Garlic cloves":2,"Feta cheese":30,"Eggs":2},"name":"Tomato fritters"},{"ingredients":{"Puff pastry":1,"Mushrooms":250,"Onion":1,"Plain flour":2,"Butter":2,"Chicken breast fillets":2,"Milk":2},"name":"Chicken and mushroom pie"},{"ingredients":{"Prawns":500,"Mussels":500,"Onion":1,"Chicken stock":1,"Cherry tomatoes":250,"Vegetable oil":2,"Saffron":1,"Chorizo":100,"Garlic cloves":2,"Rice":1},"name":"Seafood paella"},{"ingredients":{"Salt":1,"Pepper":1,"Avocado":1,"Lemon":1,"Bread":2},"name":"Avocado toast"},{"ingredients":{"Dried rosemary":1,"Carrot":1,"Onion":1,"Dried parsley":1,"Chicken stock":1,"Dried basil":1,"Garlic cloves":2,"Dried thyme":1,"Parmesan cheese":1,"Celery":1,"Dried oregano":1,"Italian sausage":1,"Orzo":1},"name":"Italian sausage orzo soup"},{"ingredients":{"Mushrooms":250,"Onion":1,"Plain flour":2,"Butter":2,"Chicken breast fillets":2,"Pasta":1,"Garlic cloves":2,"Milk":2},"name":"Chicken and mushroom pasta"},{"ingredients":{"Salt":1,"Pepper":1,"Pasta":1,"Hummus":1,"Garlic cloves":2,"Lemon":1},"name":"Creamy Hummus Pasta"},{"ingredients":{"Cheddar cheese":1,"Potato":1,"Tomato sauce":1,"Onion":1,"Ground beef":1,"Tomato paste":1,"Garlic cloves":2,"Beef stock":1},"name":"Ground beef and potato casserole"},{"ingredients":{"Cheddar cheese":1,"Blue cheese":1,"Hot sauce":1,"Butter":2,"Chicken breast fillets":2,"Macaroni":1,"Flour":2,"Milk":2},"name":"Buffalo Chicken Mac \u0027n\u0027 Cheese"}]
1 change: 1 addition & 0 deletions database/userIngredientsDatabase.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"Salt":{"ingredientName":"Salt","ingredientCount":4,"expiryDate":{"year":2023,"month":4,"day":9},"expired":false},"Pepper":{"ingredientName":"Pepper","ingredientCount":4,"expiryDate":{"year":2023,"month":4,"day":9},"expired":false},"Chicken":{"ingredientName":"Chicken","ingredientCount":4,"expiryDate":{"year":2023,"month":4,"day":9},"expired":false},"Rice":{"ingredientName":"Rice","ingredientCount":4,"expiryDate":{"year":2023,"month":4,"day":9},"expired":false}}
1 change: 1 addition & 0 deletions database/weeklyPlanDatabase.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"chicken rice":2447,"avocado toast":50}
15 changes: 7 additions & 8 deletions docs/AboutUs.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
# About us

Display | Name | Github Profile | Portfolio
--------|:----:|:--------------:|:---------:
![](https://via.placeholder.com/100.png?text=Photo) | John Doe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
![](https://via.placeholder.com/100.png?text=Photo) | Don Joe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
![](https://via.placeholder.com/100.png?text=Photo) | Ron John | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
![](https://via.placeholder.com/100.png?text=Photo) | John Roe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
![](https://via.placeholder.com/100.png?text=Photo) | Don Roe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
Display | Name | Github Profile | Portfolio
--------|:------------------:|:--------------:|:---------:
![](https://via.placeholder.com/100.png?text=Photo) | Suresh Abijith Ram | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
![](https://via.placeholder.com/100.png?text=Photo) | Lu Bingyuan | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
![](https://via.placeholder.com/100.png?text=Photo) | Gurman Kalkat | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
![](https://via.placeholder.com/100.png?text=Photo) | Nita Chenvisuwat | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
![](https://via.placeholder.com/100.png?text=Photo) | Jared Oong | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
Loading