-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: merge branch 'main' into Accessibility-test/#136
- Loading branch information
Showing
120 changed files
with
2,276 additions
and
738 deletions.
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 |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| name: Vercel Production Deployment | ||
|
|
||
| env: | ||
| VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }} | ||
| VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }} | ||
| on: | ||
| push: | ||
| branches: | ||
| - main | ||
| jobs: | ||
| Deploy-Production: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| - name: Install Vercel CLI | ||
| run: npm install --global vercel@latest | ||
| - name: Pull Vercel Environment Information | ||
| run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }} | ||
| - name: Build Project Artifacts | ||
| run: vercel build --prod --token=${{ secrets.VERCEL_TOKEN }} | ||
| - name: Deploy Project Artifacts to Vercel | ||
| run: vercel deploy --prebuilt --prod --token=${{ secrets.VERCEL_TOKEN }} |
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| import { auth } from '@/app/business/services/user/user.query'; | ||
| import Button from '@/app/ui/view/atom/button/button'; | ||
| import Link from 'next/link'; | ||
| import { ChevronRightIcon } from 'lucide-react'; | ||
|
|
||
| export default async function NavigationItems() { | ||
| const userInfo = await auth(); | ||
|
|
||
| return ( | ||
| <div className="flex flex-col lg:flex-row divide-y lg:divide-y-0 "> | ||
| {userInfo ? ( | ||
| <> | ||
| <NavigationItem href={'/my'} label="마이페이지" /> | ||
| <NavigationItem href={'/result'} label="결과확인" /> | ||
| </> | ||
| ) : ( | ||
| <NavigationItem href={'/sign-in'} label="로그인" /> | ||
| )} | ||
| <NavigationItem href={'/tutorial'} label="튜토리얼" /> | ||
| <NavigationItem | ||
| target="_black" | ||
| href={'https://soft-anorak-0ca.notion.site/e35e3b210995463fa748f35aab536f2c?pvs=74'} | ||
| label="팀소개" | ||
| /> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| interface NavigationItemProps { | ||
| href: string; | ||
| label: string; | ||
| target?: '_black' | '_self' | '_parent' | '_top'; | ||
| } | ||
|
|
||
| export function NavigationItem({ href, label, target }: NavigationItemProps) { | ||
| return ( | ||
| <Link href={href} target={target} className="flex items-center justify-between"> | ||
| <Button | ||
| size={'xs'} | ||
| className="text-black lg:text-white hover:text-slate-400 lg:text-base text-lg my-1" | ||
| variant={'text'} | ||
| label={label} | ||
| /> | ||
| <ChevronRightIcon className="h-4 w-4 lg:hidden text-black" /> | ||
| </Link> | ||
| ); | ||
| } |
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 |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| 'use client'; | ||
| import useFunnel from '@/app/hooks/useFunnel'; | ||
| import FindIdForm from '@/app/ui/user/find-id-form/find-id-form'; | ||
| import { useState } from 'react'; | ||
| import { FormState } from '@/app/ui/view/molecule/form/form-root'; | ||
| import FindIdSuccess from './find-id-success'; | ||
|
|
||
| export default function FindIdContainer() { | ||
| const { Funnel, setStep } = useFunnel<'form' | 'success'>('form'); | ||
| const [authId, setAuthId] = useState<string | undefined>(undefined); | ||
| return ( | ||
| <div className="p-6"> | ||
| <Funnel> | ||
| <Funnel.Step name="form"> | ||
| <FindIdForm | ||
| onNext={(formState?: FormState) => { | ||
| if (formState?.value) setAuthId(formState.value.authId); | ||
| setStep('success'); | ||
| }} | ||
| /> | ||
| </Funnel.Step> | ||
| <Funnel.Step name="success"> | ||
| <FindIdSuccess authId={authId} /> | ||
| </Funnel.Step> | ||
| </Funnel> | ||
| </div> | ||
| ); | ||
| } |
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 |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| import Button from '@/app/ui/view/atom/button/button'; | ||
| import Link from 'next/link'; | ||
| interface FindIdSuccessProps { | ||
| authId: string | undefined; | ||
| } | ||
| export default function FindIdSuccess({ authId }: FindIdSuccessProps) { | ||
| return ( | ||
| <div className=" flex items-center justify-center px-4 sm:px-6"> | ||
| <div className="max-w-md w-full space-y-8"> | ||
| <div className="space-y-2"> | ||
| <p className="text-gray-500 text-center">입력하신 정보와 일치하는 아이디입니다.</p> | ||
| </div> | ||
| <div className="p-8 px-20 bg-light-blue-1 text-point-blue rounded-lg text-center">{authId}</div> | ||
| <div className="space-y-4"> | ||
| <div className="flex justify-center gap-4"> | ||
| <Link href="/sign-in"> | ||
| <Button size="sm" label={'로그인 하기'} /> | ||
| </Link> | ||
| <Link href="/find-password"> | ||
| <Button size="sm" label={'비밀번호 바꾸기'} /> | ||
| </Link> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| ); | ||
| } |
Oops, something went wrong.