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

[장혁수] sprint5 #144

Merged
Show file tree
Hide file tree
Changes from all 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
8,129 changes: 4,007 additions & 4,122 deletions package-lock.json

Large diffs are not rendered by default.

Binary file removed public/favicon.ico
Binary file not shown.
33 changes: 0 additions & 33 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,42 +2,9 @@
<html lang="en">
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lang ko로 바꿔주시면 좋을 것 같아요!

<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="Web site created using create-react-app"
/>
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<!--
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<!--
Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
Only files inside the `public` folder can be referenced from the HTML.

Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>React App</title>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

저희 판다마켓이니까 title도 변경해주시면 될 것 같습니다.

</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.

You can add webfonts, meta tags, or analytics to this file.
The build step will place the bundled scripts into the <body> tag.

To begin the development, run `npm start` or `yarn start`.
To create a production bundle, use `npm run build` or `yarn build`.
-->
</body>
</html>
Binary file removed public/logo192.png
Binary file not shown.
Binary file removed public/logo512.png
Binary file not shown.
25 changes: 0 additions & 25 deletions public/manifest.json

This file was deleted.

3 changes: 0 additions & 3 deletions public/robots.txt

This file was deleted.

38 changes: 0 additions & 38 deletions src/App.css

This file was deleted.

22 changes: 5 additions & 17 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -1,23 +1,11 @@
import logo from './logo.svg';
import './App.css';
import Header from './Header';
import Items from './Items';

function App() {
return (
<div className="App">
<header className="App-header">
<img src={logo} className="App-logo" alt="logo" />
<p>
Edit <code>src/App.js</code> and save to reload.
</p>
<a
className="App-link"
href="https://reactjs.org"
target="_blank"
rel="noopener noreferrer"
>
Learn React
</a>
</header>
<div>
<Header />
<Items />
</div>
);
}
Expand Down
8 changes: 0 additions & 8 deletions src/App.test.js

This file was deleted.

67 changes: 67 additions & 0 deletions src/Header.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
header {
display: flex;
align-items: center;
width: 100%;
height: 70px;
padding: 0 200px;
gap: 20px;
border: 1px solid #dfdfdf;
position: fixed;
left: 0;
top: 0;
background-color: #fff;
}

a {
text-decoration: none;
}

.home-button {
display: inline-flex;
width: 153px;
height: 51px;
}

.nav-box {
display: flex;
width: 100%;
}

.nav-item {
display: inline-flex;
align-items: center;
justify-content: center;
width: 109px;
height: 69px;
font-weight: 700;
font-size: 18px;
line-height: 21px;
color: #4b5563;
}

.login-button {
display: inline-flex;
align-items: center;
justify-content: center;
width: 88px;
height: 42px;
border-radius: 8px;
gap: 10px;
background-color: #3692ff;
font-weight: 600;
font-size: 16px;
line-height: 19px;
color: #fff;
}

@media (max-width: 1199px) {
header {
padding: 0 24px;
}
}

@media (max-width: 767px) {
header {
padding: 0 16px;
}
}
25 changes: 25 additions & 0 deletions src/Header.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import './Header.css';
import logo from './images/logo1.png';

function Header() {
return (
<header>
<a href="/" className="home-button">
<img src={logo} alt="로고" />
</a>
<div className="nav-box">
<a href="/#" className="nav-item">
자유게시판
</a>
<a href="/items" className="nav-item">
중고마켓
</a>
</div>
<a href="/login" className="login-button">
로그인
</a>
</header>
);
}

export default Header;
33 changes: 33 additions & 0 deletions src/Items.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import './items.css';

function Items() {
return (
<>
<div className="main">
<h2>베스트 상품</h2>
<div className="best-wrapper">상품들</div>
<div className="onsale-bar">
<h2>판매 중인 상품</h2>
<input />
<a href="/#">상품 등록하기</a>
<select>
<option>최신순</option>
<option>좋아요순</option>
</select>
</div>
<div className="onsale-wrapper">상품들</div>
</div>
<ul className="pagination-container">
<li>좌</li>
<li>1</li>
<li>2</li>
<li>3</li>
<li>4</li>
<li>5</li>
<li>우</li>
</ul>
</>
);
}

export default Items;
Binary file added src/fonts/Pretendard-Regular.ttf
Binary file not shown.
Binary file added src/images/logo1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/logo_text.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 10 additions & 9 deletions src/index.css
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
body {
@font-face {
font-family: 'Pretendard-Regular';
src: url('./fonts/Pretendard-Regular.ttf') format('truetype');
}

* {
margin: 0;
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
padding: 0;
box-sizing: border-box;
}

code {
font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
monospace;
body {
font-family: 'Pretendard-Regular', sans-serif;
}
6 changes: 0 additions & 6 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,10 @@ import React from 'react';
import ReactDOM from 'react-dom/client';
import './index.css';
import App from './App';
import reportWebVitals from './reportWebVitals';

const root = ReactDOM.createRoot(document.getElementById('root'));
root.render(
<React.StrictMode>
<App />
</React.StrictMode>
);

// If you want to start measuring performance in your app, pass a function
// to log results (for example: reportWebVitals(console.log))
// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
reportWebVitals();
15 changes: 15 additions & 0 deletions src/items.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
.main {
margin: 70px auto 0;
display: flex;
flex-direction: column;
}

.onsale-bar {
display: flex;
align-items: center;
}

.pagination-container {
display: flex;
list-style-type: none;
}
1 change: 0 additions & 1 deletion src/logo.svg

This file was deleted.

13 changes: 0 additions & 13 deletions src/reportWebVitals.js

This file was deleted.

5 changes: 0 additions & 5 deletions src/setupTests.js

This file was deleted.

Loading