Merge pull request nus-cs2113-AY2324S1#4 from AY2324S1-CS2113-F11-3/master

Update

Author: Cheezeblokz

README.md

@@ -62,3 +62,4 @@ 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.
+

build.gradle

@@ -41,7 +41,7 @@ checkstyle {
     toolVersion = '10.2'
 }
 
-run{
+run {
     standardInput = System.in
     enableAssertions = true
 }

data/events/event.txt

@@ -0,0 +1,2 @@
+submit v1.0 | 2023-10-29T23:59:59 | 2023-10-30T23:59:59 
+eat dinner | 2023-12-20T19:00 | 2023-12-20T20:00 

data/flashcards/flashcard.txt

@@ -0,0 +1,8 @@
+d | a | - | - | -
+dfdf | dfdf | - | - | -
+dfdf | asdfdf | - | - | -
+ddf | dfdf | - | - | -
+hello | bye | - | - | -
+hello | bye | - | - | -
+end program | hello | - | - | -
+hello | world | - | - | -

src/main/java/seedu/duke/Duke.java

@@ -2,9 +2,8 @@
 
 package seedu.duke;
 
-import seedu.duke.flashcard.Flashcard;
+import seedu.duke.calendar.CalendarManager;
 import seedu.duke.flashcard.FlashcardComponent;
-import seedu.duke.flashcard.FlashcardDirectory;
 
 import java.util.ArrayList;
 import java.util.Scanner;
@@ -17,7 +16,8 @@ public static void main(String[] args) {
     }
 
     private void run() {
-        FlashcardComponent fc = new FlashcardComponent(new ArrayList<Flashcard>());
+        FlashcardComponent fc = new FlashcardComponent();
+        CalendarManager cm = new CalendarManager(new ArrayList<>());
 
         Scanner scanner = new Scanner(System.in);
         String input;
@@ -28,8 +28,13 @@ private void run() {
 
             if (fc.isResponsible(input)) {
                 fc.processInput(input);
+
+            } else if (cm.isResponsible(input)) {
+                cm.processInput(input);
+            } else {
+                System.out.println("    Invalid command! Please try again.");
             }
         }
 
     }
-}
+}

src/main/java/seedu/duke/calendar/Calendar.java

@@ -1,5 +1,7 @@
+//@@ kherlenbayasgalan & jingxizhu
+
 package seedu.duke.calendar;
 
 public class Calendar {
-    EventStorage eventStorage;
+    EventList eventList;
 }

src/main/java/seedu/duke/calendar/CalendarCommandParser.java

@@ -1,3 +1,5 @@
+//@@ kherlenbayasgalan & jingxizhu
+
 package seedu.duke.calendar;
 
 import seedu.duke.calendar.command.AddEventCommand;

src/main/java/seedu/duke/calendar/CalendarManager.java

@@ -1,18 +1,72 @@
+//@@ kherlenbayasgalan & jingxizhu
+
 package seedu.duke.calendar;
 
+import seedu.duke.calendar.command.EventCommand;
+import seedu.duke.calendar.command.UnknownCommand;
+import seedu.duke.calendar.Event;
+import seedu.duke.flashcard.FlashcardStorage;
+
+import java.io.FileNotFoundException;
+import java.util.ArrayList;
+import java.util.Scanner;
+
 public class CalendarManager {
     Calendar calendar;
     CalendarUi calendarUi;
+    EventList eventList;
     CalendarCommandParser calendarCommandParser;
+    Scanner scanner;
+
+    private EventStorage storage;
+
+    public CalendarManager(ArrayList<Event> events) {
+
+        EventDirectory eventdirectory = new EventDirectory();
+        eventdirectory.listEventFiles();
+
+        storage = new EventStorage("./data/events/event.txt");
+
+        try{
+            eventList = storage.loadEvents();
+        } catch (FileNotFoundException e){
+            System.out.println("Making new file for Events");
+            eventList = new EventList(events);
+        }
 
-    public CalendarManager() {
         calendar = new Calendar();
-        calendarUi = new CalendarUi();
+        calendarUi = new CalendarUi(eventList);
         calendarCommandParser = new CalendarCommandParser();
+        scanner = new Scanner(System.in);
+
     }
 
-    public void start() {
+    public EventStorage getStorage(){
+        return this.storage;
+    }
+
+    public boolean validCommand(String input) {
+        EventCommand command = calendarCommandParser.parseInput(input);
+
+        return !(command instanceof UnknownCommand);
+    }
+
+    public boolean isResponsible(String input) {
+        return validCommand(input);
+    }
+
+    public void processInput(String input) {
+        startCalendar(input);
+
+        storage.saveEvents(eventList.getEvent());
+    }
 
+    public void startCalendar(String input) {
+        EventCommand command = calendarCommandParser.parseInput(input);
+        assert !(command instanceof seedu.duke.calendar.command.UnknownCommand) :
+                "Command cannot be " + "unknown";
+        calendarUi.executeCommand(command);
+        //calendarCommandParser.parseInput(command);
     }
 
 }

src/main/java/seedu/duke/calendar/CalendarUi.java

@@ -1,4 +1,19 @@
 package seedu.duke.calendar;
 
+import seedu.duke.calendar.command.EventCommand;
+
+import java.util.Scanner;
+
 public class CalendarUi {
+    private Scanner scanner;
+    private EventList eventList;
+
+    public CalendarUi (EventList eventList) {
+        scanner = new Scanner(System.in);
+        this.eventList = eventList;
+    }
+
+    public void executeCommand(EventCommand command) {
+        command.execute(scanner, eventList);
+    }
 }

src/main/java/seedu/duke/calendar/Event.java

@@ -1,13 +1,15 @@
+//@@author @@kherlenbayasgalan & @@ Jingxizhu
+
 package seedu.duke.calendar;
 
-import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 public class Event {
-    String name;
-    LocalDate from;
-    LocalDate to;
+    private String name;
+    private LocalDateTime from;
+    private LocalDateTime to;
 
-    public Event(String name, LocalDate from, LocalDate to) {
+    public Event(String name, LocalDateTime from, LocalDateTime to) {
         this.name = name;
         this.from = from;
         this.to = to;
@@ -21,19 +23,19 @@ public void setName(String name) {
         this.name = name;
     }
 
-    public LocalDate getFrom() {
+    public LocalDateTime getFrom() {
         return from;
     }
 
-    public void setFrom(LocalDate from) {
+    public void setFrom(LocalDateTime from) {
         this.from = from;
     }
 
-    public LocalDate getTo() {
+    public LocalDateTime getTo() {
         return to;
     }
 
-    public void setTo(LocalDate to) {
+    public void setTo(LocalDateTime to) {
         this.to = to;
     }