Merge pull request #159 from Clubber2024/dev

Dev
Clubber2024 · Jan 7, 2025 · 031fdd2 · 031fdd2
2 parents cd2490f + abdeefe
commit 031fdd2
Show file tree

Hide file tree

Showing 21 changed files with 1,115 additions and 276 deletions.
diff --git a/src/component/admin/AdminIntroductionPage.module.css b/src/component/admin/AdminIntroductionPage.module.css
@@ -162,12 +162,14 @@
         box-shadow: inset 0px -15px 0 #7bc8e04d;
     }
 
-    .detailBody p {
+    .p_style {
         margin-top: 1%;
         margin-left: 7%;
-        /* width: 50%; */
+        width: 90%;
         text-align: left;
         font-size: 13px;
+        /* white-space: nowrap; */
+        word-break: break-all;
     }
 
     .detailTab button {

diff --git a/src/component/admin/EditPage.jsx b/src/component/admin/EditPage.jsx
@@ -228,9 +228,7 @@ export default function EditPage() {
                     }
 
                     <div className={styles.admin_detail_header_container}>
-                        <div className={styles.admin_detail_header_name}>
-                            <h3>{club.clubName}</h3>
-                        </div>
+                        <div className={styles.admin_detail_header_name}>{club.clubName}</div>
 
                         <div className={styles.association_btn}>
                             <span>{club.clubType === '해당 없음' ? club.college : club.clubType}</span>
@@ -273,15 +271,14 @@ export default function EditPage() {
                         placeholder=" 동아리 인스타 URL을 입력하세요."
                     />
                     <br />
-                    <strong>📌 대표 활동 ({actiCount}/500)</strong>
+                    <strong>📌 대표 활동 ({actiCount}/1500)</strong>
                     <textarea
                         value={clubInfo.activity}
                         defaultValue={clubInfo.activity}
                         onChange={handleActivityChange}
                         rows={5}
                         cols={50}
-                        placeholder=" 대표 활동을 입력하세요.
-										(최대 1500자)"
+                        placeholder=" 대표 활동을 입력하세요."
                     />
                     <br />
                     <strong>📌 동아리장</strong>

diff --git a/src/component/admin/editPage.module.css b/src/component/admin/editPage.module.css
@@ -224,55 +224,57 @@
 }
 
 @media screen and (max-width: 768px) {
-    .DivMyPage {
+    /* .DivMyPage {
         display: flex;
         margin-left: 10%;
         margin-right: 10%;
         margin-bottom: 100px;
-    }
+    } */
 
     .admin_detail_container {
         display: flex;
         flex-direction: column;
-        align-items: flex-start;
-        margin-left: 5%;
-        /* margin-top: 6px; */
-        width: 100%;
+        align-items: center;
+        margin-left: 10%;
+        margin-right: 10%;
     }
 
     .admin_detail_header_container {
         display: flex;
         flex-direction: column;
+        align-items: flex-start;
+        width: 100%;
+        /* height: 40%; */
+        /* margin-top: 20px; */
+        margin-bottom: 10px;
     }
 
     .admin_detail_header {
         display: flex;
         flex-direction: row;
         align-items: center;
-        width: 80%;
-        height: 30%;
+        width: 100%;
+        height: 20%;
+        justify-content: space-around;
     }
 
     .admin_detail_header_name {
         display: flex;
         flex-direction: row;
         margin-bottom: 10px;
-        /* margin-top: 15px; */
-    }
-
-    .admin_detail_header_name h3 {
-        display: flex;
-        flex-direction: row;
-        align-items: center;
         font-size: 20px;
         font-weight: 500;
-        /* line-height: 20px; */
-        margin-top: 1px;
+        line-height: 20px;
+
+        /* margin-top: 15px; */
     }
 
     .admin_detail_logo {
-        width: 150px;
-        margin: 12px 0px 20px 22px;
+        /* width: 150px;
+        margin: 12px 0px 20px 22px; */
+        width: 90%;
+        height: 60%;
+        margin: 12px 24px 20px 0px;
     }
 
     .logoDiv {
@@ -282,8 +284,9 @@
         margin-right: 10px;
     }
     .logoButtonDiv {
-        width: 160px;
-        margin-left: 10px;
+        width: 100px;
+
+        /* margin-left: 5px; */
     }
     .logoButton {
         background-color: #7bc8e0;
@@ -310,10 +313,11 @@
     .edit_input {
         border: 0;
         padding: 0;
+        background-color: #f9f9f9;
     }
 
     .association_btn {
-        width: 110px;
+        width: 140px;
         height: 25px;
         background-color: #7bc8e0;
         color: white;
@@ -329,10 +333,15 @@
     }
 
     .detail_image {
-        width: 30%;
+        /* width: 30%;
+        aspect-ratio: 1/1;
+        object-fit: cover;
+        margin-bottom: 2.5%; */
+        width: 50%;
         aspect-ratio: 1/1;
         object-fit: cover;
         margin-bottom: 2.5%;
+        align-items: left;
     }
 
     .detail_tab {
@@ -369,40 +378,13 @@
         height: 20px;
     }
 
-    .association_btn {
-        width: 160px;
-        height: 30px;
-        background-color: #7bc8e0;
-        color: white;
-        font-size: 12.5px;
-        font-weight: 400;
-        border-radius: 5px;
-        /* text-align: center; */
-        display: flex;
-        flex-direction: row;
-        align-items: center;
-        justify-content: space-evenly;
-        padding: 0px 6px 0px 6px;
-    }
-
     .detail_image {
         width: 30%;
         aspect-ratio: 1/1;
         object-fit: cover;
         margin-bottom: 2.5%;
     }
 
-    .detail_tab {
-        position: relative;
-        display: flex;
-        flex-direction: row;
-        align-items: center;
-        justify-content: space-evenly;
-        width: 100%;
-        height: 25px;
-        background-color: #7bc8e04d;
-    }
-
     .detailBody {
         display: flex;
         flex-direction: column;
@@ -435,34 +417,36 @@
     }
 
     .CompleteButton {
-        width: 90px;
-        height: 35px;
+        width: 80px;
+        height: 30px;
         border-radius: 5px;
         background: #7bc8e0;
         color: white;
         display: flex;
         align-items: center;
         font-family: Noto Sans KR;
-        font-size: 15px;
+        font-size: 13px;
         font-weight: 500;
         margin-left: 20%;
-        padding-left: 31px;
+        display: flex;
+        justify-content: space-around;
         margin-right: 5%;
         border: none;
     }
     .CancelButton {
-        width: 90px;
-        height: 35px;
+        width: 80px;
+        height: 30px;
         border-radius: 5px;
         background: #7bc8e0;
         color: white;
         display: flex;
         align-items: center;
         font-family: Noto Sans KR;
-        font-size: 15px;
+        font-size: 13px;
         font-weight: 500;
         margin-left: 0;
-        padding-left: 31px;
+        display: flex;
+        justify-content: space-around;
         margin-right: 20%;
         border: none;
     }
@@ -473,7 +457,7 @@
         width: 100%;
         align-items: center;
         justify-content: center;
-        margin-top: 5%;
+        margin-top: 10%;
         margin-bottom: 5%;
     }
 }
diff --git a/src/component/admin/mypage.module.css b/src/component/admin/mypage.module.css
@@ -144,6 +144,7 @@
         display: flex;
         flex-direction: row;
         align-items: center;
+        justify-content: space-around;
         width: 100%;
         /* height: 40%; */
         margin-top: 40px;
@@ -164,7 +165,7 @@
     }
 
     .detail_logo {
-        width: 30%;
+        width: 40%;
         height: 60%;
         margin: 12px 24px 20px 0px;
     }

diff --git a/src/component/admin/recruit/AdminRecruitList.jsx b/src/component/admin/recruit/AdminRecruitList.jsx
@@ -71,11 +71,11 @@ export default function AdminRecruitList() {
                         key={item.recruitId}
                         onClick={() => onClickRecruit(item.recruitId)}
                     >
+                        <img src={item.imageUrl ? item.imageUrl : ''} className={styles.recruit_logo} />
                         <div className={styles.recruit_div}>
                             <p className={styles.recruit_title}>{item.title}</p>
                             <p className={styles.recruit_text}>{item.content}</p>
                         </div>
-                        {item.imageUrl ? <img src={item.imageUrl} className={styles.recruit_logo} /> : ''}
                     </div>
                 ))}
             </div>