Skip to content
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.

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

[영양사] 월간 조회 UI 구현 #14

Merged
merged 11 commits into from
Sep 12, 2024
5 changes: 0 additions & 5 deletions .github/workflows/reviewer.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,6 @@
"name": "정해성",
"githubName": "junghaesung79",
"team" : "campus"
},
{
"name": "김경윤",
"githubName": "KimKyungYun",
"team" : "campus"
},
{
"name": "김민재",
Expand Down
2 changes: 2 additions & 0 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import AuthLayout from 'layout/AuthLayout';
import DefaultLayout from 'layout/DefaultLayout';
import Coop from 'pages/Coop';
import Login from 'pages/Login';
import Setting from 'pages/Setting';
import { useCoopMe } from 'query/auth';

function ProtectedRoute() {
Expand All @@ -29,6 +30,7 @@ function App() {
<Route element={<DefaultLayout />}>
<Route path="/" element={<Coop />} />
</Route>
<Route path="/setting" element={<Setting />} />
</Route>
<Route element={<PublicRoute />}>
<Route element={<AuthLayout />}>
Expand Down
Binary file removed src/assets/fonts/NotoSansKR-Medium.woff2
Binary file not shown.
Binary file removed src/assets/fonts/NotoSansKR-Regular.woff2
Binary file not shown.
Binary file added src/assets/fonts/PretendardVariable.woff2
Binary file not shown.
3 changes: 1 addition & 2 deletions src/assets/styles/fonts.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
@use "./mixin.scss";
@include mixin.font-face("NotoSansKR", "/assets/fonts/NotoSansKR-Regular", 400);
@include mixin.font-face("NotoSansKR", "/assets/fonts/NotoSansKR-Medium", 500);
@include mixin.font-face("Pretandard", "/assets/fonts/PretandardVariable", 400, normal);
9 changes: 7 additions & 2 deletions src/assets/svg/auth/search-glasses.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/svg/common/arrow-down.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 11 additions & 9 deletions src/assets/svg/common/koin-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading