[CS2103T-T09-2] ExerHealth

.gitignore

@@ -9,7 +9,11 @@ src/main/resources/docs/
 /*.iml
 
 # Storage/log files
-/data/
+/data/exercisebook.json
+/data/propertybook.json
+/data/regimebook.json
+/data/schedulebook.json
+
 /config.json
 /preferences.json
 /*.log.*

.travis.yml

@@ -1,8 +1,15 @@
 language: java
+
 matrix:
   include:
     - jdk: openjdk11
 
+services:
+  - xvfb
+
+before_script:
+  - export DISPLAY=:99.0
+
 script: >-
     ./config/travis/run-checks.sh &&
     ./gradlew clean checkstyleMain checkstyleTest test coverage coveralls asciidoctor
@@ -17,8 +24,11 @@ deploy:
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
   - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+  - rm -f  $HOME/.gradle/caches/*/fileHashes/fileHashes.bin
+  - rm -f  $HOME/.gradle/caches/*/fileHashes/fileHashes.lock
 
 cache:
   directories:
     - $HOME/.gradle/caches/
     - $HOME/.gradle/wrapper/
+    - $HOME/.m2

README.adoc

@@ -1,23 +1,21 @@
-= Address Book (Level 3)
+= ExerHealth
 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://gitter.im/se-edu/Lobby[image:https://badges.gitter.im/se-edu/Lobby.svg[Gitter chat]]
+https://travis-ci.org/AY1920S1-CS2103T-T09-2/main[image:https://travis-ci.org/AY1920S1-CS2103T-T09-2/main.svg?branch=master[Build Status]]
+https://coveralls.io/github/AY1920S1-CS2103T-T09-2/main?branch=master[image:https://coveralls.io/repos/github/AY1920S1-CS2103T-T09-2/main/badge.svg?branch=master[Coverage]]
+https://app.netlify.com/sites/exerhealth/deploys[image:https://api.netlify.com/api/v1/badges/8b51ce83-a6ec-4994-8014-1c4b30aa3cd6/deploy-status[Netlify Status]]
 
 ifdef::env-github[]
-image::docs/images/Ui.png[width="600"]
+image::docs/images/Ui.png[width="800]
 endif::[]
 
 ifndef::env-github[]
-image::images/Ui.png[width="600"]
+image::images/Ui.png[width="800"]
 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.
+* ExerHealth is a one-stop platform for students who wish to embark on a journey of health and fitness.
+* This application has a GUI but is optimised for students who prefer to work with a Command Line Interface(CLI).
+* If you can type fast and wish to maintain a healthy lifestyle, Exerhealth is that one app for you!
 
 == Site Map
 
@@ -28,9 +26,11 @@ endif::[]
 * <<ContactUs#, Contact Us>>
 
 == Acknowledgements
+* Original source code, AddressBook-Level3, was created by https://se-education.org[SE-EDU initiative].
 
 * 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_.
-* Libraries used: https://openjfx.io/[JavaFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/junit-team/junit5[JUnit5]
+* Libraries used: https://openjfx.io/[JavaFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/junit-team/junit5[JUnit5], https://github.com/TestFX/TestFX[TestFX], https://github.com/TestFX/Monocle[Monocle]
+* Icons made by https://www.flaticon.com/authors/freepik[Freepik] from https://www.flaticon.com[Flaticon]
 
 == Licence : link:LICENSE[MIT]

build.gradle

@@ -15,7 +15,7 @@ plugins {
 }
 
 // Specifies the entry point of the application
-mainClassName = 'seedu.address.Main'
+mainClassName = 'seedu.exercise.Main'
 
 sourceCompatibility = JavaVersion.VERSION_11
 targetCompatibility = JavaVersion.VERSION_11
@@ -42,7 +42,8 @@ test {
 }
 
 dependencies {
-    String jUnitVersion = '5.4.0'
+    String testFxVersion = '4.0.16-alpha'
+    String jUnitVersion = '5.5.1'
     String javaFxVersion = '11'
 
     implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'win'
@@ -61,13 +62,19 @@ dependencies {
     implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.7.0'
     implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.7.4'
 
+    testCompile group: 'org.assertj', name: 'assertj-core', version: '3.13.2'
+    testCompile "org.testfx:testfx-junit5:4.0.16-alpha"
+
+    testImplementation group: 'org.testfx', name: 'testfx-core', version: testFxVersion
+    testRuntimeOnly group: 'org.testfx', name: 'openjfx-monocle', version: 'jdk-11+26'
     testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: jUnitVersion
 
     testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: jUnitVersion
+
 }
 
 shadowJar {
-    archiveName = 'addressbook.jar'
+    archiveName = 'ExerHealth.jar'
 
     destinationDir = file("${buildDir}/jar/")
 }

docs/AboutUs.adoc

@@ -4,53 +4,54 @@
 :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} +
+ExerHealth was developed by the https://github.com/AY1920S1-CS2103T-T09-2[ExerHealth] team based on
+the AddressBook code base done by the https://se-edu.github.io/docs/Team.html[se-edu] 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>>]
+=== Gary Lim Yan Peng
+image::garylyp.png[width="150", align="left"]
+{empty}[https://github.com/garylyp[github]] [<<garylyp#, portfolio>>]
 
-Role: Project Advisor
+Role: Team Lead +
+Responsibilities: Overall project coordination
 
 '''
 
-=== John Roe
-image::lejolly.jpg[width="150", align="left"]
-{empty}[http://github.com/lejolly[github]] [<<johndoe#, portfolio>>]
+=== Kwek Kee En
+image::kwekke.png[width="150", align="left"]
+{empty}[https://github.com/kwekke[github]] [<<kwekke#, portfolio>>]
 
-Role: Team Lead +
-Responsibilities: UI
+Role: Developer +
+Responsibilities: Testing
 
 '''
 
-=== Johnny Doe
-image::yijinl.jpg[width="150", align="left"]
-{empty}[http://github.com/yijinl[github]] [<<johndoe#, portfolio>>]
+=== Tan Chee Peng
+image::t-cheepeng.png[width="150", align="left"]
+{empty}[https://github.com/t-cheepeng[github]] [<<t-cheepeng#, portfolio>>]
 
 Role: Developer +
-Responsibilities: Data
+Responsibilities: Integration of project items
 
 '''
 
-=== Johnny Roe
-image::m133225.jpg[width="150", align="left"]
-{empty}[http://github.com/m133225[github]] [<<johndoe#, portfolio>>]
+=== Chai Jie Tung
+image::jietung.png[width="150", align="left"]
+{empty}[https://github.com/jietung[github]] [<<jietung#, portfolio>>]
 
 Role: Developer +
-Responsibilities: Dev Ops + Threading
+Responsibilities: Code quality, deliverable and deadlines
 
 '''
 
-=== Benson Meier
-image::yl_coder.jpg[width="150", align="left"]
-{empty}[http://github.com/yl-coder[github]] [<<johndoe#, portfolio>>]
+=== Ho Wei Haw
+image::weihaw08.png[width="150", align="left"]
+{empty}[https://github.com/weihaw08[github]] [<<weihaw08#, portfolio>>]
 
 Role: Developer +
-Responsibilities: UI
+Responsibilities: Quality of various project documents
 
 '''

docs/ContactUs.adoc

@@ -2,6 +2,6 @@
 :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/AY1920S1-CS2103T-T09-2/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 `e0310551 [at] u.nus.edu`

docs/DevOps.adoc

@@ -1,4 +1,4 @@
-= AddressBook Level 3 - Dev Ops
+= ExerHealth - Dev Ops
 :site-section: DeveloperGuide
 :toc:
 :toc-title: