Merge pull request #156 from hvrain/React-김강우-sprint5

[김강우] sprint5
codeit-bootcamp-frontend · Jun 24, 2024 · 9a5f71e · 9a5f71e
2 parents 66f3ba6 + fd0c5a8
commit 9a5f71e
Show file tree

Hide file tree

Showing 85 changed files with 4,696 additions and 2,251 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,3 +21,6 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+
+# lint
+.prettierrc.json
diff --git a/README.md b/README.md
@@ -68,3 +68,4 @@ This section has moved here: [https://facebook.github.io/create-react-app/docs/d
 ### `npm run build` fails to minify
 
 This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify)
+react router dom 에서 Header Footer 레이아웃을 설정할 때, Browser router로 이렇게 설정해도 될 것 같네요.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,13 +1,14 @@
 {
-  "name": "1-weekly-mission",
+  "name": "react-sprint",
   "version": "0.1.0",
   "private": true,
   "dependencies": {
     "@testing-library/jest-dom": "^5.17.0",
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^13.5.0",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
+    "react-router-dom": "^6.23.1",
     "react-scripts": "5.0.1",
     "web-vitals": "^2.1.4"
   },

diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/index.html b/public/index.html
@@ -2,42 +2,16 @@
 <html lang="en">
   <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="stylesheet"
+      as="style"
+      crossorigin
+      href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard@v1.3.9/dist/web/variable/pretendardvariable.min.css"
     />
-    <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>
+    <title>판다마켓</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>
diff --git a/public/logo192.png b/public/logo192.png
diff --git a/public/logo512.png b/public/logo512.png
diff --git a/src/App.css b/src/App.css
@@ -1,38 +1,154 @@
-.App {
-  text-align: center;
+.header {
+	position: fixed;
+	z-index: 1;
+	top: 0;
+	left: 0;
+	right: 0;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	width: 100%;
+	height: 70px;
+	padding: 10px 200px 9px;
+	background-color: #ffffff;
+	border: 0px 0px 1px 0px;
+	border-bottom: 1px solid #DFDFDF;
 }
 
-.App-logo {
-  height: 40vmin;
-  pointer-events: none;
+.header__desktop-img {
+	width: 153px;
+	height: 51px;
 }
 
-@media (prefers-reduced-motion: no-preference) {
-  .App-logo {
-    animation: App-logo-spin infinite 20s linear;
-  }
+.header__mobile-img {
+	display: none;
+	width: 103px;
+	height: 35px;
 }
 
-.App-header {
-  background-color: #282c34;
-  min-height: 100vh;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  font-size: calc(10px + 2vmin);
-  color: white;
+.header__login {
+	border-radius: 8px;
+	padding: 14.5px 43px;
+	text-decoration: none;
+	background-color: var(--brand-blue);
+	font-size: 16px;
+	font-weight: 600;
+	color: #ffffff;
+	cursor: pointer;
 }
 
-.App-link {
-  color: #61dafb;
+.nav-bar {
+	margin-left: 60px;
+	display: flex;
+	justify-content: start;
+	align-items: center;
+	gap: 30px;
+	flex-grow: 1;
 }
 
-@keyframes App-logo-spin {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(360deg);
-  }
+.nav-bar li {
+	font-size: 18px;
+	font-weight: 700;
+	line-height: 21.48px;
+	border: 0;
+	background-color: transparent;
+	height: 100%;
 }
+
+.nav-bar .nav-bar--active {
+	color: var(--brand-blue);
+}
+
+.footer {
+	display: grid;
+	grid-template-areas:
+		"copyright etc messenger";
+	justify-content: space-between;
+	background: var(--gray-900);
+	color: white;
+	padding: 32px 200px 108px;
+}
+
+.footer a {
+	text-decoration: none;
+}
+
+.footer__copyright {
+	grid-area: copyright;
+	color: #676767;
+}
+
+.footer__etc {
+	grid-area: etc;
+	display: flex;
+	gap: 20px;
+}
+
+.footer__etc a {
+	color: #CFCFCF;
+}
+
+.footer__messenger {
+	grid-area: messenger;
+	display: flex;
+	gap: 12px;
+}
+
+.footer>div {
+	justify-content: space-between;
+}
+
+@media (max-width: 1199px) {
+	.header {
+		padding: 10px 24px 9px;
+	}
+
+	.header__login {
+		padding: 14.5px 25px;
+		font-size: 12px;
+	}
+
+	.nav-bar {
+		margin-left: 40px;
+		gap: 20px;
+	}
+
+	.footer {
+		padding: 32px 104px 108px;
+	}
+
+
+}
+
+@media (max-width: 767px) {
+
+	.header__desktop-img {
+		display: none;
+	}
+
+	.header__mobile-img {
+		display: block;
+	}
+
+	.header__login {
+		padding: 10px;
+		font-size: 10px;
+	}
+
+	.nav-bar {
+		margin-left: 20px;
+		gap: 8px;
+	}
+
+	.footer {
+		grid-template-areas:
+			"etc messenger"
+			"copyright .";
+		gap: 60px;
+		padding: 32px;
+	}
+
+
+
+
+}
diff --git a/src/App.js b/src/App.js
@@ -1,25 +1,7 @@
-import logo from './logo.svg';
-import './App.css';
+import "./App.css";
 
-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>
-  );
+function App({ children }) {
+  return <>{children}</>;
 }
 
 export default App;
diff --git a/src/App.jsx b/src/App.jsx
@@ -0,0 +1,7 @@
+import "./App.css";
+
+function App({ children }) {
+  return <>{children}</>;
+}
+
+export default App;
diff --git a/src/App.test.js b/src/App.test.js
diff --git a/src/assets/Img_home_01.png b/src/assets/Img_home_01.png
diff --git a/src/assets/Img_home_01@2x.png b/src/assets/Img_home_01@2x.png
diff --git a/src/assets/Img_home_01@3x.png b/src/assets/Img_home_01@3x.png
diff --git a/src/assets/Img_home_02-1.png b/src/assets/Img_home_02-1.png
diff --git a/src/assets/Img_home_02.png b/src/assets/Img_home_02.png
diff --git a/src/assets/Img_home_02@2x.png b/src/assets/Img_home_02@2x.png
diff --git a/src/assets/Img_home_03.png b/src/assets/Img_home_03.png
diff --git a/src/assets/Img_home_03@2x.png b/src/assets/Img_home_03@2x.png
diff --git a/src/assets/Img_home_03@3x.png b/src/assets/Img_home_03@3x.png
diff --git a/src/assets/Img_home_bottom.png b/src/assets/Img_home_bottom.png
diff --git a/src/assets/Img_home_bottom@2x.png b/src/assets/Img_home_bottom@2x.png
diff --git a/src/assets/Img_home_bottom@3x.png b/src/assets/Img_home_bottom@3x.png
diff --git a/src/assets/Img_home_top.png b/src/assets/Img_home_top.png
diff --git a/src/assets/Img_home_top@2x.png b/src/assets/Img_home_top@2x.png
diff --git a/src/assets/Img_home_top@3x.png b/src/assets/Img_home_top@3x.png
diff --git a/src/assets/Img_inquiry_empty.png b/src/assets/Img_inquiry_empty.png
diff --git a/src/assets/Img_inquiry_empty.svg b/src/assets/Img_inquiry_empty.svg
diff --git a/src/assets/Img_inquiry_empty@2x.png b/src/assets/Img_inquiry_empty@2x.png
diff --git a/src/assets/Img_inquiry_empty@3x.png b/src/assets/Img_inquiry_empty@3x.png
diff --git a/src/assets/Img_reply_empty.png b/src/assets/Img_reply_empty.png
diff --git a/src/assets/Img_reply_empty.svg b/src/assets/Img_reply_empty.svg
diff --git a/src/assets/Img_reply_empty@2x.png b/src/assets/Img_reply_empty@2x.png
diff --git a/src/assets/Img_reply_empty@3x.png b/src/assets/Img_reply_empty@3x.png
diff --git a/src/assets/arrow_left@3x.png b/src/assets/arrow_left@3x.png
diff --git a/src/assets/arrow_right@3x.png b/src/assets/arrow_right@3x.png
diff --git a/src/assets/btn_visibility_off_24px.png b/src/assets/btn_visibility_off_24px.png
diff --git a/src/assets/btn_visibility_on_24px.png b/src/assets/btn_visibility_on_24px.png
diff --git a/src/assets/google_logo.png b/src/assets/google_logo.png
diff --git a/src/assets/google_logo@2x.png b/src/assets/google_logo@2x.png
diff --git a/src/assets/google_logo@3x.png b/src/assets/google_logo@3x.png
diff --git a/src/assets/ic_dropdown@3x.png b/src/assets/ic_dropdown@3x.png
diff --git a/src/assets/ic_dropdown_mobile@3x.png b/src/assets/ic_dropdown_mobile@3x.png
diff --git a/src/assets/ic_facebook.svg b/src/assets/ic_facebook.svg
diff --git a/src/assets/ic_heart.png b/src/assets/ic_heart.png
diff --git a/src/assets/ic_instagram.svg b/src/assets/ic_instagram.svg
diff --git a/src/assets/ic_search@3x.png b/src/assets/ic_search@3x.png
diff --git a/src/assets/ic_twitter.svg b/src/assets/ic_twitter.svg
diff --git a/src/assets/ic_youtube.svg b/src/assets/ic_youtube.svg
diff --git a/src/assets/img_default.png b/src/assets/img_default.png
Original file line number	Diff line number	Diff line change
Expand Up		@@ -68,3 +68,4 @@ This section has moved here: [https://facebook.github.io/create-react-app/docs/d
		### `npm run build` fails to minify

		This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify)
		react router dom 에서 Header Footer 레이아웃을 설정할 때, Browser router로 이렇게 설정해도 될 것 같네요.