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

경북대 FE_안희정 6주차 과제 재제출 #123

Open
wants to merge 29 commits into
base: anheejeong
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
00699a5
init
dev-root-lee Jul 21, 2024
5428355
[Feat] BaseURL Context 구현
anheejeong Jul 30, 2024
e79b372
[Feat] 회원가입 구현
anheejeong Jul 30, 2024
06264ba
[Feat] 카테고리 API 구현
anheejeong Aug 1, 2024
4e1dc12
[Feat] product API 수정
anheejeong Aug 1, 2024
380af68
[Feat] 회원가입 구현
anheejeong Aug 1, 2024
66469fe
[Feat] Header BaseUrl 선택 구현
anheejeong Aug 1, 2024
25adc46
[Feat] 회원가입 API 구현
anheejeong Aug 1, 2024
e388562
[Feat] 이메일 로그인 API 수정
anheejeong Aug 1, 2024
852c3e1
[Feat] 주문하기 API 수정
anheejeong Aug 1, 2024
376fb4c
[Feat] 위시 구현
anheejeong Aug 1, 2024
75f3364
[Feat] type 수정 및 추가
anheejeong Aug 1, 2024
e43ef5d
[Feat] http secure 추가
anheejeong Aug 1, 2024
0082033
Resolved merge conflict in README.md
anheejeong Aug 1, 2024
c950b66
[Fix] productId -> product-id api request 수정
anheejeong Aug 2, 2024
46514af
[Feat] Route URL 수정
anheejeong Aug 2, 2024
5453f0a
[Feat] Admin 페이지 로그인 구현
anheejeong Aug 2, 2024
186b53e
[Feat] 관리자 멤버 포인트 조회 및 추가 구현
anheejeong Aug 2, 2024
ab0c2ba
[Feat] 관리자 권한 체크
anheejeong Aug 2, 2024
c3c20fb
[Refactor] console 삭제
anheejeong Aug 2, 2024
d0a81fb
[Fix] 위시리스트 api 수정
anheejeong Aug 2, 2024
4eef110
[Design] 버튼 위치 변경
anheejeong Aug 2, 2024
cd2399f
[Design] 카테고리 이미지 비율 조정
anheejeong Aug 2, 2024
9ff7d02
[Fix] 주문하기 API 포인트 추가 수정
anheejeong Aug 2, 2024
6b16a1c
[Docs] 4단계 Q&A 작성
anheejeong Aug 2, 2024
41ca855
[Chore] 배포 환경 설정
anheejeong Aug 6, 2024
dd8b74a
[Fix] code: 'ERR_REQUIRE_ESM' 오류 수정
anheejeong Aug 7, 2024
6aeb3fa
[Fix] 패키지 혼합 문제 해결 Delete package-lock.json
anheejeong Aug 7, 2024
783632a
[Docs] Update README.md
anheejeong Aug 7, 2024
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
Prev Previous commit
Next Next commit
[Design] 버튼 위치 변경
anheejeong committed Aug 2, 2024
commit 4eef110c40a3b17495379d414cc10bca461b6032
8 changes: 4 additions & 4 deletions src/pages/Login/index.tsx
Original file line number Diff line number Diff line change
@@ -36,9 +36,9 @@ export const LoginPage = () => {

return (
<Wrapper>
<Logo src={KAKAO_LOGO} alt="카카고 CI" />
<Logo src={KAKAO_LOGO} alt="카카고 CI" onClick={() => window.location.assign('/')} style={{ cursor: 'pointer' }} />
<FormWrapper>
<UnderlineTextField placeholder="카카오메일 아이디, 이메일, 전화번호" value={id} onChange={(e) => setId(e.target.value)} />
<UnderlineTextField placeholder="이메일" value={id} onChange={(e) => setId(e.target.value)} />
<Spacing />
<UnderlineTextField
type="password"
@@ -53,11 +53,11 @@ export const LoginPage = () => {
sm: 60,
}}
/>
<Button onClick={handleConfirm}>로그인</Button>
<Button theme='lightGray' onClick={handleConfirm}>로그인</Button>
<OrBox>
<OrText>또는</OrText>
</OrBox>
<Button theme='lightGray' onClick={handleConfirm}>이메일로 로그인</Button>
<Button onClick={handleConfirm}>kakao로 로그인</Button>
<SignUp>
<SignUpA href='/register'>회원가입</SignUpA>
</SignUp>