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

[FEAT] 서비스 오픈 대비 유지보수 배포 4차
CAUCSE · Mar 7, 2024 · 093d31c · 093d31c
2 parents 58f4134 + d7fc7f5
commit 093d31c
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 32 deletions.
diff --git a/src/@types/user.d.ts b/src/@types/user.d.ts
@@ -127,17 +127,17 @@ declare namespace User {
 
   // findPrivilegedUsers
   export interface FindPrivilegedUsersResponseDto {
-    presidentUsers: UserDto[];
-    vicePresidentUsers: UserDto[];
+    presidentUser: UserDto[];
+    vicePresidentUser: UserDto[];
     councilUsers: UserDto[];
     leaderGradeUsers: UserDto[];
     leaderCircleUsers: UserDto[];
     leaderAlumni: UserDto[];
   }
 
   export interface FindPrivilegedUsersResponse {
-    presidentUsers: Model.User[];
-    vicePresidentUsers: Model.User[];
+    presidentUser: Model.User[];
+    vicePresidentUser: Model.User[];
     councilUsers: Model.User[];
     leaderGradeUsers: Model.User[];
     leaderCircleUsers: Model.User[];

diff --git a/src/configs/axios.ts b/src/configs/axios.ts
@@ -62,7 +62,12 @@ API.interceptors.response.use(
 
         config.headers['Authorization'] = accessToken;
         return API.request(config);
-      } else if (data.errorCode === '4107' || data.errorCode === 4107) {
+      } else if (
+        data.errorCode === '4107' ||
+        data.errorCode === 4107 ||
+        data.errorCode === '4000' ||
+        data.errorCode === 4000
+      ) {
         location.href = PAGE_URL.NoPermission;
       }
 

diff --git a/src/pages/auth/NoPermission/NoPermissionPage.tsx b/src/pages/auth/NoPermission/NoPermissionPage.tsx
@@ -15,15 +15,15 @@ const NoPermissionPage: React.FC = observer(() => {
         <Wrapper>
           <img src="/images/empty.png" alt="Empty list logo" />
           <br />
-          권한이 없습니다.
+          페이지가 존재하지 않거나, 권한이 없습니다.
         </Wrapper>
       </PageBody>
     </>
   );
 });
 
 const Wrapper = styled.div`
-  margin: 160px 0 10px;
+  margin: 160px 0 30px;
   font-size: 17px;
   //font-weight: bolder;
   color: gray;

diff --git a/src/pages/board/boardList/components/DeleteBoardModal/DeleteBoardModalUi.ts b/src/pages/board/boardList/components/DeleteBoardModal/DeleteBoardModalUi.ts
@@ -11,7 +11,6 @@ export class DeleteBoardModalUi {
   }
 
   open(target: Model.Board): void {
-    console.log(target);
     this.visible = true;
     this.target = target;
   }

diff --git a/src/pages/board/postDetail/components/CommentInput/CommentInputView.tsx b/src/pages/board/postDetail/components/CommentInput/CommentInputView.tsx
@@ -29,8 +29,6 @@ export const CommentInputView: React.FC<Props> = observer(({ onSubmit }) => {
     setValue('content', content);
   }, [commentInput, setFocus, setValue]);
 
-  console.log(pathname.indexOf('comment'));
-
   return (
     <Form onSubmit={onSubmit} isFocus={isFocus}>
       <InputBox>

diff --git a/src/pages/circle/editor/SubmitButton.tsx b/src/pages/circle/editor/SubmitButton.tsx
@@ -28,7 +28,6 @@ export const SubmitButton: React.FC<{ isEdit: boolean }> = observer(({ isEdit })
   const onSubmit = useCallback(
     async (body: FormBody) => {
       let result: StoreAPI, message: string;
-      console.log(body);
 
       if (isEdit) {
         result = (await update(circleId, body)) as unknown as StoreAPI;

diff --git a/src/pages/setting/roleManagement/SettingRoleManagementPage.tsx b/src/pages/setting/roleManagement/SettingRoleManagementPage.tsx
@@ -24,6 +24,7 @@ const PermissionManagementPage: React.FC = observer(() => {
     fetch();
     return () => reset();
   }, []);
+
   return (
     <>
       <Header mini title="권한 관리" withBack={PAGE_URL.Setting} RightComponent={null} />

diff --git a/src/pages/setting/roleManagement/SettingRoleManagementPageUiStore.ts b/src/pages/setting/roleManagement/SettingRoleManagementPageUiStore.ts
@@ -10,8 +10,8 @@ import { UserRepoImpl as Repo } from '@/stores/repositories/UserRepo';
 export type listKey = 'councilUsers' | 'leaderGradeUsers' | 'leaderCircleUsers';
 
 export class SettingRoleManagementPageUiStore implements WithUserInfoModalUi {
-  presidentUsers: Model.User[] = [];
-  vicePresidentUsers: Model.User[] = [];
+  presidentUser: Model.User[] = [];
+  vicePresidentUser: Model.User[] = [];
   councilUsers: Model.User[] = [];
   leaderGradeUsers: Model.User[] = [];
   leaderCircleUsers: Model.User[] = [];
@@ -34,8 +34,8 @@ export class SettingRoleManagementPageUiStore implements WithUserInfoModalUi {
   }
 
   reset(): void {
-    this.presidentUsers = [];
-    this.vicePresidentUsers = [];
+    this.presidentUser = [];
+    this.vicePresidentUser = [];
     this.councilUsers = [];
     this.leaderGradeUsers = [];
     this.leaderCircleUsers = [];
@@ -44,16 +44,15 @@ export class SettingRoleManagementPageUiStore implements WithUserInfoModalUi {
 
   *fetch(): Generator {
     const {
-      presidentUsers,
-      vicePresidentUsers,
+      presidentUser,
+      vicePresidentUser,
       councilUsers,
       leaderAlumni,
       leaderCircleUsers,
       leaderGradeUsers,
     } = (yield Repo.findPrivilegedUsers()) as unknown as User.FindPrivilegedUsersResponse;
-
-    this.presidentUsers = presidentUsers;
-    this.vicePresidentUsers = vicePresidentUsers;
+    this.presidentUser = presidentUser;
+    this.vicePresidentUser = vicePresidentUser;
     this.councilUsers = councilUsers;
     this.leaderGradeUsers = leaderGradeUsers;
     this.leaderCircleUsers = leaderCircleUsers;

diff --git a/src/pages/setting/roleManagement/components/PresidentUsers.tsx b/src/pages/setting/roleManagement/components/PresidentUsers.tsx
@@ -5,14 +5,14 @@ import { Box, Row, Title, UserName } from './styled';
 import { usePageUiStore } from '@/hooks';
 
 export const PresidentUsers: React.FC = observer(() => {
-  const { presidentUsers } = usePageUiStore<PageUiStore.SettingRoleManagement>();
+  const { presidentUser } = usePageUiStore<PageUiStore.SettingRoleManagement>();
 
   return (
     <Box>
       <Title>학생회장</Title>
-      {presidentUsers[0] ? (
+      {presidentUser[0] ? (
         <Row>
-          <UserName model={presidentUsers[0]} />
+          <UserName model={presidentUser[0]} />
         </Row>
       ) : null}
     </Box>

diff --git a/src/pages/setting/roleManagement/components/VicePresidentUsers.tsx b/src/pages/setting/roleManagement/components/VicePresidentUsers.tsx
@@ -6,15 +6,15 @@ import { PAGE_URL } from '@/configs/path';
 import { usePageUiStore } from '@/hooks';
 
 export const VicePresidentUsers: React.FC = observer(() => {
-  const { vicePresidentUsers } = usePageUiStore<PageUiStore.SettingRoleManagement>();
+  const { vicePresidentUser } = usePageUiStore<PageUiStore.SettingRoleManagement>();
 
   return (
     <Box>
       <ChangeLink pathname={PAGE_URL.SettingRoleVicePresident} />
       <Title>부학생회장</Title>
-      {vicePresidentUsers[0] ? (
+      {vicePresidentUser[0] ? (
         <Row>
-          <UserName model={vicePresidentUsers[0]} />
+          <UserName model={vicePresidentUser[0]} />
         </Row>
       ) : null}
     </Box>

diff --git a/src/pages/setting/users/components/DropModal/DropModal.tsx b/src/pages/setting/users/components/DropModal/DropModal.tsx
@@ -32,8 +32,6 @@ export const DropModal: React.FC = observer(() => {
     close();
   }, [target]);
 
-  console.log(visible);
-
   return (
     <Modal open={visible} closeAfterTransition>
       <ModalBox>

diff --git a/src/stores/repositories/UserRepo.ts b/src/stores/repositories/UserRepo.ts
@@ -77,8 +77,8 @@ class UserRepo {
   findPrivilegedUsers = async (): Promise<User.FindPrivilegedUsersResponse> => {
     const {
       data: {
-        presidentUsers,
-        vicePresidentUsers,
+        presidentUser,
+        vicePresidentUser,
         councilUsers,
         leaderAlumni,
         leaderCircleUsers,
@@ -94,8 +94,8 @@ class UserRepo {
     } = await axios.get<User.FindPrivilegedUsersResponseDto>(`${this.URI}/privileged`); */
 
     return {
-      presidentUsers: presidentUsers.map(user => new UserModel(user)),
-      vicePresidentUsers: vicePresidentUsers.map(user => new UserModel(user)),
+      presidentUser: presidentUser.map(user => new UserModel(user)),
+      vicePresidentUser: vicePresidentUser.map(user => new UserModel(user)),
       councilUsers: councilUsers.map(user => new UserModel(user)),
       leaderGradeUsers: leaderGradeUsers.map(user => new UserModel(user)),
       leaderCircleUsers: leaderCircleUsers.map(user => new UserModel(user)),