Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1044 commits
Select commit Hold shift + click to select a range
5d18345
Chore: write test classes for imageutil and unique recipe list and re…
muhd97 Apr 11, 2020
49d5527
Add test cases for new command
AdarshChugani Apr 11, 2020
a3949e3
Fix checkstyle issues
AdarshChugani Apr 11, 2020
267bb54
Merge branch 'main-adarsh-tests' of https://github.com/AY1920S2-CS210…
AdarshChugani Apr 11, 2020
d2e4c6e
Add test cases for the reset command
AdarshChugani Apr 11, 2020
771fd04
Fix checkstyle issues related to import
AdarshChugani Apr 11, 2020
3414973
Fix: unique recipe list test and do some refactoring
muhd97 Apr 11, 2020
7bfd949
Add test cases for help command
AdarshChugani Apr 11, 2020
9404088
Fix: imageutil test
muhd97 Apr 11, 2020
764fa00
Fix: checkstyle issues
muhd97 Apr 11, 2020
4683de6
Added test cases for fav command
AdarshChugani Apr 11, 2020
4bad89f
Fix Checkstyle issues
AdarshChugani Apr 11, 2020
ecc6dff
Add test cases for unfav command
AdarshChugani Apr 11, 2020
4f6e172
Fix checkstyle issues
AdarshChugani Apr 11, 2020
9ba1c44
Add test cases for done command
AdarshChugani Apr 11, 2020
5bdbf27
Refact: Image to Photograph
muhd97 Apr 11, 2020
16446d2
Chore: write deleteCommandParserTest
muhd97 Apr 11, 2020
d9c945d
Fix checkstyle issues
AdarshChugani Apr 11, 2020
052e46a
Add test cases for Undo command
AdarshChugani Apr 11, 2020
843aded
Fix checkstyle issues
AdarshChugani Apr 11, 2020
49808b9
Fix reference to donecommand
AdarshChugani Apr 11, 2020
90e89a0
Add parsertest for done/undo command
AdarshChugani Apr 11, 2020
36ab135
Chore: remove refactoring
muhd97 Apr 11, 2020
1aed845
Fix: checkstyle issues
muhd97 Apr 11, 2020
8c4d431
Add test cases for random command
AdarshChugani Apr 11, 2020
41d035a
Fix: PhotographUtilTest
muhd97 Apr 11, 2020
bd1585a
Fix checkstyle
AdarshChugani Apr 11, 2020
28e0f49
Fix checkstyle again
AdarshChugani Apr 11, 2020
1e154b2
More checkstyle fixes
AdarshChugani Apr 11, 2020
c29c6c3
Add test cases for time command
AdarshChugani Apr 11, 2020
d7be6c5
Fix checkstyle issues
AdarshChugani Apr 11, 2020
7daf2d1
Fix: checkstyle issues
muhd97 Apr 11, 2020
d90eb4b
Fix: DeleteCommandParserTest
muhd97 Apr 11, 2020
2c52aee
Chore: add FindCommandParserTest
muhd97 Apr 11, 2020
c743aba
Chore: write CalorieTest class
muhd97 Apr 11, 2020
a4825b0
Refact: rename method in CalorieTest
muhd97 Apr 11, 2020
22b642d
Chore: write RatingTest class
muhd97 Apr 11, 2020
2087fa3
Chore: add DifficultyTest class
muhd97 Apr 11, 2020
20f8ad3
Chore: add ServingTest
muhd97 Apr 11, 2020
553bba6
update User Stories to reflect 3 tier priority
kevinswk94 Apr 11, 2020
ec41333
Increase coverage
AdarshChugani Apr 11, 2020
fc0b723
Merge branch 'master' into main-kevin-docs
kevinswk94 Apr 11, 2020
35af298
Merge branch 'master' into main-zain
muhd97 Apr 11, 2020
de00fc7
Merge branch 'main-zain' of https://github.com/AY1920S2-CS2103T-W12-4…
muhd97 Apr 11, 2020
134349b
Refact: move test classes of attributes of a recipe to recipe.attribu…
muhd97 Apr 11, 2020
b752848
Fix: checkstyle issues
muhd97 Apr 11, 2020
5539775
Docs: update DG (Intro, overview of features, product survey)
muhd97 Apr 11, 2020
4151e99
Merge pull request #305 from AY1920S2-CS2103T-W12-4/main-zain-dg
kevinswk94 Apr 11, 2020
16b85d2
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-4/ma…
muhd97 Apr 11, 2020
87ff782
Merge branch 'master' into main-kevin-docs
kevinswk94 Apr 11, 2020
5beee50
Merge branch 'master' into main-sharadh
Apr 12, 2020
5101df9
Merge pull request #301 from AY1920S2-CS2103T-W12-4/main-zain
muhd97 Apr 12, 2020
b0bed80
Merge branch 'master' into main-kevin-docs
AdarshChugani Apr 12, 2020
f8dd5af
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-4/ma…
muhd97 Apr 12, 2020
fd25420
Merge branch 'master' into main-sharadh
Apr 12, 2020
eeb8127
Refact: remove some oldTestCases that are no longer needed
muhd97 Apr 12, 2020
b1a174d
Chore: add editRecipeDescriptorTest and ArgumentTokenizerTest
muhd97 Apr 12, 2020
2636e20
Chore: add recipeBookParserTest
muhd97 Apr 12, 2020
8003bf0
Add error message for duplicated recipe
AdarshChugani Apr 12, 2020
4bd19ee
Made code more OOP
AdarshChugani Apr 12, 2020
4b4071b
Merge branch 'master' into main-adarsh-tests
AdarshChugani Apr 12, 2020
851a7ee
Bug fixes for rating and serving
AdarshChugani Apr 12, 2020
c3ee6a1
error message for time and difficulty command
AdarshChugani Apr 12, 2020
4958710
Merge branch 'main-adarsh-tests' of https://github.com/AY1920S2-CS210…
AdarshChugani Apr 12, 2020
2509d34
Add error messages
AdarshChugani Apr 12, 2020
6468800
Merge branch 'master' into main-zain
muhd97 Apr 12, 2020
4654839
Merge pull request #306 from AY1920S2-CS2103T-W12-4/main-zain
muhd97 Apr 12, 2020
1b93cf8
add manual test instructions for startup and adding recipes
kevinswk94 Apr 12, 2020
3592f44
Merge branch 'main-zain' of https://github.com/AY1920S2-CS2103T-W12-4…
muhd97 Apr 12, 2020
dffc34c
Merge branch 'master' into main-kevin-docs
muhd97 Apr 12, 2020
257ac2a
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-4/ma…
muhd97 Apr 12, 2020
6d42446
Merge branch 'master' into main-sharadh
Apr 12, 2020
d2300cb
Refact: move image/ photo method from appUtil to photoUtil
muhd97 Apr 12, 2020
ab6f481
Docs: update UG
muhd97 Apr 12, 2020
d0ab0a8
Fix: codacy errors
muhd97 Apr 12, 2020
38ed891
update mugshot
kevinswk94 Apr 12, 2020
b8c1b46
Merge remote-tracking branch 'origin/master' into main-kevin-DG
kevinswk94 Apr 12, 2020
dd45254
Updated badges on ReadMe
AdarshChugani Apr 12, 2020
4a0a811
Updated Badges
AdarshChugani Apr 12, 2020
c0d8967
add manual tests for modifying & finding recipes
kevinswk94 Apr 12, 2020
6143202
Merge branch 'master' into main-sharadh
Apr 12, 2020
ebaf932
Docs: update PPP
muhd97 Apr 12, 2020
1433879
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-4/ma…
muhd97 Apr 12, 2020
8c3c15c
add FindCommandActivityDiagram
kevinswk94 Apr 12, 2020
75e7605
Docs: demarcate my contributions
muhd97 Apr 12, 2020
5eb2842
Merge branch 'master' into main-zain
muhd97 Apr 12, 2020
7a94f82
Docs: demarcate my contributions to DG
muhd97 Apr 12, 2020
dfa0733
Docs: add CountCommand implementation in DG with the UML diagrams
muhd97 Apr 12, 2020
ca95009
Docs: upload the countCommand UML diagrams
muhd97 Apr 12, 2020
5b432cd
Docs: update DG
muhd97 Apr 12, 2020
4729f95
Docs: update UG
muhd97 Apr 12, 2020
395d6fb
Docs: update DG's section demarcation
muhd97 Apr 12, 2020
2a96467
Merge pull request #313 from AY1920S2-CS2103T-W12-4/main-zain-DG
kevinswk94 Apr 13, 2020
f8f1ab5
Merge branch 'master' into main-zain-PPP
kevinswk94 Apr 13, 2020
6b58ee0
Merge pull request #312 from AY1920S2-CS2103T-W12-4/main-zain-PPP
kevinswk94 Apr 13, 2020
964d082
Merge branch 'master' into master-zain-ug
kevinswk94 Apr 13, 2020
787de40
update DG to add tests for modifying recipe
kevinswk94 Apr 13, 2020
1bf75a6
Merge remote-tracking branch 'origin/master' into main-kevin-docs
kevinswk94 Apr 13, 2020
6a90678
Merge branch 'main-kevin-DG' into main-kevin-docs
kevinswk94 Apr 13, 2020
e8a9c80
Merge pull request #302 from AY1920S2-CS2103T-W12-4/main-kevin-docs
kevinswk94 Apr 13, 2020
6dc87f1
update SettingUp guide
kevinswk94 Apr 13, 2020
1e10514
update Documentation.adoc
kevinswk94 Apr 13, 2020
d0476cb
update DevOps.adoc
kevinswk94 Apr 13, 2020
cfe195b
update Testing.adoc
kevinswk94 Apr 13, 2020
26e5b12
Merge branch 'master' into main-sharadh
Apr 13, 2020
aadbea6
Chore: upload .puml files and change images from .png to .svg
muhd97 Apr 13, 2020
ee5b459
Merge branch 'master' into main-zain-DG
muhd97 Apr 13, 2020
0b0fa30
Fix: travis issues
muhd97 Apr 13, 2020
79b3465
Merge branch 'main-zain-DG' of https://github.com/AY1920S2-CS2103T-W1…
muhd97 Apr 13, 2020
9193c45
Docs: update UG
muhd97 Apr 13, 2020
0b68299
Merge branch 'master-zain-ug' of https://github.com/AY1920S2-CS2103T-…
muhd97 Apr 13, 2020
06b8564
Merge branch 'master' into master-zain-ug
muhd97 Apr 13, 2020
af66668
Merge branch 'master' into main-zain
muhd97 Apr 13, 2020
e956c60
Update docs/DeveloperGuide.adoc
muhd97 Apr 13, 2020
8f18ea3
Update docs/DeveloperGuide.adoc
muhd97 Apr 13, 2020
1d64d59
Fix: Photograph Util and Photograph Util Test
muhd97 Apr 13, 2020
217bb46
Merge pull request #308 from AY1920S2-CS2103T-W12-4/main-zain
muhd97 Apr 13, 2020
b7dfcb8
Merge branch 'master' into main-zain-DG
muhd97 Apr 13, 2020
626994a
Merge pull request #315 from AY1920S2-CS2103T-W12-4/main-zain-DG
muhd97 Apr 13, 2020
19c2a09
Merge branch 'master' into master-zain-ug
muhd97 Apr 13, 2020
48cfd44
Merge branch 'master' into main-sharadh
Apr 13, 2020
89bd9fe
Update DG, change CSS, remove unnecessary info
Apr 13, 2020
6f393fc
Docs: fix ug formatting issues
muhd97 Apr 13, 2020
2f07804
add style to FindCommandActivityDiagram
kevinswk94 Apr 13, 2020
6df3c39
Docs: fix DG formatting issue
muhd97 Apr 13, 2020
12f690b
Fix checkstyle
Apr 13, 2020
aa58183
Merge branch 'main-zain-DG' of https://github.com/AY1920S2-CS2103T-W1…
muhd97 Apr 13, 2020
504d89e
SVG EOF
Apr 13, 2020
60611da
Merge branch 'master' into main-zain-DG
muhd97 Apr 13, 2020
86c6384
Merge pull request #317 from AY1920S2-CS2103T-W12-4/main-zain-DG
sharadhr Apr 13, 2020
a5bca3e
Merge branch 'master' into main-sharadh
Apr 13, 2020
524f6fd
Merge branch 'master' into master-zain-ug
muhd97 Apr 13, 2020
69bb07f
update my PPP
kevinswk94 Apr 13, 2020
bb6fbd6
Merge pull request #309 from AY1920S2-CS2103T-W12-4/master-zain-ug
kevinswk94 Apr 13, 2020
ba6b3bf
Merge branch 'master' into main-sharadh
kevinswk94 Apr 13, 2020
fb41f8f
Merge branch 'master' into main-sharadh
Apr 13, 2020
7899d23
Merge remote-tracking branch 'origin/main-sharadh' into main-sharadh
Apr 13, 2020
7679189
Move DG stuff around
Apr 13, 2020
828728b
Change \r\n to \n
Apr 13, 2020
babe73b
update PPP
kevinswk94 Apr 13, 2020
0473ba5
Merge pull request #316 from AY1920S2-CS2103T-W12-4/main-sharadh
kevinswk94 Apr 13, 2020
1ad0742
Merge remote-tracking branch 'origin/master' into main-kevin-docs
kevinswk94 Apr 13, 2020
9815a6f
Bug fixes
AdarshChugani Apr 13, 2020
42f7c56
Merge branch 'master' into main-adarsh-updateReadme
AdarshChugani Apr 13, 2020
8507f52
Fix DG conflicts
Apr 13, 2020
a21b15f
Merge branch 'master' into main-sharadh
Apr 13, 2020
64922b3
consistency fixes
AdarshChugani Apr 13, 2020
541e444
Merge branch 'main-adarsh-updateReadme' of https://github.com/AY1920S…
AdarshChugani Apr 13, 2020
7c1f708
More consistency issues
AdarshChugani Apr 13, 2020
bdd1ea7
various consistency and bug fixes
AdarshChugani Apr 13, 2020
c30257b
Update docs/DeveloperGuide.adoc
sharadhr Apr 13, 2020
e5819aa
Merge branch 'master' into main-sharadh
Apr 13, 2020
01a9faf
Update CSS
Apr 13, 2020
db088a5
Merge pull request #319 from AY1920S2-CS2103T-W12-4/main-sharadh
sharadhr Apr 13, 2020
bd97f0b
DG picture fixes
Apr 13, 2020
36832dc
update dev guide with activity diagram
kevinswk94 Apr 13, 2020
c2bebf3
update kevinswk94 PPP
kevinswk94 Apr 13, 2020
b41b977
Merge remote-tracking branch 'origin/master' into main-kevin-docs
kevinswk94 Apr 13, 2020
0833e9d
Merge pull request #320 from AY1920S2-CS2103T-W12-4/main-sharadh
sharadhr Apr 13, 2020
9d634f5
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-4/ma…
muhd97 Apr 13, 2020
488423c
Fix: display calorie in GUI
muhd97 Apr 13, 2020
1e8e3d2
Update src/main/java/cookbuddy/ui/RecipeCard.java
muhd97 Apr 13, 2020
f6cadf0
Merge pull request #321 from AY1920S2-CS2103T-W12-4/main-zain
muhd97 Apr 13, 2020
2cba396
Fix test cases
AdarshChugani Apr 13, 2020
6c3f0f3
Merge branch 'master' into main-adarsh-updateReadme
AdarshChugani Apr 13, 2020
e76293c
Fix issues with test cases
AdarshChugani Apr 13, 2020
1bfdcb9
update DevGuide with FindCommand implmentation
kevinswk94 Apr 13, 2020
5772ff0
Merge remote-tracking branch 'origin/master' into main-kevin-docs
kevinswk94 Apr 13, 2020
1034a6e
update FindCommand diagram name
kevinswk94 Apr 13, 2020
1cfe9c3
fix checkstyle warnings
kevinswk94 Apr 13, 2020
e64d1b7
Update some UG and PUML stuff
AdarshChugani Apr 13, 2020
6f30b83
Merge pull request #323 from AY1920S2-CS2103T-W12-4/main-kevin-docs
kevinswk94 Apr 13, 2020
9cefd06
Update PUMLs
AdarshChugani Apr 13, 2020
fae4707
More PUMLs
AdarshChugani Apr 13, 2020
f0a891e
Add time sequence diagram
AdarshChugani Apr 13, 2020
d9d55db
add manual tests for prep time and fav
kevinswk94 Apr 13, 2020
05a2c1b
More SVGs
AdarshChugani Apr 13, 2020
ff4a1c3
More SVGs
AdarshChugani Apr 13, 2020
33bffcf
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-4/ma…
AdarshChugani Apr 13, 2020
d361a45
Update PUML files
AdarshChugani Apr 13, 2020
e058357
Update the DG
AdarshChugani Apr 13, 2020
12b34b1
Update Dev Guide
AdarshChugani Apr 13, 2020
48b1b30
Update DG
AdarshChugani Apr 13, 2020
0a80921
Update UG
Apr 13, 2020
b793507
Merge branch 'master' into main-sharadh
Apr 13, 2020
ee1ba8b
Merge pull request #324 from AY1920S2-CS2103T-W12-4/main-sharadh
sharadhr Apr 13, 2020
cafb25d
Merge branch 'main-zain' of https://github.com/AY1920S2-CS2103T-W12-4…
muhd97 Apr 13, 2020
e5b947e
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-4/ma…
muhd97 Apr 13, 2020
4e74dcb
More additions to DG
AdarshChugani Apr 13, 2020
fffa655
Docs: update PPP
muhd97 Apr 13, 2020
f203daa
Docs: update my PPP
muhd97 Apr 13, 2020
937cf85
Consistency fixes
AdarshChugani Apr 13, 2020
b3a2408
Update SVG and PUMLs
AdarshChugani Apr 13, 2020
f87ee74
Sharadh's PPP
Apr 13, 2020
eed1dd6
Merge branch 'master' into main-sharadh
Apr 13, 2020
fdb8590
Add EOF to svg files
AdarshChugani Apr 13, 2020
53e9721
Docs: update PPP
muhd97 Apr 13, 2020
2be6d25
Update PUMLs
AdarshChugani Apr 13, 2020
8a06c78
Update UG
AdarshChugani Apr 13, 2020
88b29bf
duplicate activity and sequence diagram
Apr 13, 2020
6469097
Update UG
AdarshChugani Apr 13, 2020
bad424c
Merge branch 'master' into main-adarsh-updateReadme
AdarshChugani Apr 13, 2020
003e662
checkstyle fix
AdarshChugani Apr 13, 2020
aaeebf1
Merge branch 'main-adarsh-updateReadme' of https://github.com/AY1920S…
AdarshChugani Apr 13, 2020
31b7a49
Merge pull request #325 from AY1920S2-CS2103T-W12-4/main-zain
muhd97 Apr 13, 2020
5690d20
Merge branch 'master' into main-adarsh-updateReadme
muhd97 Apr 13, 2020
c651391
update DG, UG and PPP
kevinswk94 Apr 13, 2020
4aa4294
Merge remote-tracking branch 'origin/master' into main-kevin-linked-docs
kevinswk94 Apr 13, 2020
daa5739
Update user guide
AdarshChugani Apr 13, 2020
d0a13bc
Merge branch 'main-adarsh-updateReadme' of https://github.com/AY1920S…
AdarshChugani Apr 13, 2020
371a2d5
Update UG and DG
AdarshChugani Apr 13, 2020
f3d1896
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-4/ma…
muhd97 Apr 13, 2020
f118728
Fix: DG and UG
muhd97 Apr 13, 2020
9638abd
Chore: update Ui.png
muhd97 Apr 13, 2020
ae805f8
Update PPP
AdarshChugani Apr 13, 2020
0031056
update DG & UG
kevinswk94 Apr 13, 2020
e2b64d6
Merge branch 'main-kevin-docs' into main-kevin-linked-docs
kevinswk94 Apr 13, 2020
6edfad3
Merge remote-tracking branch 'origin/master' into main-kevin-linked-docs
kevinswk94 Apr 13, 2020
485997c
Update PPP
Apr 13, 2020
6faf00f
fix checkstyple error, update ppp
Apr 13, 2020
9ef7941
Fix: travis issues
muhd97 Apr 13, 2020
150cc38
Merge pull request #314 from AY1920S2-CS2103T-W12-4/main-kevin-linked…
kevinswk94 Apr 13, 2020
6f25c7f
Merge branch 'master' into main-zain
kevinswk94 Apr 13, 2020
9b30a45
Complete PPP
Apr 13, 2020
bc2c8f2
Merge branch 'master' into main-sharadh
Apr 13, 2020
cdefb8a
Fix checkstyle
Apr 13, 2020
39d4215
Merge pull request #328 from AY1920S2-CS2103T-W12-4/main-zain
muhd97 Apr 13, 2020
73b3dcb
Merge branch 'master' into main-mingsi-docs
e0316059 Apr 13, 2020
881bfbf
Merge branch 'master' into main-sharadh
Apr 13, 2020
d4191e6
Fix checkstyle again
Apr 13, 2020
93949b5
update PPP
kevinswk94 Apr 13, 2020
942e0a3
Merge branch 'master' into main-kevin-PPP
kevinswk94 Apr 13, 2020
3f30f76
Update PPP
AdarshChugani Apr 13, 2020
96b3659
Merge pull request #326 from AY1920S2-CS2103T-W12-4/main-mingsi-docs
e0316059 Apr 13, 2020
1067086
Merge branch 'master' into main-adarsh-updateReadme
AdarshChugani Apr 13, 2020
6ea99a0
Merge branch 'master' into main-kevin-PPP
kevinswk94 Apr 13, 2020
971a4c1
Merge branch 'master' into main-sharadh
Apr 13, 2020
57b9381
Merge pull request #330 from AY1920S2-CS2103T-W12-4/main-kevin-PPP
kevinswk94 Apr 13, 2020
6426db6
Merge branch 'master' into main-adarsh-updateReadme
kevinswk94 Apr 13, 2020
68a7321
remove parts of PPP
AdarshChugani Apr 13, 2020
00dbb82
Merge branch 'main-adarsh-updateReadme' of https://github.com/AY1920S…
AdarshChugani Apr 13, 2020
e0792d4
Update PPP
AdarshChugani Apr 13, 2020
777f88f
Merge branch 'master' into main-sharadh
Apr 13, 2020
483b222
Merge pull request #329 from AY1920S2-CS2103T-W12-4/main-sharadh
sharadhr Apr 13, 2020
e517d22
Chore: update Ui.png
muhd97 Apr 13, 2020
89f6440
Merge branch 'main-zain' of https://github.com/AY1920S2-CS2103T-W12-4…
muhd97 Apr 13, 2020
1cdbe9c
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W12-4/ma…
muhd97 Apr 13, 2020
044513e
Merge pull request #332 from AY1920S2-CS2103T-W12-4/main-zain
muhd97 Apr 13, 2020
9382d46
Update image which appears on Google
AdarshChugani Aug 30, 2022
b3e8374
Merge pull request #334 from AY1920S2-CS2103T-W12-4/main-adarsh
AdarshChugani Aug 30, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 12 additions & 0 deletions .github/ISSUE_TEMPLATE/add-a-user-story.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
name: Add a User Story
about: This template helps add a user story as an issue to be tracked.
title: As a user, I can ...
labels: type.Story
assignees: ''

