Skip to content

Commit

Permalink
fix: 누락 사항 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
@eun-hak
eun-hak committed May 15, 2024
1 parent dca9001 commit b3f3179
Show file tree
Hide file tree
Showing 3 changed files with 131 additions and 136 deletions.
192 changes: 95 additions & 97 deletions src/pages/index.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,116 +1,114 @@
// import { Inter } from 'next/font/google';
import { userinfo } from '@/api/auth/auth.get.api';
import Layout from '@/components/layout/Layout';
// import { userinfo } from '@/api/auth/auth.get.api';
// import Layout from '@/components/layout/Layout';
import Image from 'next/image';
import { useEffect } from 'react';
// import { useEffect } from 'react';

// const inter = Inter({ subsets: ['latin'] });

export default function Home() {
useEffect(() => {
userinfo();
}, []);
// useEffect(() => {
// userinfo();
// }, []);

return (
<main className={`flex min-h-screen flex-col items-center justify-between p-24 `}>
<Layout>
<div className=" z-10 max-w-5xl w-full items-center justify-between font-mono text-sm lg:flex">
<p className="fixed left-0 top-0 flex w-full justify-center border-b border-gray-300 bg-gradient-to-b from-zinc-200 pb-6 pt-8 backdrop-blur-2xl dark:border-neutral-800 dark:bg-zinc-800/30 dark:from-inherit lg:static lg:w-auto lg:rounded-xl lg:border lg:bg-gray-200 lg:p-4 lg:dark:bg-zinc-800/30"></p>
<div className="fixed bottom-0 left-0 flex h-48 w-full items-end justify-center bg-gradient-to-t from-white via-white dark:from-black dark:via-black lg:static lg:h-auto lg:w-auto lg:bg-none">
<a
className="pointer-events-none flex place-items-center gap-2 p-8 lg:pointer-events-auto lg:p-0"
href="https://vercel.com?utm_source=create-next-app&utm_medium=default-template-tw&utm_campaign=create-next-app"
target="_blank"
rel="noopener noreferrer">
By{' '}
<Image
src="/vercel.svg"
alt="Vercel Logo"
className="dark:invert"
width={100}
height={24}
priority
/>
</a>
</div>
</div>

<div className="relative flex place-items-center before:absolute before:h-[300px] before:w-full sm:before:w-[480px] before:-translate-x-1/2 before:rounded-full before:bg-gradient-radial before:from-white before:to-transparent before:blur-2xl before:content-[''] after:absolute after:-z-20 after:h-[180px] after:w-full sm:after:w-[240px] after:translate-x-1/3 after:bg-gradient-conic after:from-sky-200 after:via-blue-200 after:blur-2xl after:content-[''] before:dark:bg-gradient-to-br before:dark:from-transparent before:dark:to-blue-700/10 after:dark:from-sky-900 after:dark:via-[#0141ff]/40 before:lg:h-[360px]">
<Image
className="relative dark:drop-shadow-[0_0_0.3rem_#ffffff70] dark:invert"
src="/next.svg"
alt="Next.js Logo"
width={180}
height={37}
/>
</div>

<div className="mb-32 grid text-center lg:max-w-5xl lg:w-full lg:mb-0 lg:grid-cols-4 lg:text-left">
<div className=" z-10 max-w-5xl w-full items-center justify-between font-mono text-sm lg:flex">
<p className="fixed left-0 top-0 flex w-full justify-center border-b border-gray-300 bg-gradient-to-b from-zinc-200 pb-6 pt-8 backdrop-blur-2xl dark:border-neutral-800 dark:bg-zinc-800/30 dark:from-inherit lg:static lg:w-auto lg:rounded-xl lg:border lg:bg-gray-200 lg:p-4 lg:dark:bg-zinc-800/30"></p>
<div className="fixed bottom-0 left-0 flex h-48 w-full items-end justify-center bg-gradient-to-t from-white via-white dark:from-black dark:via-black lg:static lg:h-auto lg:w-auto lg:bg-none">
<a
href="https://nextjs.org/docs?utm_source=create-next-app&utm_medium=default-template-tw&utm_campaign=create-next-app"
className="group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30"
className="pointer-events-none flex place-items-center gap-2 p-8 lg:pointer-events-auto lg:p-0"
href="https://vercel.com?utm_source=create-next-app&utm_medium=default-template-tw&utm_campaign=create-next-app"
target="_blank"
rel="noopener noreferrer">
<h2 className="mb-3 text-2xl font-semibold">
Docs{' '}
<span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
-&gt;
</span>
</h2>
<p className="m-0 max-w-[30ch] text-sm opacity-50">
Find in-depth information about Next.js features and API.
</p>
By{' '}
<Image
src="/vercel.svg"
alt="Vercel Logo"
className="dark:invert"
width={100}
height={24}
priority
/>
</a>
</div>
</div>

<a
href="https://nextjs.org/learn?utm_source=create-next-app&utm_medium=default-template-tw&utm_campaign=create-next-app"
className="group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30"
target="_blank"
rel="noopener noreferrer">
<h2 className="mb-3 text-2xl font-semibold">
Learn{' '}
<span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
-&gt;
</span>
</h2>
<p className="m-0 max-w-[30ch] text-sm opacity-50">
Learn about Next.js in an interactive course with&nbsp;quizzes!
</p>
</a>
<div className="relative flex place-items-center before:absolute before:h-[300px] before:w-full sm:before:w-[480px] before:-translate-x-1/2 before:rounded-full before:bg-gradient-radial before:from-white before:to-transparent before:blur-2xl before:content-[''] after:absolute after:-z-20 after:h-[180px] after:w-full sm:after:w-[240px] after:translate-x-1/3 after:bg-gradient-conic after:from-sky-200 after:via-blue-200 after:blur-2xl after:content-[''] before:dark:bg-gradient-to-br before:dark:from-transparent before:dark:to-blue-700/10 after:dark:from-sky-900 after:dark:via-[#0141ff]/40 before:lg:h-[360px]">
<Image
className="relative dark:drop-shadow-[0_0_0.3rem_#ffffff70] dark:invert"
src="/next.svg"
alt="Next.js Logo"
width={180}
height={37}
/>
</div>

<a
href="https://vercel.com/templates?framework=next.js&utm_source=create-next-app&utm_medium=default-template-tw&utm_campaign=create-next-app"
className="group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30"
target="_blank"
rel="noopener noreferrer">
<h2 className="mb-3 text-2xl font-semibold">
Templates{' '}
<span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
-&gt;
</span>
</h2>
<p className="m-0 max-w-[30ch] text-sm opacity-50 text-gray-700">
Discover and deploy boilerplate example Next.js&nbsp;projects.
</p>
</a>
<div className="mb-32 grid text-center lg:max-w-5xl lg:w-full lg:mb-0 lg:grid-cols-4 lg:text-left">
<a
href="https://nextjs.org/docs?utm_source=create-next-app&utm_medium=default-template-tw&utm_campaign=create-next-app"
className="group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30"
target="_blank"
rel="noopener noreferrer">
<h2 className="mb-3 text-2xl font-semibold">
Docs{' '}
<span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
-&gt;
</span>
</h2>
<p className="m-0 max-w-[30ch] text-sm opacity-50">
Find in-depth information about Next.js features and API.
</p>
</a>

<a
href="https://vercel.com/new?utm_source=create-next-app&utm_medium=default-template-tw&utm_campaign=create-next-app"
className="group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30"
target="_blank"
rel="noopener noreferrer">
<h2 className="mb-3 text-2xl font-semibold">
Deploy{' '}
<span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
-&gt;
</span>
</h2>
<p className="m-0 max-w-[30ch] text-sm opacity-50 text-balance">
Instantly deploy your Next.js site to a shareable URL with Vercel.
</p>
</a>
</div>
</Layout>
<a
href="https://nextjs.org/learn?utm_source=create-next-app&utm_medium=default-template-tw&utm_campaign=create-next-app"
className="group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30"
target="_blank"
rel="noopener noreferrer">
<h2 className="mb-3 text-2xl font-semibold">
Learn{' '}
<span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
-&gt;
</span>
</h2>
<p className="m-0 max-w-[30ch] text-sm opacity-50">
Learn about Next.js in an interactive course with&nbsp;quizzes!
</p>
</a>

<a
href="https://vercel.com/templates?framework=next.js&utm_source=create-next-app&utm_medium=default-template-tw&utm_campaign=create-next-app"
className="group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30"
target="_blank"
rel="noopener noreferrer">
<h2 className="mb-3 text-2xl font-semibold">
Templates{' '}
<span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
-&gt;
</span>
</h2>
<p className="m-0 max-w-[30ch] text-sm opacity-50 text-gray-700">
Discover and deploy boilerplate example Next.js&nbsp;projects.
</p>
</a>

<a
href="https://vercel.com/new?utm_source=create-next-app&utm_medium=default-template-tw&utm_campaign=create-next-app"
className="group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30"
target="_blank"
rel="noopener noreferrer">
<h2 className="mb-3 text-2xl font-semibold">
Deploy{' '}
<span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
-&gt;
</span>
</h2>
<p className="m-0 max-w-[30ch] text-sm opacity-50 text-balance">
Instantly deploy your Next.js site to a shareable URL with Vercel.
</p>
</a>
</div>
</main>
);
}
55 changes: 26 additions & 29 deletions src/pages/sign/index.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import Layout from '@/components/layout/Layout';
import MainContainer from '@/components/shared/MainContainer';
import SignInButton from '@/components/shared/sign/SignInButton';
import SignUpButton from '@/components/shared/sign/SignUpButton';
Expand All @@ -8,38 +7,36 @@ import Link from 'next/link';
const SignHomePage = () => {
return (
<MainContainer>
<Layout>
<div className="flex flex-col justify-center items-center gap-[39px] h-[470px]">
<div className="w-[280px] h-[70px]">
<img src="/logo.png" alt="" className="w-full object-cover" />
</div>
<div className="text-center">
<span className="text-black text-lg font-normal font-pretendard leading-[28.80px]">
예약하고, 탐색하고, 성장하는
<br />
</span>
<span className="text-black text-lg font-semibold font-pretendard leading-[28.80px]">
멀티 서비스 오피스
</span>
</div>
<div className="flex flex-col justify-center items-center gap-[39px] h-[470px]">
<div className="w-[280px] h-[70px]">
<img src="/logo.png" alt="" className="w-full object-cover" />
</div>

<div className="flex flex-col justify-center items-center gap-[10px]">
<SignInButton />
<SignUpButton />
<div className="text-center">
<span className="text-black text-lg font-normal font-pretendard leading-[28.80px]">
예약하고, 탐색하고, 성장하는
<br />
</span>
<span className="text-black text-lg font-semibold font-pretendard leading-[28.80px]">
멀티 서비스 오피스
</span>
</div>
</div>

<div className="text-center mt-[26px] mb-8">
<span className="text-neutral-400 text-sm font-light font-pretendard">
비밀번호를 잊으셨나요?{' '}
<div className="flex flex-col justify-center items-center gap-[10px]">
<SignInButton />
<SignUpButton />
</div>

<div className="text-center mt-[26px] mb-8">
<span className="text-neutral-400 text-sm font-light font-pretendard">
비밀번호를 잊으셨나요?{' '}
</span>
<Link href="/sign/findpassword">
<span className="text-neutral-400 text-sm font-light font-pretendard underline">
비밀번호 찾기{' '}
</span>
<Link href="/sign/findpassword">
<span className="text-neutral-400 text-sm font-light font-pretendard underline">
비밀번호 찾기{' '}
</span>
</Link>
</div>
</Layout>
</Link>
</div>
</MainContainer>
);
};
Expand Down
20 changes: 10 additions & 10 deletions src/pages/signup/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@ const SignUpPage = () => {

const { mutateAsync: signUpReq } = useMutation(
({
memberEmail,
memberPassword,
email,
password,
memberName,
memberJob,
memberPhone,
memberSmsAgree
}: ISignUp) => {
return signup({
memberEmail,
memberPassword,
email,
password,
memberName,
memberJob,
memberPhone,
Expand Down Expand Up @@ -57,24 +57,24 @@ const SignUpPage = () => {

const handleNameAndEmail = (
name: ApplyValues['memberName'],
email: ApplyValues['memberEmail']
email: ApplyValues['password']
) => {
setApplyValues((prev) => ({
...prev,
memberName: name,
memberEmail: email,
email: email,
step: (prev.step as number) + 1
}));
};

const handleRemainData = (
password: ApplyValues['memberPassword'],
password: ApplyValues['password'],
job: ApplyValues['memberJob'],
smsAgree: ApplyValues['memberSmsAgree']
) => {
setApplyValues((prev) => ({
...prev,
memberPassword: password,
password: password,
memberJob: job,
memberSmsAgree: smsAgree,
step: (prev.step as number) + 1
Expand All @@ -84,8 +84,8 @@ const SignUpPage = () => {
useEffect(() => {
if (applyValues.step === 3) {
signUpReq({
memberEmail: applyValues.memberEmail as string,
memberPassword: applyValues.memberPassword as string,
email: applyValues.email as string,
password: applyValues.password as string,
memberName: applyValues.memberName as string,
memberJob: applyValues.memberJob as string,
memberPhone: applyValues.memberPhone as string,
Expand Down

0 comments on commit b3f3179

Please sign in to comment.