Skip to content

Commit

Permalink
Merge pull request #161 from AP2020Fall/elahe
Browse files Browse the repository at this point in the history 
Elahe
  • Loading branch information
@elahemrtz
elahemrtz committed Feb 3, 2021
2 parents 2c3d1d3 + fbbab9c commit b5bfac0
Show file tree
Hide file tree
Showing 11 changed files with 288 additions and 430 deletions.
59 changes: 8 additions & 51 deletions src/com/plato/Controller/Menus/DeleteAccountController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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(
Expand All @@ -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");
}

}
106 changes: 26 additions & 80 deletions src/com/plato/Controller/Menus/DisplayPersonalAccInfoController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 -> {
Expand Down Expand Up @@ -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());
Expand All @@ -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());
Expand Down Expand Up @@ -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");
}

}
41 changes: 5 additions & 36 deletions src/com/plato/Controller/Menus/EditPWController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -131,31 +108,23 @@ 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();

try {
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");
}

}
Loading

0 comments on commit b5bfac0

Please sign in to comment.