From 739a0ca9ba105195d822c68d2dcc4cabd7a5faba Mon Sep 17 00:00:00 2001
From: Sony <faraz.ghahremani@yahoo.com>
Date: Fri, 24 Jul 2020 20:01:13 +0430
Subject: [PATCH] go go go

---
 .idea/misc.xml                                |  2 +-
 .idea/workspace.xml                           | 84 +++++++++---------
 src/main/java/Controller/AdminManager.java    | 16 +++-
 src/main/java/Controller/ClientThread.java    |  6 ++
 src/main/java/Controller/Database.java        | 14 ++-
 .../java/View/Menu/AdminMenus/AdminMenu.java  | 87 ++++++++++++++++++-
 src/main/java/View/Menu/ChatRoomMenu.java     |  2 +-
 src/main/java/View/Menu/LoginMenu.java        |  5 ++
 src/main/java/View/Menu/SupporterMenu.java    | 26 ++++++
 src/main/java/View/Menu/UserMenu.java         | 10 ++-
 10 files changed, 195 insertions(+), 57 deletions(-)
 create mode 100644 src/main/java/View/Menu/SupporterMenu.java

diff --git a/.idea/misc.xml b/.idea/misc.xml
index d528a03..7417b01 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -12,7 +12,7 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 423f2fa..8503620 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,16 +2,16 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="aeefa500-3a99-4ed0-98cf-a7157d1fa89a" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/View/Menu/SupporterMenu.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Data/Accounts/Buyers.json" beforeDir="false" afterPath="$PROJECT_DIR$/Data/Accounts/Buyers.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Controller/BuyerManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Controller/BuyerManager.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Controller/AdminManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Controller/AdminManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Controller/ClientThread.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Controller/ClientThread.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Controller/Database.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Controller/Database.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Model/Account/BuyerAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Model/Account/BuyerAccount.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/View/Menu/BuyerMenus/ViewCartMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/View/Menu/BuyerMenus/ViewCartMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/View/Menu/AdminMenus/AdminMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/View/Menu/AdminMenus/AdminMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/View/Menu/ChatRoomMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/View/Menu/ChatRoomMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/View/Menu/LoginMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/View/Menu/LoginMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/View/Menu/UserMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/View/Menu/UserMenu.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -98,7 +98,7 @@
   <component name="RunManager" selected="Application.Client">
     <configuration name="Client" type="Application" factoryName="Application" singleton="false" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="Client" />
-      <module name="Project_anotherTime" />
+      <module name="Project_team-53" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
@@ -125,7 +125,6 @@
     </configuration>
     <configuration name="All in Project-2" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="Project" />
-      <useClassPathOnly />
       <option name="PACKAGE_NAME" value="" />
       <option name="MAIN_CLASS_NAME" value="" />
       <option name="METHOD_NAME" value="" />
@@ -815,9 +814,10 @@
       <screen x="0" y="0" width="1366" height="728" />
     </state>
     <state x="280" y="0" key="#All_in_Project-2_(1)/0.0.1366.728@0.0.1366.728" timestamp="1593165627201" />
-    <state x="400" y="26" key="#Client" timestamp="1595596690503">
-      <screen x="0" y="0" width="1366" height="738" />
+    <state x="400" y="26" key="#Client" timestamp="1595600335680">
+      <screen x="0" y="0" width="1366" height="728" />
     </state>
+    <state x="400" y="26" key="#Client/0.0.1366.728@0.0.1366.728" timestamp="1595600335680" />
     <state x="400" y="26" key="#Client/0.0.1366.738@0.0.1366.738" timestamp="1595596690503" />
     <state x="275" y="26" key="#Inspections" timestamp="1591540003920">
       <screen x="0" y="0" width="1366" height="738" />
@@ -878,10 +878,10 @@
     </state>
     <state x="412" y="149" key="#com.intellij.ide.util.TreeClassChooserDialog/0.0.1366.728@0.0.1366.728" timestamp="1589388879706" />
     <state x="412" y="151" key="#com.intellij.ide.util.TreeClassChooserDialog/0.0.1366.738@0.0.1366.738" timestamp="1589230109625" />
