Merge pull request #312 from mash-up-kr/develop

어드민 활동점수 변경사항 배포
mash-up-kr · Sep 1, 2024 · 73a2f4b · 73a2f4b
2 parents 95e83bc + fa88111
commit 73a2f4b
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 35 deletions.
diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/src/components/ActivityScore/Icon/Icon.component.tsx b/src/components/ActivityScore/Icon/Icon.component.tsx
@@ -22,6 +22,8 @@ const scoreIcon = {
   [ScoreType.LATE]: <LATE />,
   [ScoreType.ABSENT]: <Absent />,
   [ScoreType.SEMINAR_PRESENTATION]: <Presentation />,
+  [ScoreType.ADD_SCORE_DURING_SEMINAR_ACTIVITY_0_5]: <Presentation />,
+  [ScoreType.ADD_SCORE_DURING_SEMINAR_ACTIVITY_1]: <Presentation />,
   [ScoreType.DEPLOY_SUCCESS]: <ProjectSuccess />,
   [ScoreType.DEPLOY_FAILURE]: <ProjectFail />,
   [ScoreType.MASHUP_LEADER]: <Leader />,

diff --git a/src/components/ActivityScore/constants.ts b/src/components/ActivityScore/constants.ts
@@ -12,6 +12,8 @@ export const ScoreType = {
   MASHUP_LEADER: 'MASHUP_LEADER',
   MASHUP_SUBLEADER: 'MASHUP_SUBLEADER',
   MASHUP_CONTENT_WRITE: 'MASHUP_CONTENT_WRITE',
+  ADD_SCORE_DURING_SEMINAR_ACTIVITY_0_5: 'ADD_SCORE_DURING_SEMINAR_ACTIVITY_0_5',
+  ADD_SCORE_DURING_SEMINAR_ACTIVITY_1: 'ADD_SCORE_DURING_SEMINAR_ACTIVITY_1',
   DEFAULT: 'DEFAULT',
 } as const;
 

diff --git a/src/components/common/Navigation/Navigation.component.tsx b/src/components/common/Navigation/Navigation.component.tsx
@@ -1,4 +1,4 @@
-import React, { ReactElement } from 'react';
+import React, { Fragment, ReactElement } from 'react';
 import { useLocation, useNavigate } from 'react-router-dom';
 import { useRecoilValue, useResetRecoilState } from 'recoil';
 import { ValueOf } from '@/types';
@@ -50,7 +50,7 @@ const Navigation = ({ size, inActiveColor, items, showBottomBorder = true }: Nav
   return (
     <Styled.NavigationContainer showBottomBorder={showBottomBorder}>
       {items.map((item) => (
-        <>
+        <Fragment key={item.title}>
           <Styled.NavigationTitle>{item.title}</Styled.NavigationTitle>
           {item.menus.map((menu, menuIdx) => {
             if (menu.isMasterOnly && !isMaster) {
@@ -62,7 +62,7 @@ const Navigation = ({ size, inActiveColor, items, showBottomBorder = true }: Nav
               .some((pathNameItem) => `/${pathNameItem}` === menu.to);
 
             return (
-              <>
+              <Fragment key={menu.label}>
                 <Styled.ItemWrapper>
                   <Styled.NavigationItem
                     key={menu.to}
@@ -76,10 +76,10 @@ const Navigation = ({ size, inActiveColor, items, showBottomBorder = true }: Nav
                   </Styled.NavigationItem>
                 </Styled.ItemWrapper>
                 {item.menus.length === menuIdx + 1 && <Styled.NavigationDivider />}
-              </>
+              </Fragment>
             );
           })}
-        </>
+        </Fragment>
       ))}
       <Styled.ItemWrapper>
         <Styled.LogoutButton size={size} onClick={handleLogout}>

diff --git a/src/components/common/Table/Table.component.tsx b/src/components/common/Table/Table.component.tsx
@@ -188,10 +188,10 @@ const TableColumnCell = <T extends object>({
     return (
       <Styled.TableColumn textAlign={column.textAlign}>
         {titles.map((title, index) => (
-          <>
+          <Fragment key={title}>
             {title}
             {index !== titles.length - 1 && <br />}
-          </>
+          </Fragment>
         ))}
       </Styled.TableColumn>
     );

diff --git a/...omponents/modal/ApplyActivityScoreModalDialog/ApplyActivityScoreModalDialog.component.tsx b/...omponents/modal/ApplyActivityScoreModalDialog/ApplyActivityScoreModalDialog.component.tsx
@@ -23,69 +23,66 @@ interface FormValues {
 }
 
 const scoreTypes = [
-  {
-    label: '출결',
-    items: [
-      { value: ScoreType.ATTENDANCE, label: '출석', rangeType: RangeType.Normal, range: 0 },
-      { value: ScoreType.LATE, label: '지각', rangeType: RangeType.Minus, range: 0.5 },
-      { value: ScoreType.ABSENT, label: '결석', rangeType: RangeType.Minus, range: 1 },
-    ],
-  },
   {
     label: '활동',
     items: [
       {
-        value: ScoreType.DEPLOY_FAILURE,
-        label: '프로젝트 배포 실패',
-        rangeType: RangeType.Minus,
+        value: ScoreType.SEMINAR_PRESENTATION,
+        label: '전체 세미나 발표',
+        rangeType: RangeType.Plus,
         range: 1,
       },
       {
-        value: ScoreType.DEPLOY_SUCCESS,
-        label: '프로젝트 배포 성공',
+        value: ScoreType.ADD_SCORE_DURING_SEMINAR_ACTIVITY_0_5,
+        label: '세미나 활동중 추가 점수(0.5)',
         rangeType: RangeType.Plus,
-        range: 1,
+        range: 0.5,
       },
       {
-        value: ScoreType.SEMINAR_PRESENTATION,
-        label: '전체 세미나 발표',
+        value: ScoreType.ADD_SCORE_DURING_SEMINAR_ACTIVITY_1,
+        label: '세미나 활동중 추가 점수(1)',
         rangeType: RangeType.Plus,
         range: 1,
       },
       {
         value: ScoreType.MASHUP_CONTENT_WRITE,
-        label: '매시업 콘텐츠 글 작성',
+        label: 'Mash-Up 콘텐츠 글 작성',
         rangeType: RangeType.Plus,
         range: 0.5,
       },
       {
         value: ScoreType.HACKATHON_COMMITTEE,
-        label: '뭐든준비위원회',
+        label: '준비위원회',
         rangeType: RangeType.Plus,
         range: 1,
       },
+      {
+        value: ScoreType.DEPLOY_FAILURE,
+        label: '프로젝트 MVP 배포 실패',
+        rangeType: RangeType.Minus,
+        range: 0.5,
+      },
     ],
   },
   {
     label: '직위',
     items: [
-      { value: ScoreType.MASHUP_LEADER, label: '회장', rangeType: RangeType.Plus, range: 100 },
-      { value: ScoreType.MASHUP_SUBLEADER, label: '부회장', rangeType: RangeType.Plus, range: 100 },
-      { value: ScoreType.MASHUP_STAFF, label: '스태프', rangeType: RangeType.Plus, range: 99 },
+      { value: ScoreType.MASHUP_STAFF, label: '스태프', rangeType: RangeType.Plus, range: 3 },
       {
         value: ScoreType.PROJECT_LEADER,
-        label: '프로젝트팀 팀장',
-        rangeType: RangeType.Plus,
-        range: 2,
-      },
-      {
-        value: ScoreType.PROJECT_SUBLEADER,
-        label: '프로젝트팀 부팀장',
+        label: '프로젝트 팀 리더',
         rangeType: RangeType.Plus,
         range: 2,
       },
     ],
   },
+  {
+    label: '출결',
+    items: [
+      { value: ScoreType.LATE, label: '지각', rangeType: RangeType.Minus, range: 0.5 },
+      { value: ScoreType.ABSENT, label: '결석', rangeType: RangeType.Minus, range: 1 },
+    ],
+  },
 ];
 
 export interface ApplyActivityScoreModalDialogProps {