Skip to content

[FE] SISC1-188 [FEAT] : 랜딩페이지 구현 #67

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.

Sign up for GitHub

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

Merged
DongEun02 merged 4 commits into from
Oct 30, 2025
Merged

[FE] SISC1-188 [FEAT] : 랜딩페이지 구현 #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8634d23
[FE] SISC1-188 [FEAT]: 랜딩페이지 디자인 구현
DongEun02 Oct 29, 2025
8261c13
[FE] SISC1-188 [FEAT]: 랜딩페이지 사이드바 토글 구현
DongEun02 Oct 29, 2025
3cf9cd9
[FE] SISC1-188 [FIX] : CSS 속성 수정
DongEun02 Oct 30, 2025
edfb0b5
[FE] SISC1-188 [FIX] : CSS 수정
DongEun02 Oct 30, 2025
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
116 changes: 102 additions & 14 deletions frontend/package-lock.json
View file
Open in desktop

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

1 change: 1 addition & 0 deletions frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"preview": "vite preview"
},
"dependencies": {
"axios": "^1.13.1",
"pretendard": "^1.3.9",
"react": "^19.1.1",
"react-dom": "^19.1.1",
Expand Down
Binary file added frontend/src/assets/coin3.png
View file
Open in desktop
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 frontend/src/assets/coin5.png
View file
Open in desktop
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 frontend/src/assets/logo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 13 additions & 4 deletions frontend/src/components/Layout.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,20 @@
import { Outlet } from 'react-router-dom';
import { Outlet, useLocation } from 'react-router-dom';
import Sidebar from './Sidebar';

function Layout() {
const location = useLocation();
const isRoot = location.pathname === '/';

return (
<div style={{ display: 'flex' }}>
<Sidebar />
<main style={{ flex: 1, backgroundColor: '#ffffff' }}>
<div style={{ display: 'flex', position: 'relative' }}>
{/* 홈이 아닐 때는 Sidebar 고정 */}
{!isRoot && <Sidebar />}

<main
style={{ flex: 1, backgroundColor: '#ffffff', position: 'relative' }}
>
{/* 홈일 때만 Sidebar를 main 내부에서 렌더링 (햄버거 + 슬라이드) */}
{isRoot && <Sidebar />}
<Outlet />
</main>
</div>
Expand Down
Loading