From 19c76c0cb8a88d111512d3c30af37ed844e24ed8 Mon Sep 17 00:00:00 2001
From: Nicholas Jimmy Alden <89759682+Nixx162@users.noreply.github.com>
Date: Fri, 3 Nov 2023 00:56:52 +0800
Subject: [PATCH 01/12] style: merged some columns of the list

---
 .../java/seedu/address/ui/ContactCard.java    | 56 +++++++++++++++++++
 .../seedu/address/ui/PersonListPanel.java     | 33 ++++-------
 src/main/resources/view/ContactCard.fxml      | 37 ++++++++++++
 src/main/resources/view/PersonListPanel.fxml  |  6 +-
 4 files changed, 104 insertions(+), 28 deletions(-)
 create mode 100644 src/main/java/seedu/address/ui/ContactCard.java
 create mode 100644 src/main/resources/view/ContactCard.fxml

diff --git a/src/main/java/seedu/address/ui/ContactCard.java b/src/main/java/seedu/address/ui/ContactCard.java
new file mode 100644
index 00000000000..2e290965e17
--- /dev/null
+++ b/src/main/java/seedu/address/ui/ContactCard.java
@@ -0,0 +1,56 @@
+package seedu.address.ui;
+
+import java.util.Comparator;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.Label;
+import javafx.scene.layout.FlowPane;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Region;
+import seedu.address.model.person.Person;
+
+/**
+ * An UI component that displays information of a {@code Person}.
+ */
+public class ContactCard extends UiPart<Region> {
+
+    private static final String FXML = "ContactCard.fxml";
+
+    /**
+     * Note: Certain keywords such as "location" and "resources" are reserved keywords in JavaFX.
+     * As a consequence, UI elements' variable names cannot be set to such keywords
+     * or an exception will be thrown by JavaFX during runtime.
+     *
+     * @see <a href="https://github.com/se-edu/addressbook-level4/issues/336">The issue on AddressBook level 4</a>
+     */
+
+    public final Person person;
+
+    @FXML
+    private HBox cardPane;
+    @FXML
+    private Label name;
+    @FXML
+    private Label email;
+    @FXML
+    private Label mobile;
+    @FXML
+    private Label address;
+    @FXML
+    private FlowPane tags;
+
+    /**
+     * Creates a {@code PersonCode} with the given {@code Person} and index to display.
+     */
+    public ContactCard(Person person) {
+        super(FXML);
+        this.person = person;
+        name.setText(person.getName().fullName);
+        mobile.setText("Phone: " + person.getPhone().value);
+        address.setText(person.getAddress().value);
+        email.setText(person.getEmail().value);
+        person.getTags().stream()
+                .forEach(tag -> tags.getChildren().add(new Label(tag.tagName)));
+
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/seedu/address/ui/PersonListPanel.java b/src/main/java/seedu/address/ui/PersonListPanel.java
index 1dd4bee05c4..54b193bccdb 100644
--- a/src/main/java/seedu/address/ui/PersonListPanel.java
+++ b/src/main/java/seedu/address/ui/PersonListPanel.java
@@ -28,11 +28,7 @@ public class PersonListPanel extends UiPart<Region> {
 
     @FXML private TableView<Person> table;
     @FXML private TableColumn<Person, Void> indexCol;
-    @FXML private TableColumn<Person, String> nameCol;
-    @FXML private TableColumn<Person, String> emailCol;
-    @FXML private TableColumn<Person, String> phoneCol;
-    @FXML private TableColumn<Person, String> addressCol;
-    @FXML private TableColumn<Person, Void> tagsCol;
+    @FXML private TableColumn<Person, Void> contactCol;
     @FXML private TableColumn<Person, Void> notesCol;
     @FXML private TableColumn<Person, Void> eventsCol;
 
@@ -46,24 +42,23 @@ public PersonListPanel(ObservableList<Person> personList) {
         indexCol.setCellFactory(col -> new TableIndexCell());
         indexCol.setPrefWidth(50);
 
-        nameCol.setCellValueFactory(data -> new SimpleStringProperty(data.getValue().getName().fullName));
-        emailCol.setCellValueFactory(data -> new SimpleStringProperty(data.getValue().getEmail().value));
+        contactCol.setCellFactory(col -> new TableContactsCell(personList));
 
-        phoneCol.setCellValueFactory(data -> new SimpleStringProperty(data.getValue().getPhone().value));
-        phoneCol.setPrefWidth(100);
-
-        addressCol.setCellValueFactory(data -> new SimpleStringProperty(data.getValue().getAddress().value));
-        tagsCol.setCellFactory(col -> new TableTagsCell(personList));
         notesCol.setCellFactory(col -> new TableNotesCell(personList));
+        notesCol.minWidthProperty().bind(
+            table.widthProperty().multiply(0.5));
+
         eventsCol.setCellFactory(col -> new TableEventsCell(personList));
+        eventsCol.minWidthProperty().bind(
+            table.widthProperty().multiply(0.3));
 
         table.setItems(personList);
     }
 
-    class TableTagsCell extends TableCell<Person, Void> {
+    class TableContactsCell extends TableCell<Person, Void> {
         private ObservableList<Person> personList;
 
-        public TableTagsCell(ObservableList<Person> personList) {
+        public TableContactsCell(ObservableList<Person> personList) {
             this.personList = personList;
         }
 
@@ -73,13 +68,7 @@ public void updateIndex(int index) {
             if (isEmpty() || index < 0) {
                 setGraphic(null);
             } else {
-                FlowPane tagFlowPane = new FlowPane();
-                tagFlowPane.setVgap(8);
-                tagFlowPane.setHgap(10);
-                tagFlowPane.setPrefWrapLength(200);
-                personList.get(index).getTags().stream()
-                    .forEach(tag -> tagFlowPane.getChildren().add(new Label(tag.tagName)));
-                setGraphic(tagFlowPane);
+                setGraphic(new ContactCard(personList.get(index)).getRoot());
             }
         }
     }
@@ -101,7 +90,6 @@ public void updateIndex(int index) {
                 notes.setItems(personList.get(index).getNotes());
                 notes.setCellFactory(cell -> new NoteCell());
                 notes.setPrefHeight(120);
-                notes.setPrefWidth(300);
                 setGraphic(notes);
             }
         }
@@ -168,5 +156,4 @@ protected void updateItem(Event event, boolean empty) {
             }
         }
     }
-
 }
diff --git a/src/main/resources/view/ContactCard.fxml b/src/main/resources/view/ContactCard.fxml
new file mode 100644
index 00000000000..165e2fd4f46
--- /dev/null
+++ b/src/main/resources/view/ContactCard.fxml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.FlowPane?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Region?>
+<?import javafx.scene.layout.VBox?>
+
+<HBox fx:id="cardPane" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1">
+    <GridPane HBox.hgrow="ALWAYS">
+        <columnConstraints>
+            <ColumnConstraints hgrow="SOMETIMES" minWidth="10" prefWidth="500" />
+        </columnConstraints>
+        <VBox alignment="CENTER_LEFT" minHeight="105" GridPane.columnIndex="0">
+            <padding>
+                <Insets top="5" right="5" bottom="5" left="15" />
+            </padding>
+            <HBox spacing="5" alignment="CENTER_LEFT">
+                <Label fx:id="id" styleClass="cell_big_label">
+                    <minWidth>
+                        <!-- Ensures that the label text is never truncated -->
+                        <Region fx:constant="USE_PREF_SIZE" />
+                    </minWidth>
+                </Label>
+                <Label fx:id="name" text="\$first" styleClass="cell_big_label" />
+            </HBox>
+            <FlowPane fx:id="tags"/>
+            <Label fx:id="email" styleClass="cell_small_label"/>
+            <Label fx:id="mobile" styleClass="cell_small_label" />
+            <Label fx:id="address" styleClass="cell_small_label"/>
+
+        </VBox>
+    </GridPane>
+</HBox>
\ No newline at end of file
diff --git a/src/main/resources/view/PersonListPanel.fxml b/src/main/resources/view/PersonListPanel.fxml
index 89cbf96db77..6048e5af365 100644
--- a/src/main/resources/view/PersonListPanel.fxml
+++ b/src/main/resources/view/PersonListPanel.fxml
@@ -8,11 +8,7 @@
   <TableView fx:id="table" VBox.vgrow="ALWAYS">
     <columns>
       <TableColumn fx:id="indexCol" text="ID"/>
-      <TableColumn fx:id="nameCol" text="Name"/>
-      <TableColumn fx:id="emailCol" text="Email"/>
-      <TableColumn fx:id="phoneCol" text="Mobile"/>
-      <TableColumn fx:id="addressCol" text="Address"/>
-      <TableColumn fx:id="tagsCol" text="Tags"/>
+      <TableColumn fx:id="contactCol" text="Contact"/>
       <TableColumn fx:id="notesCol" text="Notes"/>
       <TableColumn fx:id="eventsCol" text="Events"/>
     </columns>

From f5fbb1e7935df43d66a982c75a5348efceec5643 Mon Sep 17 00:00:00 2001
From: Nicholas Jimmy Alden <89759682+Nixx162@users.noreply.github.com>
Date: Fri, 3 Nov 2023 00:57:22 +0800
Subject: [PATCH 02/12] style: adjust UI look

---
 src/main/resources/view/DarkTheme.css   |  4 ++--
 src/main/resources/view/MainWindow.fxml | 20 +++++++++-----------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/main/resources/view/DarkTheme.css b/src/main/resources/view/DarkTheme.css
index 4697b3b1def..07ed3d2c90d 100644
--- a/src/main/resources/view/DarkTheme.css
+++ b/src/main/resources/view/DarkTheme.css
@@ -123,13 +123,13 @@
 .cell_big_label {
     -fx-font-family: "Segoe UI Semibold";
     -fx-font-size: 16px;
-    -fx-text-fill: #010504;
+    -fx-text-fill: #ffffff;
 }
 
 .cell_small_label {
     -fx-font-family: "Segoe UI";
     -fx-font-size: 13px;
-    -fx-text-fill: #010504;
+    -fx-text-fill: #ffffff;
 }
 
 .stack-pane {
diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml
index 7778f666a0a..dd4452fc8f4 100644
--- a/src/main/resources/view/MainWindow.fxml
+++ b/src/main/resources/view/MainWindow.fxml
@@ -6,13 +6,12 @@
 <?import javafx.scene.control.Menu?>
 <?import javafx.scene.control.MenuBar?>
 <?import javafx.scene.control.MenuItem?>
-<?import javafx.scene.control.SplitPane?>
 <?import javafx.scene.image.Image?>
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
+<?import javafx.stage.Stage?>
 
-<fx:root type="javafx.stage.Stage" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1"
-         title="Address App" minWidth="450" minHeight="600" onCloseRequest="#handleExit">
+<fx:root minHeight="600" minWidth="450" onCloseRequest="#handleExit" title="Address App" type="javafx.stage.Stage" xmlns="http://javafx.com/javafx/20.0.1" xmlns:fx="http://javafx.com/fxml/1">
   <icons>
     <Image url="@/images/address_book_32.png" />
   </icons>
@@ -33,24 +32,23 @@
           </Menu>
         </MenuBar>
 
-        <StackPane VBox.vgrow="NEVER" fx:id="commandBoxPlaceholder" styleClass="pane-with-border">
+        <StackPane fx:id="commandBoxPlaceholder" prefHeight="35.0" prefWidth="340.0" styleClass="pane-with-border" VBox.vgrow="NEVER">
           <padding>
-            <Insets top="5" right="10" bottom="5" left="10" />
+            <Insets bottom="5" left="10" right="10" top="5" />
           </padding>
         </StackPane>
 
-        <StackPane VBox.vgrow="NEVER" fx:id="resultDisplayPlaceholder" styleClass="pane-with-border"
-                   minHeight="100" prefHeight="100" maxHeight="100">
+        <StackPane fx:id="resultDisplayPlaceholder" maxHeight="100" minHeight="200" prefHeight="100" styleClass="pane-with-border" VBox.vgrow="NEVER">
           <padding>
-            <Insets top="5" right="10" bottom="5" left="10" />
+            <Insets bottom="5" left="10" right="10" top="5" />
           </padding>
         </StackPane>
 
-        <VBox fx:id="personList" styleClass="pane-with-border" minWidth="340" prefWidth="340" VBox.vgrow="ALWAYS">
+        <VBox fx:id="personList" minWidth="340" prefWidth="340" styleClass="pane-with-border" VBox.vgrow="ALWAYS">
           <padding>
-            <Insets top="10" right="10" bottom="10" left="10" />
+            <Insets bottom="10" left="10" right="10" top="10" />
           </padding>
-          <StackPane fx:id="personListPanelPlaceholder" VBox.vgrow="ALWAYS"/>
+          <StackPane fx:id="personListPanelPlaceholder" VBox.vgrow="ALWAYS" />
         </VBox>
 
         <StackPane fx:id="statusbarPlaceholder" VBox.vgrow="NEVER" />

From cf558eaf937721f3358aeb262c44435e9cb292c2 Mon Sep 17 00:00:00 2001
From: Nicholas Jimmy Alden <89759682+Nixx162@users.noreply.github.com>
Date: Fri, 3 Nov 2023 00:57:38 +0800
Subject: [PATCH 03/12] style: make result display bar larger

---
 src/main/resources/view/ResultDisplay.fxml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/view/ResultDisplay.fxml b/src/main/resources/view/ResultDisplay.fxml
index 01b691792a9..562e5a32459 100644
--- a/src/main/resources/view/ResultDisplay.fxml
+++ b/src/main/resources/view/ResultDisplay.fxml
@@ -5,5 +5,5 @@
 
 <StackPane fx:id="placeHolder" styleClass="pane-with-border" xmlns="http://javafx.com/javafx/17"
     xmlns:fx="http://javafx.com/fxml/1">
-  <TextArea fx:id="resultDisplay" editable="false" styleClass="result-display"/>
+  <TextArea fx:id="resultDisplay" editable="false" styleClass="result-display" prefHeight="500" />
 </StackPane>

From 54f81bf0179eee0c015b483be95b9865d4f57168 Mon Sep 17 00:00:00 2001
From: Nicholas Jimmy Alden <89759682+Nixx162@users.noreply.github.com>
Date: Fri, 3 Nov 2023 01:02:52 +0800
Subject: [PATCH 04/12] chore: fix checkstyle errors

---
 src/main/java/seedu/address/ui/ContactCard.java     | 4 +---
 src/main/java/seedu/address/ui/PersonListPanel.java | 3 ---
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/main/java/seedu/address/ui/ContactCard.java b/src/main/java/seedu/address/ui/ContactCard.java
index 2e290965e17..368c9aebde8 100644
--- a/src/main/java/seedu/address/ui/ContactCard.java
+++ b/src/main/java/seedu/address/ui/ContactCard.java
@@ -1,7 +1,5 @@
 package seedu.address.ui;
 
-import java.util.Comparator;
-
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
 import javafx.scene.layout.FlowPane;
@@ -53,4 +51,4 @@ public ContactCard(Person person) {
                 .forEach(tag -> tags.getChildren().add(new Label(tag.tagName)));
 
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/seedu/address/ui/PersonListPanel.java b/src/main/java/seedu/address/ui/PersonListPanel.java
index 54b193bccdb..18c0c587361 100644
--- a/src/main/java/seedu/address/ui/PersonListPanel.java
+++ b/src/main/java/seedu/address/ui/PersonListPanel.java
@@ -2,16 +2,13 @@
 
 import java.util.logging.Logger;
 
-import javafx.beans.property.SimpleStringProperty;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
-import javafx.scene.control.Label;
 import javafx.scene.control.ListCell;
 import javafx.scene.control.ListView;
 import javafx.scene.control.TableCell;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
-import javafx.scene.layout.FlowPane;
 import javafx.scene.layout.Region;
 import javafx.scene.paint.Color;
 import seedu.address.commons.core.LogsCenter;

From c671afd9ff5fe4cbee17956849edb419074a626a Mon Sep 17 00:00:00 2001
From: Nicholas Jimmy Alden <89759682+Nixx162@users.noreply.github.com>
Date: Fri, 3 Nov 2023 02:18:57 +0800
Subject: [PATCH 05/12] chore: adjust constructor to include new boolean

---
 .../address/logic/commands/CommandResult.java     | 15 ++++++++++++---
 .../seedu/address/logic/commands/ExitCommand.java |  2 +-
 .../address/logic/commands/ListEventCommand.java  |  2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/main/java/seedu/address/logic/commands/CommandResult.java b/src/main/java/seedu/address/logic/commands/CommandResult.java
index 167be8a8ab0..17ef07f9415 100644
--- a/src/main/java/seedu/address/logic/commands/CommandResult.java
+++ b/src/main/java/seedu/address/logic/commands/CommandResult.java
@@ -16,12 +16,15 @@ public class CommandResult {
     /** The application should exit. */
     private final boolean exit;
 
+    private final boolean listEvent;
+
     /**
      * Constructs a {@code CommandResult} with the specified fields.
      */
-    public CommandResult(String feedbackToUser, boolean exit) {
+    public CommandResult(String feedbackToUser, boolean exit, boolean listEvent) {
         this.feedbackToUser = requireNonNull(feedbackToUser);
         this.exit = exit;
+        this.listEvent = listEvent;
     }
 
     /**
@@ -29,7 +32,7 @@ public CommandResult(String feedbackToUser, boolean exit) {
      * and other fields set to their default value.
      */
     public CommandResult(String feedbackToUser) {
-        this(feedbackToUser, false);
+        this(feedbackToUser, false, false);
     }
 
     public String getFeedbackToUser() {
@@ -40,6 +43,10 @@ public boolean isExit() {
         return exit;
     }
 
+    public boolean isListEvent() {
+        return listEvent;
+    }
+
     @Override
     public boolean equals(Object other) {
         if (other == this) {
@@ -53,7 +60,8 @@ public boolean equals(Object other) {
 
         CommandResult otherCommandResult = (CommandResult) other;
         return feedbackToUser.equals(otherCommandResult.feedbackToUser)
-                && exit == otherCommandResult.exit;
+                && exit == otherCommandResult.exit
+                && listEvent == otherCommandResult.listEvent;
     }
 
     @Override
@@ -66,6 +74,7 @@ public String toString() {
         return new ToStringBuilder(this)
                 .add("feedbackToUser", feedbackToUser)
                 .add("exit", exit)
+                .add("listEvent", listEvent)
                 .toString();
     }
 
diff --git a/src/main/java/seedu/address/logic/commands/ExitCommand.java b/src/main/java/seedu/address/logic/commands/ExitCommand.java
index e950db1c71e..f31708f810b 100644
--- a/src/main/java/seedu/address/logic/commands/ExitCommand.java
+++ b/src/main/java/seedu/address/logic/commands/ExitCommand.java
@@ -13,7 +13,7 @@ public class ExitCommand extends Command {
 
     @Override
     public CommandResult execute(Model model) {
-        return new CommandResult(MESSAGE_EXIT_ACKNOWLEDGEMENT, true);
+        return new CommandResult(MESSAGE_EXIT_ACKNOWLEDGEMENT, true, false);
     }
 
 }
diff --git a/src/main/java/seedu/address/logic/commands/ListEventCommand.java b/src/main/java/seedu/address/logic/commands/ListEventCommand.java
index 3bb06f08835..d4b21a25ff2 100644
--- a/src/main/java/seedu/address/logic/commands/ListEventCommand.java
+++ b/src/main/java/seedu/address/logic/commands/ListEventCommand.java
@@ -69,6 +69,6 @@ public CommandResult execute(Model model) throws CommandException {
                     : -1) * (sortAscending ? -1 : 1);
         });
         result += StringUtil.eventListToString(eventList);
-        return new CommandResult(result);
+        return new CommandResult(result, false, true);
     }
 }

From 2d6296d7c72f084ab4b61a4326997db37d1c9195 Mon Sep 17 00:00:00 2001
From: Nicholas Jimmy Alden <89759682+Nixx162@users.noreply.github.com>
Date: Fri, 3 Nov 2023 02:19:22 +0800
Subject: [PATCH 06/12] chore: adjust testcases to account for new constructor

---
 .../seedu/address/logic/commands/CommandResultTest.java     | 6 +++---
 .../java/seedu/address/logic/commands/ExitCommandTest.java  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/test/java/seedu/address/logic/commands/CommandResultTest.java b/src/test/java/seedu/address/logic/commands/CommandResultTest.java
index 9c6895a4762..c908f83a167 100644
--- a/src/test/java/seedu/address/logic/commands/CommandResultTest.java
+++ b/src/test/java/seedu/address/logic/commands/CommandResultTest.java
@@ -14,7 +14,7 @@ public void equals() {
 
         // same values -> returns true
         assertTrue(commandResult.equals(new CommandResult("feedback")));
-        assertTrue(commandResult.equals(new CommandResult("feedback", false)));
+        assertTrue(commandResult.equals(new CommandResult("feedback", false, false)));
 
         // same object -> returns true
         assertTrue(commandResult.equals(commandResult));
@@ -29,7 +29,7 @@ public void equals() {
         assertFalse(commandResult.equals(new CommandResult("different")));
 
         // different exit value -> returns false
-        assertFalse(commandResult.equals(new CommandResult("feedback", true)));
+        assertFalse(commandResult.equals(new CommandResult("feedback", true, false)));
     }
 
     @Test
@@ -43,7 +43,7 @@ public void hashcode() {
         assertNotEquals(commandResult.hashCode(), new CommandResult("different").hashCode());
 
         // different exit value -> returns different hashcode
-        assertNotEquals(commandResult.hashCode(), new CommandResult("feedback", true).hashCode());
+        assertNotEquals(commandResult.hashCode(), new CommandResult("feedback", true, false).hashCode());
     }
 
     @Test
diff --git a/src/test/java/seedu/address/logic/commands/ExitCommandTest.java b/src/test/java/seedu/address/logic/commands/ExitCommandTest.java
index 3fbc5eb78f1..3c8888cc451 100644
--- a/src/test/java/seedu/address/logic/commands/ExitCommandTest.java
+++ b/src/test/java/seedu/address/logic/commands/ExitCommandTest.java
@@ -14,7 +14,7 @@ public class ExitCommandTest {
 
     @Test
     public void execute_exit_success() {
-        CommandResult expectedCommandResult = new CommandResult(MESSAGE_EXIT_ACKNOWLEDGEMENT, true);
+        CommandResult expectedCommandResult = new CommandResult(MESSAGE_EXIT_ACKNOWLEDGEMENT, true, false);
         assertCommandSuccess(new ExitCommand(), model, expectedCommandResult, expectedModel);
     }
 }

From d4df98ed813b7d352fdeaca4bdb17f06da192b1e Mon Sep 17 00:00:00 2001
From: Nicholas Jimmy Alden <89759682+Nixx162@users.noreply.github.com>
Date: Fri, 3 Nov 2023 02:19:58 +0800
Subject: [PATCH 07/12] feat: add filtered event list to logic

---
 src/main/java/seedu/address/logic/Logic.java        | 4 ++++
 src/main/java/seedu/address/logic/LogicManager.java | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/src/main/java/seedu/address/logic/Logic.java b/src/main/java/seedu/address/logic/Logic.java
index 92cd8fa605a..51acb7789f7 100644
--- a/src/main/java/seedu/address/logic/Logic.java
+++ b/src/main/java/seedu/address/logic/Logic.java
@@ -8,6 +8,7 @@
 import seedu.address.logic.commands.exceptions.CommandException;
 import seedu.address.logic.parser.exceptions.ParseException;
 import seedu.address.model.ReadOnlyAddressBook;
+import seedu.address.model.event.Event;
 import seedu.address.model.person.Person;
 
 /**
@@ -33,6 +34,9 @@ public interface Logic {
     /** Returns an unmodifiable view of the filtered list of persons */
     ObservableList<Person> getFilteredPersonList();
 
+    /** Returns an unmodifiable view of the filtered list of events */
+    ObservableList<Event> getFilteredEventList();
+
     /**
      * Returns the user prefs' address book file path.
      */
diff --git a/src/main/java/seedu/address/logic/LogicManager.java b/src/main/java/seedu/address/logic/LogicManager.java
index 5aa3b91c7d0..8bc5ce7374a 100644
--- a/src/main/java/seedu/address/logic/LogicManager.java
+++ b/src/main/java/seedu/address/logic/LogicManager.java
@@ -15,6 +15,7 @@
 import seedu.address.logic.parser.exceptions.ParseException;
 import seedu.address.model.Model;
 import seedu.address.model.ReadOnlyAddressBook;
+import seedu.address.model.event.Event;
 import seedu.address.model.person.Person;
 import seedu.address.storage.Storage;
 
@@ -71,6 +72,11 @@ public ObservableList<Person> getFilteredPersonList() {
         return model.getFilteredPersonList();
     }
 
+    @Override
+    public ObservableList<Event> getFilteredEventList() {
+        return model.getFilteredEventList();
+    }
+
     @Override
     public Path getAddressBookFilePath() {
         return model.getAddressBookFilePath();

From 84c0ab60f4dde23faab821b43b8a1217d983099c Mon Sep 17 00:00:00 2001
From: Nicholas Jimmy Alden <89759682+Nixx162@users.noreply.github.com>
Date: Fri, 3 Nov 2023 02:20:24 +0800
Subject: [PATCH 08/12] style: create a new eventlist window

---
 .../seedu/address/ui/EventListWindow.java     | 112 ++++++++++++++++++
 .../java/seedu/address/ui/MainWindow.java     |  21 +++-
 src/main/resources/view/EventListWindow.fxml  |  43 +++++++
 src/main/resources/view/EventWindow.css       |   3 +
 4 files changed, 178 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/seedu/address/ui/EventListWindow.java
 create mode 100644 src/main/resources/view/EventListWindow.fxml
 create mode 100644 src/main/resources/view/EventWindow.css

diff --git a/src/main/java/seedu/address/ui/EventListWindow.java b/src/main/java/seedu/address/ui/EventListWindow.java
new file mode 100644
index 00000000000..02de5aa40b3
--- /dev/null
+++ b/src/main/java/seedu/address/ui/EventListWindow.java
@@ -0,0 +1,112 @@
+package seedu.address.ui;
+
+import java.util.logging.Logger;
+
+import javafx.beans.property.SimpleStringProperty;
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
+import javafx.scene.control.TableCell;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableView;
+import javafx.stage.Stage;
+import seedu.address.commons.core.LogsCenter;
+import seedu.address.model.event.Event;
+
+/**
+ * Controller for a help page
+ */
+public class EventListWindow extends UiPart<Stage> {
+    private static final Logger logger = LogsCenter.getLogger(EventListWindow.class);
+    private static final String FXML = "EventListWindow.fxml";
+
+    @FXML private TableView<Event> table;
+    @FXML private TableColumn<Event, Void> indexCol;
+    @FXML private TableColumn<Event, String> nameCol;
+    @FXML private TableColumn<Event, String> startCol;
+    @FXML private TableColumn<Event, String> endCol;
+    @FXML private TableColumn<Event, String> locCol;
+    @FXML private TableColumn<Event, String> infoCol;
+
+    /**
+     * Creates a new EventListWindow.
+     *
+     * @param root Stage to use as the root of the EventListWindow.
+     */
+    public EventListWindow(Stage root) {
+        super(FXML, root);
+    }
+
+    /**
+     * Creates a new EventListWindow.
+     */
+    public EventListWindow() {
+        this(new Stage());
+    }
+
+    /**
+     * Shows the help window.
+     * @throws IllegalStateException
+     *     <ul>
+     *         <li>
+     *             if this method is called on a thread other than the JavaFX Application Thread.
+     *         </li>
+     *         <li>
+     *             if this method is called during animation or layout processing.
+     *         </li>
+     *         <li>
+     *             if this method is called on the primary stage.
+     *         </li>
+     *         <li>
+     *             if {@code dialogStage} is already showing.
+     *         </li>
+     *     </ul>
+     */
+    public void show(ObservableList<Event> events) {
+        logger.fine("Showing help page about the application.");
+
+        indexCol.setCellFactory(col -> new TableIndexCell());
+        nameCol.setCellValueFactory(data -> new SimpleStringProperty(data.getValue().getName()));
+        startCol.setCellValueFactory(data -> new SimpleStringProperty(data.getValue().getStartString()));
+        endCol.setCellValueFactory(data -> new SimpleStringProperty(data.getValue().getEndString()));
+        locCol.setCellValueFactory(data -> new SimpleStringProperty(data.getValue().getLocationStr()));
+        infoCol.setCellValueFactory(data -> new SimpleStringProperty(data.getValue().getInformationStr()));
+
+        table.setItems(events);
+
+        getRoot().show();
+        getRoot().centerOnScreen();
+    }
+
+    /**
+     * Returns true if the help window is currently being shown.
+     */
+    public boolean isShowing() {
+        return getRoot().isShowing();
+    }
+
+    /**
+     * Hides the help window.
+     */
+    public void hide() {
+        getRoot().hide();
+    }
+
+    /**
+     * Focuses on the help window.
+     */
+    public void focus() {
+        getRoot().requestFocus();
+    }
+
+    class TableIndexCell extends TableCell<Event, Void> {
+        @Override
+        public void updateIndex(int index) {
+            super.updateIndex(index);
+            if (isEmpty() || index < 0) {
+                setText(null);
+            } else {
+                setText(Integer.toString(index + 1));
+            }
+        }
+    }
+}
diff --git a/src/main/java/seedu/address/ui/MainWindow.java b/src/main/java/seedu/address/ui/MainWindow.java
index b7586057d05..1045c525db8 100644
--- a/src/main/java/seedu/address/ui/MainWindow.java
+++ b/src/main/java/seedu/address/ui/MainWindow.java
@@ -36,6 +36,7 @@ public class MainWindow extends UiPart<Stage> {
     private PersonListPanel personListPanel;
     private ResultDisplay resultDisplay;
     private HelpWindow helpWindow;
+    private EventListWindow eventListWindow;
 
     @FXML
     private StackPane commandBoxPlaceholder;
@@ -70,6 +71,8 @@ public MainWindow(Stage primaryStage, Logic logic) {
 
         helpWindow = new HelpWindow();
 
+        eventListWindow = new EventListWindow();
+
         iNSTANCE = this;
     }
 
@@ -140,6 +143,18 @@ private void setWindowDefaultSize(GuiSettings guiSettings) {
         }
     }
 
+    /**
+     * Opens the event list window or focuses on it if it's already opened.
+     */
+    @FXML
+    public void handleEventList() {
+        if (!eventListWindow.isShowing()) {
+            eventListWindow.show(logic.getFilteredEventList());
+        } else {
+            eventListWindow.focus();
+        }
+    }
+
     /**
      * Opens the help window or focuses on it if it's already opened.
      */
@@ -148,7 +163,7 @@ public void handleHelp() {
         if (!helpWindow.isShowing()) {
             helpWindow.show();
         } else {
-            helpWindow.focus();
+            eventListWindow.focus();
         }
     }
 
@@ -183,6 +198,10 @@ private CommandResult executeCommand(String commandText) throws CommandException
             logger.info("Result: " + commandResult.getFeedbackToUser());
             resultDisplay.setFeedbackToUser(commandResult.getFeedbackToUser());
 
+            if (commandResult.isListEvent()) {
+                handleEventList();
+            }
+
             if (commandResult.isExit()) {
                 handleExit();
             }
diff --git a/src/main/resources/view/EventListWindow.fxml b/src/main/resources/view/EventListWindow.fxml
new file mode 100644
index 00000000000..f492c933df1
--- /dev/null
+++ b/src/main/resources/view/EventListWindow.fxml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.net.URL?>
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.Scene?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TableView?>
+<?import javafx.scene.control.TableColumn?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.stage.Stage?>
+
+<fx:root resizable="true" title="Event List" type="javafx.stage.Stage"
+    xmlns="http://javafx.com/javafx/17"
+    xmlns:fx="http://javafx.com/fxml/1">
+    <scene>
+        <Scene>
+            <stylesheets>
+                <URL value="@EventWindow.css" />
+            </stylesheets>
+
+            <HBox alignment="CENTER" fx:id="eventListContainer">
+                <children>
+                    <TableView fx:id="table">
+                        <columns>
+                            <TableColumn fx:id="indexCol" text="ID"/>
+                            <TableColumn fx:id="nameCol" text="Name"/>
+                            <TableColumn fx:id="startCol" text="Start Time"/>
+                            <TableColumn fx:id="endCol" text="End Time"/>
+                            <TableColumn fx:id="locCol" text="Location"/>
+                            <TableColumn fx:id="infoCol" text="Info"/>
+                        </columns>
+                    </TableView>
+                </children>
+                <opaqueInsets>
+                    <Insets bottom="10.0" left="5.0" right="10.0" top="5.0" />
+                </opaqueInsets>
+                <padding>
+                    <Insets bottom="10.0" left="5.0" right="10.0" top="5.0" />
+                </padding>
+            </HBox>
+        </Scene>
+    </scene>
+</fx:root>
diff --git a/src/main/resources/view/EventWindow.css b/src/main/resources/view/EventWindow.css
new file mode 100644
index 00000000000..8e18bad7ea5
--- /dev/null
+++ b/src/main/resources/view/EventWindow.css
@@ -0,0 +1,3 @@
+#helpMessageContainer {
+    -fx-background-color: derive(#1d1d1d, 20%);
+}
\ No newline at end of file

From 42db864c4750819c768f0b957553d05b1d367ddd Mon Sep 17 00:00:00 2001
From: Nicholas Jimmy Alden <89759682+Nixx162@users.noreply.github.com>
Date: Fri, 3 Nov 2023 02:28:37 +0800
Subject: [PATCH 09/12] chore: fix checkstyle

---
 src/main/resources/view/ContactCard.fxml | 2 +-
 src/main/resources/view/EventWindow.css  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/view/ContactCard.fxml b/src/main/resources/view/ContactCard.fxml
index 165e2fd4f46..ad658e4765a 100644
--- a/src/main/resources/view/ContactCard.fxml
+++ b/src/main/resources/view/ContactCard.fxml
@@ -34,4 +34,4 @@
 
         </VBox>
     </GridPane>
-</HBox>
\ No newline at end of file
+</HBox>
diff --git a/src/main/resources/view/EventWindow.css b/src/main/resources/view/EventWindow.css
index 8e18bad7ea5..6ced880dff6 100644
--- a/src/main/resources/view/EventWindow.css
+++ b/src/main/resources/view/EventWindow.css
@@ -1,3 +1,3 @@
 #helpMessageContainer {
     -fx-background-color: derive(#1d1d1d, 20%);
-}
\ No newline at end of file
+}

From 3af6a6991b9da303c55c1c335d70ce0257fe0058 Mon Sep 17 00:00:00 2001
From: Nicholas Jimmy Alden <89759682+Nixx162@users.noreply.github.com>
Date: Fri, 3 Nov 2023 02:33:11 +0800
Subject: [PATCH 10/12] test: fix testcases

---
 .../java/seedu/address/logic/commands/CommandResultTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/seedu/address/logic/commands/CommandResultTest.java b/src/test/java/seedu/address/logic/commands/CommandResultTest.java
index c908f83a167..5dab1f07d60 100644
--- a/src/test/java/seedu/address/logic/commands/CommandResultTest.java
+++ b/src/test/java/seedu/address/logic/commands/CommandResultTest.java
@@ -50,7 +50,7 @@ public void hashcode() {
     public void toStringMethod() {
         CommandResult commandResult = new CommandResult("feedback");
         String expected = CommandResult.class.getCanonicalName() + "{feedbackToUser="
-                + commandResult.getFeedbackToUser() + ", exit=" + commandResult.isExit() + "}";
+                + commandResult.getFeedbackToUser() + ", exit=" + commandResult.isExit() + ", listEvent=" + commandResult.isListEvent() + "}";
         assertEquals(expected, commandResult.toString());
     }
 }

From b999a1d73eb716e4e6f2bee8226690eba5ef6858 Mon Sep 17 00:00:00 2001
From: Nicholas Jimmy Alden <89759682+Nixx162@users.noreply.github.com>
Date: Fri, 3 Nov 2023 02:34:57 +0800
Subject: [PATCH 11/12] chore: fix more checkstyle

---
 .../java/seedu/address/logic/commands/CommandResultTest.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/test/java/seedu/address/logic/commands/CommandResultTest.java b/src/test/java/seedu/address/logic/commands/CommandResultTest.java
index 5dab1f07d60..88fa3721fbc 100644
--- a/src/test/java/seedu/address/logic/commands/CommandResultTest.java
+++ b/src/test/java/seedu/address/logic/commands/CommandResultTest.java
@@ -50,7 +50,8 @@ public void hashcode() {
     public void toStringMethod() {
         CommandResult commandResult = new CommandResult("feedback");
         String expected = CommandResult.class.getCanonicalName() + "{feedbackToUser="
-                + commandResult.getFeedbackToUser() + ", exit=" + commandResult.isExit() + ", listEvent=" + commandResult.isListEvent() + "}";
+                + commandResult.getFeedbackToUser() + ", exit=" + commandResult.isExit() 
+                + ", listEvent=" + commandResult.isListEvent() + "}";
         assertEquals(expected, commandResult.toString());
     }
 }

From 7b1f7467809c0b2e276cf1a6480535fcc5faa3ea Mon Sep 17 00:00:00 2001
From: Nicholas Jimmy Alden <89759682+Nixx162@users.noreply.github.com>
Date: Fri, 3 Nov 2023 02:36:37 +0800
Subject: [PATCH 12/12] chore: fix moreeeeee checkstyle

---
 .../java/seedu/address/logic/commands/CommandResultTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/seedu/address/logic/commands/CommandResultTest.java b/src/test/java/seedu/address/logic/commands/CommandResultTest.java
index 88fa3721fbc..f248e1923d1 100644
--- a/src/test/java/seedu/address/logic/commands/CommandResultTest.java
+++ b/src/test/java/seedu/address/logic/commands/CommandResultTest.java
@@ -50,7 +50,7 @@ public void hashcode() {
     public void toStringMethod() {
         CommandResult commandResult = new CommandResult("feedback");
         String expected = CommandResult.class.getCanonicalName() + "{feedbackToUser="
-                + commandResult.getFeedbackToUser() + ", exit=" + commandResult.isExit() 
+                + commandResult.getFeedbackToUser() + ", exit=" + commandResult.isExit()
                 + ", listEvent=" + commandResult.isListEvent() + "}";
         assertEquals(expected, commandResult.toString());
     }