Merge pull request #94 from CAUCSE/feat/#87

[FEAT] 서비스 오픈 대비 유지보수 배포 2차
CAUCSE · Mar 7, 2024 · 09086a5 · 09086a5
2 parents c12cb30 + 387a6c3
commit 09086a5
Show file tree

Hide file tree

Showing 21 changed files with 573 additions and 53 deletions.
diff --git a/src/@types/circle.d.ts b/src/@types/circle.d.ts
@@ -1,5 +1,5 @@
 declare namespace Circle {
-  export type Status = 'AWAIT' | 'DROP' | 'LEAVE' | 'MEMBER' | 'REJECT' | 'LEAVE_N_DROP';
+  export type Status = 'AWAIT' | 'DROP' | 'LEAVE' | 'MEMBER' | 'REJECT';
 
   export interface CreateRequestDto {
     mainImage: string;

diff --git a/src/@types/user.d.ts b/src/@types/user.d.ts
@@ -127,21 +127,21 @@ declare namespace User {
 
   // findPrivilegedUsers
   export interface FindPrivilegedUsersResponseDto {
-    presidentUsers: UserDto | null;
-    vicePresidentUsers: UserDto | null;
+    presidentUsers: Model.User[];
+    vicePresidentUsers: Model.User[];
     councilUsers: UserDto[];
     leaderGradeUsers: UserDto[];
     leaderCircleUsers: UserDto[];
-    leaderAlumni: UserDto | null;
+    leaderAlumni: Model.User[];
   }
 
   export interface FindPrivilegedUsersResponse {
-    presidentUsers: Model.User | null;
-    vicePresidentUsers: Model.User | null;
+    presidentUsers: Model.User[];
+    vicePresidentUsers: Model.User[];
     councilUsers: Model.User[];
     leaderGradeUsers: Model.User[];
     leaderCircleUsers: Model.User[];
-    leaderAlumni: Model.User | null;
+    leaderAlumni: Model.User[];
   }
 
   // ---

diff --git a/src/components/Atoms/Button.tsx b/src/components/Atoms/Button.tsx
@@ -54,6 +54,11 @@ export const NavButton = styled(Button)`
   margin: 13px 0;
 `;
 
+export const NavSmallButton = styled(Button)`
+  margin: 13px 0;
+  font-size: 15px;
+`;
+
 const ClearButtonNative = styled('button')`
   user-select: none;
   padding: 0;

diff --git a/src/configs/axios.ts b/src/configs/axios.ts
@@ -49,7 +49,7 @@ API.interceptors.response.use(
       ) {
         removeRefresh();
         if (location.pathname !== PAGE_URL.SignIn) location.href = PAGE_URL.SignIn;
-      } else if (data.errorCode === '4105') {
+      } else if (data.errorCode === '4105' || data.errorCode === 4105) {
         const {
           data: { accessToken },
         } = (await API.put(`/api/v1/users/token/update`, {
@@ -62,7 +62,7 @@ API.interceptors.response.use(
 
         config.headers['Authorization'] = accessToken;
         return API.request(config);
-      } else if (data.errorCode === '4107') {
+      } else if (data.errorCode === '4107' || data.errorCode === 4107) {
         location.href = PAGE_URL.NoPermission;
       }
 

diff --git a/src/pages/auth/NoPermission/NoPermissionPage.tsx b/src/pages/auth/NoPermission/NoPermissionPage.tsx
@@ -1,3 +1,4 @@
+import styled from '@emotion/styled';
 import { observer } from 'mobx-react-lite';
 import React from 'react';
 
@@ -9,12 +10,30 @@ import { PAGE_URL } from '@/configs/path';
 const NoPermissionPage: React.FC = observer(() => {
   return (
     <>
-      <Header withBack={PAGE_URL.Home} title="경고" />
+      <Header withBack={PAGE_URL.Home} title="접근 불가" />
       <PageBody>
-        <BodyScreen>접근 권한이 없습니다.</BodyScreen>
+        <Wrapper>
+          <img src="/images/empty.png" alt="Empty list logo" />
+          <br />
+          권한이 없습니다.
+        </Wrapper>
       </PageBody>
     </>
   );
 });
 
+const Wrapper = styled.div`
+  margin: 160px 0 10px;
+  font-size: 17px;
+  //font-weight: bolder;
+  color: gray;
+  line-height: 12px;
+  text-align: center;
+
+  > img {
+    margin-bottom: 10px;
+    width: 100px;
+  }
+`;
+
 export default PageStoreHOC(<NoPermissionPage />, { store: PageUiStoreImpl });
diff --git a/src/pages/auth/admission/AdmissionPage.tsx b/src/pages/auth/admission/AdmissionPage.tsx
@@ -31,17 +31,17 @@ const AdmissionPage: React.FC = observer(() => {
         <BodyScreen>
           <Guide>
             중앙대학교 전산학과 / 컴퓨터공학과 / 소프트웨어학부임을 인증할 수 있는 자료를
-            첨부해주세요.
+            첨부해주세요. 변경이 불가능하니 주의하여 입력하세요.
             <br />
             <br />
-            예) 학생증, 졸업증명서, 포탈 내 개인정보 화면 캡처 등
+            (학번/이름이 포함되게 하여 학생증, 졸업증명서, 포탈 내 개인정보 화면 캡처 중 하나 기입)
           </Guide>
 
           <Label>사진 첨부</Label>
           <ImageInput name="attachImage" />
           <Label>설명 첨부</Label>
           <Textarea
-            placeholder="설명을 첨부해주세요"
+            placeholder="사진에 대한 설명을 첨부해주세요"
             {...methods.register('description')}
             maxLength={254}
           />

diff --git a/src/pages/auth/signIn/SignInPage.tsx b/src/pages/auth/signIn/SignInPage.tsx
@@ -78,7 +78,7 @@ const SignInPage: React.FC = observer(() => {
       </Form>
 
       <SubLink>
-        <Link to={PAGE_URL.SignUp}>회원가입</Link>
+        <Link to={PAGE_URL.UseTerms}>회원가입</Link>
         <Link to={PAGE_URL.FindPassword}>비밀번호를 잃어버리셨나요?</Link>
       </SubLink>
     </PageWrapper>

diff --git a/src/pages/auth/signUp/SignUpPage.tsx b/src/pages/auth/signUp/SignUpPage.tsx
@@ -42,7 +42,7 @@ const SignUpPage: React.FC = observer(() => {
     const { success, message } = (await signUp(body)) as unknown as StoreAPI;
 
     if (success) {
-      replace(PAGE_URL.UseTerms);
+      replace(PAGE_URL.SignIn);
       alert({ message: '회원가입 되었습니다. 로그인 후 학부인증을 진행하세요.' });
     } else if (message) {
       alert({ message });