-    <state x="531" y="251" key="#com.intellij.ide.util.projectWizard.JdkChooserPanel.MyDialog" timestamp="1595409573947">
+    <state x="531" y="251" key="#com.intellij.ide.util.projectWizard.JdkChooserPanel.MyDialog" timestamp="1595599785053">
       <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state x="531" y="251" key="#com.intellij.ide.util.projectWizard.JdkChooserPanel.MyDialog/0.0.1366.728@0.0.1366.728" timestamp="1595409573947" />
+    <state x="531" y="251" key="#com.intellij.ide.util.projectWizard.JdkChooserPanel.MyDialog/0.0.1366.728@0.0.1366.728" timestamp="1595599785053" />
     <state x="531" y="254" key="#com.intellij.ide.util.projectWizard.JdkChooserPanel.MyDialog/0.0.1366.738@0.0.1366.738" timestamp="1593177959020" />
     <state x="263" y="17" key="#com.intellij.openapi.projectRoots.ui.ProjectJdksEditor" timestamp="1587840031430">
       <screen x="0" y="0" width="1366" height="728" />
@@ -922,25 +922,25 @@
       <screen x="0" y="0" width="1366" height="738" />
     </state>
     <state x="463" y="122" key="FileChooserDialogImpl/0.0.1366.738@0.0.1366.738" timestamp="1595594769860" />
-    <state width="661" height="176" key="GridCell.Tab.0.bottom" timestamp="1595596830903">
-      <screen x="0" y="0" width="1366" height="738" />
+    <state width="1323" height="179" key="GridCell.Tab.0.bottom" timestamp="1595600436680">
+      <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state width="1322" height="174" key="GridCell.Tab.0.bottom/0.0.1366.728@0.0.1366.728" timestamp="1595543598715" />
+    <state width="1323" height="179" key="GridCell.Tab.0.bottom/0.0.1366.728@0.0.1366.728" timestamp="1595600436680" />
     <state width="661" height="176" key="GridCell.Tab.0.bottom/0.0.1366.738@0.0.1366.738" timestamp="1595596830903" />
-    <state width="661" height="176" key="GridCell.Tab.0.center" timestamp="1595596830903">
-      <screen x="0" y="0" width="1366" height="738" />
+    <state width="1323" height="179" key="GridCell.Tab.0.center" timestamp="1595600436679">
+      <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state width="1322" height="174" key="GridCell.Tab.0.center/0.0.1366.728@0.0.1366.728" timestamp="1595543598715" />
+    <state width="1323" height="179" key="GridCell.Tab.0.center/0.0.1366.728@0.0.1366.728" timestamp="1595600436679" />
     <state width="661" height="176" key="GridCell.Tab.0.center/0.0.1366.738@0.0.1366.738" timestamp="1595596830903" />
-    <state width="661" height="176" key="GridCell.Tab.0.left" timestamp="1595596830903">
-      <screen x="0" y="0" width="1366" height="738" />
+    <state width="1323" height="179" key="GridCell.Tab.0.left" timestamp="1595600436678">
+      <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state width="1322" height="174" key="GridCell.Tab.0.left/0.0.1366.728@0.0.1366.728" timestamp="1595543598715" />
+    <state width="1323" height="179" key="GridCell.Tab.0.left/0.0.1366.728@0.0.1366.728" timestamp="1595600436678" />
     <state width="661" height="176" key="GridCell.Tab.0.left/0.0.1366.738@0.0.1366.738" timestamp="1595596830903" />
-    <state width="661" height="176" key="GridCell.Tab.0.right" timestamp="1595596830903">
-      <screen x="0" y="0" width="1366" height="738" />
+    <state width="1323" height="179" key="GridCell.Tab.0.right" timestamp="1595600436679">
+      <screen x="0" y="0" width="1366" height="728" />
     </state>
-    <state width="1322" height="174" key="GridCell.Tab.0.right/0.0.1366.728@0.0.1366.728" timestamp="1595543598715" />
+    <state width="1323" height="179" key="GridCell.Tab.0.right/0.0.1366.728@0.0.1366.728" timestamp="1595600436679" />
     <state width="661" height="176" key="GridCell.Tab.0.right/0.0.1366.738@0.0.1366.738" timestamp="1595596830903" />
     <state width="1322" height="244" key="GridCell.Tab.1.bottom" timestamp="1595502161406">
       <screen x="0" y="0" width="1366" height="728" />
