Merge pull request #18 from novice1993/feat/InfiniteScroll

[Feat] 무한 스크롤 구현
novice1993 · Jul 23, 2023 · 4e9225d · 4e9225d
2 parents 6e96357 + c235e4c
commit 4e9225d
Show file tree

Hide file tree

Showing 38 changed files with 604 additions and 409 deletions.
diff --git a/coz-shopping/.gitignore → .gitignore b/coz-shopping/.gitignore → .gitignore
diff --git a/coz-shopping/README.md b/coz-shopping/README.md
diff --git a/coz-shopping/src/Page/BookmarkListPage.js b/coz-shopping/src/Page/BookmarkListPage.js
diff --git a/coz-shopping/src/Page/ItemListPage.js b/coz-shopping/src/Page/ItemListPage.js
diff --git a/coz-shopping/src/Page/MainPage.js b/coz-shopping/src/Page/MainPage.js
diff --git a/coz-shopping/package-lock.json → package-lock.json b/coz-shopping/package-lock.json → package-lock.json
diff --git a/coz-shopping/package.json → package.json b/coz-shopping/package.json → package.json
diff --git a/coz-shopping/public/favicon.ico → public/favicon.ico b/coz-shopping/public/favicon.ico → public/favicon.ico
diff --git a/coz-shopping/public/index.html → public/index.html b/coz-shopping/public/index.html → public/index.html
diff --git a/coz-shopping/public/manifest.json → public/manifest.json b/coz-shopping/public/manifest.json → public/manifest.json
diff --git a/coz-shopping/public/robots.txt → public/robots.txt b/coz-shopping/public/robots.txt → public/robots.txt
diff --git a/coz-shopping/src/App.css → src/App.css b/coz-shopping/src/App.css → src/App.css
@@ -25,10 +25,10 @@ main {
 }
 
 footer {
-  flex: 1 0 0;
+  flex: 0.7 0 0;
 }
 
-div {
+/* div {
   border: 1px solid black;
-}
+} */
 
diff --git a/coz-shopping/src/App.js → src/App.js b/coz-shopping/src/App.js → src/App.js
@@ -1,5 +1,5 @@
 import './App.css';
-import { useEffect, useState } from 'react';
+import { useState } from 'react';
 import MainPage from './Page/MainPage';
 import ItemListPage from './Page/ItemListPage';
 import BookmarkListPage from './Page/BookmarkListPage';
@@ -9,8 +9,9 @@ import { BrowserRouter, Routes, Route } from 'react-router-dom';
 function App() {
 
   const bookmarkData = JSON.parse(localStorage.getItem('bookmark'));
-  const [bookmark_List, setBookmark_List] = useState(bookmarkData); // 북마크 리스트
+  const [bookmark_List, setBookmark_List] = useState( (bookmarkData !== null) ? bookmarkData : [] );
 
+
   return (
     <BrowserRouter>
       <Routes>

diff --git a/coz-shopping/src/App.test.js → src/App.test.js b/coz-shopping/src/App.test.js → src/App.test.js