Skip to content
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: login 페이지 마크업, yarn.lock 버그해결 #63

Merged
merged 4 commits into from
Nov 16, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@
"eslint --cache --fix"
]
},
"resolutions": {
"jackspeak": "2.1.1"
},
"config": {
"commitizen": {
"path": "cz-conventional-changelog"
Expand Down
10 changes: 10 additions & 0 deletions src/assets/kakao.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions src/assets/naver.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions src/domain/login/components/AuthLoginButton.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import { type ReactNode } from 'react';

interface AuthLoginButtonProps {
icon: ReactNode;
text: string;
onClick: () => void;
backgroundColor?: string;
color?: string;
}
export default function AuthLoginButton({ icon, text, onClick, backgroundColor, color }: AuthLoginButtonProps) {
return (
<button
onClick={onClick}
style={{ backgroundColor, color }}
className="w-[300px] rounded-lg flex items-center p-[12px] gap-[12px]"
>
<div className="absolute w-[20x] h-[20px]">{icon}</div>
bullmouse marked this conversation as resolved.
Show resolved Hide resolved
<div className="text-[15px] font-bold flex-1">{text}</div>
</button>
);
}
Empty file.
31 changes: 30 additions & 1 deletion src/domain/login/index.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,32 @@
import { ReactComponent as KakaoIcon } from '@/assets/kakao.svg';
import { ReactComponent as NaverIcon } from '@/assets/naver.svg';
import AuthLoginButton from '@/domain/login/components/AuthLoginButton';

export default function Login() {
return <h1>로그인 페이지</h1>;
return (
<main className="bg-white flex flex-col justify-center items-center">
<div className="text-[64px] mb-[120px] font-extrabold">LOGO</div>
<div className="text-grey-placeholder mb-[20px]">계정을 만들고 어쩌구 저쩌구를 즐겨보세요</div>
<div className="flex flex-col gap-[8px]">
<AuthLoginButton
icon={<KakaoIcon />}
backgroundColor="#FEE500"
color="#3C1E1E"
text="카카오 로그인"
onClick={() => {
console.log('카카오');
}}
/>
<AuthLoginButton
icon={<NaverIcon />}
backgroundColor="#03C75A"
color="#ffffff"
text="네이버 로그인"
onClick={() => {
console.log('네이버');
}}
/>
</div>
</main>
);
}
3 changes: 2 additions & 1 deletion vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { defineConfig } from 'vite';
import react from '@vitejs/plugin-react';
import svgr from 'vite-plugin-svgr';
import tsconfigPaths from 'vite-tsconfig-paths';

import react from '@vitejs/plugin-react';

export default defineConfig({
plugins: [svgr(), react(), tsconfigPaths()],
build: {
Expand Down
11,552 changes: 11,552 additions & 0 deletions yarn.lock

Large diffs are not rendered by default.