minor changes

Client/src/main/java/Console.java

@@ -4,44 +4,58 @@ public class Console {
 
     private static Scanner scanner = new Scanner(System.in);
 
-    public static String mainMenu() {
-        System.out.println("What would you like to do?" +
+    public static String printMainMenu() {
+        System.out.println("\nWhat would you like to do?" +
                 "\n> GET all users" +
                 "\n> ADD your information" +
                 "\n> SEND a message" +
                 "\n> SEE all messages" +
                 "\n> QUIT");
-        String option = scanner.nextLine().toUpperCase();
-        return option;
+        return scanner.nextLine().toUpperCase();
+    }
+
+    public static String printSendMenu() {
+        System.out.println("\nWhat type of message do you want to send?" +
+                "\n> GLOBAL message to everyone" +
+                "\n> DIRECT message to a specific user");
+        return scanner.nextLine().toUpperCase();
     }
 
     public static String getName() {
-        System.out.println("Please input your name: ");
+        System.out.println("\nPlease input your name: ");
         String name = scanner.nextLine();
         return name;
     }
 
     public static String getGithub() {
-        System.out.println("Please input your Github ID: ");
+        System.out.println("\nPlease input your Github ID: ");
         String github = scanner.nextLine();
         return github;
     }
 
     public static String getFromID() {
-        System.out.println("Please input your ID: ");
+        System.out.println("\nPlease input your ID: ");
         String github = scanner.nextLine();
         return github;
     }
 
     public static String getToID() {
-        System.out.println("Please input the receiver's ID: ");
+        System.out.println("\nPlease input the receiver's ID: ");
         String github = scanner.nextLine();
         return github;
     }
 
     public static String getMessage() {
-        System.out.println("Please input your message: ");
+        System.out.println("\nPlease input your message: ");
         String github = scanner.nextLine();
         return github;
     }
+
+    public static void printError(){
+        System.out.println("\nAn error has occurred.");
+    }
+
+    public static void printSuccess(String choice) {
+        System.out.println("\n" + choice + " success!");
+    }
 }

Client/src/main/java/YouAreEll.java

@@ -1,3 +1,4 @@
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.mashape.unirest.http.HttpResponse;
 import com.mashape.unirest.http.JsonNode;
 import com.mashape.unirest.http.Unirest;
@@ -18,24 +19,30 @@ public class YouAreEll {
 
         boolean flag = true;
         while (flag) {
-            String userChoice = Console.mainMenu();
+            String userChoice = Console.printMainMenu();
             switch (userChoice) {
                 case "GET":
                     url.sendGetIDsRequest(url);
+                    Console.printSuccess(userChoice);
                     break;
                 case "ADD":
                     url.sendInputUserInfoRequest(url);
+                    Console.printSuccess(userChoice);
                     break;
                 case "SEND":
-                    url.sendGlobalMessageRequest(url);
-                    // url.sendDirectMessageRequest(url);
+                    url.sendMenu(Console.printSendMenu(), url);
+                    Console.printSuccess(userChoice);
                     break;
                 case "SEE":
                     url.sendGetGlobalMessagesRequest(url);
+                    Console.printSuccess(userChoice);
                     break;
                 case "QUIT":
                     flag = false;
                     break;
+                default:
+                    Console.printError();
+                    break;
             }
         }
 //        url.sendInputUserInfoRequest(url);
@@ -57,6 +64,19 @@ public class YouAreEll {
         return input;
     }
 
+    public void sendMenu(String sendOption, YouAreEll url) {
+        switch (sendOption) {
+            case "GLOBAL":
+                url.sendGlobalMessageRequest(url);
+                break;
+            case "DIRECT":
+                url.sendDirectMessageRequest(url);
+                break;
+            default:
+                break;
+        }
+    }
+
     public void inputUserInfo() throws UnirestException {
         String name = getInput(Console.getName());
         String github = getInput(Console.getGithub());