hotfix (#75)

depromeet · Aug 31, 2024 · e3defde · e3defde
1 parent 7ef3ef4
commit e3defde
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 27 deletions.
diff --git a/src/app/(sidebar)/my-recruit/containers/components/Card/BoxCard.tsx b/src/app/(sidebar)/my-recruit/containers/components/Card/BoxCard.tsx
@@ -49,7 +49,7 @@ export function BoxCard({
             <div className="flex items-center gap-[4px]">
               <Icon name="clover" size={20} color={color.mint30} />
               <span className="text-white text-label2 ">
-                {nearestSchedule.recruitScheduleStage} D-{dday(nearestSchedule.deadLine)}
+                {nearestSchedule.recruitScheduleStage} D-{dday(nearestSchedule.deadLine) || 'DAY'}
               </span>
             </div>
             <MoreButton onDeleteClick={() => onRecruitDelete(id)} />

diff --git a/src/app/(sidebar)/my-recruit/containers/components/Card/RowCard.tsx b/src/app/(sidebar)/my-recruit/containers/components/Card/RowCard.tsx
@@ -53,7 +53,7 @@ export function RowCard({
             <div className="px-6 py-4 rounded-[4px] bg-neutral-95 flex gap-[2px]">
               <Icon name="clover" size={20} color={color.mint30} />
               <span className="text-white text-label2 ">
-                {nearestSchedule?.recruitScheduleStage} D-{dday(nearestSchedule?.deadLine!)}
+                {nearestSchedule?.recruitScheduleStage} D-{dday(nearestSchedule?.deadLine!) || 'DAY'}
               </span>
             </div>
           </If>

diff --git a/src/app/(sidebar)/my-recruit/containers/components/RocketIcon.tsx b/src/app/(sidebar)/my-recruit/containers/components/RocketIcon.tsx
@@ -1,29 +1,15 @@
 export function RocketIcon() {
   return (
-    <svg xmlns="http://www.w3.org/2000/svg" width="25" height="24" viewBox="0 0 25 24" fill="none">
+    <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+      <path d="M11.5 24V16.5L16.5 14V20.5L11.5 24Z" fill="#186D50" />
+      <path d="M3 7.5L10 8L8 12L0 13L3 7.5Z" fill="#186D50" />
+      <path d="M8.5 6.5L6 14L10 17.5L17 15.5L22 10.5L15 1.5L8.5 6.5Z" fill="#2DC98E" />
       <path
-        d="M5.96597 8.72214L9.38174 8.44054C10.0846 8.3826 10.625 9.05091 10.4212 9.7261L9.41491 13.0604C9.30459 13.426 8.99576 13.6968 8.61895 13.7584L2.75305 14.7177C1.83139 14.8684 1.22448 13.7856 1.83404 13.0781L5.29052 9.06605C5.46182 8.86722 5.70442 8.7437 5.96597 8.72214Z"
-        fill="#227355"
-      />
-      <path
-        d="M15.5354 18.8764L16.0195 15.4834C16.1192 14.7852 15.4841 14.2061 14.798 14.3693L11.4098 15.1757C11.0383 15.2641 10.7497 15.5563 10.6658 15.9288L9.35956 21.7273C9.15433 22.6384 10.1991 23.3086 10.9416 22.7422L15.152 19.5302C15.3607 19.3711 15.4984 19.1362 15.5354 18.8764Z"
-        fill="#227355"
-      />
-      <path
-        d="M3.8469 17.0758C4.28647 16.3314 4.84961 15.8712 5.38957 15.5807C6.27947 15.1018 7.33952 15.5226 8.03326 16.2574L8.62172 16.8807C9.25642 17.5529 9.60438 18.5114 9.19472 19.3402C7.73075 22.3021 3.3711 22.8071 0.710938 21.0722C1.01451 21.2114 2.0993 21.0592 2.74692 20.2444C3.55644 19.226 2.67518 19.0602 3.8469 17.0758Z"
-        fill="#8BEDC9"
-      />
-      <path
-        d="M12.3416 4.83625C9.17695 7.54588 8.34772 10.8284 8.0179 13.1444C7.8669 14.2048 8.24335 15.272 8.97842 16.051C9.42636 16.5257 9.99135 16.8851 10.638 16.9738C12.6492 17.2496 16.432 17.0677 19.911 13.6445C25.1267 8.51252 24.6566 2.25744 23.9062 1.87667C23.1558 1.49591 17.3997 0.505411 12.3416 4.83625Z"
-        fill="#43C595"
-      />
-      <circle cx="15.002" cy="10.0117" r="2.79102" fill="#98F9D5" />
-      <path
-        fillRule="evenodd"
-        clipRule="evenodd"
-        d="M23.0277 9.31775C21.8367 9.06945 20.6116 8.47759 19.5283 7.55348C17.7628 6.04736 16.8094 4.03009 16.8365 2.24619C20.3499 1.03501 23.3755 1.60787 23.9054 1.87673C24.4502 2.15319 24.8472 5.52622 23.0277 9.31775Z"
-        fill="#227355"
+        d="M7.69189 18.6236L5.76892 17.0852L2.69216 17.8544L2.30757 20.5466L0 21.3157L3.84595 22.8541L6.53811 21.7003L7.69189 18.6236Z"
+        fill="#A2F1D6"
       />
+      <path d="M24 1.5L22 10.5L18 6.5L15 1.5L21.5 0L24 1.5Z" fill="#186D50" />
+      <path d="M11 11.5L11.5 8.5L15 7L17 9L16.5 12L13 13L11 11.5Z" fill="#A2F1D6" />
     </svg>
   );
 }
diff --git a/src/components/LogoOnlyLeaf.tsx b/src/components/LogoOnlyLeaf.tsx
@@ -0,0 +1,37 @@
+export function LogoOnlyLeaf() {
+  return (
+    <svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 40 40" fill="none">
+      <path d="M9.61446 31.8391L12.8291 25.9752L6.07856 27.5573L9.61446 31.8391Z" fill="#20E79D" />
+      <path
+        d="M19.1241 13.5988L18.7902 10.698L22.3869 7.65377L27.7351 9.94332L29.9587 12.6168L28.3767 15.6428L31.3038 15.6454L33.4344 19.6281L32.2475 25.1459L28.7378 26.4645L25.5844 25.3001L24.4575 28.8142L21.46 30.6541L15.781 28.163L16.0244 23.8631L12.0755 22.7081L10.7042 19.4354L12.0696 13.088L16.0115 11.9774L19.1241 13.5988Z"
+        fill="#20E79D"
+      />
+      <path
+        opacity="0.9"
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M26.8966 22.4263L23.8677 20.8393L24.3544 19.6473L27.5699 20.6407L26.8966 22.4263Z"
+        fill="#007D4F"
+      />
+      <path
+        opacity="0.9"
+        d="M22.3477 17.4978L23.1138 14.3763L24.9044 14.9625L23.5674 17.9102L22.3477 17.4978Z"
+        fill="#007D4F"
+      />
+      <path
+        opacity="0.9"
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M19.8625 19.5017L16.4868 18.7446L16.9398 17.2274L20.1467 18.3539L19.8625 19.5017Z"
+        fill="#007D4F"
+      />
+      <path
+        opacity="0.9"
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M22.4531 21.3669L21.8421 24.3953L20.1338 24.1233L21.2132 21.0199L22.4531 21.3669Z"
+        fill="#007D4F"
+      />
+    </svg>
+  );
+}
diff --git a/src/container/Sidebar/Collapsible/CollapsibleArrowButton.tsx b/src/container/Sidebar/Collapsible/CollapsibleArrowButton.tsx
@@ -9,7 +9,7 @@ export function CollapsibleArrowButton() {
     <motion.div className="relative" whileTap="touch" whileHover="hover" variants={{ touch: { scale: 0.96 } }}>
       <motion.div
         variants={{ hover: { backgroundColor: '#27282C' } }}
-        className="absolute w-[100%] h-[100%] top-[50%] left-[50%] translate-x-[-50%] translate-y-[-50%] rounded-[6px]"
+        className="z-[-1] absolute w-[100%] h-[100%] top-[50%] left-[50%] translate-x-[-50%] translate-y-[-50%] rounded-[6px]"
       />
       <motion.div
         variants={{

diff --git a/src/container/Sidebar/Sidebar.tsx b/src/container/Sidebar/Sidebar.tsx
@@ -2,7 +2,6 @@
 
 import { useGetCardTypeCount } from '@/app/(sidebar)/(my-info)/apis/useGetCardTypeCount';
 import { useGetRecruitTitles } from '@/app/(sidebar)/my-recruit/api/useGetRecruitTitles';
-import { Logo } from '@/components/Logo';
 import { TouchButton } from '@/components/TouchButton';
 import { SidebarButton } from '@/container/Sidebar/SidebarButton';
 import { MY_INFO_PATH, MY_RECRUIT_PATH } from '@/route';
@@ -18,6 +17,7 @@ import { usePathname, useRouter } from 'next/navigation';
 import { PropsWithChildren, useState } from 'react';
 import { Collapsible } from './Collapsible/Collapsible';
 import { useNotificationContext } from '@/components/Notification/context';
+import { LogoOnlyLeaf } from '@/components/LogoOnlyLeaf';
 
 export function Sidebar() {
   const router = useRouter();
@@ -59,7 +59,7 @@ export function Sidebar() {
       className={`z-[10000] relative shrink-0 flex flex-col px-[16px] py-[32px] h-screen bg-black`}>
       <div className="flex relative mb-[32px]">
         <TouchButton onClick={() => router.push(MY_INFO_PATH)}>
-          <Logo />
+          <LogoOnlyLeaf />
         </TouchButton>
         <button
           aria-label={expanded ? '사이드바 축소' : '사이드바 확장'}