Merge pull request #174 from AP2020Fall/elahe

Elahe
AP2020Fall · Feb 6, 2021 · 4e5eec4 · 4e5eec4
2 parents 994f98b + 0d59233
commit 4e5eec4
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 2 deletions.
diff --git a/src/com/Resources/JSONs/AccountRelated/Admin.json b/src/com/Resources/JSONs/AccountRelated/Admin.json
@@ -0,0 +1 @@
+{"firstName":"ed","lastName":"ed","username":"ed","password":"ed","userID":"464565","email":"[email protected]","phoneNum":"0912334457","pfpUrl":"https://i.imgur.com/IIyNCG4.png"}
diff --git a/src/com/Resources/JSONs/IDGenerator.json b/src/com/Resources/JSONs/IDGenerator.json
@@ -1 +0,0 @@
-["944106","565519"]

diff --git a/src/com/plato/Controller/Menus/RegisterFormController.java b/src/com/plato/Controller/Menus/RegisterFormController.java
@@ -118,7 +118,7 @@ public void signUp (ActionEvent actionEvent) {
 //		(Class accType, String pfp, String firstName, String lastName, String username, String password, String email, String phoneNum, double money)
 		try {
 			dataOutputStream.writeUTF(
-					"register_" + (Admin.adminHasBeenCreated() ? Gamer.class : Admin.class).getSimpleName() + "_" +
+					"register" + (Admin.adminHasBeenCreated() ? Gamer.class : Admin.class).getSimpleName() + "_" +
 							pfp.getImage().getUrl() + "_" +
 							firstName.getText() + "_" +
 							lastName.getText() + "_" +

diff --git a/src/com/plato/Controller/Server.java b/src/com/plato/Controller/Server.java
@@ -114,6 +114,7 @@ public void run () {
 				String[] receivedInfo = received.split("_");
 				System.out.println("receivedInfo = " + Arrays.toString(receivedInfo));
 				//System.out.println(token);
+				System.out.println(receivedInfo);
 				switch (receivedInfo[0]) {
 					case "getAllAccounts":
 						dataOutputStream.writeUTF(MainController.getInstance().getGson().toJson(Account.getAccounts()));