---

... so that ...

Command: `...`
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
/.gradle/
/build/
src/main/resources/docs/
/bin/

# IDEA files
/.idea/
Expand All @@ -19,3 +20,10 @@ src/test/data/sandbox/

# MacOS custom attributes files created by Finder
.DS_Store

# VS Code files
.project
.settings/org.eclipse.buildship.core.prefs
.vscode/settings.json
.classpath
.settings/org.eclipse.jdt.core.prefs
25 changes: 12 additions & 13 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
= Address Book (Level 3)
ifdef::env-github,env-browser[:relfileprefix: docs/]

https://travis-ci.org/se-edu/addressbook-level3[image:https://travis-ci.org/se-edu/addressbook-level3.svg?branch=master[Build Status]]
https://ci.appveyor.com/project/damithc/addressbook-level3[image:https://ci.appveyor.com/api/projects/status/3boko2x2vr5cc3w2?svg=true[Build status]]
https://coveralls.io/github/se-edu/addressbook-level3?branch=master[image:https://coveralls.io/repos/github/se-edu/addressbook-level3/badge.svg?branch=master[Coverage Status]]
https://www.codacy.com/app/damith/addressbook-level3?utm_source=github.com&utm_medium=referral&utm_content=se-edu/addressbook-level3&utm_campaign=Badge_Grade[image:https://api.codacy.com/project/badge/Grade/fc0b7775cf7f4fdeaf08776f3d8e364a[Codacy Badge]]
https://travis-ci.org/AY1920S2-CS2103T-W12-4/main[image:https://travis-ci.org/AY1920S2-CS2103T-W12-4/main.svg?branch=master[Build Status]]
https://ci.appveyor.com/project/AdarshChugani/main[image:https://ci.appveyor.com/api/projects/status/coce69u02f8j3qte?svg=true[Build Status]]
https://coveralls.io/github/AY1920S2-CS2103T-W12-4/main?branch=master[image:https://coveralls.io/repos/github/AY1920S2-CS2103T-W12-4/main/badge.svg?branch=master[Coverage Status]]
https://app.codacy.com/gh/AY1920S2-CS2103T-W12-4/main?utm_source=github.com&utm_medium=referral&utm_content=AY1920S2-CS2103T-W12-4/main&utm_campaign=Badge_Grade_Dashboard[image:https://api.codacy.com/project/badge/Grade/26ab505f4302490cb6160c093889381c[Code Quality]]

