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-F13-1] Taste of Mom's #49

Open
wants to merge 463 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 150 commits
Commits
Show all changes
463 commits
Select commit Hold shift + click to select a range
8dd61fa
Merge pull request #63 from YatPang/master
liuziyang020319 Mar 30, 2023
82feaef
Strips all leading spaces and converts command words to lower case to…
Aung-Phone-Naing Apr 1, 2023
1529e90
Adds link tto Jar file
Aung-Phone-Naing Apr 1, 2023
38f0529
Fixes minor gramatical error when viewing some dishes with a flavor t…
Aung-Phone-Naing Apr 1, 2023
ae028cb
Merge branch 'master' into PE-D-Fixes-Branch
liuziyang020319 Apr 1, 2023
ad1a983
Fixes expected output for viewing recipe
Aung-Phone-Naing Apr 1, 2023
d5bfaeb
Merge branch 'PE-D-Fixes-Branch' of https://github.com/Aung-Phone-Nai…
Aung-Phone-Naing Apr 1, 2023
4b7abc5
Merge pull request #106 from Aung-Phone-Naing/PE-D-Fixes-Branch
liuziyang020319 Apr 1, 2023
758a79e
Fix Issues #92, #102, #103
YatPang Apr 1, 2023
287f24d
Fix Issues #92, #102, #103
YatPang Apr 1, 2023
d167880
Fix Issues #92, #97, #102, #103
YatPang Apr 1, 2023
dbcd99f
Fetch add edit feature
liuziyang020319 Apr 1, 2023
1a7f3a4
Fix Issues #69, #92, #97, #102, #103
YatPang Apr 1, 2023
698397e
Fix Issues #69, #92, #97, #102, #103
YatPang Apr 1, 2023
268fd28
Fix Issues #69, #92, #97, #102, #103
YatPang Apr 1, 2023
ff3d52b
Fix Issues #69, #92, #97, #102, #103
YatPang Apr 1, 2023
4ba790f
Merge pull request #107 from YatPang/master
Aung-Phone-Naing Apr 1, 2023
13291d7
Follow-Up on #107
YatPang Apr 1, 2023
043e560
Follow-Up on #107
YatPang Apr 1, 2023
bdd960a
Merge pull request #108 from YatPang/master
Aung-Phone-Naing Apr 1, 2023
76007db
Merge branch 'master' of https://github.com/AY2223S2-CS2113-F13-1/tp
liuziyang020319 Apr 2, 2023
d00512d
Fetch: Add edit method
liuziyang020319 Apr 2, 2023
1b37db9
Fix Issues #83
YatPang Apr 2, 2023
4705697
Merge pull request #110 from YatPang/master
LimHongYao Apr 3, 2023
dd4a982
Fixed out of bounds handling for ingredientList
LimHongYao Apr 3, 2023
05ca1b2
Removes the SAVE SUCCESS srtring from file writing method,
Aung-Phone-Naing Apr 3, 2023
e2a9086
Changes VIEW command instruction
Aung-Phone-Naing Apr 3, 2023
58b84c4
Merge branch 'master' into PE-D-Fixes-Branch
Aung-Phone-Naing Apr 3, 2023
b1be50e
Add JUnit test for searchByTag
YatPang Apr 3, 2023
3eb93bd
Merge branch 'AY2223S2-CS2113-F13-1:master' into master
YatPang Apr 3, 2023
7bb8873
Resolve merge conflict
Aung-Phone-Naing Apr 3, 2023
36fbe83
Fixes merge conflict
Aung-Phone-Naing Apr 3, 2023
dfcac8f
Add JUnit test for searchByTag
YatPang Apr 3, 2023
919a5e1
Merge pull request #112 from YatPang/master
LimHongYao Apr 3, 2023
2dfd149
Merge branch 'master' of https://github.com/AY2223S2-CS2113-F13-1/tp
liuziyang020319 Apr 3, 2023
ac3d9cc
Fetch: fixed coflict
liuziyang020319 Apr 3, 2023
a4d587d
Fetch: Fixed lay out bug
liuziyang020319 Apr 3, 2023
7ee5bab
Fixed
liuziyang020319 Apr 3, 2023
b8c9270
Merge pull request #109 from liuziyang020319/master
YatPang Apr 3, 2023
de264d5
Fix Issue #82
YatPang Apr 3, 2023
365cbb7
Merge remote-tracking branch 'origin/master'
YatPang Apr 3, 2023
85ffe83
Fix Issue #82
YatPang Apr 3, 2023
300f81a
Fix Issue #82
YatPang Apr 3, 2023
179f4ef
Change Save Format
YatPang Apr 3, 2023
ed62516
Change Save Format
YatPang Apr 3, 2023
8f8fdf8
Fixes indentation
Aung-Phone-Naing Apr 4, 2023
800a002
Merge branch 'master' into PE-D-Fixes-Branch
Aung-Phone-Naing Apr 4, 2023
bc967d9
Fixes string variable name
Aung-Phone-Naing Apr 4, 2023
117a8e8
Fixes String variable classifier
Aung-Phone-Naing Apr 4, 2023
8041ae2
Fixes String declaration order
Aung-Phone-Naing Apr 4, 2023
d890a29
Reorders variable declaration
Aung-Phone-Naing Apr 4, 2023
85e7fd7
Fixes "View" to "Find"
Aung-Phone-Naing Apr 4, 2023
9648606
Fixes last instance of "View" to "Find"
Aung-Phone-Naing Apr 4, 2023
86dc042
Fixes texts in Expected text to reflect actual output
Aung-Phone-Naing Apr 4, 2023
1b0c6f4
Merge pull request #111 from Aung-Phone-Naing/PE-D-Fixes-Branch
YatPang Apr 4, 2023
e6e4e7d
Merge branch 'AY2223S2-CS2113-F13-1:master' into master
YatPang Apr 4, 2023
c50fd56
Merge pull request #114 from YatPang/master
Aung-Phone-Naing Apr 4, 2023
1db9fe9
no message
LimHongYao Apr 4, 2023
f05b702
Merge branch 'master' of https://github.com/LimHongYao/tp
LimHongYao Apr 4, 2023
836e0f0
added text-ui for out of bounds edit instructions
LimHongYao Apr 4, 2023
172c00a
Created some test cases for editIngredient
LimHongYao Apr 4, 2023
7b35d47
Modified stepbystep corrections to clear ambiguity
LimHongYao Apr 4, 2023
5cf324b
prepared object class level methods for add/remove ingredient/step me…
LimHongYao Apr 4, 2023
831c2d2
Create ListEmptyException (general use)
LimHongYao Apr 5, 2023
859ea19
modified editIngredient method for easier testing
LimHongYao Apr 5, 2023
a0e31c8
add basic edit ingredient test
LimHongYao Apr 5, 2023
a876329
Further modification of editIngredient method to ease testing
LimHongYao Apr 5, 2023
55c5d8d
DG bold formatting issue fix
LimHongYao Apr 5, 2023
ebc4a4b
Create editStep junit
LimHongYao Apr 5, 2023
dfdf60c
formatting fixes
LimHongYao Apr 5, 2023
4f2fe86
remove extra curly
LimHongYao Apr 5, 2023
7d6ec59
clear confusion between overload methods
LimHongYao Apr 5, 2023
d7db903
Added basic editStep junit test
LimHongYao Apr 5, 2023
3491691
remove unused import
LimHongYao Apr 5, 2023
6467134
restore deleted empty editTest junit
LimHongYao Apr 5, 2023
c62b1fe
Merge pull request #115 from LimHongYao/master
LimHongYao Apr 5, 2023
d3bb227
Add AddToRecipe (Step/Ingredient)
YatPang Apr 6, 2023
1586b22
Add AddToRecipe (Step/Ingredient)
YatPang Apr 6, 2023
f313b49
Add AddToRecipe (Step/Ingredient)
YatPang Apr 6, 2023
5ee679e
Add DeleteFromRecipe (Step/Ingredient)
YatPang Apr 6, 2023
4930203
Adds PPP content
Aung-Phone-Naing Apr 7, 2023
42f3e93
Merge branch 'PE-D-Fixes-Branch'
Aung-Phone-Naing Apr 7, 2023
c9e3f03
Updates the following:
Aung-Phone-Naing Apr 7, 2023
51b8636
Updates Components
Aung-Phone-Naing Apr 7, 2023
cd3dfad
Updates FindRecipe plant uml diagram
Aung-Phone-Naing Apr 7, 2023
3da840d
Updates DG format
Aung-Phone-Naing Apr 7, 2023
b49edbf
Implements Singleton for RecipeList class
Aung-Phone-Naing Apr 7, 2023
ddcd67a
Fixes declaration order and style check issues
Aung-Phone-Naing Apr 7, 2023
51edb7e
Merge pull request #117 from Aung-Phone-Naing/DG-Improvements
LimHongYao Apr 7, 2023
48816b5
Merge branch 'AY2223S2-CS2113-F13-1:master' into master
YatPang Apr 7, 2023
c3c6bf4
Add AddToRecipe (Step/Ingredient), DeleteFromRecipe (Step/Ingredient)
YatPang Apr 7, 2023
c1051cd
Add AddToRecipe (Step/Ingredient), DeleteFromRecipe (Step/Ingredient)
YatPang Apr 7, 2023
d1c0e8f
Fixes UG for View feature
Aung-Phone-Naing Apr 7, 2023
85ad2f5
no message
liuziyang020319 Apr 7, 2023
7464c50
Merge branch 'master' of https://github.com/AY2223S2-CS2113-F13-1/tp
liuziyang020319 Apr 7, 2023
9184b25
Add AddToRecipe (Step/Ingredient), DeleteFromRecipe (Step/Ingredient)…
YatPang Apr 7, 2023
77c3992
no message
liuziyang020319 Apr 7, 2023
115821b
removed support for scrapped feature: timed step
LimHongYao Apr 7, 2023
4fbc445
Step-by-step view now automatically terminates when the last step has…
LimHongYao Apr 7, 2023
ddf3c1c
forgot to change expected.txt hehe xD
LimHongYao Apr 7, 2023
c9ee317
Add AddToRecipe (Step/Ingredient), DeleteFromRecipe (Step/Ingredient)
YatPang Apr 8, 2023
96a710a
Refactor AddToRecipe (Step/Ingredient), DeleteFromRecipe (Step/Ingred…
YatPang Apr 8, 2023
ae72cfa
Merge pull request #118 from LimHongYao/master
liuziyang020319 Apr 8, 2023
476bce1
Add AddToRecipe (Step/Ingredient), DeleteFromRecipe (Step/Ingredient)
YatPang Apr 8, 2023
bd9ffe4
Merge remote-tracking branch 'origin/master'
YatPang Apr 8, 2023
cbe6f1b
Add AddToRecipe (Step/Ingredient), DeleteFromRecipe (Step/Ingredient)
YatPang Apr 8, 2023
601ad17
Add AddToRecipe (Step/Ingredient), DeleteFromRecipe (Step/Ingredient)
YatPang Apr 8, 2023
b86a2e9
Add AddToRecipe (Step/Ingredient), DeleteFromRecipe (Step/Ingredient)
YatPang Apr 8, 2023
53db7a2
Add AddToRecipe (Step/Ingredient), DeleteFromRecipe (Step/Ingredient)
YatPang Apr 8, 2023
3e5d857
Add AddToRecipe (Step/Ingredient), DeleteFromRecipe (Step/Ingredient)
YatPang Apr 8, 2023
9ed0bb9
Add AddToRecipe (Step/Ingredient), DeleteFromRecipe (Step/Ingredient)
YatPang Apr 8, 2023
7131d86
Add AddToRecipe (Step/Ingredient), DeleteFromRecipe (Step/Ingredient)
YatPang Apr 8, 2023
77948d1
Add AddToRecipe (Step/Ingredient), DeleteFromRecipe (Step/Ingredient)
YatPang Apr 8, 2023
2964580
Change RecipeView and RecipeManage sequence diagrams
Aung-Phone-Naing Apr 8, 2023
d7bd894
Fixes bug in Find Recipe sequence diagram
Aung-Phone-Naing Apr 8, 2023
6d0e378
Fixes Help sequence diagram
Aung-Phone-Naing Apr 8, 2023
ba5ceb7
Fetch: add exception handle in numberoverflow
liuziyang020319 Apr 8, 2023
f3e277f
Merge branch 'master' into master
liuziyang020319 Apr 8, 2023
cf3dee9
Fixes Help sequence diagram
Aung-Phone-Naing Apr 8, 2023
e333c3c
Add photos
liuziyang020319 Apr 8, 2023
d734a7d
Merge pull request #123 from liuziyang020319/master
Aung-Phone-Naing Apr 8, 2023
90ee126
Merge branch 'master' of https://github.com/liuziyang020319/tp
liuziyang020319 Apr 8, 2023
fcb985e
Format fix
liuziyang020319 Apr 8, 2023
b539f58
Merge remote-tracking branch 'origin/master'
YatPang Apr 8, 2023
b952884
Adds sequence diagram for recipe steps edit feature
Aung-Phone-Naing Apr 8, 2023
4730087
Add Flexibility to AddToRecipe command and DeleteFromRecipe command
YatPang Apr 8, 2023
0afbb62
Add Flexibility to AddToRecipe command and DeleteFromRecipe command
YatPang Apr 8, 2023
c24f670
Add Flexibility to AddToRecipe command and DeleteFromRecipe command
YatPang Apr 8, 2023
3de54d5
Add Flexibility to AddToRecipe command and DeleteFromRecipe command
YatPang Apr 8, 2023
ec98a81
Fixes error log for VIEW feature
Aung-Phone-Naing Apr 8, 2023
43ee87c
Adds constrain for ADD feature
Aung-Phone-Naing Apr 8, 2023
11bbbe6
Merge pull request #124 from YatPang/master
LimHongYao Apr 8, 2023
8ccea7b
Merge branch 'master' of https://github.com/AY2223S2-CS2113-F13-1/tp
liuziyang020319 Apr 8, 2023
75c2d52
Fix couting bugs
liuziyang020319 Apr 8, 2023
d00c126
Implements error to reject numerical only input and special character…
Aung-Phone-Naing Apr 8, 2023
f8ab184
Updates minor language for VIEW feature
Aung-Phone-Naing Apr 8, 2023
84aa7e8
Merge branch 'Constrain-Add-Recipe-Input-Branch' into DG-Improvements
Aung-Phone-Naing Apr 8, 2023
b2f2ff4
no message
liuziyang020319 Apr 8, 2023
63a42a2
Fixed: checkstyle
liuziyang020319 Apr 8, 2023
cf639ab
Fixed some bugs in addtorecipe and deletefromrecipe
liuziyang020319 Apr 8, 2023
2690ffd
Fixed: checkstyle bugs
liuziyang020319 Apr 8, 2023
1842fcc
Fixed: syntax mistake
liuziyang020319 Apr 8, 2023
5224c1c
Fix checkstyle bugs
liuziyang020319 Apr 8, 2023
dc75167
Update Yat Pang's PPP
YatPang Apr 8, 2023
1d30f73
Merge pull request #129 from liuziyang020319/master
LimHongYao Apr 8, 2023
7926fd2
Merge branch 'AY2223S2-CS2113-F13-1:master' into master
YatPang Apr 8, 2023
2c160b2
add hongyao's photo
LimHongYao Apr 8, 2023
01280ec
Fixes sequence diagrams and DG format with InvalidInputCharacterExcep…
Aung-Phone-Naing Apr 8, 2023
4f40b20
Merge pull request #130 from YatPang/master
LimHongYao Apr 8, 2023
02eb44c
Merge branch 'AY2223S2-CS2113-F13-1:master' into master
LimHongYao Apr 8, 2023
7bde6e4
Fixes the deactivation of Commands in sequence diagram to extend unti…
Aung-Phone-Naing Apr 8, 2023
227b8ed
Updates DG Instructions for Manual Testing along with removal of v3.0…
Aung-Phone-Naing Apr 8, 2023
40ee966
Merge pull request #131 from LimHongYao/master
Aung-Phone-Naing Apr 8, 2023
04c15de
Merge branch 'DG-Improvements'
Aung-Phone-Naing Apr 8, 2023
d121f14
Merge branch 'master' of https://github.com/Aung-Phone-Naing/tp
Aung-Phone-Naing Apr 8, 2023
b1256fe
Fixes visual bug in DG for VIEW feature
Aung-Phone-Naing Apr 8, 2023
0b67ab2
Merge pull request #132 from Aung-Phone-Naing/master
LimHongYao Apr 8, 2023
89def7d
Add Yat Pang's image
YatPang Apr 9, 2023
124e636
Merge pull request #133 from YatPang/master
Aung-Phone-Naing Apr 9, 2023
deda078
Update YatPang's PPP and UG
YatPang Apr 9, 2023
3ea0289
Fetch: fix some changes in UG
liuziyang020319 Apr 9, 2023
fdbce9b
Merge pull request #134 from YatPang/master
liuziyang020319 Apr 9, 2023
5260efd
Modify: rename the file as a correct name
liuziyang020319 Apr 9, 2023
a518844
Merge branch 'master' of https://github.com/AY2223S2-CS2113-F13-1/tp
liuziyang020319 Apr 9, 2023
605a8a6
Fetch: Add some increment of PPP
liuziyang020319 Apr 9, 2023
f4ad9fb
Add the most part of PPP
liuziyang020319 Apr 9, 2023
05850c0
Update the table
liuziyang020319 Apr 9, 2023
bf88789
Try to fix the layout
liuziyang020319 Apr 9, 2023
9fd2639
Fix another layout issue
liuziyang020319 Apr 9, 2023
fa76281
Fix another bugs
liuziyang020319 Apr 9, 2023
85cbdd0
Merge pull request #135 from liuziyang020319/master
Aung-Phone-Naing Apr 9, 2023
374f514
no message
Aung-Phone-Naing Apr 9, 2023
9b213b9
Revert "no message"
Aung-Phone-Naing Apr 9, 2023
00e38c7
Merge branch 'master' of https://github.com/Aung-Phone-Naing/tp
Aung-Phone-Naing Apr 9, 2023
59c3b43
Modify: Fix PPP layout
liuziyang020319 Apr 9, 2023
cbd0d72
Updates PPP and DG welcome messgage to picture
Aung-Phone-Naing Apr 9, 2023
9540501
Fix bug in UG
liuziyang020319 Apr 9, 2023
d4466cc
Merge pull request #136 from Aung-Phone-Naing/master
liuziyang020319 Apr 9, 2023
f1f90e8
Merge pull request #137 from liuziyang020319/master
LimHongYao Apr 9, 2023
5590a68
update README to remove duke
LimHongYao Apr 9, 2023
93de60d
Updated PPP to match set formatting
LimHongYao Apr 9, 2023
39062f4
Add default case/else condition warnings for code quality
LimHongYao Apr 9, 2023
ca4c7af
editStep and editIngredient handling of non-number and overflow inputs
LimHongYao Apr 9, 2023
adcb7f7
remove unused import
LimHongYao Apr 9, 2023
d222ce6
Merge pull request #138 from LimHongYao/master
YatPang Apr 10, 2023
3da2537
Updates App description for README and UG
Aung-Phone-Naing Apr 10, 2023
e3bcc06
Merge branch 'master' of https://github.com/Aung-Phone-Naing/tp
Aung-Phone-Naing Apr 10, 2023
04d4c94
Fixes UG description for deletefromrecipe feature
Aung-Phone-Naing Apr 10, 2023
1b29b0e
Minor UG formatting fix
Aung-Phone-Naing Apr 10, 2023
db6ca78
Updates UG to add specification for quick start
Aung-Phone-Naing Apr 10, 2023
5f9f0c4
Merge pull request #139 from Aung-Phone-Naing/master
LimHongYao Apr 10, 2023
0963ac9
Fixes UG description for addtorecipe
Aung-Phone-Naing Apr 10, 2023
70369ce
Fixes UG expected strings for view feature
Aung-Phone-Naing Apr 10, 2023
ad527d1
Updates UG view strings
Aung-Phone-Naing Apr 10, 2023
551ee0a
fixed bug where delete to less than 1 ingredient is possible
LimHongYao Apr 10, 2023
48bafb7
fixed empty recipe list output for addtoingredient
LimHongYao Apr 10, 2023
3053042
Updates help messgae to include all commands and minor UG format tabl…
Aung-Phone-Naing Apr 10, 2023
996cdcb
Merge branch 'AY2223S2-CS2113-F13-1:master' into master
Aung-Phone-Naing Apr 10, 2023
03d1350
Fixes formatting error in StringLib
Aung-Phone-Naing Apr 10, 2023
423b582
solved same issue for deletefromrecipe
LimHongYao Apr 10, 2023
c2b588a
req expected
LimHongYao Apr 10, 2023
6a31b6a
removed unused imports
LimHongYao Apr 10, 2023
f2385db
fix tests
LimHongYao Apr 10, 2023
3287077
Merge pull request #141 from LimHongYao/master
YatPang Apr 10, 2023
164cd90
Merge branch 'AY2223S2-CS2113-F13-1:master' into master
Aung-Phone-Naing Apr 10, 2023
ad315e0
Merge pull request #140 from Aung-Phone-Naing/master
LimHongYao Apr 10, 2023
3dae67b
Fix markdown bugs
liuziyang020319 Apr 10, 2023
ebfe01e
Merge branch 'master' of https://github.com/AY2223S2-CS2113-F13-1/tp
liuziyang020319 Apr 10, 2023
f573770
Changes name of PPP to match github username
Aung-Phone-Naing Apr 10, 2023
5ba4ccb
Merge branch 'master' into master
liuziyang020319 Apr 10, 2023
8a68cba
Updates DG acknowledgements
Aung-Phone-Naing Apr 10, 2023
7bfbb77
insert missing ingredient edit implementation
LimHongYao Apr 10, 2023
e6834ba
Merge pull request #142 from liuziyang020319/master
Aung-Phone-Naing Apr 10, 2023
5320d42
Fix layout bugs
liuziyang020319 Apr 10, 2023
2fd5b02
Merge branch 'master' of https://github.com/liuziyang020319/tp
liuziyang020319 Apr 10, 2023
e2a17ba
Fixes Delete feature Number Format Exception error message
Aung-Phone-Naing Apr 10, 2023
933d3c7
Merge branch 'AY2223S2-CS2113-F13-1:master' into master
Aung-Phone-Naing Apr 10, 2023
6abbe77
add misisng step and example usage
LimHongYao Apr 10, 2023
9b002bf
Merge pull request #143 from LimHongYao/master
Aung-Phone-Naing Apr 10, 2023
7faf7a6
Merge pull request #144 from Aung-Phone-Naing/master
LimHongYao Apr 10, 2023
a6c94ac
Merge branch 'master' of https://github.com/AY2223S2-CS2113-F13-1/tp
liuziyang020319 Apr 10, 2023
15ee28b
Merge remote-tracking branch 'upstream/master'
liuziyang020319 Apr 10, 2023
7a873fd
Fix grammar bugs in log
liuziyang020319 Apr 10, 2023
bbdb20c
grammar check for recipelist
LimHongYao Apr 10, 2023
b71c052
Merge pull request #145 from liuziyang020319/master
LimHongYao Apr 10, 2023
2982656
Change StepsList Grammar
Aung-Phone-Naing Apr 10, 2023
ce3e9f4
fixed grammar for add and delete commands
LimHongYao Apr 10, 2023
7cb803d
Merge pull request #146 from LimHongYao/master
liuziyang020319 Apr 10, 2023
8263c28
Fixes step delete quit message grammar
Aung-Phone-Naing Apr 10, 2023
cc032cd
Merge branch 'AY2223S2-CS2113-F13-1:master' into master
Aung-Phone-Naing Apr 10, 2023
ef76dd8
Merge pull request #147 from Aung-Phone-Naing/master
LimHongYao Apr 10, 2023
91ef522
UG grammar fixed
liuziyang020319 Apr 10, 2023
dba1b33
Fixes DG bugs on github pages
Aung-Phone-Naing Apr 10, 2023
62c1317
Merge pull request #149 from Aung-Phone-Naing/master
LimHongYao Apr 10, 2023
8b06c76
Merge pull request #148 from liuziyang020319/master
Aung-Phone-Naing Apr 10, 2023
2874a6a
Final UG format fixes
Aung-Phone-Naing Apr 10, 2023
548bd7d
Final DG format fixes
Aung-Phone-Naing Apr 10, 2023
eb4f05c
Merge pull request #150 from Aung-Phone-Naing/master
Aung-Phone-Naing Apr 10, 2023
6677071
PPP finalised
LimHongYao Apr 10, 2023
5550e66
Merge branch 'AY2223S2-CS2113-F13-1:master' into master
LimHongYao Apr 10, 2023
8924ab7
Merge pull request #151 from LimHongYao/master
YatPang Apr 10, 2023
b43792c
Update YatPang's PPP
YatPang Apr 10, 2023
aedeef7
Merge pull request #152 from YatPang/master
Aung-Phone-Naing Apr 10, 2023
79fd1cb
Adds Phone's PPP
Aung-Phone-Naing Apr 10, 2023
1ff4e21
Merge branch 'AY2223S2-CS2113-F13-1:master' into master
Aung-Phone-Naing Apr 10, 2023
8ebb4bb
Merge pull request #153 from Aung-Phone-Naing/master
LimHongYao Apr 10, 2023
f3fd69d
Update PPP
Aung-Phone-Naing Apr 10, 2023
daadd13
Merge branch 'AY2223S2-CS2113-F13-1:master' into master
Aung-Phone-Naing Apr 10, 2023
71ab057
Adds more PRs to PRs reviewed for PPP
Aung-Phone-Naing Apr 10, 2023
197e200
Merge pull request #154 from Aung-Phone-Naing/master
YatPang Apr 11, 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
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.duke.Duke

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Duke project template
# Taste Of Mom's (TOM)

This is a project template for a greenfield Java project. It's named after the Java mascot _Duke_. Given below are instructions on how to use it.

Expand Down
2 changes: 2 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ repositories {

dependencies {
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.5.0'
testImplementation 'junit:junit:4.13.1'
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.5.0'
}

Expand Down Expand Up @@ -43,4 +44,5 @@ checkstyle {

run{
standardInput = System.in
enableAssertions = true;
}
11 changes: 11 additions & 0 deletions data/Hotpot.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Hotpot
Chinese
Ingredient list
Beef
Potatoes
Carrots
Step list
chop beef
add potatoes
add carrots
cook 5 minutes
13 changes: 6 additions & 7 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) | Leong Yat Pang | [Github](https://github.com/YatPang) | [Portfolio](team/leongyatpang.md)
![](https://via.placeholder.com/100.png?text=Photo) | Lim Hong Yao | [Github](http://github.com/LimHongYao) | [Portfolio](team/limhongyao.md)
![](https://via.placeholder.com/100.png?text=Photo) | Aung Phone Naing | [Github](https://github.com/Aung-Phone-Naing) | [Portfolio](team/aungphonenaing.md)
![](https://via.placeholder.com/100.png?text=Photo) | Liu Ziyang | [Github](https://github.com/liuziyang020319) | [Portfolio](team/liuziyang.md)

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)
323 changes: 308 additions & 15 deletions docs/DeveloperGuide.md

Large diffs are not rendered by default.

Binary file added docs/PlantUML/ArchitectureInteract.png

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like how an example of just one command is given (delete 1) as it helps to understand the general flow of the program while keeping the diagram simple and readable. This is provided that delete 1 is the most exhaustive example that shows the most classes involved.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The dotted line (delete 1) between UI and Duke seems a little ambiguous.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
37 changes: 37 additions & 0 deletions docs/PlantUML/ArchitectureInteract.puml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
@startuml ArchitectureInteract
box Manager #White
Actor User #Blue
participant ":UI" as UI #Gray
participant ":Duke" as Duke #Gold
participant ":Parser" as Parser #Yellow
participant ":Command" as Command #Beige
participant ":RecipeList" as RecipeList #OrangeRed
participant ":Storage" as Storage #DimGray
end box

activate Duke #Gold
Duke -> UI : readCommand()
activate UI #Gray
User -> UI : delete 1
UI --> Duke : delete 1
Duke -> Parser : parseCommand(delete 1)
activate Parser #Yellow
Parser --> Duke
deactivate Parser
Duke -> Command : execute(delete,1)
activate Command #Beige
Command -> RecipeList : delete(1)
activate RecipeList #OrangeRed
RecipeList -> Storage
activate Storage #DimGray
Storage -> Storage : save()
activate Storage
Storage --> Storage
deactivate Storage
Storage --> RecipeList
deactivate Storage
RecipeList --> Command
deactivate RecipeList
Command --> Duke
deactivate Command
@enduml
Binary file added docs/PlantUML/CommandComponent.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions docs/PlantUML/CommandComponent.puml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
@startuml

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A common problem among all groups including mine is to have the little icons. You can add:

hide circle
skinparam classAttributeIconSize 0

to remove them and follow the recommended format.

class Command implements StringLib {
- type: CommandType
- fullDescription: String
+ isExit(): boolean
+ execute(recipeList: RecipeList, ui: UI): void
}

enum CommandType {
LIST
ADD
DELETE
FIND
CLEAR
VIEW
HELP
EXIT
UNKNOWN
}

Command --> CommandType
IncompleteInputException --|> Exceptions : extends
Command ..> IncompleteInputException : uses

@enduml
34 changes: 34 additions & 0 deletions docs/PlantUML/FindRecipe.puml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
@startuml Recipe Find
box Find #White
Actor User
participant ":UI" as UI
participant ":Duke" as Duke
participant ":Parser" as Parser
participant ":Command" as Command
participant ":RecipeList" as RecipeList
end box
activate Duke
Duke -> UI : "readCommand()"
activate UI
User -> UI : "Find MaLaXiangGuo"
UI --> Duke
deactivate UI
Duke -> Parser : "parseCommand()"
activate Parser
Parser --> Duke
deactivate Parser
Duke -> Command : "execute()"
activate Command
Command -> RecipeList : "searchRecipeList()"
activate RecipeList
RecipeList -> UI : show recipe with index
activate UI
UI --> RecipeList
deactivate UI
RecipeList --> Command
deactivate RecipeList
Command --> Duke
deactivate Command


@enduml
Binary file added docs/PlantUML/Help.png

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Quotation marks around functions can be removed. I also like the mindful deletion of only the :Command object as the other classes will continue to be used in other functions, while the :Command object will no longer be used.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since the HELP message shown does not require any further user input, consider changing it to a dotted line. The UI can be shifted to the rightmost portion of the sequence diagram since it is only used after Command.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 31 additions & 0 deletions docs/PlantUML/Help.puml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
@startuml Help
box Manager #White
Actor User

participant ":UI" as UI
participant ":Duke" as Duke
participant ":Parser" as Parser
participant ":Command" as Command1
end box

activate Duke

User -> Duke : "help"
Duke -> Parser : "parseCommand()"
activate Parser
Parser --> Duke
deactivate Parser
Duke -> Command1 : "execute()"
activate Command1
Command1 -> UI : "showHelp()"
activate UI
UI -> User : HELP message shown
UI --> Command1
deactivate UI
Command1 --> Duke
deactivate Command1
Duke -> Command1 : delete
destroy Command1


@enduml
Binary file added docs/PlantUML/MainArchitecture.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions docs/PlantUML/MainArchitecture.puml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
@startuml MainArchitecture

archimate #Technology "User" as User <<technology-device>>
archimate #Technology "Data" as Data <<application-data-object>>


rectangle RM {
rectangle UI
rectangle Duke
rectangle Parser
rectangle Storage
rectangle RecipeList
rectangle Command
User -down.> UI
Storage .> Data
Duke -up-> UI
Duke -> Command
Command -> RecipeList
Duke -up-> Parser
Storage -up-> RecipeList
}
@enduml
Binary file added docs/PlantUML/ParserComponent.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions docs/PlantUML/ParserComponent.puml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
@startuml ParserComponent

class Parser implements StringLib {
+parseCommands(line: String): Command
+parseRecipe(description: String): ArrayList<String>
-matchString(input: String, regex: String): boolean
-RECIPE_WRONG_NAME_INGREDIENTS_TAG_STEP: String
-RECIPE_MISSING_NAME: String
-RECIPE_MISSING_INGREDIENTS: String
-RECIPE_MISSING_TAG: String
-RECIPE_MISSING_STEP: String
}

class IncompleteInputException {
}

class Exceptions {
}

IncompleteInputException --|> Exceptions : extends
Parser ..> IncompleteInputException : uses

@enduml
Binary file added docs/PlantUML/RecipeFind.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/PlantUML/RecipeListComponent.png

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can the multiplicity of Step be specified? If it can, then it would be good to indicate.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
68 changes: 68 additions & 0 deletions docs/PlantUML/RecipeListComponent.puml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
@startuml
'https://plantuml.com/sequence-diagram

class RecipeList {
- recipeList:ArrayList<Recipe>
- currRecipeNumber: int
+ getRecipeList(): ArrayList<Recipe>
+ getCurrRecipeNumber(): int
+ getRecipeFromList(itemNum:int): Recipe
+ getNewestRecipe(): Recipe
+ addNewRecipe(recipe: Recipe)
+ removeRecipe(index: int)
+ clearRecipeList()
}
class Recipe {
- ingredientList: IngredientList
- stepList: StepList
- name: String
- tag: String
+ getIngredientList(): IngredientList
+ getStepList(): StepList
+ getName(): Name
+ getTag(): String
+ toString(): String
}

class IngredientList {
- list: ArrayList<Ingredient>
- currIngredientNumber: int
+ getCurrIngredientNumber(): int
+ addIngredient(item: Ingredient)
+ removeIngredient(index: int)
+ showList()
+ getList(): ArrayList<Ingredient>
}

class Ingredient {
- name: String
+ getName(): String

}

class StepList {
- stepList: ArrayList<Step>
- currStepNumber: int
+ addStep(step: Step)
+ removeStep(stepIndex: int)
+ showStepList()
+ getList(): ArrayList<Step>
}

class Step {
- description: String
+ getStep(): String
+ toString(): String
}
class RecipeListEmptyError {
}
class Exceptions {
}
RecipeList -> "*" Recipe : stores >
Recipe -> "1" IngredientList : contains >
Recipe --> "1" StepList : contains >
IngredientList --> Ingredient : stores >
StepList --> Step : stores >
RecipeList ..> RecipeListEmptyError : uses
RecipeListEmptyError --|> Exceptions : extends
@enduml
Binary file added docs/PlantUML/RecipeManage.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading