From b4a210de9ea475da7481cac99797b5e05aa57f25 Mon Sep 17 00:00:00 2001
From: "DESKTOP-2HNCDPM\\Ysabella" <e0201472@u.nus.edu>
Date: Tue, 16 Oct 2018 23:21:41 +0800
Subject: [PATCH 1/4] Update TO_DO_LIST_PREFIX in CliSyntax Add parser for
 ToDoListAddCommand and WildcardSearchCommand.java Slight change to
 ToDoList.fxml

---
 .../logic/commands/ToDoListAddCommand.java    |  2 +-
 .../logic/commands/WildcardSearchCommand.java |  2 +-
 .../seedu/address/logic/parser/CliSyntax.java |  2 +-
 .../logic/parser/FinancialDatabaseParser.java | 25 +++++--------
 .../parser/ToDoListAddCommandParser.java      | 35 ++++++++++++++++++
 .../parser/WildcardSearchCommandParser.java   | 36 +++++++++++++++++++
 src/main/resources/view/ToDoList.fxml         |  3 +-
 7 files changed, 85 insertions(+), 20 deletions(-)
 create mode 100644 src/main/java/seedu/address/logic/parser/ToDoListAddCommandParser.java
 create mode 100644 src/main/java/seedu/address/logic/parser/WildcardSearchCommandParser.java

