Merge pull request #1421 from 42organization/6th_party

[test-deploy] 파티 모집 피드백 반영 테스트 배포
42organization · Apr 20, 2024 · f4b513b · f4b513b
2 parents a46f6ce + d8a3282
commit f4b513b
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -120,6 +120,23 @@
 </table>
 <br>
 
+<h3>6기</h3>
+<table>
+  <tr>
+    <td align=center>역할</td>
+    <td align=center>LEAD🐧</td>
+    <td align=center>Party detail room 개발</td>
+    <td align=center>Party admin 개발</td>
+  </tr>
+  <tr>
+    <td align=center>이름</td>
+    <td align=center><a href="https://github.com/izone00">정우진 @woojeong</a></td>
+    <td align=center><a href="https://github.com/contemplation-person">하주영 @juha</a></td>
+    <td align=center><a href="https://github.com/mantoing">원재윤 @jaeywon</a></td>
+  </tr>
+</table>
+<br>
+
 <h2>주요 기능 소개</h2>
 
 ### 🔐 42 OAuth, Kakao OAuth api를 통해 로그인할 수 있습니다.
@@ -140,9 +157,9 @@
 
 <br/>
 
-### 🏓 메인페이지에서 탁구 랭킹, 최근 경기를 확인할 수 있습니다.
+### 🏓 메인페이지에서 Party모집, 탁구 랭킹, 최근 경기를 확인할 수 있습니다.
 
-<img width="25%" alt="Main_Main" src="https://github.com/42organization/42gg.client/assets/100325940/61689755-1535-4e79-85d6-611b4390f9ea">
+<img width="25%" alt="Main_Main" src="https://github.com/42organization/42gg.client/assets/68673565/44965344-c6de-4601-bad5-4332f6e57679">
 &nbsp;&nbsp;&nbsp;
 <img width="25%" alt="Main_Menu" src="https://github.com/42organization/42gg.client/assets/100325940/625fba76-076b-4936-8679-61bdc24f2065">
 &nbsp;&nbsp;&nbsp;
@@ -195,6 +212,7 @@
 <br/>
 
 ### 🏦 상점 페이지에서 아이템을 구매하고 사용할 수 있습니다
+
 <img width="25%" alt="Store_Main" src="https://github.com/42organization/42gg.client/assets/100325940/751f4dec-b8a1-4ca5-b01e-35119f930da9">
 &nbsp;&nbsp;&nbsp;
 <img width="25%" alt="Store_Inventory" src="https://github.com/42organization/42gg.client/assets/100325940/be1cabb6-9f80-4f8b-81dc-4c1c987cc313">
@@ -218,13 +236,15 @@
 <img width="25%" alt="Gacha_Edge" src="https://github.com/42organization/42gg.client/assets/100325940/088d252a-fdb9-42c8-8482-859e952245f3">
 
 ### 💰 본인의 코인 내역도 확인할 수 있습니다
+
 <img width="25%" alt="Store_CoinClick" src="https://github.com/42organization/42gg.client/assets/100325940/f4d260db-2fc7-4109-a427-d6cf0bc36f75">
 &nbsp;&nbsp;&nbsp;
 <img width="25%" alt="Store_CoinHistory" src="https://github.com/42organization/42gg.client/assets/100325940/4b30f9d9-d39b-4a5d-bc09-8ed6665910bb">
 
 <br/>
 
 ### 🏓 개최된 토너먼트에 참가 신청을 할 수 있습니다
+
 <img width="25%" alt="Store_CoinHistory" src="https://github.com/42organization/42gg.client/assets/93255519/8614432d-e570-4423-a064-5655c766df5b">
 &nbsp;&nbsp;&nbsp;
 <img width="25%" alt="Store_CoinHistory" src="https://github.com/42organization/42gg.client/assets/93255519/40d5b219-fd55-4b9f-a4ab-f57c29f39e6c">
@@ -234,6 +254,7 @@
 <img width="25%" alt="Store_CoinHistory" src="https://github.com/42organization/42gg.client/assets/93255519/e6fce8ce-bb7d-4e44-b3c2-b19167c5ce39">
 
 ### 🏆 명예의 전당에서 토너먼트 우승자들을 확인 할 수 있어요!
+
 <img width="28.4%" alt="Store_CoinHistory" src="https://github.com/42organization/42gg.client/assets/93255519/524d6c26-39bb-48f6-ae08-ca0690a69bfb">
 &nbsp;&nbsp;&nbsp;
 <img width="25%" alt="Store_CoinHistory" src="https://github.com/42organization/42gg.client/assets/93255519/53b6d903-de35-401d-979d-90ab7ec19eb5">
@@ -264,7 +285,6 @@
 &nbsp;&nbsp;&nbsp;
 <img width="25%" alt="Profile_Edit2" src="https://github.com/42organization/42gg.client/assets/100325940/e4437d0f-9bab-4b62-a245-159f679c0e99">
 
-
 #### 👤 42 계정과 Kakao 계정을 연동할 수 있어요!
 
 <img width="25%" alt="Profile_Connect_Kakao" src="https://github.com/42organization/42gg.client/assets/100325940/f748bd0c-3e44-4715-80bd-aedfd47c6521">
@@ -277,6 +297,24 @@
 
 <img width=25% alt="email" src="https://user-images.githubusercontent.com/58678617/177515852-c12394c4-e926-4034-997c-c9c8cea48ded.png">
 
