[F10-1] OASIS

.gitignore

@@ -18,3 +18,6 @@ classes/
 /bin/
 src/main/resources/docs/
 out/
+
+# https://github.com/nus-cs2103-AY1819S1/forum/issues/74 Allow _reposense/config.json
+!_reposense/config.json

README.adoc

@@ -1,11 +1,13 @@
-= Address Book (Level 4)
+= Office Assistance Specialized Integrated System (OASIS)
 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]]
+image:https://travis-ci.org/CS2103-AY1819S1-F10-1/main.svg?branch=master["Build Status", link="https://travis-ci.org/CS2103-AY1819S1-F10-1/main"]
+image:https://ci.appveyor.com/api/projects/status/sbbu13iahl2smpox/branch/master?svg=true["Build Status", link="https://ci.appveyor.com/project/bugfreeSpice/main/branch/master"]
+image:https://coveralls.io/repos/github/CS2103-AY1819S1-F10-1/main/badge.svg?branch=master["Coverage Status", link="https://coveralls.io/github/CS2103-AY1819S1-F10-1/main?branch=master"]
+////
 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]]
+////
 
 ifdef::env-github[]
 image::docs/images/Ui.png[width="600"]
@@ -15,10 +17,11 @@ 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]:
+image::docs/images/UiLoggedin.PNG[width="600"]
+
+* This is a desktop employee management application. It has a GUI but most of the user interactions happen using a CLI (Command Line Interface).
+* This application is still a WIP. Updates and new releases will occur every fortnight
+* Features:
 ** 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.
@@ -27,12 +30,12 @@ endif::[]
 
 * <<UserGuide#, User Guide>>
 * <<DeveloperGuide#, Developer Guide>>
-* <<LearningOutcomes#, Learning Outcomes>>
 * <<AboutUs#, About Us>>
 * <<ContactUs#, Contact Us>>
 
 == Acknowledgements
 
+* Original source code from https://github.com/se-edu/addressbook-level4/[AddressBook-Level4] project created by https://github.com/se-edu/[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://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]

_reposense/config.json

@@ -0,0 +1,30 @@
+{
+  "authors":
+  [
+    {
+      "githubId": "ChooJeremy",
+      "displayName": "JEREM...UN KA",
+      "authorNames": ["ChooJeremy", "Jeremy Choo", "Jeremy"]
+    },
+    {
+      "githubId": "elliottan",
+      "displayName": "ELLIO...W HAN",
+      "authorNames": ["elliottan", "Elliot Tan"]
+    },
+    {
+      "githubId": "KokJianYu",
+      "displayName": "KOK J...AN YU",
+      "authorNames": ["KokJianYu", "Kok Jian Yu"]
+    },
+    {
+      "githubId": "RnardHa",
+      "displayName": "RAYNA...DJAJA",
+      "authorNames": ["RnardHa", "Raynard"]
+    },
+    {
+      "githubId": "jroberts91",
+      "displayName": "DE JE...UZMAN",
+      "authorNames": ["jroberts91", "Laptop-Josh Jr", "joshrobert"]
+    }
+  ]
+}

build.gradle

@@ -82,7 +82,7 @@ dependencies {
 }
 
 shadowJar {
-    archiveName = 'addressbook.jar'
+    archiveName = 'OASIS.jar'
 
     destinationDir = file("${buildDir}/jar/")
 }
@@ -207,8 +207,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': 'OASIS',
+        'site-githuburl': 'https://github.com/CS2103-AY1819S1-F10-1/main/',
         'site-seedu': true,  // delete this line if your project is not a fork (not a SE-EDU project)
     ]
 
@@ -237,7 +237,7 @@ task deployOfflineDocs(type: Copy) {
 }
 
 task copyDummySearchPage(type: Copy) {
-    from 'docs/DummySearchPage.html'
+    from 'docs/ProfilePage.html'
     into "${buildDir}/docs/html5"
 }
 

docs/AboutUs.adoc

@@ -4,53 +4,61 @@
 :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.}_ +
+Office Assistance Specialized Integration System (OASIS) was developed by the https://github.com/CS2103-AY1819S1-F10-1[NUS School of Computing AY1819S1 F10-1] team.
 {empty} +
 We are a team based in the http://www.comp.nus.edu.sg[School of Computing, National University of Singapore].
 
 == Project Team
 
-=== John Doe
+=== 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>>]
+{empty}[http://www.comp.nus.edu.sg/~damithch[homepage]] [https://github.com/damithc[github]]
 
 Role: Project Advisor
 
 '''
 
-=== John Roe
-image::lejolly.jpg[width="150", align="left"]
-{empty}[http://github.com/lejolly[github]] [<<johndoe#, portfolio>>]
+=== Jeremy Choo
+image::choojeremy.png[width="150", align="left"]
+{empty}[https://jch.ooo[Website]] [http://github.com/ChooJeremy[github]]
 
 Role: Team Lead +
-Responsibilities: UI
+Responsibilities: Git, User Accounts (Login, Passwords, Profiles)
 
 '''
 
-=== Johnny Doe
-image::yijinl.jpg[width="150", align="left"]
-{empty}[http://github.com/yijinl[github]] [<<johndoe#, portfolio>>]
+=== Elliot Tan
+image::elliottan.png[width="150", align="left"]
+{empty}[http://github.com/elliottan[github]]
 
 Role: Developer +
-Responsibilities: Data
+Responsibilities: Leave System (Applying, Accepting, Rejecting)
 
 '''
 
-=== Johnny Roe
-image::m133225.jpg[width="150", align="left"]
-{empty}[http://github.com/m133225[github]] [<<johndoe#, portfolio>>]
+=== Raynard Hadiwidjaja
+image::rnardha.png[width="150", align="left"]
+{empty}[http://github.com/RnardHa[github]]
 
 Role: Developer +
-Responsibilities: Dev Ops + Threading
+Responsibilities: Projects
 
 '''
 
-=== Benson Meier
-image::yl_coder.jpg[width="150", align="left"]
-{empty}[http://github.com/yl-coder[github]] [<<johndoe#, portfolio>>]
+=== Joshua Robert
+image::jroberts91.png[width="150", align="left"]
+{empty}[http://github.com/jroberts91[github]] [http://github.com/CS2103-AY1819S1-F10-1/main/blob/master/docs/team/joshuarobert.adoc[portfolio]]
 
 Role: Developer +
-Responsibilities: UI
+Responsibilities: Archive (Archive, Restore)
+
+'''
+
+=== Jian Yu
+image::kokjianyu.png[width="150", align="left"]
+{empty}[http://github.com/KokJianYu[github]]
+
+Role: Developer +
+Responsibilities: Permissions (Adding, Removing, Ensuring user has valid permissions)
 
 '''

docs/ContactUs.adoc

@@ -2,6 +2,6 @@
 :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.
+* *Bug reports, Suggestions* : Post in our https://github.com/CS2103-AY1819S1-F10-1/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 `damith [at] comp.nus.edu.sg`