diff --git a/src/main/java/seedu/address/logic/commands/ToDoListAddCommand.java b/src/main/java/seedu/address/logic/commands/ToDoListAddCommand.java
index 0b20222f24c6..e780313761fb 100644
--- a/src/main/java/seedu/address/logic/commands/ToDoListAddCommand.java
+++ b/src/main/java/seedu/address/logic/commands/ToDoListAddCommand.java
@@ -12,7 +12,7 @@
  */
 public class ToDoListAddCommand extends Command {
     public static final String COMMAND_WORD = "todo";
-    public static final String COMMAND_ALIAS = "td";
+    public static final String COMMAND_ALIAS = "toDo";
 
     public static final String MESSAGE_USAGE = COMMAND_WORD + ": Adds an action to the user's to-do list. "
             + "Parameters: "
diff --git a/src/main/java/seedu/address/logic/commands/WildcardSearchCommand.java b/src/main/java/seedu/address/logic/commands/WildcardSearchCommand.java
index 5140dcf5e408..b09622ae1e2f 100644
--- a/src/main/java/seedu/address/logic/commands/WildcardSearchCommand.java
+++ b/src/main/java/seedu/address/logic/commands/WildcardSearchCommand.java
@@ -16,7 +16,7 @@ public class WildcardSearchCommand extends Command{
     public static final String COMMAND_ALIAS = "wcs";
 
     public static final String MESSAGE_USAGE = COMMAND_WORD + ": Performs a wildcard search on the address book's "
-            + "contacts based on user's input."
+            + "contacts based on user's input. "
             + "Parameters: KEYWORD [MORE_KEYWORDS]...\n"
             + "Example: " + COMMAND_WORD + " oh";
 
diff --git a/src/main/java/seedu/address/logic/parser/CliSyntax.java b/src/main/java/seedu/address/logic/parser/CliSyntax.java
index a4331c998574..8fd160618dec 100644
--- a/src/main/java/seedu/address/logic/parser/CliSyntax.java
+++ b/src/main/java/seedu/address/logic/parser/CliSyntax.java
@@ -14,5 +14,5 @@ public class CliSyntax {
     public static final Prefix PREFIX_PERSONID = new Prefix("id/");
     public static final Prefix PREFIX_TRANSACTION_AMOUNT = new Prefix("ta/");
     public static final Prefix PREFIX_TRANSACTION_TYPE = new Prefix("tt/");
-    public static final Prefix PREFIX_TO_DO_LIST = new Prefix("td/");
+    public static final Prefix PREFIX_TO_DO_LIST = new Prefix("toDo/");
 }
diff --git a/src/main/java/seedu/address/logic/parser/FinancialDatabaseParser.java b/src/main/java/seedu/address/logic/parser/FinancialDatabaseParser.java
index 8614aa20e1c0..646c9068cca7 100644
--- a/src/main/java/seedu/address/logic/parser/FinancialDatabaseParser.java
+++ b/src/main/java/seedu/address/logic/parser/FinancialDatabaseParser.java
@@ -8,22 +8,7 @@
 
 import seedu.address.MainApp;
 import seedu.address.Mode;
-import seedu.address.logic.commands.AddCommand;
-import seedu.address.logic.commands.AddTransactionCommand;
-import seedu.address.logic.commands.ClearCommand;
-import seedu.address.logic.commands.Command;
-import seedu.address.logic.commands.DeleteCommand;
-import seedu.address.logic.commands.EditCommand;
-import seedu.address.logic.commands.ExitCommand;
-import seedu.address.logic.commands.FindCommand;
-import seedu.address.logic.commands.HelpCommand;
-import seedu.address.logic.commands.HistoryCommand;
-import seedu.address.logic.commands.ListCommand;
-import seedu.address.logic.commands.ModeCommand;
-import seedu.address.logic.commands.RedoCommand;
-import seedu.address.logic.commands.SelectCommand;
-import seedu.address.logic.commands.UndoCommand;
-import seedu.address.logic.commands.FilterCommand;
+import seedu.address.logic.commands.*;
 import seedu.address.logic.parser.exceptions.ParseException;
 
 
@@ -115,6 +100,14 @@ public Command parseCommand(String userInput) throws ParseException {
         case ModeCommand.COMMAND_ALIAS:
             return new ModeCommand();
 
+        case WildcardSearchCommand.COMMAND_WORD:
+        case WildcardSearchCommand.COMMAND_ALIAS:
+            return new WildcardSearchCommandParser().parse(arguments);
+
+        case ToDoListAddCommand.COMMAND_WORD:
+        case ToDoListAddCommand.COMMAND_ALIAS:
+            return new ToDoListAddCommandParser().parse(arguments);
+
         default:
             throw new ParseException(MESSAGE_UNKNOWN_COMMAND);
         }
diff --git a/src/main/java/seedu/address/logic/parser/ToDoListAddCommandParser.java b/src/main/java/seedu/address/logic/parser/ToDoListAddCommandParser.java
new file mode 100644
index 000000000000..d15b68b185e1
--- /dev/null
+++ b/src/main/java/seedu/address/logic/parser/ToDoListAddCommandParser.java
@@ -0,0 +1,35 @@
+package seedu.address.logic.parser;
+
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+
+import java.util.Arrays;
+
+import seedu.address.logic.commands.FindCommand;
+import seedu.address.logic.commands.ToDoListAddCommand;
+import seedu.address.logic.commands.WildcardSearchCommand;
+import seedu.address.logic.parser.exceptions.ParseException;
+import seedu.address.model.person.NameContainsKeywordsPredicate;
+import seedu.address.model.person.NameContainsLettersPredicate;
+
+/**
+ *
+ */
+
+public class ToDoListAddCommandParser implements Parser<ToDoListAddCommand> {
+
+    /**
+     * Parses the given {@code String} of arguments in the context of the ToDoListAddCommand
+     * and returns an ToDoListAddCommand object for execution.
+     * @throws ParseException if the user input does not conform the expected format
+     */
+
+    public ToDoListAddCommand parse(String args) throws ParseException {
+        if (args.isEmpty()) {
+            throw new ParseException(
+                    String.format(MESSAGE_INVALID_COMMAND_FORMAT, ToDoListAddCommand.MESSAGE_USAGE));
+        }
+
+        return new ToDoListAddCommand(args);
+    }
+}
+
diff --git a/src/main/java/seedu/address/logic/parser/WildcardSearchCommandParser.java b/src/main/java/seedu/address/logic/parser/WildcardSearchCommandParser.java
new file mode 100644
index 000000000000..fef6215703fe
--- /dev/null
+++ b/src/main/java/seedu/address/logic/parser/WildcardSearchCommandParser.java
@@ -0,0 +1,36 @@
+package seedu.address.logic.parser;
+
+import static seedu.address.commons.core.Messages.MESSAGE_INVALID_COMMAND_FORMAT;
+
+import java.util.Arrays;
+
+import seedu.address.logic.commands.FindCommand;
+import seedu.address.logic.commands.WildcardSearchCommand;
+import seedu.address.logic.parser.exceptions.ParseException;
+import seedu.address.model.person.NameContainsKeywordsPredicate;
+import seedu.address.model.person.NameContainsLettersPredicate;
+
+/**
+ *
+ */
+
+public class WildcardSearchCommandParser implements Parser<WildcardSearchCommand>{
+
+    /**
+     * Parses the given {@code String} of arguments in the context of the WildcardSearchCommand
+     * and returns an WildcardSearchCommand object for execution.
+     * @throws ParseException if the user input does not conform the expected format
+     */
+
+    public WildcardSearchCommand parse(String args) throws ParseException {
+        String trimmedArgs = args.trim();
+        if (trimmedArgs.isEmpty()) {
+            throw new ParseException(
+                    String.format(MESSAGE_INVALID_COMMAND_FORMAT, WildcardSearchCommand.MESSAGE_USAGE));
+        }
+
+        String[] nameKeywords = trimmedArgs.split("\\s+");
+
+        return new WildcardSearchCommand(new NameContainsLettersPredicate(Arrays.asList(nameKeywords)));
+    }
+}
diff --git a/src/main/resources/view/ToDoList.fxml b/src/main/resources/view/ToDoList.fxml
index c97cdd937a30..ddcbf24f65e4 100644
--- a/src/main/resources/view/ToDoList.fxml
+++ b/src/main/resources/view/ToDoList.fxml
@@ -3,13 +3,14 @@
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ScrollBar?>
 <?import javafx.scene.control.TextArea?>
+<?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.AnchorPane?>
 
-
 <AnchorPane prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="view.ToDoList">
    <children>
       <Label text="To-Do List" AnchorPane.leftAnchor="10.0" AnchorPane.topAnchor="5.0" />
       <TextArea prefHeight="200.0" prefWidth="200.0" AnchorPane.bottomAnchor="10.0" AnchorPane.leftAnchor="10.0" AnchorPane.rightAnchor="10.0" AnchorPane.topAnchor="30.0" />
+      <TextField AnchorPane.leftAnchor="10.0" AnchorPane.rightAnchor="30.0" AnchorPane.topAnchor="30.0" />
       <ScrollBar layoutX="568.0" layoutY="33.0" orientation="VERTICAL" prefHeight="353.0" prefWidth="18.0" AnchorPane.bottomAnchor="12.0" AnchorPane.rightAnchor="12.0" AnchorPane.topAnchor="32.0" />
    </children>
 </AnchorPane>

From 53185680af8685abdaba5f6b4fa957c1dd204a28 Mon Sep 17 00:00:00 2001
From: "DESKTOP-2HNCDPM\\Ysabella" <e0201472@u.nus.edu>
Date: Tue, 16 Oct 2018 23:52:06 +0800
Subject: [PATCH 2/4] Fixed style

---
 .gitignore                                                      | 2 +-
 _reposense/config.json                                          | 2 +-
 allTest.sh                                                      | 2 +-
 build.gradle                                                    | 2 +-
 src/main/resources/creds/creds.json                             | 2 +-
 src/test/java/seedu/address/logic/commands/CommandTestUtil.java | 2 +-
 src/test/java/seedu/address/testutil/PersonBuilder.java         | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index ee5db3ed292e..78fc9e6e72bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,4 +20,4 @@ src/main/resources/docs/
 out/
 allTest.sh
 tokens/
-!_reposense/config.json
\ No newline at end of file
+!_reposense/config.json
diff --git a/_reposense/config.json b/_reposense/config.json
index eb0da94414b1..31c14aa13cb5 100644
--- a/_reposense/config.json
+++ b/_reposense/config.json
@@ -27,4 +27,4 @@
       "authorNames": ["Bellaaarh","DESKTOP-2HNCDPM\\Ysabella"]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/allTest.sh b/allTest.sh
index a1dbac2bdb93..856a5381c349 100644
--- a/allTest.sh
+++ b/allTest.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 #./config/travis/run-checks.sh
-./gradlew clean checkstyleMain checkstyleTest headless allTests coverage coveralls asciidoctor copyDummySearchPage
\ No newline at end of file
+./gradlew clean checkstyleMain checkstyleTest headless allTests coverage coveralls asciidoctor copyDummySearchPage
diff --git a/build.gradle b/build.gradle
index 4cfa048b9980..d7cbda9147e8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -79,7 +79,7 @@ dependencies {
     testRuntimeOnly group: 'org.testfx', name: 'openjfx-monocle', version: 'jdk-9+181'
     testRuntimeOnly group:'org.junit.vintage', name:'junit-vintage-engine', version: jUnitVersion
     testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: jUnitVersion
-	
+
 	compile 'com.google.api-client:google-api-client:1.23.0'
     compile 'com.google.oauth-client:google-oauth-client-jetty:1.23.0'
     compile 'com.google.apis:google-api-services-calendar:v3-rev305-1.23.0'
diff --git a/src/main/resources/creds/creds.json b/src/main/resources/creds/creds.json
index 05195ad57cb0..89ac26ddb758 100644
--- a/src/main/resources/creds/creds.json
+++ b/src/main/resources/creds/creds.json
@@ -1 +1 @@
-{"installed":{"client_id":"701191040047-p35krni7rngbafn4q00836sckhhmfj11.apps.googleusercontent.com","project_id":"debt-tracker-1539007158978","auth_uri":"https://accounts.google.com/o/oauth2/auth","token_uri":"https://www.googleapis.com/oauth2/v3/token","auth_provider_x509_cert_url":"https://www.googleapis.com/oauth2/v1/certs","client_secret":"FrEvGQ94puiSdScIxwi0D3zQ","redirect_uris":["urn:ietf:wg:oauth:2.0:oob","http://localhost"]}}
\ No newline at end of file
+{"installed":{"client_id":"701191040047-p35krni7rngbafn4q00836sckhhmfj11.apps.googleusercontent.com","project_id":"debt-tracker-1539007158978","auth_uri":"https://accounts.google.com/o/oauth2/auth","token_uri":"https://www.googleapis.com/oauth2/v3/token","auth_provider_x509_cert_url":"https://www.googleapis.com/oauth2/v1/certs","client_secret":"FrEvGQ94puiSdScIxwi0D3zQ","redirect_uris":["urn:ietf:wg:oauth:2.0:oob","http://localhost"]}}
diff --git a/src/test/java/seedu/address/logic/commands/CommandTestUtil.java b/src/test/java/seedu/address/logic/commands/CommandTestUtil.java
index 0e812e54add6..9834d36a5b34 100644
--- a/src/test/java/seedu/address/logic/commands/CommandTestUtil.java
+++ b/src/test/java/seedu/address/logic/commands/CommandTestUtil.java
@@ -71,7 +71,7 @@ public class CommandTestUtil {
         DESC_AMY = new EditTransactionDescriptorBuilder().withAmount(VALID_AMOUNT_AMY).withDeadline(VALID_DEADLINE_AMY)
                 .withType(VALID_TYPE_AMY).withName(VALID_NAME_AMY).withPhone(VALID_PHONE_AMY)
                 .withEmail(VALID_EMAIL_AMY).withAddress(VALID_ADDRESS_AMY).withTags(VALID_TAG_FRIEND).build();
-        
+
         DESC_BOB = new EditTransactionDescriptorBuilder().withAmount(VALID_AMOUNT_BOB).withDeadline(VALID_DEADLINE_BOB)
                 .withType(VALID_TYPE_BOB).withName(VALID_NAME_BOB).withPhone(VALID_PHONE_BOB)
                 .withEmail(VALID_EMAIL_BOB).withAddress(VALID_ADDRESS_BOB)
diff --git a/src/test/java/seedu/address/testutil/PersonBuilder.java b/src/test/java/seedu/address/testutil/PersonBuilder.java
index ac4c0f88b2b2..5eff412178bd 100644
--- a/src/test/java/seedu/address/testutil/PersonBuilder.java
+++ b/src/test/java/seedu/address/testutil/PersonBuilder.java
@@ -90,4 +90,4 @@ public Person build() {
         return new Person(name, phone, email, address, tags);
     }
 
-}
\ No newline at end of file
+}

From ed90f59582c448fcb78b976f5425e455a234a444 Mon Sep 17 00:00:00 2001
From: "DESKTOP-2HNCDPM\\Ysabella" <e0201472@u.nus.edu>
Date: Wed, 17 Oct 2018 00:00:54 +0800
Subject: [PATCH 3/4] Fix style again. Cannot find Photo.java

---
 src/main/java/seedu/address/logic/Logic.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/seedu/address/logic/Logic.java b/src/main/java/seedu/address/logic/Logic.java
index e5f4904a3057..ea04851b2702 100644
--- a/src/main/java/seedu/address/logic/Logic.java
+++ b/src/main/java/seedu/address/logic/Logic.java
@@ -19,7 +19,7 @@ public interface Logic {
      * @throws ParseException If an error occurs during parsing.
      */
     CommandResult execute(String commandText) throws CommandException, ParseException;
-    
+
     /** Returns an unmodifiable view of the filtered list of transactions */
     ObservableList<seedu.address.model.transaction.Transaction> getFilteredTransactionList();
 

From acbbb05661276d1a312672be9a4eac35c3669512 Mon Sep 17 00:00:00 2001
From: "DESKTOP-2HNCDPM\\Ysabella" <e0201472@u.nus.edu>
Date: Wed, 17 Oct 2018 00:15:24 +0800
Subject: [PATCH 4/4] Style fix. Found Photo.java

---
 src/main/java/seedu/address/model/person/Photo.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/seedu/address/model/person/Photo.java b/src/main/java/seedu/address/model/person/Photo.java
index a85eb6294b99..cce5af7d1002 100644
--- a/src/main/java/seedu/address/model/person/Photo.java
+++ b/src/main/java/seedu/address/model/person/Photo.java
@@ -48,8 +48,8 @@ public Photo(String filePath, String newPhoto) throws IllegalValueException {
         }
         //link to the path
         this.photoPath = FOLDER + "//" + newPhoto;
-        
-        makePhoto( filePath,   newPhoto);        
+
+        makePhoto( filePath, newPhoto);
     }
 
     private void makePhoto(String filePath, String newPhoto) {