Skip to content

Commit

Permalink
Merge pull request #9 from School-of-Company/feature/sesstion-page
Browse files Browse the repository at this point in the history
🔀 세션 페이지 퍼블리싱
  • Loading branch information
Ethen1264 authored Oct 27, 2024
2 parents 658dc8b + b1688a0 commit 24a6d4c
Show file tree
Hide file tree
Showing 24 changed files with 186 additions and 3 deletions.
12 changes: 12 additions & 0 deletions src/app/(pages)/signIn/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import React from 'react';
import SignIn from '@/views/signIn/ui/signIn';

const page = () => {
return (
<div>
<SignIn />
</div>
);
};

export default page;
12 changes: 12 additions & 0 deletions src/app/(pages)/signUp/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import React from 'react';
import SignUp from '@/views/signUp/ui/signUp';

const page = () => {
return (
<div>
<SignUp />
</div>
);
};

export default page;
1 change: 1 addition & 0 deletions src/entities/main/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default as ExpoListItem } from './ui/ExpoListItem';
2 changes: 2 additions & 0 deletions src/entities/signIn/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export { default as SignInForm } from './ui/SignInForm';
export { default as SignupPrompt } from './ui/SignupPrompt';
21 changes: 21 additions & 0 deletions src/entities/signIn/ui/SignInForm/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import React from 'react';
import Button from '@/shared/ui/Button';
import Input from '@/shared/ui/Input';

const SignInForm = () => {
return (
<div>
<div className="space-y-6">
<p className="text-h4 text-black">이메일</p>
<Input type="text" placeholder="이메일을 입력해주세요." />
<p className="text-h4 text-black">비밀번호</p>
<Input placeholder="비밀번호를 입력해주세요." type="password" />
</div>
<div className="mt-[160px]">
<Button text="로그인" />
</div>
</div>
);
};

export default SignInForm;
17 changes: 17 additions & 0 deletions src/entities/signIn/ui/SignupPrompt/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import Link from 'next/link';
import React from 'react';

const SignupPrompt = () => {
return (
<div className="mt-[10px] flex gap-6">
<p className="text-caption2 text-gray-300">
아직 관리자 로그인을 안 하셨나요?
</p>
<Link href="/signUp" className="text-caption2 text-gray-500">
회원가입
</Link>
</div>
);
};

export default SignupPrompt;
1 change: 1 addition & 0 deletions src/entities/signUp/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default as SignUpForm } from './ui/SignUpForm';
36 changes: 36 additions & 0 deletions src/entities/signUp/ui/SignUpForm/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
import React from 'react';
import { Button, Input } from '@/shared/ui';

const SignUpForm = () => {
return (
<div>
<div className="space-y-6">
<div className="space-y-3">
<p className="text-h4 text-black">이름</p>
<Input type="text" placeholder="이름을 입력해주세요." />
</div>
<div className="space-y-3">
<p className="text-h4 text-black">이메일</p>
<Input placeholder="이메일을 입력해주세요." type="email" />
</div>
<div className="space-y-3">
<p className="text-h4 text-black">비밀번호</p>
<Input
placeholder="(8~24자 영어(대소문자)/숫자 특수문자 1개이상)"
type="password"
/>
<Input placeholder="비밀번호를 다시 입력해주세요." type="password" />
</div>
<div className="space-y-3">
<p className="text-h4 text-black">연락처</p>
<Input placeholder="연락처을 입력해주세요." type="text" />
</div>
</div>
<div className="mt-[160px]">
<Button text="로그인" />
</div>
</div>
);
};

export default SignUpForm;
2 changes: 1 addition & 1 deletion src/shared/styles/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -134,5 +134,5 @@ html {
font-family: 'Pretendard';
}
body {
background-color: #e9e9e9;
background-color: #fff;
}
6 changes: 5 additions & 1 deletion src/shared/ui/Input/index.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
'use client';

import {
ChangeEvent,
DetailedHTMLProps,
Expand All @@ -16,10 +18,11 @@ interface Props
error?: string;
label?: string;
type: string;
placeholder: string;
}