= CookBuddy Recipe Manager
ifdef::env-github,env-browser[:relfileprefix: docs/]

ifdef::env-github[]
image::docs/images/Ui.png[width="600"]
Expand All @@ -15,22 +14,22 @@ ifndef::env-github[]
image::images/Ui.png[width="600"]
endif::[]

* This is a desktop Address Book application. It has a GUI but most of the user interactions happen using a CLI (Command Line Interface).
* It is a Java sample application intended for students learning Software Engineering while using Java as the main programming language.
* It is *written in OOP fashion*. It provides a *reasonably well-written* code example that is *significantly bigger* (around 6 KLoC)than what students usually write in beginner-level SE modules.
* CookBuddy Recipe Manager is a desktop application for managing recipes.
* It has a Graphical User Interface (GUI) but most of the user interactions happen through a Command Line Interface (CLI).
* CookBuddy is designed primarily for advanced computer users who prefer typing over using a mouse.

== Site Map

* <<UserGuide#, User Guide>>
* <<DeveloperGuide#, Developer Guide>>
* <<LearningOutcomes#, Learning Outcomes>>
* <<AboutUs#, About Us>>
* <<ContactUs#, Contact Us>>

== Acknowledgements

* Some parts of this sample application were inspired by the excellent http://code.makery.ch/library/javafx-8-tutorial/[Java FX tutorial] by
_Marco Jakob_.
* This project has been adapted from AddressBook-Level3 sample application created by the SE-EDU initiative at https://se-education.org
* Some parts of CookBuddy were inspired by the excellent http://code.makery.ch/library/javafx-8-tutorial/[Java FX
tutorial] by _Marco Jakob_.
* Libraries used: https://openjfx.io/[JavaFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/junit-team/junit5[JUnit5]

