diff --git a/apps/graduate/src/admin/pages/filePreview/styles/PreviewPage.css.ts b/apps/graduate/src/admin/pages/filePreview/styles/FilePreviewPage.css.ts similarity index 91% rename from apps/graduate/src/admin/pages/filePreview/styles/PreviewPage.css.ts rename to apps/graduate/src/admin/pages/filePreview/styles/FilePreviewPage.css.ts index 301c8cdb..deb6e090 100644 --- a/apps/graduate/src/admin/pages/filePreview/styles/PreviewPage.css.ts +++ b/apps/graduate/src/admin/pages/filePreview/styles/FilePreviewPage.css.ts @@ -3,13 +3,11 @@ import { style } from '@vanilla-extract/css'; import { vars } from '~/vars.css'; export const root = style({ - display: 'flex', - flexDirection: 'column', - height: '100vh', - width: '100vw', - overflow: 'hidden', + minHeight: '100dvh', backgroundColor: vars.colors.sub, + padding: vars.spacing.lg, }); + export const container = style({ padding: vars.spacing.xl, maxWidth: '1200px', diff --git a/apps/graduate/src/admin/pages/filePreview/ui/FilePreviewPage.tsx b/apps/graduate/src/admin/pages/filePreview/ui/FilePreviewPage.tsx index 8772bab5..a7d2bcb9 100644 --- a/apps/graduate/src/admin/pages/filePreview/ui/FilePreviewPage.tsx +++ b/apps/graduate/src/admin/pages/filePreview/ui/FilePreviewPage.tsx @@ -11,7 +11,7 @@ import FilePreviewContent from './FilePreviewContent'; import FilePreviewToolbar from './FilePreviewToolbar'; import { getSubmissionTypeIndex } from '../../schedule/constants'; import { useFile } from '../model'; -import * as style from '../styles/PreviewPage.css'; +import * as style from '../styles/FilePreviewPage.css'; import { useGraduationBatchApproval } from '~/admin/entities/graduation-approval/model'; import { useStudentDetail } from '~/admin/features/studentDetail'; @@ -138,34 +138,39 @@ export default function FilePreviewPage() { }; return ( -
-
- -
-
- refetch()} - /> - -
-
- +
+
+
+ +
+
+ refetch()} + /> + +
+
+ +
diff --git a/apps/graduate/src/admin/pages/notice/styles/NoticeAdminCreatePage.css.ts b/apps/graduate/src/admin/pages/notice/styles/NoticeAdminCreatePage.css.ts index d1efab9d..f6d58251 100644 --- a/apps/graduate/src/admin/pages/notice/styles/NoticeAdminCreatePage.css.ts +++ b/apps/graduate/src/admin/pages/notice/styles/NoticeAdminCreatePage.css.ts @@ -2,6 +2,12 @@ import { style } from '@vanilla-extract/css'; import { vars } from '~/vars.css'; +export const root = style({ + minHeight: '100dvh', + backgroundColor: vars.colors.sub, + padding: vars.spacing.lg, +}); + export const container = style({ padding: vars.spacing.xl, maxWidth: '1000px', diff --git a/apps/graduate/src/admin/pages/notice/styles/NoticeAdminPage.css.ts b/apps/graduate/src/admin/pages/notice/styles/NoticeAdminPage.css.ts index 6b5f4982..f53f9b29 100644 --- a/apps/graduate/src/admin/pages/notice/styles/NoticeAdminPage.css.ts +++ b/apps/graduate/src/admin/pages/notice/styles/NoticeAdminPage.css.ts @@ -2,7 +2,14 @@ import { style } from '@vanilla-extract/css'; import { vars } from '~/vars.css'; +export const root = style({ + minHeight: '100dvh', + backgroundColor: vars.colors.sub, + padding: vars.spacing.lg, +}); + export const container = style({ + backgroundColor: vars.colors.sub, padding: vars.spacing.xl, maxWidth: '1200px', margin: '0 auto', diff --git a/apps/graduate/src/admin/pages/notice/ui/NoticeAdminCreatePage.tsx b/apps/graduate/src/admin/pages/notice/ui/NoticeAdminCreatePage.tsx index cfffb1e2..6cb121b4 100644 --- a/apps/graduate/src/admin/pages/notice/ui/NoticeAdminCreatePage.tsx +++ b/apps/graduate/src/admin/pages/notice/ui/NoticeAdminCreatePage.tsx @@ -184,115 +184,117 @@ export default function NoticeAdminCreatePage({ } return ( -
-
- -
+
+
+
+ +
-
-

- {isEditMode ? '공지사항 수정' : '공지사항 작성'} -

+
+

+ {isEditMode ? '공지사항 수정' : '공지사항 작성'} +

- {isEditMode && ( -
-
작성일: {createdAt}
-
- )} + {isEditMode && ( +
+
작성일: {createdAt}
+
+ )} -
-
- - ( - + +
+ + ( + + )} + /> + {errors.title && ( +

{errors.title.message}

)} - /> - {errors.title && ( -

{errors.title.message}

- )} -
+
-
- ( - onChange(e.target.checked)} - > - - 상단 고정 (공지로 표시) - - - )} - /> -
+
+ ( + onChange(e.target.checked)} + > + + 상단 고정 (공지로 표시) + + + )} + /> +
-
- - ( - {}} - isSaved={true} - className={style.textarea} - /> +
+ + ( + {}} + isSaved={true} + className={style.textarea} + /> + )} + /> + {errors.content && ( +

{errors.content.message}

)} - /> - {errors.content && ( -

{errors.content.message}

- )} -
+
-
- - - - -
+
+ + + + +
- + -
-
- {isEditMode && ( - + )} +
+
+ - )} -
-
- - + +
-
- + +
); diff --git a/apps/graduate/src/admin/pages/notice/ui/NoticeAdminPage.tsx b/apps/graduate/src/admin/pages/notice/ui/NoticeAdminPage.tsx index e92d64d3..1a32ae56 100644 --- a/apps/graduate/src/admin/pages/notice/ui/NoticeAdminPage.tsx +++ b/apps/graduate/src/admin/pages/notice/ui/NoticeAdminPage.tsx @@ -103,38 +103,40 @@ export default function NoticeAdminPage() { }; return ( -
-
+
+
+
+ +
+ setSearchText(e.target.value)} + className={style.searchInput} + size='large' + allowClear + /> + +
-
- setSearchText(e.target.value)} - className={style.searchInput} - size='large' - allowClear + setCurrentPage(page), + showSizeChanger: false, + showTotal: total => `총 ${total}개`, + }} + bordered /> - - -
setCurrentPage(page), - showSizeChanger: false, - showTotal: total => `총 ${total}개`, - }} - bordered - /> ); } diff --git a/apps/graduate/src/admin/pages/schedule/styles/ScheduleAdminPage.css.ts b/apps/graduate/src/admin/pages/schedule/styles/ScheduleAdminPage.css.ts index 01b77fa4..64963643 100644 --- a/apps/graduate/src/admin/pages/schedule/styles/ScheduleAdminPage.css.ts +++ b/apps/graduate/src/admin/pages/schedule/styles/ScheduleAdminPage.css.ts @@ -7,3 +7,9 @@ export const container = style({ maxWidth: '1200px', margin: '0 auto', }); + +export const root = style({ + minHeight: '100dvh', + backgroundColor: vars.colors.sub, + padding: vars.spacing.lg, +}); diff --git a/apps/graduate/src/admin/pages/schedule/ui/ScheduleAdminPage.tsx b/apps/graduate/src/admin/pages/schedule/ui/ScheduleAdminPage.tsx index 58e55377..cb6d8c4d 100644 --- a/apps/graduate/src/admin/pages/schedule/ui/ScheduleAdminPage.tsx +++ b/apps/graduate/src/admin/pages/schedule/ui/ScheduleAdminPage.tsx @@ -41,23 +41,25 @@ export default function ScheduleAdminPage() { ]; return ( -
-
+
+
+
-
+
- + -
+
- + + ); }