@@ -1028,21 +1028,27 @@
     <state x="346" y="59" width="672" height="678" key="search.everywhere.popup/0.0.1366.738@0.0.1366.738" timestamp="1591438296011" />
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
-    <SUITE FILE_PATH="coverage/Project$AccountManagerTest.ic" NAME="AccountManagerTest Coverage Results" MODIFIED="1588943574745" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
+    <SUITE FILE_PATH="coverage/Project_team_53$AccountTest.ic" NAME="AccountTest Coverage Results" MODIFIED="1589230660323" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
       <FILTER>ControllerTest.*</FILTER>
     </SUITE>
-    <SUITE FILE_PATH="coverage/Project_team_53$AccountTest.ic" NAME="AccountTest Coverage Results" MODIFIED="1589230660323" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
+    <SUITE FILE_PATH="coverage/Project_2$All_in_Project_2__1_.ic" NAME="All in Project-2 (1) Coverage Results" MODIFIED="1593158770773" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
+    <SUITE FILE_PATH="coverage/Project_2$All_in_Project_2.ic" NAME="All in Project-2 Coverage Results" MODIFIED="1593010274041" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
+    <SUITE FILE_PATH="coverage/Project$AllProductManagerTest.ic" NAME="AllProductManagerTest Coverage Results" MODIFIED="1589544649151" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
+      <FILTER>ControllerTest.*</FILTER>
+    </SUITE>
+    <SUITE FILE_PATH="coverage/Project_2$SellerManagerTest.ic" NAME="SellerManagerTest Coverage Results" MODIFIED="1589580271799" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
+      <FILTER>ControllerTest.*</FILTER>
+    </SUITE>
+    <SUITE FILE_PATH="coverage/Project_team_53$ControllerTest_in_Project_team_53.ic" NAME="ControllerTest in Project_team-53 Coverage Results" MODIFIED="1589568222105" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
       <FILTER>ControllerTest.*</FILTER>
     </SUITE>
     <SUITE FILE_PATH="coverage/Project$SellerAccountTest.ic" NAME="SellerAccountTest Coverage Results" MODIFIED="1589388843464" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
       <FILTER>ModelTest.*</FILTER>
     </SUITE>
-    <SUITE FILE_PATH="coverage/Project_2$Main.ic" NAME="Main Coverage Results" MODIFIED="1589874331120" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
-    <SUITE FILE_PATH="coverage/Project_team_53$AccountManagerTest_registerTest1.ic" NAME="AccountManagerTest.registerTest1 Coverage Results" MODIFIED="1589228895297" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
+    <SUITE FILE_PATH="coverage/Project_team_53$AdminManagerTest_showRequestWithIDTest.ic" NAME="AdminManagerTest.showRequestWithIDTest Coverage Results" MODIFIED="1589226973100" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
       <FILTER>ControllerTest.*</FILTER>
-      <FILTER>*</FILTER>
     </SUITE>
-    <SUITE FILE_PATH="coverage/Project_2$All_in_Project_2__1_.ic" NAME="All in Project-2 (1) Coverage Results" MODIFIED="1593158770773" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
+    <SUITE FILE_PATH="coverage/Project_2$Main.ic" NAME="Main Coverage Results" MODIFIED="1589874331120" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
     <SUITE FILE_PATH="coverage/Project_team_53$AdminManagerTest_showAccountWithUsernameTest.ic" NAME="AdminManagerTest.showAccountWithUsernameTest Coverage Results" MODIFIED="1589226667004" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
       <FILTER>ControllerTest.*</FILTER>
     </SUITE>
@@ -1052,24 +1058,18 @@
     <SUITE FILE_PATH="coverage/Project_team_53$AccountManagerTest.ic" NAME="AccountManagerTest Coverage Results" MODIFIED="1589229190334" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
       <FILTER>*</FILTER>
     </SUITE>
