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-T17-2] CafeCTRL #14

Open
wants to merge 1,231 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1231 commits
Select commit Hold shift + click to select a range
c2e5d0c
Merge pull request #321 from NaychiMin/error-handling-decoding-of-sal…
Cazh1 Nov 12, 2023
0dc39bb
Add logging to add dish related functions
DextheChik3n Nov 12, 2023
1f53b9c
Merge branch 'master' into 301-negative-ingredient-qty-v2.1
DextheChik3n Nov 12, 2023
32a18bb
Add methods to check the validity of pantryStock data format
ziyi105 Nov 12, 2023
1c9c475
Inlcude pattern and matcher in PPP
ziyi105 Nov 12, 2023
002138b
Merge pull request #331 from ziyi105/update-PPP
ziyi105 Nov 12, 2023
e60a02a
Add in sequence diagram for list_ingredients command.
NaychiMin Nov 12, 2023
3ef9520
Add in sequence diagram for list_sale command.
NaychiMin Nov 12, 2023
df55bc8
Add in sequence diagram for isDishCooked() function in Pantry class.
NaychiMin Nov 12, 2023
ede4342
Add in sequence diagram for calculateMaxDish() function in Pantry class.
NaychiMin Nov 12, 2023
9c80fc3
Improve coding standard.
NaychiMin Nov 12, 2023
8d2f29e
Edit List_ingredient command in DG with updated sequence diagram.
NaychiMin Nov 12, 2023
b4acb84
Add in sequence diagram and necessary description into DG for
NaychiMin Nov 12, 2023
ad81169
Add in sequence diagram and description for isDishCooked() function from
NaychiMin Nov 12, 2023
c460bae
Add in sequence diagram and description for calculateMaxDish() function
NaychiMin Nov 12, 2023
23d7f8b
Removed unused sequence diagram.
NaychiMin Nov 12, 2023
5de6fc9
Add JUnit tests for FileManager class
DextheChik3n Nov 12, 2023
6f7526d
Resolve checkstyle issues
DextheChik3n Nov 12, 2023
11dc0cb
Remove unused test file
DextheChik3n Nov 12, 2023
1a0025b
Merge pull request #330 from DextheChik3n/301-negative-ingredient-qty…
ziyi105 Nov 12, 2023
13f73b0
Update PPP
Cazh1 Nov 12, 2023
cba4af9
Update png used
Cazh1 Nov 12, 2023
6f934de
Modified message to match format
ShaniceTang Nov 12, 2023
92a3073
Merge branch 'master' of https://github.com/AY2324S1-CS2113-T17-2/tp …
ShaniceTang Nov 12, 2023
600ede0
Merge pull request #336 from Cazh1/Update-self-PPP
ShaniceTang Nov 12, 2023
b522977
Merge branch 'master' of https://github.com/AY2324S1-CS2113-T17-2/tp …
ShaniceTang Nov 12, 2023
a516273
Resize Images for PPP
Cazh1 Nov 12, 2023
0fda7d9
Merge pull request #337 from Cazh1/Update-self-PPP
Cazh1 Nov 12, 2023
59359ef
Resize of pictures for marking
Cazh1 Nov 12, 2023
363a89b
Merge pull request #338 from Cazh1/Update-self-PPP
Cazh1 Nov 12, 2023
6d5c64a
Update text size to comply with requirements
Cazh1 Nov 12, 2023
ed8fabf
Merge pull request #339 from Cazh1/Update-self-PPP
Cazh1 Nov 12, 2023
c4c0009
Update PPP to resize text
Cazh1 Nov 12, 2023
b42e44c
Merge pull request #340 from Cazh1/Update-self-PPP
Cazh1 Nov 12, 2023
ff06160
Edit formatting of PPP
DextheChik3n Nov 12, 2023
a122c3f
Update formatting of UG and DG
DextheChik3n Nov 12, 2023
0a2996a
Edit hyperlinks for table of contents in UG
DextheChik3n Nov 12, 2023
fa189ae
Merge pull request #341 from DextheChik3n/edit-ppp
DextheChik3n Nov 12, 2023
0b28754
Update table of contents in DG with changes made.
NaychiMin Nov 12, 2023
68a532c
Update user guide with edited command tag for list_ingredients.
NaychiMin Nov 12, 2023
90d7528
Improve code quality.
NaychiMin Nov 12, 2023
00d977d
Edit PPP and renamed PPP folder to all small caps of github user name.
NaychiMin Nov 12, 2023
03cc365
Merge branch 'master' into Update-DG-with-changes-made-v2.1
NaychiMin Nov 12, 2023
e76fc31
Add relevant examples in PPP.
NaychiMin Nov 12, 2023
4aadb07
Format encoding of current dish price to 2dp.
NaychiMin Nov 12, 2023
0962c62
Merge pull request #332 from DextheChik3n/196-junit-test-for-file-man…
NaychiMin Nov 12, 2023
1860742
Merge branch 'master' into Update-DG-with-changes-made-v2.1
NaychiMin Nov 12, 2023
68698da
Update UG
ziyi105 Nov 12, 2023
bfe545c
Update DG architecture sequence diagram and AboutUs photo
ShaniceTang Nov 13, 2023
16dca45
Modify buy ingredient message to prevent formatting issues
ShaniceTang Nov 13, 2023
257540b
Add JUnit test for methods in parser class
ShaniceTang Nov 13, 2023
7536828
Add javadoc
ShaniceTang Nov 13, 2023
7d79f50
Remove extra whitespace
ShaniceTang Nov 13, 2023
3876bb9
Merge branch 'master' of https://github.com/AY2324S1-CS2113-T17-2/tp …
ShaniceTang Nov 13, 2023
b54b380
Update architecture sequence diagram
ShaniceTang Nov 13, 2023
35115ad
Edit minor details in DG
ziyi105 Nov 13, 2023
41b693e
Add Future Enhancements in DG
ziyi105 Nov 13, 2023
2579e3e
Add future enhancement under DG contributions in PPP
ziyi105 Nov 13, 2023
62a6099
Update src/main/java/seedu/cafectrl/ui/Messages.java
ShaniceTang Nov 13, 2023
8311bd9
PPP: add more info under team tasks and help feature
ziyi105 Nov 13, 2023
2ef94c7
Add more info under general formatting in PPP
ziyi105 Nov 13, 2023
8472c4b
Update error message for decoding pantry stock data
ziyi105 Nov 13, 2023
af9d862
Correct typo
ziyi105 Nov 13, 2023
ced653f
Add ViewTotalStockCommand and BuyIngredientCommand to DG
ShaniceTang Nov 13, 2023
f26744b
Merge branch '326-junit-dg-javadoc' of https://github.com/ShaniceTang…
ShaniceTang Nov 13, 2023
8b103eb
Merge pull request #347 from ziyi105/323-standardise-error-messages-f…
ziyi105 Nov 13, 2023
459144d
Add Javadoc and author tag
ziyi105 Nov 13, 2023
c65114d
Merge branch 'master' of https://github.com/AY2324S1-CS2113-T17-2/tp …
ShaniceTang Nov 13, 2023
22af8c0
Update PPP
ShaniceTang Nov 13, 2023
de520bb
Update Storage class diagram
DextheChik3n Nov 13, 2023
8c3b0c6
Fix bug found in list_sales command.
NaychiMin Nov 13, 2023
124baf2
Update coding standard in CafeCtrl.java
ziyi105 Nov 13, 2023
6396a80
Update coding standard in EditPriceCommand and HelpCommand
ziyi105 Nov 13, 2023
3cf0e86
Change comparison from .equals() to .equalsIgnoreCase()
NaychiMin Nov 13, 2023
f98139d
Update src/main/java/seedu/cafectrl/data/Menu.java
NaychiMin Nov 13, 2023
419eb11
Update src/main/java/seedu/cafectrl/data/OrderList.java
NaychiMin Nov 13, 2023
d1abc91
Update coding standard up to Pantry.java
ziyi105 Nov 13, 2023
f6dad25
Update coding standard
ziyi105 Nov 13, 2023
e42c6d7
Update coding standard in Ui.java
ziyi105 Nov 13, 2023
28d2c33
Update according to checkStyle
ziyi105 Nov 13, 2023
66becd9
Merge pull request #348 from ziyi105/323-standardise-error-messages-f…
DextheChik3n Nov 13, 2023
88182f0
Add a line after loading data
ziyi105 Nov 13, 2023
6556585
Update src/main/java/seedu/cafectrl/data/CurrentDate.java
ziyi105 Nov 13, 2023
b721daa
Assign variable to obj.name
ziyi105 Nov 13, 2023
e8e7e10
Remove {more to be added} in UG
ziyi105 Nov 13, 2023
5ed0008
Merge pull request #345 from ziyi105/update-UG
DextheChik3n Nov 13, 2023
24a11c1
Edit sequence diagrams according to reviews made.
NaychiMin Nov 13, 2023
d9c82f2
Update AddDishCommand sequence diagram
DextheChik3n Nov 13, 2023
296f71d
Merge branch 'master' into Update-DG-with-changes-made-v2.1
NaychiMin Nov 13, 2023
ce52191
Update variable names
ziyi105 Nov 13, 2023
57023da
Merge branch 'master' into general-coding-standard-check
ziyi105 Nov 13, 2023
237419d
Merge pull request #343 from NaychiMin/Update-DG-with-changes-made-v2.1
ziyi105 Nov 13, 2023
0e8a2c0
Remove unused import
ziyi105 Nov 13, 2023
ddbe823
Update Storage class in DG
DextheChik3n Nov 13, 2023
3fa34de
Merge branch 'master' into general-coding-standard-check
ziyi105 Nov 13, 2023
0b64876
Remove unused class from functions in sales.
NaychiMin Nov 13, 2023
d54d01c
Update PPP
ziyi105 Nov 13, 2023
78093ff
Merge branch 'master' into handle-dishes-not-in-menu-v2.1
NaychiMin Nov 13, 2023
3c0f2dd
Merge branch 'master' into 335-update-ug-dg-v2.1
DextheChik3n Nov 13, 2023
f300a74
Change order of variable in Pantry.java
ziyi105 Nov 13, 2023
4df42b0
Merge branch 'master' of https://github.com/AY2324S1-CS2113-T17-2/tp …
ShaniceTang Nov 13, 2023
8d2a283
Refactor name of PPP to small caps.
NaychiMin Nov 13, 2023
da86bbe
Update Pantry.java
ziyi105 Nov 13, 2023
4f9540d
Edit PPP
NaychiMin Nov 13, 2023
e594262
Update Pantry.java
ziyi105 Nov 13, 2023
1357238
Handle tampering of menu.txt
ShaniceTang Nov 13, 2023
273c063
Merge pull request #344 from ShaniceTang/326-junit-dg-javadoc
NaychiMin Nov 13, 2023
2bbca99
Merge branch 'master' into handle-dishes-not-in-menu-v2.1
NaychiMin Nov 13, 2023
4abbf3f
Merge pull request #351 from ziyi105/general-coding-standard-check
ziyi105 Nov 13, 2023
77e1c72
Merge branch 'general-coding-standard-check'
ziyi105 Nov 13, 2023
f0e1bdd
Update figure number and formatting
DextheChik3n Nov 13, 2023
1212ef6
Add profile picture
DextheChik3n Nov 13, 2023
4a20b29
Edit logic related to handling dishes not in menu.
NaychiMin Nov 13, 2023
6a15c01
Merge branch 'master' into handle-dishes-not-in-menu-v2.1
NaychiMin Nov 13, 2023
5c1113c
Add reviews on other teams' PR
ziyi105 Nov 13, 2023
b897297
Edit add dish command output message
DextheChik3n Nov 13, 2023
327b44a
Update UG for add dish command
DextheChik3n Nov 13, 2023
b1096d9
Edit PPP.
NaychiMin Nov 13, 2023
bc62c5b
Merge branch 'master' into rename-ppp
NaychiMin Nov 13, 2023
50902a6
Remove argument check for Help command
ziyi105 Nov 13, 2023
a9d282f
Format PPP
ShaniceTang Nov 13, 2023
648e9fe
Merge pull request #352 from NaychiMin/rename-ppp
ShaniceTang Nov 13, 2023
bc6bac8
Merge branch 'master' of https://github.com/AY2324S1-CS2113-T17-2/tp …
ShaniceTang Nov 13, 2023
9784662
Merge pull request #353 from ziyi105/master
ShaniceTang Nov 13, 2023
f05609b
Merge pull request #356 from ShaniceTang/355-mini-ppp
NaychiMin Nov 13, 2023
96151da
Update UG
DextheChik3n Nov 13, 2023
775f7cc
Merge branch 'master' into 335-update-ug-dg-v2.1
DextheChik3n Nov 13, 2023
709c0bd
Merge pull request #354 from ziyi105/update-PPP-last
ShaniceTang Nov 13, 2023
025dc44
Update src/main/java/seedu/cafectrl/data/OrderList.java
NaychiMin Nov 13, 2023
c468153
Update src/main/java/seedu/cafectrl/data/OrderList.java
NaychiMin Nov 13, 2023
4a5bdf8
Changes made according to Review.
NaychiMin Nov 13, 2023
14d5b0e
Merge branch 'master' into handle-dishes-not-in-menu-v2.1
NaychiMin Nov 13, 2023
9b94d06
Merge pull request #350 from NaychiMin/handle-dishes-not-in-menu-v2.1
DextheChik3n Nov 13, 2023
8c6a5c9
Merge branch 'master' into 335-update-ug-dg-v2.1
DextheChik3n Nov 13, 2023
3b38993
Merge pull request #357 from DextheChik3n/335-update-ug-dg-v2.1
ShaniceTang Nov 13, 2023
7ae759b
Edit profile picture size
DextheChik3n Nov 13, 2023
b7c08b6
Add colon to entity names
ShaniceTang Nov 13, 2023
41b6693
Fix broken links
ShaniceTang Nov 13, 2023
0fd634e
Handle no ingredient for dish in menu.txt
ShaniceTang Nov 13, 2023
9ea67c5
Standardize loading error message
ShaniceTang Nov 13, 2023
bcd42b3
Merge pull request #361 from ShaniceTang/360-check-dg
NaychiMin Nov 13, 2023
16697bd
Fix broken links
ShaniceTang Nov 13, 2023
bce2ee1
Improve code quality
ShaniceTang Nov 13, 2023
18594eb
Merge pull request #362 from ShaniceTang/360-check-dg
NaychiMin Nov 13, 2023
590597b
Fix line under TOC
ShaniceTang Nov 13, 2023
e4716bb
Merge branch 'master' of https://github.com/AY2324S1-CS2113-T17-2/tp …
ShaniceTang Nov 13, 2023
ec219d7
Fix line under TOC
ShaniceTang Nov 13, 2023
b3cde80
Merge pull request #363 from ShaniceTang/360-check-dg
DextheChik3n Nov 13, 2023
bb544ab
Merge pull request #359 from ziyi105/remove-argumen-check-for-help
DextheChik3n Nov 13, 2023
1f60e2a
Change index to dish in UG
ziyi105 Nov 13, 2023
fbc355c
Remove line after TOC
ShaniceTang Nov 13, 2023
5495765
Corrected casing for edit_price in UG
ziyi105 Nov 13, 2023
3fece68
Merge pull request #369 from ShaniceTang/360-check-dg
DextheChik3n Nov 13, 2023
a83defa
Merge pull request #364 from DextheChik3n/358-edit-profile-picture-v2.1
ShaniceTang Nov 13, 2023
aed269d
Update Code Quality of project
Cazh1 Nov 13, 2023
b0a0cbf
Update buy ingredient output in user guide
ShaniceTang Nov 13, 2023
70bb27a
Convert names in menu.txt to lowercase
ShaniceTang Nov 13, 2023
3cf1e03
Edit tag of list_ingredients command.
NaychiMin Nov 13, 2023
46ba05d
Update DG accordingly for list_ingredients.
NaychiMin Nov 13, 2023
927feec
Edit JUnit test for list_ingredients.
NaychiMin Nov 13, 2023
6d2e8b2
Edit output message of add_order for better clarity.
NaychiMin Nov 13, 2023
7795bac
Fix help command not showing
ziyi105 Nov 13, 2023
4a5519d
Add additional error handling to decode orders.txt.
NaychiMin Nov 13, 2023
44d728c
Edit output of add_order for better clarity.
NaychiMin Nov 13, 2023
ad6fa2b
Update DG with updated sequence diagram.
NaychiMin Nov 13, 2023
ac8fddf
Edit list_total_sales and formatting of UG.
NaychiMin Nov 13, 2023
fac41f1
Merge pull request #383 from NaychiMin/370-change-parameter-of-list-i…
ShaniceTang Nov 13, 2023
173bc37
Merge pull request #384 from NaychiMin/374-edit-output-message-add-or…
ShaniceTang Nov 13, 2023
d8bfe96
Merge pull request #385 from NaychiMin/380-decode-negative-dish-qty-v2.1
ShaniceTang Nov 13, 2023
b78cee5
Add photo in AboutUs
NaychiMin Nov 13, 2023
2dcaa35
Fix bugs for delete, buyIngredient and viewTotalStock command
ShaniceTang Nov 13, 2023
3a93909
Update UG and DG
Cazh1 Nov 13, 2023
80b464e
Merge branch 'master' into Update-Code-Quality-
Cazh1 Nov 13, 2023
d007813
Merge branch 'master' into minor-last-min-edit
ziyi105 Nov 13, 2023
2734620
Merge pull request #388 from NaychiMin/Edit-UG-v2.1
ziyi105 Nov 13, 2023
8d30658
Fix formatting error
Cazh1 Nov 13, 2023
d4031eb
Merge branch 'master' of https://github.com/AY2324S1-CS2113-T17-2/tp …
ShaniceTang Nov 13, 2023
ff72eb0
Merge branch 'master' of https://github.com/AY2324S1-CS2113-T17-2/tp …
ShaniceTang Nov 13, 2023
16ff7a4
Merge pull request #389 from ziyi105/minor-last-min-edit
NaychiMin Nov 13, 2023
7c4962d
Update code to comply with Gradle
Cazh1 Nov 13, 2023
3f5d746
Merge branch 'Update-Code-Quality-' of https://github.com/Cazh1/tp in…
Cazh1 Nov 13, 2023
177c979
Rename newPrice to newDishPrice in EditPriceCommand.java for better c…
ziyi105 Nov 13, 2023
ba4f595
Fix formatting error
Cazh1 Nov 13, 2023
e27a795
Remove the use of "this" reference
ziyi105 Nov 13, 2023
fbdfc4c
Improve code quality
ShaniceTang Nov 13, 2023
9032698
Update JUnit test expected output
ShaniceTang Nov 13, 2023
4992ae3
Merge branch 'master' of https://github.com/AY2324S1-CS2113-T17-2/tp …
ShaniceTang Nov 13, 2023
ad1f273
Merge pull request #390 from Cazh1/Update-Code-Quality-
ziyi105 Nov 13, 2023
f72cc6e
Add photo in aboutUs
ziyi105 Nov 13, 2023
561f74e
Update known issue regarding differentiating hash string and data text
ziyi105 Nov 13, 2023
5ebca21
Update known issues regarding the hyperlink of ToCs
ziyi105 Nov 13, 2023
ddd88c7
Replace parser class diagram with a better resolution one
ziyi105 Nov 13, 2023
12e639b
Merge pull request #392 from ziyi105/386-remove-this-references
DextheChik3n Nov 13, 2023
45fd69c
DG: improve resolution of diagram image
ziyi105 Nov 13, 2023
ba27496
Edit add dish command's invalid price message
DextheChik3n Nov 13, 2023
855d4ce
Merge branch 'master' into 373-edit-add-dish-messages-v2.1
DextheChik3n Nov 13, 2023
fd79c2b
Update regex and error message
ShaniceTang Nov 13, 2023
69718b9
Merge branch 'master' of https://github.com/AY2324S1-CS2113-T17-2/tp …
ShaniceTang Nov 13, 2023
393beca
Edit add dish command's invalid price message
DextheChik3n Nov 13, 2023
c5f18e0
Refactor magic strings in Storage class
DextheChik3n Nov 13, 2023
e0ac8d3
Merge pull request #391 from ShaniceTang/minor-fixes
DextheChik3n Nov 13, 2023
956634e
Merge branch 'master' into 373-edit-add-dish-messages-v2.1
DextheChik3n Nov 13, 2023
3a9d442
Edit ingredient qty regex for parseIngredient function
DextheChik3n Nov 13, 2023
3d9d018
Change photo for AboutUs page
DextheChik3n Nov 13, 2023
e75d6a3
Remove the issue about hyperlink in UG
ziyi105 Nov 13, 2023
52ad74a
Resolve checkstyle issues
DextheChik3n Nov 13, 2023
6db47af
UG: update Known Issues regarding adding order with unknown dish
ziyi105 Nov 13, 2023
bf4eedd
Refactor files in ui package
DextheChik3n Nov 13, 2023
35f30a7
Refactor files in storage package
DextheChik3n Nov 13, 2023
d16bbb7
Refactor files in data package
DextheChik3n Nov 13, 2023
61a1ef6
Add error handling of user input in add order command
DextheChik3n Nov 13, 2023
25e7d39
Edit to ensure all dish and ingredient names are convert to lowercase
DextheChik3n Nov 13, 2023
43a2ebd
Resolve JUnit test errors
DextheChik3n Nov 13, 2023
1f1ff80
Resolve checkstyle errors
DextheChik3n Nov 13, 2023
eaed86f
Merge pull request #393 from ziyi105/379-add-known-issue-unable-to-di…
DextheChik3n Nov 13, 2023
3cdc854
Edit hash string message
DextheChik3n Nov 13, 2023
234c862
Merge pull request #394 from DextheChik3n/373-edit-add-dish-messages-…
Cazh1 Nov 13, 2023
2af72b1
Update formatting of user guide and PPP
NaychiMin Nov 13, 2023
90e66d7
Merge branch 'master' into Edit-UG-v2.1
NaychiMin Nov 13, 2023
7e02db4
Merge pull request #395 from NaychiMin/Edit-UG-v2.1
DextheChik3n Nov 13, 2023
62f49ea
Add in hyperlink and edit list_ingredients command tag in PPP.
NaychiMin Nov 13, 2023
2eabb48
Merge branch 'master' into Edit-UG-v2.1
NaychiMin Nov 13, 2023
7f513db
Merge pull request #396 from NaychiMin/Edit-UG-v2.1
ShaniceTang Nov 14, 2023
475cdce
Update DG parser sequence diagram
ziyi105 Nov 14, 2023
ade34a1
Change index to dish in UG
ziyi105 Nov 14, 2023
2859132
Update Zi Yi's photo
ziyi105 Nov 14, 2023
ba5a021
Update PPP with bugs found
ziyi105 Nov 14, 2023
6c8a74d
Merge pull request #397 from ziyi105/update-DG
ziyi105 Nov 14, 2023
891f03e
Update HelpCommand
ziyi105 Nov 14, 2023
289ee61
Update UG regarding last day string
ziyi105 Nov 14, 2023
5ea7df4
Merge pull request #398 from ziyi105/update-DG
Cazh1 Nov 14, 2023
5680041
Update PPP
ziyi105 Nov 14, 2023
1855718
Merge pull request #399 from ziyi105/update-DG
Cazh1 Nov 14, 2023
e338697
Edit PPP to reduce length.
NaychiMin Nov 14, 2023
82fed56
Merge branch 'master' into Edit-UG-v2.1
NaychiMin Nov 14, 2023
fae600f
Add manual testing for edit price
ziyi105 Nov 14, 2023
36ad50e
Merge pull request #400 from NaychiMin/Edit-UG-v2.1
ziyi105 Nov 14, 2023
7f0ddcf
Adjust position of imagein PPP
ziyi105 Nov 14, 2023
9c6bbb5
Decrease length of PPP
ziyi105 Nov 14, 2023
2b02dd5
Merge branch 'master' into Add-manual-testing-guide-DG
ziyi105 Nov 14, 2023
e61fef9
Merge pull request #401 from ziyi105/Add-manual-testing-guide-DG
ziyi105 Nov 14, 2023
781b9e6
Edit PPP to reduce page length
ShaniceTang Nov 14, 2023
0c7dfcc
Update ziyi105.md
ziyi105 Nov 14, 2023
69eabbc
Merge pull request #402 from ShaniceTang/smol-ppp
NaychiMin Nov 14, 2023
826b3e3
reduce PPP length
ziyi105 Nov 14, 2023
56cd519
Merge branch 'Add-manual-testing-guide-DG'
ziyi105 Nov 14, 2023
01dd638
Merge pull request #403 from ziyi105/master
ziyi105 Nov 14, 2023
1923eba
Disable assertion
ziyi105 Nov 14, 2023
825ed91
Merge branch 'AY2324S1-CS2113-T17-2:master' into master
ziyi105 Nov 14, 2023
56507bd
Merge pull request #404 from ziyi105/master
NaychiMin Nov 14, 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
30 changes: 15 additions & 15 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,18 @@ jobs:
- name: Build and check with Gradle
run: ./gradlew check

