Added gui

build.gradle

@@ -1,8 +1,6 @@
 plugins {
     id 'java'
     id 'application'
-    id 'checkstyle'
-    id 'com.github.johnrengelman.shadow' version '5.1.0'
 }
 
 group 'org.example'
@@ -11,18 +9,14 @@ version '1.0-SNAPSHOT'
 repositories {
     mavenCentral()
 }
-sourceSets {
-    main {
-        java {
-            srcDirs = ['src']
-        }
-    }
-}
+
+
 dependencies {
     implementation 'org.junit.jupiter:junit-jupiter:5.7.0'
-    compile 'junit:junit:4.12'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.0'
 
-    String javaFxVersion = '11'
+    String javaFxVersion = '16'
 
     implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'win'
     implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'mac'

src/main/java/duke/Controller.java

@@ -0,0 +1,147 @@
+package duke;
+
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.DatePicker;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
+
+import java.io.IOException;
+import java.util.ArrayList;
+
+
+public class Controller {
+
+    private static Storage storage = new Storage("C:\\Users\\65906\\IdeaProjects\\ip\\duke.txt");
+    private static TaskList tasks;
+
+    @FXML
+    private Label listLabel;
+
+    @FXML
+    private Label deleteError;
+
+    @FXML
+    private TextField deleteText;
+
+    @FXML
+    private TextField taskType;
+
+    @FXML
+    private TextField taskDescription;
+
+    @FXML
+    private DatePicker taskDate;
+
+    @FXML
+    private Label addTaskError;
+
+    @FXML
+    private TextField doneText;
+
+    @FXML
+    private Label doneError;
+
+    @FXML
+    private TextField findText;
+
+    public void load(ActionEvent a) {
+        {
+            try {
+                tasks = new TaskList(storage.load());
+            } catch (IOException | DukeException e) {
+                tasks = new TaskList();
+            }
+            String listContent = "";
+            for (int i = 0; i < tasks.size(); i++) {
+                listContent += (i + 1) + ". " + tasks.getTask(i).toString() + "\n";
+            }
+            listLabel.setText("Here are the tasks in your list:\n" + listContent);
+        }
+    }
+
+    public void load() {
+        String listContent = "";
+        for (int i = 0; i < tasks.size(); i++) {
+            listContent += (i + 1) + ". " + tasks.getTask(i).toString() + "\n";
+        }
+        listLabel.setText("Here are the tasks in your list:\n" + listContent);
+        addTaskError.setText("");
+        deleteError.setText("");
+        doneError.setText("");
+    }
+
+    public Task taskParse(String type, String description, String dateTime){
+        if (type.equalsIgnoreCase("T")) {
+            return new Todo(description);
+        } else if (type.equalsIgnoreCase("D")) {
+            return new Deadline(description,dateTime);
+        } else if (type.equalsIgnoreCase("E")) {
+            return new Event(description,dateTime);
+        } else {
+            return null;
+        }
+    }
+
+    public void add(ActionEvent a) {
+        if (taskType.getText().equalsIgnoreCase("T")) {
+            tasks.addTask(taskParse(taskType.getText(), taskDescription.getText(), ""));
+            this.load();
+        } else if (taskType.getText().equalsIgnoreCase("D") || taskType.getText().equalsIgnoreCase( "E")) {
+            tasks.addTask(taskParse(taskType.getText(), taskDescription.getText(),
+                    taskDate.getValue().toString()));
+            this.load();
+        } else {
+            addTaskError.setText("Wrong Format");
+        }
+
+    }
+
+    public void done(ActionEvent a) {
+        try {
+            int doneIndex = Integer.parseInt(doneText.getText()) - 1;
+            if(doneIndex > tasks.size() - 1 || doneIndex < 0) {
+                doneError.setText("Please enter a number in the list");
+            } else {
+                tasks.markAsDone(doneIndex);
+                this.load();
+            }
+        } catch (NumberFormatException e) {
+            doneError.setText("Please enter integer");
+        }
+    }
+
+    public void delete(ActionEvent a){
+        try {
+            int deleteIndex = Integer.parseInt(deleteText.getText()) - 1;
+            if(deleteIndex > tasks.size() - 1 || deleteIndex < 0) {
+                deleteError.setText("Please enter a number in the list");
+            } else {
+                tasks.removeTask(deleteIndex);
+
+                this.load();
+            }
+        } catch (NumberFormatException e) {
+            deleteError.setText("Please enter integer");
+        }
+    }
+
+    public void find(ActionEvent a) {
+        ArrayList<Task> result = new ArrayList<>();
+        String listContent = "";
+
+        for (int i = 0; i < tasks.size(); i++) {
+            if (tasks.getTask(i).description.contains(findText.getText())) {
+                result.add(tasks.getTask(i));
+            }
+        }
+        if (result.size() == 0) {
+            listLabel.setText("There are no matching task in your list!\nPress load to go back!");
+        } else {
+            for (int i = 0; i < result.size(); i++) {
+                listContent += (i + 1) + ". " + result.get(i).toString() + "\n";
+            }
+            listLabel.setText("Here are the matching tasks in your list:\n" + listContent + "Press load to go back!");
+        }
+    }
+}

src/main/java/duke/Deadline.java

@@ -1,4 +1,4 @@
-package main.java.duke;
+package duke;
 
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;

src/main/java/duke/Duke.java

@@ -1,10 +1,9 @@
-package main.java.duke;
+package duke;
 
-import java.io.IOException;
-import java.util.Scanner;
 import javafx.application.Application;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
 import javafx.scene.Scene;
-import javafx.scene.control.Label;
 import javafx.stage.Stage;
 
 /**
@@ -13,48 +12,49 @@
  * When run, parses input into parser class which utilizes ui class to give an output
  * After each command it saves to the storage text file
  */
-public class Duke {
-
-    private final Storage storage;
-    private final Ui ui;
-    private TaskList tasks;
-
-    public Duke(String filePath) {
-        ui = new Ui();
-        storage = new Storage(filePath);
-        try {
-            tasks = new TaskList(storage.load());
-        } catch (DukeException e) {
-            ui.showLoadingError();
-            tasks = new TaskList();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
+public class Duke extends Application{
 
-    public static void main(String[] args) throws IOException {
-        new Duke("C:\\Users\\65906\\IdeaProjects\\ip\\duke.txt").run();
-    }
 
-    /**
-     * Starts the duke bot
-     *
-     * @throws IOException
-     */
-    private void run() throws IOException {
-        ui.showWelcome();
-        Parser duke = new Parser(this.tasks);
-        Scanner sc = new Scanner(System.in);
-        while (sc.hasNextLine()) {
-            ui.showLine();
-            String str = sc.nextLine();
-            duke.parse(str);
-            ui.showLine();
-            storage.save(tasks);
-        }
 
+    public Duke() {}
 
-    }
 
 
+//    public static void startDuke() throws IOException {
+//        new Duke().run();
+//
+//    }
+//
+//    /**
+//     * Starts the duke bot
+//     *
+//     * @throws IOException
+//     */
+//    private void run() throws IOException {
+//        ui.showWelcome();
+//        Parser duke = new Parser(this.tasks);
+//        Scanner sc = new Scanner(System.in);
+//        while (sc.hasNextLine()) {
+//            ui.showLine();
+//            String str = sc.nextLine();
+//            duke.parse(str);
+//            ui.showLine();
+//            storage.save(tasks);
+//        }
+//
+//
+//    }
+
+
+
+    @Override
+    public void start(Stage stage) throws Exception {
+
+        Parent root = FXMLLoader.load(Duke.class.getResource("/duke.fxml"));
+        Scene scene = new Scene(root); // Setting the scene to be our Label
+
+        stage.setTitle("Duke Bot");
+        stage.setScene(scene); // Setting the stage to show our screen
+        stage.show(); // Render the stage.
+    }
 }

src/main/java/duke/DukeException.java

@@ -1,4 +1,4 @@
-package main.java.duke;
+package duke;
 
 public class DukeException extends Exception {
     private final String description;

src/main/java/duke/DukeTest.java

@@ -1,4 +1,4 @@
-package main.java.duke;
+package duke;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;

src/main/java/duke/Event.java

@@ -1,4 +1,4 @@
-package main.java.duke;
+package duke;
 
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;

src/main/java/duke/Launcher.java

@@ -0,0 +1,9 @@
+package duke;
+
+import javafx.application.Application;
+
+public class Launcher {
+    public static void main(String[] args) {
+        Application.launch(Duke.class, args);
+    }
+}

src/main/java/duke/Parser.java

@@ -1,4 +1,4 @@
-package main.java.duke;
+package duke;
 
 /**
  * Class which converts user command to functions
@@ -11,6 +11,7 @@ public Parser(TaskList taskList) {
         this.taskList = taskList;
     }
 
+
     /**
      * Takes in the user input and run functions that are associated with the input
      *
@@ -57,4 +58,6 @@ public void parse(String input) {
     }
 
 
+
+
 }

src/main/java/duke/Storage.java

@@ -1,4 +1,4 @@
-package main.java.duke;
+package duke;
 
 import java.io.File;
 import java.io.FileWriter;

src/main/java/duke/Task.java

@@ -1,4 +1,4 @@
-package main.java.duke;
+package duke;
 
 /**
  * Task class used by the duke class

src/main/java/duke/TaskList.java

@@ -1,4 +1,4 @@
-package main.java.duke;
+package duke;
 
 import java.util.ArrayList;
 

src/main/java/duke/Todo.java

@@ -1,4 +1,4 @@
-package main.java.duke;
+package duke;
 
 /**
  * class that extends task

src/main/java/duke/Ui.java

@@ -1,4 +1,4 @@
-package main.java.duke;
+package duke;
 
 /**
  * Class which stores basic output of the bot

src/main/resources/duke.fxml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.DatePicker?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.shape.Rectangle?>
+
+<AnchorPane prefHeight="518.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/16" xmlns:fx="http://javafx.com/fxml/1" fx:controller="duke.Controller">
+   <children>
+      <Rectangle arcHeight="5.0" arcWidth="5.0" fill="#c8cacd" height="149.0" layoutX="2.0" layoutY="118.0" stroke="BLACK" strokeType="INSIDE" width="291.0" />
+      <Rectangle arcHeight="5.0" arcWidth="5.0" fill="#c8cacd" height="112.0" layoutX="2.0" layoutY="267.0" stroke="BLACK" strokeType="INSIDE" width="291.0" />
+      <Button layoutX="214.0" layoutY="298.0" mnemonicParsing="false" onAction="#delete" text="Delete" />
+      <Button layoutX="234.0" layoutY="209.0" mnemonicParsing="false" onAction="#add" text="Add" />
+      <Label fx:id="listLabel" alignment="TOP_CENTER" layoutX="293.0" layoutY="8.0" prefHeight="485.0" prefWidth="329.0" text="Press Load" />
+      <Button layoutX="300.0" layoutY="14.0" mnemonicParsing="false" onAction="#load" text="Load" />
+      <TextField fx:id="deleteText" layoutX="24.0" layoutY="295.0" />
+      <Label fx:id="deleteError" layoutX="23.0" layoutY="335.0" prefHeight="26.0" prefWidth="243.0" />
+      <TextField fx:id="taskType" layoutX="24.0" layoutY="148.0" />
+      <Label layoutX="24.0" layoutY="131.0" prefHeight="17.0" prefWidth="110.0" text="Add a Task" />
+      <Label layoutX="205.0" layoutY="152.0" prefHeight="17.0" prefWidth="85.0" text="Type (T,D,E)" />
+      <Label layoutX="203.0" layoutY="184.0" prefHeight="17.0" prefWidth="73.0" text="Description" />
+      <TextField fx:id="taskDescription" layoutX="24.0" layoutY="180.0" />
+      <DatePicker fx:id="taskDate" layoutX="23.0" layoutY="209.0" />
+      <Label layoutX="205.0" layoutY="213.0" prefHeight="17.0" prefWidth="42.0" text="Date" />
+      <Label fx:id="addTaskError" layoutX="23.0" layoutY="234.0" prefHeight="26.0" prefWidth="243.0" />
+      <Rectangle arcHeight="5.0" arcWidth="5.0" fill="#c8cacd" height="112.0" layoutX="2.0" layoutY="379.0" stroke="BLACK" strokeType="INSIDE" width="291.0" />
+      <Rectangle arcHeight="5.0" arcWidth="5.0" fill="#c8cacd" height="112.0" layoutX="2.0" layoutY="9.0" stroke="BLACK" strokeType="INSIDE" width="291.0" />
+      <Label layoutX="24.0" layoutY="278.0" prefHeight="17.0" prefWidth="110.0" text="Delete a Task" />
+      <Label layoutX="23.0" layoutY="18.0" prefHeight="17.0" prefWidth="162.0" text="Completed a Task" />
+      <Button layoutX="214.0" layoutY="53.0" mnemonicParsing="false" onAction="#done" text="Complete" />
+      <TextField fx:id="doneText" layoutX="24.0" layoutY="53.0" />
+      <Label fx:id="doneError" layoutX="24.0" layoutY="87.0" prefHeight="17.0" prefWidth="243.0" />
+      <Label layoutX="24.0" layoutY="388.0" prefHeight="17.0" prefWidth="149.0" text="Find a Task" />
+      <TextField fx:id="findText" layoutX="24.0" layoutY="410.0" />
+      <Button layoutX="214.0" layoutY="410.0" mnemonicParsing="false" onAction="#find" text="Find" />
+   </children>
+</AnchorPane>