Skip to content

배포를 위한 pr #101

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
b1uey0 merged 4 commits into from
Mar 25, 2026
Merged

배포를 위한 pr #101

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
d89cb4a
fix: 모집글 관리 페이지 내부 스크롤 삭제
b1uey0 Mar 20, 2026
a3f13a1
Merge pull request #99 from Team-Waggle/feat/teamPostManagementPage
Min9ithub Mar 20, 2026
3a98811
fix: 404 페이지 수정
Min9ithub Mar 25, 2026
b8e4eaa
Merge pull request #100 from Team-Waggle/feat/notfoundpage
b1uey0 Mar 25, 2026
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
2 changes: 1 addition & 1 deletion src/pages/NotFoundPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const NotFoundPage = () => {
돌아가주세요!!
</span>
<span className="whitespace-pre-line text-center text-[2rem] font-semibold text-black-60">
{`불편을 드려 죄송합니다. \n이전 페이지로 돌아가 주세요.`}
{`존재하지 않는 페이지입니다. \n이전 페이지로 돌아가 주세요.`}
</span>
</div>
<BaseButton
Expand Down
2 changes: 1 addition & 1 deletion src/pages/TeamPostManagementPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const TeamPostManagementPage = () => {
</span>
</div>
)}
<div className={`mb-[29.1rem] flex flex-col items-start self-stretch ${posts.length >= 6 ? 'max-h-[60rem] overflow-y-auto scrollbar-hide' : ''}`}>
<div className={`mb-[29.1rem] flex flex-col items-start self-stretch`}>
{posts.length === 0 ? (
<PostEmptyPage />
) : (
Expand Down
32 changes: 24 additions & 8 deletions src/router.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,33 @@ import TeamHomePage from './pages/TeamHomePage';
import TeamPostManagementPage from './pages/TeamPostManagementPage';
import PostDetailPage from './pages/PostDetailPage';
import PostFormPage from './pages/PostFormPage';
import NotFoundPage from './pages/NotFoundPage';
// import TeamStatusPage from './pages/TeamStatusPage';

export const router = createBrowserRouter(
createRoutesFromElements(
<Route element={<App />}>
<Route path="/" element={<MainPage />} />
<>
<Route element={<App />}>
<Route path="/" element={<MainPage />} />
<Route path="/team/new" element={<TeamNewPage />} />
<Route path="/team/:teamId" element={<TeamHomePage />} />
<Route
path="/team/:teamId/recruitments"
element={<TeamPostManagementPage />}
/>
{/* <Route path="/team/:teamId/status" element={<TeamStatusPage />} /> */}
<Route path="/post/new" element={<PostFormPage />} />
<Route path="/post/:postId" element={<PostDetailPage />} />
</Route>
<Route path="/oauth/callback" element={<LoginPage />} />
<Route path="/team/new" element={<TeamNewPage />} />
<Route path="/team/:teamId" element={<TeamHomePage />} />
<Route path="/team/:teamId/recruitments" element={<TeamPostManagementPage />} />
<Route path="/post/new" element={<PostFormPage />} />
<Route path="/post/:postId" element={<PostDetailPage />} />
</Route>,
<Route path="*" element={<NotFoundPage />} />
</>,
),
);

// 내팀/모집글 관리 /team/:teamId/posts
// 내팀/지원자 관리 /team/:teamId/applicants
// 내팀/팀상태 관리 /team/:teamId/status
// 알림 /notification
// 메시지 /message
// 유저 정보 및 마이페이지 /profile/:userId
Loading