Skip to content

Commit

Permalink
feat: 학부 인증, 사용약관 router 변경, 동아리 유저 관리, 로그아웃 method 변경 (#87)
Browse files Browse the repository at this point in the history
  • Loading branch information
selfishAltruism committed Mar 7, 2024
1 parent ea7de02 commit 760a939
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 9 deletions.
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
2 changes: 1 addition & 1 deletion src/pages/auth/useTerms/UseTermsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const UseTermsPage: React.FC = observer(() => {
} = useRootStore();

const onSubmit = () => {
if (!isSignIn) replace(PAGE_URL.SignIn);
if (!isSignIn) replace(PAGE_URL.SignUp);
else push(generatePath(PAGE_URL.Setting));
};

Expand Down
2 changes: 1 addition & 1 deletion src/pages/circle/users/CircleUsersPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const CircleUsersPage: React.FC = observer(() => {
>
<Tab label="가입 대기 유저" {...a11yProps(0)} />
<Tab label="모든 유저" {...a11yProps(1)} />
<Tab label="탈퇴/추방 유저" {...a11yProps(2)} />
<Tab label="추방 유저" {...a11yProps(2)} />
</Tabs>

<SwipeableWrapper
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ export const AdmissionRejectModal: React.FC = observer(() => {

if (success) {
remove(target);
alert({ message: `${target.nameWithAdmission} 유저의 회원가입이 거절되었습니다` });
alert({
message: `${target.nameWithAdmission} 유저의 회원가입이 거절되었습니다. 학생회장에게 연락 바랍니다.`,
});
} else if (message) alert({ message });
close();
}, [target]);
Expand Down
2 changes: 1 addition & 1 deletion src/stores/repositories/AuthRepo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class AuthRepo {
};

signOut = async (body: User.SignOutRequestDto) => {
return API.put(`${this.URI}/sign-out`, body);
return API.post(`${this.URI}/sign-out`, body);
};
}

Expand Down

0 comments on commit 760a939

Please sign in to comment.