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-W10-3] BuffBuddy #20

Open
wants to merge 936 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
936 commits
Select commit Hold shift + click to select a range
a51ba86
Upload loadProgrammeListSeqenceDiagram image
Bev-low Nov 7, 2024
65118b5
Upload Save Sequence Diagram
Bev-low Nov 7, 2024
1c8c97a
Change ReadMe File
Bev-low Nov 7, 2024
ef35c27
Adjust history commands
TVageesan Nov 7, 2024
9945772
Merge branch 'master' into Adjust-History-Commands
TVageesan Nov 7, 2024
3caf340
Fix checkstyle error
TVageesan Nov 7, 2024
0d163c4
Update UG
TVageesan Nov 7, 2024
1f8455c
Remove test
TVageesan Nov 7, 2024
c1ae5ac
Remove title to standarise
Bev-low Nov 7, 2024
6fc0059
Add programme Compoennt and descriptions
Bev-low Nov 7, 2024
7bd3ede
Add programme Compoennt diagram
Bev-low Nov 7, 2024
d412197
Add Date Seralizer in diagram
Bev-low Nov 7, 2024
6f3a5a3
Add Save Seq Dia
Bev-low Nov 7, 2024
898f3cc
Move Private methods to the top for DailyRecord
Bev-low Nov 7, 2024
34cf6b4
Minor fixes
Bev-low Nov 7, 2024
8e86548
Merge pull request #229 from TVageesan/Adjust-History-Commands
Bev-low Nov 7, 2024
69b3deb
Merge branch 'master' of https://github.com/AY2425S1-CS2113-W10-3/tp …
Bev-low Nov 7, 2024
a201fbb
Add Date Serializer description
Bev-low Nov 7, 2024
f814ab1
Added a toStringPB for PB printing for nicer looking strings
Bev-low Nov 7, 2024
c7d0a97
Make printing pb nicer
Bev-low Nov 7, 2024
8bdd01c
Fix printing of History PB commands and updated UG accordingly
Bev-low Nov 7, 2024
0b48724
Add JavaDoc to toStringPb
Bev-low Nov 7, 2024
4a7efeb
Added PPP changes
Bev-low Nov 7, 2024
5d1ddd5
Merge pull request #230 from Bev-low/DG
Bev-low Nov 7, 2024
7c7b6b4
Merge branch 'master' of https://github.com/AY2425S1-CS2113-W10-3/tp
Bev-low Nov 7, 2024
a90df91
Remove Date paramenter from history wk
Bev-low Nov 7, 2024
924e46f
Merge pull request #231 from Bev-low/master
Bev-low Nov 7, 2024
1d7ca14
Add class diagram in DG
nirala-ts Nov 7, 2024
dcdaa77
Add ui class diagram in DG
nirala-ts Nov 7, 2024
bcccc5f
Merge branch 'master' of https://github.com/AY2425S1-CS2113-W10-3/tp
nirala-ts Nov 7, 2024
1817964
Merge branch 'master' of https://github.com/AY2425S1-CS2113-W10-3/tp …
nirala-ts Nov 7, 2024
381cf90
Add descriptions for Ui, Parser components
nirala-ts Nov 7, 2024
b583d46
Merge branch 'edit-doc-package'
nirala-ts Nov 7, 2024
1b55164
Merge pull request #232 from nirala-ts/master
nirala-ts Nov 7, 2024
8f22fcd
Finish up test code for all History features related code
andreusxcarvalho Nov 7, 2024
66c2d9e
fix checkstyle errors
andreusxcarvalho Nov 7, 2024
9d38e81
Resolved merge conflicts
andreusxcarvalho Nov 7, 2024
b0212e9
Add more test code for History features
andreusxcarvalho Nov 7, 2024
17edd7d
Merge pull request #233 from andreusxcarvalho/HistoryFeaturesTest
TVageesan Nov 7, 2024
721772c
Add java doc comments
andreusxcarvalho Nov 7, 2024
33dd043
Update DG diagrams and add PPP
nirala-ts Nov 7, 2024
02c59a9
Update exception type thrown in Javadoc
nirala-ts Nov 7, 2024
8aa2012
Merge branch 'edit-doc-package'
nirala-ts Nov 7, 2024
3b35e56
Change author for Ui
nirala-ts Nov 7, 2024
11b2260
Edit History component in DG
andreusxcarvalho Nov 7, 2024
a9e43ff
Update HistoryCommandFactory.java
andreusxcarvalho Nov 7, 2024
524e57c
Update History.java
andreusxcarvalho Nov 7, 2024
d4036ae
Update History.java
andreusxcarvalho Nov 7, 2024
5008d83
Update ViewPersonalBestCommand.java
andreusxcarvalho Nov 7, 2024
7b05321
Update History.java
andreusxcarvalho Nov 7, 2024
726729c
Change historycommandsummary diagram
andreusxcarvalho Nov 7, 2024
fbfdad3
Merge branch 'HistoryFeaturesTest' of https://github.com/andreusxcarv…
andreusxcarvalho Nov 7, 2024
0df4769
Merge pull request #234 from andreusxcarvalho/HistoryFeaturesTest
andreusxcarvalho Nov 7, 2024
f6ac8b8
Merge pull request #235 from nirala-ts/master
Bev-low Nov 7, 2024
97c4503
Draft PPP
andreusxcarvalho Nov 8, 2024
5c607dc
Merge pull request #236 from andreusxcarvalho/master
TVageesan Nov 8, 2024
c6eeb83
Resolved -ve meals issue
Atulteja Nov 9, 2024
5fe7e30
Resolved -ve water volume issue
Atulteja Nov 9, 2024
7fc4f58
Resolved UG errors for optional flags
Atulteja Nov 9, 2024
c3ec0fa
Change saving to happen after each action, not just at end
TVageesan Nov 9, 2024
5a4158f
Fix bugs identified during PE dry run
TVageesan Nov 9, 2024
16a93d1
Fix bugs identified during PE dry run
TVageesan Nov 9, 2024
934a32f
Fix bugs identified during PE dry run
TVageesan Nov 9, 2024
2bcb989
Fix tests broken by changes
TVageesan Nov 9, 2024
17ee6a2
Update EditExerciseProgrammeCommand.java
TVageesan Nov 9, 2024
32f4f73
Resolved start programme errors
Atulteja Nov 10, 2024
21be2f3
Updated UG
Atulteja Nov 10, 2024
93f62e1
resolved merge conflicts
Atulteja Nov 10, 2024
6ace3eb
Refactored the exceptions and moved water and meal checks to command …
Atulteja Nov 10, 2024
2f409d2
Fixed failing test cases
Atulteja Nov 10, 2024
4978f5b
Fixed Checkstyle error
Atulteja Nov 10, 2024
6876abf
Merge pull request #285 from Atulteja/PE-D_issues-branch
Atulteja Nov 10, 2024
8e547e7
Merge pull request #284 from TVageesan/Fix-2.0-Bugs
Atulteja Nov 10, 2024
cbefae9
Edited water, meal and meallist class diagrams
Atulteja Nov 10, 2024
fbe18dc
Shifted log workout down
Bev-low Nov 10, 2024
8e5a575
Fixing #248
Bev-low Nov 10, 2024
4651dde
Making invlaid number exceptions more clear
Bev-low Nov 10, 2024
bfdd9e6
Add the to note section in UG
Bev-low Nov 10, 2024
c9c6fa4
Fix integer and float to inifinty
Bev-low Nov 10, 2024
537c5f2
Fix incorrect integer
Bev-low Nov 10, 2024
9da63fb
Add message when day is being replaced
Bev-low Nov 10, 2024
569a61b
Add data storage Information
Bev-low Nov 10, 2024
3d833e1
Add try and catch for corrupted file
Bev-low Nov 10, 2024
ed4f96c
Remove logging
Bev-low Nov 10, 2024
ea90703
Add message for first time here
Bev-low Nov 10, 2024
e23d16c
Fix checkstyle
Bev-low Nov 10, 2024
9e6b307
Add dont mess with our file in User guide
Bev-low Nov 10, 2024
a8b1451
Fix build issue
Bev-low Nov 11, 2024
5968f05
Remove dont mess with our files
Bev-low Nov 11, 2024
039b013
Rename all excetion to remove the 's'
Bev-low Nov 11, 2024
714068d
Edited DG and PPP
Atulteja Nov 11, 2024
9fd7a58
Fix UG bugs raised during PE-D
nirala-ts Nov 11, 2024
c4c1e0c
Add Validate methods to common
Bev-low Nov 11, 2024
20db2a5
Fix history wk bug
andreusxcarvalho Nov 11, 2024
729ec2b
Merge pull request #288 from Atulteja/master
Atulteja Nov 11, 2024
12a992e
Merge pull request #287 from nirala-ts/master
nirala-ts Nov 11, 2024
06350dd
Merge branch 'master' into master
andreusxcarvalho Nov 11, 2024
d2bf18f
Merge pull request #289 from andreusxcarvalho/master
TVageesan Nov 11, 2024
0b69bf1
Fix bugs for edit commands in UG
nirala-ts Nov 11, 2024
eb7b660
Add Table of Contents
nirala-ts Nov 11, 2024
7d3cebe
Update UG's To Note section
nirala-ts Nov 11, 2024
921092e
Update UG's Command Summary Table
nirala-ts Nov 11, 2024
ee8d90b
Merge pull request #290 from nirala-ts/master
nirala-ts Nov 11, 2024
40d892d
Update Storage for corruption
Bev-low Nov 11, 2024
720e424
Merge with Upstream
Bev-low Nov 11, 2024
13fa164
Update UG
nirala-ts Nov 11, 2024
9299601
Fix build fail
Bev-low Nov 11, 2024
f469fca
Update User Guide
Bev-low Nov 11, 2024
98ea901
Change all PUML symbols to + and -
Bev-low Nov 11, 2024
ee0ba45
Change all PUML symbols to + and -
Bev-low Nov 11, 2024
94ab38e
Update FAQ
nirala-ts Nov 11, 2024
0418d36
Remake loadProgrammeListSeqenceDiagram.puml
Bev-low Nov 11, 2024
14fcba5
Merge pull request #291 from nirala-ts/master
TVageesan Nov 11, 2024
31c88eb
Add authorship in UserGuide
Bev-low Nov 11, 2024
428b081
Merge branch 'master' into v2.0_BugFix
TVageesan Nov 11, 2024
d9df4cf
Update FAQ UG
nirala-ts Nov 11, 2024
ab4cc62
Merge pull request #286 from Bev-low/v2.0_BugFix
TVageesan Nov 11, 2024
9dc42ec
Merge branch 'master' of https://github.com/AY2425S1-CS2113-W10-3/tp
nirala-ts Nov 11, 2024
7b785b8
Change all to Example Usage
Bev-low Nov 11, 2024
c533bf6
Fix order of DG
Bev-low Nov 11, 2024
a44e3b8
Merge with Upstream
Bev-low Nov 11, 2024
3f40a9f
delte random
Bev-low Nov 11, 2024
cfb1532
Fix DG
Bev-low Nov 11, 2024
ece5cc5
Fix UG
Bev-low Nov 11, 2024
a60ac5f
Fix UG
Bev-low Nov 11, 2024
1526a9f
Merge pull request #292 from Bev-low/v2.0_BugFix
TVageesan Nov 11, 2024
241ec11
Fix bugs related to flag validation
TVageesan Nov 11, 2024
e09f85c
Merge branch 'master' into Finish-DG-Section
TVageesan Nov 11, 2024
72002e7
Resolve merge conflict
TVageesan Nov 11, 2024
b95309d
Merge branch 'master' of https://github.com/AY2425S1-CS2113-W10-3/tp
nirala-ts Nov 11, 2024
65a85fb
Restructure UG
TVageesan Nov 11, 2024
56b3926
Merge pull request #293 from TVageesan/Finish-DG-Section
Bev-low Nov 11, 2024
35b593b
Update class diagrams in DG
nirala-ts Nov 11, 2024
d0f6a51
Polish Edit Command documentation
TVageesan Nov 11, 2024
d4e618c
Resolve merge conflict
nirala-ts Nov 11, 2024
9b0b9d3
Update table of contents UG
nirala-ts Nov 11, 2024
be57fdb
Fix build fail
nirala-ts Nov 11, 2024
8405c42
Merge pull request #294 from TVageesan/Finish-DG-Section
Bev-low Nov 11, 2024
c4d988c
Edited DG and added constructors to sequence diagrams
Atulteja Nov 11, 2024
a32274c
fix weeklysummary seq diagram
andreusxcarvalho Nov 11, 2024
125b725
Merge branch 'master' into master
andreusxcarvalho Nov 11, 2024
9d5a0c4
Merge pull request #296 from Atulteja/master
Atulteja Nov 11, 2024
ee2fa48
Update seq diagrams to have constructor
Bev-low Nov 11, 2024
e4fde6b
add Water Seq Diagram
Bev-low Nov 11, 2024
b869d0f
add Delete Water deq Diagram
Bev-low Nov 11, 2024
add7910
add View Water deq Diagram
Bev-low Nov 11, 2024
864d922
add activation bars to seq diagram
andreusxcarvalho Nov 11, 2024
319aa0e
add add water activity diagram
Bev-low Nov 11, 2024
2d0fe46
Update PPP
Bev-low Nov 11, 2024
5f0ec2d
Update Parser component class diagrams
nirala-ts Nov 11, 2024
7a64638
Add Deletion for UML diagrams (my part + Edit Command)
Bev-low Nov 11, 2024
fc11ef0
Merge with upstream
nirala-ts Nov 11, 2024
02273f3
Merge branch 'master' of https://github.com/AY2425S1-CS2113-W10-3/tp …
Bev-low Nov 11, 2024
77690d6
Merge pull request #298 from Bev-low/v2.0_BugFix
Bev-low Nov 11, 2024
5ca2ab1
Merge branch 'master' of https://github.com/AY2425S1-CS2113-W10-3/tp
nirala-ts Nov 11, 2024
0b5142c
Fix AboutUs.md
Bev-low Nov 11, 2024
412c03a
Adjust user guide
TVageesan Nov 11, 2024
8d7d148
Merge pull request #299 from Bev-low/v2.0_BugFix
TVageesan Nov 11, 2024
76204b3
Merge branch 'master' of https://github.com/TVageesan/tp into TVagees…
TVageesan Nov 11, 2024
7e926e8
add sequence diagram for logprogramme
andreusxcarvalho Nov 11, 2024
45c88ff
Merge branch 'TVageesan-master'
TVageesan Nov 11, 2024
fd7d610
Update PPP
Bev-low Nov 11, 2024
958424d
update dev guide
andreusxcarvalho Nov 11, 2024
2d583ed
Resolve merge conflicts
andreusxcarvalho Nov 11, 2024
963e59a
Resolve merge conflicts
TVageesan Nov 11, 2024
aa22855
Merge branch 'master' into master
andreusxcarvalho Nov 11, 2024
7be0fd6
edit PPP
andreusxcarvalho Nov 11, 2024
7ca70ce
remove some Reviews
Bev-low Nov 11, 2024
1aee699
Update andreusxcarvalho.md
andreusxcarvalho Nov 11, 2024
b06f045
Merge branch 'master' of https://github.com/AY2425S1-CS2113-W10-3/tp …
Bev-low Nov 11, 2024
3a7b88c
Resolve merge conflicts
andreusxcarvalho Nov 11, 2024
b2f140d
fix proglog seq diagram
andreusxcarvalho Nov 11, 2024
a653a8a
Merge pull request #297 from andreusxcarvalho/master
andreusxcarvalho Nov 11, 2024
b1721d3
Merge pull request #301 from Bev-low/v2.0_BugFix
andreusxcarvalho Nov 11, 2024
2025415
Add edit programme documentation
TVageesan Nov 11, 2024
e258d71
Merge branch 'master' into Add-Programme-Documentation
TVageesan Nov 11, 2024
3ab57ea
Add edit programme documentation
TVageesan Nov 11, 2024
940a8fe
Merge branch 'master' into Add-Programme-Documentation
TVageesan Nov 11, 2024
8f4768e
Update edit command png
TVageesan Nov 11, 2024
6b724a6
Merge remote-tracking branch 'origin/Add-Programme-Documentation' int…
TVageesan Nov 11, 2024
49409d4
Update DG
nirala-ts Nov 11, 2024
f2e9fec
Merge pull request #302 from TVageesan/Add-Programme-Documentation
nirala-ts Nov 11, 2024
f3a2de8
Merge with upstream
nirala-ts Nov 11, 2024
b6cab55
Fix spelling errors in DG
nirala-ts Nov 12, 2024
5c7d6e4
Add flow of operations for create programme
nirala-ts Nov 12, 2024
5085839
Update common component DG
nirala-ts Nov 12, 2024
ec7b4e0
Merge pull request #303 from nirala-ts/master
nirala-ts Nov 12, 2024
82eedae
Make it shorter
Bev-low Nov 12, 2024
f8e8d3f
Make it shorter
Bev-low Nov 12, 2024
6900c05
Edited Meal sequence diagrams
Atulteja Nov 12, 2024
e86a918
Resolved merge conflicts
Atulteja Nov 12, 2024
4416a18
Add constructor for Add WAter
Bev-low Nov 12, 2024
d65d7ed
Replaced Diagrams to improve clarity
Atulteja Nov 12, 2024
d638bb8
Add arrows
Bev-low Nov 12, 2024
592771b
Add constructor
Bev-low Nov 12, 2024
8a810bd
Add constructor
Bev-low Nov 12, 2024
d4ac274
Edited PPP
Atulteja Nov 12, 2024
390a9da
Edited Meal sequence diagrams AGAIN
Atulteja Nov 12, 2024
ae5c12f
Update Add Water
Bev-low Nov 12, 2024
829bc4a
Update Add Water
Bev-low Nov 12, 2024
9e2f8b0
Clarified why parser functions are not included in seq diags
Atulteja Nov 12, 2024
dfd10a8
Update Add Water
Bev-low Nov 12, 2024
4695649
Make full seq diagram for felete and view water
Bev-low Nov 12, 2024
1d38668
Merge pull request #305 from Atulteja/master
Bev-low Nov 12, 2024
385755f
Merge branch 'master' of https://github.com/AY2425S1-CS2113-W10-3/tp …
Bev-low Nov 12, 2024
3d3bead
Fix mistake
Bev-low Nov 12, 2024
753f37e
Merge pull request #304 from Bev-low/v2.0_BugFix
Bev-low Nov 12, 2024
4238f8a
Fix mistake
Bev-low Nov 12, 2024
2fb15c1
Merge pull request #306 from Bev-low/v2.0_BugFix
TVageesan Nov 12, 2024
d4a32fd
Add ": to consturctor"
Bev-low Nov 12, 2024
1a561b8
Add ": to consturctor"
Bev-low Nov 12, 2024
4c5fb7e
add PPP to aboutus
andreusxcarvalho Nov 12, 2024
437a2dd
Merge pull request #307 from andreusxcarvalho/master
Bev-low Nov 12, 2024
0a3523b
Merge branch 'master' of https://github.com/AY2425S1-CS2113-W10-3/tp …
Bev-low Nov 12, 2024
cccfbdb
Merge pull request #308 from Bev-low/v2.0_BugFix
nirala-ts Nov 12, 2024
b8cfdeb
remove lines
Bev-low Nov 12, 2024
7c0e875
Update programmeException
Bev-low Nov 12, 2024
1f13497
Finish documentation
TVageesan Nov 12, 2024
3a752d0
Merge pull request #309 from Bev-low/v2.0_BugFix
TVageesan Nov 12, 2024
df37361
Update ProgCommandFactory to ProgrammeCommandFactory
nirala-ts Nov 12, 2024
4bf740f
Add link to PPP
nirala-ts Nov 12, 2024
7b2d09f
Merge pull request #310 from nirala-ts/master
Bev-low Nov 12, 2024
ebbfc6b
Merge pull request #311 from TVageesan/master
Bev-low Nov 12, 2024
28621c8
Edited programme exceptions
Atulteja Nov 12, 2024
fa3eaf4
Edit PPP
nirala-ts Nov 12, 2024
f1cb94c
update PPP
Bev-low Nov 12, 2024
d37d9d8
Shortened PPP
Atulteja Nov 12, 2024
a3e357d
Update tvageesan.md
TVageesan Nov 12, 2024
ccb34bf
Merge pull request #313 from nirala-ts/master
Bev-low Nov 12, 2024
01d9250
Merge branch 'master' of https://github.com/AY2425S1-CS2113-W10-3/tp …
Bev-low Nov 12, 2024
2dc572f
Merge pull request #312 from Atulteja/master
Atulteja Nov 12, 2024
0780db9
Update Log feature authorship
nirala-ts Nov 12, 2024
7bbdc39
Merge pull request #314 from Bev-low/v2.0_BugFix
nirala-ts Nov 12, 2024
4bc00d4
Merge branch 'master' of https://github.com/AY2425S1-CS2113-W10-3/tp
nirala-ts Nov 12, 2024
ba9f46a
Shortened PPP
Atulteja Nov 12, 2024
d81a2fb
Merge pull request #315 from nirala-ts/master
nirala-ts Nov 12, 2024
c3ccd36
Merge pull request #316 from Atulteja/master
Atulteja Nov 12, 2024
d5f8893
Add Link
Bev-low Nov 12, 2024
2b4e1be
Merge pull request #317 from Bev-low/v2.0_BugFix
TVageesan Nov 12, 2024
db6759a
Update DeveloperGuide.md
TVageesan Nov 12, 2024
778847a
Shortened PPP
Atulteja Nov 12, 2024
7b812c5
Merge pull request #318 from Atulteja/master
Bev-low Nov 12, 2024
d1da3f5
Update BuffBuddy.java
TVageesan Nov 12, 2024
4931ffd
made changes to exceptions
Atulteja Nov 12, 2024
b76319a
made changes to exceptions
Atulteja Nov 12, 2024
56d1602
Merge pull request #319 from Atulteja/master
TVageesan Nov 12, 2024
b0ad264
Finish BuffBuddy
TVageesan Nov 12, 2024
b770f5b
Solve checkstyle bug
TVageesan Nov 12, 2024
004ca15
Merge pull request #320 from TVageesan/master
nirala-ts Nov 12, 2024
ec1b69d
Update UserGuide.md
TVageesan Nov 12, 2024
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: BuffBuddy

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

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.
BuffyBuddy is your go to workout tracker to help you stay on track with your goals.

