Merge pull request #106 from sopt-makers/dev

SOPT Web Admin 2.0.2

src/assets/icons/SoptLogos/index.ts

@@ -1,3 +1,4 @@
 export { default as DoSoptLogo } from './DoSoptLogo.svg';
 export { default as GoSoptLogo } from './GoSoptLogo.svg';
+export { default as NowSoptLogo } from './NowSoptLogo.svg';
 export { default as SoptMainLogo } from './SoptMainLogo.svg';

src/components/common/Nav/GenerationDropDown/index.tsx

@@ -3,7 +3,7 @@ import { useRouter } from 'next/router';
 import { useState } from 'react';
 
 import { IcNewDropdown } from '@/assets/icons';
-import { DoSoptLogo } from '@/assets/icons/SoptLogos';
+import { NowSoptLogo } from '@/assets/icons/SoptLogos';
 import { useRecoilGenerationSSR } from '@/hooks/useRecoilGenerationSSR';
 import { GENERATION_INFO } from '@/utils/nav';
 
@@ -21,8 +21,8 @@ function GenerationDropDown() {
   const [isDropdownOn, setIsDropdownOn] = useState<boolean>(false);
 
   const [selectedGenerationInfo, setSelectedGenerationInfo] = useState({
-    logo: <DoSoptLogo />,
-    slogan: 'DO',
+    logo: <NowSoptLogo />,
+    slogan: GENERATION_INFO[0].slogan,
   });
 
   const handleSelectedGeneration = (

src/components/common/Nav/GenerationDropDown/style.ts

@@ -41,6 +41,10 @@ export const StSelectedGeneration = styled(GenerationContainer)`
   &:active {
     background-color: ${colors.gray700};
   }
+
+  & > svg > path > fill {
+    border-radius: 0.7rem;
+  }
 `;
 
 export const StDropdownGeneration = styled(GenerationContainer)`

src/pages/attendanceAdmin/session/[id].tsx

@@ -98,7 +98,7 @@ function SessionDetailPage() {
         ? prevStatus.secondRoundStatus
         : prevStatus.firstRoundStatus
       : (attendances.find((attendance) => attendance.round === anotherRound)
-        ?.status as ATTEND_STATUS);
+          ?.status as ATTEND_STATUS);
 
     const firstRoundStatus = round === 1 ? status : anotherRoundStatus;
     const secondRoundStatus = round === 2 ? status : anotherRoundStatus;
@@ -246,7 +246,7 @@ function SessionDetailPage() {
         return () => closeAttendance();
       default:
         // eslint-disable-next-line prettier/prettier
-        return () => { };
+        return () => {};
     }
   };
 

src/recoil/atom.ts

@@ -1,6 +1,8 @@
 import { atom } from 'recoil';
 import { recoilPersist } from 'recoil-persist';
 
+import { ACTIVITY_GENERATION } from '@/utils/generation';
+
 const sessionStorage =
   typeof window !== 'undefined' ? window.sessionStorage : undefined;
 
@@ -11,6 +13,6 @@ const { persistAtom } = recoilPersist({
 
 export const currentGenerationState = atom<string>({
   key: 'currentGenerationState',
-  default: '33',
+  default: ACTIVITY_GENERATION,
   effects_UNSTABLE: [persistAtom],
 });

src/utils/generation.ts

@@ -1,3 +1,3 @@
-export const ACTIVITY_GENERATION: string = '33';
+export const ACTIVITY_GENERATION: string = '34';
 
-export const GENERATION_LIST: string[] = ['33', '32'];
+export const GENERATION_LIST: string[] = ['34', '33', '32'];

src/utils/nav.ts

@@ -1,7 +1,12 @@
 import { IcAlarmMenu, IcAttendanceMenu, IcOrgMenu } from '@/assets/icons';
-import { DoSoptLogo, GoSoptLogo } from '@/assets/icons/SoptLogos';
+import { DoSoptLogo, GoSoptLogo, NowSoptLogo } from '@/assets/icons/SoptLogos';
 
 export const GENERATION_INFO = [
+  {
+    generation: '34',
+    Logo: NowSoptLogo,
+    slogan: 'NOW',
+  },
   {
     generation: '33',
     Logo: DoSoptLogo,