From 33e5b11b7bcba684216be5a383679ff07e6ae265 Mon Sep 17 00:00:00 2001 From: moamdavoodi <58753725+moamdavoodi@users.noreply.github.com> Date: Fri, 24 Jul 2020 23:14:03 +0430 Subject: [PATCH] phase 3; no, i am the one who knocks! --- .../PurchasePagePaymentController.java | 2 +- .../loginPanel/LoginPanelController.java | 195 ++++++++++++------ .../ManagerAccountPageController.java | 4 +- .../ManagerEditInfoPageController.java | 2 +- .../PurchaserWalletController.java | 2 +- .../AllProductsForAuctionPageController.java | 2 +- .../sellerAccount/SellerWalletController.java | 6 +- src/main/java/module-info.java | 2 +- src/main/java/server/main/Main.java | 113 ++-------- src/main/java/server/viewServer/a.java | 4 - .../loginPanel/LoginPanelServer.java | 1 + .../PurchasePagePaymentController.class | Bin 3872 -> 3875 bytes .../loginPanel/LoginPanelController$1.class | Bin 0 -> 1057 bytes .../loginPanel/LoginPanelController$2.class | Bin 0 -> 842 bytes .../loginPanel/LoginPanelController$3.class | Bin 0 -> 981 bytes .../loginPanel/LoginPanelController$4.class | Bin 0 -> 1054 bytes .../loginPanel/LoginPanelController.class | Bin 5434 -> 8674 bytes .../ManagerAccountPageController.class | Bin 9001 -> 9004 bytes .../ManagerEditInfoPageController.class | Bin 4369 -> 4372 bytes .../PurchaserWalletController.class | Bin 3611 -> 3614 bytes .../AllProductsForAuctionPageController.class | Bin 5778 -> 5781 bytes .../SellerWalletController.class | Bin 5077 -> 5080 bytes target/classes/module-info.class | Bin 1637 -> 1617 bytes target/classes/server/main/Main$1.class | Bin 0 -> 718 bytes target/classes/server/main/Main.class | Bin 6516 -> 5446 bytes target/classes/server/viewServer/a.class | Bin 264 -> 0 bytes .../LoginPanelServer$ClientHandler.class | Bin 3800 -> 3800 bytes .../LoginPanel/LoginPanelServer.class | Bin 2938 -> 3085 bytes 28 files changed, 160 insertions(+), 173 deletions(-) delete mode 100644 src/main/java/server/viewServer/a.java create mode 100644 target/classes/client/graphicView/userRegion/loginPanel/LoginPanelController$1.class create mode 100644 target/classes/client/graphicView/userRegion/loginPanel/LoginPanelController$2.class create mode 100644 target/classes/client/graphicView/userRegion/loginPanel/LoginPanelController$3.class create mode 100644 target/classes/client/graphicView/userRegion/loginPanel/LoginPanelController$4.class create mode 100644 target/classes/server/main/Main$1.class delete mode 100644 target/classes/server/viewServer/a.class diff --git a/src/main/java/client/graphicView/purchasePage/PurchasePagePaymentController.java b/src/main/java/client/graphicView/purchasePage/PurchasePagePaymentController.java index d9f55389..c5b4a223 100644 --- a/src/main/java/client/graphicView/purchasePage/PurchasePagePaymentController.java +++ b/src/main/java/client/graphicView/purchasePage/PurchasePagePaymentController.java @@ -58,7 +58,7 @@ public void goPaymentAction(ActionEvent actionEvent) throws IOException { String response = in.readUTF(); receiveMessageId.setText(response); if (response.equals("done successfully")) { - out.writeUTF("get_size " + LoginPanelController.token); + out.writeUTF("get_size " + LoginPanelController.getToken()); out.flush(); int size = Integer.parseInt(in.readUTF()); for (int i = 0; i < size; i++) { diff --git a/src/main/java/client/graphicView/userRegion/loginPanel/LoginPanelController.java b/src/main/java/client/graphicView/userRegion/loginPanel/LoginPanelController.java index a58ea098..87cf20f7 100644 --- a/src/main/java/client/graphicView/userRegion/loginPanel/LoginPanelController.java +++ b/src/main/java/client/graphicView/userRegion/loginPanel/LoginPanelController.java @@ -1,10 +1,6 @@ package client.graphicView.userRegion.loginPanel; -import server.controller.LoginPageController; -import server.controller.ValidationController; -import server.exception.UsernameExistsException; -import server.exception.UsernameNotExistsException; -import server.exception.WrongPasswordException; +import javafx.application.Platform; import javafx.collections.FXCollections; import javafx.collections.ObservableList; import javafx.fxml.FXML; @@ -14,57 +10,54 @@ import javafx.scene.media.MediaPlayer; import server.model.account.Account; -import java.io.File; -import java.io.IOException; +import java.io.*; +import java.net.Socket; import java.net.URL; -import java.util.HashMap; import java.util.ResourceBundle; public class LoginPanelController implements Initializable { // pass this to next scene for adding properties private static Account loggedInAccount; - - public static void setLoggedInAccount(Account loggedInAccount) { - LoginPanelController.loggedInAccount = loggedInAccount; - } - - public static Account getLoggedInAccount() { - return loggedInAccount; - } - - public static String token; - + private static String token; final ObservableList accountTypesList = FXCollections.observableArrayList("Head Manager", "Seller", "Purchaser"); + private final int PORT = 9050; + private final String IP = "127.0.0.1"; + private DataOutputStream out; + private DataInputStream in; @FXML private ComboBox accountTypes = new ComboBox<>(); - // check if clicked, then can login @FXML private RadioButton agreeButton = new RadioButton(); - @FXML private TextField loginUsernameField = new TextField(); - @FXML private TextField registerUsernameField = new TextField(); - @FXML private PasswordField loginPasswordField = new PasswordField(); - @FXML private PasswordField registerPasswordField = new PasswordField(); - @FXML private Label loginMessageText = new Label(); - @FXML private Label registerMessageText = new Label(); - @FXML private TextField registerEmailField = new TextField(); + public static String getToken() { + return token; + } + + public static Account getLoggedInAccount() { + return loggedInAccount; + } + + public static void setLoggedInAccount(Account loggedInAccount) { + LoginPanelController.loggedInAccount = loggedInAccount; + } + // after hit the buttons, call this void resetFields() { registerEmailField.setText(""); @@ -101,28 +94,14 @@ private void processRegister() { return; } if (accountTypes.getValue() == null) { - registerMessageText.setText("Select server.main.Main type first"); + registerMessageText.setText("Select server.Main type first"); return; } try { - ValidationController.checkUsernameForRegistration(registerUsernameField.getText()); - LoginPanel.window.close(); - if (accountTypes.getValue().equals("Head Manager")) { - ManagerInfoSetPanel.display(registerUsernameField.getText(), - registerPasswordField.getText(), - registerEmailField.getText()); - } else if (accountTypes.getValue().equals("Seller")) { - SellerInfoSetPanel.display(registerUsernameField.getText(), - registerPasswordField.getText(), - registerEmailField.getText()); - } else { - PurchaserInfoSetPanel.display(registerUsernameField.getText(), - registerPasswordField.getText(), - registerEmailField.getText()); - } - resetFields(); - } catch (UsernameExistsException | IOException exception) { - registerMessageText.setText(exception.getMessage()); + out.writeUTF("checkUsernameForRegistration:" + registerUsernameField.getText()); + out.flush(); + } catch (IOException exception) { + exception.printStackTrace(); } } @@ -135,35 +114,131 @@ private void processLogin() { loginMessageText.setText("Invalid username"); return; } -// check password only consist words, numbers and longer than 8 + // check password only consist words, numbers and longer than 8 if (!loginPasswordField.getText().matches("\\w{8,}")) { loginMessageText.setText("Invalid password"); return; } try { - LoginPageController.processLogin(loginUsernameField.getText(), - loginPasswordField.getText()); - resetFields(); - LoginPanel.window.close(); -// TODO: goto next scene - } catch (UsernameNotExistsException | WrongPasswordException exception) { - loginMessageText.setText(exception.getMessage()); + out.writeUTF("processLogin:" + loginUsernameField.getText() + "," + loginPasswordField.getText()); + out.flush(); + // TODO: goto next scene + } catch (IOException e) { + e.printStackTrace(); } } private void playButtonSound() { - MediaPlayer mediaPlayer = new MediaPlayer(new Media(new File("src/server.main/resources/media/sound/Mouse-Click-00-c-FesliyanStudios.com.mp3").toURI().toString())); + MediaPlayer mediaPlayer = new MediaPlayer(new Media(new File("src/main/resources/media/sound/Mouse-Click-00-c-FesliyanStudios.com.mp3").toURI().toString())); mediaPlayer.play(); } + + public void input() { + while (true) { + String input; + try { + input = in.readUTF(); + if (input.startsWith("MainManagerIsRegistered")) { + accountTypesList.remove(0); + accountTypes.setItems(accountTypesList); + + } else if (input.startsWith("MainManagerIsNotRegistered")) { + accountTypes.setItems(accountTypesList); + + } else if (input.startsWith("checkUsernameForRegistrationFalse")) { + int colonIndex = input.indexOf(":"); + String exceptionMessage = input.substring(colonIndex + 1); + Platform.runLater(new Runnable() { + @Override + public void run() { + registerMessageText.setText(exceptionMessage); + } + }); + + } else if (input.startsWith("checkUsernameForRegistrationTrue")) { + Platform.runLater(new Runnable() { + @Override + public void run() { + processGoToInfoSetPanel(); + } + }); + + } else if (input.startsWith("loginSuccessful:")) { + int colonIndex = input.indexOf(":"); + LoginPanelController.token = input.substring(colonIndex + 1); + Platform.runLater(new Runnable() { + @Override + public void run() { + resetFields(); + LoginPanel.window.close(); + } + }); + + } else if (input.startsWith("loginUnsuccessful:")) { + int colonIndex = input.indexOf(":"); + String exceptionMessage = input.substring(colonIndex + 1); + Platform.runLater(new Runnable() { + @Override + public void run() { + loginMessageText.setText(exceptionMessage); + } + }); + + } + } catch (IOException e) { + e.printStackTrace(); + } + + } + } + + private void processGoToInfoSetPanel() { + LoginPanel.window.close(); + try { + if (accountTypes.getValue().equals("Head Manager")) { + ManagerInfoSetPanel.display(registerUsernameField.getText(), + registerPasswordField.getText(), + registerEmailField.getText()); + + } else if (accountTypes.getValue().equals("Seller")) { + SellerInfoSetPanel.display(registerUsernameField.getText(), + registerPasswordField.getText(), + registerEmailField.getText()); + + } else { + PurchaserInfoSetPanel.display(registerUsernameField.getText(), + registerPasswordField.getText(), + registerEmailField.getText()); + + } + } catch (IOException e) { + e.printStackTrace(); + } + resetFields(); + } + + public void processInitialize() { + try { + Socket socket = new Socket(IP, PORT); + out = new DataOutputStream(new BufferedOutputStream(socket.getOutputStream())); + in = new DataInputStream(new BufferedInputStream(socket.getInputStream())); + new Thread(this::input).start(); + } catch (IOException e) { + e.printStackTrace(); + } + } + @Override public void initialize(URL url, ResourceBundle resourceBundle) { - + processInitialize(); loggedInAccount = null; // manager can register only once - if (LoginPageController.isIsMainManagerRegistered()) { - accountTypesList.remove(0); + try { + out.writeUTF("IsMainManagerRegistered"); + out.flush(); + } catch (IOException e) { + e.printStackTrace(); } - accountTypes.setItems(accountTypesList); } -} +} \ No newline at end of file diff --git a/src/main/java/client/graphicView/userRegion/userAccount/managerAccount/ManagerAccountPageController.java b/src/main/java/client/graphicView/userRegion/userAccount/managerAccount/ManagerAccountPageController.java index b08c3bc8..39dbe5e8 100644 --- a/src/main/java/client/graphicView/userRegion/userAccount/managerAccount/ManagerAccountPageController.java +++ b/src/main/java/client/graphicView/userRegion/userAccount/managerAccount/ManagerAccountPageController.java @@ -70,7 +70,7 @@ public class ManagerAccountPageController implements Initializable { @FXML private void logout() throws IOException { - out.writeUTF("logout " + LoginPanelController.token); + out.writeUTF("logout " + LoginPanelController.getToken()); out.flush(); LoginPanelController.setLoggedInAccount(null); ManagerAccountPage.primaryStage.close(); @@ -96,7 +96,7 @@ public void processWriteInformation(String firstName, String lastName, String us public void writeInformationForManager() { try { - out.writeUTF("get_information " + LoginPanelController.token); + out.writeUTF("get_information " + LoginPanelController.getToken()); out.flush(); } catch (IOException e) { e.printStackTrace(); diff --git a/src/main/java/client/graphicView/userRegion/userAccount/managerAccount/ManagerEditInfoPageController.java b/src/main/java/client/graphicView/userRegion/userAccount/managerAccount/ManagerEditInfoPageController.java index f9475658..b361a9bc 100644 --- a/src/main/java/client/graphicView/userRegion/userAccount/managerAccount/ManagerEditInfoPageController.java +++ b/src/main/java/client/graphicView/userRegion/userAccount/managerAccount/ManagerEditInfoPageController.java @@ -83,7 +83,7 @@ public void applyChanges() { @FXML public void logout() throws IOException { ManagerEditInfoPage.primaryStage.close(); - out.writeUTF("logout " + LoginPanelController.token); + out.writeUTF("logout " + LoginPanelController.getToken()); out.flush(); LoginPanelController.setLoggedInAccount(null); MainMenu.display(Main.window); diff --git a/src/main/java/client/graphicView/userRegion/userAccount/purchaserAccount/PurchaserWalletController.java b/src/main/java/client/graphicView/userRegion/userAccount/purchaserAccount/PurchaserWalletController.java index 9138e8fc..14cbfe4e 100644 --- a/src/main/java/client/graphicView/userRegion/userAccount/purchaserAccount/PurchaserWalletController.java +++ b/src/main/java/client/graphicView/userRegion/userAccount/purchaserAccount/PurchaserWalletController.java @@ -57,7 +57,7 @@ public void goPaymentAction() throws IOException { String response = in.readUTF(); receiveMessageId.setText(response); if (response.equals("done successfully")) { - out.writeUTF("set_balance " + amountId.getText() + " " + LoginPanelController.token); + out.writeUTF("set_balance " + amountId.getText() + " " + LoginPanelController.getToken()); out.flush(); } } diff --git a/src/main/java/client/graphicView/userRegion/userAccount/sellerAccount/AllProductsForAuctionPageController.java b/src/main/java/client/graphicView/userRegion/userAccount/sellerAccount/AllProductsForAuctionPageController.java index 7825e535..f1d504a7 100644 --- a/src/main/java/client/graphicView/userRegion/userAccount/sellerAccount/AllProductsForAuctionPageController.java +++ b/src/main/java/client/graphicView/userRegion/userAccount/sellerAccount/AllProductsForAuctionPageController.java @@ -84,7 +84,7 @@ public void back() throws IOException { @FXML public void logout() throws IOException { - out.writeUTF("logout " + LoginPanelController.token); + out.writeUTF("logout " + LoginPanelController.getToken()); out.flush(); LoginPanelController.setLoggedInAccount(null); AllProductsForAuctionPage.primaryStage.close(); diff --git a/src/main/java/client/graphicView/userRegion/userAccount/sellerAccount/SellerWalletController.java b/src/main/java/client/graphicView/userRegion/userAccount/sellerAccount/SellerWalletController.java index f21c46d8..5537faec 100644 --- a/src/main/java/client/graphicView/userRegion/userAccount/sellerAccount/SellerWalletController.java +++ b/src/main/java/client/graphicView/userRegion/userAccount/sellerAccount/SellerWalletController.java @@ -56,7 +56,7 @@ public void initialize(URL url, ResourceBundle resourceBundle) { process(); String balance = null; try { - out.writeUTF("get_balance " + LoginPanelController.token); + out.writeUTF("get_balance " + LoginPanelController.getToken()); out.flush(); balance = in.readUTF(); } catch (IOException e) { @@ -70,7 +70,7 @@ public void initialize(URL url, ResourceBundle resourceBundle) { public void receiveAction() throws IOException { String balance = null; try { - out.writeUTF("get_balance " + LoginPanelController.token); + out.writeUTF("get_balance " + LoginPanelController.getToken()); out.flush(); balance = in.readUTF(); } catch (IOException e) { @@ -89,7 +89,7 @@ public void receiveAction() throws IOException { String respond = in.readUTF(); receiveMessageId.setText(respond); if (respond.equals("done successfully")) { - out.writeUTF("set_balance " + amountId.getText() + " " + LoginPanelController.token); + out.writeUTF("set_balance " + amountId.getText() + " " + LoginPanelController.getToken()); out.flush(); String amount = in.readUTF(); creditId.setText("Credit " + amount + " $"); diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index 30e0d452..401323ec 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -34,5 +34,5 @@ opens client.graphicView.userRegion.userAccount.managerAccount to javafx.fxml; opens client.graphicView.userRegion.userAccount.sellerAccount to javafx.fxml; opens client.graphicView.userRegion.userAccount.purchaserAccount to javafx.fxml; - opens server to javafx.graphics; +// opens server to javafx.graphics; } \ No newline at end of file diff --git a/src/main/java/server/main/Main.java b/src/main/java/server/main/Main.java index 767e8ab1..97c2275d 100644 --- a/src/main/java/server/main/Main.java +++ b/src/main/java/server/main/Main.java @@ -1,8 +1,5 @@ package server.main; -import server.controller.LoginPageController; -import client.graphicView.mainMenu.MainMenu; -import javafx.application.Application; import javafx.scene.media.MediaPlayer; import javafx.stage.Stage; import server.model.Category; @@ -14,13 +11,13 @@ import server.model.comment.Comment; import server.model.product.Auction; import server.model.product.Product; +import server.viewServer.mainMenu.MainMenuServer; +import server.viewServer.userRegion.loginPanel.LoginPanelServer; import java.io.IOException; import java.util.ArrayList; -import java.util.Date; -public class Main extends Application { -// static ArrayList all = new ArrayList<>(); +public class Main { public static Product good; public static Stage accountRegionStage; static MediaPlayer mediaPlayer; @@ -36,100 +33,18 @@ public static void setAccountRegionStage(Stage accountRegionStage) { public static void main(String[] args) throws IOException { reload(); -// setMediaPlayer("The Swimmer.mp3"); - - -// new Category("digital", null, "tom.jpg"); -// new Category("home", null, "tom.jpg"); -// new Category("laptop", Category.getCategoryByName("digital"), "tom.jpg"); -// new Category("phone", Category.getCategoryByName("digital"), "tom.jpg"); -// new Category("vacuum cleaner", Category.getCategoryByName("home"), "tom.jpg"); -// Category category = new Category("apple", Category.getCategoryByName("phone"), "tom.jpg"); -// ArrayList attributes = new ArrayList<>(); -// attributes.add("Strong"); -// attributes.add("created by steve jobs"); -// attributes.add("designed by california"); -// attributes.add("American Good"); -// attributes.add("fast and powerful"); -// category.setAttributes(attributes); -// Seller seller = new Seller("dariush_amiri", "Dariush", "amiri", "dariush_amiri@co.co", "66255252", "1234", "apple", "sattarkhan", "3478546355"); -// Seller seller1 = new Seller("finn_colin", "finn", "colin", "finn_colin@co.co", "6625525222", "123456", "apple", "sattarkhan2", "34785463552222"); -// Seller seller2 = new Seller("Berlin", "professor", "professorzadeh", "berlin_B@co.co", "09129990000", "12345", "apple", "california", "001234567"); -// new Category("samsung", Category.getCategoryByName("phone"), "tom.jpg"); -// new Category("lg", Category.getCategoryByName("phone"), "tom.jpg"); -// new Category("siemens", Category.getCategoryByName("vacuum cleaner"), "tom.jpg"); -// new Category("bosch", Category.getCategoryByName("vacuum cleaner"), "tom.jpg"); -// new Category("dell", Category.getCategoryByName("laptop"), "tom.jpg"); -// new Category("asus", Category.getCategoryByName("laptop"), "tom.jpg"); -// new Category("sony", Category.getCategoryByName("laptop"), "tom.jpg"); -//// -// new Product(Category.getCategoryByName("apple"), "iphone x", "apple", 10, "beautiful", "tom.jpg"); -// Product product = new Product(Category.getCategoryByName("apple"), "iphone 12", "apple", 12, "beautiful", "tom.jpg"); -// ArrayList allSeller = new ArrayList<>(); -// allSeller.add(seller); -// allSeller.add(seller1); -// allSeller.add(seller2); -// product.setAllSellers(allSeller); -// Purchaser account = new Purchaser("darius-amr", "dariush", "amiri", "dar_am@u.co", "394843984", "1234", "sattarkhan ave"); -// Purchaser account1 = new Purchaser("darius-amr", "dariush", "amiri", "dar_am@u.co", "394843984", "1234", "sattarkhan ave"); -// Purchaser account2 = new Purchaser("darius-amr", "dariush", "amiri", "dar_am@u.co", "394843984", "1234", "sattarkhan ave"); -// -// new Comment(account, product, "low", "quality"); -// new Comment(account1, product, "medium", "quality"); -// new Comment(account2, product, "high", "quality"); -// new Comment(account2, product, "ful", "power"); -// new Comment(account1, product, "mid", "power"); -// new Comment(account, product, "weak", "power"); -// new Comment(account1, product, "good", "support"); -// new Comment(account, product, "excellent", "support"); -// new Comment(account2, product, "low", "support"); -// -// new Product(Category.getCategoryByName("apple"), "iphone 7plus", "apple", 7, "excellent", "tom.jpg"); -// new Product(Category.getCategoryByName("samsung"), "galaxy s10", "samsung", 1500, "high", "tom.jpg"); -// new Product(Category.getCategoryByName("samsung"), "galaxy s9", "samsung", 9, "medium", "tom.jpg"); -// new Product(Category.getCategoryByName("lg"), "G2", "lg", 9, "medium", "tom.jpg"); -// new Product(Category.getCategoryByName("lg"), "G3", "lg", 9, "medium", "tom.jpg"); -// new Product(Category.getCategoryByName("siemens"), "s1", "siemens", 10, "very good", "tom.jpg"); -// new Product(Category.getCategoryByName("Bosch"), "b2", "bosch", 10, "very good", "tom.jpg"); -// new Product(Category.getCategoryByName("asus"), "zenBook 13", "asus", 10, "very good", "tom.jpg"); -// new Product(Category.getCategoryByName("asus"), "zenBook 15", "asus", 10, "very good", "tom.jpg"); -// new Product(Category.getCategoryByName("dell"), "d12", "dell", 10, "very good", "tom.jpg"); -// new Product(Category.getCategoryByName("dell"), "d15", "dell", 10, "very good", "tom.jpg"); -// new Product(Category.getCategoryByName("sony"), "sonyPro3", "sony", 10, "very good", "tom.jpg"); -// new Product(Category.getCategoryByName("sony"), "sonyPro5", "sony", 10, "very good", "tom.jpg"); -// new Manager("steve_jobs", "steve", "jobs", "steve@co.co", "001982625373", "1111"); -// server.main.BankAPI bankAPI = new server.main.BankAPI(); -// for (ShopBankAccount bankAccount : ShopBankAccount.allShopBankAccount) { -// bankAPI.SendMessage("get_token " + bankAccount.getUserName() + " " + bankAccount.getPassword()); -// bankAPI.SendMessage("create_receipt " + bankAPI.getInputStream() + " deposit " + 1000 + " " + (-1) + " " + bankAccount.getAccountId() + " " + "deposit"); -// bankAPI.SendMessage("pay " + Integer.parseInt(bankAPI.getInputStream())); -// bankAPI.getInputStream(); -// } - - Product product = new Product(Category.getCategoryByName("apple"), "iphone15", "apple", 15, "tak tir", "tom.jpg"); - -// for (Category subCategory : Category.getCategoryByName("digital").getSubCategories()) { -// for (Category category : subCategory.getSubCategories()) { -// for (Product allSubProduct : category.getAllSubProducts()) { -// System.out.println("line 135 server.main.Main " + "digital" + " " + subCategory.getName() + " " + category.getName() + " " + allSubProduct.getName()); -// -// } -// } -// } - Date fin = new Date(120, 6, 23, 15, 40, 45); - new Auction(product.getCategory(), product.getName(), product.getCompanyName(), product.getPrice(), product.getExplanationText(), product.getImageName(), fin); - LoginPageController.setLoggedInAccount(Account.getAccountByUsername("purchaserpurchaser")); - Manager.getAllManagers().get(0).setMinAmount(5); - launch(args); - - - } +// new MainMenuServer(); + new Thread(new Runnable() { + @Override + public void run() { + try { + new LoginPanelServer(); + } catch (IOException e) { + e.printStackTrace(); + } - @Override - public void start(Stage stage) throws Exception { - stage.setWidth(1275); - stage.setHeight(720); - MainMenu.display(stage); + } + }).start(); } private static void setCategoryParent(ArrayList all) { diff --git a/src/main/java/server/viewServer/a.java b/src/main/java/server/viewServer/a.java deleted file mode 100644 index 03682cc1..00000000 --- a/src/main/java/server/viewServer/a.java +++ /dev/null @@ -1,4 +0,0 @@ -package server.viewServer; - -public class a { -} diff --git a/src/main/java/server/viewServer/userRegion/loginPanel/LoginPanelServer.java b/src/main/java/server/viewServer/userRegion/loginPanel/LoginPanelServer.java index 0f345bca..e1736e54 100644 --- a/src/main/java/server/viewServer/userRegion/loginPanel/LoginPanelServer.java +++ b/src/main/java/server/viewServer/userRegion/loginPanel/LoginPanelServer.java @@ -27,6 +27,7 @@ public static HashMap getTokenToUser() { } public LoginPanelServer() throws IOException { + System.out.println("here"); loginPanelServer = new ServerSocket(port); new Thread(() -> { while (true) { diff --git a/target/classes/client/graphicView/purchasePage/PurchasePagePaymentController.class b/target/classes/client/graphicView/purchasePage/PurchasePagePaymentController.class index 16cf969da9a949be86345eed3458694c3f04faef..06439bce6e8268f6e68ec06006e85825b5ffdf39 100644 GIT binary patch delta 43 zcmZ1=w^(jNGaD}#LpMVYJ3}uILmxxxW}PK7yOp0}qJP4q z)x-yXfIrH32Z%h#8=LIhkIbBV?wvEg|NQ&~;3@VCaFBD6_ppRzh8JNhg-ZQM^Wi{- zJt;oBFCKY;0u`5PYac4~P!^k(GP{I!<^YR1U7cmjO zfh`x?9&TcXVcQa(zm>r?BAq~P)c2;P3EmM7+x+$rFPI_D0F0`c$#Udp3|9PD0Y%ehvK!g z?QYFe=e`{bk$t7YI58xaBasf0QxCgVDN9lfGrFvmV`0)ai6Pf}tCY~~m>VMus-#B` z47cEv%T|^ES$Z|}kR19;xI?x|UYl&rW}3T~V9mWtxXmB9@{Ljs?$WwUFu-Trqjht7 z_&#bBSr`k+@PK>=W%3@5*DA$_l(8pE%?q##TqEOt$MqR-aSZkatN1zww|p(+1U!#N a6gjA)K{ij)Z(?tpso*i$BJH-F(DxTpwGvGL literal 0 HcmV?d00001 diff --git a/target/classes/client/graphicView/userRegion/loginPanel/LoginPanelController$2.class b/target/classes/client/graphicView/userRegion/loginPanel/LoginPanelController$2.class new file mode 100644 index 0000000000000000000000000000000000000000..3b976f36e78f4d56e785e75132aee41cf94534ab GIT binary patch literal 842 zcmbtS%T5$Q6g@RG(?iq3hzR0aGYc3Ko3L;piqVM=k`W1z+1E5>Pm%K0q^etghXjAX z#7E-75AdUmx0;D;+)X7__mOkYeboK^=jSf~k8ytv4a~%dQp}<$@GLi4QJED^jz>Bl zX!R+pymAMs(3Ub|3r+iyl*#)4)Sji%S!0yzYzZ{Wk@lTUrs_|{wVj}axfn@`d87jE z6ZuhQMpBWz8=k1V2gP4W_@FjU;&FU+9@sv_|vJ93#^Wv&6W4B?UCK3_x4bg zb>A_r2rOOHa!?V;p-}=a)~9TEV;~Uq>@jmK_BE-!>cddEqjUD9zRjf>NT-86aYkX* z0?(&Q+}YaZ5xR;5l0#d$T)onvp|$^g@x#zM7xqsYDk64C?R`)B!cU-z)O6uq{#Q0pZg$Tw?*dp9u atAU%i#WLc}y3Lgb&jRkTOc)(%aM$ z2tEmN!_z&U2(1FC6QN#2ipwDUt@gFbQY|G&zry`URsokumI(vA z#RkdM846d>B8%`-Hb#i6@aJ3)XtgKm-OpghSo(zKG0yzqtD{J}@8IG+mhfT9YtPb& eIj@6jWEF57ZCV}jcd$A2)NzAWkI*(-`hEdk-~9>z literal 0 HcmV?d00001 diff --git a/target/classes/client/graphicView/userRegion/loginPanel/LoginPanelController$4.class b/target/classes/client/graphicView/userRegion/loginPanel/LoginPanelController$4.class new file mode 100644 index 0000000000000000000000000000000000000000..004aafae805c0c571fa3932e45c3926f3e37b823 GIT binary patch literal 1054 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 U&bu$Jb^qRSUvh`sDW@^}w|AOK!2kdN literal 5434 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 MMozxLVGaKEKf8bMg8%>k diff --git a/target/classes/client/graphicView/userRegion/userAccount/managerAccount/ManagerAccountPageController.class b/target/classes/client/graphicView/userRegion/userAccount/managerAccount/ManagerAccountPageController.class index d1ab9600a7c9adcfc1ac8e977a55dbb3b8c3b273..2275e642aa8c80564cc92eb7383345b70ab13ab1 100644 GIT binary patch delta 1224 zcmaJ;UrbY19R5ykxtHD^3gLFZZQ=G0RH29!aWcmch89IZML>tMW0!JitL2u|GWW2= zC0mTiwx~PF=AQO8v&09rT8L&Z%jVOPg_yWxaUpx&%O1z}u$@y%f@9g!Ip_QRzVG|} zzVr3)o#DGKQm3K`x&j}CAI${)%yb*9mxQ9#DXTD zo*4Eh=%(0<9)jbH)O52Obw2i$quuo~_ABV6c!mAs2l%gfvOe<3A2Q9g`|qV zC~1d0B*aE5$=0%u)H6=bFjz@7nB;yUkJZD?pFg_4qlStIZzc9D&lStY0{8rQ3s2=SsVdfs+4`_gn1pCG}5=c1t3eocNK3;gj|5W1V zLGCnL!aR%kdpt9@|Ng#A>%o3boA)pA$)5XXI>OVBadn!@UR%b;%eej!TJ$ke9K9jX zPnYr8GQN0-SvJ?alUBT^ah{8O-fVJ__2y?zu`_$x(#xN2$l6RYt0nFX{bb~PFl+@NQOL+;H;LckhDSgiMLxU)In%##*b4F5-6*6ef`LFk za$zbqX5yMVDT-0TN;LZ|WhfU=K~ae+f@a>Jjxc2m@{-x{}hFZK!8 zPjLWMOwx+xLpUs;j>3m}=F_$tj!^i~$Y!*ahGXhXO>9Yf(A`Ej$Y=s7rfYSuFapkg79*UGVwfnCQ1uss9B4HB(I7>08dXauH8VXN#Pbx#_ zd!ouvvi~`XAq=x$x;*m;Mg@#fgfPxzeLho2cD!CMX^5K*3fIX<{Hrjg(fd>-reyfo zeN&%qoIqx8`GE}P58GR;Fhero2R;c{A?QjvE75C2ia(;?4MdLLv>nrSbIU-;HhxG0 ze=YnaszF;YZp;>pyRil1w#23EPNG#exs-FuGl%SVZ~_UqcD{lwfdVp*9djs6pn48_ z=J`*RE!L3$>lgD)Dd26fhJ)`#Z&^ce$vYfX6^?U-cFs}XE>X7@^oshmpkFlbfLZMK zyve4gQk%{qt))1DGcWmmKo&#<*n+)@w=g;EIwgT1D{@p@&dmNIsU4BDAmti74rnqdG1gYZzYmyQ7I;mbIu_d?hU+r%j`G#b^&a)}s>rqE~>Y4rv Dnkn=? diff --git a/target/classes/client/graphicView/userRegion/userAccount/managerAccount/ManagerEditInfoPageController.class b/target/classes/client/graphicView/userRegion/userAccount/managerAccount/ManagerEditInfoPageController.class index 28b95458eae5ac1e23ae6bf56939295389dfb14f..0245074c241eae6a58c9586ccad295cdca098c59 100644 GIT binary patch delta 42 zcmV+_0M-AIB9tPqo(ByI0F?li2LP800GI$tldA_p1qf$lbX2qN2P+5xxRVab1&U+jH&o&Dz diff --git a/target/classes/client/graphicView/userRegion/userAccount/sellerAccount/AllProductsForAuctionPageController.class b/target/classes/client/graphicView/userRegion/userAccount/sellerAccount/AllProductsForAuctionPageController.class index 4e960c1a7b9ce72094e5e96ca7103522c8479942..2639a8939c35c75785c4161d39fb3fe1806b4649 100644 GIT binary patch delta 49 zcmV-10M7rCEtM^>4+#(o0I2|~2LP)K0IUFX0RTOd&;}lpJqaNN2xnzc}WLxt#Sn Ow+~PuBLgpxWB>pQi4ETX diff --git a/target/classes/server/main/Main$1.class b/target/classes/server/main/Main$1.class new file mode 100644 index 0000000000000000000000000000000000000000..98f34b32db45aeeaa170bae4b32ded4e0c3ef5d8 GIT binary patch literal 718 zcmZuuT~8B16g|_fY*`lj0n~3nMMJ@`@y&?wg^Du+PsrS#X)#=oj&v6TCxR! zrIJS{!T#ai=SYonR(kNT=;ON8Q6Hz;GlAvsUy2=eo)$(x5N;*> zk8r+NETwkkc!uZok|K@NYi*^>Tdmu+kb3q^6epQB!>-EDl2aFJociCaJ|5x`d$64f zv^PFXY0JIza*k%W)9DM;4pf%ENiuH9-#133yRpnNm0=Ba?p2`4C0F=!xAc~H3uuLn zY+gcKl<8%jHVr(+3QvFf0Bzi$CvfwsctkJ@*ZdCm{Uzp4zMvLveT9EfmejDo6;@#Z z+vEf~sNpH2n*`lL1KTA*n;AQ3*xQF|+4p#91>t$q> LIzb{1la}9aml>73 literal 0 HcmV?d00001 diff --git a/target/classes/server/main/Main.class b/target/classes/server/main/Main.class index a1cc5bebb1d57d25626416abe028c445ce35b489..f019bed908da404f24d30506c862ca9ef8ddfb2e 100644 GIT binary patch literal 5446 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 literal 6516 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 diff --git a/target/classes/server/viewServer/userRegion/LoginPanel/LoginPanelServer$ClientHandler.class b/target/classes/server/viewServer/userRegion/LoginPanel/LoginPanelServer$ClientHandler.class index b913b7d8e4cf970271a197c6960223e388a09568..8a71440ba620279507d9184dd477ba06d377d882 100644 GIT binary patch delta 177 zcmWN{y9+^a0LAg|6@%9;nG83R)#5ejBDy!PyzsGr zoZtEVyg%<_t+;|%2_X|kC4!r%c~CTI8^b~zJDN}lJS6dv#!r?2x(M@PDUhN}hN3Vf z>Qop|WlD{OpcM^vG}+VQNSg~CuJpOlpDuXvt-4GwfO=k!UkfsL8K I`FW`tf0GX&=>Px# diff --git a/target/classes/server/viewServer/userRegion/LoginPanel/LoginPanelServer.class b/target/classes/server/viewServer/userRegion/LoginPanel/LoginPanelServer.class index b1890951a4e73e080d13ed573a0415f5ff04e99f..63c283edb20bae203f0bfa525938ae2ec40e5499 100644 GIT binary patch delta 1282 zcmZuw+jA3D82_EkhTWv6cc39{)0DKdNsv@T6rxlS+J**;O;Zh3WDRQ@+9o00R`5bl z6jVekN4$ae2VO0)iIUOL@y#dSo#DY({{UwkNBqvFIy&Rd?0)CF{eIu&?C%>ddfY$$ zdGlKUyYcz5`)bjJ1~h7D;%G(-L(_3%$%xDu+385))PiNsGdOaK7Q=?P?aAaKhYFdj zm9Pq?F(1{jonP?BF6q$aMA?@-5i?{SpGTU>-|sd6Ejrau@-8xkE0(! z(a)yz9)xB7R&jxKczdvoBLdFgT(FFS4Sy%ccHAYtXWi=E3~hp`Z4M3hTvq&byRchB zl;b|!FT%>;_MI4%SPw9G);gid#IpItzb6x%bYlkwWswhY?8AO>O$o4J@txAiV&az4 zt?$ApM;r%*=7{Jc7?XI1#2$yQeh6bSFClj_A##o`HYqMSM)f2flR+u*iz6OQVw;A? z|265@*#47gGjC;bSvRI|gyTusUZXwpgk_{>CkjT|)L@8=+EsrPE=h8X!^G3#iaJm? zgN%mb9J81cKdD3OvK%?&MTaxuDKIqKTUoR+bCD5aVdkKbcjH7U?fio^Tyoz*ItjuDjxOTxqYq((uoXq}@ESDE;6>72qF0hlH7Ph-w4Ji(9|%Mt zIUf2F{xSyQ#J(d{#m-c?jC(8CQ^A9)*h|(SvW`gWfeIe3;E`2~SCLFnp3L1FuHex! z4qw0hb(~_JxPE)ZrXR)ux+V_0;LXs9DL~(157pdDS9c4B5u}hljM5)8MrT>MpAvKo z;$^%-Afr_GIh?oQ#@D)em7?Uu`VBFS@O8ZQPe)O^AE3R8qp1p>Dk1$9rc0Qw;sogn zC9stvlwMm;15p7jwDMLoVLeg3PP&2%c!Q)ISP~cMB!~GX#a_WX^uA9PFKJ1N{D9c6 QVg?^lK_B50e1=Vb0oZ~1RR910 delta 1116 zcmX|=+f!Rr6vlu1B;h3CK)G0&a)(eF5;d)&MNqM}Kq$8surE0?KvC5qTb;?@h_-k>j6d0C3oFTF1h)O$=QWM z*3Hxj(m{ttn)J4s3pUVV09tj#YHnZ}Wh|gCzAGYcLq&sKI$i?^-QY-5fPc9&vb-W4gx|RgdWjUyB;hi@uIvf+rlF zWKiGqC4>DOH+fI%-+ZkH`Z#X#h8%_&QTUeEii*Z@ecBhX2W&i=93(N_bJDuq3ipI^>o3pQWsGoiS;sjq~NZCqplMNXz?aY@D}oMhi<2#5?5phEnM zo_|SVq=VjGCg4fA6C(YDc!j+9mqlxq4DaDe>?&y<+VXYrnBRUgD_| zC$>3RCY6@Fld^gfB~I-yaclR-afvy7YxlNSeuPtUA$%U$PJ&X&e4|3Qi(U>%D>q^i z(#;r$nIh&fZ