Merge pull request #326 from themoment-team/develop

Release v231017.0
themoment-team · Oct 17, 2023 · fa45472 · fa45472 · vercel · Oct 17, 2023
2 parents f037363 + cd6d0ce
commit fa45472
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 23 deletions.
diff --git a/packages/hello-gsm-admin/src/PageContainer/ApplicationPage/index.tsx b/packages/hello-gsm-admin/src/PageContainer/ApplicationPage/index.tsx
@@ -375,7 +375,7 @@ const ApplicationPage: NextPage<{
               <tbody>
                 <tr>
                   <S.Subject rowSpan={2}>학년</S.Subject>
-                  <S.Subject colSpan={6}>출결상황</S.Subject>
+                  <S.Subject colSpan={6}>미인정 출결 현황</S.Subject>
                   <S.Subject colSpan={2}>봉사활동</S.Subject>
                 </tr>
                 <tr>

diff --git a/packages/hello-gsm-admin/src/PageContainer/CalculatorPage/index.tsx b/packages/hello-gsm-admin/src/PageContainer/CalculatorPage/index.tsx
@@ -509,7 +509,7 @@ const CalculatorPage: NextPage<CalculatorPageProps> = ({ score, userId }) => {
                 <tbody>
                   <tr>
                     <S.Grade rowSpan={2}>학년</S.Grade>
-                    <S.Attendance colSpan={4}>출결상황</S.Attendance>
+                    <S.Attendance colSpan={4}>미인정 출결 현황</S.Attendance>
                     <S.Attendance rowSpan={2}>봉사활동(시간)</S.Attendance>
                   </tr>
                   <tr>

diff --git a/packages/hello-gsm-calculate/src/PageContainer/CalculatorPage/index.tsx b/packages/hello-gsm-calculate/src/PageContainer/CalculatorPage/index.tsx
@@ -434,7 +434,7 @@ const CalculatorPage: NextPage = () => {
                 <tbody>
                   <tr>
                     <S.Grade rowSpan={2}>학년</S.Grade>
-                    <S.Attendance colSpan={4}>출결상황</S.Attendance>
+                    <S.Attendance colSpan={4}>미인정 출결 현황</S.Attendance>
                     <S.Attendance rowSpan={2}>봉사활동(시간)</S.Attendance>
                   </tr>
                   <tr>

diff --git a/packages/hello-gsm/src/PageContainer/ApplicationPage/index.tsx b/packages/hello-gsm/src/PageContainer/ApplicationPage/index.tsx
@@ -372,7 +372,7 @@ const ApplicationPage: NextPage<ApplicationDataType> = ({ data }) => {
               <tbody>
                 <tr>
                   <S.Subject rowSpan={2}>학년</S.Subject>
-                  <S.Subject colSpan={6}>출결상황</S.Subject>
+                  <S.Subject colSpan={6}>미인정 출결 현황</S.Subject>
                   <S.Subject colSpan={2}>봉사활동</S.Subject>
                 </tr>
                 <tr>

diff --git a/packages/hello-gsm/src/PageContainer/CalculatorPage/index.tsx b/packages/hello-gsm/src/PageContainer/CalculatorPage/index.tsx
@@ -521,7 +521,7 @@ const CalculatorPage: NextPage<CalculatorPageProps> = ({
                 <tbody>
                   <tr>
                     <S.Grade rowSpan={2}>학년</S.Grade>
-                    <S.Attendance colSpan={4}>출결상황</S.Attendance>
+                    <S.Attendance colSpan={4}>미인정 출결 현황</S.Attendance>
                     <S.Attendance rowSpan={2}>봉사활동(시간)</S.Attendance>
                   </tr>
                   <tr>

diff --git a/packages/hello-gsm/src/PageContainer/MypagePage/index.tsx b/packages/hello-gsm/src/PageContainer/MypagePage/index.tsx
@@ -55,11 +55,7 @@ const MyPage: NextPage<ApplicationIdentityType> = ({
   );
 
   const isSubmitted = () => (
-    <S.ButtonBox
-      css={css`
-        width: 30rem;
-      `}
-    >
+    <S.ButtonBox>
       <LinkButton href="/application" color={theme.color.primary.sky}>
         🖨️ 원서 출력
       </LinkButton>
@@ -79,11 +75,7 @@ const MyPage: NextPage<ApplicationIdentityType> = ({
         height: 13.125rem;
       `}
     >
-      <S.ButtonBox
-        css={css`
-          width: 55.25rem;
-        `}
-      >
+      <S.ButtonBox>
         <LinkButton
           color={theme.color.sub.orange}
           onClick={() => showModal('delete')}

diff --git a/packages/hello-gsm/src/PageContainer/MypagePage/style.ts b/packages/hello-gsm/src/PageContainer/MypagePage/style.ts
@@ -45,9 +45,8 @@ export const Name = styled.p`
 `;
 
 export const ButtonBox = styled.div`
-  width: 100%;
   display: flex;
-  justify-content: space-between;
+  gap: 12px;
 `;
 
 export const Button = styled.button`

diff --git a/packages/hello-gsm/src/PageContainer/SchoolPage/style.ts b/packages/hello-gsm/src/PageContainer/SchoolPage/style.ts
@@ -147,7 +147,7 @@ export const Line = styled.div`
   height: 0.1875rem;
   position: absolute;
   top: 33.3438rem;
-  z-index: -1;
+  z-index: 0;
   background: #9a9a9a;
 `;
 
@@ -212,6 +212,7 @@ export const Dot = styled.div`
   border-radius: 50%;
   background: #c4c4c4;
   margin: 1.25rem 0 1.0625rem;
+  z-index: 1;
 `;
 
 export const TotalWrapper = styled.div`
@@ -292,6 +293,7 @@ export const GreenBall = styled(Ball)`
 export const BlueBall = styled(Ball)`
   width: 6.875rem;
   height: 6.875rem;
+  z-index: -1;
   background: linear-gradient(
     220deg,
     #7be8ff 10.2%,
@@ -300,6 +302,7 @@ export const BlueBall = styled(Ball)`
   );
   top: 50.25rem;
   left: 82%;
+
   @media ${device.tablet} {
     display: none;
   }
@@ -366,6 +369,7 @@ export const BigGreenBall = styled(Ball)`
   box-shadow: 0.25rem 0.25rem 1.9375rem 0rem rgba(0, 0, 0, 0.25);
   top: 111.625rem;
   left: 75%;
+  z-index: -2;
   @media ${device.tablet} {
     display: none;
   }

diff --git a/packages/hello-gsm/src/PageContainer/Test/CalculatorPage/index.tsx b/packages/hello-gsm/src/PageContainer/Test/CalculatorPage/index.tsx
@@ -445,7 +445,7 @@ const TestCalculatorPage: NextPage = () => {
                 <tbody>
                   <tr>
                     <S.Grade rowSpan={2}>학년</S.Grade>
-                    <S.Attendance colSpan={4}>출결상황</S.Attendance>
+                    <S.Attendance colSpan={4}>미인정 출결 현황</S.Attendance>
                     <S.Attendance rowSpan={2}>봉사활동(시간)</S.Attendance>
                   </tr>
                   <tr>

diff --git a/packages/hello-gsm/src/components/Common/Header/index.tsx b/packages/hello-gsm/src/components/Common/Header/index.tsx
@@ -2,17 +2,28 @@ import { css } from '@emotion/react';
 import auth from 'Api/auth';
 import Link from 'next/link';
 import { useRouter } from 'next/router';
-import React from 'react';
+import React, { useState } from 'react';
 import useStore from 'Stores/StoreContainer';
 import * as S from './style';
 import * as I from 'Assets/svg';
 import { SideBar } from 'components';
+import { toast } from 'react-toastify';
 
 const Header: React.FC = () => {
   const { pathname } = useRouter();
+  const [isLogoutClicked, setIsLogoutClicked] = useState<boolean>(false);
 
   const { logged, setShowSideBar } = useStore();
 
+  const handleLogoutClick = (e: React.MouseEvent<HTMLAnchorElement>) => {
+    if (isLogoutClicked) {
+      toast.error('로그아웃 중입니다. 잠시만 기다려주세요.');
+      return e.preventDefault();
+    }
+
+    return setIsLogoutClicked(true);
+  };
+
   const select = (navPath: string) =>
     navPath === pathname &&
     css`
@@ -57,7 +68,7 @@ const Header: React.FC = () => {
             <Link href="/mypage" passHref>
               <S.NavContent css={select('/mypage')}>마이페이지</S.NavContent>
             </Link>
-            <a href={auth.logout()}>
+            <a href={auth.logout()} onClick={handleLogoutClick}>
               <S.AuthButton>로그아웃</S.AuthButton>
             </a>
           </S.MemberBox>

diff --git a/packages/hello-gsm/src/components/Modals/MypageModal/index.tsx b/packages/hello-gsm/src/components/Modals/MypageModal/index.tsx
@@ -4,7 +4,7 @@ import useStore from 'Stores/StoreContainer';
 import { css } from '@emotion/react';
 import application from 'Api/application';
 import { useRouter } from 'next/router';
-
+import Link from 'next/link';
 const MypageModal: React.FC = () => {
   const { setShowMypageModal, mypageModalContent, setShowMypageSuccessModal } =
     useStore();
@@ -96,6 +96,9 @@ const MypageModal: React.FC = () => {
           <I.Questioner />
         </S.ExplanationBox>
         <S.ButtonBox>
+          <Link href="/application">
+            <S.CancelButton>원서 미리보기</S.CancelButton>
+          </Link>
           <S.CancelButton onClick={setShowMypageModal}>취소</S.CancelButton>
           <S.AllowButton
             css={css`

diff --git a/packages/hello-gsm/src/components/Modals/MypageModal/style.ts b/packages/hello-gsm/src/components/Modals/MypageModal/style.ts
@@ -55,9 +55,9 @@ export const RedHighlighting = styled.span`
 `;
 
 export const ButtonBox = styled.div`
-  width: 310px;
   display: flex;
   justify-content: space-between;
+  gap: 10px;
 `;
 
 const Button = styled.div`