## Setting up in Intellij

Expand Down
9 changes: 9 additions & 0 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.10.0'
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.10.0'
implementation 'com.google.code.gson:gson:2.8.9'
testImplementation 'org.mockito:mockito-junit-jupiter:5.3.1'
}

test {
Expand Down Expand Up @@ -43,4 +45,11 @@ checkstyle {

run{
standardInput = System.in
enableAssertions = true
}

java {
toolchain {
languageVersion = JavaLanguageVersion.of(17)
}
}
80 changes: 80 additions & 0 deletions data/data.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
{
"programmeList": {
"currentActiveProgramme": 0,
"programmeList": [
{
"programmeName": "Advanced Starter",
"dayList": [
{
"name": "Monday",
"exercises": [
{
"sets": 3,
"reps": 15,
"weight": 30,
"calories": 200,
"name": "Bench Press"
},
{
"sets": 3,
"reps": 15,
"weight": 50,
"calories": 200,
"name": "Squat"
}
]
},
{
"name": "Wednesday",
"exercises": [
{
"sets": 3,
"reps": 10,
"weight": 10,
"calories": 100,
"name": "Bicep Curl"
}
]
}
]
},
{
"programmeName": "Advanced Starter",
"dayList": [
{
"name": "Monday",
"exercises": [
{
"sets": 3,
"reps": 15,
"weight": 30,
"calories": 200,
"name": "Bench Press"
},
{
"sets": 3,
"reps": 15,
"weight": 50,
"calories": 200,
"name": "Squat"
}
]
},
{
"name": "Wednesday",
"exercises": [
{
"sets": 3,
"reps": 10,
"weight": 10,
"calories": 100,
"name": "Bicep Curl"
}
]
}
]
}
]
},
"history": {}
}
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 |
|--------------------------------------------------------|:--------------:|:----------------------------------------------:|:-------------------------------------:|
| ![](https://via.placeholder.com/100.png?text=Atul) | Atul Teja | [Github](https://github.com/atulteja) | [Portfolio](team/atulteja) |
| ![](https://via.placeholder.com/100.png?text=Thiru) | Thiru Vageesan | [Github](https://github.com/tvageesan) | [Portfolio](team/tvageesan.md) |
| ![](https://via.placeholder.com/100.png?text=Beverly) | Low Beverly | [Github](https://github.com/Bev-low) | [Portfolio](team/bev-low.md) |
| ![](https://via.placeholder.com/100.png?text=Tanishka) | Tanishka | [Github Profile](https://github.com/nirala-ts) | [Portfolio](team/nirala-ts) |
| ![](https://via.placeholder.com/100.png?text=Andreus) | Andreus | [Github Profile](https://github.com/Andreus) | [Portfolio](team/andreusxcarvalho.md) |
Loading
Loading