Merge pull request #75 from swatimahadevan/io-clicklogo

io and click logo
AY2122S1-CS2113T-T09-4 · Oct 13, 2021 · c3a72cd · c3a72cd
2 parents ead1a0f + fec4dd2
commit c3a72cd
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 13 deletions.
diff --git a/journalData/journalEntries.txt b/journalData/journalEntries.txt
@@ -0,0 +1 @@
+Today's stuff|Random Observation
diff --git a/src/main/java/seedu/duke/commands/ListJournalCommand.java b/src/main/java/seedu/duke/commands/ListJournalCommand.java
@@ -23,7 +23,7 @@ public void execute(Ui ui, Storage storage) {
         ArrayList<Note> notes = storage.collectionOfNotes.getNotesArrayList();
         ArrayList<Entry> entries = storage.collectionOfEntries.getEntriesArrayList();
         for (Note note : notes) {
-            System.out.println("The notebook " + note.getNoteName() + " contains: ");
+            System.out.println("The notebook " + note.getNoteName() + " contains:");
             for (Entry entry : entries) {
                 if (entry.getEntryNoteName().equals(note.getNoteName())) {
                     System.out.println(entry.getNameOfJournalEntry());

diff --git a/src/main/java/seedu/duke/constants/Messages.java b/src/main/java/seedu/duke/constants/Messages.java
@@ -2,11 +2,11 @@
 
 public class Messages {
 
-    public static final String LOGO = "\t" + " ____        _\n"
-            + "\t" + "|  _ \\ _   _| | _____\n"
-            + "\t" + "| | | | | | | |/ / _ \\\n"
-            + "\t" + "| |_| | |_| |   <  __/\n"
-            + "\t" + "|____/ \\__,_|_|\\_\\___|\n\n";
+    public static final String LOGO = "\t" + " _____ _  _     _\n"
+            + "\t" + "/  __ \\ |(_)   | |\n"
+            + "\t" + "| /  \\/ |_  ___| | __\n"
+            + "\t" + "| \\__/\\ | | (__|   <\n"
+            + "\t" + "\\_____/_|_|\\___|_|\\_\\\n\n";
 
     public static final String EMPTY_STRING = "";
     public static final String LINE_PREFIX = "\t";
@@ -51,7 +51,7 @@ public class Messages {
     public static final int INDEX_TODO_DATE = 2;
     public static final int TOTAL_SIZE = 32;
     public static final String ADDED_TASK = "Task has been added successfully!";
-    public static final String LIST_TASKS_HEADER = "Here's your task list: ";
+    public static final String LIST_TASKS_HEADER = "Here's your task list:";
     public static final String DISPLAY_LINE = "-------------------------"
             + "----------------------------------------"
             + "-----------------------------------------";

diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT
@@ -19,15 +19,49 @@ creating new file...
 Hey, I didn't find journalEntries.txt in journalData/!
 creating new file...
 	__________________________________________________
-	 ____        _
-	|  _ \ _   _| | _____
-	| | | | | | | |/ / _ \
-	| |_| | |_| |   <  __/
-	|____/ \__,_|_|\_\___|
+	 _____ _  _     _
+	/  __ \ |(_)   | |
+	| /  \/ |_  ___| | __
+	| \__/\ | | (__|   <
+	\_____/_|_|\___|_|\_\
 
 	Hello! I'm Duke
 	What can I do for you?
 	__________________________________________________
+Nice.  I've added Samurai Burger to the list, with 433 calories!
+	__________________________________________________
+Nice.  I've added McFlurry to the list, with 165 calories!
+	__________________________________________________
+1st,You consumed  Samurai Burger , which has a calorie count of : 433!
+2nd,You consumed  McFlurry , which has a calorie count of : 165!
+Wow, that's a lot of food! Finished reading today's list
+You consumed 598 calories in total today!
+	__________________________________________________
+Added cs2113t | softwareengineering | Expected grade: A
+	__________________________________________________
+Added cs1231 | discrete structure
+	__________________________________________________
+Here are the modules in your list:
+1. cs2113t   |   softwareengineering   | Expected grade:   A
+2. cs1231  |  discrete structure  | Expected grade:  N/A
+	__________________________________________________
+I have deleted this module:
+cs1231  |  discrete structure  | Expected grade:  N/A
+	__________________________________________________
+Great you have added the note: Today's stuff
+	__________________________________________________
+Great you have added the entry: Random Observation
+	__________________________________________________
+The notebook Today's stuff contains:
+Random Observation
+	__________________________________________________
+Task has been added successfully!
+	__________________________________________________
+Here's your task list:
+1. sometask (on: 10-10-2021)
+	__________________________________________________
+Task has been deleted!
+	__________________________________________________
 	__________________________________________________
 	Bye. Hope to see you again soon!
 	__________________________________________________
diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt
@@ -1 +1,14 @@
-exit
+food add n/ Samurai Burger c/ 433
+food add n/ McFlurry c/ 165
+food list
+module add c/cs2113t n/softwareengineering e/A
+module add c/cs1231 n/discrete structure
+module list
+module delete 2
+journal notebook n/ Today's stuff
+journal entry n/ Today's stuff e/ Random Observation
+journal list
+calendar todo n/ sometask d/ 10-10-2021
+calendar list
+calendar delete 1
+exit