-
Notifications
You must be signed in to change notification settings - Fork 1
Feat/login page #17
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
Merged
Merged
Feat/login page #17
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
ff6dc81
로고 및 SNS 아이콘 추가: comatching-logo.svg, google.svg, kakao.svg 파일을 새로 추가…
dasosann 479b770
feat: 쿼리 및 서비스 상태 제공자를 추가
dasosann 5284382
feat: 초기 점검 모드 상태를 서버에서 가져오는 기능 추가
dasosann 1d08173
feat: 서비스 상태 제공자의 초기값을 undefined로 변경하고, 사용 시 오류 처리 추가
dasosann 2a836cf
feat: 추가 폰트 사이즈 유틸리티(10~30px) 생성 및 정렬 기능 추가
dasosann 74fc632
feat: 로그인 페이지 컴포넌트 생성
dasosann c531891
Merge branch 'main' into feat/login-page
dasosann 9a40f8a
feat: 토큰 수 증가 및 새로운 색상 및 배경 유틸리티 추가
dasosann 84dabaf
feat: 로그인 페이지에 버튼 추가 및 Button 컴포넌트의 bgColor 속성 수정
dasosann d794ff6
feat: shadcn의 drawer 설치
dasosann bbf3320
feat: 로그인 페이지 퍼블리싱
dasosann 71d878c
refactor: 코드리뷰 반영
dasosann f2c3726
feat: 로그인 방법 버튼을 span에서 button으로 변경
dasosann 2ed64df
feat: 소셜 로그인 페이지 완성
dasosann File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| import Image from "next/image"; | ||
| import React from "react"; | ||
|
|
||
| const BubbleDiv = () => { | ||
| return ( | ||
| <div className="relative h-[41.77px] w-[226px]"> | ||
| <span className="typo-16-600 absolute top-1 left-0 z-20 w-full text-center text-black"> | ||
| 현재 <span className="text-bubble-text-highight">775명 </span> | ||
| 참여중이에요! | ||
| </span> | ||
| <Image src="/bubble/bubble.svg" alt="bubble" width={226} height={41.77} /> | ||
dasosann marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| export default BubbleDiv; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| "use client"; | ||
| import BubbleDiv from "@/app/_components/BubbleDiv"; | ||
| import Button from "@/components/ui/Button"; | ||
| import { KakaoLoginButton, GoogleLoginButton } from "./SocialButtonList"; | ||
| import { | ||
| Drawer, | ||
| DrawerContent, | ||
| DrawerTitle, | ||
| DrawerTrigger, | ||
| } from "@/components/ui/drawer"; | ||
|
|
||
| export default function ScreenLoginActionSection() { | ||
| const handleKakaoLogin = () => { | ||
| // window.location.href = "https://backend.comatching.site/oauth2/authorization/kakao"; | ||
| alert("코매칭 서비스는 10/13일부로 종료되었습니다."); | ||
| }; | ||
|
|
||
| const handleGoogleLogin = () => { | ||
| // window.location.href = "https://backend.comatching.site/oauth2/authorization/google"; | ||
| alert("코매칭 서비스는 10/13일부로 종료되었습니다."); | ||
| }; | ||
|
|
||
| return ( | ||
| <section className="flex flex-col items-center"> | ||
| <BubbleDiv /> | ||
| <KakaoLoginButton | ||
| className="mt-[1.6vh] mb-[0.49vh]" | ||
| onClick={handleKakaoLogin} | ||
| shadow={true} | ||
| > | ||
| 카카오로 빠르게 시작하기 | ||
| </KakaoLoginButton> | ||
| <Drawer> | ||
| <div className="typo-14-600 text-color-text-caption2 flex flex-col items-center leading-[1.6]"> | ||
| <span>또는</span> | ||
| <DrawerTrigger asChild> | ||
| <button | ||
| type="button" | ||
| className="all-[unset] cursor-pointer underline" | ||
| > | ||
| 다른 방법으로 로그인 | ||
| </button> | ||
| </DrawerTrigger> | ||
| </div> | ||
| <DrawerContent | ||
| showHandle={false} | ||
| className="mx-auto flex h-[44.33vh] w-full flex-col items-center px-4 pt-6 md:max-w-[430px]" | ||
| > | ||
| <DrawerTitle className="sr-only">다른 로그인 방법</DrawerTitle> | ||
| <div className="flex w-full flex-col items-start gap-2"> | ||
| <span className="typo-20-700 text-bottomsheet-text-title"> | ||
| 로그인/회원가입 | ||
| </span> | ||
| <span className="typo-14-500 text-[#999]"> | ||
| 로그인과 회원가입 수단은 동일합니다. | ||
| <br /> | ||
| 원하는 계정으로 시작하세요. | ||
| </span> | ||
| </div> | ||
| <KakaoLoginButton onClick={handleKakaoLogin} className="mt-8 mb-4"> | ||
| 카카오로 시작하기 | ||
| </KakaoLoginButton> | ||
| <GoogleLoginButton className="w-full" onClick={handleGoogleLogin}> | ||
| 구글로 시작하기 | ||
| </GoogleLoginButton> | ||
| <div className="typo-14-500 text-bottomsheet-text-caption mt-6 flex flex-col items-center"> | ||
| <span>혹은</span> | ||
| <button | ||
| type="button" | ||
| className="all-[unset] cursor-pointer underline" | ||
| > | ||
| 이메일로 로그인 | ||
| </button> | ||
| </div> | ||
| </DrawerContent> | ||
| </Drawer> | ||
| <span className="typo-12-600 text-footo-text-main mt-[6.75vh] mb-[6.15vh]"> | ||
| Developed By Team Comatching, Catholic University of Korea | ||
| </span> | ||
| </section> | ||
| ); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| import Image from "next/image"; | ||
|
|
||
| export default function ScreenLoginLogoSection() { | ||
| return ( | ||
| <section className="mt-[13.3vh] flex w-full flex-col items-start gap-3"> | ||
| <Image | ||
| src="/logo/comatching-logo.svg" | ||
| alt="comatching-logo" | ||
| width={96} | ||
| height={16} | ||
| /> | ||
| <div className="typo-26-700 text-color-text-black"> | ||
| 반갑습니다 | ||
| <br /> | ||
| 코매칭이라면 당신은 | ||
| <br /> | ||
| 이미 커플입니다 | ||
| </div> | ||
| </section> | ||
| ); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| import ScreenLoginLogoSection from "./LoginLogoSection"; | ||
| import ScreenLoginActionSection from "./LoginActionSection"; | ||
|
|
||
| export default function ScreenLoginPage() { | ||
| return ( | ||
| <main className="flex h-full flex-col items-center justify-between px-4"> | ||
| <ScreenLoginLogoSection /> | ||
| <ScreenLoginActionSection /> | ||
| </main> | ||
| ); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| import Image from "next/image"; | ||
| import Button from "@/components/ui/Button"; | ||
| import { cn } from "@/lib/utils"; | ||
|
|
||
| type SocialButtonProps = React.ComponentProps<typeof Button> & { | ||
| children?: React.ReactNode; | ||
| }; | ||
|
|
||
| export function KakaoLoginButton({ | ||
| children = "카카오로 시작하기", | ||
| ...props | ||
| }: SocialButtonProps) { | ||
| return ( | ||
| <Button | ||
| {...props} | ||
| className={cn( | ||
| "typo-20-600 flex w-full items-center gap-6 bg-[#FEE500] text-black", | ||
| props.className, | ||
| )} | ||
| > | ||
| <Image | ||
| src="/sns/kakao.svg" | ||
| alt="카카오 로그인" | ||
| width={22.73} | ||
| height={21} | ||
| /> | ||
| {children} | ||
| </Button> | ||
| ); | ||
| } | ||
|
|
||
| export function GoogleLoginButton({ | ||
| children = "구글로 시작하기", | ||
| ...props | ||
| }: SocialButtonProps) { | ||
| return ( | ||
| <Button | ||
| {...props} | ||
| className={cn( | ||
| "typo-20-600 flex w-full items-center gap-6 border bg-white text-[#797479]", | ||
| props.className, | ||
| )} | ||
| > | ||
| <Image src="/sns/google.svg" alt="구글 로그인" width={20} height={20} /> | ||
| {children} | ||
| </Button> | ||
| ); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,5 @@ | ||
| import Blur from "@/components/common/Blur"; | ||
| import Button from "@/components/ui/Button"; | ||
| import ScreenLoginPage from "@/app/_components/ScreenLoginPage"; | ||
|
|
||
| export default function Home() { | ||
| return ( | ||
| <main> | ||
| <Button fixed={true}>안녕하세요</Button> | ||
| </main> | ||
| ); | ||
| return <ScreenLoginPage />; | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.