From 94dfe518cb61bfe57b8db68f62b130a5c58821bb Mon Sep 17 00:00:00 2001
From: janinapaasila <119249112+janinapaasila@users.noreply.github.com>
Date: Sat, 25 Jan 2025 22:22:24 +0200
Subject: [PATCH] Updated memberList & memberDetails formatting

---
 .../admin/addMember/addMemberView.js          |  2 +-
 .../memberDetails/memberDetailsAdminView.js   |  2 +-
 .../memberDetails/memberUpdateAdminView.js    |  2 +-
 .../admin/memberList/memberList.css           |  4 +--
 .../admin/memberList/memberListView.js        | 25 +++++++++++++++----
 5 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/components/admin/addMember/addMemberView.js b/src/components/admin/addMember/addMemberView.js
index eaa6200..3f15b17 100644
--- a/src/components/admin/addMember/addMemberView.js
+++ b/src/components/admin/addMember/addMemberView.js
@@ -147,7 +147,7 @@ const addMemberView = ({
                     type="checkbox"
                     onChange={handleInputChange}
                     name="accessRights"
-                    label="24/7 kulkuoikeudet"
+                    label="Varaston/roskisten kulkuoikeudet"
                 />
             </Form.Group>
             <Form.Group>
diff --git a/src/components/admin/memberDetails/memberDetailsAdminView.js b/src/components/admin/memberDetails/memberDetailsAdminView.js
index 2451149..77bfc42 100644
--- a/src/components/admin/memberDetails/memberDetailsAdminView.js
+++ b/src/components/admin/memberDetails/memberDetailsAdminView.js
@@ -116,7 +116,7 @@ const MemberDetailsAdminView = ({
                 </tr>
                 <tr>
                     <th>Kulkuoikeudet</th>
-                    <td>{accessRights ? '24/7' : 'Ma-Su 07:00-21:00'}</td>
+                    <td>{accessRights ? 'Varasto/roskikset' : 'Vain toimisto'}</td>
                 </tr>
                 <tr>
                     <th>Jäsenyys hyväksytty</th>
diff --git a/src/components/admin/memberDetails/memberUpdateAdminView.js b/src/components/admin/memberDetails/memberUpdateAdminView.js
index 0ac6aec..bccfb5e 100644
--- a/src/components/admin/memberDetails/memberUpdateAdminView.js
+++ b/src/components/admin/memberDetails/memberUpdateAdminView.js
@@ -153,7 +153,7 @@ const MemberUpdateAdminView = ({
                     checked={accessRights}
                     onChange={handleInputChange}
                     name="accessRights"
-                    label="24/7 kulkuoikeudet"
+                    label="Varaston/roskisten kulkuoikeudet"
                 />
             </Form.Group>
             <Form.Group>
diff --git a/src/components/admin/memberList/memberList.css b/src/components/admin/memberList/memberList.css
index 1ac686d..319fc0e 100644
--- a/src/components/admin/memberList/memberList.css
+++ b/src/components/admin/memberList/memberList.css
@@ -6,9 +6,9 @@
     cursor: pointer;
 }
 
-@media only screen and (max-width: 1450px) {
+@media only screen and (max-width: 1320px) {
     .memberlistTable {
-        width: 1480px !important;
+        width: 1340px !important;
     }
 }
 
diff --git a/src/components/admin/memberList/memberListView.js b/src/components/admin/memberList/memberListView.js
index 0756047..f31fd65 100644
--- a/src/components/admin/memberList/memberListView.js
+++ b/src/components/admin/memberList/memberListView.js
@@ -83,6 +83,9 @@ const columns = [
         dataField: 'utuAccount',
         text: 'UTU',
         sort: true,
+        headerStyle: {
+            width: '90px',
+        },
         align: 'center',
         headerAlign: 'center',
     },
@@ -100,6 +103,9 @@ const columns = [
         dataField: 'hometown',
         text: 'Kotikunta',
         sort: true,
+        headerStyle: {
+            width: '110px',
+        },
         align: 'center',
         headerAlign: 'center',
     },
@@ -131,7 +137,7 @@ const columns = [
         text: 'TIVIA',
         sort: true,
         headerStyle: {
-            width: '90px',
+            width: '80px',
         },
         align: 'center',
         headerAlign: 'center',
@@ -153,18 +159,21 @@ const columns = [
         dataField: 'role',
         text: 'Rooli',
         sort: true,
+        headerStyle: {
+            width: '110px',
+        },
         align: 'center',
         headerAlign: 'center',
         formatter: roleSwitchCase,
     },
     {
         dataField: 'accessRights',
-        text: '24/7',
+        text: 'Varasto',
         sort: true,
         align: 'center',
         headerAlign: 'center',
         headerStyle: {
-            width: '80px',
+            width: '110px',
         },
         formatter: (cell, row, rowIndex, extraData) => (
             <div>
@@ -184,6 +193,9 @@ const columns = [
         dataField: 'membershipStarts',
         text: 'Alkanut',
         sort: true,
+        headerStyle: {
+            width: '100px',
+        },
         align: 'center',
         headerAlign: 'center',
         formatter: (cell, row, rowIndex, extraData) => (
@@ -200,18 +212,21 @@ const columns = [
         dataField: 'membershipEnds',
         text: 'Päättyy',
         sort: true,
+        headerStyle: {
+            width: '100px',
+        },
         align: 'center',
         headerAlign: 'center',
         formatter: membershipEndsFormatter,
     },
     {
         dataField: 'accepted',
-        text: 'Hyväksytty',
+        text: 'Jäsen',
         sort: true,
         align: 'center',
         headerAlign: 'center',
         headerStyle: {
-            width: '130px',
+            width: '80px',
         },
         formatter: (cell, row, rowIndex, extraData) => (
             <div>