diff --git a/app/(sub-page)/components/navigation-bar.tsx b/app/(sub-page)/components/navigation-bar.tsx index fbe40e6d..aafa240e 100644 --- a/app/(sub-page)/components/navigation-bar.tsx +++ b/app/(sub-page)/components/navigation-bar.tsx @@ -10,7 +10,7 @@ import UserDeleteModal from '@/app/ui/user/user-info-navigator/user-delete-modal export default function NavigationBar() { return ( -
+
main-logo diff --git a/app/(sub-page)/components/navigation-items.tsx b/app/(sub-page)/components/navigation-items.tsx index 0f741295..22a212ea 100644 --- a/app/(sub-page)/components/navigation-items.tsx +++ b/app/(sub-page)/components/navigation-items.tsx @@ -40,7 +40,7 @@ export function NavigationItem({ href, label, target }: NavigationItemProps) {
); } diff --git a/app/(sub-page)/sign-in/page.tsx b/app/(sub-page)/sign-in/page.tsx index 42205546..7c321181 100644 --- a/app/(sub-page)/sign-in/page.tsx +++ b/app/(sub-page)/sign-in/page.tsx @@ -18,11 +18,11 @@ export const metadata: Metadata = { export default function SignInPage() { return ( - -
- 마루 -
-
+
+ + 마루 + +
diff --git a/app/business/services/user/user.query.ts b/app/business/services/user/user.query.ts index feab0b4e..826f8ba8 100644 --- a/app/business/services/user/user.query.ts +++ b/app/business/services/user/user.query.ts @@ -12,6 +12,7 @@ import { } from './user.validation'; import { FormState } from '@/app/ui/view/molecule/form/form-root'; import { instance } from '@/app/utils/api/instance'; +import { CreditResponse } from '@/app/store/querys/result'; export async function auth(): Promise { try { @@ -39,6 +40,16 @@ export async function fetchUser(): Promise { + try { + const { data } = await instance.get(`${API_PATH.graduations}/credits`); + + return data; + } catch (error) { + throw error; + } +} + export async function findUserToStudentNumber(prevState: FormState, formData: FormData): Promise { const validatedFields = FindIdFormSchema.safeParse({ studentNumber: formData.get('studentNumber'), diff --git a/app/globals.css b/app/globals.css index d56e84e2..dbd8b5c2 100644 --- a/app/globals.css +++ b/app/globals.css @@ -24,7 +24,7 @@ *, a { - font-family: 'Pretendard'; + font-family: 'Pretendard Variable'; } ::-webkit-scrollbar { @@ -40,14 +40,3 @@ a { background: #c4c4c4; border-radius: 5px; } - -@font-face { - font-family: 'VitroCore'; - src: - local('vitro'), - url('../public/assets/font/vitro.woff2') format('woff2'), - url('../public/assets/font/vitro.woff') format('woff'), - url('../public/assets/font/vitro.ttf') format('truetype'); - font-weight: 700; - font-display: swap; -} diff --git a/app/layout.tsx b/app/layout.tsx index 51cd2909..7143376a 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -13,7 +13,7 @@ export const metadata: Metadata = { description: '명지대학교 졸업사정결과 조회서비스 "졸업을 부탁해"는 미이수 / 이수 과목정보 및 잔여학점 조회, 졸업사정예측 서비스를 원클릭으로 제공합니다.', icons: { - icon: 'https://github.com/Myongji-Graduate/MyongjiGraduate-BE/assets/75975946/2a7354ae-dffe-4250-8b83-a211a07ff5d2', + icon: '/assets/favicon.png', }, openGraph: { siteName: '졸업을 부탁해', @@ -38,7 +38,8 @@ export default function RootLayout({ diff --git a/app/mocks/handlers/taken-lecture-handler.mock.ts b/app/mocks/handlers/taken-lecture-handler.mock.ts index 9e1aa373..e62b7fa2 100644 --- a/app/mocks/handlers/taken-lecture-handler.mock.ts +++ b/app/mocks/handlers/taken-lecture-handler.mock.ts @@ -14,9 +14,9 @@ export const takenLectureHandlers = [ await delay(100); return HttpResponse.json(takenLectures); }), - http.post(API_PATH.takenLectures, async ({ request }) => { + http.post(API_PATH.takenLectures, async ({ request }) => { const body = await request.json(); - const isAdded = mockDatabase.addTakenLecture(body.lectureCode); + const isAdded = mockDatabase.addTakenLecture(body.lectureId); await delay(1000); if (isAdded) return HttpResponse.json({ message: '과목 추가에 성공했습니다' }, { status: 200 }); return HttpResponse.json({ errorCode: 400, message: '추가에 실패했습니다' }, { status: 400 }); diff --git a/app/page.tsx b/app/page.tsx index 3ba68c08..dff73b55 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -6,13 +6,30 @@ import Responsive from './ui/responsive'; import NavigationBar from './(sub-page)/components/navigation-bar'; import Button from './ui/view/atom/button/button'; import Link from 'next/link'; +import localFont from 'next/font/local'; + +const vitroFont = localFont({ + src: '../public/assets/font/vitro.woff2', + variable: '--font-vitro', + weight: '700', + display: 'swap', +}); export default function HomePage() { return ( -
+
- main-book-background +
+ main-book-background +
-

+

-
- +
+ 업을  - + 탁해 @@ -37,11 +57,13 @@ export default function HomePage() { graduation-cap
명지인을 위한 간편 졸업요건 검사 사이트
-

+
-

+

* 서비스의 결과는 공식적인 효력을 갖지 않습니다. 정확한 졸업사정결과는 소속 단과대 교학팀에서의 확인을 권장합니다.

diff --git a/app/ui/user/user-info-card/user-info-content/user-info-content.tsx b/app/ui/user/user-info-card/user-info-content/user-info-content.tsx index fcb6e9a0..ed368d94 100644 --- a/app/ui/user/user-info-card/user-info-content/user-info-content.tsx +++ b/app/ui/user/user-info-card/user-info-content/user-info-content.tsx @@ -1,14 +1,13 @@ -'use client'; import { UserInfoResponse } from '@/app/business/services/user/user.type'; -import { useFetchCredits } from '@/app/store/querys/result'; import UserInfoContentViewer from './user-info-content-viewer'; +import { fetchCredits } from '@/app/business/services/user/user.query'; interface UserInfoContentProp { data: UserInfoResponse; } -function UserInfoContent({ data }: UserInfoContentProp) { - const { data: categories } = useFetchCredits(); +async function UserInfoContent({ data }: UserInfoContentProp) { + const categories = await fetchCredits(); return ; } diff --git a/app/ui/user/user-info-card/user-info-content/user-info-list.tsx b/app/ui/user/user-info-card/user-info-content/user-info-list.tsx index e0b17cea..3f16ef2f 100644 --- a/app/ui/user/user-info-card/user-info-content/user-info-list.tsx +++ b/app/ui/user/user-info-card/user-info-content/user-info-list.tsx @@ -18,7 +18,7 @@ function UserInfoList({ data }: UserInfoListProps) { return (
-
    +
    • 이름
    • 학번
    • {displaySeveralMajor('title')} diff --git a/app/ui/view/molecule/form/form-submit-button.tsx b/app/ui/view/molecule/form/form-submit-button.tsx index 88d049c2..31a71ba7 100644 --- a/app/ui/view/molecule/form/form-submit-button.tsx +++ b/app/ui/view/molecule/form/form-submit-button.tsx @@ -32,7 +32,7 @@ export function FormSubmitButton({