nus-cs2103-AY1920S1 · stevenwjy · Sep 30, 2019 · Sep 30, 2019 · Sep 30, 2019 · Sep 30, 2019
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,7 @@ src/main/resources/docs/
 
 # Storage/log files
 /data/
+/src/test/data/JsonNoteBookStorageTest/TempNoteBook2.json
 /config.json
 /preferences.json
 /*.log.*

diff --git a/.travis.yml b/.travis.yml
@@ -3,9 +3,21 @@ matrix:
   include:
     - jdk: openjdk11
 
+services:
+  - xvfb
+
+before_install:
+  - sudo apt update
+  - sudo apt install openjfx
+  - chmod +x ./gradlew
+  - export DISPLAY=:99.0
+
+install: true
+
 script: >-
     ./config/travis/run-checks.sh &&
-    ./gradlew clean checkstyleMain checkstyleTest test coverage coveralls asciidoctor
+    ./gradlew clean checkstyleMain checkstyleTest headless test &&
+    ./gradlew test coverage coveralls asciidoctor
 
 deploy:
   skip_cleanup: true

diff --git a/README.adoc b/README.adoc
@@ -1,9 +1,9 @@
-= Address Book (Level 3)
+= TagLine
 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://travis-ci.org/AY1920S1-CS2103T-F12-3/main[image:https://travis-ci.org/AY1920S1-CS2103T-F12-3/main.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://coveralls.io/github/AY1920S1-CS2103T-F12-3/main?branch=master[image:https://coveralls.io/repos/github/AY1920S1-CS2103T-F12-3/main/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]]
 
@@ -15,22 +15,25 @@ 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.
+== About TagLine
+Tired of Sticky Notes? +
+Having trouble finding the right note in your messy collage of notes? +
+Want a CLI note-taking app befitting of the techie that you are?
+
+TagLine is just for you!
+
+Being a multi-purpose note-taking app, not only can you take notes from the command line, you can also tag your notes with hashtags, contacts or groups. Managing your notes have never been easier!
 
 == Site Map
 
 * <<UserGuide#, User Guide>>
 * <<DeveloperGuide#, Developer Guide>>
-* <<LearningOutcomes#, Learning Outcomes>>
 * <<AboutUs#, About Us>>
 * <<ContactUs#, Contact Us>>
 
 == Acknowledgements
 
-* 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]
+* The original source of the code was created by SE-EDU initiative at https://se-education.org
+* Libraries used: https://openjfx.io/[JavaFX], https://github.com/controlsfx/controlsfx[ControlsFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/junit-team/junit5[JUnit5], https://github.com/TestFX/TestFX[TestFX], http://github.com/https://github.com/hamcrest/JavaHamcrest[Hamcrest]
 
 == Licence : link:LICENSE[MIT]
diff --git a/build.gradle b/build.gradle
@@ -15,7 +15,7 @@ plugins {
 }
 
 // Specifies the entry point of the application
-mainClassName = 'seedu.address.Main'
+mainClassName = 'tagline.Main'
 
 sourceCompatibility = JavaVersion.VERSION_11
 targetCompatibility = JavaVersion.VERSION_11
@@ -60,15 +60,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'
+    implementation group: 'org.controlsfx', name: 'controlsfx', version: '11.0.0'
+    testCompile group: 'org.testfx', name: 'testfx-core', version: '4.0.16-alpha'
+    testCompile group: 'org.testfx', name: 'testfx-junit5', version: '4.0.16-alpha'
+    testCompile group: 'org.hamcrest', name: 'hamcrest', version: '2.1'
 
     testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: jUnitVersion
 
+    testRuntimeOnly "org.testfx:openjfx-monocle:jdk-11+26"
     testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: jUnitVersion
 }
 
 shadowJar {
-    archiveName = 'addressbook.jar'
-
+    archiveName = 'tagline.jar'
     destinationDir = file("${buildDir}/jar/")
 }
 
@@ -114,6 +118,25 @@ test {
     }
 }
 
+task headless {
+    doLast {
+        println 'Setting headless mode properties.'
+        test {
+            systemProperties = [
+                    'java.awt.headless': 'true',
+                    'testfx.robot': 'glass',
+                    'testfx.headless': 'true',
+                    'prism.order': 'sw',
+                    'prism.text': 't2k',
+                    'headless.geometry': '1600x1200-32'
+            ]
+        }
+    }
+}
+
+// Makes sure that headless properties are set before running tests
+test.mustRunAfter headless
+
 asciidoctor {
     backends 'html5'
     sourceDir 'docs'
@@ -133,8 +156,8 @@ asciidoctor {
         idprefix: '',  // for compatibility with GitHub preview
         idseparator: '-',
         'site-root': "${sourceDir}",  // must be the same as sourceDir, do not modify
-        'site-name': 'AddressBook-Level3',
-        'site-githuburl': 'https://github.com/se-edu/addressbook-level3',
+        'site-name': 'tagline',
+        'site-githuburl': 'https://github.com/AY1920S1-CS2103T-F12-3/main',
         'site-seedu': true,  // delete this line if your project is not a fork (not a SE-EDU project)
     ]
 

diff --git a/docs/AboutUs.adoc b/docs/AboutUs.adoc
@@ -4,53 +4,69 @@
 :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} +
+TagLine was developed by the https://AY1920S1-CS2103T-F12-3.github.io/docs/Team.html[AY1920-F12-3] 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
+=== Prof. Damith C. Rajapakse
 image::damithc.jpg[width="150", align="left"]
 {empty}[http://www.comp.nus.edu.sg/~damithch[homepage]] [https://github.com/damithc[github]] [<<johndoe#, portfolio>>]
 
 Role: Project Advisor
 
 '''
 
-=== John Roe
-image::lejolly.jpg[width="150", align="left"]
-{empty}[http://github.com/lejolly[github]] [<<johndoe#, portfolio>>]
+=== Tan Likai
+image::tanlk99.png[width="150", align="left"]
+{empty}[https://github.com/tanlk99[github]] [<<tanlk99#, portfolio>>]
 
-Role: Team Lead +
-Responsibilities: UI
+Roles:
+
+- Team Lead
+- In charge of UI
+- In charge of tag model.
 
 '''
 
-=== Johnny Doe
-image::yijinl.jpg[width="150", align="left"]
-{empty}[http://github.com/yijinl[github]] [<<johndoe#, portfolio>>]
+=== Jonas Ong
+image::e0031374.png[width="150", align="left"]
+{empty}[https://github.com/e0031374[github]] [<<e0031374#, portfolio>>]
+
+Roles:
 
-Role: Developer +
-Responsibilities: Data
+- Testing
+- In charge of note logic
 
 '''
 
-=== Johnny Roe
-image::m133225.jpg[width="150", align="left"]
-{empty}[http://github.com/m133225[github]] [<<johndoe#, portfolio>>]
+=== Ng Shi Wei
+image::shiweing.png[width="150", align="left"]
+{empty}[https://github.com/shiweing[github]] [<<shiweing#, portfolio>>]
 
-Role: Developer +
-Responsibilities: Dev Ops + Threading
+Roles:
+
+- Documentation
+- In charge of note model
 
 '''
 
-=== Benson Meier
-image::yl_coder.jpg[width="150", align="left"]
-{empty}[http://github.com/yl-coder[github]] [<<johndoe#, portfolio>>]
+=== Steven Wijaya
+image::stevenwjy.png[width="150", align="left"]
+{empty}[https://github.com/stevenwjy[github]] [<<stevenwjy#, portfolio>>]
+
+Roles:
 
-Role: Developer +
-Responsibilities: UI
+- Quality Assurance
+- In charge of contact logic
 
 '''
+
+=== Yehezkiel Raymundo Theodoroes
+image::yehezkiel01.png[width="150", align="left"]
+{empty}[https://github.com/Yehezkiel01[github]] [<<yehezkiel01#, portfolio>>]
+
+Roles:
+
+- Scheduling and tracking
+- In charge of contact model
diff --git a/docs/ContactUs.adoc b/docs/ContactUs.adoc
@@ -2,6 +2,4 @@
 :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.
-* *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`
+* *Bug reports, Suggestions* : Post in our https://github.com/AY1920S1-CS2103T-F12-3/main/issues[issue tracker] if you noticed bugs or have suggestions on how to improve.
diff --git a/docs/DevOps.adoc b/docs/DevOps.adoc
@@ -1,4 +1,4 @@
-= AddressBook Level 3 - Dev Ops
+= TagLine - Dev Ops
 :site-section: DeveloperGuide
 :toc:
 :toc-title:
@@ -12,7 +12,7 @@ ifdef::env-github[]
 :note-caption: :information_source:
 :warning-caption: :warning:
 endif::[]
-:repoURL: https://github.com/se-edu/addressbook-level3/tree/master
+:repoURL: https://github.com/AY1920S1-CS2103T-F12-3/main/tree/master
 
 == Build Automation