nus-cs2103-AY1718S2 · hypertun · Apr 3, 2018 · Apr 3, 2018 · Apr 3, 2018 · Apr 3, 2018
diff --git a/.gitignore b/.gitignore
@@ -8,7 +8,6 @@ lib/*
 *.log
 *.log.*
 *.csv
-config.json
 src/test/data/sandbox/
 preferences.json
 .DS_Store

diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ matrix:
 
 script: >-
     ./config/travis/run-checks.sh &&
-    travis_retry ./gradlew clean checkstyleMain checkstyleTest headless allTests coverage coveralls asciidoctor copyDummySearchPage
+    travis_retry ./gradlew clean checkstyleMain checkstyleTest headless allTests coverage coveralls asciidoctor
 
 deploy:
   skip_cleanup: true

diff --git a/README.adoc b/README.adoc
@@ -1,9 +1,9 @@
-= Address Book (Level 4)
+= Personal Trainer Pro Application
 ifdef::env-github,env-browser[:relfileprefix: docs/]
 
-https://travis-ci.org/se-edu/addressbook-level4[image:https://travis-ci.org/se-edu/addressbook-level4.svg?branch=master[Build Status]]
-https://ci.appveyor.com/project/damithc/addressbook-level4[image:https://ci.appveyor.com/api/projects/status/3boko2x2vr5cc3w2?svg=true[Build status]]
-https://coveralls.io/github/se-edu/addressbook-level4?branch=master[image:https://coveralls.io/repos/github/se-edu/addressbook-level4/badge.svg?branch=master[Coverage Status]]
+https://travis-ci.org/CS2103JAN2018-F12-B2/main[image:https://travis-ci.org/CS2103JAN2018-F12-B2/main.svg?branch=master[Build Status]]
+https://ci.appveyor.com/project/hypertun/main/branch/master[image:https://ci.appveyor.com/api/projects/status/690sw2r4l3lxa1fr/branch/master?svg=true[Build status]]
+https://coveralls.io/github/CS2103JAN2018-F12-B2/main?branch=master[image:https://coveralls.io/repos/github/CS2103JAN2018-F12-B2/main/badge.svg?branch=master[Coverage Status]]
 https://www.codacy.com/app/damith/addressbook-level4?utm_source=github.com&utm_medium=referral&utm_content=se-edu/addressbook-level4&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]]
 
@@ -15,13 +15,8 @@ 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.
-* What's different from https://github.com/se-edu/addressbook-level3[level 3]:
-** A more sophisticated GUI that includes a list  panel and an in-built Browser.
-** More test cases, including automated GUI testing.
-** Support for _Build Automation_ using Gradle and for _Continuous Integration_ using Travis CI.
+* This is a desktop Personal Trainer Pro application. It has a GUI but most of the user interactions happen using a CLI (Command Line Interface).
+* It is a Java application meant for Personal Trainers to manage and view their clients.
 
 == Site Map
 
@@ -36,5 +31,6 @@ endif::[]
 * 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://github.com/TomasMikula/EasyBind[EasyBind], https://github.com/TestFX/TestFX[TextFX], https://bitbucket.org/controlsfx/controlsfx/[ControlsFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/google/guava[Guava], https://github.com/junit-team/junit4[JUnit4]
+* PersonCard.css was adapted from https://codepen.io/er40/pen/bdFgx.
 
 == Licence : link:LICENSE[MIT]
diff --git a/build.gradle b/build.gradle
@@ -41,6 +41,9 @@ jacocoTestReport {
 dependencies {
     String testFxVersion = '4.0.7-alpha'
 
+    compile 'com.google.api-client:google-api-client:1.23.0'
+    compile 'com.google.oauth-client:google-oauth-client-jetty:1.23.0'
+    compile 'com.google.apis:google-api-services-calendar:v3-rev302-1.23.0'
     compile group: 'org.fxmisc.easybind', name: 'easybind', version: '1.0.3'
     compile group: 'org.controlsfx', name: 'controlsfx', version: '8.40.11'
     compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.7.0'
@@ -196,10 +199,6 @@ task deployOfflineDocs(type: Copy) {
     }
 }
 
-task copyDummySearchPage(type: Copy) {
-    from 'docs/DummySearchPage.html'
-    into "${buildDir}/docs/html5"
-}
 
 deployOfflineDocs.dependsOn asciidoctor
 processResources.dependsOn deployOfflineDocs

diff --git a/collated/functional/hypertun-reused.md b/collated/functional/hypertun-reused.md
@@ -0,0 +1,149 @@
+# hypertun-reused
+###### /resources/view/PersonCard.css
+``` css
+body {
+    background:#485b6e;
+}
+
+.container {
+    max-width:500px;
+    margin-left:auto;
+    margin-right:auto;
+    margin-top:10%;
+}
+
+h1 {
+    font-family: "Open Sans", sans;
+    font-weight:300;
+    text-align:center;
+    color:rgba(255,255,255,0.6)
+}
+
+h2 {
+    color:#2c3e52;
+    font-family:  "Open Sans", sans;
+    font-size: 14px;
+    text-align:center;
+    font-weight:700;
+    margin-bottom:50px;
+
+}
+
+.service-details {
+    width: 600px;
+    height: 460px;
+    overflow: hidden;
+    position: relative;
+}
+
+.service-details img {
+    position: absolute;
+    top: 0;
+    left: 0;
+    height: inherit;
+    width: auto;
+    height: 100%;
+    float: left;
+    transition: all 0.8s;
+    -moz-transition: all 0.8s;
+
+}
+
+.service-details:hover img {
+    /*opacity: 0.4 !important;*/
+}
+
+.service-details .service-hover-text h3 {
+    padding: 0px;
+    margin: 0px;
+    font-size: 25px;
+    font-weight:300;
+    font-family: "Open Sans";
+}
+
+.service-details .service-hover-text h4 {
+    padding: 0px;
+    padding-bottom: 13px;
+    margin: 0px;
+    font-size: 14px;
+    letter-spacing: 3px;
+    width: 90%;
+    font-family: "Open Sans";
+    text-transform:uppercase;
+    border-bottom: 2px solid #000;
+}
+
+.service-details .service-hover-text p {
+    padding-top: 10px;
+    font-size: 9px;
+    line-height: 10px;
+    font-family: "Open Sans";
+}
+
+
+.service-details .service-hover-text{
+    width: 42%;
+    height: 89%;
+    position: absolute;
+    top: 0%;
+    left: 50%;
+    padding: 3% 4%;
+    background: #D90E0E;
+    color: rgba(255,255,255,1);
+    /*	display: none;*/
+    transition: all 0.5s ease-in-out;
+    -moz-transition: all 0.4s;
+}
+
+.service-details:hover .service-hover-text {
+    display: block !important;
+    color: rgba(255,255,255,1);
+    background:rgba(217,14,14,0.85);
+    left: 0px;
+    top: 0px;
+}
+
+
+.service-details .service-text {
+    width: 50%;
+    height: inherit;
+    background: #000;
+    float: left;
+    position: absolute;
+    left: 50%;
+}
+
+.service-details .service-text p {
+    padding:100px 0px 0px 20px;
+    font-size: 24px;
+    font-family: "Open Sans";
+    font-weight:700;
+    color: #fff;
+}
+
+.service-details .service-text p span {
+    font-family: "Open Sans" !important;
+}
+
+.service-details .service-text a , .service-white .service-text {
+    padding: 0px 0px 0px 20px;
+    font-size: 14px !important;
+    color:#FF5A22 !important;
+    font-family: "Open Sans" !important;
+    text-decoration: none !important;
+}
+
+.service-details .service-text {
+    float: left;
+}
+
+.service-white {
+    background: #eee !important;
+    width: 50% !important;
+    height: inherit !important;
+}
+
+.service-white p {
+    color: #000 !important;
+}
+```