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

[CS2113T-F11-1] The Schwarzenegger #113

Open
wants to merge 977 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
977 commits
Select commit Hold shift + click to select a range
c9fe146
Move parser test code in parser package
tienkhoa16 Nov 8, 2020
7c12364
Refactor magic number and string in profile parser
tienkhoa16 Nov 8, 2020
6ac3374
update common parser test
tienkhoa16 Nov 8, 2020
2aad4b4
Add javaDoc for all public Workout Session methods
yujinyang1998 Nov 8, 2020
1283edd
Merge pull request #219 from CFZeon/master
yujinyang1998 Nov 8, 2020
f0d57c3
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp
yujinyang1998 Nov 8, 2020
bf778fb
Refactor test for WorkoutSessionParser
yujinyang1998 Nov 8, 2020
3dfd5cc
Merge pull request #220 from yujinyang1998/master
CFZeon Nov 8, 2020
022a57e
Update User guide
yujinyang1998 Nov 8, 2020
85b047c
Move InsufficientArgumentException out to common exceptions package
tienkhoa16 Nov 8, 2020
eda14de
Add test for profile help
tienkhoa16 Nov 8, 2020
5c78ca5
Merge pull request #221 from yujinyang1998/master
CFZeon Nov 8, 2020
17c4b22
Update search format for diet session in help message and user guide
yujinyang1998 Nov 8, 2020
d8793d2
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp
yujinyang1998 Nov 8, 2020
6e3db36
Add Profile Session test
tienkhoa16 Nov 8, 2020
96be087
fixed workoutmanager dates bug
wgzesg Nov 8, 2020
0e4ac8a
Update profile session test
tienkhoa16 Nov 8, 2020
c750d14
Merge pull request #222 from yujinyang1998/master
tienkhoa16 Nov 8, 2020
1788d28
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp…
tienkhoa16 Nov 8, 2020
e92a723
Merge pull request #223 from tienkhoa16/branch-oop
tienkhoa16 Nov 8, 2020
4eeb303
change name
CFZeon Nov 8, 2020
d77234d
add template for PPP
CFZeon Nov 8, 2020
d080277
Merge pull request #224 from CFZeon/master
wgzesg Nov 8, 2020
adeee25
merged files
wgzesg Nov 8, 2020
cb0192b
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp
wgzesg Nov 8, 2020
ba6e552
update config to use kramdown markdown
CFZeon Nov 8, 2020
2ae979b
Make dietmanager and dietsession parser extends common parser
tienkhoa16 Nov 8, 2020
512951b
Add javadoc
tienkhoa16 Nov 8, 2020
2f209f7
update ppp
CFZeon Nov 8, 2020
e56a87f
update ppp
CFZeon Nov 8, 2020
e69d392
Merge pull request #225 from CFZeon/master
zsk612 Nov 8, 2020
6cdd05e
update ppp
wgzesg Nov 8, 2020
6404113
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp
wgzesg Nov 8, 2020
8622a4c
Edit format
yujinyang1998 Nov 8, 2020
e9b8cb8
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp
yujinyang1998 Nov 8, 2020
ff5ff9d
Update ppp
zsk612 Nov 8, 2020
280b9f4
update PPP
wgzesg Nov 8, 2020
b03e199
Merge pull request #227 from zsk612/branch-refactor
wgzesg Nov 8, 2020
6a3968f
Merge pull request #226 from yujinyang1998/master
wgzesg Nov 8, 2020
d705703
Merge pull request #228 from wgzesg/master
wgzesg Nov 8, 2020
dabce62
Add expected weight recommendation in view profile
tienkhoa16 Nov 8, 2020
1ca6f9c
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp…
tienkhoa16 Nov 8, 2020
c642cf4
Update app name with correct format in build.gradle
tienkhoa16 Nov 8, 2020
ed3df94
Add PPP
tienkhoa16 Nov 8, 2020
d7b3ec2
Merge pull request #229 from tienkhoa16/branch-oop
tienkhoa16 Nov 8, 2020
e619d83
Update jar file name in UG
tienkhoa16 Nov 8, 2020
23aebd7
Merge pull request #230 from tienkhoa16/branch-oop
tienkhoa16 Nov 8, 2020
1f5dffb
Update dg links and ppp
yujinyang1998 Nov 9, 2020
db9216a
Update example in Main Menu and Profile Menu
tienkhoa16 Nov 9, 2020
f962e17
Add contribution tag in UG
tienkhoa16 Nov 9, 2020
7b4a324
Merge pull request #231 from yujinyang1998/master
yujinyang1998 Nov 9, 2020
971691c
Update cfzeon.md
CFZeon Nov 9, 2020
3edfb60
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp…
tienkhoa16 Nov 9, 2020
43e30f9
Merge pull request #232 from tienkhoa16/branch-oop
tienkhoa16 Nov 9, 2020
2e67e66
add corrupted file exception handling, test case for corrupted file
CFZeon Nov 9, 2020
e4cfc34
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp
CFZeon Nov 9, 2020
337ae34
fix style check
CFZeon Nov 9, 2020
42a2511
Update README.md in project folder
tienkhoa16 Nov 9, 2020
6818953
Update UG and add missing javadoc
tienkhoa16 Nov 9, 2020
04f2136
update UG with screenshots for new diet session
CFZeon Nov 9, 2020
ae32ebd
Merge pull request #233 from CFZeon/master
tienkhoa16 Nov 9, 2020
d4a62d9
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp…
tienkhoa16 Nov 9, 2020
c03dca5
Merge pull request #234 from tienkhoa16/branch-oop
CFZeon Nov 9, 2020
118cc8f
change new diet session step 4 image
CFZeon Nov 9, 2020
c446b99
Merge pull request #235 from CFZeon/master
CFZeon Nov 9, 2020
c491a8c
Update user stories in DG
tienkhoa16 Nov 9, 2020
5fd813e
Update PPP
tienkhoa16 Nov 9, 2020
cf844fb
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp…
tienkhoa16 Nov 9, 2020
75c34fe
Merge pull request #237 from tienkhoa16/branch-oop
yujinyang1998 Nov 9, 2020
92ffe95
update javadocs
CFZeon Nov 9, 2020
aedc3c1
update uml diagram for dietsessionedit
CFZeon Nov 9, 2020
232e120
update ug dg
wgzesg Nov 9, 2020
59369c3
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp
wgzesg Nov 9, 2020
941596a
Add more javadoc
zsk612 Nov 9, 2020
694b223
Add value proposition to DG
tienkhoa16 Nov 9, 2020
393cfcc
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp…
zsk612 Nov 9, 2020
dacaf4d
Merge pull request #238 from wgzesg/master
tienkhoa16 Nov 9, 2020
8923513
update diagram styles
wgzesg Nov 9, 2020
ad95d5d
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp…
tienkhoa16 Nov 9, 2020
bac2f8f
Merge pull request #239 from wgzesg/master
tienkhoa16 Nov 9, 2020
c02c792
add more javadoc
zsk612 Nov 9, 2020
68e1729
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp…
zsk612 Nov 9, 2020
a67c414
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp…
tienkhoa16 Nov 9, 2020
e31ec26
Fix checkstyle
zsk612 Nov 9, 2020
582fe5e
Merge pull request #240 from zsk612/branch-refactor
zsk612 Nov 9, 2020
bc8c6cd
add ownership
wgzesg Nov 9, 2020
e1f9691
Update plantUML diagram for workout session search
yujinyang1998 Nov 9, 2020
889a4c8
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp
yujinyang1998 Nov 9, 2020
5871f13
Update msg in plantUML for workout session search
yujinyang1998 Nov 9, 2020
8e7466e
Merge pull request #241 from yujinyang1998/master
yujinyang1998 Nov 9, 2020
2258840
update dg, refactor dietsessionclear
CFZeon Nov 9, 2020
84ef4bc
refactor dietsessionclear
CFZeon Nov 9, 2020
f1a66a0
Update uml diagram
zsk612 Nov 9, 2020
6e5382f
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp…
zsk612 Nov 9, 2020
9075224
update dgs
wgzesg Nov 9, 2020
6b3dbf9
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp
wgzesg Nov 9, 2020
d2ad3e3
Update DG for workout session help
yujinyang1998 Nov 9, 2020
61416d3
Adjust diagram in DG
tienkhoa16 Nov 9, 2020
943fb2e
Merge pull request #242 from yujinyang1998/master
tienkhoa16 Nov 9, 2020
9a3b222
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp…
tienkhoa16 Nov 9, 2020
c868af3
update titles
wgzesg Nov 9, 2020
b24df34
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp
wgzesg Nov 9, 2020
5b9a89d
fix anchoring
wgzesg Nov 9, 2020
6ee8580
update uml sequence diagram for DG
CFZeon Nov 9, 2020
0b1cf46
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp
CFZeon Nov 9, 2020
fe01e04
Merge pull request #243 from wgzesg/master
yujinyang1998 Nov 9, 2020
bdfa009
update ppp link
wgzesg Nov 9, 2020
ce075ad
Merge pull request #244 from CFZeon/master
yujinyang1998 Nov 9, 2020
88a2612
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp
wgzesg Nov 9, 2020
2a4d437
Merge pull request #245 from wgzesg/master
wgzesg Nov 9, 2020
a1b21ad
Update diagrams in DG
tienkhoa16 Nov 9, 2020
a01f1da
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp…
tienkhoa16 Nov 9, 2020
7f2e3d8
Update ug for workout session add and dg typo
yujinyang1998 Nov 9, 2020
2af8355
update dg
CFZeon Nov 9, 2020
6462093
Update image linking
tienkhoa16 Nov 9, 2020
238bd36
Merge pull request #246 from yujinyang1998/master
yujinyang1998 Nov 9, 2020
d8a4a91
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp
CFZeon Nov 9, 2020
d0b450d
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp
CFZeon Nov 9, 2020
fb868f1
Merge pull request #247 from CFZeon/master
CFZeon Nov 9, 2020
3d1d426
Update image link in DG
tienkhoa16 Nov 9, 2020
68b24e8
Update image anchor
tienkhoa16 Nov 9, 2020
d9db629
update dg
CFZeon Nov 9, 2020
a042c2d
Update image anchor
tienkhoa16 Nov 9, 2020
02694d6
Update image anchor
tienkhoa16 Nov 9, 2020
d588618
Update DG and PPP
tienkhoa16 Nov 9, 2020
07aabda
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp…
tienkhoa16 Nov 9, 2020
3f1a656
Add activation bar
tienkhoa16 Nov 9, 2020
5ad1292
Remove trailing lines after destruction
tienkhoa16 Nov 9, 2020
db1235c
Update appendix indentation
tienkhoa16 Nov 9, 2020
3c4b1b9
Remove common classes
tienkhoa16 Nov 9, 2020
c9370a2
update dg and uml diagram
CFZeon Nov 9, 2020
5cb5796
update dg
CFZeon Nov 9, 2020
123aec1
Merge pull request #248 from tienkhoa16/branch-oop
CFZeon Nov 9, 2020
623371b
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp
CFZeon Nov 9, 2020
a324a23
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp
CFZeon Nov 9, 2020
5e65c64
Merge pull request #249 from CFZeon/master
CFZeon Nov 9, 2020
ac69799
Update dg
yujinyang1998 Nov 9, 2020
3224651
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp
yujinyang1998 Nov 9, 2020
47936df
Merge pull request #250 from yujinyang1998/master
yujinyang1998 Nov 9, 2020
8269b1a
add diagrams
wgzesg Nov 9, 2020
13ac209
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp
wgzesg Nov 9, 2020
312ab01
Change ui -> commonui
tienkhoa16 Nov 9, 2020
a9d6fa2
Remove div
tienkhoa16 Nov 9, 2020
2a69d24
Test image center aligning
tienkhoa16 Nov 9, 2020
e648206
test image aligning
tienkhoa16 Nov 9, 2020
9b24047
Revert center aligning
tienkhoa16 Nov 9, 2020
3f583c3
Update ug for workout session
yujinyang1998 Nov 9, 2020
7721e28
Merge pull request #251 from yujinyang1998/master
yujinyang1998 Nov 9, 2020
ae6a20b
Fix anchor
tienkhoa16 Nov 9, 2020
b23158f
Ui diagram
wgzesg Nov 9, 2020
a399415
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp
wgzesg Nov 9, 2020
852bffb
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp…
tienkhoa16 Nov 9, 2020
4bec18b
Merge pull request #252 from wgzesg/master
wgzesg Nov 9, 2020
1030fb2
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp…
tienkhoa16 Nov 9, 2020
27424c2
move storage section up
wgzesg Nov 9, 2020
a665584
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp
wgzesg Nov 9, 2020
8908c5a
update dg
CFZeon Nov 9, 2020
5285bb6
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp
CFZeon Nov 9, 2020
e9c078a
typo
wgzesg Nov 9, 2020
293ff89
Merge pull request #253 from wgzesg/master
CFZeon Nov 9, 2020
b2087c3
remove trailing line below X in uml diagram
CFZeon Nov 9, 2020
10045c6
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp
CFZeon Nov 9, 2020
20a8dbb
Merge pull request #254 from CFZeon/master
CFZeon Nov 9, 2020
ebc7e1f
remove trailing red line in uml diagram
CFZeon Nov 9, 2020
ed9d9b1
update ppp hyperlink
wgzesg Nov 9, 2020
cfe6526
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp
CFZeon Nov 9, 2020
0148be1
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp
wgzesg Nov 9, 2020
8f4191d
Update DeveloperGuide.md
CFZeon Nov 9, 2020
12491ea
Merge pull request #255 from CFZeon/master
yujinyang1998 Nov 9, 2020
e3399d9
Update Dg
yujinyang1998 Nov 9, 2020
7339978
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp
yujinyang1998 Nov 9, 2020
e80a41b
Merge pull request #256 from yujinyang1998/master
yujinyang1998 Nov 9, 2020
84f3590
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp
wgzesg Nov 9, 2020
8b08d37
Merge pull request #257 from wgzesg/master
wgzesg Nov 9, 2020
5bfd878
update dg and ug
CFZeon Nov 9, 2020
9bada0f
Merge pull request #258 from CFZeon/master
yujinyang1998 Nov 9, 2020
9b7c765
Adjust diagrams
tienkhoa16 Nov 9, 2020
4181045
Update dg
yujinyang1998 Nov 9, 2020
1dc93eb
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp
yujinyang1998 Nov 9, 2020
4bfa437
update ppp
CFZeon Nov 9, 2020
1dfbe64
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp
CFZeon Nov 9, 2020
4acf626
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp…
tienkhoa16 Nov 9, 2020
cacddea
Merge pull request #259 from CFZeon/master
CFZeon Nov 9, 2020
75b55e7
Merge pull request #260 from tienkhoa16/branch-oop
yujinyang1998 Nov 9, 2020
5c0cff1
Update dg
yujinyang1998 Nov 9, 2020
5f8837d
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp
yujinyang1998 Nov 9, 2020
4ff88b6
Add screenshots for ug and update uml
zsk612 Nov 9, 2020
504d13a
add ug screenshots and update uml
zsk612 Nov 9, 2020
7c09209
Update DeveloperGuide.md
CFZeon Nov 9, 2020
0e3fc3e
Update ug and dg
yujinyang1998 Nov 9, 2020
431a33c
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp
yujinyang1998 Nov 9, 2020
cf70b81
Merge pull request #261 from yujinyang1998/master
yujinyang1998 Nov 9, 2020
bfab0df
Update Youtube link in DG
tienkhoa16 Nov 9, 2020
d4b6068
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp…
tienkhoa16 Nov 9, 2020
dd362d2
Merge pull request #262 from tienkhoa16/branch-oop
tienkhoa16 Nov 9, 2020
3f3eaf4
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp…
zsk612 Nov 9, 2020
13b93cf
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp…
zsk612 Nov 9, 2020
9e48329
Update ug
yujinyang1998 Nov 9, 2020
84189a0
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp
yujinyang1998 Nov 9, 2020
6489ae3
Merge pull request #263 from yujinyang1998/master
yujinyang1998 Nov 9, 2020
b122bd2
Update ug
zsk612 Nov 9, 2020
73b297e
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp…
zsk612 Nov 9, 2020
85dab4e
Merge pull request #264 from zsk612/branch-refactor
zsk612 Nov 9, 2020
03870bd
Update DeveloperGuide.md
CFZeon Nov 9, 2020
d48661c
update ppp
CFZeon Nov 9, 2020
42beb5d
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp
CFZeon Nov 9, 2020
7ce7bdc
Merge pull request #265 from CFZeon/master
CFZeon Nov 9, 2020
7ffd4bc
Update ppp
yujinyang1998 Nov 9, 2020
6d8ba5e
Merge pull request #266 from yujinyang1998/master
yujinyang1998 Nov 9, 2020
a05fe83
Update PPP
tienkhoa16 Nov 9, 2020
7b81fec
Merge pull request #267 from tienkhoa16/branch-oop
tienkhoa16 Nov 9, 2020
3c472b9
Update ppp
zsk612 Nov 9, 2020
3099cec
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp…
zsk612 Nov 9, 2020
4c63d30
update ppp
CFZeon Nov 9, 2020
0b6aa77
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp
CFZeon Nov 9, 2020
e1ae6a3
Merge pull request #268 from CFZeon/master
CFZeon Nov 9, 2020
6fd5039
Update ppp
zsk612 Nov 9, 2020
97e65b2
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp…
zsk612 Nov 9, 2020
dd8cbe5
update ppp
zsk612 Nov 9, 2020
28141ee
update ug
zsk612 Nov 9, 2020
80ad1ef
Update ppp
yujinyang1998 Nov 9, 2020
e291b89
Merge pull request #269 from zsk612/branch-refactor
zsk612 Nov 9, 2020
3c714b8
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp
yujinyang1998 Nov 9, 2020
6aa9413
Merge pull request #270 from yujinyang1998/master
yujinyang1998 Nov 9, 2020
92032dc
update ug
zsk612 Nov 9, 2020
7830171
Merge pull request #271 from zsk612/branch-refactor
zsk612 Nov 9, 2020
5fdf8f7
udpate ppp
zsk612 Nov 9, 2020
162f516
Merge pull request #272 from zsk612/branch-refactor
zsk612 Nov 9, 2020
4c38207
update dg
zsk612 Nov 9, 2020
cde50ba
Update UG
yujinyang1998 Nov 9, 2020
13a418f
Merge pull request #273 from zsk612/branch-refactor
zsk612 Nov 9, 2020
acbc479
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp
yujinyang1998 Nov 9, 2020
7eeddbd
Merge pull request #274 from yujinyang1998/master
yujinyang1998 Nov 9, 2020
37349a0
remove line from uml diagram
CFZeon Nov 9, 2020
24e38e5
Merge pull request #275 from CFZeon/master
CFZeon Nov 9, 2020
b311878
update ug
zsk612 Nov 9, 2020
eedf667
Merge pull request #276 from zsk612/branch-refactor
zsk612 Nov 9, 2020
e552099
update uml diagram
CFZeon Nov 9, 2020
2b68ff1
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp
CFZeon Nov 9, 2020
073cf26
Merge pull request #277 from CFZeon/master
CFZeon Nov 9, 2020
d7e3710
Update ug
yujinyang1998 Nov 9, 2020
1a067bd
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp
yujinyang1998 Nov 9, 2020
70703d3
Update UG
yujinyang1998 Nov 9, 2020
6b4ccf7
Merge pull request #278 from yujinyang1998/master
yujinyang1998 Nov 9, 2020
88d7ef9
Update ug
yujinyang1998 Nov 9, 2020
5985a90
Merge pull request #279 from yujinyang1998/master
yujinyang1998 Nov 9, 2020
740ef04
Update ug
yujinyang1998 Nov 9, 2020
fa8b081
Merge branch 'master' of https://github.com/AY2021S1-CS2113T-F11-1/tp
yujinyang1998 Nov 9, 2020
8ffe077
Merge pull request #280 from yujinyang1998/master
yujinyang1998 Nov 9, 2020
94efcbe
GitBook: [master] 17 pages and 90 assets modified
wgzesg Jun 23, 2021
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
19 changes: 19 additions & 0 deletions .classpath
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="bin/main" path="src/main/java">
<attributes>
<attribute name="gradle_scope" value="main"/>
<attribute name="gradle_used_by_scope" value="main,test"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="bin/test" path="src/test/java">
<attributes>
<attribute name="gradle_scope" value="test"/>
<attribute name="gradle_used_by_scope" value="test"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
<classpathentry kind="output" path="bin/default"/>
</classpath>
Binary file added .gitbook/assets/AddCommand.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 .gitbook/assets/AddCommandMessage.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 .gitbook/assets/AddCommandStart.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 .gitbook/assets/AddProfile.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 .gitbook/assets/Architecture.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 .gitbook/assets/CreateDietSession.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 .gitbook/assets/DeleteProfile.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 .gitbook/assets/DeleteWS.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 .gitbook/assets/DietSessionClear.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 .gitbook/assets/DietSessionDelete.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 .gitbook/assets/DietSessionEdit.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 .gitbook/assets/DietSessionList.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 .gitbook/assets/EditProfile.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 .gitbook/assets/EditWS.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 .gitbook/assets/FoodItemAdd.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 .gitbook/assets/FoodItemClear.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 .gitbook/assets/FoodItemDelete.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 .gitbook/assets/FoodItemList.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 .gitbook/assets/ListWS.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 .gitbook/assets/Logic.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 .gitbook/assets/MainMenu.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 .gitbook/assets/NewWS.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 .gitbook/assets/ParseInput (1).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 .gitbook/assets/ParseInput.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 .gitbook/assets/ParseInputWorkoutSession.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 .gitbook/assets/SearchDietSession.png
Binary file added .gitbook/assets/SearchWS.png
Binary file added .gitbook/assets/Ui.png
Binary file added .gitbook/assets/ViewProfile.png
Binary file added .gitbook/assets/WorkoutSessionAdd.png
Binary file added .gitbook/assets/WorkoutSessionDelete.png
Binary file added .gitbook/assets/WorkoutSessionList.png
Binary file added .gitbook/assets/WorkoutSessionSearch.png
Binary file added .gitbook/assets/add-new-food-item-step-2.JPG
Binary file added .gitbook/assets/add-new-food-item-step-3.JPG
Binary file added .gitbook/assets/add-profile-step-1.png
Binary file added .gitbook/assets/add-profile-step-2.png
Binary file added .gitbook/assets/add-profile-step-3.png
Binary file added .gitbook/assets/main-help-step-2.png
Binary file added .gitbook/assets/model.png
Binary file added .gitbook/assets/new-dietsession-step-2.png
Binary file added .gitbook/assets/new-dietsession-step-3.png
Binary file added .gitbook/assets/new-dietsession-step-4.png
Binary file added .gitbook/assets/workout-help-step-1.png
Binary file added .gitbook/assets/workout-help-step-2.png
18 changes: 1 addition & 17 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,20 +31,4 @@ jobs:
java-package: jdk+fx

