Merge branch 'develop' into feat/#64/editTextField

Author: shinjigu

public/svg/ic_pencil.svg

@@ -0,0 +1,13 @@
+import type { SVGProps } from 'react';
+const SvgIcPencil = (props: SVGProps<SVGSVGElement>) => (
+  <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 40 40" {...props}>
+    <path
+      stroke="#E3E4E5"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+      strokeWidth={2}
+      d="m25.387 8.72 5.892 5.893M27.888 6.22a4.167 4.167 0 1 1 5.892 5.893L10.833 35.059H5v-5.952z"
+    />
+  </svg>
+);
+export default SvgIcPencil;

src/assets/svg/IcPencil.tsx

@@ -5,6 +5,7 @@ export { default as IcDropdown } from './IcDropdown';
 export { default as IcLock } from './IcLock';
 export { default as IcMediumTextdelete } from './IcMediumTextdelete';
 export { default as IcModalDelete } from './IcModalDelete';
+export { default as IcPencil } from './IcPencil';
 export { default as IcRadioChecked } from './IcRadioChecked';
 export { default as IcRadioDefault } from './IcRadioDefault';
 export { default as IcSmallTextdelete } from './IcSmallTextdelete';

src/assets/svg/index.ts

@@ -0,0 +1,13 @@
+import { GradientCircle } from '@/common/component/GradientCircle/GradientCircle';
+
+const GradientBackground = () => {
+  return (
+    <>
+      <GradientCircle variant="topRight" />
+      <GradientCircle variant="bottomLeft1" />
+      <GradientCircle variant="bottomLeft2" />
+    </>
+  );
+};
+
+export default GradientBackground;

src/common/component/Background/GradientBackground.tsx

@@ -3,13 +3,14 @@ import { goButtonContainer, goIcon } from '@/common/component/GoButton/GoButton.
 
 type GoButtonProps = {
   isActive: boolean;
+  onClick?: React.MouseEventHandler<HTMLButtonElement>;
 };
 
