Skip to content
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
143 changes: 131 additions & 12 deletions react/my-react-app/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions react/my-react-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"preview": "vite preview"
},
"dependencies": {
"axios": "^1.9.0",
"react": "^19.1.0",
"react-dom": "^19.1.0",
"styled-components": "^6.1.18"
Expand Down
49 changes: 18 additions & 31 deletions react/my-react-app/src/App.jsx
Original file line number Diff line number Diff line change
@@ -1,48 +1,35 @@
import React from "react";
import { BrowserRouter, Routes, Route, useLocation } from "react-router-dom";
import Header from "./components/Header";
import Footer from "./components/Footer";
import { BrowserRouter, Routes, Route } from "react-router-dom";
import Layout from "./components/Layout";
import HomePage from "./pages/HomePage";
import SigninPage from "./pages/SigninPage";
import SignupPage from "./pages/SignupPage";
import ItemsPage from "./pages/ItemsPage";
import ProductsPage from "./pages/ProductsPage";
import AddItemPage from "./pages/AddItemPage";
import PrivacyPage from "./pages/PrivacyPage";
import FaqPage from "./pages/FaqPage";
import MyProfilePage from "./pages/MyProfilePage";
import ProductDetailPage from "./pages/ProductDetailPage";

function AppContent() {
const location = useLocation();
const hideFooterRoutes = ["/additem", "/signin", "/signup"];
const hideHeaderRoutes = ["/signin", "/signup"];

// 현재 라우트에 따라 헤더 표시 여부 결정
const shouldShowHeader = !hideHeaderRoutes.includes(location.pathname);
// 현재 라우트에 따라 푸터 표시 여부 결정
const shouldShowFooter = !hideFooterRoutes.includes(location.pathname);

function App() {
return (
<>
{shouldShowHeader && <Header />}
<BrowserRouter>
<Routes>
<Route path="/" element={<HomePage />} />
{/* Auth routes without layout */}
<Route path="/signin" element={<SigninPage />} />
<Route path="/signup" element={<SignupPage />} />
<Route path="/items" element={<ItemsPage />} />
<Route path="/additem" element={<AddItemPage />} />
<Route path="/privacy" element={<PrivacyPage />} />
<Route path="/faq" element={<FaqPage />} />
<Route path="/myprofile" element={<MyProfilePage />} />
</Routes>
{shouldShowFooter && <Footer />}
</>
);
}

function App() {
return (
<BrowserRouter>
<AppContent />
{/* Main routes with layout */}
<Route element={<Layout />}>
<Route path="/" element={<HomePage />} />
<Route path="/items" element={<ProductsPage />} />
<Route path="/items/:productId" element={<ProductDetailPage />} />
<Route path="/additem" element={<AddItemPage />} />
<Route path="/privacy" element={<PrivacyPage />} />
<Route path="/faq" element={<FaqPage />} />
<Route path="/myprofile" element={<MyProfilePage />} />
</Route>
</Routes>
</BrowserRouter>
);
}
Expand Down
Loading
Loading