- 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
run: ./gradlew check
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,7 @@ bin/

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

/saves/
logs/
data/
34 changes: 34 additions & 0 deletions .project
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>tp-master</name>
<comment>Project tp-master created by Buildship.</comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
</natures>
<filteredResources>
<filter>
<id>1601482289537</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
13 changes: 13 additions & 0 deletions .settings/org.eclipse.buildship.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
arguments=
auto.sync=false
build.scans.enabled=false
connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
connection.project.dir=
eclipse.preferences.version=1
gradle.user.home=
java.home=/Library/Java/JavaVirtualMachines/adoptopenjdk-11.jdk/Contents/Home
jvm.arguments=
offline.mode=false
override.workspace.settings=true
show.console.view=true
show.executions.view=true
9 changes: 0 additions & 9 deletions CONTRIBUTORS.md

This file was deleted.

Binary file added FoodItemAdd.png
63 changes: 33 additions & 30 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,45 +1,52 @@
# Duke project template

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.
The Schwarzenegger is a desktop command line interface-based app for managing all your needs regarding fitness. With the built-in personal assistant, you are able to track your daily workout and diet sessions based on your profile. If you can type fast, The Schwarzenegger can help you maximise your efficiency for maintaining fitness.

## Setting up in Intellij

Prerequisites: JDK 11 (use the exact version), update Intellij to the most recent version.
Prerequisites: JDK 11 \(use the exact version\), update Intellij to the most recent version.

