Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FEAT] 서비스 오픈 대비 유지보수 배포 2차 (개발) #94

Merged
merged 5 commits into from
Mar 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/@types/circle.d.ts
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
12 changes: 6 additions & 6 deletions src/@types/user.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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[];
}

// ---
Expand Down
5 changes: 5 additions & 0 deletions src/components/Atoms/Button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/configs/axios.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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`, {
Expand All @@ -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;
}

Expand Down
23 changes: 21 additions & 2 deletions src/pages/auth/NoPermission/NoPermissionPage.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import styled from '@emotion/styled';
import { observer } from 'mobx-react-lite';
import React from 'react';

Expand All @@ -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 });
6 changes: 3 additions & 3 deletions src/pages/auth/admission/AdmissionPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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}
/>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/auth/signIn/SignInPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/auth/signUp/SignUpPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 });
Expand Down
Loading