-const GoButton = ({ isActive = true }: GoButtonProps) => {
+const GoButton = ({ isActive = true, onClick }: GoButtonProps) => {
   const state = isActive ? 'active' : 'disabled';
 
   return (
-    <button className={goButtonContainer({ state })}>
+    <button className={goButtonContainer({ state })} onClick={onClick}>
       <IcBigNext className={goIcon({ state })} />
     </button>
   );

src/common/component/GoButton/GoButton.tsx

@@ -1,17 +1,28 @@
 import { style } from '@vanilla-extract/css';
 
-export const gridDefault = style({
+const baseGrid = {
   display: 'grid',
   gridTemplateColumns: 'repeat(3, 1fr)',
-  gap: '1.6rem',
-  width: 'fit-content',
+  gap: '1.2rem',
   margin: '0 auto',
-});
-
-export const gridSmall = style({
-  display: 'grid',
-  gridTemplateColumns: 'repeat(3, 1fr)',
-  gap: '2rem',
   width: 'fit-content',
-  margin: '0 auto',
-});
+};
+
+export const grid = {
+  TODO_SUB: style({
+    ...baseGrid,
+    gap: '1rem',
+  }),
+  TODO_MAIN: style({
+    ...baseGrid,
+    gap: '1.6rem',
+  }),
+  TODO_EDIT: style({
+    ...baseGrid,
+    gap: '2rem',
+  }),
+  MY_MANDAL: style({
+    ...baseGrid,
+    gap: '3rem',
+  }),
+};

src/common/component/Mandalart/Mandalart.css.ts

@@ -1,6 +1,6 @@
 import type { Meta, StoryObj } from '@storybook/react-vite';
 
-import Mandalart, { type Cycle } from './Mandalart';
+import Mandalart from './Mandalart';
 import { MOCK_MANDALART_DATA } from './mock';
 
 const meta = {
@@ -13,95 +13,65 @@ const meta = {
     },
   },
   tags: ['autodocs'],
+  argTypes: {
+    type: {
+      control: 'select',
+      options: ['TODO_SUB', 'TODO_MAIN', 'TODO_EDIT', 'MY_MANDAL'],
+    },
+  },
 } satisfies Meta<typeof Mandalart>;
 
 export default meta;
 type Story = StoryObj<typeof meta>;
 
-const CUSTOM_GOALS = {
-  mainGoal: '나인도트 1등하기',
-  subGoals: [
-    {
-      title: '이현준 갈구기',
-      position: 0,
-      cycle: 'DAILY' as Cycle,
-    },
-    {
-      title: '매일 운동하기',
-      position: 1,
-      cycle: 'DAILY' as Cycle,
-    },
-    {
-      title: '일찍 일어나기',
-      position: 2,
-      cycle: 'DAILY' as Cycle,
-    },
-    {
-      title: '계획 세우기',
-      position: 3,
-      cycle: 'WEEKLY' as Cycle,
-    },
-    {
-      title: '시간 관리하기',
-      position: 4,
-      cycle: 'WEEKLY' as Cycle,
-    },
-    {
-      title: '건강 관리하기',
-      position: 5,
-      cycle: 'DAILY' as Cycle,
-    },
-    {
-      title: '긍정적으로 생각하기',
-      position: 6,
-      cycle: 'DAILY' as Cycle,
-    },
-    {
-      title: '꾸준히 노력하기',
-      position: 7,
-      cycle: 'DAILY' as Cycle,
-    },
-  ],
-  completedGoals: [1, 3, 5],
+export const Default: Story = {
+  args: {
+    mainGoal: MOCK_MANDALART_DATA.mainGoal,
+    subGoals: MOCK_MANDALART_DATA.subGoals,
+    type: 'TODO_MAIN',
+  },
 };
 
-export const Default: Story = {
+export const AllTypes: Story = {
   args: {
-    mainGoal: '메인 목표를 입력하세요',
+    mainGoal: MOCK_MANDALART_DATA.mainGoal,
     subGoals: MOCK_MANDALART_DATA.subGoals,
+    type: 'TODO_MAIN',
   },
-  render: (args) => (
-    <div style={{ display: 'flex', gap: '2rem' }}>
+  render: () => (
+    <div style={{ display: 'flex', flexDirection: 'column', gap: '4rem' }}>
       <div>
-        <h3 style={{ color: 'white', marginBottom: '1rem' }}>Default 사이즈</h3>
-        <Mandalart {...args} />
+        <h3 style={{ marginBottom: '1rem' }}>TODO_SUB (96px)</h3>
+        <Mandalart
+          mainGoal={MOCK_MANDALART_DATA.mainGoal}
+          subGoals={MOCK_MANDALART_DATA.subGoals}
+          type="TODO_SUB"
+        />
       </div>
       <div>
-        <h3 style={{ color: 'white', marginBottom: '1rem' }}>Small 사이즈</h3>
-        <Mandalart {...args} size="small" />
+        <h3 style={{ marginBottom: '1rem' }}>TODO_MAIN (196px)</h3>
+        <Mandalart
+          mainGoal={MOCK_MANDALART_DATA.mainGoal}
+          subGoals={MOCK_MANDALART_DATA.subGoals}
+          type="TODO_MAIN"
+        />
+      </div>
+      <div>
+        <h3 style={{ marginBottom: '1rem' }}>TODO_EDIT (160px)</h3>
+        <Mandalart
+          mainGoal={MOCK_MANDALART_DATA.mainGoal}
+          subGoals={MOCK_MANDALART_DATA.subGoals}
+          type="TODO_EDIT"
+        />
+      </div>
+      <div>
+        <h3 style={{ marginBottom: '1rem' }}>MY_MANDAL (298px)</h3>
+        <Mandalart
+          mainGoal={MOCK_MANDALART_DATA.mainGoal}
+          subGoals={MOCK_MANDALART_DATA.subGoals}
+          type="MY_MANDAL"
+        />
       </div>
     </div>
   ),
 };
-
-export const Small: Story = {
-  args: {
-    mainGoal: '메인 목표를 입력하세요',
-    subGoals: CUSTOM_GOALS.subGoals,
-    size: 'small',
-  },
-  render: (args) => <Mandalart {...args} />,
-};
-
-export const WithCustomGoals: Story = {
-  args: CUSTOM_GOALS,
-  render: (args) => <Mandalart {...args} />,
-};
-
-export const WithCustomGoalsSmall: Story = {
-  args: {
-    ...CUSTOM_GOALS,
-    size: 'small',
-  },
-  render: (args) => <Mandalart {...args} />,
-};

src/common/component/Mandalart/Mandalart.stories.tsx

@@ -1,11 +1,11 @@
 import { useState } from 'react';
 
-import { Square } from './Square';
+import { Main, Sub } from './Square';
 import * as styles from './Mandalart.css';
 import { MOCK_MANDALART_DATA } from './mock';
 
 export type Cycle = 'DAILY' | 'WEEKLY' | 'ONCE';
-export type MandalartSize = 'small' | 'default';
+export type MandalartType = 'TODO_SUB' | 'TODO_MAIN' | 'TODO_EDIT' | 'MY_MANDAL';
 
 export interface SubGoal {
   title: string;
@@ -16,37 +16,40 @@ export interface SubGoal {
 interface MandalartProps {
   mainGoal?: string;
   subGoals?: SubGoal[];
-  size?: MandalartSize;
+  type: MandalartType;
+  onGoalClick?: (position: number) => void;
 }
 
 const CENTER_INDEX = 4;
 
 const Mandalart = ({
   mainGoal = MOCK_MANDALART_DATA.mainGoal,
   subGoals = MOCK_MANDALART_DATA.subGoals,
-  size = 'default',
+  type,
+  onGoalClick,
 }: MandalartProps) => {
   const [selectedGoal, setSelectedGoal] = useState<number | null>(null);
 
   const handleGoalClick = (position: number) => {
     setSelectedGoal(selectedGoal === position ? null : position);
+    onGoalClick?.(position);
   };
 
   const renderSquare = (index: number) => {
     if (index === CENTER_INDEX) {
-      return <Square.Main key={index} content={mainGoal} size={size} />;
+      return <Main key={index} content={mainGoal} type={type} />;
     }
 
     const subGoalIndex = index > CENTER_INDEX ? index - 1 : index;
     const subGoal = subGoals[subGoalIndex];
 
     return (
-      <Square.Sub
+      <Sub
         key={index}
         content={subGoal.title}
         isCompleted={selectedGoal === subGoalIndex}
         onClick={() => handleGoalClick(subGoalIndex)}
-        size={size}
+        type={type}
       />
     );
   };
@@ -55,7 +58,7 @@ const Mandalart = ({
     .fill(null)
     .map((_, index) => renderSquare(index));
 
-  return <div className={size === 'small' ? styles.gridSmall : styles.gridDefault}>{squares}</div>;
+  return <div className={styles.grid[type]}>{squares}</div>;
 };
 
 export default Mandalart;