From 03e7393ab8986b63e46f250db13902534dd37aca Mon Sep 17 00:00:00 2001
From: Firesieht <firesieht@mail.ru>
Date: Sun, 9 Oct 2022 02:31:30 +0300
Subject: [PATCH] add clan in table

---
 src/admin/addAdminMarketCard/addAdminMarket.css | 2 +-
 src/admin/adminMarket/adminMarket.css           | 2 +-
 src/admin/adminMarketPopUp/adminMarketPopUp.css | 2 +-
 src/admin/adminUserCard/adminUserCard.css       | 2 +-
 src/admin/userTable/index.tsx                   | 3 ++-
 src/admin/userTable/userTable.css               | 2 +-
 src/app/interfaces.ts                           | 1 +
 7 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/admin/addAdminMarketCard/addAdminMarket.css b/src/admin/addAdminMarketCard/addAdminMarket.css
index 8b2c69b..7ea6872 100644
--- a/src/admin/addAdminMarketCard/addAdminMarket.css
+++ b/src/admin/addAdminMarketCard/addAdminMarket.css
@@ -1,7 +1,7 @@
 .addProduct{
     padding-top: 200px;
     width: 100%;
-    height: 100vh;
+    min-height: 100vh;
     background: linear-gradient(85.91deg, #096DD9 0%, #40A9FF 100%);
     display: flex;
     flex-direction: column;
diff --git a/src/admin/adminMarket/adminMarket.css b/src/admin/adminMarket/adminMarket.css
index c77cb92..68a6526 100644
--- a/src/admin/adminMarket/adminMarket.css
+++ b/src/admin/adminMarket/adminMarket.css
@@ -19,7 +19,7 @@
 .market{
     padding-top: 200px;
     width: 100%;
-    height: 100vh;
+    min-height: 100vh;
     background: linear-gradient(85.91deg, #096DD9 0%, #40A9FF 100%);
     display: flex;
     flex-direction: column;
diff --git a/src/admin/adminMarketPopUp/adminMarketPopUp.css b/src/admin/adminMarketPopUp/adminMarketPopUp.css
index 8ab03ed..564fea1 100644
--- a/src/admin/adminMarketPopUp/adminMarketPopUp.css
+++ b/src/admin/adminMarketPopUp/adminMarketPopUp.css
@@ -1,7 +1,7 @@
 .changeProduct{
     padding-top: 200px;
     width: 100%;
-    height: 100vh;
+    min-height: 100vh;
     background: linear-gradient(85.91deg, #096DD9 0%, #40A9FF 100%);
     display: flex;
     flex-direction: column;
diff --git a/src/admin/adminUserCard/adminUserCard.css b/src/admin/adminUserCard/adminUserCard.css
index 5a14102..00621bf 100644
--- a/src/admin/adminUserCard/adminUserCard.css
+++ b/src/admin/adminUserCard/adminUserCard.css
@@ -1,7 +1,7 @@
 .userCard{
     padding-top: 200px;
     width: 100%;
-    height: 100vh;
+    min-height: 100vh;
     background: linear-gradient(85.91deg, #096DD9 0%, #40A9FF 100%);
     display: flex;
     flex-direction: column;
diff --git a/src/admin/userTable/index.tsx b/src/admin/userTable/index.tsx
index f7dbfd6..a9921d1 100644
--- a/src/admin/userTable/index.tsx
+++ b/src/admin/userTable/index.tsx
@@ -142,6 +142,7 @@ export const UserTable:React.FC = () =>{
                 respect: user.respect,
                 balance: user.salary,
                 jobTittle: user.department,
+                clan: user.clan_name
             }) as EmployerIE ))))
         })
         adminFetcher.get("season/clans/").then((response:any)=>{
@@ -168,7 +169,7 @@ export const UserTable:React.FC = () =>{
                 {
                     name: user.name,
                     balance: user.balance,
-                    command: user.command,
+                    command: user.clan,
                     speciality: user.jobTittle,
                     key: user.telegramID,
                     telegram: user.telegramID,
diff --git a/src/admin/userTable/userTable.css b/src/admin/userTable/userTable.css
index 5c1bc49..a2e6885 100644
--- a/src/admin/userTable/userTable.css
+++ b/src/admin/userTable/userTable.css
@@ -1,7 +1,7 @@
 .userTable{
     padding-top: 200px;
     width: 100%;
-    height: 100vh;
+    min-height: 100vh;
     background: linear-gradient(85.91deg, #096DD9 0%, #40A9FF 100%);
     display: flex;
     flex-direction: column;
diff --git a/src/app/interfaces.ts b/src/app/interfaces.ts
index a9aafeb..3a9b021 100644
--- a/src/app/interfaces.ts
+++ b/src/app/interfaces.ts
@@ -26,6 +26,7 @@ export interface EmployerIE extends UserIE{
     respect: number, 
     telegramID: string,
     command: string,
+    clan:string
 }