Add sort and modify search

.gitignore

@@ -8,8 +8,9 @@ lib/*
 *.log
 *.log.*
 *.csv
-config.json
+/config.json
 src/test/data/sandbox/
+users.json
 preferences.json
 .DS_Store
 ./screenshot*.png

.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 copyEventSearchPage
 
 deploy:
   skip_cleanup: true

LICENSE

@@ -2,11 +2,11 @@ MIT License
 
 Copyright (c) 2016 Software Engineering Education - FOSS Resources
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
+Permission is hereby granted, free of charge, to any event obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
+copies of the Software, and to permit events to whom the Software is
 furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all

README.adoc

@@ -1,11 +1,7 @@
-= Address Book (Level 4)
-ifdef::env-github,env-browser[:relfileprefix: docs/]
+= Event Manager
 
-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://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-T12-1/main[image:https://travis-ci.org/CS2113-AY1819S1-T12-1/main.svg?branch=master[Build Status]]
+https://coveralls.io/github/CS2113-AY1819S1-T12-1/main?branch=master[image:https://coveralls.io/repos/github/CS2113-AY1819S1-T12-1/main/badge.svg?branch=master[Coverage Status]]
 
 ifdef::env-github[]
 image::docs/images/Ui.png[width="600"]
@@ -15,27 +11,23 @@ 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 Event Manager application. It has a GUI but most of the user interactions happen using a CLI (Command Line Interface).
+* 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>>
+* https://github.com/CS2113-AY1819S1-T12-1/main/blob/master/docs/UserGuide.adoc[User Guide]
+* https://github.com/CS2113-AY1819S1-T12-1/main/blob/master/docs/DeveloperGuide.adoc[Developer Guide]
+* https://github.com/CS2113-AY1819S1-T12-1/main/blob/master/docs/LearningOutcomes.adoc[Learning Outcomes]
+* https://github.com/CS2113-AY1819S1-T12-1/main/blob/master/docs/AboutUs.adoc[About Us]
+* https://github.com/CS2113-AY1819S1-T12-1/main/blob/master/docs/ContactUs.adoc[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://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]
+* Project based on: https://se-edu.github.io/addressbook-level4/[se-edu/addressbook-level4]
 
 == Licence : link:LICENSE[MIT]
 

_reposense/config.json

@@ -0,0 +1,30 @@
+{
+  "authors":
+  [
+    {
+      "githubId": "chiaxr",
+      "displayName": "CHI...ONG",
+      "authorNames": ["chiaxr"]
+    },
+    {
+      "githubId": "cqinkai",
+      "displayName": "CHU...KAI",
+      "authorNames": ["cqinkai"]
+    },
+    {
+      "githubId": "Geraldcdx",
+      "displayName": "GER...ANG",
+      "authorNames": ["Geraldcdx","Gerald Chua Deng Xiang"]
+    },
+    {
+      "githubId": "Tertium3",
+      "displayName": "HO ...ONG",
+      "authorNames": ["Tertium3"]
+    },
+    {
+      "githubId": "jamesyaputra",
+      "displayName": "JAM...TRA",
+      "authorNames": ["jamesyaputra"]
+    }
+  ]
+}

build.gradle

@@ -59,13 +59,17 @@ dependencies {
     String jUnitVersion = '5.1.0'
 
     implementation group: 'org.controlsfx', name: 'controlsfx', version: '8.40.11'
+    implementation group: 'org.jsoup', name: 'jsoup', version: '1.11.3'
+    implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.0'
     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: 'com.google.guava', name: 'guava', version: '19.0'
     implementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.8'
     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.jsoup', name: 'jsoup', version: '1.11.3'
+    implementation group: 'org.mnode.ical4j', name: 'ical4j', version: '3.0.0'
 
     testImplementation group: 'junit', name: 'junit', version: '4.12'
     testImplementation group: 'org.testfx', name: 'testfx-core', version: testFxVersion, {
@@ -82,7 +86,7 @@ dependencies {
 }
 
 shadowJar {
-    archiveName = 'addressbook.jar'
+    archiveName = 'eventmanager.jar'
 
     destinationDir = file("${buildDir}/jar/")
 }
@@ -134,6 +138,7 @@ test {
 
     testLogging {
         events TestLogEvent.FAILED, TestLogEvent.SKIPPED
+        exceptionFormat 'full'
 
         // Prints the currently running test's name in the CI's build log,
         // so that we can check if tests are being silently skipped or
@@ -207,8 +212,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': 'Event Manager',
+        'site-githuburl': 'https://github.com/CS2113-AY1819S1-T12-1/main',
         'site-seedu': true,  // delete this line if your project is not a fork (not a SE-EDU project)
     ]
 
@@ -236,8 +241,8 @@ task deployOfflineDocs(type: Copy) {
     }
 }
 
-task copyDummySearchPage(type: Copy) {
-    from 'docs/DummySearchPage.html'
+task copyEventSearchPage(type: Copy) {
+    from 'docs/EventSearchPage.html'
     into "${buildDir}/docs/html5"
 }
 

docs/AboutUs.adoc

@@ -4,53 +4,52 @@
 :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} +
-We are a team based in the http://www.comp.nus.edu.sg[School of Computing, National University of Singapore].
+Event Manager is based on Address-Book Level 4, which was developed by the https://se-edu.github.io/docs/Team.html[se-edu] team. +
+We are a team of Y2 Computer Engineering undergraduate students 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>>]
+=== Chia Xiang Rong
+image::chiaxr.png[width="150", align="left"]
+{empty}[http://github.com/chiaxr[github]] [<<chiaxr#, portfolio>>]
 
-Role: Project Advisor
+Role: Developer +
+Responsibilities: RSVP/Attendance
 
 '''
 
-=== John Roe
-image::lejolly.jpg[width="150", align="left"]
-{empty}[http://github.com/lejolly[github]] [<<johndoe#, portfolio>>]
+=== Gerald Chua Deng Xiang
+image::geraldcdx.png[width="250", align="left"]
+{empty}[https://www.comp.nus.edu.sg/~geraldc/website2-0/index.html[homepage]] [https://github.com/Geraldcdx[github]][<<geraldcdx#, portfolio>>]
 
-Role: Team Lead +
-Responsibilities: UI
+Role: Developer +
+Responsibilities: Comment Section Architect
 
 '''
 
-=== Johnny Doe
-image::yijinl.jpg[width="150", align="left"]
-{empty}[http://github.com/yijinl[github]] [<<johndoe#, portfolio>>]
+=== James Arista Yaputra
+image::jamesyaputra.png[width="150", align="left"]
+{empty}[http://github.com/jamesyaputra[github]] [<<jamesyaputra#, portfolio>>]
 
 Role: Developer +
-Responsibilities: Data
+Responsibilities: User Authentication
 
 '''
 
-=== Johnny Roe
-image::m133225.jpg[width="150", align="left"]
-{empty}[http://github.com/m133225[github]] [<<johndoe#, portfolio>>]
+=== Chuang Qin Kai
+image::cqinkai.png[width="150", align="left"]
+{empty}[http://github.com/cqinkai[github]] [<<cqinkai#, portfolio>>]
 
 Role: Developer +
-Responsibilities: Dev Ops + Threading
+Responsibilities: Event Reminders
 
 '''
 
-=== Benson Meier
-image::yl_coder.jpg[width="150", align="left"]
-{empty}[http://github.com/yl-coder[github]] [<<johndoe#, portfolio>>]
+=== Ho Phi Long
+image::tertium3.png[width="150", align="left"]
+{empty}[https://github.com/Tertium3[github]] [<<tertium3#, portfolio>>]
 
 Role: Developer +
-Responsibilities: UI
+Responsibilities: Sort, Filter and Calendar export
 
 '''