From 822067c105f7248a4ff21453fa685c99364ae5ed Mon Sep 17 00:00:00 2001
From: elahe <elahe1380m@gmail.com>
Date: Wed, 3 Feb 2021 14:58:21 +0330
Subject: [PATCH 1/2] Events in Menus and DeleteAccountController and
 DisplayPersonalAccInfoController

---
 .../Menus/DeleteAccountController.java        |  59 +-----
 .../DisplayPersonalAccInfoController.java     | 106 +++-------
 .../Controller/Menus/EditPWController.java    |  41 +---
 .../EventCreateOrEditPageController.java      | 197 +++++++++++-------
 src/com/plato/Controller/Server.java          |  33 ++-
 5 files changed, 185 insertions(+), 251 deletions(-)

diff --git a/src/com/plato/Controller/Menus/DeleteAccountController.java b/src/com/plato/Controller/Menus/DeleteAccountController.java
index fbf014a..2828cf4 100644
--- a/src/com/plato/Controller/Menus/DeleteAccountController.java
+++ b/src/com/plato/Controller/Menus/DeleteAccountController.java
@@ -15,6 +15,7 @@
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
+import java.io.IOException;
 import java.net.Socket;
 import java.net.URL;
 import java.util.ResourceBundle;
@@ -27,33 +28,11 @@ public class DeleteAccountController implements Initializable {
 	public ImageView showPwOrNot;
 	public PasswordField pwFieldpwHidden;
 	public TextField pwFieldpwShown;
-	private MouseEvent mouseEvent;
-	private ActionEvent actionEvent;
 	private static DataInputStream dataInputStream;
 	private static DataOutputStream dataOutputStream;
 	private static Socket socket;
 
 
-	public DeleteAccountController() {
-		this.mouseEvent = null;
-		this.actionEvent = null;
-	}
-
-	public MouseEvent getMouseEvent() {
-		return mouseEvent;
-	}
-
-	public ActionEvent getActionEvent() {
-		return actionEvent;
-	}
-
-	public void setMouseEvent(MouseEvent mouseEvent) {
-		this.mouseEvent = mouseEvent;
-	}
-
-	public void setActionEvent(ActionEvent actionEvent) {
-		this.actionEvent = actionEvent;
-	}
 
 	public static void setStage (Stage stage) {
 		DeleteAccountController.stage = stage;
@@ -97,14 +76,11 @@ public void initialize (URL url, ResourceBundle resourceBundle) {
 		showPwOrNot.toFront();
 	}
 
-	public void closeStage () {
+	public void closeStage (ActionEvent actionEvent) {
 		stage.close();
 	}
-	public void closeStageWrite(ActionEvent actionEvent)
-	{setActionEvent(actionEvent);
-		MainController.write("DeletAccount.closeStage");
-	}
-	public void removeAccount () {
+
+	public void removeAccount (ActionEvent actionEvent) throws IOException {
 //		Stage stage = new Stage();
 //		try {
 //			stage = MainController.getInstance().createAndReturnNewStage(
@@ -119,31 +95,12 @@ public void removeAccount () {
 
 		String password = (showPwOrNot.getImage().getUrl().contains("invisible") ? pwFieldpwShown : pwFieldpwHidden).getText();
 
-		try {
-			AccountController.getInstance().deleteAccount(username.getText(), password);
-		} catch (MainController.InvalidFormatException e) {
-			if (e.getMessage().toLowerCase().startsWith("username")) {
-				usernameError.setText(e.getMessage());
-				return;
-			}
-			if (e.getMessage().toLowerCase().startsWith("password")) {
-				passwordError.setText(e.getMessage());
-				return;
-			}
-		} catch (AccountController.NoAccountExistsWithUsernameException | AccountController.AdminAccountCantBeDeletedException e) {
-			usernameError.setText(e.getMessage());
-			return;
-		} catch (AccountController.PaswordIncorrectException e) {
-			passwordError.setText(e.getMessage());
-			return;
-		}
+		dataOutputStream.writeUTF("deleteAccount_" + username.getText() + "_" + password);
+		dataOutputStream.flush();
+		//AccountController.getInstance().deleteAccount(username.getText(), password);
 
 		DeleteAccountController.stage.close();
 //		stage.show();
 	}
-	public void removeAccountWrite(ActionEvent actionEvent)
-	{
-		setActionEvent(actionEvent);
-		MainController.write("DeletAccount.removeAccount");
-	}
+
 }
diff --git a/src/com/plato/Controller/Menus/DisplayPersonalAccInfoController.java b/src/com/plato/Controller/Menus/DisplayPersonalAccInfoController.java
index 66559ac..0a178ee 100644
--- a/src/com/plato/Controller/Menus/DisplayPersonalAccInfoController.java
+++ b/src/com/plato/Controller/Menus/DisplayPersonalAccInfoController.java
@@ -37,35 +37,11 @@ public class DisplayPersonalAccInfoController implements Initializable {
 	public HBox coinHbox;
 	public GridPane mainGridPane;
 	public LinkedList<Label> editButtons = new LinkedList<>();
-	private MouseEvent mouseEvent;
-	private ActionEvent actionEvent;
 	private static DataInputStream dataInputStream;
 	private static DataOutputStream dataOutputStream;
 	private static Socket socket;
 
 
-
-	public DisplayPersonalAccInfoController() {
-		this.mouseEvent = null;
-		this.actionEvent =null;
-	}
-
-	public MouseEvent getMouseEvent() {
-		return mouseEvent;
-	}
-
-	public ActionEvent getActionEvent() {
-		return actionEvent;
-	}
-
-	public void setMouseEvent(MouseEvent mouseEvent) {
-		this.mouseEvent = mouseEvent;
-	}
-
-	public void setActionEvent(ActionEvent actionEvent) {
-		this.actionEvent = actionEvent;
-	}
-
 	public static void setStage (Stage stage) {
 		DisplayPersonalAccInfoController.stage = stage;
 		DisplayPersonalAccInfoController.stage.setOnCloseRequest(e -> {
@@ -93,14 +69,10 @@ public void initialize (URL location, ResourceBundle resources) {
 		}
 	}
 
-	public void closeStage () {
+	public void closeStage (ActionEvent actionEvent) {
 		stage.close();
 	}
-	public void closeStageWrite(ActionEvent actionEvent)
-	{
-		setActionEvent(actionEvent);
-		MainController.write("DisplayPersonalInfo.closeStage");
-	}
+
 	public void updateFieldViews () {
 		firstName.setText(account.getFirstName());
 		lastName.setText(account.getLastName());
@@ -114,60 +86,42 @@ public void updateFieldViews () {
 		editButtons.clear();
 	}
 
-	public void editFirstName () {
+	public void editFirstName (MouseEvent mouseEvent) {
 		firstNameTextField.setVisible(!firstNameTextField.isVisible());
-		((Label) getMouseEvent().getSource()).setText(firstNameTextField.isVisible() ? "cancel" : "edit");
+		((Label) mouseEvent.getSource()).setText(firstNameTextField.isVisible() ? "cancel" : "edit");
 		firstNameTextField.setText(firstName.getText());
-		editButtons.add(((Label) getMouseEvent().getSource()));
-	}
-	public void editFirstNameWrite(MouseEvent mouseEvent) {
-		setMouseEvent(mouseEvent);
-		MainController.write("DisplayPersonalInfo.editFirstName");
+		editButtons.add(((Label) mouseEvent.getSource()));
 	}
-	public void editLastName () {
+
+	public void editLastName (MouseEvent mouseEvent) {
 		lastNameTextField.setVisible(!lastNameTextField.isVisible());
-		((Label) getMouseEvent().getSource()).setText(lastNameTextField.isVisible() ? "cancel" : "edit");
+		((Label) mouseEvent.getSource()).setText(lastNameTextField.isVisible() ? "cancel" : "edit");
 		lastNameTextField.setText(lastName.getText());
-		editButtons.add(((Label) getMouseEvent().getSource()));
-	}
-	public void editLastNameWrite(MouseEvent mouseEvent)
-	{
-		setMouseEvent(mouseEvent);
-		MainController.write("DisplayPersonalInfo.editLastName");
+		editButtons.add(((Label) mouseEvent.getSource()));
 	}
-	public void editUsername () {
+
+	public void editUsername (MouseEvent mouseEvent) {
 		usernameTextField.setVisible(!usernameTextField.isVisible());
-		((Label) getMouseEvent().getSource()).setText(usernameTextField.isVisible() ? "cancel" : "edit");
+		((Label) mouseEvent.getSource()).setText(usernameTextField.isVisible() ? "cancel" : "edit");
 		usernameTextField.setText(username.getText());
-		editButtons.add(((Label) getMouseEvent().getSource()));
-	}
-	public void editUsernameWrite(MouseEvent mouseEvent)
-	{
-		setMouseEvent(mouseEvent);
-		MainController.write("DisplayPersonalInfo.editUsername");
+		editButtons.add(((Label) mouseEvent.getSource()));
 	}
-	public void editEmail () {
+
+	public void editEmail (MouseEvent mouseEvent) {
 		emailTextField.setVisible(!emailTextField.isVisible());
-		((Label) getMouseEvent().getSource()).setText(emailTextField.isVisible() ? "cancel" : "edit");
+		((Label) mouseEvent.getSource()).setText(emailTextField.isVisible() ? "cancel" : "edit");
 		emailTextField.setText(email.getText());
-		editButtons.add(((Label) getMouseEvent().getSource()));
-	}
-	public void editEmailWrite(MouseEvent mouseEvent)
-	{
-		setMouseEvent(mouseEvent);
-		MainController.write("DisplayPersonalInfo.editEmail");
+		editButtons.add(((Label) mouseEvent.getSource()));
 	}
-	public void editPhoneNum () {
+
+	public void editPhoneNum (MouseEvent mouseEvent) {
 		phoneNumberTextField.setVisible(!phoneNumberTextField.isVisible());
-		((Label) getMouseEvent().getSource()).setText(phoneNumberTextField.isVisible() ? "cancel" : "edit");
+		((Label) mouseEvent.getSource()).setText(phoneNumberTextField.isVisible() ? "cancel" : "edit");
 		phoneNumberTextField.setText(phoneNumber.getText());
-		editButtons.add(((Label) getMouseEvent().getSource()));
+		editButtons.add(((Label) mouseEvent.getSource()));
 	}
-	public void editPhoneNumWrite(MouseEvent mouseEvent) {
-		setMouseEvent(mouseEvent);
-		MainController.write("DisplayPersonalInfo.editPhoneNum");
-	}
-	public void confirmAllEdits () {
+
+	public void confirmAllEdits (ActionEvent actionEvent) {
 		if (firstNameTextField.isVisible()) {
 			try {
 				dataOutputStream.writeUTF("editAccField_first name_"+firstNameTextField.getText());
@@ -225,17 +179,9 @@ public void confirmAllEdits () {
 
 		updateFieldViews();
 	}
-	public void confirmAllEditsWrite(ActionEvent actionEvent)
-	{
-		setActionEvent(actionEvent);
-		MainController.write("DisplayPersonalInfo.confirmAllEdits");
-	}
-	public void uploadPfp ()
-	{
+
+	public void uploadPfp (MouseEvent mouseEvent) {
 		MainController.openUploadPfpWindow(stage, pfp);
 	}
-	public void uploadPfpWrite(MouseEvent mouseEvent) {
-		setMouseEvent(mouseEvent);
-		MainController.write("DisplayPersonalInfo.uploadPfp");
-	}
+
 }
diff --git a/src/com/plato/Controller/Menus/EditPWController.java b/src/com/plato/Controller/Menus/EditPWController.java
index 172be9e..ab18874 100644
--- a/src/com/plato/Controller/Menus/EditPWController.java
+++ b/src/com/plato/Controller/Menus/EditPWController.java
@@ -27,35 +27,12 @@ public class EditPWController implements Initializable {
 	public ImageView newShowPwOrNot, oldShowPwOrNot;
 	public PasswordField newPwFieldpwHidden, oldPwFieldpwHidden;
 	public TextField newPwFieldpwShown, oldPwFieldpwShown;
-	private MouseEvent mouseEvent;
-	private ActionEvent actionEvent;
 	private static DataOutputStream dataOutputStream;
 	private static DataInputStream dataInputStream;
 	private static Socket socket;
 
 
 
-	public EditPWController() {
-		this.mouseEvent = null;
-		this.actionEvent = null;
-	}
-
-	public MouseEvent getMouseEvent() {
-		return mouseEvent;
-	}
-
-	public ActionEvent getActionEvent() {
-		return actionEvent;
-	}
-
-	public void setMouseEvent(MouseEvent mouseEvent) {
-		this.mouseEvent = mouseEvent;
-	}
-
-	public void setActionEvent(ActionEvent actionEvent) {
-		this.actionEvent = actionEvent;
-	}
-
 	public static void setStage (Stage stage) {
 		EditPWController.stage = stage;
 		EditPWController.stage.setOnCloseRequest(event -> EditPWController.stage = null);
@@ -131,7 +108,7 @@ public void initialize (URL location, ResourceBundle resources) {
 		}
 	}
 
-	public void confirmPasswordEdit () {
+	public void confirmPasswordEdit (ActionEvent actionEvent) {
 		String oldPassword = (oldShowPwOrNot.getImage().getUrl().contains("invisible") ? oldPwFieldpwShown : oldPwFieldpwHidden).getText(),
 				newPassword = (newShowPwOrNot.getImage().getUrl().contains("invisible") ? newPwFieldpwShown : newPwFieldpwHidden).getText();
 
@@ -139,23 +116,15 @@ public void confirmPasswordEdit () {
 			dataOutputStream.writeUTF("changePWCommand_"+oldPassword+"_"+newPassword);
 			dataOutputStream.flush();
 		//	AccountController.getInstance().changePWCommand(oldPassword, newPassword);
-			closeStage();
+			closeStage(actionEvent);
 
 		} catch (IOException e) {
 			oldPasswordError.setText(e.getMessage());
 		}
 	}
-	public void confirmPasswordEditWrite(ActionEvent actionEvent)
-	{
-		setActionEvent(actionEvent);
-		MainController.write("EditPW.confirmPasswordEdit");
-	}
-	public void closeStage ()
-	{
+
+	public void closeStage (ActionEvent actionEvent) {
 		stage.close();
 	}
-	public void closeStageWrite(ActionEvent actionEvent) {
-		setActionEvent(actionEvent);
-		MainController.write("EditPW.closeStage");
-	}
+
 }
diff --git a/src/com/plato/Controller/Menus/EventCreateOrEditPageController.java b/src/com/plato/Controller/Menus/EventCreateOrEditPageController.java
index 96ac33f..f2f4aed 100644
--- a/src/com/plato/Controller/Menus/EventCreateOrEditPageController.java
+++ b/src/com/plato/Controller/Menus/EventCreateOrEditPageController.java
@@ -3,10 +3,12 @@
 import Controller.AccountRelated.AccountController;
 import Controller.AccountRelated.EventController;
 import Controller.MainController;
+import Model.AccountRelated.Account;
 import Model.AccountRelated.Admin;
 import Model.AccountRelated.Event;
 import Model.AccountRelated.Gamer;
 import Model.GameRelated.Game;
+import com.google.gson.Gson;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXMLLoader;
 import javafx.fxml.Initializable;
@@ -24,6 +26,7 @@
 import java.io.DataOutputStream;
 import java.io.File;
 import java.io.IOException;
+import java.lang.reflect.Type;
 import java.net.Socket;
 import java.net.URL;
 import java.time.LocalDate;
@@ -51,6 +54,7 @@ public class EventCreateOrEditPageController implements Initializable {
 	private static DataOutputStream dataOutputStream;
 	private static DataInputStream dataInputStream;
 	private static Socket socket;
+	private Object Account;
 
 
 	public static void setStage (Stage stage) {
@@ -62,6 +66,14 @@ public static void setIsForCreateOrInfo (boolean isForCreateOrInfo) {
 		EventCreateOrEditPageController.isForCreateOrInfo = isForCreateOrInfo;
 	}
 
+	public DatePicker getStartDatePicker() {
+		return startDatePicker;
+	}
+
+	public DatePicker getEndDatePicker() {
+		return endDatePicker;
+	}
+
 	public static Event getEvent () {
 		return event;
 	}
@@ -122,8 +134,10 @@ public void editDetails (MouseEvent mouseEvent) {
 		editButtons.add(((Label) mouseEvent.getSource()));
 	}
 
-	public void removeEvent (ActionEvent actionEvent) {
-		Event.removeEvent(event.getEventID());
+	public void removeEvent (ActionEvent actionEvent) throws IOException {
+		dataOutputStream.writeUTF("removeEvent_" + event.getEventID());
+		dataOutputStream.flush();
+		//Event.removeEvent(event.getEventID());
 		mainGridPane.getChildren().clear();
 		mainGridPane.setVisible(false);
 	}
@@ -137,70 +151,50 @@ public void revertEdits (ActionEvent actionEvent) {
 		coinSplitMenu.setVisible(false);
 	}
 
-	public void confirmEdits (ActionEvent actionEvent) {
-		try {
-			if (titleTextField.isVisible()) {
-				try {	dataOutputStream.writeUTF("editEvent");
-					// TODO: 2/2/2021
-					dataOutputStream.flush();
-					//EventController.getInstance().editEvent(event, "title", titleTextField.getText());
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
-			}
-
-			if (gameEditMenu.isVisible()) {
-				try {
-					EventController.getInstance().editEvent(event, "game menu", gameEditMenu.getText());
-				} catch (EventController.StartDateTimeIsAfterEndException | MainController.InvalidFormatException | EventController.EndDateTimeHasAlreadyPassedException | EventController.StartDateTimeHasAlreadyPassedException e) {
-					allErrors.setText(allErrors.getText() + "\n" + e.getMessage());
-				}
+	public void confirmEdits (ActionEvent actionEvent) throws IOException {
+		if (titleTextField.isVisible()) {
+			try {
+				dataOutputStream.writeUTF("editEvent_title_" + titleTextField.getText());
+				dataOutputStream.flush();
+				//EventController.getInstance().editEvent(event, "title", titleTextField.getText());
+			} catch (IOException e) {
+				e.printStackTrace();
 			}
+		}
 
-			if (coinSplitMenu.isVisible()) {
-				try {
-					EventController.getInstance().editEvent(event, "prize", coinSplitMenu.getText());
-				} catch (EventController.StartDateTimeIsAfterEndException | MainController.InvalidFormatException | EventController.EndDateTimeHasAlreadyPassedException | EventController.StartDateTimeHasAlreadyPassedException e) {
-					allErrors.setText(allErrors.getText() + "\n" + e.getMessage());
-				}
-			}
+		if (gameEditMenu.isVisible()) {
+			dataOutputStream.writeUTF("editEvent_game menu_" + gameEditMenu.getText());
+			dataOutputStream.flush();
+			//EventController.getInstance().editEvent(event, "game menu", gameEditMenu.getText());
+		}
 
-			if (detailsTextArea.isVisible()) {
-				try {
-					EventController.getInstance().editEvent(event, "details", detailsTextArea.getText());
-				} catch (EventController.StartDateTimeIsAfterEndException | MainController.InvalidFormatException | EventController.EndDateTimeHasAlreadyPassedException | EventController.StartDateTimeHasAlreadyPassedException e) {
-					allErrors.setText(allErrors.getText() + "\n" + e.getMessage());
-				}
-			}
+		if (coinSplitMenu.isVisible()) {
+			dataOutputStream.writeUTF("editEvent_prize_" + coinSplitMenu.getText());
+			dataOutputStream.flush();
+			//EventController.getInstance().editEvent(event, "prize", coinSplitMenu.getText());
+		}
 
-			if (startDatePicker.isVisible()) {
-				try {
-					EventController.getInstance().editEvent(
-							event, "start date", startDatePicker.getValue().format(DateTimeFormatter.ofPattern("d-MMM-yyyy"))
-					);
-				} catch (EventController.StartDateTimeIsAfterEndException | MainController.InvalidFormatException | EventController.EndDateTimeHasAlreadyPassedException | EventController.StartDateTimeHasAlreadyPassedException e) {
-					allErrors.setText(allErrors.getText() + "\n" + e.getMessage());
-				}
-			}
+		if (detailsTextArea.isVisible()) {
+			dataOutputStream.writeUTF("editEvent_details_" + detailsTextArea.getText());
+			dataOutputStream.flush();
+			//		EventController.getInstance().editEvent(event, "details", detailsTextArea.getText());
+		}
 
-			if (endDatePicker.isVisible()) {
-				try {
-					EventController.getInstance().editEvent(
-							event, "end date", endDatePicker.getValue().format(DateTimeFormatter.ofPattern("d-MMM-yyyy"))
-					);
-				} catch (EventController.StartDateTimeIsAfterEndException | MainController.InvalidFormatException | EventController.EndDateTimeHasAlreadyPassedException | EventController.StartDateTimeHasAlreadyPassedException e) {
-					allErrors.setText(allErrors.getText() + "\n" + e.getMessage());
-				}
-			}
+		if (startDatePicker.isVisible()) {
+			dataOutputStream.writeUTF("editEvent_start date_" + startDatePicker.getValue().format(DateTimeFormatter.ofPattern("d-MMM-yyyy")));
+			dataOutputStream.flush();
+			//EventController.getInstance().editEvent(event, "start date", startDatePicker.getValue().format(DateTimeFormatter.ofPattern("d-MMM-yyyy")));
+		}
 
-			try {
-				EventController.getInstance().editEvent(event, "pic-url", eventImg.getImage().getUrl());
-			} catch (EventController.StartDateTimeIsAfterEndException | MainController.InvalidFormatException | EventController.EndDateTimeHasAlreadyPassedException | EventController.StartDateTimeHasAlreadyPassedException e) {
-				allErrors.setText(allErrors.getText() + "\n" + e.getMessage());
-			}
-		} catch (EventController.CantEditInSessionEventException e) {
-			e.printStackTrace();
+		if (endDatePicker.isVisible()) {
+			dataOutputStream.writeUTF("editEvent_end date_" + endDatePicker.getValue().format(DateTimeFormatter.ofPattern("d-MMM-yyyy")));
+			dataOutputStream.flush();
+			//		EventController.getInstance().editEvent(event, "end date", endDatePicker.getValue().format(DateTimeFormatter.ofPattern("d-MMM-yyyy")));
 		}
+
+		dataOutputStream.writeUTF("editEvent_pic-url_" + eventImg.getImage().getUrl());
+		dataOutputStream.flush();
+		//EventController.getInstance().editEvent(event, "pic-url", eventImg.getImage().getUrl());
 	}
 
 	public void closeStage (ActionEvent actionEvent) {
@@ -209,8 +203,13 @@ public void closeStage (ActionEvent actionEvent) {
 
 	@Override
 	public void initialize (URL location, ResourceBundle resources) {
-		if (event != null && event.hasStarted())
-			makeEventUnEditableAndUnremovable();
+		if (event != null && event.hasStarted()) {
+			try {
+				makeEventUnEditableAndUnremovable();
+			} catch (IOException exception) {
+				exception.printStackTrace();
+			}
+		}
 
 		if (isForCreateOrInfo || (!isForCreateOrInfo && AccountController.getInstance().getCurrentAccLoggedIn() instanceof Admin)) {
 			mainGridPane.getChildren().remove(gameHbox);
@@ -246,7 +245,11 @@ public LocalDate fromString (String dateString) {
 			topButtonsHbox.getChildren().removeAll(removeEventBtn, howToWinPrize, eventSettingsBtn);
 			mainGridPane.getRowConstraints().remove(2);
 			displayAllEditableParts();
-			makeEventUnEditableAndUnremovable();
+			try {
+				makeEventUnEditableAndUnremovable();
+			} catch (IOException exception) {
+				exception.printStackTrace();
+			}
 		}
 
 		else {
@@ -258,7 +261,11 @@ public LocalDate fromString (String dateString) {
 
 			// gamer cant edit or delete
 			if (isForGamerOrAdmin) {
-				makeEventUnEditableAndUnremovable();
+				try {
+					makeEventUnEditableAndUnremovable();
+				} catch (IOException exception) {
+					exception.printStackTrace();
+				}
 				mainGridPane.getChildren().remove(eventSettingsBtn);
 			}
 			else {
@@ -268,7 +275,7 @@ public LocalDate fromString (String dateString) {
 		}
 	}
 
-	private void makeEventUnEditableAndUnremovable () {
+	private void makeEventUnEditableAndUnremovable () throws IOException {
 		downBtnsHbox.getChildren().remove(1, 6);
 		topButtonsHbox.getChildren().removeAll(closeStageBtn, removeEventBtn);
 		mainGridPane.getChildren().remove(uploadEventImg);
@@ -287,19 +294,42 @@ private void makeEventUnEditableAndUnremovable () {
 								.forEach(vBox -> vBox.getChildren().remove(vBox.getChildren().size() - 1)));
 	}
 
-	private void updateJoinOrDropOutBtn () {
-		if (event.participantExists(AccountController.getInstance().getCurrentAccLoggedIn().getUsername())) {
+	private void updateJoinOrDropOutBtn () throws IOException {
+		dataOutputStream.writeUTF("getCurrentAccLoggedIn_");
+		dataOutputStream.flush();
+		Account account = new Gson().fromJson(dataInputStream.readUTF() , (Type) Account);
+		if (event.participantExists(account.getUsername())) {
 			joinOrDropoutEventBtn.setText("Drop-out");
 			joinOrDropoutEventBtn.setOnAction(e -> {
-				EventController.getInstance().stopParticipatingInEvent(event.getEventID());
-				updateJoinOrDropOutBtn();
+				try {
+					dataOutputStream.writeUTF("stopParticipatingInEvent_" + event.getEventID());
+					dataOutputStream.flush();
+				} catch (IOException exception) {
+					exception.printStackTrace();
+				}
+			//	EventController.getInstance().stopParticipatingInEvent(event.getEventID());
+				try {
+					updateJoinOrDropOutBtn();
+				} catch (IOException exception) {
+					exception.printStackTrace();
+				}
 			});
 		}
 		else {
 			joinOrDropoutEventBtn.setText("Join");
 			joinOrDropoutEventBtn.setOnAction(e -> {
-				EventController.getInstance().participateInEvent(event.getEventID());
-				updateJoinOrDropOutBtn();
+				try {
+					dataOutputStream.writeUTF("participateInEvent_" + event.getEventID());
+					dataOutputStream.flush();
+				} catch (IOException exception) {
+					exception.printStackTrace();
+				}
+			//	EventController.getInstance().participateInEvent(event.getEventID());
+				try {
+					updateJoinOrDropOutBtn();
+				} catch (IOException exception) {
+					exception.printStackTrace();
+				}
 			});
 		}
 	}
@@ -349,16 +379,25 @@ private void displayAllEditableParts () {
 
 	public void createEvent (ActionEvent actionEvent) {
 		try {
-			EventController.getInstance().createEvent(
-					titleTextField.getText(),
-					gameEditMenu.getText(),
-					eventImg.getImage().getUrl(),
-					startDatePicker.getValue(),
-					endDatePicker.getValue(),
-					Double.parseDouble(coinSplitMenu.getText()),
-					detailsTextArea.getText()
+		//	String title, String gameName, String picUrl, LocalDate start, LocalDate end, double eventPrize, String details
+			dataOutputStream.writeUTF("createEvent_"
+					+ titleTextField.getText() + "_"
+					+ gameEditMenu.getText() + "_"
+					+ eventImg.getImage().getUrl() + "_"
+					+ coinSplitMenu.getText() + "_"
+					+ detailsTextArea.getText()
 			);
-		} catch (MainController.InvalidFormatException | EventController.EndDateTimeHasAlreadyPassedException | EventController.StartDateTimeIsAfterEndException | EventController.StartDateTimeHasAlreadyPassedException | EventController.GameNameCantBeEmptyException e) {
+			dataOutputStream.flush();
+//			EventController.getInstance().createEvent(
+//					titleTextField.getText(),
+//					gameEditMenu.getText(),
+//					eventImg.getImage().getUrl(),
+//					startDatePicker.getValue(),
+//					endDatePicker.getValue(),
+//					Double.parseDouble(coinSplitMenu.getText()),
+//					detailsTextArea.getText()
+//			);
+		} catch (IOException e) {
 			allErrors.setText(allErrors.getText() + "\n" + e.getMessage());
 		}
 	}
diff --git a/src/com/plato/Controller/Server.java b/src/com/plato/Controller/Server.java
index 3a0a9a8..f9a5939 100644
--- a/src/com/plato/Controller/Server.java
+++ b/src/com/plato/Controller/Server.java
@@ -11,6 +11,7 @@
 import Controller.GameRelated.Reversi.ReversiController;
 import Controller.Menus.*;
 import Model.AccountRelated.Account;
+import Model.AccountRelated.Event;
 import Model.GameRelated.BattleSea.Ship;
 import Model.GameRelated.Game;
 import View.Client;
@@ -137,7 +138,6 @@ public void run() {
                     ReversiController.getInstance().displayPrevMoves();
                     break;
                 case "editAccField" :
-
                     AccountController.getInstance().editAccField (receivedInfo[1],receivedInfo[2]);
                     break;
                 case "displayLogOfGame" :
@@ -173,20 +173,33 @@ public void run() {
 
                     break;
                 case "participateInEvent" :
-                    EventController.getInstance();
+                    EventController.getInstance().participateInEvent(receivedInfo[1]);
                     break;
 
                 case "stopParticipateInEvent" :
-                    EventController.getInstance().stopParticipatingInEvent();
+                    EventController.getInstance().stopParticipatingInEvent(receivedInfo[1]);
                     break;
                 case "getCurrentGameInSession":
                     Game game = GameController.getInstance().getCurrentGameInSession();
                     dataOutputStream.writeUTF(new Gson().toJson(game));
                     dataOutputStream.flush();
                     break;
-
+                case "deleteAccount":
+                    AccountController.getInstance().deleteAccount(receivedInfo[1], receivedInfo[2]);
+                    break;
+                case "removeEvent":
+                    Event.removeEvent(receivedInfo[1]);
+                    break;
+                case "editEvent":
+                    EventController.getInstance().editEvent(EventCreateOrEditPageController.getEvent(), receivedInfo[1], receivedInfo[2]);
+                    break;
+                case "createEvent_" :
+                    //String title, String gameName, String picUrl, LocalDate start, LocalDate end, double eventPrize, String details
+                    double prize = Double.parseDouble(receivedInfo[4]);
+                    EventController.getInstance().createEvent(receivedInfo[1],receivedInfo[2],receivedInfo[3],EventCreateOrEditPageController.getEvent().getStart(), EventCreateOrEditPageController.getEvent().getEnd(),prize,receivedInfo[5]);
+                    break;
             }
-        }catch (IOException | BombController.CoordinateAlreadyBombedException | ReversiController.PlayerHasAlreadyPlacedDiskException e){
+        }catch (IOException | BombController.CoordinateAlreadyBombedException | ReversiController.PlayerHasAlreadyPlacedDiskException | EventController.GameNameCantBeEmptyException e){
             System.out.println("connection closed!");
             e.printStackTrace();
         } catch (MainController.InvalidFormatException e) {
@@ -204,6 +217,16 @@ public void run() {
             e.printStackTrace();
         } catch (MessageController.EmptyMessageException e) {
             e.printStackTrace();
+        } catch (AccountController.AdminAccountCantBeDeletedException e) {
+            e.printStackTrace();
+        } catch (EventController.StartDateTimeIsAfterEndException e) {
+            e.printStackTrace();
+        } catch (EventController.EndDateTimeHasAlreadyPassedException e) {
+            e.printStackTrace();
+        } catch (EventController.StartDateTimeHasAlreadyPassedException e) {
+            e.printStackTrace();
+        } catch (EventController.CantEditInSessionEventException e) {
+            e.printStackTrace();
         }
     }
 

From fbbab9c3ed1d3363c0efff48823b42c1a15930ba Mon Sep 17 00:00:00 2001
From: elahe <elahe1380m@gmail.com>
Date: Wed, 3 Feb 2021 15:29:18 +0330
Subject: [PATCH 2/2] menus done

---
 .../Controller/Menus/EventPageController.java |  2 +-
 .../Menus/EventSettingsController.java        | 89 +++++--------------
 .../Controller/Menus/EventsTabController.java | 88 ++++++------------
 .../Menus/FriendProfileController.java        | 23 -----
 ...FriendRequestManagementPageController.java | 52 +++++++----
 .../Menus/FriendsTabController.java           | 14 ++-
 src/com/plato/Controller/Server.java          | 14 ++-
 7 files changed, 103 insertions(+), 179 deletions(-)

diff --git a/src/com/plato/Controller/Menus/EventPageController.java b/src/com/plato/Controller/Menus/EventPageController.java
index ef9b407..f6b3730 100644
--- a/src/com/plato/Controller/Menus/EventPageController.java
+++ b/src/com/plato/Controller/Menus/EventPageController.java
@@ -43,7 +43,7 @@ public void initialize (URL location, ResourceBundle resources) {
 	}
 
 	public void joinEvent (String eventID) throws IOException {
-		dataOutputStream.writeUTF("participateInEvent");
+		dataOutputStream.writeUTF("participateInEvent_" + eventID);
 		dataOutputStream.flush();
 		//EventController.getInstance().participateInEvent(eventID);
 	}
diff --git a/src/com/plato/Controller/Menus/EventSettingsController.java b/src/com/plato/Controller/Menus/EventSettingsController.java
index 4726e02..7784e25 100644
--- a/src/com/plato/Controller/Menus/EventSettingsController.java
+++ b/src/com/plato/Controller/Menus/EventSettingsController.java
@@ -1,6 +1,5 @@
 package Controller.Menus;
 
-import Controller.MainController;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.event.ActionEvent;
@@ -10,7 +9,8 @@
 import javafx.scene.layout.GridPane;
 import javafx.stage.Stage;
 
-import java.awt.event.MouseEvent;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.net.URL;
 import java.util.ResourceBundle;
 
@@ -21,31 +21,8 @@ public class EventSettingsController implements Initializable {
 	public MenuButton eventTypeMenu, gameMenu, minReqMenu;
 	public GridPane gridPane;
 	private StringProperty eventSettings;
-	private MouseEvent mouseEvent;
-	private ActionEvent actionEvent;
-
-
-
-	public EventSettingsController() {
-		this.mouseEvent = null;
-		this.actionEvent = null;
-	}
-
-	public MouseEvent getMouseEvent() {
-		return mouseEvent;
-	}
-
-	public void setMouseEvent(MouseEvent mouseEvent) {
-		this.mouseEvent = mouseEvent;
-	}
-
-	public void setActionEvent(ActionEvent actionEvent) {
-		this.actionEvent = actionEvent;
-	}
-
-	public ActionEvent getActionEvent() {
-		return actionEvent;
-	}
+	private DataInputStream dataInputStream;
+	private DataOutputStream dataOutputStream;
 
 	public static void setStage (Stage stage) {
 		EventSettingsController.stage = stage;
@@ -99,7 +76,7 @@ private String getEventSettingsAsString () {
 		return "%s|%s|%s".formatted(eventTypeMenu.getText(), gameMenu.getText(), minReqMenu.getText());
 	}
 
-	public void isLoginTimes () {
+	public void isLoginTimes (ActionEvent actionEvent) {
 		gameMenu.setVisible(false);
 		minReqMenu.setVisible(true);
 
@@ -113,39 +90,27 @@ public void isLoginTimes () {
 			}});
 		}
 
-		resetPageWrite(getActionEvent());
-	}
-	public void isLoginTimesWrite(ActionEvent actionEvent) {
-		setActionEvent(actionEvent);
-		MainController.write("EventSettings.isLoginTimes");
+		resetPage(actionEvent);
 	}
-	public void resetPage () {
+
+	public void resetPage (ActionEvent actionEvent) {
 		minReqMenu.setText("Minimum Requirement");
 		gameMenu.setText("Game name");
 		eventTypeMenu.setText(((MenuItem) actionEvent.getSource()).getText());
 	}
-	public void resetPageWrite(ActionEvent actionEvent) {
-		setActionEvent(actionEvent);
-		MainController.write("EventSettings.resetPage");
-	}
-	public void closeStage () {
+
+	public void closeStage (ActionEvent actionEvent) {
 		stage.close();
 	}
-	public void closeStageWrite(ActionEvent actionEvent) {
-		setActionEvent(actionEvent);
-		MainController.write("EventSettings.closeStage");
-	}
-	public void isMVPInGame () {
+
+	public void isMVPInGame (ActionEvent actionEvent) {
 		gameMenu.setVisible(true);
 		minReqMenu.setVisible(false);
 
-		resetPageWrite(getActionEvent());
-	}
-	public void isMVPInGameWrite(ActionEvent actionEvent) {
-		setActionEvent(actionEvent);
-		MainController.write("EventSettings.isMVPInGame");
+		resetPage(actionEvent);
 	}
-	public void isPlayTimes () {
+
+	public void isPlayTimes (ActionEvent actionEvent) {
 		minReqMenu.setVisible(true);
 		gameMenu.setVisible(true);
 
@@ -159,13 +124,10 @@ public void isPlayTimes () {
 			}});
 		}
 
-		resetPageWrite(getActionEvent());
-	}
-	public void isPlayTimeWrite(ActionEvent actionEvent) {
-		setActionEvent(actionEvent);
-		MainController.write("EventSettings.isPlayTimes");
+		resetPage(actionEvent);
 	}
-	public void isWinTimes () {
+
+	public void isWinTimes (ActionEvent actionEvent) {
 		minReqMenu.setVisible(true);
 		gameMenu.setVisible(true);
 
@@ -179,13 +141,10 @@ public void isWinTimes () {
 			}});
 		}
 
-		resetPageWrite(getActionEvent());
+		resetPage(actionEvent);
 	}
-	public void isWinTimesWrite(ActionEvent actionEvent) {
-		setActionEvent(actionEvent);
-		MainController.write("EventSettings.isWinTimes");
-	}
-	public void isWinTimesNonStop () {
+
+	public void isWinTimesNonStop (ActionEvent actionEvent) {
 		minReqMenu.setVisible(true);
 		gameMenu.setVisible(true);
 
@@ -199,10 +158,6 @@ public void isWinTimesNonStop () {
 			}});
 		}
 
-		resetPageWrite(getActionEvent());
-	}
-	public void isWinTimesNonStopWrite(ActionEvent actionEvent) {
-		setActionEvent(actionEvent);
-		MainController.write("EventSettings.isWinTimesNonStop");
+		resetPage(actionEvent);
 	}
 }
diff --git a/src/com/plato/Controller/Menus/EventsTabController.java b/src/com/plato/Controller/Menus/EventsTabController.java
index 99c127d..6d1cb66 100644
--- a/src/com/plato/Controller/Menus/EventsTabController.java
+++ b/src/com/plato/Controller/Menus/EventsTabController.java
@@ -3,6 +3,7 @@
 import Controller.AccountRelated.AccountController;
 import Controller.AccountRelated.EventController;
 import Controller.MainController;
+import Model.AccountRelated.Account;
 import Model.AccountRelated.Event;
 import Model.AccountRelated.Gamer;
 import com.google.gson.Gson;
@@ -46,42 +47,21 @@ public class EventsTabController implements Initializable {
 	public ListView<GridPane> eventsList;
 	public Pane eventInfo;
 	public GridPane gridPane;
-	private MouseEvent mouseEvent;
-	private ActionEvent actionEvent;
 	private static DataOutputStream dataOutputStream;
 	private static DataInputStream dataInputStream;
 	private static Socket socket;
+	private Object Account;
 
 
-	public EventsTabController() {
-		this.mouseEvent = null;
-		this.actionEvent = null;
-	}
-
-	public MouseEvent getMouseEvent() {
-		return mouseEvent;
-	}
-
-	public ActionEvent getActionEvent() {
-		return actionEvent;
-	}
-
-	public void setMouseEvent(MouseEvent mouseEvent) {
-		this.mouseEvent = mouseEvent;
-	}
-
-	public void setActionEvent(ActionEvent actionEvent) {
-		this.actionEvent = actionEvent;
-	}
-
 	public static void setGamerOrAdmin (boolean gamerOrAdmin) {
 		EventsTabController.gamerOrAdmin = gamerOrAdmin;
 	}
 
-	public void filter (ActionEvent actionEvent) {
+	public void filter (ActionEvent actionEvent) throws IOException {
 		LinkedList<Event> eventsToShow;
-		// TODO: 2/3/2021
-		Gamer gamer = (Gamer) AccountController.getInstance().getCurrentAccLoggedIn();
+		dataOutputStream.writeUTF("getCurrentAccLoggedIn_");
+		dataOutputStream.flush();
+		Gamer gamer = (Gamer) new Gson().fromJson(dataInputStream.readUTF() , (Type) Account);
 
 		String showWhich = (showInSession.isSelected() ? "y" : "n") + (showUpcoming.isSelected() ? "y" : "n") + (showParticipatingIn.isSelected() ? "y" : "n");
 
@@ -97,10 +77,8 @@ public void filter (ActionEvent actionEvent) {
 
 		updateList(Event.getSortedEvents(eventsToShow));
 	}
-	public void filterWrite(ActionEvent actionEvent) {
-		MainController.write("EventsTab.filter");
-	}
-	public void createEvent () {
+
+	public void createEvent (ActionEvent actionEvent) {
 		try {
 			EventCreateOrEditPageController.setIsForCreateOrInfo(true);
 			Stage stage = MainController.getInstance().createAndReturnNewStage(
@@ -115,10 +93,7 @@ public void createEvent () {
 			e.printStackTrace();
 		}
 	}
-	public void createEventWrite(ActionEvent actionEvent) {
-		setActionEvent(actionEvent);
-		MainController.write("EventsTab.createEvent");
-	}
+
 	@Override
 	public void initialize (URL location, ResourceBundle resources) {
 		if (gamerOrAdmin)
@@ -195,51 +170,51 @@ public void updateList (LinkedList<Event> eventsToShow) {
 								new Button() {{
 									try {
 										dataOutputStream.writeUTF("getCurrentAccLoggedIn");
-									} catch (IOException e) {
-										e.printStackTrace();
-									}
-									try {
 										dataOutputStream.flush();
 									} catch (IOException e) {
 										e.printStackTrace();
 									}
 									Gamer currentLoggedIn = null;
 									// TODO: 2/3/2021
-									//	currentLoggedIn = (Gamer) new Gson().fromJson(dataInputStream.readUTF(), (Type) Account);
+									try {
+										currentLoggedIn = (Gamer) new Gson().fromJson(dataInputStream.readUTF(), (Type) Account);
+									} catch (IOException exception) {
+										exception.printStackTrace();
+									}
 									;
 									// is already participating in event
 									if (event.participantExists(currentLoggedIn.getUsername())) {
 										setText("Drop-out");
 										setOnAction(e -> {
 											try {
-												dataOutputStream.writeUTF("stopParticipatingInEvent");
+												dataOutputStream.writeUTF("stopParticipatingInEvent_" + event.getEventID());
+												dataOutputStream.flush();
 											} catch (IOException exception) {
 												exception.printStackTrace();
 											}
+											//EventController.getInstance().stopParticipatingInEvent(event.getEventID());
 											try {
-												dataOutputStream.flush();
+												filter(new ActionEvent());
 											} catch (IOException exception) {
 												exception.printStackTrace();
 											}
-											EventController.getInstance().stopParticipatingInEvent(event.getEventID());
-											filter(new ActionEvent());
 										});
 									}
 									else {
 										setText("Join");
 										setOnAction(e -> {
 											try {
-												dataOutputStream.writeUTF("participateInEvent");
+												dataOutputStream.writeUTF("participateInEvent_");
+												dataOutputStream.flush();
 											} catch (IOException exception) {
 												exception.printStackTrace();
 											}
+											//EventController.getInstance().participateInEvent(event.getEventID());
 											try {
-												dataOutputStream.flush();
+												filter(new ActionEvent());
 											} catch (IOException exception) {
 												exception.printStackTrace();
 											}
-											//EventController.getInstance().participateInEvent(event.getEventID());
-											filter(new ActionEvent());
 										});
 									}
 
@@ -311,8 +286,9 @@ public void updateList (LinkedList<Event> eventsToShow) {
 	}
 
 	private void removeEvent (Event event) throws IOException {
-
-		Event.removeEvent(event.getEventID());
+		dataOutputStream.writeUTF("removeEvent_" + event.getEventID());
+		dataOutputStream.flush();
+	//	Event.removeEvent(event.getEventID());
 		filter(new ActionEvent());
 	}
 
@@ -342,20 +318,12 @@ private void displayEventInfo (Event event) {
 		}
 	}
 
-	public void mouseIsOut () {
+	public void mouseIsOut (MouseEvent mouseEvent) {
 		((Button) mouseEvent.getSource()).setOpacity(0.8);
 	}
-	public void mouseIsOutWrite(MouseEvent mouseEvent) {
-		setMouseEvent(mouseEvent);
-		MainController.write("EventsTab.mouseIsOut");
-	}
-	public void mouseIsOver () {
-		((Button) getMouseEvent().getSource()).setOpacity(1);
-	}
 
-	public void mouseIsOverWrite(MouseEvent mouseEvent) {
-		setMouseEvent(mouseEvent);
-		MainController.write("EventsTab.mouseIsOver");
+	public void mouseIsOver (MouseEvent mouseEvent) {
+		((Button) mouseEvent.getSource()).setOpacity(1);
 	}
 }
 
diff --git a/src/com/plato/Controller/Menus/FriendProfileController.java b/src/com/plato/Controller/Menus/FriendProfileController.java
index aceaf05..838de84 100644
--- a/src/com/plato/Controller/Menus/FriendProfileController.java
+++ b/src/com/plato/Controller/Menus/FriendProfileController.java
@@ -26,34 +26,11 @@ public class FriendProfileController implements Initializable {
 	public Label reversiDraws, reversiScore, reversiWins, reversiLosses;
 	public Label battleseaScore, battleseaWins, battleseaLosses, battleseaDraws;
 	public ImageView pfp;
-    private MouseEvent mouseEvent;
-    private ActionEvent actionEvent;
 	private static DataOutputStream dataOutputStream;
 	private static DataInputStream dataInputStream;
 	private static Socket socket;
 
 
-	public FriendProfileController() {
-		this.mouseEvent = null;
-		this.actionEvent = null;
-	}
-
-	public MouseEvent getMouseEvent() {
-		return mouseEvent;
-	}
-
-	public ActionEvent getActionEvent() {
-		return actionEvent;
-	}
-
-	public void setMouseEvent(MouseEvent mouseEvent) {
-		this.mouseEvent = mouseEvent;
-	}
-
-	public void setActionEvent(ActionEvent actionEvent) {
-		this.actionEvent = actionEvent;
-	}
-
 	public static Gamer getFrnd () {
 		return frnd;
 	}
diff --git a/src/com/plato/Controller/Menus/FriendRequestManagementPageController.java b/src/com/plato/Controller/Menus/FriendRequestManagementPageController.java
index 09dacc6..65b7495 100644
--- a/src/com/plato/Controller/Menus/FriendRequestManagementPageController.java
+++ b/src/com/plato/Controller/Menus/FriendRequestManagementPageController.java
@@ -43,7 +43,6 @@ public class FriendRequestManagementPageController implements Initializable {
 	private static DataOutputStream dataOutputStream;
 	private static DataInputStream dataInputStream;
 	private static Socket socket;
-	private Object Account;
 
 
 	public static void setStage (Stage stage) {
@@ -57,9 +56,9 @@ public void sendFriendReq (ActionEvent actionEvent) throws IOException {
 	}
 
 	private void updateAvailableGamersList () throws IOException {
-		dataOutputStream.writeUTF("getCurrentAccLoggedIn");
-		dataOutputStream.flush();
-		Gamer currentLoggedIn = (Gamer)new Gson().fromJson(dataInputStream.readUTF(), (Type) Account);
+//		dataOutputStream.writeUTF("getCurrentAccLoggedIn");
+//		dataOutputStream.flush();
+		Gamer currentLoggedIn = (Gamer) AccountController.getInstance().getCurrentAccLoggedIn();
 		availableForFrndReqList.getItems().clear();
 
 		for (Gamer gamer : Gamer.getGamers(Gamer.getAvailableGamersForFrndReq(currentLoggedIn), search.getText())) {
@@ -100,7 +99,13 @@ private void updateAvailableGamersList () throws IOException {
 					setPadding(new Insets(2.5, 2.5, 2.5, 2.5));
 					setOnMouseEntered(e -> setOpacity(0.8));
 					setOnMouseExited(e -> setOpacity(1));
-					setOnMouseClicked(e -> sendFriendReqDone(username.getText()));
+					setOnMouseClicked(e -> {
+						try {
+							sendFriendReqDone(username.getText());
+						} catch (IOException exception) {
+							exception.printStackTrace();
+						}
+					});
 				}};
 
 				circle.setCenterX(pfp.getFitHeight() / 2);
@@ -113,18 +118,24 @@ private void updateAvailableGamersList () throws IOException {
 		}
 	}
 
-	private void sendFriendReqDone (String usernameTo) {
-		FriendRequestController.getInstance().sendFrndRequest(usernameTo);
+	private void sendFriendReqDone (String usernameTo) throws IOException {
+		dataOutputStream.writeUTF("sendFrndRequest_" + usernameTo);
+		dataOutputStream.flush();
+	//	FriendRequestController.getInstance().sendFrndRequest(usernameTo);
 		availableForFrndReqList.getItems().removeIf(item -> ((Label) item.getChildren().get(1)).getText().equals(usernameTo));
 	}
 
-	private void declineFriendReq (String usernameFrom) {
-		FriendRequestController.getInstance().declineFriendReq(usernameFrom);
+	private void declineFriendReq (String usernameFrom) throws IOException {
+		dataOutputStream.writeUTF("declineFriendReq_" + usernameFrom);
+		dataOutputStream.flush();
+		//FriendRequestController.getInstance().declineFriendReq(usernameFrom);
 		frndReqsGottenList.getItems().removeIf(item -> ((Label) item.getChildren().get(1)).getText().equals(usernameFrom));
 	}
 
-	private void acceptFriendReq (String usernameFrom) {
-		FriendRequestController.getInstance().acceptFriendReq(usernameFrom);
+	private void acceptFriendReq (String usernameFrom) throws IOException {
+		dataOutputStream.writeUTF("acceptFriendReq_" + usernameFrom);
+		dataOutputStream.flush();
+		//FriendRequestController.getInstance().acceptFriendReq(usernameFrom);
 		frndReqsGottenList.getItems().removeIf(item -> ((Label) item.getChildren().get(1)).getText().equals(usernameFrom));
 	}
 
@@ -139,8 +150,7 @@ public void initialize (URL url, ResourceBundle resourceBundle) {
 
 
 		for (FriendRequest friendRequest : FriendRequest.getFriendReq(AccountController.getInstance().getCurrentAccLoggedIn().getUsername())) {
-			// TODO: 2/3/2021
-			//Gamer gamerFrom = (Gamer) Account.getAccount(friendRequest.getFromUsername());
+			Gamer gamerFrom = (Gamer) Account.getAccount(friendRequest.getFromUsername());
 
 			Circle circle = new Circle(50);
 
@@ -180,7 +190,13 @@ public void initialize (URL url, ResourceBundle resourceBundle) {
 					setPadding(new Insets(5, 5, 5, 5));
 					setOnMouseEntered(e -> setOpacity(0.8));
 					setOnMouseExited(e -> setOpacity(1));
-					setOnMouseClicked(e -> acceptFriendReq(username.getText()));
+					setOnMouseClicked(e -> {
+						try {
+							acceptFriendReq(username.getText());
+						} catch (IOException exception) {
+							exception.printStackTrace();
+						}
+					});
 				}};
 				Button declineBtn = new Button() {{
 					setStyle("-fx-background-image: url('https://i.imgur.com/kMFxd9Q.png');" +
@@ -191,7 +207,13 @@ public void initialize (URL url, ResourceBundle resourceBundle) {
 					setPadding(new Insets(5, 5, 5, 5));
 					setOnMouseEntered(e -> setOpacity(0.8));
 					setOnMouseExited(e -> setOpacity(1));
-					setOnMouseClicked(e -> declineFriendReq(username.getText()));
+					setOnMouseClicked(e -> {
+						try {
+							declineFriendReq(username.getText());
+						} catch (IOException exception) {
+							exception.printStackTrace();
+						}
+					});
 				}};
 
 				circle.setCenterX(pfp.getFitHeight() / 2);
diff --git a/src/com/plato/Controller/Menus/FriendsTabController.java b/src/com/plato/Controller/Menus/FriendsTabController.java
index b5d92b9..93842e6 100644
--- a/src/com/plato/Controller/Menus/FriendsTabController.java
+++ b/src/com/plato/Controller/Menus/FriendsTabController.java
@@ -39,8 +39,6 @@ public class FriendsTabController implements Initializable {
 	public ListView<GridPane> frndsList;
 	private static DataInputStream dataInputStream;
 	private static DataOutputStream dataOutputStream;
-	private Object Account;
-
 	@Override
 	public void initialize (URL url, ResourceBundle resourceBundle) {
 		try {
@@ -52,12 +50,11 @@ public void initialize (URL url, ResourceBundle resourceBundle) {
 
 	public void updateFrndsList (ActionEvent actionEvent) throws IOException {
 		frndsList.getItems().clear();
-		dataOutputStream.writeUTF("getCurrentAccLoggedIn");
-		dataOutputStream.flush();
-		Gamer currentAccLoggedIn = (Gamer) new Gson().fromJson(dataInputStream.readUTF(), (Type) Account);
+//		dataOutputStream.writeUTF("getCurrentAccLoggedIn");
+//		dataOutputStream.flush();
+		Gamer currentAccLoggedIn = (Gamer) AccountController.getInstance().getCurrentAccLoggedIn();
 		for (String frndUN : currentAccLoggedIn.getFrnds()) {
-			// TODO: 2/3/2021
-			//Gamer frndAcc = (Gamer) Account.getAccount(frndUN);
+			Gamer frndAcc = (Gamer) Account.getAccount(frndUN);
 
 			Circle circle = new Circle(40);
 
@@ -124,7 +121,7 @@ public void updateFrndsList (ActionEvent actionEvent) throws IOException {
 	private void unfriend (String frndUN) throws IOException {
 		dataOutputStream.writeUTF("removeFriend_"+frndUN);
 		dataOutputStream.flush();
-		GamerController.getInstance().removeFriend(frndUN);
+		//GamerController.getInstance().removeFriend(frndUN);
 
 		if (FriendProfileController.getFrnd() != null && FriendProfileController.getFrnd().getUsername().equals(frndUN))
 			frndProfile.getChildren().clear();
@@ -136,7 +133,6 @@ private void unfriend (String frndUN) throws IOException {
 	private void displayFriendProfile (String frndUn) {
 		try {
 			frndProfile.getChildren().clear();
-			// TODO: 2/3/2021
 			FriendProfileController.setFrnd((Gamer) Account.getAccount(frndUn));
 			frndProfile.getChildren().add(FXMLLoader.load(new File("src/com/plato/View/Menus/FriendProfile.fxml").toURI().toURL()));
 			GridPane.setValignment(frndProfile.getChildren().get(0), VPos.CENTER);
diff --git a/src/com/plato/Controller/Server.java b/src/com/plato/Controller/Server.java
index f9a5939..8affb9b 100644
--- a/src/com/plato/Controller/Server.java
+++ b/src/com/plato/Controller/Server.java
@@ -1,9 +1,6 @@
 package Controller;
 
-import Controller.AccountRelated.AccountController;
-import Controller.AccountRelated.EventController;
-import Controller.AccountRelated.GamerController;
-import Controller.AccountRelated.MessageController;
+import Controller.AccountRelated.*;
 import Controller.GameRelated.BattleSea.BattleSeaController;
 import Controller.GameRelated.BattleSea.BombController;
 import Controller.GameRelated.BattleSea.ShipController;
@@ -198,6 +195,15 @@ public void run() {
                     double prize = Double.parseDouble(receivedInfo[4]);
                     EventController.getInstance().createEvent(receivedInfo[1],receivedInfo[2],receivedInfo[3],EventCreateOrEditPageController.getEvent().getStart(), EventCreateOrEditPageController.getEvent().getEnd(),prize,receivedInfo[5]);
                     break;
+                case "sendFrndRequest":
+                    FriendRequestController.getInstance().sendFrndRequest(receivedInfo[1]);
+                    break;
+                case "declineFriendReq" :
+                    FriendRequestController.getInstance().declineFriendReq(receivedInfo[1]);
+                    break;
+                case "acceptFriendReq" :
+                    FriendRequestController.getInstance().acceptFriendReq(receivedInfo[1]);
+                    break;
             }
         }catch (IOException | BombController.CoordinateAlreadyBombedException | ReversiController.PlayerHasAlreadyPlacedDiskException | EventController.GameNameCantBeEmptyException e){
             System.out.println("connection closed!");