Skip to content

Commit 8286683

Browse files
authored
Merge pull request #1 from WoongyuChoi/dev
Dev
2 parents 8b5b05f + a9aaf07 commit 8286683

38 files changed

+514
-53
lines changed

package-lock.json

Lines changed: 57 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,14 @@
1010
"preview": "vite preview"
1111
},
1212
"dependencies": {
13+
"@tanstack/react-query": "^5.59.16",
1314
"@vercel/speed-insights": "^1.0.14",
1415
"chart.js": "^4.4.5",
1516
"chartjs-plugin-datalabels": "^2.2.0",
1617
"react": "^18.3.1",
1718
"react-chartjs-2": "^5.2.0",
1819
"react-dom": "^18.3.1",
20+
"react-lottie-player": "^2.1.0",
1921
"react-router-dom": "^6.27.0"
2022
},
2123
"devDependencies": {

src/App.tsx

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,27 @@
1+
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
12
import { SpeedInsights } from "@vercel/speed-insights/react";
3+
import { useState } from "react";
24
import { BrowserRouter, Route, Routes } from "react-router-dom";
35
import Home from ".";
46
import "./App.css";
57
import ChartProvider from "./provider/ChartProvider";
8+
import UsePlayingProvider from "./provider/UsePlayingProvider";
69

710
function App() {
11+
const [queryClient] = useState(() => new QueryClient());
812
return (
9-
<ChartProvider>
10-
<BrowserRouter>
11-
<SpeedInsights />
12-
<Routes>
13-
<Route path="/" element={<Home />} />
14-
</Routes>
15-
</BrowserRouter>
16-
</ChartProvider>
13+
<QueryClientProvider client={queryClient}>
14+
<UsePlayingProvider>
15+
<ChartProvider>
16+
<BrowserRouter>
17+
<SpeedInsights />
18+
<Routes>
19+
<Route path="/" element={<Home />} />
20+
</Routes>
21+
</BrowserRouter>
22+
</ChartProvider>
23+
</UsePlayingProvider>
24+
</QueryClientProvider>
1725
);
1826
}
1927

src/Button.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
border: none;
44
border-radius: 5px;
55
cursor: pointer;
6-
font-size: 10px;
6+
font-size: 14px;
77
font-weight: 700;
88
transition: background-color 0.3s ease;
99
}

src/assets/fonts/pretendard.css

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
/*
2+
Copyright (c) 2021 Kil Hyung-jin, with Reserved Font Name Pretendard.
3+
https://github.com/orioncactus/pretendard
4+
5+
This Font Software is licensed under the SIL Open Font License, Version 1.1.
6+
This license is copied below, and is also available with a FAQ at:
7+
http://scripts.sil.org/OFL
8+
*/
9+
10+
@font-face {
11+
font-family: 'Pretendard';
12+
font-weight: 900;
13+
font-display: swap;
14+
src: local('Pretendard Black'), url(./woff2/Pretendard-Black.woff2) format('woff2'), url(./woff/Pretendard-Black.woff) format('woff');
15+
}
16+
17+
@font-face {
18+
font-family: 'Pretendard';
19+
font-weight: 800;
20+
font-display: swap;
21+
src: local('Pretendard ExtraBold'), url(./woff2/Pretendard-ExtraBold.woff2) format('woff2'), url(./woff/Pretendard-ExtraBold.woff) format('woff');
22+
}
23+
24+
@font-face {
25+
font-family: 'Pretendard';
26+
font-weight: 700;
27+
font-display: swap;
28+
src: local('Pretendard Bold'), url(./woff2/Pretendard-Bold.woff2) format('woff2'), url(./woff/Pretendard-Bold.woff) format('woff');
29+
}
30+
31+
@font-face {
32+
font-family: 'Pretendard';
33+
font-weight: 600;
34+
font-display: swap;
35+
src: local('Pretendard SemiBold'), url(./woff2/Pretendard-SemiBold.woff2) format('woff2'), url(./woff/Pretendard-SemiBold.woff) format('woff');
36+
}
37+
38+
@font-face {
39+
font-family: 'Pretendard';
40+
font-weight: 500;
41+
font-display: swap;
42+
src: local('Pretendard Medium'), url(./woff2/Pretendard-Medium.woff2) format('woff2'), url(./woff/Pretendard-Medium.woff) format('woff');
43+
}
44+
45+
@font-face {
46+
font-family: 'Pretendard';
47+
font-weight: 400;
48+
font-display: swap;
49+
src: local('Pretendard Regular'), url(./woff2/Pretendard-Regular.woff2) format('woff2'), url(./woff/Pretendard-Regular.woff) format('woff');
50+
}
51+
52+
@font-face {
53+
font-family: 'Pretendard';
54+
font-weight: 300;
55+
font-display: swap;
56+
src: local('Pretendard Light'), url(./woff2/Pretendard-Light.woff2) format('woff2'), url(./woff/Pretendard-Light.woff) format('woff');
57+
}
58+
59+
@font-face {
60+
font-family: 'Pretendard';
61+
font-weight: 200;
62+
font-display: swap;
63+
src: local('Pretendard ExtraLight'), url(./woff2/Pretendard-ExtraLight.woff2) format('woff2'), url(./woff/Pretendard-ExtraLight.woff) format('woff');
64+
}
65+
66+
@font-face {
67+
font-family: 'Pretendard';
68+
font-weight: 100;
69+
font-display: swap;
70+
src: local('Pretendard Thin'), url(./woff2/Pretendard-Thin.woff2) format('woff2'), url(./woff/Pretendard-Thin.woff) format('woff');
71+
}
1.09 MB
Binary file not shown.
1.08 MB
Binary file not shown.
1.08 MB
Binary file not shown.
1.05 MB
Binary file not shown.
1.07 MB
Binary file not shown.

0 commit comments

Comments
 (0)