From 9f2b48d2843633e59f2170676596d86b6a954f54 Mon Sep 17 00:00:00 2001 From: Kangnets Date: Thu, 10 Oct 2024 05:04:17 +0900 Subject: [PATCH 1/2] =?UTF-8?q?feat=20:=20=EC=B1=84=EB=84=90=ED=86=A1,=20?= =?UTF-8?q?=EC=B9=B4=ED=86=A1,=20=EC=9D=B8=EC=8A=A4=ED=83=80,=20=EC=9C=A0?= =?UTF-8?q?=ED=8A=9C=EB=B8=8C=20=EC=97=B0=EA=B2=B0=20=EB=B2=84=ED=8A=BC=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 43 ++++++++++++++++++++++++ src/assets/image/channel_talk.svg | 7 ++++ src/components/Floating/Floating.tsx | 14 ++------ src/pages/main/containers/CounselBtn.tsx | 22 ++++++++++++ src/pages/main/page.tsx | 3 ++ 5 files changed, 78 insertions(+), 11 deletions(-) create mode 100644 src/assets/image/channel_talk.svg create mode 100644 src/pages/main/containers/CounselBtn.tsx diff --git a/index.html b/index.html index 0a1dccf7..03e45e0b 100644 --- a/index.html +++ b/index.html @@ -37,6 +37,49 @@ } })(window.location); + +
diff --git a/src/assets/image/channel_talk.svg b/src/assets/image/channel_talk.svg new file mode 100644 index 00000000..7ba6c248 --- /dev/null +++ b/src/assets/image/channel_talk.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/components/Floating/Floating.tsx b/src/components/Floating/Floating.tsx index b3547f16..c901a10b 100644 --- a/src/components/Floating/Floating.tsx +++ b/src/components/Floating/Floating.tsx @@ -3,24 +3,16 @@ import { linkPaths, iconPaths } from './const'; interface FloatingIconProps { icon: 'kakao' | 'insta' | 'youtube'; fill?: string; - size?: string; viewBox: string; path: 'kakaoLink' | 'instaLink' | 'youtubeLink'; } -const FloatingIcon = ({ icon, fill = '#ffffff', size = '34px', viewBox, path }: FloatingIconProps) => ( +const FloatingIcon = ({ icon, fill = '#ffffff', viewBox, path }: FloatingIconProps) => ( - + diff --git a/src/pages/main/containers/CounselBtn.tsx b/src/pages/main/containers/CounselBtn.tsx new file mode 100644 index 00000000..42de018e --- /dev/null +++ b/src/pages/main/containers/CounselBtn.tsx @@ -0,0 +1,22 @@ +import Channel from '@/assets/image/channel_talk.svg'; +import { InstaFloating, KakaoFloating, YoutubeFloating } from '@/components/Floating/Floating'; +import { Spacing } from '@/components/Spacing'; + +export function CounselBtn() { + return ( +
+
+ + + + + + + + +
+
+ ); +} diff --git a/src/pages/main/page.tsx b/src/pages/main/page.tsx index f64b9f59..ce2dbe6f 100644 --- a/src/pages/main/page.tsx +++ b/src/pages/main/page.tsx @@ -5,6 +5,7 @@ import PetitionSection from './containers/PetitionSection'; import { Spacing } from '@/components/Spacing'; import LostArticleSection from './containers/LostArticleSection'; import CampusMapSection from './containers/CampusMapSection'; +import { CounselBtn } from './containers/CounselBtn'; export function MainPage() { return ( @@ -12,6 +13,8 @@ export function MainPage() {
+ +
From 6f4c00afa8ad9324c5a31ba042d92b69c1e98d90 Mon Sep 17 00:00:00 2001 From: Kangnets Date: Thu, 10 Oct 2024 05:12:13 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix=20:=20=EC=B1=84=EB=84=90=ED=86=A1,=20?= =?UTF-8?q?=EC=B9=B4=ED=86=A1,=20=EC=9D=B8=EC=8A=A4=ED=83=80,=20=EC=9C=A0?= =?UTF-8?q?=ED=8A=9C=EB=B8=8C=20=EC=97=B0=EA=B2=B0=20=EB=B2=84=ED=8A=BC=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20build=20=EC=98=A4=EB=A5=98=20=ED=95=B4?= =?UTF-8?q?=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Floating/Floating.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Floating/Floating.tsx b/src/components/Floating/Floating.tsx index c901a10b..6e39a663 100644 --- a/src/components/Floating/Floating.tsx +++ b/src/components/Floating/Floating.tsx @@ -22,4 +22,4 @@ export const KakaoFloating = () => ; -export const YoutubeFloating = () => ; +export const YoutubeFloating = () => ;