- name: Perform IO redirection test (*NIX)
if: runner.os == 'Linux'
working-directory: ${{ github.workspace }}/text-ui-test
run: ./runtest.sh

- name: Perform IO redirection test (MacOS)
if: always() && runner.os == 'macOS'
working-directory: ${{ github.workspace }}/text-ui-test
run: ./runtest.sh

- name: Perform IO redirection test (Windows)
if: always() && runner.os == 'Windows'
working-directory: ${{ github.workspace }}/text-ui-test
shell: cmd
run: runtest.bat
# - name: Perform IO redirection test (*NIX)
# if: runner.os == 'Linux'
# working-directory: ${{ github.workspace }}/text-ui-test
# run: ./runtest.sh
#
# - name: Perform IO redirection test (MacOS)
# if: always() && runner.os == 'macOS'
# working-directory: ${{ github.workspace }}/text-ui-test
# run: ./runtest.sh
#
# - name: Perform IO redirection test (Windows)
# if: always() && runner.os == 'Windows'
# working-directory: ${{ github.workspace }}/text-ui-test
# shell: cmd
# run: runtest.bat
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,8 @@ bin/

/text-ui-test/ACTUAL.TXT
text-ui-test/EXPECTED-UNIX.TXT
META-INF/MANIFEST.MF
data/

