diff --git a/.config/checkstyle/checkstyle.xml b/.config/checkstyle/checkstyle.xml
new file mode 100644
index 0000000000..eb761a9b9a
--- /dev/null
+++ b/.config/checkstyle/checkstyle.xml
@@ -0,0 +1,434 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/.config/checkstyle/suppressions.xml b/.config/checkstyle/suppressions.xml
new file mode 100644
index 0000000000..39efb6e4ac
--- /dev/null
+++ b/.config/checkstyle/suppressions.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000000..43768ed916
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,62 @@
+plugins {
+ id 'checkstyle'
+ id 'java'
+ id 'application'
+ id 'com.github.johnrengelman.shadow' version '7.1.2'
+}
+
+checkstyle {
+ toolVersion = '10.2'
+}
+
+repositories {
+ mavenCentral()
+}
+
+dependencies {
+ testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.10.0'
+ testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.10.0'
+ String javaFxVersion = '17.0.7'
+
+ implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'win'
+ implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'mac'
+ implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'linux'
+ implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'win'
+ implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'mac'
+ implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'linux'
+ implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'win'
+ implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'mac'
+ implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'linux'
+ implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'win'
+ implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'mac'
+ implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'linux'
+}
+
+test {
+ useJUnitPlatform()
+
+ testLogging {
+ events "passed", "skipped", "failed"
+
+ showExceptions true
+ exceptionFormat "full"
+ showCauses true
+ showStackTraces true
+ showStandardStreams = false
+ }
+}
+
+application {
+ mainClassName = "zoe.Launcher"
+}
+
+shadowJar {
+ archiveBaseName = "zoe"
+ archiveClassifier = null
+ dependsOn("distZip", "distTar")
+}
+
+run{
+ standardInput = System.in
+}
+
diff --git a/data/SavedTasks.txt b/data/SavedTasks.txt
new file mode 100644
index 0000000000..c9ad5396cd
--- /dev/null
+++ b/data/SavedTasks.txt
@@ -0,0 +1,7 @@
+todo_read book_1
+event_meeting /from 2pm/to 6pm_1
+deadline_english project/by 2024-03-01 23:58_0
+deadline_math project/by 2024-03-01 23:59_0
+deadline_art project/by 2024-05-03 23:58_0
+deadline_science project/by 2024-05-03 23:59_0
+EOF
\ No newline at end of file
diff --git a/docs/README.md b/docs/README.md
index 8077118ebe..12b60bae40 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,29 +1,76 @@
-# User Guide
+# Zoe User Guide
-## Features
+
-### Feature-ABC
+Hey you! Yes you! Do you need to manage tasks? Well I can do it for you!
-Description of the feature.
+## Get Started
-### Feature-XYZ
+1. Ensure you have java 11 installed in your computer
+2. Download the latest Zoe.jar from [here](https://github.com/Arixeyeion/ip/releases/tag/A-Release)
+3. Copy the jar file to a directory of your choosing
+4. Open the command terminal, change to the directory you chose in step 3 and key in `java -jar Zoe.jar`
+5. aaaaaaaaaaaaand Viola! you can start managing your tasks
-Description of the feature.
+## Features
-## Usage
+### Add ToDos
-### `Keyword` - Describe action
+Adds a new todo task with no other parameters, just to keep things in mind
-Describe the action and its outcome.
+```
+todo
+```
+
+Note, you cannot type todo on its own
-Example of usage:
+### Add Events
+
+Adds a new event task with a timeframe
+
+```
+event /from /to
+```
-`keyword (optional arguments)`
+Note, the time frame currently does not follow any date/time standards so you can key in any timeframe you want
-Expected outcome:
+### Add Deadlines
-Description of the outcome.
+Adds a new deadline task with the by parameter to signify when you must finish the task
```
-expected output
+deadline /by yyyy-mm-dd HH:mm
```
+Example: `deadline complete project /by 2024-03-20 23:59`
+
+Note, the `/by` parameter only accepts `yyyy-MM-dd HH:mm`
+
+### List
+
+Lists all of the tasks you currently have when you call `list`
+
+For dealines, they are listed according to their date time
+
+### Marking, Unmarking and Deleting
+
+Marks, unmarks or deletes a task according to its index in list
+
+Examples: `mark 1` or `unmark 2` or `delete 3`
+
+Note, the function currently does not support keying in multiple numbers
+
+### Finding
+
+Shows tasks that contain a certain `word` in their description
+
+Example: Calling `find book` will display all tasks that contain `book` in their description
+
+Note, the `word` used to locate a task is case sensitive
+
+### Exiting
+
+Calling `bye` or clicking on the red cross closes Zoe
+
+### Saving
+
+Data saving is done automatically everytime a todo, event or deadline is created
\ No newline at end of file
diff --git a/docs/Ui.png b/docs/Ui.png
new file mode 100644
index 0000000000..d07c9f3565
Binary files /dev/null and b/docs/Ui.png differ
diff --git a/github UI entry/Full Demo.png b/github UI entry/Full Demo.png
new file mode 100644
index 0000000000..8ec0308360
Binary files /dev/null and b/github UI entry/Full Demo.png differ
diff --git a/github UI entry/deadline.png b/github UI entry/deadline.png
new file mode 100644
index 0000000000..e4a62672d9
Binary files /dev/null and b/github UI entry/deadline.png differ
diff --git a/github UI entry/image.png b/github UI entry/image.png
new file mode 100644
index 0000000000..d57bce62f0
Binary files /dev/null and b/github UI entry/image.png differ
diff --git a/github UI entry/startUp.png b/github UI entry/startUp.png
new file mode 100644
index 0000000000..ab1a907977
Binary files /dev/null and b/github UI entry/startUp.png differ
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000000..033e24c4cd
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000000..66c01cfeba
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000000..fcb6fca147
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,248 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+# Gradle start up script for POSIX generated by Gradle.
+#
+# Important for running:
+#
+# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+# noncompliant, but you have some other compliant shell such as ksh or
+# bash, then to run this script, type that shell name before the whole
+# command line, like:
+#
+# ksh Gradle
+#
+# Busybox and similar reduced shells will NOT work, because this script
+# requires all of these POSIX shell features:
+# * functions;
+# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+# * compound commands having a testable exit status, especially «case»;
+# * various built-in commands including «command», «set», and «ulimit».
+#
+# Important for patching:
+#
+# (2) This script targets any POSIX shell, so it avoids extensions provided
+# by Bash, Ksh, etc; in particular arrays are avoided.
+#
+# The "traditional" practice of packing multiple parameters into a
+# space-separated string is a well documented source of bugs and security
+# problems, so this is (mostly) avoided, by progressively accumulating
+# options in "$@", and eventually passing that to Java.
+#
+# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+# see the in-line comments for details.
+#
+# There are tweaks for specific operating systems such as AIX, CygWin,
+# Darwin, MinGW, and NonStop.
+#
+# (3) This script is generated from the Groovy template
+# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# within the Gradle project.
+#
+# You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+ APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
+ [ -h "$app_path" ]
+do
+ ls=$( ls -ld "$app_path" )
+ link=${ls#*' -> '}
+ case $link in #(
+ /*) app_path=$link ;; #(
+ *) app_path=$APP_HOME$link ;;
+ esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+ echo "$*"
+} >&2
+
+die () {
+ echo
+ echo "$*"
+ echo
+ exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in #(
+ CYGWIN* ) cygwin=true ;; #(
+ Darwin* ) darwin=true ;; #(
+ MSYS* | MINGW* ) msys=true ;; #(
+ NONSTOP* ) nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD=$JAVA_HOME/jre/sh/java
+ else
+ JAVACMD=$JAVA_HOME/bin/java
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD=java
+ if ! command -v java >/dev/null 2>&1
+ then
+ die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+ case $MAX_FD in #(
+ max*)
+ # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC3045
+ MAX_FD=$( ulimit -H -n ) ||
+ warn "Could not query maximum file descriptor limit"
+ esac
+ case $MAX_FD in #(
+ '' | soft) :;; #(
+ *)
+ # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC3045
+ ulimit -n "$MAX_FD" ||
+ warn "Could not set maximum file descriptor limit to $MAX_FD"
+ esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+# * args from the command line
+# * the main class name
+# * -classpath
+# * -D...appname settings
+# * --module-path (only if needed)
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+ APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+ CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+ JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ for arg do
+ if
+ case $arg in #(
+ -*) false ;; # don't mess with options #(
+ /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
+ [ -e "$t" ] ;; #(
+ *) false ;;
+ esac
+ then
+ arg=$( cygpath --path --ignore --mixed "$arg" )
+ fi
+ # Roll the args list around exactly as many times as the number of
+ # args, so each arg winds up back in the position where it started, but
+ # possibly modified.
+ #
+ # NB: a `for` loop captures its iteration list before it begins, so
+ # changing the positional parameters here affects neither the number of
+ # iterations, nor the values presented in `arg`.
+ shift # remove old arg
+ set -- "$@" "$arg" # push replacement arg
+ done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command;
+# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+# shell script including quotes and variable substitutions, so put them in
+# double quotes to make sure that they get re-expanded; and
+# * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+ "-Dorg.gradle.appname=$APP_BASE_NAME" \
+ -classpath "$CLASSPATH" \
+ org.gradle.wrapper.GradleWrapperMain \
+ "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+ die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+# set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+ printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+ xargs -n1 |
+ sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+ tr '\n' ' '
+ )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000000..6689b85bee
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,92 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/src/main/java/Duke.java b/src/main/java/Duke.java
deleted file mode 100644
index 5d313334cc..0000000000
--- a/src/main/java/Duke.java
+++ /dev/null
@@ -1,10 +0,0 @@
-public class Duke {
- public static void main(String[] args) {
- String logo = " ____ _ \n"
- + "| _ \\ _ _| | _____ \n"
- + "| | | | | | | |/ / _ \\\n"
- + "| |_| | |_| | < __/\n"
- + "|____/ \\__,_|_|\\_\\___|\n";
- System.out.println("Hello from\n" + logo);
- }
-}
diff --git a/src/main/java/zoe/Deadline.java b/src/main/java/zoe/Deadline.java
new file mode 100644
index 0000000000..586cb8dff8
--- /dev/null
+++ b/src/main/java/zoe/Deadline.java
@@ -0,0 +1,60 @@
+package zoe;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * Subclass of task
+ * Creates a deadline when keyed in the form: deadline XYZ /by yyyy-mm-dd
+ */
+public class Deadline extends Task {
+ private static DateTimeFormatter DATE_TIME_PARSER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
+
+ private static DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("MMM d yyyy HH:mm");
+ private static int DESCRIPTION = 0;
+ private static int DATE = 1;
+ protected String dateTime;
+ protected String formattedDate;
+ public Deadline(String desc) {
+ String[] str = desc.split("/by");
+ this.description = str[DESCRIPTION].trim();
+ this.dateTime = str[DATE].trim();
+ LocalDateTime inputDate = LocalDateTime.parse(dateTime, DATE_TIME_PARSER);
+ this.formattedDate = inputDate.format(FORMATTER);
+ this.type = "D";
+ this.isDone = false;
+ this.priority = TaskPriority.DEADLINE.getPriority();
+ }
+
+ public Deadline(String desc, String isDoneNumber) {
+ String[] str = desc.split("/by");
+ this.description = str[DESCRIPTION].trim();
+ this.dateTime = str[DATE].trim();
+ LocalDateTime inputDate = LocalDateTime.parse(dateTime, DATE_TIME_PARSER);
+ this.formattedDate = inputDate.format(FORMATTER);
+ this.type = "D";
+ int doneState = Integer.parseInt(isDoneNumber);
+ assert doneState < 2 : "Data file corrupted, invalid state";
+ assert doneState >= 0 : "Data file corrupted, invalid state";
+ this.isDone = doneState == DONE_STATE;
+ this.priority = TaskPriority.DEADLINE.getPriority();
+ }
+
+ @Override
+ public String getStatus() {
+ return String.format("[%s][%s] %s (by: %s)", type, getStatusIcon(),
+ description, formattedDate);
+ }
+
+ @Override
+ public String saveTask() {
+ return String.format("deadline_%s/by %s_%d", description, dateTime, isDoneNumerical());
+ }
+
+ /**
+ * Provides date to the comparator to sort deadlines
+ */
+ public LocalDateTime getDateTime() {
+ return LocalDateTime.parse(dateTime, DATE_TIME_PARSER);
+ }
+}
diff --git a/src/main/java/zoe/DialogBox.java b/src/main/java/zoe/DialogBox.java
new file mode 100644
index 0000000000..9f71b82889
--- /dev/null
+++ b/src/main/java/zoe/DialogBox.java
@@ -0,0 +1,70 @@
+package zoe;
+
+import java.io.IOException;
+import java.util.Collections;
+
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.geometry.Pos;
+import javafx.scene.Node;
+import javafx.scene.control.Label;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.Background;
+import javafx.scene.layout.BackgroundFill;
+import javafx.scene.layout.HBox;
+import javafx.scene.paint.Color;
+
+/**
+ * @@author Arixeyeion-reused
+ * Reused from https://se-education.org/guides/tutorials/javaFx.html
+ * with some modifications to accomodate ip.
+ * Custom control using FXML.
+ * This control represents a dialog box consisting of an ImageView to represent the speaker's face and a label
+ * Zoe replies user and performs functions based on input
+ */
+public class DialogBox extends HBox {
+ @FXML
+ private Label dialog;
+ @FXML
+ private ImageView displayPicture;
+
+ private DialogBox(String text, Image img) {
+ try {
+ FXMLLoader fxmlLoader = new FXMLLoader(MainWindow.class.getResource("/view/DialogBox.fxml"));
+ fxmlLoader.setController(this);
+ fxmlLoader.setRoot(this);
+ fxmlLoader.load();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ dialog.setText(text);
+ displayPicture.setImage(img);
+ }
+
+ /**
+ * Flips the dialog box such that the ImageView is on the left and text on the right.
+ */
+ private void flip() {
+ ObservableList tmp = FXCollections.observableArrayList(this.getChildren());
+ Collections.reverse(tmp);
+ getChildren().setAll(tmp);
+ setAlignment(Pos.TOP_LEFT);
+ }
+
+ public static DialogBox getUserDialog(String text, Image img) {
+ var userDialogBox = new DialogBox(text, img);
+ userDialogBox.setBackground(new Background(new BackgroundFill(Color.SANDYBROWN, null, null)));
+ return userDialogBox;
+ }
+
+ public static DialogBox getZoeDialog(String text, Image img) {
+ var zoeDialogBox = new DialogBox(text, img);
+ zoeDialogBox.flip();
+ zoeDialogBox.setBackground(new Background(new BackgroundFill(Color.ROSYBROWN, null, null)));
+ return zoeDialogBox;
+ }
+}
diff --git a/src/main/java/zoe/Event.java b/src/main/java/zoe/Event.java
new file mode 100644
index 0000000000..b0c1252bbd
--- /dev/null
+++ b/src/main/java/zoe/Event.java
@@ -0,0 +1,50 @@
+package zoe;
+
+/**
+ * Subclass of task
+ * Creates an event when keyed in the form: event XYZ /from 123 /to 123
+ */
+public class Event extends Task {
+ private static int DESCRIPTION = 0;
+
+ private static int TIME_FRAME = 1;
+ private static int FROM = 0;
+ private static int TO = 1;
+ protected String from;
+ protected String to;
+ public Event(String desc) {
+ String[] dsc = desc.split("/from");
+ this.description = dsc[DESCRIPTION];
+ String[] timeFrame = dsc[TIME_FRAME].split("/to");
+ this.from = timeFrame[FROM].trim();
+ this.to = timeFrame[TO].trim();
+ this.type = "E";
+ this.isDone = false;
+ this.priority = TaskPriority.EVENT.getPriority();
+ }
+
+ public Event(String desc, String isDoneNumber) {
+ String[] dsc = desc.split("/from");
+ this.description = dsc[DESCRIPTION];
+ String[] timeFrame = dsc[TIME_FRAME].split("/to");
+ this.from = timeFrame[FROM].trim();
+ this.to = timeFrame[TO].trim();
+ this.type = "E";
+ int doneState = Integer.parseInt(isDoneNumber);
+ assert doneState < 2 : "Data file corrupted, invalid state";
+ assert doneState >= 0 : "Data file corrupted, invalid state";
+ this.isDone = doneState == DONE_STATE;
+ this.priority = TaskPriority.EVENT.getPriority();
+ }
+
+ @Override
+ public String getStatus() {
+ return String.format("[%s][%s] %s(from: %s to: %s)", this.type, this.getStatusIcon(),
+ this.description, this.from, this.to);
+ }
+
+ @Override
+ public String saveTask() {
+ return String.format("event_%s/from %s/to %s_%d", this.description, this.from, this.to, this.isDoneNumerical());
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/zoe/Launcher.java b/src/main/java/zoe/Launcher.java
new file mode 100644
index 0000000000..f209d60260
--- /dev/null
+++ b/src/main/java/zoe/Launcher.java
@@ -0,0 +1,12 @@
+package zoe;
+
+import javafx.application.Application;
+
+/**
+ * A launcher class to workaround classpath issues.
+ */
+public class Launcher {
+ public static void main(String[] args) {
+ Application.launch(Main.class, args);
+ }
+}
diff --git a/src/main/java/zoe/LoadSplit.java b/src/main/java/zoe/LoadSplit.java
new file mode 100644
index 0000000000..51e4d135a3
--- /dev/null
+++ b/src/main/java/zoe/LoadSplit.java
@@ -0,0 +1,16 @@
+package zoe;
+
+public enum LoadSplit {
+ Task_Type(0),
+ Description(1),
+ Status(2);
+
+ private final int idx;
+ private LoadSplit(int idx) {
+ this.idx = idx;
+ }
+
+ public int getIdx() {
+ return idx;
+ }
+}
diff --git a/src/main/java/zoe/Loader.java b/src/main/java/zoe/Loader.java
new file mode 100644
index 0000000000..dc0876bf7b
--- /dev/null
+++ b/src/main/java/zoe/Loader.java
@@ -0,0 +1,60 @@
+package zoe;
+
+import java.io.*;
+import java.util.ArrayList;
+
+public class Loader {
+ protected String path;
+ protected String fileName;
+
+ public Loader(String path, String fileName) {
+ this.path = path;
+ this.fileName = fileName;
+ }
+
+ /**
+ * Loads data from a saved file when zoe is opened again
+ * If no file exists, creates an empty Array list for zoe.
+ */
+ public ArrayList loadTasks(){
+ File file = new File(path, fileName);
+ try {
+ File directory = file.getParentFile();
+ //check for existence of directory
+ if (directory.exists() && file.exists()) {
+ BufferedReader reader = new BufferedReader(new FileReader(file));
+ ArrayList loadedTasks = new ArrayList();
+ String line;
+
+ while (!(line = reader.readLine()).equals("EOF")) {
+ String[] readTask = line.split("_");
+ int taskType = LoadSplit.Task_Type.getIdx();
+ int description = LoadSplit.Description.getIdx();
+ int status = LoadSplit.Status.getIdx();
+
+ if (readTask[taskType].equals("todo")) {
+ ToDo td = new ToDo(
+ readTask[description], readTask[status]);
+ loadedTasks.add(td);
+
+ } else if (readTask[taskType].equals("event")) {
+ Event e = new Event(readTask[description], readTask[status]);
+ loadedTasks.add(e);
+
+ } else {
+ Deadline dl = new Deadline(readTask[description], readTask[status]);
+ loadedTasks.add(dl);
+ }
+ }
+ return loadedTasks;
+ } else {
+ return new ArrayList();
+ }
+
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ return new ArrayList();
+ }
+}
diff --git a/src/main/java/zoe/Main.java b/src/main/java/zoe/Main.java
new file mode 100644
index 0000000000..f6fbbf4817
--- /dev/null
+++ b/src/main/java/zoe/Main.java
@@ -0,0 +1,35 @@
+package zoe;
+import java.io.IOException;
+
+import javafx.application.Application;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Scene;
+import javafx.scene.layout.AnchorPane;
+import javafx.stage.Stage;
+
+/**
+ * @@author Arixeyeion-reused
+ * Reused from https://se-education.org/guides/tutorials/javaFx.html
+ * with some modifications to accomodate ip.
+ * A GUI for zoe.Zoe using FXML.
+ */
+public class Main extends Application {
+
+ private Zoe zoe = new Zoe();
+ private Ui ui = new Ui();
+
+ @Override
+ public void start(Stage stage) {
+ try {
+ stage.setTitle("Zoe");
+ FXMLLoader fxmlLoader = new FXMLLoader(Main.class.getResource("/view/MainWindow.fxml"));
+ AnchorPane ap = fxmlLoader.load();
+ Scene scene = new Scene(ap);
+ stage.setScene(scene);
+ fxmlLoader.getController().initialize(zoe, ui);
+ stage.show();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+}
diff --git a/src/main/java/zoe/MainWindow.java b/src/main/java/zoe/MainWindow.java
new file mode 100644
index 0000000000..04c20597b9
--- /dev/null
+++ b/src/main/java/zoe/MainWindow.java
@@ -0,0 +1,82 @@
+package zoe;
+
+import java.util.Timer;
+import java.util.TimerTask;
+
+import javafx.application.Platform;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.control.TextField;
+import javafx.scene.image.Image;
+import javafx.scene.layout.AnchorPane;
+import javafx.scene.layout.VBox;
+
+/**
+ * @@author Arixeyeion-reused
+ * Reused from https://se-education.org/guides/tutorials/javaFx.html
+ * with some modifications to accomodate ip.
+ * Controller for zoe.MainWindow. Provides the layout for the other controls.
+ */
+public class MainWindow extends AnchorPane {
+ @FXML
+ private ScrollPane scrollPane;
+ @FXML
+ private VBox dialogContainer;
+ @FXML
+ private TextField userInput;
+ @FXML
+ private Button sendButton;
+
+ private Zoe zoe;
+ private Image userImage = new Image(this.getClass().getResourceAsStream("/images/DaUser.png"));
+ private Image zoeImage = new Image(this.getClass().getResourceAsStream("/images/DaZoe.png"));
+
+ @FXML
+ public void initialize(Zoe zoe, Ui ui) {
+ this.zoe = zoe;
+ scrollPane.vvalueProperty().bind(dialogContainer.heightProperty());
+ dialogContainer.getChildren().addAll(DialogBox.getZoeDialog(ui.saysHi(), zoeImage));
+ }
+
+ /**
+ * Creates two dialog boxes, one echoing user input and the other containing Zoe's reply and then appends them to
+ * the dialog container. Clears the user input after processing.
+ */
+ @FXML
+ private void handleUserInput() {
+ String input = userInput.getText();
+ String response = zoe.getResponse(input);
+ dialogContainer.getChildren().addAll(
+ DialogBox.getUserDialog(input, userImage),
+ DialogBox.getZoeDialog(response, zoeImage)
+ );
+
+ userInput.clear();
+
+ if (response.equals(new Ui().saysBye())) {
+ pauseAndStop();
+ }
+ }
+
+ /**
+ * Pauses the app for 1 second then closes so that it can display the bye message
+ */
+ private void pauseAndStop() {
+ Timer timer = new Timer();
+ userInput.setDisable(true);
+ sendButton.setDisable(true);
+ timer.schedule(new stopApp(), 500);
+ }
+
+ /**
+ * Helps the pauseAndStop function by providing the stopping functionality
+ */
+ private class stopApp extends TimerTask {
+ @Override
+ public void run() {
+ Platform.exit();
+ System.exit(0);
+ }
+ }
+}
diff --git a/src/main/java/zoe/Parser.java b/src/main/java/zoe/Parser.java
new file mode 100644
index 0000000000..00c37a4418
--- /dev/null
+++ b/src/main/java/zoe/Parser.java
@@ -0,0 +1,140 @@
+package zoe;
+
+import java.io.IOException;
+import java.time.format.DateTimeParseException;
+
+/**
+ * Processes input from user
+ */
+public class Parser {
+ public TaskList tl;
+ protected Ui ui;
+
+ private Saver s;
+ public Parser(TaskList tl) {
+ this.tl = tl;
+ this.ui = new Ui();
+ this.s = new Saver(this.tl.getTasks());
+ }
+ public String process(String command) {
+ if (command.contains("_")) {
+ return ui.avoidUnderscores();
+ }
+
+ int idx = command.indexOf(" ");
+
+ if (idx > -1) {
+ String[] str = command.split(" ", 2);
+ if (str[1].trim().length() == 0 || str[1].charAt(0) == ('/')) {
+ return ui.noDescription();
+ }
+ return carryOutLongCommand(str[0], str[1]);
+
+ } else {
+ return carryOutShortCommand(command);
+ }
+ }
+
+ /**
+ * Carries out short commands like list
+ * If invalid command like empty todo is given, calls the respective responses
+ * @param command
+ */
+ public String carryOutShortCommand(String command) {
+ String res = "";
+ if (command.equals("list")) {
+ if (tl.getSize() < 1) {
+ res += "Sorry you don't have any tasks currently D:";
+ } else {
+ for (int i = 1; i <= tl.getSize(); i++) {
+ res += String.format("%d.%s\n", i, tl.get(i).getStatus());
+ }
+ }
+
+ } else {
+ if (command.equals("todo")) {
+ res += ui.todoDescription();
+ } else {
+ res += ui.invalidCommand();
+ }
+
+ }
+
+ return res;
+ }
+
+ /**
+ * Carries out long commands to deal with the different forms of task
+ * @param command
+ * @param commandDescription
+ */
+ public String carryOutLongCommand(String command, String commandDescription) {
+ try {
+ switch (command){
+ case "todo":
+ ToDo td = new ToDo(commandDescription);
+ tl.add(td);
+ s.saveTo("./data/");
+ return ui.addedTask(td, tl.getSize());
+
+ case "deadline":
+ Deadline dl = new Deadline(commandDescription);
+ tl.add(dl);
+ s.saveTo("./data/");
+ return ui.addedTask(dl, tl.getSize());
+
+ case "event":
+ Event e = new Event(commandDescription);
+ tl.add(e);
+ s.saveTo("./data/");
+ return ui.addedTask(e, tl.getSize());
+
+ case "find":
+ String res = "";
+ int counter = 0;
+ for (Task t: tl.getTasks()) {
+ if (t.getStatus().contains(commandDescription)) {
+ counter++;
+ res += String.format("%d.%s\n", counter, t.getStatus());
+ }
+ }
+
+ if (counter == 0) {
+ res += ui.taskDoesNotExist(tl.getSize());
+ }
+
+ return res;
+
+ case "mark":
+ tl.markAsDone(Integer.parseInt(commandDescription.trim()));
+ return ui.markedTask(tl.get(Integer.parseInt(commandDescription.trim())));
+
+ case "unmark":
+ tl.unmark(Integer.parseInt(commandDescription.trim()));
+ return ui.unmarkedTask(tl.get(Integer.parseInt(commandDescription.trim())));
+
+ case "delete":
+ Task deletedTask = tl.get(Integer.parseInt(commandDescription.trim()));
+ tl.delete(Integer.parseInt(commandDescription.trim()));
+ return ui.deletedTask(deletedTask, tl.getSize());
+
+ default:
+ return ui.invalidCommand();
+ }
+
+ } catch (IndexOutOfBoundsException e) {
+ if (command.equals("event")) {
+ return ui.eventFormat();
+ } else if (command.equals("deadline")) {
+ return ui.deadlineFormat();
+ }
+ return ui.invalidIndex(tl.getSize());
+
+ } catch (DateTimeParseException d) {
+ return ui.invalidDate();
+
+ } catch (NumberFormatException n) {
+ return ui.invalidIndexFormat();
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/zoe/PriorityComparator.java b/src/main/java/zoe/PriorityComparator.java
new file mode 100644
index 0000000000..f1155456b8
--- /dev/null
+++ b/src/main/java/zoe/PriorityComparator.java
@@ -0,0 +1,19 @@
+package zoe;
+import java.util.Comparator;
+
+public class PriorityComparator implements Comparator{
+ /**
+ * Compares tasks according to their type first and if they are deadlines, sorts them according to date time
+ * @param firstTask the first object to be compared.
+ * @param secondTask the second object to be compared.
+ */
+ @Override
+ public int compare(Task firstTask, Task secondTask) {
+ if ((firstTask instanceof Deadline) && (secondTask instanceof Deadline)) {
+
+ return ((Deadline) firstTask).getDateTime().isBefore(((Deadline) secondTask).getDateTime()) ? -1 : 0;
+ }
+
+ return firstTask.getPriority() - secondTask.getPriority();
+ }
+}
diff --git a/src/main/java/zoe/Saver.java b/src/main/java/zoe/Saver.java
new file mode 100644
index 0000000000..d01bb2f165
--- /dev/null
+++ b/src/main/java/zoe/Saver.java
@@ -0,0 +1,46 @@
+package zoe;
+
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.util.ArrayList;
+import java.io.IOException;
+import java.io.File;
+public class Saver {
+ protected ArrayList tasks;
+ public Saver(ArrayList tasks) {
+ this.tasks = tasks;
+ }
+
+ /**
+ * Saves data from the current zoe instance to a path when zoe closes
+ * @param path
+ */
+ public void saveTo(String path) {
+ File file = new File(path, "SavedTasks.txt");
+
+ try {
+ File directory = file.getParentFile();
+ //check for existence of directory
+ if (!directory.exists()) {
+ directory.mkdirs();
+ }
+
+ //create the "save" file if it does not exist
+ if(!file.exists()) {
+ file.createNewFile();
+ }
+
+ BufferedWriter writer = new BufferedWriter(new FileWriter(file, false));
+
+ for (Task t: tasks) {
+ writer.write(t.saveTask() + "\n");
+ }
+
+ writer.write("EOF");
+ writer.close();
+
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/zoe/Task.java b/src/main/java/zoe/Task.java
new file mode 100644
index 0000000000..bffe6001e4
--- /dev/null
+++ b/src/main/java/zoe/Task.java
@@ -0,0 +1,80 @@
+package zoe;
+
+/**
+ * Superclass for all forms of tasks
+ * Contains some global methods so that all subclasses have access to that method
+ */
+public class Task {
+ protected static int DONE_STATE = 1;
+ protected String description;
+ protected String type;
+ protected boolean isDone;
+
+ protected int priority;
+
+ public Task() {
+ this.description = "";
+ this.type = "";
+ this.isDone = false;
+ }
+
+ public Task(String description) {
+ this.description = description.trim();
+ this.type = "";
+ this.isDone = false;
+ }
+
+ /**
+ * Returns the marked condition X or empty to supplement the marking command
+ */
+ public String getStatusIcon() {
+ return (isDone ? "X" : " ");
+ }
+
+ /**
+ * Marks a task as done to reflect in zoe
+ */
+ public void markAsDone() {
+ this.isDone = true;
+ }
+
+ /**
+ * Unmarks a given task from list in zoe
+ */
+ public void unmark() {
+ this.isDone = false;
+ }
+
+ /**
+ * Returns the status of the respective task for visualisation in the GUI
+ */
+ public String getStatus() {
+ return String.format("[%s][%s] %s", this.type, this.getStatusIcon(), this.description);
+ }
+
+ /**
+ * Records whether a task is done or not in numerical form for data loading
+ */
+ public int isDoneNumerical() {
+ //to help with saving and loading
+ if (this.isDone) {
+ return 1;
+ }
+
+ return 0;
+ }
+
+ /**
+ * Saves respective tasks in the required format
+ */
+ public String saveTask() {
+ return String.format("%d|%s", this.isDoneNumerical(), this.description);
+ }
+
+ /**
+ * Returns a priority to sort the tasks in the following order: todos, events, deadlines according to date
+ */
+ public int getPriority() {
+ return priority;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/zoe/TaskList.java b/src/main/java/zoe/TaskList.java
new file mode 100644
index 0000000000..ccd11b7caf
--- /dev/null
+++ b/src/main/java/zoe/TaskList.java
@@ -0,0 +1,70 @@
+package zoe;
+
+import java.util.ArrayList;
+import java.util.Collections;
+
+/**
+ * Stores all tasks that is manipulated by zoe
+ */
+public class TaskList {
+ protected ArrayList tasks;
+
+ public TaskList(ArrayList tl) {
+ this.tasks = tl;
+ }
+
+ /**
+ * Adds a new task to the list, when add(task) is called
+ * @param t
+ */
+ public void add(Task t) {
+ this.tasks.add(t);
+ Collections.sort(tasks, new PriorityComparator());
+ }
+ /**
+ * Deletes a new task to the list, when delete(task) is called
+ * @param i
+ */
+ public void delete(int i) {
+ tasks.remove(Integer.valueOf(i) - 1);
+ Collections.sort(tasks, new PriorityComparator());
+ }
+
+ /**
+ * Marks task at a given index when markAsDone(index) is called
+ * @param i
+ */
+ public void markAsDone(int i) {
+ tasks.get(i - 1).markAsDone();
+ }
+
+ /**
+ * Unmarks the task at a given index when unmark(index) is called
+ * @param i
+ */
+ public void unmark(int i) {
+ tasks.get(i - 1).unmark();
+ }
+
+ /**
+ * Returns tasks for interactions with parser
+ */
+ public ArrayList getTasks() {
+ return this.tasks;
+ }
+
+ /**
+ * Returns size of task list so that UI can inform user about the number of tasks they have in their list
+ */
+ public int getSize() {
+ return this.tasks.size();
+ }
+
+ /**
+ * Returns task at specified index for marking, unmarking and deletion
+ */
+ public Task get(int i) {
+ return this.tasks.get(i - 1);
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/zoe/TaskPriority.java b/src/main/java/zoe/TaskPriority.java
new file mode 100644
index 0000000000..176c8cbab8
--- /dev/null
+++ b/src/main/java/zoe/TaskPriority.java
@@ -0,0 +1,16 @@
+package zoe;
+
+public enum TaskPriority {
+ TODO(0),
+ EVENT(1),
+ DEADLINE(2);
+
+ private int priority;
+ private TaskPriority(int priority){
+ this.priority = priority;
+ }
+
+ public int getPriority() {
+ return priority;
+ }
+}
diff --git a/src/main/java/zoe/ToDo.java b/src/main/java/zoe/ToDo.java
new file mode 100644
index 0000000000..3706cc0787
--- /dev/null
+++ b/src/main/java/zoe/ToDo.java
@@ -0,0 +1,27 @@
+package zoe;
+
+/**
+ * Subclass of task
+ * Creates a todo task when keyed in the following form: todo XYZ
+ */
+public class ToDo extends Task {
+ public ToDo(String description) {
+ super(description);
+ this.type = "T";
+ }
+
+ public ToDo(String description, String isDoneNumber) {
+ super(description);
+ this.type = "T";
+ int doneState = Integer.parseInt(isDoneNumber);
+ assert doneState < 2 : "Data file corrupted, invalid state";
+ assert doneState >= 0 : "Data file corrupted, invalid state";
+ this.isDone = doneState == (DONE_STATE);
+ this.priority = TaskPriority.TODO.getPriority();
+ }
+
+ @Override
+ public String saveTask() {
+ return String.format("todo_%s_%d", this.description, this.isDoneNumerical());
+ }
+}
diff --git a/src/main/java/zoe/Ui.java b/src/main/java/zoe/Ui.java
new file mode 100644
index 0000000000..633d307451
--- /dev/null
+++ b/src/main/java/zoe/Ui.java
@@ -0,0 +1,137 @@
+package zoe;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Prints statements to interact with user
+ */
+public class Ui {
+ protected ArrayList functions = new ArrayList();
+
+ public Ui() {
+ functions.addAll(List.of("list", "mark", "unmark", "todo", "deadline", "event", "delete", "find"));
+ }
+
+ /**
+ * Makes Zoe say hi when a user runs the programme
+ */
+ public String saysHi() {
+ return "Hello I am Zoe! What can I do for you today?";
+ }
+
+ /**
+ * Makes Zoe say bye when a user closes a programme
+ */
+ public String saysBye() {
+ return "Bye. Hope to see you again soon!";
+ }
+
+ /**
+ * Alerts user of the required todo format which requires a description
+ */
+ public String todoDescription() {
+ return "Sorry! todo requires a description like todo XYZ";
+ }
+
+ /**
+ * Alerts user that they have keyed in an invalid command, prints list of valid commands
+ */
+ public String invalidCommand() {
+ return String.format
+ ("Sorry! Invalid command or incorrect input. I can only perform these currently: %s " +
+ "\nIf you are trying to call task related commands, refer to the website :D", functions);
+ }
+
+ /**
+ * Alerts user that the index does not exist, gives user current size
+ */
+ public String invalidIndex(int size) {
+ return size > 0 ? String.format
+ ("This task does not exist! Input a positive number among tasks in list starting from 1 to %d", size)
+ : "Your task list is currently empty, fill it up before interacting with it :D";
+ }
+
+ /**
+ * Alerts user that the index does not exist, this is specifically for finding a task
+ */
+ public String taskDoesNotExist(int size) {
+ return String.format
+ ("Sorry, I can't find the task you have keyed in\nThere are only %d tasks in your list", size);
+ }
+
+ /**
+ * Alerts user on successful addition
+ */
+ public String addedTask(Task t, int size) {
+ return String.format
+ ("I've added this task:\n%s\nNow there are %d tasks in your list :D", t.getStatus(), size);
+ }
+
+ /**
+ * Alerts user on successful mark of a task
+ */
+ public String markedTask(Task t) {
+ return String.format("Nice! I've marked this task as done:\n%s", t.getStatus());
+ }
+
+ /**
+ * Alerts user on successful unmarking of a task
+ */
+ public String unmarkedTask(Task t) {
+ return String.format("Ok, I've marked this task as not done yet:\n%s", t.getStatus());
+ }
+
+ /**
+ * Alerts user on successful deletion of a task
+ */
+ public String deletedTask(Task t, int size) {
+ return String.format
+ ("Noted! this task gon like pentagon:\n%s\nThere are %d tasks left in the list", t.getStatus(), size);
+ }
+
+ /**
+ * Alerts user in the event they keyed in an invalid date
+ */
+ public String invalidDate() {
+ return "Sorry, I only accept deadline dates in the form ";
+ }
+
+ /**
+ * Alerts user in the event they keyed in an invalid event format
+ */
+ public String eventFormat(){
+ return "Invalid event format. Please key it in as follows:\n" +
+ "event /from /to \nThere are no requirements for from or to.";
+ }
+
+ /**
+ * Alerts user in the event they keyed in an invalid deadline format
+ */
+ public String deadlineFormat(){
+ return "Invalid deadline format. Please key it in as follows:\n" +
+ "deadline /by yyyy-mm-dd\nI only accept that specific date format.";
+ }
+
+ /**
+ * Alerts user in the event they keyed in an underscore, ensures that data corruption is not done by bot
+ */
+ public String avoidUnderscores(){
+ return "Please avoid keying in underscores as it will break the bot!";
+ }
+
+ /**
+ * Alerts user in the event they keyed in an underscore, ensures that data corruption is not done by bot
+ */
+ public String noDescription(){
+ return "The task you are trying to create " +
+ "or find lacks a description, refer to the website for formatting info :D";
+ }
+
+ /**
+ * Alerts user that the bot currently cannot read multiple integers when it comes to mark/unmark/delete
+ */
+ public String invalidIndexFormat(){
+ return "I currently mark/unmark/delete multiple tasks in a row, please key in only 1 number";
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/zoe/Zoe.java b/src/main/java/zoe/Zoe.java
new file mode 100644
index 0000000000..2677fde003
--- /dev/null
+++ b/src/main/java/zoe/Zoe.java
@@ -0,0 +1,25 @@
+package zoe;
+public class Zoe{
+ private Parser parser;
+ private TaskList tasks;
+ private Ui ui;
+
+ public Zoe() {
+ ui = new Ui();
+ Loader r = new Loader("./data/", "SavedTasks.txt");
+ tasks = new TaskList(r.loadTasks());
+ parser = new Parser(tasks);
+ }
+ public static void main(String[] args) {
+ new Zoe();
+ }
+
+ public String getResponse(String input) {
+
+ if (input.equals("bye")) {
+ return ui.saysBye();
+ }
+
+ return parser.process(input);
+ }
+}
diff --git a/src/main/resources/images/DaUser.png b/src/main/resources/images/DaUser.png
new file mode 100644
index 0000000000..76e2ef2704
Binary files /dev/null and b/src/main/resources/images/DaUser.png differ
diff --git a/src/main/resources/images/DaZoe.png b/src/main/resources/images/DaZoe.png
new file mode 100644
index 0000000000..2541d012b0
Binary files /dev/null and b/src/main/resources/images/DaZoe.png differ
diff --git a/src/main/resources/view/DialogBox.fxml b/src/main/resources/view/DialogBox.fxml
new file mode 100644
index 0000000000..bbdd7ad9e3
--- /dev/null
+++ b/src/main/resources/view/DialogBox.fxml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml
new file mode 100644
index 0000000000..231b443870
--- /dev/null
+++ b/src/main/resources/view/MainWindow.fxml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/test/java/zoe/EventTest.java b/src/test/java/zoe/EventTest.java
new file mode 100644
index 0000000000..9a5b5a14c0
--- /dev/null
+++ b/src/test/java/zoe/EventTest.java
@@ -0,0 +1,35 @@
+package zoe;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+public class EventTest {
+ @Test
+ public void testEventStatus() {
+ //test that input matches the required save format when it is newly created
+ Event testEvent = new Event("ip meeting /from 2pm /to 6pm");
+ assertEquals("[E][ ] ip meeting (from: 2pm to: 6pm)", testEvent.getStatus());
+ }
+
+ @Test
+ public void testMarkedEventStatus() {
+ //test that input matches the required save format when it is newly created
+ Event testEvent = new Event("ip meeting /from 2pm /to 6pm", "1");
+ assertEquals("[E][X] ip meeting (from: 2pm to: 6pm)", testEvent.getStatus());
+ }
+
+ @Test
+ public void testEventStatusNoSpaces() {
+ //test that input matches the required save format when it is newly created
+ Event testEvent = new Event("ip meeting /from2pm/to6pm");
+ assertEquals("[E][ ] ip meeting (from: 2pm to: 6pm)", testEvent.getStatus());
+ }
+
+ @Test
+ public void testEventStatusManySpaces() {
+ //test that input matches the required save format when it is newly created
+ Event testEvent = new Event("ip meeting /from 2pm /to 6pm ");
+ assertEquals("[E][ ] ip meeting (from: 2pm to: 6pm)", testEvent.getStatus());
+ }
+
+}
diff --git a/src/test/java/zoe/ToDoTest.java b/src/test/java/zoe/ToDoTest.java
new file mode 100644
index 0000000000..9c1281fdfe
--- /dev/null
+++ b/src/test/java/zoe/ToDoTest.java
@@ -0,0 +1,35 @@
+package zoe;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+public class ToDoTest extends Task {
+ @Test
+ public void testSaveTask() {
+ //test that input matches the required save format when it is newly created
+ ToDo testTD = new ToDo("read book");
+ assertEquals("todo_read book_0",testTD.saveTask());
+ }
+
+ @Test
+ public void testSaveTaskNoSpace() {
+ //test that input matches the required save format when it is newly created
+ ToDo testTD = new ToDo("readbook");
+ assertEquals("todo_readbook_0",testTD.saveTask());
+ }
+
+ @Test
+ public void testSaveTaskEmpty() {
+ //test that input matches the required save format when it is newly created, in this case an empty instance
+ //can be created, but the UI does not allow this behaviour when user interacts with zoe
+ ToDo testTD = new ToDo("");
+ assertEquals("todo__0",testTD.saveTask());
+ }
+
+ @Test
+ public void testSaveTaskMarked() {
+ //test that input matches the required save format when it is created
+ ToDo testTD = new ToDo("read book", "1");
+ assertEquals("todo_read book_1",testTD.saveTask());
+ }
+}
\ No newline at end of file
diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT
index 657e74f6e7..3fe033ff4a 100644
--- a/text-ui-test/EXPECTED.TXT
+++ b/text-ui-test/EXPECTED.TXT
@@ -1,7 +1,6 @@
-Hello from
- ____ _
-| _ \ _ _| | _____
-| | | | | | | |/ / _ \
-| |_| | |_| | < __/
-|____/ \__,_|_|\_\___|
-
+Hello! I'm zoe.Ui
+What can I do for you?
+1.[T][ ] read book
+2.[E][ ] project meeting (from: Mon 2pmto: 4pm)
+3.[D][ ] return book (by: Sunday)
+Bye. Hope to see you again soon!
\ No newline at end of file
diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt
index e69de29bb2..9188415676 100644
--- a/text-ui-test/input.txt
+++ b/text-ui-test/input.txt
@@ -0,0 +1,2 @@
+todo read book
+bye
\ No newline at end of file
diff --git a/text-ui-test/runtest.bat b/text-ui-test/runtest.bat
index 0873744649..61d3d22cd1 100644
--- a/text-ui-test/runtest.bat
+++ b/text-ui-test/runtest.bat
@@ -4,10 +4,10 @@ REM create bin directory if it doesn't exist
if not exist ..\bin mkdir ..\bin
REM delete output from previous run
-if exist ACTUAL.TXT del ACTUAL.TXT
+del ACTUAL.TXT
REM compile the code into the bin folder
-javac -cp ..\src\main\java -Xlint:none -d ..\bin ..\src\main\java\*.java
+javac -cp ..\zoe.Ui\src\main\java\*.java -Xlint:none -d ..\bin ..\src\main\java\*.java
IF ERRORLEVEL 1 (
echo ********** BUILD FAILURE **********
exit /b 1
@@ -15,7 +15,7 @@ IF ERRORLEVEL 1 (
REM no error here, errorlevel == 0
REM run the program, feed commands from input.txt file and redirect the output to the ACTUAL.TXT
-java -classpath ..\bin Duke < input.txt > ACTUAL.TXT
+java -classpath ..\bin Main < input.txt > ACTUAL.TXT
REM compare the output to the expected output
FC ACTUAL.TXT EXPECTED.TXT
diff --git a/text-ui-test/runtest.sh b/text-ui-test/runtest.sh
old mode 100644
new mode 100755