From 966be41d455be98697b1f966f1206bbe2e18f8f5 Mon Sep 17 00:00:00 2001
From: pbc1017 <knsol2@naver.com>
Date: Wed, 3 Jan 2024 02:45:34 +0900
Subject: [PATCH] =?UTF-8?q?=EF=B8=8F=F0=9F=92=84=20edit=20activity=20dashb?=
 =?UTF-8?q?oard?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/routes/feedback.js                                   | 2 ++
 .../admin/DashboardClubList/DashboardClubList.tsx         | 2 +-
 front/src/components/admin/DashboardClubList/style.css    | 8 ++++++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/back/routes/feedback.js b/back/routes/feedback.js
index 039a6d7..04bc9fb 100644
--- a/back/routes/feedback.js
+++ b/back/routes/feedback.js
@@ -492,6 +492,8 @@ router.get("/activity_submit_list", async (req, res) => {
       })
     );
 
+    clubData.sort((a, b) => b.feedbackTypeOne - a.feedbackTypeOne);
+
     res.json({
       totalActivities,
       nonFeedbackTypeOneActivities,
diff --git a/front/src/components/admin/DashboardClubList/DashboardClubList.tsx b/front/src/components/admin/DashboardClubList/DashboardClubList.tsx
index b27790e..bc897df 100644
--- a/front/src/components/admin/DashboardClubList/DashboardClubList.tsx
+++ b/front/src/components/admin/DashboardClubList/DashboardClubList.tsx
@@ -120,7 +120,7 @@ export const DashboardClubList = ({
         <select
           value={selectedExecutive}
           onChange={handleSelectChange}
-          className={"frame-2"}
+          className={"frame-2 text-wrapper-2"}
         >
           <option key="0" value="0">
             선택안함
diff --git a/front/src/components/admin/DashboardClubList/style.css b/front/src/components/admin/DashboardClubList/style.css
index f5d3601..83c5519 100644
--- a/front/src/components/admin/DashboardClubList/style.css
+++ b/front/src/components/admin/DashboardClubList/style.css
@@ -18,11 +18,11 @@
   display: flex;
   flex-direction: column;
   gap: 10px;
-  height: 42px;
   justify-content: center;
   padding: 10px;
   position: relative;
   width: 42px;
+  height: 100%;
 }
 
 .dashboard-club-list .element {
@@ -37,6 +37,7 @@
   text-align: center;
   white-space: nowrap;
   width: fit-content;
+  height: 100%;
 }
 
 .dashboard-club-list .div-wrapper {
@@ -50,6 +51,7 @@
   padding: 10px;
   position: relative;
   width: 544px;
+  height: 100%;
 }
 
 .dashboard-club-list .text-wrapper-2 {
@@ -62,6 +64,7 @@
   line-height: normal;
   margin-top: -1px;
   position: relative;
+  height: 100%;
 }
 
 .dashboard-club-list .frame-2 {
@@ -69,13 +72,13 @@
   border-color: #000000;
   border-right-style: solid;
   border-right-width: 1px;
-  height: 100%;
   display: flex;
   gap: 10px;
   justify-content: center;
   padding: 10px;
   position: relative;
   width: 110px;
+  height: 100%;
 }
 
 .dashboard-club-list .frame-3 {
@@ -89,6 +92,7 @@
   padding: 10px;
   position: relative;
   width: 243px;
+  height: 100%;
 }
 
 .dashboard-club-list.zero {