cafeCtrl.log
cafeCtrl.log.lck
5 changes: 3 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ test {
}

application {
mainClass.set("seedu.duke.Duke")
mainClass.set("seedu.cafectrl.CafeCtrl")
}

shadowJar {
archiveBaseName.set("duke")
archiveBaseName.set("cafectrl")
archiveClassifier.set("")
}

Expand All @@ -43,4 +43,5 @@ checkstyle {

run{
standardInput = System.in
enableAssertions = false
}
14 changes: 7 additions & 7 deletions docs/AboutUs.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# 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
--------|:--------:|:----------------------------------------:|:---------:
![](images/aboutUs/shanice.jpg) | Shanice | [Github](https://github.com/ShaniceTang) | [Portfolio](team/shanicetang.md)
![](images/aboutUs/naychimin.png) | Naychi | [Github](https://github.com/NaychiMin/tp) | [Portfolio](team/naychimin.md)
<img height="100" src="images/aboutUs/ziyi.jpg" width="100"/> | Zi Yi | [Github](https://github.com/ziyi105) | [Portfolio](team/ziyi105.md)
<img height="100" src="images/aboutUs/dexter.jpg" width="100"/> | Dexter Hoon | [Github](https://github.com/DextheChik3n) | [Portfolio](team/dexthechik3n.md)
![](images/aboutUs/zhongheng.jpg) | Chua Zhong Heng | [Github](https://github.com/Cazh1/tp) | [Portfolio](team/cazh1.md)
484 changes: 466 additions & 18 deletions docs/DeveloperGuide.md

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Duke
# CafeCTRL

{Give product intro here}
CafeCTRL aims to optimize managing of inventory and cash flow in a restaurant. Our CLI platform empowers Café proprietors to streamline inventory and menu management.

Useful links:
* [User Guide](UserGuide.md)
Expand Down
Loading
Loading