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
36 changes: 27 additions & 9 deletions frontend/src/App.jsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { useEffect } from 'react';
import './App.css';
import { Routes, Route } from 'react-router-dom';
import Layout from './components/Layout';
Expand Down Expand Up @@ -38,6 +39,19 @@ import ProtectedRoute from './components/protectedRoute.jsx';
import AdminRoute from './components/AdminRoute.jsx';

function App() {
useEffect(() => {
const setVh = () => {
const vh = window.innerHeight * 0.01;
document.documentElement.style.setProperty('--vh', `${vh}px`);
};

setVh();
window.addEventListener('resize', setVh);

return () => {
window.removeEventListener('resize', setVh);
};
}, []);
return (
<>
<Routes>
Expand Down Expand Up @@ -74,15 +88,19 @@ function App() {
<Route path="/attendance/admin/qr" element={<QrRenderPage />} />
{/* <Route path="/attendance/check-in" element={<CheckInPage />} /> */}
</Route>
<Route element={<AdminRoute />}>
<Route path="/admin" element={<AdminHome />} />
<Route path="/admin/members" element={<AdminMemberManage />} />
<Route
path="/admin/members/approval" element={<AdminMemberApproval />}
/>
<Route path="/admin/members/upload" element={<AdminExcelUpload />} />
<Route path="/admin/dashboard" element={<AdminDashboard />} />
</Route>
<Route element={<AdminRoute />}>
<Route path="/admin" element={<AdminHome />} />
<Route path="/admin/members" element={<AdminMemberManage />} />
<Route
path="/admin/members/approval"
element={<AdminMemberApproval />}
/>
<Route
path="/admin/members/upload"
element={<AdminExcelUpload />}
/>
<Route path="/admin/dashboard" element={<AdminDashboard />} />
</Route>
</Route>
</Routes>

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Sidebar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ const Sidebar = ({ isOpen, isRoot, onClose }) => {
<div>
<h2 id="feedback-modal-title">피드백 작성</h2>
<p id="feedback-modal-description">
솔직한 피드백은 금융IT팀에게 큰 도움이 됩니다.
솔직한 피드백은 금융IT팀에게 큰 도움이 됩니다. 피드백은 익명으로 저장됩니다.
Comment thread
sangkyu39 marked this conversation as resolved.
Comment thread
sangkyu39 marked this conversation as resolved.
</p>
</div>
<button
Expand Down
5 changes: 2 additions & 3 deletions frontend/src/components/Sidebar.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
top: 0;
left: 0;
width: 100vw;
height: 100vh;
height: calc(100 * var(--vh));
background-color: transparent;
z-index: 999;
display: block;
Expand Down Expand Up @@ -79,7 +79,7 @@
padding-top: 20px;
transform: translateX(0);
}

.closed {
transform: translateX(0);
}
Expand Down Expand Up @@ -323,7 +323,6 @@

.feedbackTriggerWrap {
margin-top: auto;
padding-top: 12px;
border-top: 1px solid rgba(255, 255, 255, 0.08);
}

Expand Down
4 changes: 3 additions & 1 deletion frontend/src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@ html {
}

#root {
min-height: 100vh;
height: calc(100 * var(--vh));
margin: 0;
padding: 0;
position: relative;
background-color: #ffffff !important;
}