Skip to content

Commit edccd15

Browse files
se030se030
committed
Merge branch 'dev' of https://github.com/boostcampwm-2022/web27-Wabinar into chore/#17-K
2 parents 821536b + a913893 commit edccd15

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+8544
-2960
lines changed

‎client/index.html‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,13 @@
22
<html lang="en">
33
<head>
44
<meta charset="UTF-8" />
5-
<link rel="icon" type="image/svg+xml" href="/Logo.svg" />
5+
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
6+
<link rel="preconnect" href="https://fonts.googleapis.com" />
7+
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
8+
<link
9+
href="https://fonts.googleapis.com/css2?family=Noto+Sans+KR:wght@400;500;700&display=swap"
10+
rel="stylesheet"
11+
/>
612
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
713
<title>Wabinar</title>
814
</head>

‎client/package.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"preview": "vite preview"
1010
},
1111
"dependencies": {
12+
"classnames": "^2.3.2",
1213
"@react-icons/all-files": "^4.1.0",
1314
"react": "^18.2.0",
1415
"react-dom": "^18.2.0",
@@ -21,6 +22,8 @@
2122
"@types/testing-library__jest-dom": "^5",
2223
"@vitejs/plugin-react": "^2.2.0",
2324
"eslint-plugin-react": "latest",
24-
"vite": "^3.2.3"
25+
"sass": "^1.56.1",
26+
"vite": "^3.2.3",
27+
"vite-tsconfig-paths": "^3.5.2"
2528
}
2629
}

‎client/public/Logo.svg‎ renamed to ‎client/public/favicon.svg‎

File renamed without changes.

‎client/src/App.tsx‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
1+
import { BrowserRouter, Routes, Route } from "react-router-dom";
2+
import LoginPage from "src/pages/Login";
3+
import "style/reset.scss";
4+
15
function App() {
2-
return <div>wab</div>;
6+
return (
7+
<BrowserRouter>
8+
<Routes>
9+
<Route path="/" element={<LoginPage />} />
10+
</Routes>
11+
</BrowserRouter>
12+
);
313
}
414

515
export default App;

‎client/src/components/common/Button/index.tsx‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
import cx from "classnames";
2+
3+
import style from "./style.module.scss";
4+
5+
interface ButtonProps {
6+
text: string;
7+
icon?: JSX.Element;
8+
className?: string;
9+
}
10+
11+
function Button({ text, icon, className }: ButtonProps) {
12+
return (
13+
<div className={cx(style.button, className)}>
14+
{icon}
15+
<button>{text}</button>
16+
</div>
17+
);
18+
}
19+
20+
export default Button;

‎client/src/components/common/Button/style.module.scss‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
@import "style/color.scss";
2+
3+
.button {
4+
width: fit-content;
5+
height: 30px;
6+
display: flex;
7+
align-items: center;
8+
background-color: $primary-100;
9+
border-radius: 40px;
10+
padding: 10px 40px;
11+
12+
button {
13+
color: $white;
14+
padding: 10px;
15+
font-weight: 700;
16+
}
17+
}

‎client/src/components/common/Icon/Bubbles/index.tsx‎

Lines changed: 204 additions & 0 deletions
Large diffs are not rendered by default.

‎client/src/components/common/Icon/Github/index.tsx‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
interface GithubIconProps {
2+
size: number;
3+
}
4+
5+
function GithubIcon({ size }: GithubIconProps) {
6+
return (
7+
<svg
8+
width={size}
9+
height={size}
10+
viewBox="0 0 43 43"
11+
fill="none"
12+
xmlns="http://www.w3.org/2000/svg"
13+
>
14+
<path
15+
fillRule="evenodd"
16+
clipRule="evenodd"
17+
d="M21.5 0C9.62125 0 0 9.62125 0 21.5C0 31.0138 6.15437 39.0494 14.7006 41.8981C15.7756 42.0863 16.1787 41.4412 16.1787 40.8769C16.1787 40.3662 16.1519 38.6731 16.1519 36.8725C10.75 37.8669 9.3525 35.5556 8.9225 34.3462C8.68062 33.7281 7.6325 31.82 6.71875 31.3094C5.96625 30.9062 4.89125 29.9119 6.69187 29.885C8.385 29.8581 9.59437 31.4437 9.9975 32.0887C11.9325 35.3406 15.0231 34.4269 16.2594 33.8625C16.4475 32.465 17.0119 31.5244 17.63 30.9869C12.8462 30.4494 7.8475 28.595 7.8475 20.3713C7.8475 18.0331 8.68062 16.0981 10.0513 14.5931C9.83625 14.0556 9.08375 11.8519 10.2662 8.89563C10.2662 8.89563 12.0669 8.33125 16.1787 11.0994C17.8987 10.6156 19.7262 10.3737 21.5537 10.3737C23.3812 10.3737 25.2087 10.6156 26.9287 11.0994C31.0406 8.30438 32.8412 8.89563 32.8412 8.89563C34.0238 11.8519 33.2713 14.0556 33.0563 14.5931C34.4269 16.0981 35.26 18.0062 35.26 20.3713C35.26 28.6219 30.2344 30.4494 25.4506 30.9869C26.23 31.6587 26.9019 32.9487 26.9019 34.9644C26.9019 37.84 26.875 40.1512 26.875 40.8769C26.875 41.4412 27.2781 42.1131 28.3531 41.8981C32.6212 40.4571 36.3299 37.714 38.9574 34.0549C41.5849 30.3957 42.9987 26.0048 43 21.5C43 9.62125 33.3787 0 21.5 0Z"
18+
fill="white"
19+
/>
20+
</svg>
21+
);
22+
}
23+
24+
export default GithubIcon;

‎client/src/components/common/Icon/Logo/index.tsx‎

Lines changed: 40 additions & 0 deletions
Large diffs are not rendered by default.

‎client/src/pages/Login/index.tsx‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
import BubblesIcon from "src/components/common/Icon/Bubbles";
2+
import LogoIcon from "src/components/common/Icon/Logo";
3+
4+
import Button from "../../components/common/Button";
5+
import GithubIcon from "../../components/common/Icon/Github";
6+
import style from "./style.module.scss";
7+
8+
function LoginPage() {
9+
return (
10+
<div className={style.container}>
11+
<div className={style.icons}>
12+
<LogoIcon className={style.logo} />
13+
<BubblesIcon className={style.bubbles} />
14+
</div>
15+
16+
<div className={style.copy}>
17+
<p>회의와 기록을 한번에</p>
18+
<p>원툴 웨비나</p>
19+
</div>
20+
21+
<Button
22+
className={style["login-btn"]}
23+
text="로그인"
24+
icon={<GithubIcon size={30} />}
25+
/>
26+
</div>
27+
);
28+
}
29+
30+
export default LoginPage;

0 commit comments

Comments
 (0)