-    <SUITE FILE_PATH="coverage/Project$AllProductManagerTest.ic" NAME="AllProductManagerTest Coverage Results" MODIFIED="1589544649151" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
-      <FILTER>ControllerTest.*</FILTER>
-    </SUITE>
-    <SUITE FILE_PATH="coverage/Project_2$All_in_Project_2.ic" NAME="All in Project-2 Coverage Results" MODIFIED="1593010274041" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
-    <SUITE FILE_PATH="coverage/Project_team_53$AdminManagerTest_showRequestWithIDTest.ic" NAME="AdminManagerTest.showRequestWithIDTest Coverage Results" MODIFIED="1589226973100" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
-      <FILTER>ControllerTest.*</FILTER>
-    </SUITE>
-    <SUITE FILE_PATH="coverage/Project_team_53$AdminManagerTest.ic" NAME="AdminManagerTest Coverage Results" MODIFIED="1589226535228" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
+    <SUITE FILE_PATH="coverage/Project_2$SellerManagerTest_sendEditProductRequestTest1.ic" NAME="SellerManagerTest.sendEditProductRequestTest1 Coverage Results" MODIFIED="1589580324813" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
       <FILTER>ControllerTest.*</FILTER>
     </SUITE>
-    <SUITE FILE_PATH="coverage/Project_2$SellerManagerTest.ic" NAME="SellerManagerTest Coverage Results" MODIFIED="1589580271799" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
+    <SUITE FILE_PATH="coverage/Project$All_in_Project.ic" NAME="All in Project Coverage Results" MODIFIED="1589921803728" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
+    <SUITE FILE_PATH="coverage/Project$AccountManagerTest.ic" NAME="AccountManagerTest Coverage Results" MODIFIED="1588943574745" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
       <FILTER>ControllerTest.*</FILTER>
     </SUITE>
-    <SUITE FILE_PATH="coverage/Project$All_in_Project.ic" NAME="All in Project Coverage Results" MODIFIED="1589921803728" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
-    <SUITE FILE_PATH="coverage/Project_team_53$ControllerTest_in_Project_team_53.ic" NAME="ControllerTest in Project_team-53 Coverage Results" MODIFIED="1589568222105" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
+    <SUITE FILE_PATH="coverage/Project_team_53$AccountManagerTest_registerTest1.ic" NAME="AccountManagerTest.registerTest1 Coverage Results" MODIFIED="1589228895297" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
       <FILTER>ControllerTest.*</FILTER>
+      <FILTER>*</FILTER>
     </SUITE>
-    <SUITE FILE_PATH="coverage/Project_2$SellerManagerTest_sendEditProductRequestTest1.ic" NAME="SellerManagerTest.sendEditProductRequestTest1 Coverage Results" MODIFIED="1589580324813" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
+    <SUITE FILE_PATH="coverage/Project_team_53$AdminManagerTest.ic" NAME="AdminManagerTest Coverage Results" MODIFIED="1589226535228" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
       <FILTER>ControllerTest.*</FILTER>
     </SUITE>
   </component>
diff --git a/src/main/java/Controller/AdminManager.java b/src/main/java/Controller/AdminManager.java
index 9d45d06..f311a08 100644
--- a/src/main/java/Controller/AdminManager.java
+++ b/src/main/java/Controller/AdminManager.java
@@ -1,9 +1,6 @@
 package Controller;
 
-import Model.Account.Account;
-import Model.Account.AdminAccount;
-import Model.Account.BuyerAccount;
-import Model.Account.SellerAccount;
+import Model.Account.*;
 import Model.Product.Category;
 import Model.Product.DiscountAndOff.Discount;
 import Model.Product.DiscountAndOff.Off;
@@ -67,6 +64,17 @@ public String addNewAdminAccount(String username, String firstName, String lastN
         return "New admin account registered.";
     }
 
