nusCS2113-AY1819S1 · feijunzi · Nov 6, 2018 · Nov 6, 2018 · Nov 6, 2018 · Nov 6, 2018
diff --git a/README.adoc b/README.adoc
@@ -1,11 +1,9 @@
-= Address Book (Level 4)
+= Something Daily
 ifdef::env-github,env-browser[:relfileprefix: docs/]
 
-https://travis-ci.org/nusCS2113-AY1819S1/addressbook-level4[image:https://travis-ci.org/nusCS2113-AY1819S1/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://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]]
+https://travis-ci.org/CS2113-AY1819S1-T09-2/main[image:https://travis-ci.org/CS2113-AY1819S1-T09-2/main.svg?branch=master[Build Status]]
+https://coveralls.io/github/CS2113-AY1819S1-T09-2/main?branch=master[image:https://coveralls.io/repos/github/CS2113-AY1819S1-T09-2/main/badge.svg?branch=master[Coverage Status]]
+https://www.codacy.com/app/arty9/main?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=CS2113-AY1819S1-T09-2/main&amp;utm_campaign=Badge_Grade[image:https://api.codacy.com/project/badge/Grade/3d7dd42b99cf438eadcea16b80457d11[Codacy Badge]]
 
 ifdef::env-github[]
 image::docs/images/Ui.png[width="600"]
@@ -15,27 +13,29 @@ 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.
+* Something Daily is a desktop task and expenditure tracker application. It has a GUI (Graphical User Interface) but most of the user interactions happen using a CLI (Command Line Interface).
+* It is a Java application for busy students who needs help in better managing their student life.
+* The application aims to assist students in managing all of their academic work and spendings, hence improving their student life.
+* It has 3 key components: To-do List, Expenditure Tracker, and Calendar.
+* It is built upon https://github.com/se-edu/addressbook-level4[Address Book L4], a Java application intended for students in learning Software Engineering principles while using Java as the main programming language.
+* Features:
+** A sophisticated GUI that includes two list panels and an in-built calendar.
 ** More test cases, including automated GUI testing.
 ** Support for _Build Automation_ using Gradle and for _Continuous Integration_ using Travis CI.
 
 == 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
+* This application is built upon https://github.com/se-edu/addressbook-level4[Address Book L4] by https://github.com/se-edu[SE-EDU].
+* Some parts of this 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/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/junit5[JUnit5]
+* Libraries used: 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/junit5[JUnit5], https://github.com/jfree/jfreechart[JFreeChart]
 
 == Licence : link:LICENSE[MIT]
 
diff --git a/build.gradle b/build.gradle
@@ -66,6 +66,7 @@ dependencies {
     implementation group: 'com.sun.xml.bind', name: 'jaxb-impl', version: '2.3.0'
     implementation group: 'com.sun.xml.bind', name: 'jaxb-core', version: '2.3.0'
     implementation group: 'javax.activation', name: 'activation', version: '1.1.1'
+    implementation group: 'org.jfree', name: 'jfreechart', version: '1.0.19'
 
     testImplementation group: 'junit', name: 'junit', version: '4.12'
     testImplementation group: 'org.testfx', name: 'testfx-core', version: testFxVersion, {
@@ -82,7 +83,7 @@ dependencies {
 }
 
 shadowJar {
-    archiveName = 'addressbook.jar'
+    archiveName = 'somethingdaily.jar'
 
     destinationDir = file("${buildDir}/jar/")
 }
@@ -126,7 +127,7 @@ nonGuiTests.dependsOn test
 task(allTests)
 
 // `allTests` implies both `guiTests` and `nonGuiTests`
-allTests.dependsOn guiTests
+//allTests.dependsOn guiTests
 allTests.dependsOn nonGuiTests
 
 test {
@@ -207,8 +208,8 @@ asciidoctor {
         idprefix: '',  // for compatibility with GitHub preview
         idseparator: '-',
         'site-root': "${sourceDir}",  // must be the same as sourceDir, do not modify
-        'site-name': 'AddressBook-Level4',
-        'site-githuburl': 'https://github.com/se-edu/addressbook-level4',
+        'site-name': 'Something Daily',
+        'site-githuburl': 'https://github.com/CS2113-AY1819S1-T09-2/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,45 @@
 :imagesDir: images
 :stylesDir: stylesheets
 
-AddressBook - Level 4 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} +
+Something Daily was developed by the https://se-edu.github.io/docs/Team.html[T09-2] 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>>]
-
-Role: Project Advisor
-
-'''
-
-=== John Roe
-image::lejolly.jpg[width="150", align="left"]
-{empty}[http://github.com/lejolly[github]] [<<johndoe#, portfolio>>]
+=== Wang Shining
+image::shiningggg.png[width="150", align="left"]
+{empty}[http://github.com/SHININGGGG[github]] [<<shiningggg#, portfolio>>]
 
 Role: Team Lead +
-Responsibilities: UI
+Responsibilities: Expenditure tracker & Calender components
 
 '''
 
-=== Johnny Doe
-image::yijinl.jpg[width="150", align="left"]
-{empty}[http://github.com/yijinl[github]] [<<johndoe#, portfolio>>]
+=== Tay Ran Tian
+image::arty9.png[width="150", align="left"]
+{empty}[http://github.com/arty9[github]] [<<arty9#, portfolio>>]
 
 Role: Developer +
-Responsibilities: Data
+Responsibilities: To-do list component
 
 '''
 
-=== Johnny Roe
-image::m133225.jpg[width="150", align="left"]
-{empty}[http://github.com/m133225[github]] [<<johndoe#, portfolio>>]
+=== Xin Shenzi
+image::feijunzi.png[width="150", align="left"]
+{empty}[http://github.com/feijunzi[github]] [<<feijunzi#, portfolio>>]
 
 Role: Developer +
-Responsibilities: Dev Ops + Threading
+Responsibilities: Expenditure tracker component
 
 '''
 
-=== Benson Meier
-image::yl_coder.jpg[width="150", align="left"]
-{empty}[http://github.com/yl-coder[github]] [<<johndoe#, portfolio>>]
+=== Xiao Yunhan
+image::xiaoyunhan.png[width="150", align="left"]
+{empty}[http://github.com/XiaoYunhan[github]] [<<xiaoyunhan#, portfolio>>]
 
 Role: Developer +
-Responsibilities: UI
+Responsibilities: To-do list component
 
 '''
+
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-level4/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/CS2113-AY1819S1-T09-2/main/issues[issue tracker] if you noticed any bugs or have suggestions on how we can improve Something Daily.