Skip to content

Commit a9570ec

Browse files
sinji2102sinji2102
committed
chore: develop pull 과정에서 생긴 충돌 해결
2 parents 3ecd641 + 12668ca commit a9570ec

File tree

40 files changed

+4935
-2549
lines changed

40 files changed

+4935
-2549
lines changed

‎index.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
<head>
44
<!-- Google tag (gtag.js) -->
55
<script async src="https://www.googletagmanager.com/gtag/js?id=G-HHZWCY4574"></script>
6+
<script type="text/javascript" src="//dapi.kakao.com/v2/maps/sdk.js?appkey=f4b73490dbec6c62c45107b45cc7ba84&libraries=services,clusterer,drawing"></script>
7+
68
<script>
79
window.dataLayer = window.dataLayer || [];
810
function gtag() {
@@ -31,5 +33,7 @@
3133
}
3234
})();
3335
</script>
36+
37+
3438
</body>
3539
</html>

‎package.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,20 +41,24 @@
4141
"axios": "^1.7.2",
4242
"dayjs": "^1.11.11",
4343
"jotai": "^2.8.4",
44+
"lodash": "^4.17.21",
4445
"lottie-react": "^2.4.0",
4546
"postcss": "^8.4.38",
4647
"postcss-scss": "^4.0.9",
4748
"prerender-spa-plugin": "^3.4.0",
4849
"puppeteer-core": "^22.15.0",
4950
"react": "^18.3.1",
5051
"react-beautiful-dnd": "^13.1.1",
52+
"react-calendar": "^5.1.0",
5153
"react-components": "^0.5.1",
5254
"react-csv": "^2.2.2",
5355
"react-dom": "^18.3.1",
5456
"react-helmet-async": "^2.0.5",
5557
"react-image-crop": "^11.0.6",
58+
"react-kakao-maps-sdk": "^1.1.27",
5659
"react-lottie-player": "^2.0.0",
5760
"react-router-dom": "^6.24.0",
61+
"react-time-picker": "^7.0.0",
5862
"shelljs": "^0.8.5",
5963
"styled-components": "^6.1.11",
6064
"styled-reset": "^4.5.2",
@@ -77,6 +81,7 @@
7781
"@storybook/react": "^8.1.11",
7882
"@storybook/react-vite": "^8.1.11",
7983
"@storybook/test": "^8.1.11",
84+
"@types/lodash": "^4",
8085
"@types/prettier-linter-helpers": "^1",
8186
"@types/qs": "^6",
8287
"@types/react": "^18.3.3",

‎public/svgs/beat_map_marker.svg

Lines changed: 6 additions & 0 deletions
Loading

‎public/svgs/icon_search.svg

Lines changed: 5 additions & 0 deletions
Loading

‎public/svgs/kakao_map_arrow.svg

Lines changed: 6 additions & 0 deletions
Loading

‎src/apis/domains/admins/api.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { put } from "@apis/index";
22
import { components } from "@typings/api/schema";
33

4-
export type SuccessResponse = components["schemas"]["SuccessResponse"];
4+
export type SuccessResponse = components["schemas"]["SuccessResponseVoid"];
55

66
// 캐러셀 수정 API (PUT)
77
export const updateCarousel = async (formData): Promise<SuccessResponse | null> => {

‎src/apis/domains/home/api.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { components } from "@typings/api/schema";
33
import { ApiResponseType } from "@typings/commonType";
44
import { AxiosResponse } from "axios";
55

6-
type HomeResponse = components["schemas"]["HomeResponse"];
6+
type HomeResponse = components["schemas"]["HomeFindAllResponse"];
77

88
// 1. API 요청 함수 작성 및 타입 추가
99
export const getAllScheduleList = async (): Promise<HomeResponse | null> => {

‎src/assets/svgs/BeatMapMarker.tsx

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import * as React from "react";
2+
import type { SVGProps } from "react";
3+
const SvgBeatMapMarker = (props: SVGProps<SVGSVGElement>) => (
4+
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 31" {...props}>
5+
<path
6+
fill="#FB247F"
7+
d="M3.434 3.434c4.579-4.579 12.002-4.579 16.581 0a11.724 11.724 0 0 1 1.155 15.237l-8.2 11.15c-.618.84-1.873.84-2.491 0l-8.2-11.15A11.724 11.724 0 0 1 3.434 3.434"
8+
/>
9+
<circle cx={12} cy={12} r={5} fill="#fff" />
10+
</svg>
11+
);
12+
export default SvgBeatMapMarker;

‎src/assets/svgs/IconSearch.tsx

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import * as React from "react";
2+
import type { SVGProps } from "react";
3+
const SvgIconSearch = (props: SVGProps<SVGSVGElement>) => (
4+
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" {...props}>
5+
<path
6+
fill="#F4F4F4"
7+
fillRule="evenodd"
8+
d="M6.964 6.964a5 5 0 1 1 7.072 7.071 5 5 0 0 1-7.072-7.07m-1.06-1.06a6.5 6.5 0 0 0 8.631 9.692l3.934 3.934a.75.75 0 1 0 1.06-1.06l-3.934-3.934a6.5 6.5 0 0 0-9.691-8.632"
9+
clipRule="evenodd"
10+
/>
11+
</svg>
12+
);
13+
export default SvgIconSearch;

‎src/assets/svgs/KakaoMapArrow.tsx

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import * as React from "react";
2+
import type { SVGProps } from "react";
3+
const SvgKakaoMapArrow = (props: SVGProps<SVGSVGElement>) => (
4+
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 18 18" {...props}>
5+
<circle cx={9} cy={9} r={9} fill="#626262" />
6+
<path
7+
fill="#fff"
8+
d="M12.57 6a.5.5 0 0 0-.5-.5h-4.5a.5.5 0 0 0 0 1h4v4a.5.5 0 0 0 1 0zm-6.146 6.354 6-6-.707-.708-6 6z"
9+
/>
10+
</svg>
11+
);
12+
export default SvgKakaoMapArrow;

0 commit comments

Comments
 (0)