-
Notifications
You must be signed in to change notification settings - Fork 229
[CS2113-T11-1] Wellness360 #31
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
Open
genexus85
wants to merge
512
commits into
nus-cs2113-AY2324S2:master
Choose a base branch
from
AY2324S2-CS2113-T11-1:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
512 commits
Select commit
Hold shift + click to select a range
150d51c
Add Class Diagram for current features of Fitness Motivator
Daviancold 4be581e
Add sequence diagram for current fitness motivator features
Daviancold 0075eac
Add class and sequence diagram to developer guide for fitness motivator
Daviancold 9b69f8d
Merge pull request #113 from Daviancold/branch-ExerciseMotivator
OKW32 4b83bee
Add draft code for new fitness goal feature
Daviancold 59c3715
Edit developer guide for habit tracker
genexus85 68cdd38
Merge branch 'master' into branch-DeveloperGuide
genexus85 839b4ac
Merge pull request #114 from genexus85/branch-DeveloperGuide
damiwee 976e2d2
Merge branch 'master' of https://github.com/AY2324S2-CS2113-T11-1/tp …
Daviancold 0b6989d
Add junit tests for reflection feature
damiwee 316ba0d
Fix coding style violation
damiwee dac6edb
Add comments to junit tests
damiwee 5d94679
Merge pull request #116 from damiwee/branch-ReflectJunitV2.0
Daviancold 589058f
Merge branch 'master' of https://github.com/AY2324S2-CS2113-T11-1/tp …
Daviancold 6592d5c
Add goal feature for Fitness Motivator
Daviancold 7b2da62
Add Java Docs and Comments for fitness goal feature
Daviancold 8007d83
Fix Build Gradle Issue for Fitness Motivator
Daviancold bcd178c
Remove data file for Fitness Motivator
Daviancold d376b5d
Change message variable to constants in FitnessMotivator Class
Daviancold 7536407
Add junit tests for reflection commands
damiwee b74efa6
Refactor code for Fitness Motivator
Daviancold b966b16
Fix issue with current JUnit Tests for Fitness Motivator
Daviancold 75a42d6
Merge pull request #117 from Daviancold/branch-ExerciseMotivator
damiwee 58bb5b1
Add fitness delete feature for Fitness Motivator
Daviancold 7d8e551
Fix coding convention in FitnessCommandParser class
Daviancold 6747c28
Remove unused import in main
Daviancold 329a200
Add Java Docs for fitness delete feature
Daviancold ff621b8
Minor changes to comment and exception handling in command parser
Daviancold 38ca5c6
Fix CheckStyle Violations
Daviancold 013ac11
Merge pull request #119 from Daviancold/branch-ExerciseMotivator
OKW32 9a1f962
Merge pull request #1 from Daviancold/branch-ExerciseMotivator
Daviancold 10675cd
Merge pull request #118 from damiwee/branch-ReflectJunitV2.0
Daviancold e6d2ea3
Merge branch 'master' of https://github.com/AY2324S2-CS2113-T11-1/tp
Daviancold 2bdbb48
Refactor code to reduce arrowhead in ExerciseGoalList Class
Daviancold 45bd3a1
Add draft for Ui Component in DeveloperGuide
Daviancold 232831f
Update user guide for new features in FitnessMotivator
Daviancold ed10cd8
Merge pull request #125 from Daviancold/master
genexus85 ca35fcc
Add minor changes to the User Guide
Daviancold 2b38df7
Merge pull request #127 from Daviancold/branch-UserGuide
genexus85 906163f
Update Class Diagram and PlantUML for FitnessMotivator
Daviancold 15fde8e
Update Developer Guide for new features in FitnessMotivator
Daviancold 7096436
Add junit tests for focus feature
JingHaoooo ea79b2e
Refactor code to improve coding standards
JingHaoooo 2b105be
Merge pull request #129 from JingHaoooo/branch-FocusTest
Daviancold 19a6008
Merge pull request #128 from Daviancold/branch-DeveloperGuide
JingHaoooo abb5dda
Merge branch 'master' into branch-DeveloperGuideV2.0
damiwee 08cbc52
Add Ui Component into Developer Guide
Daviancold e1fc504
Update user and developer guide
damiwee 91f3fdd
Update sequence diagram
damiwee 1ec421d
Merge pull request #130 from Daviancold/branch-DeveloperGuide
damiwee 351eb0e
Merge pull request #131 from damiwee/branch-DeveloperGuideV2.0
Daviancold b0384a9
Edit Fitness Class Diagram
Daviancold c6d5e9b
Add v2.0 user stories for Fitness Motivator
Daviancold 8b051d1
edit parser for fitness command
Daviancold 010f38b
Add Manual Testing test case for Fitness Motivator in Dev Guide
Daviancold 8b8206b
Update Fitness Motivator command parsers to increase defensiveness
Daviancold f27036f
Add JUnit tests for habit tracker and habit classes
genexus85 d813b15
Merge branch 'master' into branch-JUnit
genexus85 4b28a93
Merge pull request #134 from genexus85/branch-JUnit
Daviancold 8ccd59a
Merge branch 'master' of https://github.com/AY2324S2-CS2113-T11-1/tp …
Daviancold bf1b052
Merge branch 'master' of https://github.com/AY2324S2-CS2113-T11-1/tp …
Daviancold 5daffbf
Merge pull request #133 from Daviancold/branch-ExerciseMotivator
damiwee 03b1d5d
Update developer guide for Storage
OKW32 c654a7a
Merge pull request #132 from Daviancold/branch-DeveloperGuide
damiwee 9a14af2
Remove input sensitivity for Wellness360
Daviancold 090c285
Reduce arrowhead style coding in SleepCycleList class
OKW32 9d9276f
Fix spacing in developer guide for reflection manual testing
damiwee 240b219
Merge pull request #135 from Daviancold/branch-Main
damiwee 721170a
Remove input-output test
OKW32 a8ac934
Merge pull request #137 from damiwee/branch-DeveloperGuideV2.0
OKW32 988c55c
Merge pull request #136 from OKW32/branch-SleepTrackerV2
damiwee 51169c4
Merge branch 'master' into branch-UserGuideV2.0
damiwee 4cc696c
Add JUnit test for Fitness Goals Feature in Fitness Motivator
Daviancold bdaebe6
Merge pull request #138 from OKW32/branch-DeveloperGuide
damiwee ea04015
Merge pull request #139 from Daviancold/branch-JUnitTest
OKW32 b8f3d76
Minor changes to User Guide
Daviancold 2dd0101
Add minor changes to guides for SleepTracker
OKW32 3ac4745
Bug fix for countdown timer when using command exit.
JingHaoooo 7e49467
Minor Changes to Command Cheatsheet in User Guide
Daviancold 1c4cacd
Merge pull request #140 from OKW32/branch-Guides
JingHaoooo 7b68bca
Update user guide
damiwee 6088851
Merge pull request #143 from damiwee/branch-UserGuideV2.0
Daviancold ba1c70c
Refactor code to improve coding quality
JingHaoooo d98b722
Refactor codee to comply with coding quality
JingHaoooo 5c3373c
Merge branch 'master' of https://github.com/AY2324S2-CS2113-T11-1/tp …
Daviancold 5aa06b5
Merge pull request #141 from Daviancold/branch-UserGuide
JingHaoooo a27ac24
Update habit class and sequence diagrams
genexus85 df6ba0e
Update developer guide for habit tracker
genexus85 e411647
Refactor code for habit tracker class
genexus85 01a9cac
Update user guide for habit tracker
genexus85 8e464a9
Merge branch 'master' into branch-DeveloperGuide
genexus85 1605fb4
Update Focus timer user guide
JingHaoooo 8157510
Merge pull request #144 from genexus85/branch-DeveloperGuide
JingHaoooo ab6444a
Merge pull request #142 from JingHaoooo/branch-FocusV2
Daviancold 5c21f0c
Merge pull request #145 from JingHaoooo/branch_FocusUserGuide
genexus85 e62df73
Refactor set priority command class to abstract out complex conditions
genexus85 019c2dc
Merge branch 'master' into branch-ReflectionV2.0
damiwee 3ec433a
Update user guide for focus timer
JingHaoooo 5ec4733
Merge pull request #146 from genexus85/branch-Habit-v2.0
damiwee 1c3b250
Merge branch 'master' into branch-ReflectionV2.0
damiwee 3a89abf
Add Junit tests for Sleep Tracker
OKW32 b02eaa3
Merge pull request #148 from OKW32/branch-Guides
JingHaoooo b582550
Merge pull request #147 from JingHaoooo/branch_FocusUserGuide
OKW32 a733a56
Update user guide for habit tracker
genexus85 f0e8116
Merge branch 'master' into branch-UserGuideV2.0
damiwee 19bc90f
Merge branch 'master' into branch-ReflectionV2.0
damiwee ac7621e
Fix bug for delete and help command in Fitness Motivator
Daviancold 8870058
Merge pull request #149 from genexus85/branch-UserGuide
Daviancold eedbfcc
Add check for duplicate favorite questions saved
damiwee 653ffcc
Update user guide
damiwee db811cf
Merge pull request #150 from Daviancold/branch-ExerciseMotivator
genexus85 ce41fd9
Merge pull request #152 from damiwee/branch-UserGuideV2.0
genexus85 32921e3
Merge pull request #151 from damiwee/branch-ReflectionV2.0
genexus85 d7da155
Fix developer guide documentation bug
damiwee 4156a60
Fix letter casing for 'get' word in user stories
damiwee b250fc3
Update user guide FAQ on editing text files
damiwee a036bbf
Add missing documentation for exit command
damiwee 83de55a
Merge pull request #182 from damiwee/branch-BugFixesV2.1
damiwee 45d1a3d
Update User Guide for focus timer
JingHaoooo 8de4e4d
Improve readability of user guide for focus timer
JingHaoooo 3e21c49
Update habit class and sequence diagrams
genexus85 3c06600
Merge pull request #183 from JingHaoooo/branch-FocusV2.1
damiwee 82ad6a5
Update user guide for habit tracker
genexus85 0f5a4eb
Update developer guide for habit tracker
genexus85 aa83988
Refactor code for habit tracker to meet coding standards
genexus85 a41c947
Merge branch 'master' into branch-DeveloperGuide
genexus85 97a60ec
Bug fix: Refactor error messages
JingHaoooo 9c4cd2f
Merge pull request #184 from genexus85/branch-DeveloperGuide
OKW32 3401a67
Update Developer guide to include test cases for focus feature.
JingHaoooo c0a32c8
Update test cases in developer guide for focus feature
JingHaoooo 2a06742
Refactor developer guide for focus feature
JingHaoooo 8f3f219
Merge pull request #185 from JingHaoooo/branch-FocusV2.1
genexus85 a238de9
Fix bug for add sleep cycle command
OKW32 8849ab9
Add feature to auto delete older sleep cycles
OKW32 4766ac1
Add Sleep Help feature
OKW32 617f2ee
Merge pull request #186 from OKW32/branch-SleepTrackerV2.1
genexus85 9dc9a7a
Update guides for Sleep Tracker to include help menu
OKW32 8d45d52
Bug Fix for add exercise command in Exercise Motivator
Daviancold 0277cb0
Fix bug in delete command for Fitness Motivator
Daviancold 56897f0
Merge pull request #187 from OKW32/branch-Guides
genexus85 93c1c7c
Fix issues with build.gradle
Daviancold 3f0aa03
Fix new issues with Build.Gradle
Daviancold 386c6d9
Merge branch 'master' of https://github.com/AY2324S2-CS2113-T11-1/tp …
Daviancold c3c4e07
Edit User Guide for Fitness Motivator Bug Fix
Daviancold c07e444
Merge pull request #188 from Daviancold/branch-ExerciseMotivator
genexus85 c3b8365
Merge pull request #189 from Daviancold/branch-UserGuide
genexus85 7a78239
Update Fitness And UI Sequence Diagrams
Daviancold 76b5892
Update Developer guide with bug fix changes
Daviancold 532c223
Minor Update to sequence Diagram for Developer Guide
Daviancold a70fb16
Merge pull request #190 from Daviancold/branch-DeveloperGuide
genexus85 968afd0
Merge branch 'master' into branch-DeveloperGuideV2.1
damiwee a08c7ee
Update Designer Guide for Storage class
OKW32 b4fb205
Upload PPP for Ong Kan Wu
OKW32 b0d17a5
Add overall architecture image and description
damiwee 6174c12
Merge pull request #192 from damiwee/branch-DeveloperGuideV2.1
OKW32 707ed33
Merge pull request #191 from OKW32/branch-Guides
damiwee 9bd3b82
Add hyperlinks in PPP for Ong Kan Wu
OKW32 0abbd73
Add hyperlink in README.md to PPP
OKW32 7e48ccb
Merge pull request #193 from OKW32/branch-Guides
JingHaoooo 041cf81
Add PPP for damiwee
damiwee 1fa3258
Merge pull request #194 from damiwee/branch-PPPV2.1
OKW32 524be45
Edit PPP for Ong Kan Wu
OKW32 eb13089
Edit documentation bug in PPP for Ong Kan Wu
OKW32 270c58c
Merge pull request #195 from OKW32/branch-Guides
damiwee 4e09db7
Edit User Guide for Starting Wellness360
OKW32 c370440
Add help command for focus timer
JingHaoooo 4cb856a
Update user guide for focus timer
JingHaoooo ec818c7
Merge pull request #196 from OKW32/branch-Guides
damiwee 2fe3535
Change count down timer warning to 3 seconds
JingHaoooo e722d0f
Refactor code to improve coding quality
JingHaoooo e3d7691
Merge pull request #197 from JingHaoooo/branch-FocusV2.1
genexus85 b96db31
Remove unnecessary spacing in designer guide for Sleep Tracker
OKW32 7447d4c
Update developer guide for focus timer
JingHaoooo 7771ad1
Merge branch 'master' into branch-FocusV2.1
JingHaoooo da6f21f
Merge pull request #198 from OKW32/branch-Guides
JingHaoooo b70cd57
Update developer guide to add missing hyperlinks
JingHaoooo 9d02b72
Add PPP for Lim Jing Hao
JingHaoooo 5834022
Merge pull request #199 from JingHaoooo/branch-FocusV2.1
damiwee a8b4a68
Minor Changes to Ui Message Display
Daviancold bf3c81d
Merge pull request #200 from Daviancold/branch-ExerciseMotivator
JingHaoooo 5479674
Add command parser class and sequence diagrams
genexus85 2a5e31e
Update command parser developer guide
genexus85 aa4725f
Merge pull request #201 from genexus85/branch-DeveloperGuide
Daviancold 9840c10
Add PPP for Ari
genexus85 848d449
Edit sequence diagram for Storage component
OKW32 b522926
Merge pull request #202 from genexus85/branch-DeveloperGuide
damiwee 280a650
Merge pull request #203 from OKW32/branch-Guides
damiwee eddb354
Fix visual bug for Count up timer
JingHaoooo 13c96de
Update README
JingHaoooo 306a6f1
Merge pull request #204 from JingHaoooo/branch-FocusV2.1
damiwee 34b9bc8
Merge branch 'master' into branch-DeveloperGuideV2.1
damiwee c56f786
Update guides
damiwee 6283a57
Merge pull request #205 from damiwee/branch-DeveloperGuideV2.1
damiwee 47477cd
Add PPP for Davian Kho
Daviancold cfff08a
Merge pull request #206 from Daviancold/branch-DeveloperGuide
genexus85 15da95f
Update readme and refactor PPP file name
JingHaoooo 4a55fad
Merge pull request #207 from JingHaoooo/branch-FocusV2.1
JingHaoooo a1f6440
Update developer guide for focus timer
JingHaoooo 92394f9
Update hyperlink for Jing Hao PPP
JingHaoooo f5444bd
Merge pull request #208 from JingHaoooo/branch-FocusV2.1
JingHaoooo 4ae84b0
Merge branch 'master' into branch-DeveloperGuideV2.1
damiwee 4c3616f
Update hyperlinks
damiwee 187acea
Merge pull request #209 from damiwee/branch-DeveloperGuideV2.1
damiwee f73903a
Remove old FocusTimerTest file
JingHaoooo 370f9d5
Merge pull request #210 from JingHaoooo/branch-FocusV2.1
JingHaoooo 0dfda6f
Update user guide command summary
JingHaoooo 3843965
Bug fix for focus timer
JingHaoooo ff430a5
Merge pull request #211 from JingHaoooo/branch-FocusV2.1
JingHaoooo e8c4df3
Bug fix for focus timer feature in user guide
JingHaoooo 867ca03
Update user guide command summary
JingHaoooo 1b8409d
Merge pull request #212 from JingHaoooo/branch-FocusV2.1
JingHaoooo a4f5656
Update greet user message
genexus85 80c5d25
Add new line to IO test
genexus85 4b73dc4
Edit file name for Ong Kan Wu PPP
OKW32 02742e2
Edit greet message
genexus85 660e7df
Merge pull request #213 from genexus85/branch-Habit-v2.1
genexus85 270a408
Edit formatting in Developer Guide
Daviancold d2ba885
Merge pull request #215 from Daviancold/branch-DeveloperGuide
Daviancold 548459a
Edit header for Ong Kan Wu's PPP
OKW32 bf3c97b
Merge pull request #214 from OKW32/branch-Guides
genexus85 a044edc
Update UG for focus feature
genexus85 54dffdf
Merge pull request #216 from genexus85/branch-DeveloperGuide
genexus85 4d9f058
Refactor developer guide to improve fomatting
JingHaoooo b726fd5
Merge pull request #217 from JingHaoooo/branch-FocusV2.1
JingHaoooo 1b51387
Bug fix for developer guide
JingHaoooo 1efb708
Merge pull request #218 from JingHaoooo/branch-FocusV2.1
JingHaoooo f65a0d5
Bug fix: Fix developer guide numbering
JingHaoooo e5b68b7
Merge pull request #219 from JingHaoooo/branch-FocusV2.1
JingHaoooo d9a35d1
Fix bug for habit component in developer guide
JingHaoooo 797b1f2
Fix bug for reflect component in developer guide
JingHaoooo 8a9b055
Merge pull request #220 from JingHaoooo/branch-FocusV2.1
JingHaoooo d769aa4
Bug fix for focus timer component in developer guide
JingHaoooo 81c1ed7
Merge pull request #221 from JingHaoooo/branch-FocusV2.1
JingHaoooo 3e4138a
Add page breaks in DG
genexus85 c4cb102
Merge pull request #222 from genexus85/branch-DeveloperGuide
genexus85 7db2edf
Edit DG formatting
genexus85 ddc63f8
Merge pull request #223 from genexus85/branch-DeveloperGuide
genexus85 2d7f9c4
Add line spacing to DG
genexus85 9b0633a
Merge pull request #224 from genexus85/branch-DeveloperGuide
genexus85 3218c36
Edit DG file formatting
genexus85 efa29b3
Merge pull request #225 from genexus85/branch-DeveloperGuide
genexus85 4748d73
Merge branch 'master' into branch-DeveloperGuideV2.1
damiwee 8b63736
Fix format for pdf conversion
damiwee c7544b3
Merge pull request #226 from damiwee/branch-DeveloperGuideV2.1
damiwee b270d44
Fix pdf conversion format
damiwee 89639d0
Merge branch 'master' into branch-DeveloperGuideV2.1
damiwee 9084e0e
Fix pdf conversion formatting
damiwee d9a809a
Merge pull request #227 from damiwee/branch-DeveloperGuideV2.1
damiwee d78cf5e
Remove line breaks
damiwee b472732
Merge pull request #228 from damiwee/branch-DeveloperGuideV2.1
damiwee File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| # About us | ||
|
|
||
| Display | Name | Github Profile | Portfolio | ||
| --------|:----:|:--------------:|:---------: | ||
|  | John Doe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md) | ||
|  | Don Joe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md) | ||
|  | Ron John | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md) | ||
|  | John Roe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md) | ||
|  | Don Roe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md) | ||
| Display | Name | Github Profile | Portfolio | ||
| --------|:--------------:|:--------------:|:---------: | ||
|  | Ari Lim Ee Lik | [Github](https://github.com/genexus85) | [Portfolio](https://www.linkedin.com/in/ari-lim/) | ||
|  | Damien Wee | [Github](https://github.com/damiwee) | [Portfolio](https://www.linkedin.com/in/damien-wee-jl/) | ||
|  | Davian Kho Yong Quan | [Github](https://github.com/Daviancold) | [Portfolio](https://daviancold.netlify.app) | ||
|  | Lim Jing Hao | [Github](https://github.com/JingHaoooo) | [Portfolio](https://www.linkedin.com/in/jing-hao-lim-684326290/) | ||
|  | Ong Kan Wu | [Github](https://github.com/OKW32) | [Portfolio](https://www.linkedin.com/in/ong-kan-wu-4a869726a/) |
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,15 @@ | ||
| # Duke | ||
| # Wellness360 | ||
|
|
||
| {Give product intro here} | ||
| Wellness360, a wellness app meant for stressed Engineering Students who prefer CLI over GUI and want to keep track of | ||
| their overall well-being. | ||
|
|
||
| Useful links: | ||
| * [User Guide](UserGuide.md) | ||
| * [Developer Guide](DeveloperGuide.md) | ||
| * [About Us](AboutUs.md) | ||
| * Project Profile Page | ||
| * [Ari Lim Ee Lik](team/genexus85.md) | ||
| * [Damien Wee](team/damiwee.md) | ||
| * [Davian Kho Yong Quan](team/daviancold.md) | ||
| * [Lim Jing Hao](team/jinghaoooo.md) | ||
| * [Ong Kan Wu](team/okw32.md) |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Overall good job on the very descriptive developer guide. But maybe consider that it might be too wordy?