+    public String addNewSupporterAccount(String username, String firstName, String lastName, String email, String phoneNumber, String password, int credit) {
+        if (Database.getAccountByUsername(username) != null)
+            return "Exist account with this username.";
+        try {
+            Database.addAllAccounts(new SupporterAccount(username, firstName, lastName, password, email, phoneNumber, credit));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return "New Supporter account registered.";
+    }
+
     public String showRequestByiId(int id){
         Request request = Database.getRequestById(id);
         if (request == null)
diff --git a/src/main/java/Controller/ClientThread.java b/src/main/java/Controller/ClientThread.java
index a26704b..d2615fb 100644
--- a/src/main/java/Controller/ClientThread.java
+++ b/src/main/java/Controller/ClientThread.java
@@ -187,6 +187,9 @@ else if (input.startsWith("AddAdmin"))
                     details = input.split(" ");
                     output = adminManager.addNewAdminAccount(details[1], details[2], details[3], details[4], details[5], details[6], Integer.parseInt(details[7]));
                 }
+                else if (input.startsWith("AddSupporter")) {
+                    output = adminManager.addNewSupporterAccount(split[1], split[2], split[3], split[4], split[5], split[6], Integer.parseInt(split[7]));
+                }
                 else if (input.startsWith("ViewUsername"))
                 {
                     Account temp = Database.getAccountByUsername(input.split(" ")[1]);
@@ -430,6 +433,9 @@ else if (input.startsWith("ReceivedBuyLog"))
                 {
                     Objects.requireNonNull(Database.getBuyLogByID(Integer.parseInt(input.split(" ")[1]))).setDeliveryStatus("Received");
                 }
+                else if (input.startsWith("getAllSupporters")){
+                    output = Database.getUsers();
+                }
                 else if (input.startsWith("addMessage")) {
                     chatManager.addMessage(Integer.parseInt(split[1]), split[2], account);
                 } else if (input.startsWith("getChatById")) {
diff --git a/src/main/java/Controller/Database.java b/src/main/java/Controller/Database.java
index bf7c54c..01d3bf7 100644
--- a/src/main/java/Controller/Database.java
+++ b/src/main/java/Controller/Database.java
@@ -1,9 +1,6 @@
 package Controller;
 
-import Model.Account.Account;
-import Model.Account.AdminAccount;
-import Model.Account.BuyerAccount;
-import Model.Account.SellerAccount;
+import Model.Account.*;
 import Model.Log.BuyLog;
 import Model.Messaging.Chat;
 import Model.Product.Auction;
@@ -97,6 +94,15 @@ public static Auction getAuctionByID(int auctionId){
     }
 
 
+    public static String getUsers() {
+        String res = "";
+        for (Account account : allAccounts) {
+            if (account instanceof BuyerAccount || account instanceof SupporterAccount)
+                res += account.getUsername() + "\\n";
+        }
+        return res;
+    }
+
     public static Request getRequestById(int id) {
         for (Request request : allRequest) {
             if (request.getId() == id)
diff --git a/src/main/java/View/Menu/AdminMenus/AdminMenu.java b/src/main/java/View/Menu/AdminMenus/AdminMenu.java
index 28c45b9..61bd556 100644
--- a/src/main/java/View/Menu/AdminMenus/AdminMenu.java
+++ b/src/main/java/View/Menu/AdminMenus/AdminMenu.java
@@ -105,6 +105,11 @@ public void show() {
         manageAddAdmin.getStyleClass().add("dark-blue");
         manageAddAdmin.setMaxWidth(Double.MAX_VALUE);
 
+        Button manageAddSupporter = new Button("Add Supporter");
+        manageAddSupporter.setOnAction(e -> handleAddSupporter());
+        manageAddSupporter.getStyleClass().add("dark-blue");
+        manageAddSupporter.setMaxWidth(Double.MAX_VALUE);
+
 
         GridPane.setConstraints(editInfoButton, 0, 0);
         GridPane.setConstraints(manageUser, 0, 1);
@@ -116,6 +121,7 @@ public void show() {
         GridPane.setConstraints(manageAddAdmin, 0, 7);
         GridPane.setConstraints(manageLogs, 0, 8);
         GridPane.setConstraints(logout, 0, 9);
+        GridPane.setConstraints(manageAddSupporter,0,10);
         GridPane.setHalignment(manageLogs, HPos.CENTER);
         GridPane.setHalignment(editInfoButton, HPos.CENTER);
         GridPane.setHalignment(manageUser, HPos.CENTER);
@@ -126,7 +132,7 @@ public void show() {
         GridPane.setHalignment(manageDiscounts, HPos.CENTER);
         GridPane.setHalignment(manageAddAdmin, HPos.CENTER);
         GridPane.setHalignment(logout, HPos.CENTER);
-
+        GridPane.setHalignment(manageAddSupporter, HPos.CENTER);
         allButtons.getChildren().addAll(editInfoButton, manageUser, manageRequest, manageProduct, manageCategories, manageDiscounts, manageAddAdmin, logout, onlineUser, manageLogs);
 
         try {
@@ -1434,4 +1440,83 @@ public void handleAddAdmin()
 
         Menu.window.setScene(scene);
     }
+
+    public void handleAddSupporter()
+    {
+        super.setPane();
+        Scene scene = new Scene(super.mainPane, 1000, 600);
+        scene.getStylesheets().add(new File("Data/Styles/Buttons.css").toURI().toString());
+        scene.getStylesheets().add(new File("Data/Styles/textfield.css").toURI().toString());
+        scene.getStylesheets().add(new File("Data/Styles/backgrounds.css").toURI().toString());
+        scene.getStylesheets().add(new File("Data/Styles/choicebox.css").toURI().toString());
+        super.mainPane.getStyleClass().add("admin-page");
+
+        GridPane gridPane = new GridPane();
+        gridPane.setHgap(20);
+        gridPane.setVgap(10);
+        gridPane.setAlignment(Pos.CENTER);
+        Label status = new Label();
+        TextField userName = new TextField();
+        userName.getStyleClass().add("text-field");
+        userName.setPromptText("username");
+        TextField firstName = new TextField();
+        firstName.setPromptText("first name");
+        TextField lastName = new TextField();
+        lastName.setPromptText("last name");
+        TextField email = new TextField();
+        email.setPromptText("email");
+        TextField phoneNumber = new TextField();
+        phoneNumber.setPromptText("phone number");
+        TextField password = new TextField();
+        password.setPromptText("password");
+        TextField credit = new TextField();
+        credit.setPromptText("credit");
+
+        Button register = new Button("Register");
+        register.getStyleClass().add("dark-blue");
+        register.setMaxWidth(Double.MAX_VALUE);
+        register.setOnAction(e -> {
+            try
+            {
+                dataOutputStream.writeUTF("AddSupporter " + userName.getText() + " " + firstName.getText() + " " + lastName.getText() + " " + email.getText() + " "
+                        + phoneNumber.getText() + " " + password.getText() + " " + credit.getText());
+                dataOutputStream.flush();
+                status.setText(dataInputStream.readUTF());
+            }
+            catch (Exception ex)
+            {
+                Alert alert = new Alert(Alert.AlertType.ERROR);
+                alert.setTitle("Error");
+                alert.setHeaderText("Register Fail");
+                alert.setContentText(ex.getMessage());
+
+                alert.showAndWait();
+            }
+        });
+
+        Button back = new Button("Back");
+        back.getStyleClass().add("dark-blue");
+        back.setMaxWidth(Double.MAX_VALUE);
+        back.setOnAction(e -> show());
+
+        GridPane.setConstraints(userName, 0, 0);
+        GridPane.setConstraints(firstName, 0, 1);
+        GridPane.setConstraints(lastName, 0, 2);
+        GridPane.setConstraints(email, 0, 3);
+        GridPane.setConstraints(phoneNumber, 0, 4);
+        GridPane.setConstraints(password, 0, 5);
+        GridPane.setConstraints(credit, 0, 6);
+        GridPane.setConstraints(register, 0, 7);
+        GridPane.setConstraints(back, 0, 8);
+        GridPane.setConstraints(status, 0, 9);
+        GridPane.setHalignment(register, HPos.CENTER);
+        GridPane.setHalignment(back, HPos.CENTER);
+        GridPane.setHalignment(status, HPos.CENTER);
+
+        gridPane.getChildren().addAll(userName, firstName, lastName, email, phoneNumber, password, credit, register, back, status);
+
+        super.mainPane.setCenter(gridPane);
+
+        Menu.window.setScene(scene);
+    }
 }
diff --git a/src/main/java/View/Menu/ChatRoomMenu.java b/src/main/java/View/Menu/ChatRoomMenu.java
index a543110..2277b0b 100644
--- a/src/main/java/View/Menu/ChatRoomMenu.java
+++ b/src/main/java/View/Menu/ChatRoomMenu.java
@@ -30,7 +30,7 @@ private VBox getSupporters() {
             String input = dataInputStream.readUTF();
             String[] splitInput = input.split("\\n");
             for (String s : splitInput) {
-                Button button = new Button( "SupporterName: " + s);
+                Button button = new Button( "User: " + s);
                 vBox.getChildren().add(button);
                 button.setOnAction(e -> {
                     String[] split = button.getText().split(" ");
diff --git a/src/main/java/View/Menu/LoginMenu.java b/src/main/java/View/Menu/LoginMenu.java
index 06772b2..435f196 100644
--- a/src/main/java/View/Menu/LoginMenu.java
+++ b/src/main/java/View/Menu/LoginMenu.java
@@ -3,6 +3,7 @@
 import Model.Account.AdminAccount;
 import Model.Account.BuyerAccount;
 import Model.Account.SellerAccount;
+import Model.Account.SupporterAccount;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import javafx.geometry.HPos;
@@ -111,6 +112,10 @@ else if (role.equalsIgnoreCase("Buyer"))
                         type = new TypeToken<BuyerAccount>(){}.getType();
                         Menu.account = new Gson().fromJson(accountInJson, type);
                     }
+                    else if (role.equalsIgnoreCase("Supporter")) {
+                        type = new TypeToken<SupporterAccount>() {}.getType();
+                        Menu.account = new Gson().fromJson(accountInJson, type);
+                    }
                     else {
                         Menu.account = null;
                     }
diff --git a/src/main/java/View/Menu/SupporterMenu.java b/src/main/java/View/Menu/SupporterMenu.java
new file mode 100644
index 0000000..a790ba9
--- /dev/null
+++ b/src/main/java/View/Menu/SupporterMenu.java
@@ -0,0 +1,26 @@
+package View.Menu;
+
+
+import javafx.scene.Scene;
+import javafx.scene.control.Button;
+
+public class SupporterMenu extends Menu {
+
+    public SupporterMenu(Menu parentMenu) {
+        super("Supporter Menu", parentMenu);
+    }
+
+    @Override
+    public void show () {
+        super.setPane();
+        Button button = new Button("chat With Buyers");
+        button.setOnAction( e -> {
+            new ChatRoomMenu(this).show();
+        });
+        Button backButton = new Button("Back");
+        backButton.setOnAction(e -> parentMenu.show());
+        Scene scene = new Scene(mainPane, 1000, 600);
+        window.setScene(scene);
+        window.show();
+    }
+}
diff --git a/src/main/java/View/Menu/UserMenu.java b/src/main/java/View/Menu/UserMenu.java
index 8a999bb..115e44e 100644
--- a/src/main/java/View/Menu/UserMenu.java
+++ b/src/main/java/View/Menu/UserMenu.java
@@ -1,9 +1,6 @@
 package View.Menu;
 
-import Model.Account.Account;
-import Model.Account.AdminAccount;
-import Model.Account.BuyerAccount;
-import Model.Account.SellerAccount;
+import Model.Account.*;
 import View.Menu.AdminMenus.AdminMenu;
 import View.Menu.BuyerMenus.BuyerMenu;
 import View.Menu.SellerMenus.SellerMenu;
@@ -13,6 +10,7 @@ public class UserMenu extends Menu {
     SellerMenu sellerMenu = new SellerMenu(this.parentMenu);
     AdminMenu adminMenu = new AdminMenu(this.parentMenu);
     LoginMenu loginMenu = new LoginMenu(this.parentMenu);
+    ChatRoomMenu chatRoomMenu = new ChatRoomMenu(this.parentMenu);
     Account account;
     public UserMenu(Menu parentMenu) {
         super("User Menu", parentMenu);
@@ -37,5 +35,9 @@ else if(Menu.account == null)
         {
             loginMenu.show();
         }
+        else if(Menu.account instanceof SupporterAccount)
+        {
+            chatRoomMenu.show();
+        }
     }
 }