-
Notifications
You must be signed in to change notification settings - Fork 0
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
Feature/delivery #82
Open
ckrbqja
wants to merge
4
commits into
main
Choose a base branch
from
feature/delivery
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Feature/delivery #82
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
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
There are no files selected for viewing
This file contains 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,56 +1,78 @@ | ||
| import { Button, ButtonText } from "@/components/ui/button"; | ||
| import { useFormInput } from "@/features/shared/ui/FormInput"; | ||
| import { Button, ButtonSpinner, ButtonText } from "@/components/ui/button"; | ||
| import { Text } from "@/components/ui/text"; | ||
| import { VStack } from "@/components/ui/vstack"; | ||
| import useGlobalToast from "@/features/shared/hooks/useGlobalToast"; | ||
| import { FormInput } from "@/features/shared/ui/FormInput"; | ||
| import { useUserStore } from "@/features/user/store/user.store"; | ||
| import { supabase } from "@/supabase/utils/supabase"; | ||
| import { zodResolver } from "@hookform/resolvers/zod"; | ||
| import { useRouter } from "expo-router"; | ||
| import { useForm } from "react-hook-form"; | ||
| import { Text, View } from "react-native"; | ||
| import { z } from "zod"; | ||
|
|
||
| const schema = z.object({ | ||
| email: z.string().email("이메일 형식으로 입력해주세요").default(""), | ||
| password: z.string().min(1, "필수 값 입니다.").default(""), | ||
| password: z.string().min(6, "6자 이상으로 입력하세요").default(""), | ||
| }); | ||
|
|
||
| type schemaType = z.infer<typeof schema>; | ||
| export default function Signin() { | ||
| const { | ||
| control, | ||
| handleSubmit, | ||
| formState: { errors }, | ||
| formState: { errors, isSubmitting }, | ||
| } = useForm<schemaType>({ resolver: zodResolver(schema) }); | ||
|
|
||
| const { showToast } = useGlobalToast(); | ||
| const router = useRouter(); | ||
| const { setUser } = useUserStore(); | ||
| const { FormInput } = useFormInput({ control, errors }); | ||
|
|
||
| const router = useRouter(); | ||
| const formInputProps = { control, errors }; | ||
|
|
||
| return ( | ||
| <View className={"flex gap-[12px]"}> | ||
| <Text className={"title-3 mx-auto"}>로그인</Text> | ||
| <VStack space={"md"}> | ||
| <Text size={"xl"} className={"mx-auto"}> | ||
| 로그인 | ||
| </Text> | ||
|
|
||
| <FormInput label={"이메일을 입력하세요"} name={"email"} /> | ||
| <FormInput label={"페스워드 입력하세요"} name={"password"} /> | ||
| <FormInput | ||
| name={"email"} | ||
| label={"이메일을 입력하세요"} | ||
| {...formInputProps} | ||
| /> | ||
| <FormInput | ||
| name={"password"} | ||
| label={"페스워드를 입력하세요"} | ||
| {...formInputProps} | ||
| /> | ||
|
|
||
| <Button | ||
| disabled={isSubmitting} | ||
| onPress={handleSubmit(async ({ email, password }) => { | ||
| const res = // | ||
| await supabase.auth.signInWithPassword({ email, password }); | ||
|
|
||
| const user = res.data.user; | ||
| if (!user) return alert("유저가 존재하지 않습니다"); | ||
|
|
||
| if (!user) | ||
| return showToast({ | ||
| title: "유저가 존재하지 않습니다", | ||
| action: "error", | ||
| }); | ||
|
|
||
| const { data } = await supabase.from("user").select("name").single(); | ||
| if (!data?.name) return alert("에러발생"); | ||
| if (!data?.name) | ||
| return showToast({ title: "에러 발생", action: "error" }); | ||
|
|
||
| setUser({ email, id: user.id, name: data.name }); | ||
|
|
||
| showToast({ title: "로그인 되었습니다" }); | ||
| router.push("/(tabs)/mypage"); | ||
| })} | ||
| > | ||
| <ButtonText>로그인</ButtonText> | ||
| <ButtonText className={"text-white"}>로그인</ButtonText> | ||
| {isSubmitting && <ButtonSpinner />} | ||
| </Button> | ||
| </View> | ||
| </VStack> | ||
| ); | ||
| } | ||
This file contains 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 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 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
useGlobalToast 훅이 궁금해서 찾아보니까
파일이 없는 것 같아요
커밋 누락일까요?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
아 ㅋㅋㅋ 맞아요 커밋 누락이네여
추가했습니다 감사합니다 ㅎㅎ
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
매의눈... 멋집니다