== Licence : link:LICENSE[MIT]
18 changes: 10 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ plugins {
}

// Specifies the entry point of the application
mainClassName = 'seedu.address.Main'
mainClassName = 'cookbuddy.Main'

sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
Expand All @@ -27,6 +27,7 @@ repositories {

checkstyle {
toolVersion = '8.1'
// ignoreFailures = true;
}

jacocoTestReport {
Expand All @@ -37,10 +38,6 @@ jacocoTestReport {
}
}

test {
useJUnitPlatform()
}

dependencies {
String jUnitVersion = '5.4.0'
String javaFxVersion = '11'
Expand All @@ -64,10 +61,12 @@ dependencies {
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: jUnitVersion

testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: jUnitVersion

implementation group: 'org.jfxtras', name: 'jmetro', version: '11.6.9'
}

shadowJar {
archiveName = 'addressbook.jar'
archiveName = 'CookBuddy.jar'

destinationDir = file("${buildDir}/jar/")
}
Expand Down Expand Up @@ -98,6 +97,8 @@ tasks.coveralls {
}

test {
useJUnitPlatform()
ignoreFailures(true)
testLogging {
events TestLogEvent.FAILED, TestLogEvent.SKIPPED

Expand Down Expand Up @@ -133,8 +134,8 @@ asciidoctor {
idprefix: '', // for compatibility with GitHub preview
idseparator: '-',
'site-root': "${sourceDir}", // must be the same as sourceDir, do not modify
'site-name': 'AddressBook-Level3',
'site-githuburl': 'https://github.com/se-edu/addressbook-level3',
'site-name': 'CookBuddy',
'site-githuburl': 'https://github.com/AY1920S2-CS2103T-W12-4/main/',
'site-seedu': true, // delete this line if your project is not a fork (not a SE-EDU project)
]

Expand All @@ -153,3 +154,4 @@ task copyStylesheets(type: Copy) {
asciidoctor.dependsOn copyStylesheets

defaultTasks 'clean', 'test', 'coverage', 'asciidoctor'
//defaultTasks 'clean', 'test', 'asciidoctor'
1 change: 1 addition & 0 deletions config/checkstyle/suppressions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@

<suppressions>
<suppress checks="JavadocType" files=".*Test\.java"/>
<suppress checks="AbbreviationAsWordInName|MemberName" files="ImageUtil.java"/>
</suppressions>
6 changes: 6 additions & 0 deletions desktop.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[.ShellClassInfo]
IconResource=C:\Windows\System32\SHELL32.dll,111
[ViewState]
Mode=
Vid=
FolderType=Generic
52 changes: 26 additions & 26 deletions docs/AboutUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,53 +4,53 @@
:imagesDir: images
:stylesDir: stylesheets

AddressBook - Level 3 was developed by the https://se-edu.github.io/docs/Team.html[se-edu] team. +
_{The dummy content given below serves as a placeholder to be used by future forks of the project.}_ +
{empty} +
CookBuddy - This recipe managing application was developed by the https://github.com/AY1920S2-CS2103T-W12-4/main[AY1920S2-CS2103T-W12-4] team. +

We are a team based in the http://www.comp.nus.edu.sg[School of Computing, National University of Singapore].

== Project Team

=== John Doe
image::damithc.jpg[width="150", align="left"]
{empty}[http://www.comp.nus.edu.sg/~damithch[homepage]] [https://github.com/damithc[github]] [<<johndoe#, portfolio>>]
=== Adarsh Mohandas Chugani
image::adarshchugani.png[width="150", align="left"]
{empty}[https://github.com/AdarshChugani[github]] [<<adarshchugani#, portfolio>>]

Role: Project Advisor
Role: Team Lead +
Responsibilities: UI

'''

=== John Roe
image::lejolly.jpg[width="150", align="left"]
{empty}[http://github.com/lejolly[github]] [<<johndoe#, portfolio>>]
'''

Role: Team Lead +
Responsibilities: UI
=== Kevin Sum
image::kevinswk94.png[width="150", align="left"]
{empty}[https://github.com/kevinswk94[github]] [<<kevinswk94#, portfolio>>]

'''
Role: Developer +
Responsibilities: Dev Ops

=== Johnny Doe
image::yijinl.jpg[width="150", align="left"]
{empty}[http://github.com/yijinl[github]] [<<johndoe#, portfolio>>]
'''
=== Qi Mingsi
image::e0316059.png[width="150", align="left"]
{empty}[http://github.com/e0316059[github]] [<<e0316059#, portfolio>>]

Role: Developer +
Responsibilities: Data
Responsibilities: UI

'''

=== Johnny Roe
image::m133225.jpg[width="150", align="left"]
{empty}[http://github.com/m133225[github]] [<<johndoe#, portfolio>>]
=== Sharadh Rajaraman
image::sharadhr.png[width="150", align="left"]
{empty}[http://github.com/sharadhr[github]] [<<sharadhr#, portfolio>>]

Role: Developer +
Responsibilities: Dev Ops + Threading
Responsibilities: Documentation

'''

=== Benson Meier
image::yl_coder.jpg[width="150", align="left"]
{empty}[http://github.com/yl-coder[github]] [<<johndoe#, portfolio>>]
=== Zain Alam
image::muhd97.png[width="150", align="left"]
{empty}[https://github.com/muhd97[github]] [<<muhd97#, portfolio>>]

Role: Developer +
Responsibilities: UI
Responsibilities: Data

'''
10 changes: 8 additions & 2 deletions docs/ContactUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
:site-section: ContactUs
:stylesDir: stylesheets

* *Bug reports, Suggestions* : Post in our https://github.com/se-edu/addressbook-level3/issues[issue tracker] if you noticed bugs or have suggestions on how to improve.
* *Bug reports, Suggestions* : Post in our https://github.com/AY1920S2-CS2103T-W12-4/main/issues[issue tracker] if you noticed bugs or have suggestions on how to improve.
* *Contributing* : We welcome pull requests. Follow the process described https://github.com/oss-generic/process[here]
* *Email us* : You can also reach us at `damith [at] comp.nus.edu.sg`
* *Email us* : You can also reach us at:
** Adarsh: `[email protected]`
** Kevin: `[email protected]`
** Mingsi: `[email protected]`
** Sharadh: `[email protected]`
** Zain: `[email protected]`

6 changes: 3 additions & 3 deletions docs/DevOps.adoc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
= AddressBook Level 3 - Dev Ops
= CookBuddy - Dev Ops
:site-section: DeveloperGuide
:toc:
:toc-title:
Expand All @@ -12,7 +12,7 @@ ifdef::env-github[]
:note-caption: :information_source:
:warning-caption: :warning:
endif::[]
:repoURL: https://github.com/se-edu/addressbook-level3/tree/master
:repoURL: https://github.com/AY1920S2-CS2103T-W12-4/main/tree/master

== Build Automation

Expand Down Expand Up @@ -41,7 +41,7 @@ Here are the steps to create a new release.

== Managing Dependencies

A project often depends on third-party libraries. For example, Address Book depends on the https://github.com/FasterXML/jackson[Jackson library] for JSON parsing. Managing these _dependencies_ can be automated using Gradle. For example, Gradle can download the dependencies automatically, which is better than these alternatives:
A project often depends on third-party libraries. For example, *CookBuddy* depends on the https://github.com/FasterXML/jackson[Jackson library] for JSON parsing. Managing these _dependencies_ can be automated using Gradle. For example, Gradle can download the dependencies automatically, which is better than these alternatives:

[loweralpha]
. Include those libraries in the repo (this bloats the repo size)
Expand Down
Loading