Skip to content

Main #203

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.

Sign up for GitHub

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

Open
sobokki wants to merge 12 commits into
base: develop
Choose a base branch
from
Open

Main #203

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c7c78db
Merge pull request #161 from codeit-part4-8team-project/develop
jisunipark Apr 12, 2024
28cd98a
Merge pull request #162 from codeit-part4-8team-project/develop
jisunipark Apr 12, 2024
a6dab62
Merge pull request #163 from codeit-part4-8team-project/develop
jisunipark Apr 12, 2024
1413f2c
Merge pull request #164 from codeit-part4-8team-project/develop
jisunipark Apr 12, 2024
cecb900
Merge pull request #174 from codeit-part4-8team-project/develop
jisunipark Apr 17, 2024
c9219d2
Update main branch
caseV12 Apr 18, 2024
5dc276d
Merge pull request #184 from codeit-part4-8team-project/develop
jisunipark Apr 19, 2024
21cc5ed
Merge pull request #190 from codeit-part4-8team-project/develop
jisunipark Apr 24, 2024
1a6ee4d
Merge pull request #193 from codeit-part4-8team-project/develop
jisunipark Apr 24, 2024
1c86957
Merge pull request #194 from codeit-part4-8team-project/develop
jisunipark Apr 25, 2024
40dc6ef
Merge pull request #202 from codeit-part4-8team-project/develop
jisunipark May 22, 2024
a4c5903
로그인 수정
sobokki Jun 30, 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
6 changes: 3 additions & 3 deletions src/pages/SigninPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { MouseEventHandler, useEffect } from 'react';
import TextButton from '@/components/common/TextButton';
import { useAxios } from '@/hooks/useAxios';
import GithubIcon from '@/assets/GithubIcon';
import GoogleIcon from '@/assets/GoogleIcon';
// import GoogleIcon from '@/assets/GoogleIcon';
import KakaoIcon from '@/assets/KaKaoIcon';
import KeepyUppyIcon from '@/assets/KeepyUppyIcon';
import KeepyUppyLogo from '@/assets/KeepyUppyLogo';
Expand Down Expand Up @@ -58,7 +58,7 @@ const SigninPage = () => {
<div className="black w-full border-t-[0.1rem] border-solid border-t-[#5F5F5F4D]" />
</div>
<div className="flex w-full flex-col items-center gap-[1.2rem] ">
<TextButton
{/* <TextButton
name="google"
buttonSize="md"
color="white"
Expand All @@ -67,7 +67,7 @@ const SigninPage = () => {
>
<GoogleIcon />
<span>구글 로그인</span>
</TextButton>
</TextButton> */}
<TextButton
name="kakao"
buttonSize="md"
Expand Down