const Input = forwardRef<HTMLInputElement, Props>(
({ error, label, type, ...props }, ref) => {
({ error, label, type, placeholder, ...props }, ref) => {
const [value, setValue] = useState<string>('');
const [showPassword, setShowPassword] = useState<boolean>(false);

Expand Down Expand Up @@ -53,6 +56,7 @@ const Input = forwardRef<HTMLInputElement, Props>(
className="w-full border-none bg-transparent text-body4 outline-none"
onChange={onChange}
style={inputStyle}
placeholder={placeholder}
/>

{label && <div className="break-keep">{label}</div>}
Expand Down
3 changes: 3 additions & 0 deletions src/shared/ui/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export { default as Button } from './Button';
export { default as Input } from './Input';
export { default as Modal } from './Modal';
Empty file removed src/views/index.tsx
Empty file.
1 change: 1 addition & 0 deletions src/views/signIn/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default as signIn } from './ui/signIn';
18 changes: 18 additions & 0 deletions src/views/signIn/ui/signIn/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import React from 'react';
import Header from '@/widgets/layout/ui/Header';
import SignInContainer from '@/widgets/signIn/ui/signIn';

const SignIn = () => {
return (
<div className="flex min-h-screen flex-col">
<Header />
<div className="flex flex-grow items-center justify-center">
<div className="w-full max-w-[792px]">
<SignInContainer />
</div>
</div>
</div>
);
};

export default SignIn;
1 change: 1 addition & 0 deletions src/views/signUp/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default as signUp } from './ui/signUp';
18 changes: 18 additions & 0 deletions src/views/signUp/ui/signUp/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import React from 'react';
import { Header } from '@/widgets/layout';
import { SignUpContainer } from '@/widgets/signUp';

const SignUp = () => {
return (
<div className="flex min-h-screen flex-col">
<Header />
<div className="flex flex-grow items-center justify-center">
<div className="w-full max-w-[792px]">
<SignUpContainer />
</div>
</div>
</div>
);
};

export default SignUp;
1 change: 1 addition & 0 deletions src/widgets/expoDetails/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default as QRcode } from './ui/QRcode';
Empty file removed src/widgets/index.tsx
Empty file.
1 change: 1 addition & 0 deletions src/widgets/layout/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default as Header } from './ui/Header';
2 changes: 1 addition & 1 deletion src/widgets/layout/ui/Header/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Logo, Navigation } from '@/entities/layout/Header';

const Header = () => {
return (
<div className="flex h-[90px] w-full items-center justify-between py-[30px]">
<div className="flex h-[90px] w-full items-center justify-around py-[30px]">
<Logo />
<Navigation />
</div>
Expand Down
1 change: 1 addition & 0 deletions src/widgets/signIn/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default as signIn } from './ui/signIn';
17 changes: 17 additions & 0 deletions src/widgets/signIn/ui/signIn/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import React from 'react';
import SignInForm from '@/entities/signIn/ui/SignInForm';
import SignupPrompt from '@/entities/signIn/ui/SignupPrompt';

const SignInContainer = () => {
return (
<div>
<div className="space-y-[50px]">
<p className="text-center text-h1 text-black">관리자 로그인</p>
<SignInForm />
</div>
<SignupPrompt />
</div>
);
};

export default SignInContainer;
1 change: 1 addition & 0 deletions src/widgets/signUp/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default as SignUpContainer } from './ui/SignUpContainer';
15 changes: 15 additions & 0 deletions src/widgets/signUp/ui/SignUpContainer/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import React from 'react';
import { SignUpForm } from '@/entities/signUp';

const SignUpContainer = () => {
return (
<div>
<div className="space-y-[50px]">
<p className="text-center text-h1 text-black">관리자 회원가입</p>
<SignUpForm />
</div>
</div>
);
};

export default SignUpContainer;

0 comments on commit 24a6d4c

Please sign in to comment.