1. **Configure Intellij for JDK 11**, as described [here](https://se-education.org/guides/tutorials/intellijJdk.html).
1. **Import the project _as a Gradle project_**, as described [here](https://se-education.org/guides/tutorials/intellijImportGradleProject.html).
1. **Verify the set up**: After the importing is complete, locate the `src/main/java/seedu/duke/Duke.java` file, right-click it, and choose `Run Duke.main()`. If the setup is correct, you should see something like the below:
```
> Task :compileJava
2. **Import the project** _**as a Gradle project**_, as described [here](https://se-education.org/guides/tutorials/intellijImportGradleProject.html).
3. **Verify the set up**: After the importing is complete, locate the `src/main/java/seedu/duke/Duke.java` file, right-click it, and choose `Run Duke.main()`. If the setup is correct, you should see something like the below:

```text
> Task :compileJava UP-TO-DATE
> Task :processResources NO-SOURCE
> Task :classes
> Task :classes UP-TO-DATE

> Task :Duke.main()
Hello from
____ _
| _ \ _ _| | _____
| | | | | | | |/ / _ \
| |_| | |_| | < __/
|____/ \__,_|_|\_\___|

What is your name?
_________________________________________________________________________________________________
_____ _
/ ____| | |
| (___ ___ | |__ __ __ __ _ _ __ ____ ___ _ __ ___ __ _ __ _ ___ _ __
\___ \ / __|| '_ \\ \ /\ / // _` || '__||_ // _ \| '_ \ / _ \ / _` | / _` | / _ \| '__|
____) || (__ | | | |\ V V /| (_| || | / /| __/| | | || __/| (_| || (_| || __/| |
|_____/ \___||_| |_| \_/\_/ \__,_||_| /___|\___||_| |_| \___| \__, | \__, | \___||_|
__/ | __/ |
|___/ |___/
_________________________________________________________________________________________________

_________________________________________________________________________________________________
Welcome back to The Schwarzenegger, Khoa!
How can I help you today?
_________________________________________________________________________________________________

Main Menu >>>>>
```
Type some word and press enter to let the execution proceed to the end.

Type `help` and press Enter to see the available commands under Main Menu.

## Build automation using Gradle

* This project uses Gradle for build automation and dependency management. It includes a basic build script as well (i.e. the `build.gradle` file).
* This project uses Gradle for build automation and dependency management. It includes a basic build script as well \(i.e. the `build.gradle` file\).
* If you are new to Gradle, refer to the [Gradle Tutorial at se-education.org/guides](https://se-education.org/guides/tutorials/gradle.html).

## Testing

### I/O redirection tests

* To run _I/O redirection_ tests (aka _Text UI tests_), navigate to the `text-ui-test` and run the `runtest(.bat/.sh)` script.

### JUnit tests

* A skeleton JUnit test (`src/test/java/seedu/duke/DukeTest.java`) is provided with this project template.
* JUnit test files are placed under `src/test/java` with this project.
* If you are new to JUnit, refer to the [JUnit Tutorial at se-education.org/guides](https://se-education.org/guides/tutorials/junit.html).

## Checkstyle
Expand All @@ -55,10 +62,6 @@ The project uses [GitHub actions](https://github.com/features/actions) for CI. W

`/docs` folder contains a skeleton version of the project documentation.

Steps for publishing documentation to the public:
1. If you are using this project template for an individual project, go your fork on GitHub.<br>
If you are using this project template for a team project, go to the team fork on GitHub.
1. Click on the `settings` tab.
1. Scroll down to the `GitHub Pages` section.
1. Set the `source` as `master branch /docs folder`.
1. Optionally, use the `choose a theme` button to choose a theme for your documentation.
Steps for publishing documentation to the public: 1. If you are using this project template for an individual project, go your fork on GitHub.
If you are using this project template for a team project, go to the team fork on GitHub. 1. Click on the `settings` tab. 1. Scroll down to the `GitHub Pages` section. 1. Set the `source` as `master branch /docs folder`. 1. Optionally, use the `choose a theme` button to choose a theme for your documentation.

15 changes: 15 additions & 0 deletions SUMMARY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Table of contents

* [Duke project template](README.md)
* [The Schwarzenegger](docs/README.md)
* [team](docs/team/README.md)
* [Zhang Shukai - Project Portfolio Page](docs/team/zsk612.md)
* [Yu Jinyang - Project Portfolio Page](docs/team/yujinyang1998.md)
* [tienkhoa16](docs/team/tienkhoa16.md)
* [Wang Zesong - Project Portfolio Page](docs/team/wgzesg.md)
* [Zeon Chua Feiyi - Project Portfolio Page](docs/team/cfzeon.md)
* [The Schwarzenegger - About Us](docs/team/aboutus.md)
* [The Schwarzenegger - User Guide](docs/userguide.md)
* [The Schwarzenegger - Developer Guide](docs/developerguide.md)
* [CONTRIBUTORS](contributors.md)

15 changes: 13 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ repositories {
dependencies {
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'
implementation 'com.google.code.gson:gson:2.8.6'
implementation 'org.apache.commons:commons-lang3:3.5'
}

test {
Expand All @@ -33,14 +35,23 @@ application {
}

shadowJar {
archiveBaseName = "duke"
archiveBaseName = "[CS2113T-F11-1][TheSchwarzenegger]"
archiveClassifier = null
}

checkstyle {
toolVersion = '8.23'
}

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

jar {
manifest {
attributes(
'Main-Class': 'seedu.duke.Duke'
)
}
}
13 changes: 13 additions & 0 deletions contributors.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# CONTRIBUTORS

## Contributors

| Display | Name | Github Profile | Homepage |
| :--- | :---: | :---: | :---: |
| ![](https://avatars0.githubusercontent.com/u/22460123?s=100) | Jeffry Lum | [Github](https://github.com/j-lum/) | [Homepage](https://se.kasugano.moe) |
| ![](https://avatars0.githubusercontent.com/u/1673303?s=100) | Damith C. Rajapakse | [Github](https://github.com/damithc/) | [Homepage](https://www.comp.nus.edu.sg/~damithch/) |

## I would like to join this list. How can I help the project

For more information, please refer to our [contributor's guide](https://oss-generic.github.io/process/).

9 changes: 0 additions & 9 deletions docs/AboutUs.md

This file was deleted.

34 changes: 0 additions & 34 deletions docs/DeveloperGuide.md

This file was deleted.

14 changes: 8 additions & 6 deletions docs/README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
# Duke
# The Schwarzenegger

{Give product intro here}
The Schwarzenegger is a desktop command line interface-based app for managing all your needs regarding fitness. With the built-in personal assistant, you are able to track your daily workout and diet sessions based on your profile. If you can type fast, The Schwarzenegger can help you maximise your efficiency for maintaining fitness.

Site Map:

* [User Guide](userguide.md)
* [Developer Guide](developerguide.md)
* [About Us](team/aboutus.md)

Useful links:
* [User Guide](UserGuide.md)
* [Developer Guide](DeveloperGuide.md)
* [About Us](AboutUs.md)
42 changes: 0 additions & 42 deletions docs/UserGuide.md

This file was deleted.

4 changes: 4 additions & 0 deletions docs/_config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
theme: jekyll-theme-cayman
markdown: kramdown
plugins:
- jemoji
Loading