Add Undo DG and delete v3.0 GUI features

.github/workflows/gradle.yml

@@ -31,20 +31,4 @@ jobs:
           java-package: jdk+fx
 
       - name: Build and check with Gradle
-        run: ./gradlew check
-
-      - name: Perform IO redirection test (*NIX)
-        if: runner.os == 'Linux'
-        working-directory:  ${{ github.workspace }}/text-ui-test
-        run: ./runtest.sh
-
-      - name: Perform IO redirection test (MacOS)
-        if: always() && runner.os == 'macOS'
-        working-directory:  ${{ github.workspace }}/text-ui-test
-        run: ./runtest.sh
-
-      - name: Perform IO redirection test (Windows)
-        if: always() && runner.os == 'Windows'
-        working-directory:  ${{ github.workspace }}/text-ui-test
-        shell: cmd
-        run: runtest.bat
+        run: ./gradlew check

.gitignore

@@ -13,5 +13,8 @@ src/main/resources/docs/
 *.iml
 bin/
 
+# Project specific
 /text-ui-test/ACTUAL.txt
-text-ui-test/EXPECTED-UNIX.TXT
+/text-ui-test/EXPECTED-UNIX.TXT
+/data/
+/logs/

README.md

@@ -62,3 +62,43 @@ Steps for publishing documentation to the public:
 1. Scroll down to the `GitHub Pages` section.
 1. Set the `source` as `master branch /docs folder`.
 1. Optionally, use the `choose a theme` button to choose a theme for your documentation.
