Skip to content

Commit 5917dac

Browse files
ehlungehlung
authored
Merge pull request #26 from enjoy-hack/feat-layout
Feat layout
2 parents 34432c3 + fe4e8bd commit 5917dac

22 files changed

Lines changed: 173 additions & 67 deletions

File tree

‎.env‎

Whitespace-only changes.

‎.github/workflows/chromatic.yml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,4 @@ jobs:
2626
run: npm install
2727

2828
- name: Publish to Chromatic
29-
uses: chromaui/action@v1
30-
with:
31-
projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
32-
token: ${{ secrets.GITHUB_TOKEN }}
29+
run: npx chromatic --project-token=${{ secrets.CHROMATIC_PROJECT_TOKEN }}

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,4 @@ dist-ssr
2525

2626
*storybook.log
2727
storybook-static
28+
.env

‎index.html‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,13 @@
22
<html lang="en">
33
<head>
44
<meta charset="UTF-8" />
5-
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
5+
<link rel="icon" type="image/svg+xml" href="/logo.svg" />
6+
<link
7+
rel="stylesheet"
8+
href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css"
9+
/>
610
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
7-
<title>Vite + React</title>
11+
<title>마이트랙</title>
812
</head>
913
<body>
1014
<div id="root"></div>

‎package-lock.json‎

Lines changed: 50 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
"react-icons": "^5.5.0",
2222
"react-router-dom": "^7.6.2",
2323
"vite-plugin-svgr": "^4.5.0",
24+
"vite-tsconfig-paths": "^5.1.4",
2425
"zustand": "^5.0.5"
2526
},
2627
"devDependencies": {
@@ -39,7 +40,7 @@
3940
"@vitest/browser": "^3.2.4",
4041
"@vitest/coverage-v8": "^3.2.4",
4142
"autoprefixer": "^10.4.21",
42-
"chromatic": "^13.1.3",
43+
"chromatic": "^13.1.4",
4344
"eslint": "^9.29.0",
4445
"eslint-config-prettier": "^10.1.5",
4546
"eslint-plugin-prettier": "^5.5.0",

‎public/logo.svg‎

Lines changed: 29 additions & 0 deletions
Loading

‎public/vite.svg‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎src/app/index.jsx‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,27 @@
11
// 전역 컨텍스트 및 상태 관리 설정 (라우팅, 인증 등)
2-
32
import {
4-
BrowserRouter,
3+
BrowserRouter as Router,
54
Routes,
65
Route,
76
useLocation,
87
Navigate,
98
} from 'react-router-dom';
10-
119
import Header from '../widgets/navigation/Header';
1210
import Footer from '../widgets/navigation/Footer';
13-
1411
import Home from '../pages/home';
1512
import TrackInfo from '../pages/info';
1613
import NotFound from '../pages/NotFound';
1714
import Search from '../pages/Search';
1815
import Splash from '../pages/splash';
1916
import Login from '../pages/login';
2017
import MyPage from '../pages/my';
21-
import TrackDataUploadModal from '../features/track-management/components/TrackDataUploadModal';
18+
// import TrackDataUploadModal from '../features/track-management/components/TrackDataUploadModal';
2219

2320
function App() {
2421
return (
25-
<BrowserRouter>
22+
<Router>
2623
<AppContent />
27-
</BrowserRouter>
24+
</Router>
2825
);
2926
}
3027

@@ -34,19 +31,23 @@ function AppContent() {
3431
const shouldHideHeaderFooter = hiddenRoutes.includes(location.pathname);
3532

3633
return (
37-
<div className="min-h-screen bg-blue-primary">
34+
<div className="flex flex-col min-h-screen">
3835
{!shouldHideHeaderFooter && <Header />}
39-
<Routes>
40-
<Route path="/" element={<Navigate to="/login" replace />} />
41-
<Route path="/home" element={<Home />} />
42-
<Route path="/login" element={<Login />} />
43-
<Route path="/splash" element={<Splash />} />
44-
<Route path="/track" element={<TrackInfo />} />
45-
<Route path="/search" element={<Search />} />
46-
<Route path="/mypage" element={<MyPage />} />
47-
<Route path="/upload" element={<TrackDataUploadModal />} />
48-
<Route path="*" element={<NotFound />} />
49-
</Routes>
36+
<main
37+
className={`w-full flex-grow ${!shouldHideHeaderFooter ? 'pt-[60px]' : ''}`}
38+
>
39+
<Routes>
40+
<Route path="/" element={<Navigate to="/login" replace />} />
41+
<Route path="/home" element={<Home />} />
42+
<Route path="/login" element={<Login />} />
43+
<Route path="/splash" element={<Splash />} />
44+
<Route path="/track" element={<TrackInfo />} />
45+
<Route path="/search" element={<Search />} />
46+
<Route path="/mypage" element={<MyPage />} />
47+
{/* <Route path="/upload" element={<UploadSection />} /> */}
48+
<Route path="*" element={<NotFound />} />
49+
</Routes>
50+
</main>
5051
{!shouldHideHeaderFooter && <Footer />}
5152
</div>
5253
);

‎src/assets/background.svg‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)