+### 🧑‍🤝‍🧑 파티 리스트 페이지에서 현재 생성된 방을 한 눈에 볼 수 있습니다.
+
+<!-- 파티 리스트 이미지 -->
+<img width=25% alt="party list page" src="https://github.com/42organization/42gg.client/assets/68673565/e1d00ae9-8fe3-4fd6-a18c-bb2573518164">
+
+### 🧑‍🤝‍🧑 파티 방을 만들 때도 카테고리 선택 후 방을 생성할 수 있습니다.
+
+<!-- 파티 카테고리, 파티 생성 -->
+<img width=25% alt="party category" src="https://github.com/42organization/42gg.client/assets/68673565/8638abf0-e9b7-4ef9-bc47-2353c1871c42">
+<img width=25% alt="party create room" src="https://github.com/42organization/42gg.client/assets/68673565/50792937-0f55-4b27-b2e9-675cfb4132eb">
+
+### 🧑‍🤝‍🧑  누구나 쉽게 친구 또는 익명의 사용자와 Party를 맺을 수 있어요!
+
+<!-- 파티 카테고리, 파티 생성 -->
+
+| 방장 화면 | 팀원 화면 | 유저 화면 |
+| :-------: | :-------: | :-------: |
+|<img width=100% alt="party manager page" src="https://github.com/42organization/42gg.client/assets/68673565/f9b4866a-cfb3-407f-ba9e-99cf2d5ece6b">|<img width=100% alt="party member page" src="https://github.com/42organization/42gg.client/assets/68673565/f9659268-9159-4243-8c3d-151eca2cdbd2">|<img width=100% alt="party user page" src="https://github.com/42organization/42gg.client/assets/68673565/2276a9bb-f5d9-4581-baf8-570fbd05b5ea">|
 <br/>
 <br/>
 

diff --git a/components/Layout/Header.tsx b/components/Layout/Header.tsx
@@ -62,7 +62,7 @@ export default function Header() {
     const path = router.asPath.split('?')[0]; // 쿼리 스트링 제거
     const patterns = [
       /^\/party\/create$/, // '/party/create'
-      /^\/party\/[0-9]+$/, // '/party/[roomId]'
+      /^\/party\/room$/, // '/party/[roomId]'
     ];
 
     return patterns.some((pattern) => pattern.test(path));

diff --git a/components/modal/party/PartyRoomEditModal.tsx b/components/modal/party/PartyRoomEditModal.tsx
@@ -125,6 +125,7 @@ export default function PartyRoomEditModal({ roomId }: { roomId: number }) {
                 <div>
                   <span className={styles.commentUserName}>
                     {comment.nickname}
+                    <span className={styles.intraId}> ({comment.intraId})</span>
                   </span>
                   <span className={styles.commentDate}>
                     {dateToStringShort(new Date(comment.createDate))}

diff --git a/constants/party/createOptions.ts b/constants/party/createOptions.ts
@@ -5,7 +5,7 @@ export const customTemplate: PartyTemplateWithoutCategory = {
   gameTemplateId: custumTemplateId,
   gameName: '직접 입력',
   minGamePeople: 2,
-  maxGamePeople: 4,
+  maxGamePeople: 8,
   minGameTime: 15,
   maxGameTime: 30,
   genre: '',

diff --git a/hooks/party/usePartyForm.ts b/hooks/party/usePartyForm.ts
@@ -27,14 +27,14 @@ const reducer: React.Reducer<PartyCreateForm, PartyFormAction> = (
   switch (action.type) {
     case 'UPDATE_TITLE':
       if (action.title.length > 15) return state;
-      return { ...state, title: action.title };
+      return { ...state, title: action.title.trimStart() };
     case 'UPDATE_MIN_PEOPLE':
       return { ...state, minPeople: action.minPeople };
     case 'UPDATE_MAX_PEOPLE':
       return { ...state, maxPeople: action.maxPeople };
     case 'UPDATE_CONTENT':
       if (action.content.length > 100) return state;
-      return { ...state, content: action.content };
+      return { ...state, content: action.content.trimStart() };
     case 'UPDATE_OPEN_PERIOD':
       return {
         ...state,

diff --git a/styles/admin/party/PartyRoomEdit.module.scss b/styles/admin/party/PartyRoomEdit.module.scss
@@ -57,7 +57,7 @@
     }
     ul {
       display: flex;
-      margin: 0 5%;
+      margin: 0;
 
       li {
         display: flex;
@@ -99,6 +99,10 @@
 
           .commentUserName {
             font-weight: 500;
+
+            .intraId {
+              color: $dark-gray;
+            }
           }
           .commentDate {
             margin-left: 1em;

diff --git a/styles/party/PartyCreate.module.scss b/styles/party/PartyCreate.module.scss
@@ -148,7 +148,8 @@
 
         select {
           width: 2.5em;
-          text-align: center;
+          color: black;
+          text-align-last: center;
         }
         .textCenter {
           width: 2.5em;
@@ -163,7 +164,8 @@
 
         select {
           width: 2.5em;
-          text-align: center;
+          color: black;
+          text-align-last: center;
         }
         .textCenter {
           width: 2.5em;

diff --git a/types/modalTypes.ts b/types/modalTypes.ts
@@ -36,7 +36,7 @@ type StoreModal = 'MANUAL' | 'COIN_HISTORY';
 
 type TournamentModal = 'REGISTRY' | 'MANUAL';
 
-export type PartyModal = 'REPORT' | 'MANUAL';
+type PartyModal = 'REPORT' | 'MANUAL';
 
 type AdminModal =
   | 'PROFILE'