+
+## Workflow
+
+The workflow will go like this:
+* Synchronise your local repo with the team repo.
+* Make a separate branch for your work session.
+* Commit and push your work to the corresponding branch on your remote repo.
+* Make a pull request to merge your remote repo's work to the team repo and resolve merge conflicts.
+
+### Setting up for each work session
+
+*  `git fetch upstream`, `git rebase upstream/master`
+   * The command means to fetch from the team repo (upstream) and then rebase master.
+   * Your local master should be synchronised with the upstream master now.
+* `git switch -c <branchname>`
+   * Make a new branch for your local work (to preserve master's functionality).
+   * `git checkout -b <branchname>` does the same thing.
+
+### Pushing and merging your work after each work session
+
+* First, `git add .` if you want to stage all files or `git add <path/to/file>` if you want to add specific files.
+* `git commit -m 'commit message here'` followed by `git push origin <branchname>`.
+   * Git will create the corresponding branch on your remote repo and push your commits there.
+* Merge your work into the team repo's master with a pull request over Github's interface.
+   * Do not confirm merge! Let the rest of the team view the pull request first before we confirm that it can be merged.
+   * Any merge conflicts should be resolved AFTER we okay the merge.
+   * After we all okay-ed the merge, the merge can continue and your work is complete.
+
+### Rolling back
+
+* First off, you can bookmark [this website](https://ohshitgit.com/) because you will need it at some point.
+* Undoing a local commit: Do `git revert HEAD`. `git revert` works by bringing your previous commit in as a new commit to undo what you did so far.
+   * `HEAD` refers to your current commit (which is the one you want to undo).
+   * If you want to revert back to __BEFORE__ a specific commit, use `git log` and find the commit hash (a long string of characters but you only need the first 6 or so) and do `git revert <hash>`.
+* Undoing a push to remote: Do `git push -f origin <hash>:<branch>`.
+   * This forces a push of the `<hash>` commit, which is the one you want to revert __to__, to the specified remote branch in `<branch>`. Use `git log` to find the hash.
+   * Alternatively, you can undo the local commit first (as in point 1), then `git push -f origin master:<branch>` instead of finding a specific commit.
+* Hard reset:
+   * First, try doing `git fetch` then `git reset --hard origin/<branch>`. This gets your remote's latest commits (which shouldn't include your mistakes) and then resets your working directory to match the latest commit on your remote. __ALL WORK ON LOCAL THAT IS NOT ALSO ON REMOTE IS LOST!__
+   * If that doesn't work, delete everything in your repo except the .git folder, download from the Github repo page (green button on top right of file window), put everything in the same folder, then `git add *`, `git commit`.

build.gradle

@@ -10,8 +10,11 @@ repositories {
 }
 
 dependencies {
+    implementation 'com.alibaba:fastjson:1.2.12'
+    implementation 'com.google.code.gson:gson:2.8.6'
     testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.5.0'
     testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.5.0'
+    implementation group: 'org.fusesource.jansi', name: 'jansi', version: '1.18'
 }
 
 test {
@@ -28,12 +31,25 @@ test {
     }
 }
 
+sourceSets {
+    main {
+        resources {
+            srcDirs "src/main/resources"
+        }
+    }
+}
+
 application {
-    mainClassName = "seedu.duke.Duke"
+    mainClassName = "seedu.ravi.Ravi"
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
 }
 
 shadowJar {
-    archiveBaseName = "duke"
+    archiveBaseName = "ravi"
     archiveClassifier = null
 }
 
@@ -42,5 +58,6 @@ checkstyle {
 }
 
 run{
+    enableAssertions = true
     standardInput = System.in
 }

config/checkstyle/checkstyle.xml

@@ -38,11 +38,11 @@
             <property name="message"
                       value="Consider using special escape sequence instead of octal value or Unicode escaped value."/>
         </module>
-        <module name="AvoidEscapedUnicodeCharacters">
-            <property name="allowEscapesForControlCharacters" value="true"/>
-            <property name="allowByTailComment" value="true"/>
-            <property name="allowNonPrintableEscapes" value="true"/>
-        </module>
+<!--        <module name="AvoidEscapedUnicodeCharacters">-->
+<!--            <property name="allowEscapesForControlCharacters" value="true"/>-->
+<!--            <property name="allowByTailComment" value="true"/>-->
+<!--            <property name="allowNonPrintableEscapes" value="true"/>-->
+<!--        </module>-->
         <module name="LineLength">
             <property name="max" value="120"/>
             <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
@@ -184,7 +184,7 @@
             <property name="braceAdjustment" value="0"/>
             <property name="caseIndent" value="0"/>
             <property name="throwsIndent" value="4"/>
-            <property name="lineWrappingIndentation" value="4"/>
+            <property name="lineWrappingIndentation" value="8"/>
             <property name="arrayInitIndent" value="4"/>
         </module>
         <module name="AbbreviationAsWordInName">
@@ -199,6 +199,10 @@
                       value="COMMA, SEMI, POST_INC, POST_DEC, DOT, ELLIPSIS, METHOD_REF"/>
             <property name="allowLineBreaks" value="true"/>
         </module>
+        <module name="WhitespaceAfter">
+            <property name="tokens"
+                      value="COMMA"/>
+        </module>
         <module name="ParenPad"/>
         <module name="OperatorWrap">
             <property name="option" value="NL"/>
@@ -230,9 +234,9 @@
         </module>
         <module name="JavadocMethod">
             <property name="scope" value="public"/>
-            <property name="allowMissingParamTags" value="true"/>
-            <property name="allowMissingThrowsTags" value="true"/>
-            <property name="allowMissingReturnTag" value="true"/>
+            <property name="allowMissingParamTags" value="false"/>
+            <property name="allowMissingThrowsTags" value="false"/>
+            <property name="allowMissingReturnTag" value="false"/>
             <property name="allowedAnnotations" value="Override, Test"/>
             <property name="allowThrowsTagsForSubclasses" value="true"/>
         </module>

docs/AboutUs.md

@@ -2,8 +2,8 @@
 
 Display | Name | Github Profile | Portfolio 
 --------|:----:|:--------------:|:---------:
-![](https://via.placeholder.com/100.png?text=Photo) | John Doe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
-![](https://via.placeholder.com/100.png?text=Photo) | Don Joe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
-![](https://via.placeholder.com/100.png?text=Photo) | Ron John | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
-![](https://via.placeholder.com/100.png?text=Photo) | John Roe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
-![](https://via.placeholder.com/100.png?text=Photo) | Don Roe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
+![](https://github.com/tobiasceg.png) | Tan Jian Hui Tobias | [Github](https://github.com/tobiasceg) | [Portfolio](https://ay2021s1-cs2113t-t09-2.github.io/tp/team/tobiasceg.html)
+![](https://github.com/f0fz.png) | Sim Jun You | [Github](https://github.com/f0fz) | [Portfolio](https://ay2021s1-cs2113t-t09-2.github.io/tp/team/f0fz.html)
+![](https://github.com/amalinasani.png) | Amalina | [Github](https://github.com/amalinasani) | [Portfolio](https://ay2021s1-cs2113t-t09-2.github.io/tp/team/amalinasani.html)
+![](https://github.com/aseanseen.png) | Sean Lim | [Github](https://github.com/Aseanseen) | [Portfolio](https://ay2021s1-cs2113t-t09-2.github.io/tp/team/aseanseen.html)
+![](https://github.com/wangqinNick.png) | Wang Qin | [Github](https://github.com/wangqinNick) | [Portfolio](https://ay2021s1-cs2113t-t09-2.github.io/tp/team/wangqinNick.html)