김원진 / khusat-front

Go to a project
Toggle navigation Toggle navigation pinning
이준호
56d58621 1 parent 5aef84e1

feat: Main page 레이아웃 작성

Expand all
Inline Side-by-side
Showing 15 changed files with 99 additions and 40 deletions
...@@ -3,12 +3,17 @@ ...@@ -3,12 +3,17 @@
3 "version": "0.1.0", 3 "version": "0.1.0",
4 "private": true, 4 "private": true,
5 "dependencies": { 5 "dependencies": {
6 + "@ant-design/icons": "^4.3.0",
6 "@testing-library/jest-dom": "^5.11.4", 7 "@testing-library/jest-dom": "^5.11.4",
7 "@testing-library/react": "^11.1.0", 8 "@testing-library/react": "^11.1.0",
8 "@testing-library/user-event": "^12.1.10", 9 "@testing-library/user-event": "^12.1.10",
10 + "antd": "^4.8.2",
11 + "node-sass": "4",
9 "react": "^17.0.1", 12 "react": "^17.0.1",
10 "react-dom": "^17.0.1", 13 "react-dom": "^17.0.1",
14 + "react-router-dom": "^5.2.0",
11 "react-scripts": "4.0.0", 15 "react-scripts": "4.0.0",
16 + "sass-loader": "^10.1.0",
12 "web-vitals": "^0.2.4" 17 "web-vitals": "^0.2.4"
13 }, 18 },
14 "scripts": { 19 "scripts": {
......
1 <!DOCTYPE html> 1 <!DOCTYPE html>
2 -<html lang="en"> 2 +<html lang="ko">
3 <head> 3 <head>
4 <meta charset="utf-8" /> 4 <meta charset="utf-8" />
5 <link rel="icon" href="%PUBLIC_URL%/favicon.ico" /> 5 <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
...@@ -10,34 +10,11 @@ ...@@ -10,34 +10,11 @@
10 content="Web site created using create-react-app" 10 content="Web site created using create-react-app"
11 /> 11 />
12 <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" /> 12 <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
13 - <!--
14 - manifest.json provides metadata used when your web app is installed on a
15 - user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
16 - -->
17 <link rel="manifest" href="%PUBLIC_URL%/manifest.json" /> 13 <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
18 - <!--
19 - Notice the use of %PUBLIC_URL% in the tags above.
20 - It will be replaced with the URL of the `public` folder during the build.
21 - Only files inside the `public` folder can be referenced from the HTML.
22 -
23 - Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
24 - work correctly both with client-side routing and a non-root public URL.
25 - Learn how to configure a non-root public URL by running `npm run build`.
26 - -->
27 <title>React App</title> 14 <title>React App</title>
28 </head> 15 </head>
29 <body> 16 <body>
30 <noscript>You need to enable JavaScript to run this app.</noscript> 17 <noscript>You need to enable JavaScript to run this app.</noscript>
31 <div id="root"></div> 18 <div id="root"></div>
32 - <!--
33 - This HTML file is a template.
34 - If you open it directly in the browser, you will see an empty page.
35 -
36 - You can add webfonts, meta tags, or analytics to this file.
37 - The build step will place the bundled scripts into the <body> tag.
38 -
39 - To begin the development, run `npm start` or `yarn start`.
40 - To create a production bundle, use `npm run build` or `yarn build`.
41 - -->
42 </body> 19 </body>
43 </html> 20 </html>
......
1 -import logo from './logo.svg';
2 import './App.css'; 1 import './App.css';
2 +import MainPage from './pages/MainPage';
3 +import {BrowserRouter,Route,Switch} from 'react-router-dom';
3 4
4 function App() { 5 function App() {
5 return ( 6 return (
6 - <div className="App"> 7 + <BrowserRouter>
7 - </div> 8 + <Switch>
9 + <Route exact to="/" component={MainPage}/>
10 + <Route to="/survey"></Route>
11 + </Switch>
12 + </BrowserRouter>
8 ); 13 );
9 } 14 }
10 15
......
1 +import React from 'react';
2 +
3 +function Card(){
4 + return(
5 + <>
6 + <div className="card">
7 + <div className="card__content">"나는 오랫동안 서 있을 수 있다."</div>
8 + </div>
9 + </>
10 + );
11 +}
12 +
13 +export default Card;
...\ No newline at end of file ...\ No newline at end of file
1 +.card{
2 + width: 5rem;
3 + height: 1rem;
4 + background-color: #536349;
5 +}
...\ No newline at end of file ...\ No newline at end of file
1 +import {Progress} from 'antd';
2 +
3 +function ProgressBar({percent}){
4 + return(
5 + <Progress style={{width:"50%"}}percent={percent} showInfo={true}/>
6 + );
7 +}
8 +
9 +export default ProgressBar;
...\ No newline at end of file ...\ No newline at end of file
1 import React from 'react'; 1 import React from 'react';
2 import ReactDOM from 'react-dom'; 2 import ReactDOM from 'react-dom';
3 -import './index.css'; 3 +import './index.scss';
4 import App from './App'; 4 import App from './App';
5 import reportWebVitals from './reportWebVitals'; 5 import reportWebVitals from './reportWebVitals';
6 +import 'antd/dist/antd.css'
6 7
7 ReactDOM.render( 8 ReactDOM.render(
8 <React.StrictMode> 9 <React.StrictMode>
...@@ -10,8 +11,4 @@ ReactDOM.render( ...@@ -10,8 +11,4 @@ ReactDOM.render(
10 </React.StrictMode>, 11 </React.StrictMode>,
11 document.getElementById('root') 12 document.getElementById('root')
12 ); 13 );
13 -
14 -// If you want to start measuring performance in your app, pass a function
15 -// to log results (for example: reportWebVitals(console.log))
16 -// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
17 reportWebVitals(); 14 reportWebVitals();
......
1 body { 1 body {
2 + font-size: 10px;
2 margin: 0; 3 margin: 0;
3 font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 4 font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
4 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', 5 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
...@@ -10,4 +11,4 @@ body { ...@@ -10,4 +11,4 @@ body {
10 code { 11 code {
11 font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', 12 font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
12 monospace; 13 monospace;
13 -} 14 +}
...\ No newline at end of file ...\ No newline at end of file
......
1 -<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3">
2 - <g fill="#61DAFB">
3 - <path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/>
4 - <circle cx="420.9" cy="296.5" r="45.7"/>
5 - <path d="M520.5 78.1z"/>
6 - </g>
7 -</svg>
1 +import React,{useState} from 'react';
2 +import './MainPage.scss';
3 +import ProgressBar from "../components/progressbar/ProgressBar";
4 +import {Button} from "antd";
5 +
6 +function MainPage(){
7 + const [percent,setPercent] = useState(30);
8 + const onClick = () => {
9 +
10 + }
11 +
12 + return(
13 + <>
14 + <div className="main-wrapper">
15 + <div className="main-title">KHUSAT</div>
16 + <div className="main-title__desc">
17 + KHUSAT 특별과정, <br></br>
18 + 여러분의 보직을 추천드립니다.
19 + </div>
20 + <ProgressBar percent={percent}/>
21 + <Button
22 + size="large"
23 + onClick={onClick}
24 + > 시작하기</Button>
25 + </div>
26 + </>
27 + );
28 +}
29 +
30 +export default MainPage;
1 +.main-wrapper{
2 + display:flex;
3 + flex-direction: column;
4 + align-items: center;
5 + // max-width: 50rem;
6 +}
7 +
8 +.main-title{
9 + margin-top: 5rem;
10 + text-align: center;
11 + font-size: 5rem;
12 + font-weight: bold;
13 + &__desc{
14 + margin-top: 2rem;
15 + font-size: 1.5rem;
16 + }
17 +}
1 +import React from 'react';
2 +
3 +function SurveyPage(){
4 +
5 +}
6 +
7 +export default SurveyPage;
...\ No newline at end of file ...\ No newline at end of file
This diff is collapsed. Click to expand it.