From ef5df9b08a22d3fafe7f1ed6ea8cca4c037a06b9 Mon Sep 17 00:00:00 2001
From: JAESEON PARK <ddorri83@naver.com>
Date: Tue, 24 Feb 2026 03:39:46 +0900
Subject: [PATCH 01/21] =?UTF-8?q?feat:=20=EC=9B=8C=ED=81=AC=EC=8A=A4?=
 =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=8A=A4=20UI=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/icon/workspace/Vector.svg          |   5 +
 src/assets/icon/workspace/plus.svg            |   1 +
 src/assets/icon/workspace/search.svg          |   1 +
 .../common/dropdownmenu/DropdownMenu.tsx      |   2 +-
 src/pages/workspace/Workspace.tsx             | 152 +++++++++++++++++-
 src/pages/workspace/WorkspaceSetting.tsx      |   3 +
 src/types/workspace/workspace.ts              |  10 ++
 7 files changed, 171 insertions(+), 3 deletions(-)
 create mode 100644 src/assets/icon/workspace/Vector.svg
 create mode 100644 src/assets/icon/workspace/plus.svg
 create mode 100644 src/assets/icon/workspace/search.svg
 create mode 100644 src/pages/workspace/WorkspaceSetting.tsx
 create mode 100644 src/types/workspace/workspace.ts

diff --git a/src/assets/icon/workspace/Vector.svg b/src/assets/icon/workspace/Vector.svg
new file mode 100644
index 0000000..62803d8
--- /dev/null
+++ b/src/assets/icon/workspace/Vector.svg
@@ -0,0 +1,5 @@
+<svg width="18" height="4" viewBox="0 0 18 4" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9 3C9.55228 3 10 2.55228 10 2C10 1.44772 9.55228 1 9 1C8.44772 1 8 1.44772 8 2C8 2.55228 8.44772 3 9 3Z" stroke="#546171" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M16 3C16.5523 3 17 2.55228 17 2C17 1.44772 16.5523 1 16 1C15.4477 1 15 1.44772 15 2C15 2.55228 15.4477 3 16 3Z" stroke="#546171" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M2 3C2.55228 3 3 2.55228 3 2C3 1.44772 2.55228 1 2 1C1.44772 1 1 1.44772 1 2C1 2.55228 1.44772 3 2 3Z" stroke="#546171" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/assets/icon/workspace/plus.svg b/src/assets/icon/workspace/plus.svg
new file mode 100644
index 0000000..a644997
--- /dev/null
+++ b/src/assets/icon/workspace/plus.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 24 24" width="24px" height="24px" fill-rule="evenodd"><path fill-rule="evenodd" d="M 11 2 L 11 11 L 2 11 L 2 13 L 11 13 L 11 22 L 13 22 L 13 13 L 22 13 L 22 11 L 13 11 L 13 2 Z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icon/workspace/search.svg b/src/assets/icon/workspace/search.svg
new file mode 100644
index 0000000..06ca731
--- /dev/null
+++ b/src/assets/icon/workspace/search.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 30 30" width="30px" height="30px"><path d="M 13 3 C 7.4889971 3 3 7.4889971 3 13 C 3 18.511003 7.4889971 23 13 23 C 15.396508 23 17.597385 22.148986 19.322266 20.736328 L 25.292969 26.707031 A 1.0001 1.0001 0 1 0 26.707031 25.292969 L 20.736328 19.322266 C 22.148986 17.597385 23 15.396508 23 13 C 23 7.4889971 18.511003 3 13 3 z M 13 5 C 17.430123 5 21 8.5698774 21 13 C 21 17.430123 17.430123 21 13 21 C 8.5698774 21 5 17.430123 5 13 C 5 8.5698774 8.5698774 5 13 5 z"/></svg>
\ No newline at end of file
diff --git a/src/components/common/dropdownmenu/DropdownMenu.tsx b/src/components/common/dropdownmenu/DropdownMenu.tsx
index 501c258..3a6c635 100644
--- a/src/components/common/dropdownmenu/DropdownMenu.tsx
+++ b/src/components/common/dropdownmenu/DropdownMenu.tsx
@@ -53,7 +53,7 @@ export function DropdownMenu({
         <div
           id="dropdown-menu"
           role="menu"
-          className="absolute left-0 mt-2 w-72 rounding-15 bg-brand-200 py-3 px-1 shadow-Medium"
+          className="absolute right-0 mt-2 w-56 max-w-[calc(100vw-40px)] rounding-15 bg-brand-200 py-3 px-1 shadow-Medium z-50"
         >
           <div className="space-y-1">
             {items.map((it, idx) => (
diff --git a/src/pages/workspace/Workspace.tsx b/src/pages/workspace/Workspace.tsx
index 9d0ebac..a31a505 100644
--- a/src/pages/workspace/Workspace.tsx
+++ b/src/pages/workspace/Workspace.tsx
@@ -1,3 +1,151 @@
-export default function Workspace() {
-  return <div>Workspace</div>;
+import { useMemo, useState } from "react";
+import { useNavigate } from "react-router-dom";
+
+import type { TWorkspace } from "@/types/workspace/workspace";
+
+import Button from "@/components/common/button/Button";
+import {
+  DropdownMenu,
+  type TMenuItem,
+} from "@/components/common/dropdownmenu/DropdownMenu";
+import Input from "@/components/common/input/Input";
+
+import PlusIcon from "@/assets/icon/workspace/plus.svg?react";
+import SearchIcon from "@/assets/icon/workspace/search.svg?react";
+import VectorIcon from "@/assets/icon/workspace/Vector.svg?react";
+
+export default function WorkspacePage() {
+  const navigate = useNavigate();
+
+  const [query, setQuery] = useState("");
+  // const [createOpen, setCreateOpen] = useState(false);
+
+  // const [newName, setNewName] = useState("");
+  // const [newIntro, setNewIntro] = useState("");
+  const workspaces: TWorkspace[] = useMemo(
+    () => [
+      {
+        id: "1",
+        name: "광고회사1",
+        description: "광고회사1입니다.",
+        myRole: "admin",
+      },
+      {
+        id: "2",
+        name: "광고회사2",
+        description: "광고회사2입니다.",
+        myRole: "admin",
+      },
+      {
+        id: "3",
+        name: "광고회사3",
+        description: "광고회사3입니다.",
+        myRole: "admin",
+      },
+    ],
+    [],
+  );
+  const filtered = useMemo(() => {
+    const q = query.trim().toLowerCase();
+    if (!q) return workspaces;
+    return workspaces.filter((w) => w.name.toLowerCase().includes(q));
+  }, [query, workspaces]);
+
+  const menuItems = (id: TWorkspace["id"]): TMenuItem[] => [
+    {
+      label: "정보 수정하기",
+      onClick: () => {
+        void navigate(`/workspace/${id}/settings`);
+      },
+    },
+    {
+      label: "멤버 관리",
+      onClick: () => alert("멤버 관리 기능은 추후 연결 예정"),
+    },
+  ];
+  // const onOpenCreate = () => {
+  //   setNewName("");
+  //   setNewIntro("");
+  //   setCreateOpen(true);
+  // };
+
+  //TODO: API 연동 후에 생성 동작 연결하기
+  // const onSubmitCreate = () => {
+  //   alert("API 연동 후에 생성 기능 연결예정");
+  // };
+
+  return (
+    <section className="p-8">
+      <header className="mb-7">
+        <h1 className="font-heading2 text-text-main">워크 스페이스 관리</h1>
+        <p className="font-body1 text-text-sub">
+          워크스페이스 정보를 확인하고 관리하세요.
+        </p>
+      </header>
+      <div className="mb-6 flex items-center gap-4">
+        <div className="flex-1">
+          <Input
+            placeholder="조직을 검색하세요"
+            value={query}
+            onChange={(e) => setQuery(e.target.value)}
+            rightElement={<SearchIcon className="w-6 h-6 fill-chart-3" />}
+          />
+        </div>
+        <Button
+          // onClick={onOpenCreate}
+          size="big"
+          variant="primary"
+          className="bg-chart-3 flex shrink-0 whitespace sm:w-auto w-full"
+        >
+          <PlusIcon className="w-3 h-3 fill-white" />
+          <span>워크스페이스 생성하기</span>
+        </Button>
+      </div>
+      <div className="space-y-5">
+        {filtered.map((w) => (
+          <div
+            key={String(w.id)}
+            className="flex items-center justify-between rounded-component-md bg-white px-6 py-5 shadow-sm border border-gray-100"
+          >
+            <div className="flex items-center gap-5 min-w-0">
+              <div className="w-20 h-20 bg-gray-200 shrink-0 rounded-component-sm">
+                {/* TODO: 스타일 확인을 위해 bg-gray-200넣어둠. API연동할때 삭제예정 */}
+                {w.logoUrl}
+              </div>
+              <div className="min-w-0">
+                <div className="font-heading3 text-text-main truncate">
+                  {w.name}
+                </div>
+                <div className="font-body1 text-text-main mt-1 truncate">
+                  {w.description ?? ""}
+                </div>
+                <div className="font-body1 text-text-sub mt-2">
+                  {w.myRole ?? "내 직책 및 역할"}
+                </div>
+              </div>
+            </div>
+            <div className="flex items-center gap-4 shrink-0">
+              <DropdownMenu
+                trigger={
+                  <button
+                    type="button"
+                    aria-label="워크스페이스 메뉴"
+                    className="h-10 w-10 rounded-xl hover:bg-gray-100 transition-colors flex items-center justify-center"
+                  >
+                    <VectorIcon />
+                  </button>
+                }
+                items={menuItems(w.id)}
+              />
+            </div>
+          </div>
+        ))}
+        {filtered.length === 0 && (
+          <div className="rounded-component-lg bg-white p-10 text-center border border-gray-100">
+            <p className="font-body2 text-text-sub">워크스페이스가 없습니다.</p>
+          </div>
+        )}
+      </div>
+    </section>
+  );
 }
diff --git a/src/pages/workspace/WorkspaceSetting.tsx b/src/pages/workspace/WorkspaceSetting.tsx
new file mode 100644
index 0000000..2697171
--- /dev/null
+++ b/src/pages/workspace/WorkspaceSetting.tsx
@@ -0,0 +1,3 @@
+export default function WorkspaceSetting() {
+  return <div>workspace settings</div>;
+}
diff --git a/src/types/workspace/workspace.ts b/src/types/workspace/workspace.ts
new file mode 100644
index 0000000..dd64460
--- /dev/null
+++ b/src/types/workspace/workspace.ts
@@ -0,0 +1,10 @@
+export type TWorkSpaceId = string;
+export type TWorkspace = {
+  id: TWorkSpaceId;
+  name: string;
+  description: string;
+  url?: string | null;
+  logoUrl?: string | null;
+  myRole: string;
+  representativeName?: string; //figma에서는 대표명. erd에서는 없어서 일단 보류. 빼도될듯
+};

From 06b198156cd245989a3ef63917d3e3caa7008519 Mon Sep 17 00:00:00 2001
From: JAESEON PARK <ddorri83@naver.com>
Date: Tue, 24 Feb 2026 14:39:55 +0900
Subject: [PATCH 02/21] =?UTF-8?q?feat:=20=EC=9B=8C=ED=81=AC=EC=8A=A4?=
 =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=8A=A4=20=EC=83=9D=EC=84=B1=20=EB=AA=A8?=
 =?UTF-8?q?=EB=8B=AC=20UI=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/icon/workspace/uploadImg.svg |  3 +
 src/components/common/input/Input.tsx   | 16 ++---
 src/pages/workspace/Workspace.tsx       | 95 +++++++++++++++++++++----
 3 files changed, 90 insertions(+), 24 deletions(-)
 create mode 100644 src/assets/icon/workspace/uploadImg.svg

diff --git a/src/assets/icon/workspace/uploadImg.svg b/src/assets/icon/workspace/uploadImg.svg
new file mode 100644
index 0000000..37c18ee
--- /dev/null
+++ b/src/assets/icon/workspace/uploadImg.svg
@@ -0,0 +1,3 @@
+<svg width="23" height="20" viewBox="0 0 23 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4.28368 18.7942L14.2958 10.2162L19.0074 14.5052M4.28368 18.7942H16.0626C18.0142 18.7942 19.5963 17.354 19.5963 15.5774V10.2162M4.28368 18.7942C2.33208 18.7942 0.75 17.354 0.75 15.5774V4.855C0.75 3.07845 2.33208 1.63828 4.28368 1.63828H11.94M18.4184 6.81552L18.4184 3.78276M18.4184 3.78276L18.4184 0.75M18.4184 3.78276L15.0868 3.78276M18.4184 3.78276L21.75 3.78276M7.81736 6.46337C7.81736 7.35165 7.02632 8.07173 6.05052 8.07173C5.07472 8.07173 4.28368 7.35165 4.28368 6.46337C4.28368 5.57509 5.07472 4.855 6.05052 4.855C7.02632 4.855 7.81736 5.57509 7.81736 6.46337Z" stroke="#C3C3C3" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/components/common/input/Input.tsx b/src/components/common/input/Input.tsx
index 55537ea..5a68e5d 100644
--- a/src/components/common/input/Input.tsx
+++ b/src/components/common/input/Input.tsx
@@ -39,34 +39,28 @@ const Input = forwardRef<HTMLInputElement, IInputProps>(
 
     return (
       <div
-        className={twMerge(
-          "flex flex-col w-full gap-2 relative",
-          wrapperClassName,
-        )}
+        className={twMerge("flex flex-col w-full relative", wrapperClassName)}
       >
         {label && (
-          <label
-            htmlFor={inputId}
-            className="font-label text-brand-900 select-none ml-1 mb-2"
-          >
+          <label htmlFor={inputId} className="text-text-main select-none ml-1">
             {label}
           </label>
         )}
         <div
           className={twMerge(
-            "flex items-center w-full h-input bg-gray-50 border-transparent rounded-component-lg transition-smooth overflow-hidden",
+            "flex items-center w-full h-input bg-gray-50 border-transparent rounded-component-md transition-colors duration-200 ease-out overflow-hidden",
             error
               ? "ring-2 ring-status-red bg-status-red/5"
               : success
                 ? "ring-2 ring-logo-1 bg-white"
-                : "hover:bg-gray-100 focus-within:bg-white focus-within:ring-2 focus-within:ring-logo-1/30",
+                : "hover:bg-gray-100 focus-within:bg-white focus-within:ring-2 focus-within:ring-logo-1/30 focus-within:border-transparent",
             containerClassName,
           )}
         >
           <input
             ref={ref}
             className={twMerge(
-              "flex-1 h-full w-full bg-transparent border-none outline-none text-body1 text-brand-900 placeholder:text-text-placeholder px-5",
+              "flex-1 h-full w-full bg-transparent border-none outline-none text-body1 text-text-main placeholder:text-text-placeholder px-5",
               "disabled:bg-gray-100 disabled:cursor-not-allowed disabled:text-text-disabled",
               rightElement ? "pr-2" : "",
               inputClassName,
diff --git a/src/pages/workspace/Workspace.tsx b/src/pages/workspace/Workspace.tsx
index a31a505..82cf562 100644
--- a/src/pages/workspace/Workspace.tsx
+++ b/src/pages/workspace/Workspace.tsx
@@ -9,19 +9,21 @@ import {
   type TMenuItem,
 } from "@/components/common/dropdownmenu/DropdownMenu";
 import Input from "@/components/common/input/Input";
+import Modal from "@/components/common/modal/Modal";
 
 import PlusIcon from "@/assets/icon/workspace/plus.svg?react";
 import SearchIcon from "@/assets/icon/workspace/search.svg?react";
+import UpLoadImgIcon from "@/assets/icon/workspace/uploadImg.svg?react";
 import VectorIcon from "@/assets/icon/workspace/Vector.svg?react";
 
 export default function WorkspacePage() {
   const navigate = useNavigate();
 
   const [query, setQuery] = useState("");
-  // const [createOpen, setCreateOpen] = useState(false);
+  const [createOpen, setCreateOpen] = useState(false);
 
-  // const [newName, setNewName] = useState("");
-  // const [newIntro, setNewIntro] = useState("");
+  const [newName, setNewName] = useState("");
+  const [newDesc, setNewDesc] = useState("");
   const workspaces: TWorkspace[] = useMemo(
     () => [
       {
@@ -63,16 +65,16 @@ export default function WorkspacePage() {
       onClick: () => alert("멤버 관리 기능은 추후 연결 예정"),
     },
   ];
-  // const onOpenCreate = () => {
-  //   setNewName("");
-  //   setNewIntro("");
-  //   setCreateOpen(true);
-  // };
+  const onOpenCreate = () => {
+    setNewName("");
+    setNewDesc("");
+    setCreateOpen(true);
+  };
 
-  //TODO: API 연동 후에 생성 동작 연결하기
-  // const onSubmitCreate = () => {
-  //   alert("API 연동 후에 생성 기능 연결예정");
-  // };
+  // TODO: API 연동 후에 생성 동작 연결하기
+  const onSubmitCreate = () => {
+    alert("API 연동 후에 생성 기능 연결예정");
+  };
 
   return (
     <section className="p-8">
@@ -92,7 +94,7 @@ export default function WorkspacePage() {
           />
         </div>
         <Button
-          // onClick={onOpenCreate}
+          onClick={onOpenCreate}
           size="big"
           variant="primary"
           className="bg-chart-3 flex shrink-0 whitespace sm:w-auto w-full"
@@ -146,6 +148,73 @@ export default function WorkspacePage() {
           </div>
         )}
       </div>
+      <Modal
+        isOpen={createOpen}
+        onClose={() => setCreateOpen(false)}
+        size="xl"
+        padding="lg"
+        title="워크스페이스 생성"
+      >
+        <div className="px-2">
+          <h2 className="font-heading3 text-text-main mb-2">
+            워크스페이스 생성
+          </h2>
+          <p className="font-body1 text-text-sub mb-6">
+            워크스페이스를 생성한 사용자는 자동으로 관리자 권한을 갖습니다.{" "}
+            <br /> 로고 이미지와 기본 정보를 입력해 주세요.
+          </p>
+          <div className="space-y-6 mx-auto w-full max-w-[800px]">
+            <div className="max-w-[560px] mx-auto w-full mb-10">
+              <div className="flex items-center justify-between mb-2">
+                <div className="font-label text-text-sub">로고 이미지</div>
+                <Button
+                  variant="custom"
+                  className="!h-7 border border-gray-200 text-text-auth-sub px-5 rounded-full bg-white font-body2 hover:bg-gray-100 transition-colors duration-200 ease-in-out"
+                  onClick={() => alert("TODO:추후 업로드")}
+                >
+                  업로드
+                </Button>
+              </div>
+              <div className="rounded-component-lg border border-gray-100 bg-gray-50 h-[260px] flex items-center justify-center">
+                <span className="text-text-sub">
+                  <UpLoadImgIcon />
+                </span>
+              </div>
+            </div>
+
+            <Input
+              label="워크스페이스 이름"
+              placeholder="조직의 이름을 입력하세요."
+              value={newName}
+              onChange={(e) => setNewName(e.target.value)}
+            />
+            <div className="flex flex-col">
+              <label
+                className="text-text-main select-none ml-1"
+                htmlFor="workspace-desc"
+              >
+                워크스페이스 설명
+              </label>
+              <textarea
+                id="workspace-desc"
+                className="w-full min-h-[120px] rounded-component-md bg-gray-50 px-5 py-4 outline-none transition-smooth hover:bg-gray-100 focus:bg-white focus:ring-2 focus:ring-logo-1/30 text-body1 text-text-main placeholder:text-text-placeholder"
+                placeholder="조직에 대한 간단한 설명을 입력하세요."
+                value={newDesc}
+                onChange={(e) => setNewDesc(e.target.value)}
+              />
+            </div>
+            <Button
+              size="big"
+              variant="primary"
+              onClick={onSubmitCreate}
+              disabled={!newName.trim()}
+              className="mx-auto px-10 mt-10"
+            >
+              생성하기
+            </Button>
+          </div>
+        </div>
+      </Modal>
     </section>
   );
 }

From 84dd1932c6586e16fda2fb5fcd171eea479d32a3 Mon Sep 17 00:00:00 2001
From: JAESEON PARK <ddorri83@naver.com>
Date: Tue, 24 Feb 2026 15:11:52 +0900
Subject: [PATCH 03/21] =?UTF-8?q?chore:=20=EB=B2=84=ED=8A=BC=20=EC=B5=9C?=
 =?UTF-8?q?=EC=8B=A0=ED=99=94=EC=A7=84=ED=96=89,=20=EB=B2=84=ED=8A=BC?=
 =?UTF-8?q?=EA=B4=80=EB=A0=A8=20=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=9E=AC?=
 =?UTF-8?q?=EC=A1=B0=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/button/Button.tsx | 2 +-
 src/pages/workspace/Workspace.tsx       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/common/button/Button.tsx b/src/components/common/button/Button.tsx
index 6b56792..57202a1 100644
--- a/src/components/common/button/Button.tsx
+++ b/src/components/common/button/Button.tsx
@@ -70,7 +70,7 @@ export default function Button({
           {leftIcon}
         </span>
       )}
-      <span>{children}</span>
+      {children}
     </button>
   );
 }
diff --git a/src/pages/workspace/Workspace.tsx b/src/pages/workspace/Workspace.tsx
index 82cf562..006a508 100644
--- a/src/pages/workspace/Workspace.tsx
+++ b/src/pages/workspace/Workspace.tsx
@@ -97,10 +97,10 @@ export default function WorkspacePage() {
           onClick={onOpenCreate}
           size="big"
           variant="primary"
-          className="bg-chart-3 flex shrink-0 whitespace sm:w-auto w-full"
+          className="bg-chart-3 flex shrink-0 whitespace-nowrap items-center justify-center gap-2 sm:w-auto w-full"
         >
           <PlusIcon className="w-3 h-3 fill-white" />
-          <span>워크스페이스 생성하기</span>
+          워크스페이스 생성하기
         </Button>
       </div>
       <div className="space-y-5">
@@ -169,7 +169,7 @@ export default function WorkspacePage() {
                 <div className="font-label text-text-sub">로고 이미지</div>
                 <Button
                   variant="custom"
-                  className="!h-7 border border-gray-200 text-text-auth-sub px-5 rounded-full bg-white font-body2 hover:bg-gray-100 transition-colors duration-200 ease-in-out"
+                  className="!h-7 border border-gray-200 text-text-auth-sub px-5 rounded-component-lg bg-white font-body2 hover:bg-gray-100 transition-colors duration-200 ease-in-out"
                   onClick={() => alert("TODO:추후 업로드")}
                 >
                   업로드

From 0a7e81a71f673e43c4586e20fd981ecbe0ab23e4 Mon Sep 17 00:00:00 2001
From: JAESEON PARK <ddorri83@naver.com>
Date: Tue, 24 Feb 2026 15:17:28 +0900
Subject: [PATCH 04/21] =?UTF-8?q?fix:=20workspaceSetting=20=EB=9D=BC?=
 =?UTF-8?q?=EC=9A=B0=ED=8C=85=20=EA=B2=BD=EB=A1=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/workspace/WorkspaceSetting.tsx | 4 ++++
 src/routes/MainRoutes.tsx                | 7 +++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/pages/workspace/WorkspaceSetting.tsx b/src/pages/workspace/WorkspaceSetting.tsx
index 2697171..9f6ab25 100644
--- a/src/pages/workspace/WorkspaceSetting.tsx
+++ b/src/pages/workspace/WorkspaceSetting.tsx
@@ -1,3 +1,7 @@
+import { useNavigate, useParams } from "react-router-dom";
+
 export default function WorkspaceSetting() {
+  const navigate = useNavigate();
+  const { workspaceId } = useParams();
   return <div>workspace settings</div>;
 }
diff --git a/src/routes/MainRoutes.tsx b/src/routes/MainRoutes.tsx
index a73ac75..fc835e3 100644
--- a/src/routes/MainRoutes.tsx
+++ b/src/routes/MainRoutes.tsx
@@ -20,6 +20,9 @@ const AdsCampaignGroup = loadable(
 );
 const Setting = loadable(lazy(() => import("@/pages/setting/Setting")));
 const Workspace = loadable(lazy(() => import("@/pages/workspace/Workspace")));
+const WorkspaceSetting = loadable(
+  lazy(() => import("@/pages/workspace/WorkspaceSetting")),
+);
 const Billing = loadable(lazy(() => import("@/pages/workspace/Billing")));
 
 const MainRoutes: RouteObject[] = [
@@ -44,8 +47,8 @@ const MainRoutes: RouteObject[] = [
     element: <AdsCampaignGroup />,
   },
   {
-    path: "setting",
-    element: <Setting />,
+    path: "workspace/:workspaceId/settings",
+    element: <WorkspaceSetting />,
   },
   {
     path: "workspace",

From 89334495653e7aa2a2a9a6a182de51cbd78450ba Mon Sep 17 00:00:00 2001
From: JAESEON PARK <ddorri83@naver.com>
Date: Tue, 24 Feb 2026 19:19:04 +0900
Subject: [PATCH 05/21] =?UTF-8?q?fix:=20=EB=AF=B8=EC=82=AC=EC=9A=A9=20sett?=
 =?UTF-8?q?ing=20=EB=9D=BC=EC=9A=B0=ED=8C=85=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../icon/workspace/message-circle-warning.svg |   3 +
 src/assets/icon/workspace/warning.svg         |   3 +
 src/pages/workspace/Workspace.tsx             |   2 +-
 src/pages/workspace/WorkspaceSetting.tsx      | 158 +++++++++++++++++-
 src/routes/MainRoutes.tsx                     |   1 -
 src/types/workspace/workspace.ts              |   1 -
 6 files changed, 164 insertions(+), 4 deletions(-)
 create mode 100644 src/assets/icon/workspace/message-circle-warning.svg
 create mode 100644 src/assets/icon/workspace/warning.svg

diff --git a/src/assets/icon/workspace/message-circle-warning.svg b/src/assets/icon/workspace/message-circle-warning.svg
new file mode 100644
index 0000000..ffcc22d
--- /dev/null
+++ b/src/assets/icon/workspace/message-circle-warning.svg
@@ -0,0 +1,3 @@
+<svg width="96" height="96" viewBox="0 0 96 96" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M48.0005 31.999V47.999M48.0005 63.999H48.0405M11.9687 65.3668C12.5569 66.8504 12.6878 68.4761 12.3447 70.0348L8.08472 83.1948C7.94745 83.8622 7.98294 84.5535 8.18782 85.2034C8.3927 85.8532 8.76017 86.4399 9.25539 86.9079C9.7506 87.3758 10.3572 87.7096 11.0175 87.8774C11.6779 88.0452 12.3702 88.0415 13.0287 87.8668L26.6807 83.8748C28.1516 83.583 29.6748 83.7105 31.0767 84.2428C39.6183 88.2317 49.2942 89.0756 58.3973 86.6257C67.5005 84.1757 75.4458 78.5894 80.8315 70.8522C86.2172 63.1151 88.6972 53.7244 87.8339 44.337C86.9706 34.9495 82.8195 26.1686 76.113 19.5436C69.4065 12.9185 60.5755 8.87493 51.1782 8.12636C41.781 7.37779 32.4213 9.9723 24.7505 15.4521C17.0797 20.932 11.5908 28.9449 9.25229 38.0773C6.91374 47.2097 7.87579 56.8746 11.9687 65.3668Z" stroke="#FF2A4B" stroke-width="5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/assets/icon/workspace/warning.svg b/src/assets/icon/workspace/warning.svg
new file mode 100644
index 0000000..d2077bb
--- /dev/null
+++ b/src/assets/icon/workspace/warning.svg
@@ -0,0 +1,3 @@
+<svg width="57" height="51" viewBox="0 0 57 51" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M28.502 28.1438V14.9675M28.502 37.9103V38.0261M45.1967 49H11.8072C7.24631 49 3.39739 45.9928 2.18643 41.8786C1.6695 40.1224 2.30467 38.2931 3.27619 36.7356L19.971 6.70301C23.8824 0.432324 33.1215 0.432333 37.0329 6.70302L53.7277 36.7356C54.6992 38.2931 55.3344 40.1224 54.8175 41.8786C53.6065 45.9928 49.7576 49 45.1967 49Z" stroke="#FF2A4B" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/pages/workspace/Workspace.tsx b/src/pages/workspace/Workspace.tsx
index 006a508..f1b2fa1 100644
--- a/src/pages/workspace/Workspace.tsx
+++ b/src/pages/workspace/Workspace.tsx
@@ -77,7 +77,7 @@ export default function WorkspacePage() {
   };
 
   return (
-    <section className="p-8">
+    <section className="py-8 px-20">
       <header className="mb-7">
         <h1 className="font-heading2 text-text-main">워크 스페이스 관리</h1>
         <p className="font-body1 text-text-sub">
diff --git a/src/pages/workspace/WorkspaceSetting.tsx b/src/pages/workspace/WorkspaceSetting.tsx
index 9f6ab25..d690ec3 100644
--- a/src/pages/workspace/WorkspaceSetting.tsx
+++ b/src/pages/workspace/WorkspaceSetting.tsx
@@ -1,7 +1,163 @@
+import { useState } from "react";
 import { useNavigate, useParams } from "react-router-dom";
 
+import Button from "@/components/common/button/Button";
+import Input from "@/components/common/input/Input";
+import Modal from "@/components/common/modal/Modal";
+
+import MessageCircleWarningIcon from "@/assets/icon/workspace/message-circle-warning.svg?react";
+import UpLoadImgIcon from "@/assets/icon/workspace/uploadImg.svg?react";
+import WarningIcon from "@/assets/icon/workspace/warning.svg?react";
+
 export default function WorkspaceSetting() {
   const navigate = useNavigate();
   const { workspaceId } = useParams();
-  return <div>workspace settings</div>;
+  const [name, setName] = useState("");
+  const [desc, setDesc] = useState("");
+  const [website, setWebsite] = useState("");
+  const [deleteOpen, setDeleteOpen] = useState(false);
+  const onSave = () => {
+    alert(`API 연동후 저장예정 (workspaceId=${workspaceId})`);
+  };
+  const onDelete = () => {
+    alert(`API 연동후 삭제예정 (workspaceId=${workspaceId})`);
+    setDeleteOpen(false);
+    navigate("/workspace", { replace: true });
+  };
+
+  return (
+    <section className="py-8 px-20">
+      <header className="mb-7">
+        <h1 className="font-heading2 text-text-main">워크 스페이스 관리</h1>
+        <p className="font-body1 text-text-sub">
+          워크스페이스 정보를 확인하고 관리하세요.
+        </p>
+      </header>
+      <div className="bg-white border border-gray-100 rounded-component-lg p-8 shadow-sm">
+        <h2 className="font-heading3 text-text-main">기본 정보</h2>
+        <p className="font-body2 text-text-sub mt-2">
+          워크스페이스의 대표적인 정보를 설정합니다.
+        </p>
+        <div className="mt-7 grid grid-cols-1 md:grid-cols-[640px_1fr] gap-8">
+          <div>
+            <div className="text-text-main">로고 이미지</div>
+            <div className="border border-gray-100 bg-gray-50 h-80 rounded-component-lg flex items-center justify-center">
+              <UpLoadImgIcon />
+            </div>
+            <div className="flex gap-3 mt-3 justify-center">
+              <Button
+                variant="custom"
+                className="!h-7 border border-gray-200 text-text-auth-sub px-5 rounded-component-lg bg-white font-body2 hover:bg-gray-100 transition-colors duration-200 ease-in-out"
+                onClick={() => alert("TODO:추후 업로드")}
+                aria-label="로고 이미지 업로드 버튼"
+              >
+                업로드
+              </Button>
+              <Button
+                variant="custom"
+                className="!h-7 border border-gray-200 text-text-auth-sub px-5 rounded-component-lg bg-white font-body2 hover:bg-gray-100 transition-colors duration-200 ease-in-out"
+                onClick={() => alert("TODO:추후 초기화연결")}
+                aria-label="로고 이미지 초기화 버튼 "
+              >
+                초기화
+              </Button>
+            </div>
+          </div>
+          <div className="space-y-5">
+            <Input
+              label="워크스페이스명"
+              value={name}
+              placeholder="WhereYouAd" //API에서 받아오는이름으로 변경예정
+              onChange={(e) => setName(e.target.value)}
+            />
+            <div className="flex flex-col">
+              <label
+                className="text-text-main select-none ml-1"
+                htmlFor="workspace-setting-desc"
+              >
+                워크스페이스 설명
+              </label>
+              <textarea
+                id="workspace-setting-desc"
+                className="w-full min-h-[120px] rounded-component-md bg-gray-50 px-5 py-4 outline-none transition-smooth hover:bg-gray-100 focus:bg-white focus:ring-2 focus:ring-logo-1/30 text-body1 text-text-main placeholder:text-text-placeholder"
+                placeholder="광고 실시간 모니터링 및 분석 플랫폼" //API에서 받아오는이름으로 변경예정
+                value={desc}
+                onChange={(e) => setDesc(e.target.value)}
+              />
+            </div>
+            <Input
+              label="웹사이트"
+              value={website}
+              onChange={(e) => setWebsite(e.target.value)}
+              placeholder="https://www.wya.com" //API에서 받아오는이름으로 변경예정
+            />
+          </div>
+        </div>
+      </div>
+      <div className="flex justify-end mt-6">
+        <Button
+          size="big"
+          variant="primary"
+          onClick={onSave}
+          disabled={!name.trim()}
+          aria-label="변경사항 저장하기"
+        >
+          변경사항 저장하기
+        </Button>
+      </div>
+      <div className="bg-status-red/10 border border-status-red rounded-component-lg p-8 mt-18 flex justify-between items-center">
+        <div className="flex gap-8 items-center">
+          <WarningIcon />
+          <div>
+            <div className="text-status-red font-heading3">
+              워크스페이스 삭제
+            </div>
+            <p className="font-body1 text-text-auth-sub mt-2">
+              워크스페이스를 삭제하면 모든 데이터가 영구적으로 삭제됩니다.
+              <br />이 작업은 되돌릴 수 없습니다.
+            </p>
+          </div>
+        </div>
+        <Button
+          variant="dangerSoft"
+          size="big"
+          aria-label="워크스페이스 삭제 버튼"
+          onClick={() => setDeleteOpen(true)}
+        >
+          워크스페이스 삭제
+        </Button>
+      </div>
+      <Modal
+        isOpen={deleteOpen}
+        onClose={() => setDeleteOpen(false)}
+        size="lg"
+        padding="lg"
+        title="워크스페이스 삭제 확인"
+      >
+        <div className="text-center px-2 py-6 ">
+          <div className="flex justify-center mb-6">
+            <MessageCircleWarningIcon />
+          </div>
+          <h3 className="font-heading2 text-text-main mb-3">
+            정말 삭제하시겠습니까?
+          </h3>
+          <p className="font-body1 text-text-auth-sub mb-7">
+            삭제된 워크스페이스와 관련된 모든 데이터는 영구 삭제되며 <br /> 절대
+            되돌릴 수 없습니다.
+          </p>
+          <div className="flex justify-center">
+            <Button
+              variant="danger"
+              size="big"
+              aria-label="워크스페이스 최종 삭제 버튼"
+              onClick={onDelete}
+              className="px-12"
+            >
+              삭제하기
+            </Button>
+          </div>
+        </div>
+      </Modal>
+    </section>
+  );
 }
diff --git a/src/routes/MainRoutes.tsx b/src/routes/MainRoutes.tsx
index fc835e3..4fcf9c8 100644
--- a/src/routes/MainRoutes.tsx
+++ b/src/routes/MainRoutes.tsx
@@ -18,7 +18,6 @@ const AdsListPage = loadable(
 const AdsCampaignGroup = loadable(
   lazy(() => import("@/pages/ads/new/AdsCreatePage")),
 );
-const Setting = loadable(lazy(() => import("@/pages/setting/Setting")));
 const Workspace = loadable(lazy(() => import("@/pages/workspace/Workspace")));
 const WorkspaceSetting = loadable(
   lazy(() => import("@/pages/workspace/WorkspaceSetting")),
diff --git a/src/types/workspace/workspace.ts b/src/types/workspace/workspace.ts
index dd64460..f66b16b 100644
--- a/src/types/workspace/workspace.ts
+++ b/src/types/workspace/workspace.ts
@@ -6,5 +6,4 @@ export type TWorkspace = {
   url?: string | null;
   logoUrl?: string | null;
   myRole: string;
-  representativeName?: string; //figma에서는 대표명. erd에서는 없어서 일단 보류. 빼도될듯
 };

From afbb49af7a38b352cac8d24499f3a8a2d834f8d9 Mon Sep 17 00:00:00 2001
From: JAESEON PARK <ddorri83@naver.com>
Date: Tue, 24 Feb 2026 19:35:35 +0900
Subject: [PATCH 06/21] =?UTF-8?q?fix:=20=EC=BD=94=EB=93=9C=EB=9E=98?=
 =?UTF-8?q?=EB=B9=97=20=EC=88=98=EC=A0=95=EC=82=AC=ED=95=AD=20=EB=B0=98?=
 =?UTF-8?q?=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/input/Input.tsx    |  5 ++++-
 src/pages/workspace/Workspace.tsx        | 10 ++++++++--
 src/pages/workspace/WorkspaceSetting.tsx |  4 ++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/components/common/input/Input.tsx b/src/components/common/input/Input.tsx
index 5a68e5d..a8b7261 100644
--- a/src/components/common/input/Input.tsx
+++ b/src/components/common/input/Input.tsx
@@ -42,7 +42,10 @@ const Input = forwardRef<HTMLInputElement, IInputProps>(
         className={twMerge("flex flex-col w-full relative", wrapperClassName)}
       >
         {label && (
-          <label htmlFor={inputId} className="text-text-main select-none ml-1">
+          <label
+            htmlFor={inputId}
+            className="text-text-main select-none ml-1 mb-1"
+          >
             {label}
           </label>
         )}
diff --git a/src/pages/workspace/Workspace.tsx b/src/pages/workspace/Workspace.tsx
index f1b2fa1..e5b2e88 100644
--- a/src/pages/workspace/Workspace.tsx
+++ b/src/pages/workspace/Workspace.tsx
@@ -79,7 +79,7 @@ export default function WorkspacePage() {
   return (
     <section className="py-8 px-20">
       <header className="mb-7">
-        <h1 className="font-heading2 text-text-main">워크 스페이스 관리</h1>
+        <h1 className="font-heading2 text-text-main">워크스페이스 관리</h1>
         <p className="font-body1 text-text-sub">
           워크스페이스 정보를 확인하고 관리하세요.
         </p>
@@ -112,7 +112,13 @@ export default function WorkspacePage() {
             <div className="flex items-center gap-5 min-w-0">
               <div className="w-20 h-20 bg-gray-200 shrink-0 rounded-component-sm">
                 {/* TODO: 스타일 확인을 위해 bg-gray-200넣어둠. API연동할때 삭제예정 */}
-                {w.logoUrl}
+                (w.logoUrl ?(
+                <img
+                  src={w.logoUrl}
+                  alt={`${w.name} 로고`}
+                  className="w-full h-full object-cover rounded-b-component-sm"
+                />
+                ): null)
               </div>
               <div className="min-w-0">
                 <div className="font-heading3 text-text-main truncate">
diff --git a/src/pages/workspace/WorkspaceSetting.tsx b/src/pages/workspace/WorkspaceSetting.tsx
index d690ec3..eb3bd1f 100644
--- a/src/pages/workspace/WorkspaceSetting.tsx
+++ b/src/pages/workspace/WorkspaceSetting.tsx
@@ -28,7 +28,7 @@ export default function WorkspaceSetting() {
   return (
     <section className="py-8 px-20">
       <header className="mb-7">
-        <h1 className="font-heading2 text-text-main">워크 스페이스 관리</h1>
+        <h1 className="font-heading2 text-text-main">워크스페이스 관리</h1>
         <p className="font-body1 text-text-sub">
           워크스페이스 정보를 확인하고 관리하세요.
         </p>
@@ -57,7 +57,7 @@ export default function WorkspaceSetting() {
                 variant="custom"
                 className="!h-7 border border-gray-200 text-text-auth-sub px-5 rounded-component-lg bg-white font-body2 hover:bg-gray-100 transition-colors duration-200 ease-in-out"
                 onClick={() => alert("TODO:추후 초기화연결")}
-                aria-label="로고 이미지 초기화 버튼 "
+                aria-label="로고 이미지 초기화 버튼"
               >
                 초기화
               </Button>

From 22763393c9175f3c24ff9dd5558933c4a42638cb Mon Sep 17 00:00:00 2001
From: JAESEON PARK <ddorri83@naver.com>
Date: Tue, 24 Feb 2026 19:41:10 +0900
Subject: [PATCH 07/21] =?UTF-8?q?fix:=20=EC=9E=98=EB=AA=BB=EC=82=AC?=
 =?UTF-8?q?=EC=9A=A9=ED=95=9C=20=EA=B4=84=ED=98=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/workspace/Workspace.tsx | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/pages/workspace/Workspace.tsx b/src/pages/workspace/Workspace.tsx
index e5b2e88..e50896f 100644
--- a/src/pages/workspace/Workspace.tsx
+++ b/src/pages/workspace/Workspace.tsx
@@ -112,13 +112,13 @@ export default function WorkspacePage() {
             <div className="flex items-center gap-5 min-w-0">
               <div className="w-20 h-20 bg-gray-200 shrink-0 rounded-component-sm">
                 {/* TODO: 스타일 확인을 위해 bg-gray-200넣어둠. API연동할때 삭제예정 */}
-                (w.logoUrl ?(
-                <img
-                  src={w.logoUrl}
-                  alt={`${w.name} 로고`}
-                  className="w-full h-full object-cover rounded-b-component-sm"
-                />
-                ): null)
+                {w.logoUrl ? (
+                  <img
+                    src={w.logoUrl}
+                    alt={`${w.name} 로고`}
+                    className="w-full h-full object-cover rounded-b-component-sm"
+                  />
+                ) : null}
               </div>
               <div className="min-w-0">
                 <div className="font-heading3 text-text-main truncate">

From dc785952c8fcf13a9c85ea3d47b66cfe46bfd026 Mon Sep 17 00:00:00 2001
From: JAESEON PARK <ddorri83@naver.com>
Date: Wed, 25 Feb 2026 00:06:08 +0900
Subject: [PATCH 08/21] =?UTF-8?q?fix:=20=EC=9B=8C=ED=81=AC=EC=8A=A4?=
 =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=8A=A4=20=EC=83=9D=EC=84=B1=ED=95=A0?=
 =?UTF-8?q?=EB=95=8C=20url=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/workspace/WorkspaceSetting.tsx | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/pages/workspace/WorkspaceSetting.tsx b/src/pages/workspace/WorkspaceSetting.tsx
index eb3bd1f..7e4bc2a 100644
--- a/src/pages/workspace/WorkspaceSetting.tsx
+++ b/src/pages/workspace/WorkspaceSetting.tsx
@@ -14,7 +14,6 @@ export default function WorkspaceSetting() {
   const { workspaceId } = useParams();
   const [name, setName] = useState("");
   const [desc, setDesc] = useState("");
-  const [website, setWebsite] = useState("");
   const [deleteOpen, setDeleteOpen] = useState(false);
   const onSave = () => {
     alert(`API 연동후 저장예정 (workspaceId=${workspaceId})`);
@@ -79,18 +78,12 @@ export default function WorkspaceSetting() {
               </label>
               <textarea
                 id="workspace-setting-desc"
-                className="w-full min-h-[120px] rounded-component-md bg-gray-50 px-5 py-4 outline-none transition-smooth hover:bg-gray-100 focus:bg-white focus:ring-2 focus:ring-logo-1/30 text-body1 text-text-main placeholder:text-text-placeholder"
+                className="w-full min-h-[220px] rounded-component-md bg-gray-50 px-5 py-4 outline-none transition-smooth hover:bg-gray-100 focus:bg-white focus:ring-2 focus:ring-logo-1/30 text-body1 text-text-main placeholder:text-text-placeholder"
                 placeholder="광고 실시간 모니터링 및 분석 플랫폼" //API에서 받아오는이름으로 변경예정
                 value={desc}
                 onChange={(e) => setDesc(e.target.value)}
               />
-            </div>
-            <Input
-              label="웹사이트"
-              value={website}
-              onChange={(e) => setWebsite(e.target.value)}
-              placeholder="https://www.wya.com" //API에서 받아오는이름으로 변경예정
-            />
+            </div>{" "}
           </div>
         </div>
       </div>

From 02e63ffe0ed66668cbcdb01098d372487423b482 Mon Sep 17 00:00:00 2001
From: JAESEON PARK <ddorri83@naver.com>
Date: Wed, 25 Feb 2026 00:51:25 +0900
Subject: [PATCH 09/21] =?UTF-8?q?chore:=20dropdownMenu=EC=97=90=20?=
 =?UTF-8?q?=EC=95=84=EC=9D=B4=EC=BD=98=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/icon/workspace/edit-contained.svg | 3 +++
 src/assets/icon/workspace/userProfile.svg    | 3 +++
 src/pages/workspace/Workspace.tsx            | 4 ++++
 src/pages/workspace/WorkspaceSetting.tsx     | 4 ++--
 4 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 src/assets/icon/workspace/edit-contained.svg
 create mode 100644 src/assets/icon/workspace/userProfile.svg

diff --git a/src/assets/icon/workspace/edit-contained.svg b/src/assets/icon/workspace/edit-contained.svg
new file mode 100644
index 0000000..1969f32
--- /dev/null
+++ b/src/assets/icon/workspace/edit-contained.svg
@@ -0,0 +1,3 @@
+<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.93649 2.37731H3.38244C2.20472 2.37731 1.25 3.332 1.25 4.50967V11.6176C1.25 12.7953 2.20472 13.75 3.38244 13.75H10.4906C11.6683 13.75 12.623 12.7953 12.623 11.6176L12.623 8.06365M4.80406 10.196L7.39022 9.67491C7.52751 9.64725 7.65357 9.57964 7.75258 9.48059L13.5419 3.68823C13.8195 3.41051 13.8193 2.96035 13.5415 2.68287L12.3151 1.4579C12.0374 1.18053 11.5875 1.18072 11.31 1.45832L5.52006 7.25129C5.42125 7.35015 5.35378 7.47595 5.32609 7.61295L4.80406 10.196Z" stroke="#212121" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/assets/icon/workspace/userProfile.svg b/src/assets/icon/workspace/userProfile.svg
new file mode 100644
index 0000000..e1a5aec
--- /dev/null
+++ b/src/assets/icon/workspace/userProfile.svg
@@ -0,0 +1,3 @@
+<svg width="14" height="13" viewBox="0 0 14 13" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.26588 11.4635L9.26606 9.45491C9.26616 8.34542 8.36677 7.44595 7.25728 7.44595H2.75901C1.64968 7.44595 0.750351 8.34517 0.750226 9.45451L0.75 11.4635M12.7498 11.4636L12.75 9.45502C12.7501 8.34553 11.8507 7.44606 10.7412 7.44606M8.87896 1.14463C9.37227 1.51065 9.69197 2.09744 9.69197 2.75889C9.69197 3.42035 9.37227 4.00713 8.87896 4.37316M7.05862 2.75878C7.05862 3.86821 6.15926 4.76757 5.04984 4.76757C3.94042 4.76757 3.04105 3.86821 3.04105 2.75878C3.04105 1.64936 3.94042 0.75 5.04984 0.75C6.15926 0.75 7.05862 1.64936 7.05862 2.75878Z" stroke="#212121" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/pages/workspace/Workspace.tsx b/src/pages/workspace/Workspace.tsx
index e50896f..63a865f 100644
--- a/src/pages/workspace/Workspace.tsx
+++ b/src/pages/workspace/Workspace.tsx
@@ -11,9 +11,11 @@ import {
 import Input from "@/components/common/input/Input";
 import Modal from "@/components/common/modal/Modal";
 
+import EditContainIcon from "@/assets/icon/workspace/edit-contained.svg?react";
 import PlusIcon from "@/assets/icon/workspace/plus.svg?react";
 import SearchIcon from "@/assets/icon/workspace/search.svg?react";
 import UpLoadImgIcon from "@/assets/icon/workspace/uploadImg.svg?react";
+import UserProfileIcon from "@/assets/icon/workspace/userProfile.svg?react";
 import VectorIcon from "@/assets/icon/workspace/Vector.svg?react";
 
 export default function WorkspacePage() {
@@ -55,12 +57,14 @@ export default function WorkspacePage() {
 
   const menuItems = (id: TWorkspace["id"]): TMenuItem[] => [
     {
+      icon: <EditContainIcon />,
       label: "정보 수정하기",
       onClick: () => {
         void navigate(`/workspace/${id}/settings`);
       },
     },
     {
+      icon: <UserProfileIcon />,
       label: "멤버 관리",
       onClick: () => alert("멤버 관리 기능은 추후 연결 예정"),
     },
diff --git a/src/pages/workspace/WorkspaceSetting.tsx b/src/pages/workspace/WorkspaceSetting.tsx
index 7e4bc2a..83d95a5 100644
--- a/src/pages/workspace/WorkspaceSetting.tsx
+++ b/src/pages/workspace/WorkspaceSetting.tsx
@@ -66,7 +66,7 @@ export default function WorkspaceSetting() {
             <Input
               label="워크스페이스명"
               value={name}
-              placeholder="WhereYouAd" //API에서 받아오는이름으로 변경예정
+              placeholder="조직의 이름 또는 워크스페이스 이름을 입력해주세요"
               onChange={(e) => setName(e.target.value)}
             />
             <div className="flex flex-col">
@@ -79,7 +79,7 @@ export default function WorkspaceSetting() {
               <textarea
                 id="workspace-setting-desc"
                 className="w-full min-h-[220px] rounded-component-md bg-gray-50 px-5 py-4 outline-none transition-smooth hover:bg-gray-100 focus:bg-white focus:ring-2 focus:ring-logo-1/30 text-body1 text-text-main placeholder:text-text-placeholder"
-                placeholder="광고 실시간 모니터링 및 분석 플랫폼" //API에서 받아오는이름으로 변경예정
+                placeholder="워크스페이스에 대한 설명을 입력해주세요"
                 value={desc}
                 onChange={(e) => setDesc(e.target.value)}
               />

From 6d4d7648e34119df81655da357c83d9127a069c3 Mon Sep 17 00:00:00 2001
From: JAESEON PARK <ddorri83@naver.com>
Date: Wed, 25 Feb 2026 01:15:03 +0900
Subject: [PATCH 10/21] =?UTF-8?q?feat:=20textarea=20=EC=BB=B4=ED=8F=AC?=
 =?UTF-8?q?=EB=84=8C=ED=8A=B8=EB=A1=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/textarea/TextareaField.tsx         | 55 ++++++++++++
 src/components/workspace/WorkspaceCard.tsx    | 57 +++++++++++++
 src/pages/workspace/Workspace.tsx             | 83 ++++---------------
 3 files changed, 130 insertions(+), 65 deletions(-)
 create mode 100644 src/components/common/textarea/TextareaField.tsx
 create mode 100644 src/components/workspace/WorkspaceCard.tsx

diff --git a/src/components/common/textarea/TextareaField.tsx b/src/components/common/textarea/TextareaField.tsx
new file mode 100644
index 0000000..7e65228
--- /dev/null
+++ b/src/components/common/textarea/TextareaField.tsx
@@ -0,0 +1,55 @@
+import type React from "react";
+import { useLayoutEffect, useRef } from "react";
+import { twMerge } from "tailwind-merge";
+
+type TProps = {
+  id: string;
+  label: string;
+  value: string;
+  placeholder?: string;
+  onChange: (e: React.ChangeEvent<HTMLTextAreaElement>) => void;
+  className?: string;
+  minRows?: number;
+};
+
+export default function TextareaField({
+  id,
+  label,
+  value,
+  placeholder,
+  onChange,
+  className,
+  minRows = 4,
+}: TProps) {
+  const ref = useRef<HTMLTextAreaElement | null>(null);
+  const resize = () => {
+    const el = ref.current;
+    if (!el) return;
+    el.style.height = "auto";
+    el.style.height = `${el.scrollHeight}px`;
+  };
+  useLayoutEffect(() => {
+    resize();
+  }, [value]);
+
+  return (
+    <div className="flex flex-col">
+      <label className="text-text-main select-none ml-1" htmlFor={id}>
+        {label}
+      </label>
+      <textarea
+        ref={ref}
+        id={id}
+        rows={minRows}
+        value={value}
+        className={twMerge(
+          "w-full resize-none overflow-hidden rounded-component-md bg-gray-50 px-5 py-4 outline-none transition-smooth hover:bg-gray-100 focus:bg-white focus:ring-2 focus:ring-logo-1/30 text-body1 text-text-main placeholder:text-text-placeholder",
+          className,
+        )}
+        placeholder={placeholder}
+        onChange={onChange}
+        onInput={resize}
+      />
+    </div>
+  );
+}
diff --git a/src/components/workspace/WorkspaceCard.tsx b/src/components/workspace/WorkspaceCard.tsx
new file mode 100644
index 0000000..eea2718
--- /dev/null
+++ b/src/components/workspace/WorkspaceCard.tsx
@@ -0,0 +1,57 @@
+import type { TWorkspace } from "@/types/workspace/workspace";
+
+import {
+  DropdownMenu,
+  type TMenuItem,
+} from "@/components/common/dropdownmenu/DropdownMenu";
+
+import VectorIcon from "@/assets/icon/workspace/Vector.svg?react";
+
+type TProps = {
+  workspace: TWorkspace;
+  menuItems: TMenuItem[];
+};
+
+export default function WorkspaceCard({ workspace: w, menuItems }: TProps) {
+  return (
+    <li className="flex items-center justify-between rounded-component-md bg-white px-6 py-5 shadow-sm border border-gray-100">
+      <div className="flex items-center gap-5 min-w-0">
+        <div className="w-20 h-20 bg-gray-200 shrink-0 rounded-component-sm">
+          {/* TODO: 스타일 확인을 위해 bg-gray-200넣어둠. API연동할때 삭제예정 */}
+          {w.logoUrl ? (
+            <img
+              src={w.logoUrl}
+              alt={`${w.name} 로고`}
+              className="w-full h-full object-cover rounded-b-component-sm"
+            />
+          ) : null}
+        </div>
+
+        <div className="min-w-0">
+          <div className="font-heading3 text-text-main truncate">{w.name}</div>
+          <div className="font-body1 text-text-main mt-1 truncate">
+            {w.description ?? ""}
+          </div>
+          <div className="font-body1 text-text-sub mt-2">
+            {w.myRole ?? "내 직책 및 역할"}
+          </div>
+        </div>
+      </div>
+
+      <div className="flex items-center gap-4 shrink-0">
+        <DropdownMenu
+          trigger={
+            <button
+              type="button"
+              aria-label={`${w.name} 워크스페이스 메뉴`}
+              className="h-10 w-10 rounded-xl hover:bg-gray-100 transition-colors flex items-center justify-center"
+            >
+              <VectorIcon />
+            </button>
+          }
+          items={menuItems}
+        />
+      </div>
+    </li>
+  );
+}
diff --git a/src/pages/workspace/Workspace.tsx b/src/pages/workspace/Workspace.tsx
index 63a865f..5397c55 100644
--- a/src/pages/workspace/Workspace.tsx
+++ b/src/pages/workspace/Workspace.tsx
@@ -4,19 +4,17 @@ import { useNavigate } from "react-router-dom";
 import type { TWorkspace } from "@/types/workspace/workspace";
 
 import Button from "@/components/common/button/Button";
-import {
-  DropdownMenu,
-  type TMenuItem,
-} from "@/components/common/dropdownmenu/DropdownMenu";
+import { type TMenuItem } from "@/components/common/dropdownmenu/DropdownMenu";
 import Input from "@/components/common/input/Input";
 import Modal from "@/components/common/modal/Modal";
+import TextareaField from "@/components/common/textarea/TextareaField";
+import WorkspaceCard from "@/components/workspace/WorkspaceCard";
 
 import EditContainIcon from "@/assets/icon/workspace/edit-contained.svg?react";
 import PlusIcon from "@/assets/icon/workspace/plus.svg?react";
 import SearchIcon from "@/assets/icon/workspace/search.svg?react";
 import UpLoadImgIcon from "@/assets/icon/workspace/uploadImg.svg?react";
 import UserProfileIcon from "@/assets/icon/workspace/userProfile.svg?react";
-import VectorIcon from "@/assets/icon/workspace/Vector.svg?react";
 
 export default function WorkspacePage() {
   const navigate = useNavigate();
@@ -107,57 +105,20 @@ export default function WorkspacePage() {
           워크스페이스 생성하기
         </Button>
       </div>
-      <div className="space-y-5">
+      <ul className="space-y-5">
         {filtered.map((w) => (
-          <div
+          <WorkspaceCard
             key={String(w.id)}
-            className="flex items-center justify-between rounded-component-md bg-white px-6 py-5 shadow-sm border border-gray-100"
-          >
-            <div className="flex items-center gap-5 min-w-0">
-              <div className="w-20 h-20 bg-gray-200 shrink-0 rounded-component-sm">
-                {/* TODO: 스타일 확인을 위해 bg-gray-200넣어둠. API연동할때 삭제예정 */}
-                {w.logoUrl ? (
-                  <img
-                    src={w.logoUrl}
-                    alt={`${w.name} 로고`}
-                    className="w-full h-full object-cover rounded-b-component-sm"
-                  />
-                ) : null}
-              </div>
-              <div className="min-w-0">
-                <div className="font-heading3 text-text-main truncate">
-                  {w.name}
-                </div>
-                <div className="font-body1 text-text-main mt-1 truncate">
-                  {w.description ?? ""}
-                </div>
-                <div className="font-body1 text-text-sub mt-2">
-                  {w.myRole ?? "내 직책 및 역할"}
-                </div>
-              </div>
-            </div>
-            <div className="flex items-center gap-4 shrink-0">
-              <DropdownMenu
-                trigger={
-                  <button
-                    type="button"
-                    aria-label="워크스페이스 메뉴"
-                    className="h-10 w-10 rounded-xl hover:bg-gray-100 transition-colors flex items-center justify-center"
-                  >
-                    <VectorIcon />
-                  </button>
-                }
-                items={menuItems(w.id)}
-              />
-            </div>
-          </div>
+            workspace={w}
+            menuItems={menuItems(w.id)}
+          />
         ))}
         {filtered.length === 0 && (
-          <div className="rounded-component-lg bg-white p-10 text-center border border-gray-100">
+          <li className="rounded-component-lg bg-white p-10 text-center border border-gray-100">
             <p className="font-body2 text-text-sub">워크스페이스가 없습니다.</p>
-          </div>
+          </li>
         )}
-      </div>
+      </ul>
       <Modal
         isOpen={createOpen}
         onClose={() => setCreateOpen(false)}
@@ -198,21 +159,13 @@ export default function WorkspacePage() {
               value={newName}
               onChange={(e) => setNewName(e.target.value)}
             />
-            <div className="flex flex-col">
-              <label
-                className="text-text-main select-none ml-1"
-                htmlFor="workspace-desc"
-              >
-                워크스페이스 설명
-              </label>
-              <textarea
-                id="workspace-desc"
-                className="w-full min-h-[120px] rounded-component-md bg-gray-50 px-5 py-4 outline-none transition-smooth hover:bg-gray-100 focus:bg-white focus:ring-2 focus:ring-logo-1/30 text-body1 text-text-main placeholder:text-text-placeholder"
-                placeholder="조직에 대한 간단한 설명을 입력하세요."
-                value={newDesc}
-                onChange={(e) => setNewDesc(e.target.value)}
-              />
-            </div>
+            <TextareaField
+              id="workspace-desc"
+              label="워크스페이스 설명"
+              placeholder="조직에 대한 간단한 설명을 입력하세요"
+              value={newDesc}
+              onChange={(e) => setNewDesc(e.target.value)}
+            />
             <Button
               size="big"
               variant="primary"

From 12f4ba3a52190081bfad92b392330451e08e97f7 Mon Sep 17 00:00:00 2001
From: JAESEON PARK <ddorri83@naver.com>
Date: Wed, 25 Feb 2026 01:30:27 +0900
Subject: [PATCH 11/21] =?UTF-8?q?fix:=20=EC=9B=8C=ED=81=AC=EC=8A=A4?=
 =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=8A=A4=20=EC=83=9D=EC=84=B1=20=EB=93=9C?=
 =?UTF-8?q?=EB=A1=AD=EC=A1=B4=EC=9D=84=20=EC=84=A0=ED=83=9D=ED=96=88?=
 =?UTF-8?q?=EC=9D=84=EC=8B=9C=EC=97=90=EB=8F=84=20=EC=97=85=EB=A1=9C?=
 =?UTF-8?q?=EB=93=9C=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/workspace/Workspace.tsx | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/pages/workspace/Workspace.tsx b/src/pages/workspace/Workspace.tsx
index 5397c55..b92118c 100644
--- a/src/pages/workspace/Workspace.tsx
+++ b/src/pages/workspace/Workspace.tsx
@@ -1,4 +1,4 @@
-import { useMemo, useState } from "react";
+import React, { useMemo, useRef, useState } from "react";
 import { useNavigate } from "react-router-dom";
 
 import type { TWorkspace } from "@/types/workspace/workspace";
@@ -24,6 +24,8 @@ export default function WorkspacePage() {
 
   const [newName, setNewName] = useState("");
   const [newDesc, setNewDesc] = useState("");
+  const fileRef = useRef<HTMLInputElement | null>(null);
+  const openFile = () => fileRef.current?.click();
   const workspaces: TWorkspace[] = useMemo(
     () => [
       {
@@ -73,6 +75,11 @@ export default function WorkspacePage() {
     setCreateOpen(true);
   };
 
+  const onPickFile = (e: React.ChangeEvent<HTMLInputElement>) => {
+    const file = e.target.files?.[0];
+    if (!file) return;
+  };
+
   // TODO: API 연동 후에 생성 동작 연결하기
   const onSubmitCreate = () => {
     alert("API 연동 후에 생성 기능 연결예정");
@@ -136,21 +143,34 @@ export default function WorkspacePage() {
           </p>
           <div className="space-y-6 mx-auto w-full max-w-[800px]">
             <div className="max-w-[560px] mx-auto w-full mb-10">
+              <input
+                ref={fileRef}
+                type="file"
+                accept="image/*"
+                className="hidden"
+                onChange={onPickFile}
+              />
               <div className="flex items-center justify-between mb-2">
                 <div className="font-label text-text-sub">로고 이미지</div>
                 <Button
                   variant="custom"
                   className="!h-7 border border-gray-200 text-text-auth-sub px-5 rounded-component-lg bg-white font-body2 hover:bg-gray-100 transition-colors duration-200 ease-in-out"
-                  onClick={() => alert("TODO:추후 업로드")}
+                  onClick={openFile}
+                  type="button"
                 >
                   업로드
                 </Button>
               </div>
-              <div className="rounded-component-lg border border-gray-100 bg-gray-50 h-[260px] flex items-center justify-center">
+              <button
+                type="button"
+                aria-label="로고 이미지 업로드"
+                onClick={openFile}
+                className="w-full rounded-component-lg border border-gray-100 bg-gray-50 h-[260px] flex items-center justify-center hover:bg-gray-100 transition-colors"
+              >
                 <span className="text-text-sub">
                   <UpLoadImgIcon />
                 </span>
-              </div>
+              </button>
             </div>
 
             <Input

From 131ae551270c1f1dbc21a11219f0fa6c17ea2d27 Mon Sep 17 00:00:00 2001
From: JAESEON PARK <ddorri83@naver.com>
Date: Wed, 25 Feb 2026 01:32:09 +0900
Subject: [PATCH 12/21] =?UTF-8?q?fix:=20=EC=9B=8C=ED=81=AC=EC=8A=A4?=
 =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=8A=A4=20=EC=83=9D=EC=84=B1=20=EB=AA=A8?=
 =?UTF-8?q?=EB=8B=AC=20=ED=83=80=EC=9D=B4=ED=8B=80=20=EC=A4=91=EB=B3=B5=20?=
 =?UTF-8?q?=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/workspace/Workspace.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/workspace/Workspace.tsx b/src/pages/workspace/Workspace.tsx
index b92118c..5e5b0d7 100644
--- a/src/pages/workspace/Workspace.tsx
+++ b/src/pages/workspace/Workspace.tsx
@@ -131,7 +131,6 @@ export default function WorkspacePage() {
         onClose={() => setCreateOpen(false)}
         size="xl"
         padding="lg"
-        title="워크스페이스 생성"
       >
         <div className="px-2">
           <h2 className="font-heading3 text-text-main mb-2">

From b67589f18006c11793da82c63a0b63d6fa06e747 Mon Sep 17 00:00:00 2001
From: JAESEON PARK <ddorri83@naver.com>
Date: Wed, 25 Feb 2026 01:46:29 +0900
Subject: [PATCH 13/21] =?UTF-8?q?chore:=20=EB=A1=9C=EA=B3=A0=EC=9D=B4?=
 =?UTF-8?q?=EB=AF=B8=EC=A7=80=20=EC=97=86=EC=9D=84=EA=B2=BD=EC=9A=B0=20?=
 =?UTF-8?q?=EA=B8=B0=EB=B3=B8=20=EB=B9=84=EC=A6=88=EB=8B=88=EC=8A=A4?=
 =?UTF-8?q?=EB=B9=8C=EB=94=A9=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/icon/workspace/building.svg     |  3 +++
 src/components/workspace/WorkspaceCard.tsx | 13 +++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 src/assets/icon/workspace/building.svg

diff --git a/src/assets/icon/workspace/building.svg b/src/assets/icon/workspace/building.svg
new file mode 100644
index 0000000..cd3534c
--- /dev/null
+++ b/src/assets/icon/workspace/building.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 10H12.01M12 14H12.01M12 6H12.01M16 10H16.01M16 14H16.01M16 6H16.01M8 10H8.01M8 14H8.01M8 6H8.01M9 22V19C9 18.7348 9.10536 18.4804 9.29289 18.2929C9.48043 18.1054 9.73478 18 10 18H14C14.2652 18 14.5196 18.1054 14.7071 18.2929C14.8946 18.4804 15 18.7348 15 19V22M6 2H18C19.1046 2 20 2.89543 20 4V20C20 21.1046 19.1046 22 18 22H6C4.89543 22 4 21.1046 4 20V4C4 2.89543 4.89543 2 6 2Z" stroke="#8B8B8F" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/src/components/workspace/WorkspaceCard.tsx b/src/components/workspace/WorkspaceCard.tsx
index eea2718..af3f553 100644
--- a/src/components/workspace/WorkspaceCard.tsx
+++ b/src/components/workspace/WorkspaceCard.tsx
@@ -5,6 +5,7 @@ import {
   type TMenuItem,
 } from "@/components/common/dropdownmenu/DropdownMenu";
 
+import BuildingIcon from "@/assets/icon/workspace/building.svg?react";
 import VectorIcon from "@/assets/icon/workspace/Vector.svg?react";
 
 type TProps = {
@@ -16,15 +17,19 @@ export default function WorkspaceCard({ workspace: w, menuItems }: TProps) {
   return (
     <li className="flex items-center justify-between rounded-component-md bg-white px-6 py-5 shadow-sm border border-gray-100">
       <div className="flex items-center gap-5 min-w-0">
-        <div className="w-20 h-20 bg-gray-200 shrink-0 rounded-component-sm">
-          {/* TODO: 스타일 확인을 위해 bg-gray-200넣어둠. API연동할때 삭제예정 */}
+        <div className="w-20 h-20 bg-gray-100 shrink-0 rounded-component-sm">
+          {/* TODO: 스타일 확인을 위해 bg-gray-100넣어둠. API연동할때 삭제예정 */}
           {w.logoUrl ? (
             <img
               src={w.logoUrl}
               alt={`${w.name} 로고`}
-              className="w-full h-full object-cover rounded-b-component-sm"
+              className="w-full h-full object-cover rounded-component-sm"
             />
-          ) : null}
+          ) : (
+            <div className="w-full h-full flex items-center justify-center">
+              <BuildingIcon className="w-12 h-12" />
+            </div>
+          )}
         </div>
 
         <div className="min-w-0">

From c019783ee33970c4e82ef552c8dd5401c6f4a4ba Mon Sep 17 00:00:00 2001
From: JAESEON PARK <ddorri83@naver.com>
Date: Wed, 25 Feb 2026 02:16:08 +0900
Subject: [PATCH 14/21] =?UTF-8?q?fix:=20=EB=B0=98=EC=9D=91=ED=98=95=20?=
 =?UTF-8?q?=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/main/MainLayout.tsx           |  6 ++++--
 src/pages/workspace/Workspace.tsx        | 12 ++++++++----
 src/pages/workspace/WorkspaceSetting.tsx | 13 +++++++------
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/layout/main/MainLayout.tsx b/src/layout/main/MainLayout.tsx
index e9787eb..da89024 100644
--- a/src/layout/main/MainLayout.tsx
+++ b/src/layout/main/MainLayout.tsx
@@ -4,10 +4,12 @@ import Sidebar from "@/components/Sidebar/Sidebar";
 
 export default function MainLayout() {
   return (
-    <div className="flex h-screen p-5 bg-gray-50">
+    <div className="flex h-screen p-3 bg-gray-50 sm:p-5">
       <Sidebar />
       <main className="flex-1 overflow-auto">
-        <Outlet />
+        <div className="mx-auto w-full max-w-[1600px] py-6 px-4 sm:px-6 lg:px-20">
+          <Outlet />
+        </div>
       </main>
     </div>
   );
diff --git a/src/pages/workspace/Workspace.tsx b/src/pages/workspace/Workspace.tsx
index 5e5b0d7..b83d31b 100644
--- a/src/pages/workspace/Workspace.tsx
+++ b/src/pages/workspace/Workspace.tsx
@@ -25,7 +25,11 @@ export default function WorkspacePage() {
   const [newName, setNewName] = useState("");
   const [newDesc, setNewDesc] = useState("");
   const fileRef = useRef<HTMLInputElement | null>(null);
-  const openFile = () => fileRef.current?.click();
+  const openFile = () => {
+    if (!fileRef.current) return;
+    fileRef.current.value = "";
+    fileRef.current?.click();
+  };
   const workspaces: TWorkspace[] = useMemo(
     () => [
       {
@@ -86,14 +90,14 @@ export default function WorkspacePage() {
   };
 
   return (
-    <section className="py-8 px-20">
+    <section className="w-full">
       <header className="mb-7">
         <h1 className="font-heading2 text-text-main">워크스페이스 관리</h1>
         <p className="font-body1 text-text-sub">
           워크스페이스 정보를 확인하고 관리하세요.
         </p>
       </header>
-      <div className="mb-6 flex items-center gap-4">
+      <div className="mb-6 flex flex-col gap-4 sm:flex-row sm:items-center">
         <div className="flex-1">
           <Input
             placeholder="조직을 검색하세요"
@@ -106,7 +110,7 @@ export default function WorkspacePage() {
           onClick={onOpenCreate}
           size="big"
           variant="primary"
-          className="bg-chart-3 flex shrink-0 whitespace-nowrap items-center justify-center gap-2 sm:w-auto w-full"
+          className="bg-chart-3 flex w-full shrink-0 whitespace-nowrap items-center justify-center gap-2 sm:w-auto"
         >
           <PlusIcon className="w-3 h-3 fill-white" />
           워크스페이스 생성하기
diff --git a/src/pages/workspace/WorkspaceSetting.tsx b/src/pages/workspace/WorkspaceSetting.tsx
index 83d95a5..051c4b5 100644
--- a/src/pages/workspace/WorkspaceSetting.tsx
+++ b/src/pages/workspace/WorkspaceSetting.tsx
@@ -25,7 +25,7 @@ export default function WorkspaceSetting() {
   };
 
   return (
-    <section className="py-8 px-20">
+    <section className="w-full">
       <header className="mb-7">
         <h1 className="font-heading2 text-text-main">워크스페이스 관리</h1>
         <p className="font-body1 text-text-sub">
@@ -37,10 +37,10 @@ export default function WorkspaceSetting() {
         <p className="font-body2 text-text-sub mt-2">
           워크스페이스의 대표적인 정보를 설정합니다.
         </p>
-        <div className="mt-7 grid grid-cols-1 md:grid-cols-[640px_1fr] gap-8">
+        <div className="mt-7 grid grid-cols-1 lg:grid-cols-[minmax(320px,560px)_1fr] gap-8">
           <div>
             <div className="text-text-main">로고 이미지</div>
-            <div className="border border-gray-100 bg-gray-50 h-80 rounded-component-lg flex items-center justify-center">
+            <div className="border border-gray-100 bg-gray-50 rounded-component-lg flex items-center justify-center h-56 sm:h-72 lg:h-80">
               <UpLoadImgIcon />
             </div>
             <div className="flex gap-3 mt-3 justify-center">
@@ -94,12 +94,13 @@ export default function WorkspaceSetting() {
           onClick={onSave}
           disabled={!name.trim()}
           aria-label="변경사항 저장하기"
+          className="w-full sm:w-auto"
         >
           변경사항 저장하기
         </Button>
       </div>
-      <div className="bg-status-red/10 border border-status-red rounded-component-lg p-8 mt-18 flex justify-between items-center">
-        <div className="flex gap-8 items-center">
+      <div className="bg-status-red/10 border border-status-red rounded-component-lg p-6 sm:p-8 mt-12 flex flex-col gap-6 md:flex-row md:justify-between md:items-center">
+        <div className="flex gap-4 sm:gap-8 items-start sm:items-center">
           <WarningIcon />
           <div>
             <div className="text-status-red font-heading3">
@@ -144,7 +145,7 @@ export default function WorkspaceSetting() {
               size="big"
               aria-label="워크스페이스 최종 삭제 버튼"
               onClick={onDelete}
-              className="px-12"
+              className="w-full md:w-auto"
             >
               삭제하기
             </Button>

From 97e4c3570079252c7d34dcbe48de8332cef950ba Mon Sep 17 00:00:00 2001
From: JAESEON PARK <ddorri83@naver.com>
Date: Wed, 25 Feb 2026 02:35:06 +0900
Subject: [PATCH 15/21] =?UTF-8?q?fix:=20=EC=BD=94=EB=93=9C=EB=9E=98?=
 =?UTF-8?q?=EB=B9=97=20=EC=88=98=EC=A0=95=EC=82=AC=ED=95=AD=20=EB=B0=98?=
 =?UTF-8?q?=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/dropdownmenu/DropdownMenu.tsx |  3 +++
 src/components/workspace/WorkspaceCard.tsx          | 12 +++---------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/components/common/dropdownmenu/DropdownMenu.tsx b/src/components/common/dropdownmenu/DropdownMenu.tsx
index 3a6c635..0485a4a 100644
--- a/src/components/common/dropdownmenu/DropdownMenu.tsx
+++ b/src/components/common/dropdownmenu/DropdownMenu.tsx
@@ -12,10 +12,12 @@ export function DropdownMenu({
   trigger,
   items,
   className,
+  "aria-label": ariaLabel,
 }: {
   trigger: React.ReactNode;
   items: TMenuItem[];
   className?: string;
+  "aria-label"?: string;
 }) {
   const [open, setOpen] = useState(false);
   const ref = useRef<HTMLDivElement | null>(null);
@@ -39,6 +41,7 @@ export function DropdownMenu({
         aria-haspopup="menu"
         aria-expanded={open}
         aria-controls="dropdown-menu"
+        aria-label={ariaLabel}
         onClick={() => setOpen((v) => !v)}
         onKeyDown={(e) => {
           if (e.key === "Enter" || e.key === " ") {
diff --git a/src/components/workspace/WorkspaceCard.tsx b/src/components/workspace/WorkspaceCard.tsx
index af3f553..45e4eca 100644
--- a/src/components/workspace/WorkspaceCard.tsx
+++ b/src/components/workspace/WorkspaceCard.tsx
@@ -45,15 +45,9 @@ export default function WorkspaceCard({ workspace: w, menuItems }: TProps) {
 
       <div className="flex items-center gap-4 shrink-0">
         <DropdownMenu
-          trigger={
-            <button
-              type="button"
-              aria-label={`${w.name} 워크스페이스 메뉴`}
-              className="h-10 w-10 rounded-xl hover:bg-gray-100 transition-colors flex items-center justify-center"
-            >
-              <VectorIcon />
-            </button>
-          }
+          trigger={<VectorIcon aria-hidden="true" />}
+          aria-label={`${w.name} 워크스페이스 메뉴`}
+          triggerClassName="h-10 w-10 rounded-xl hover:bg-gray-100 transition-colors flex items-center justify-center"
           items={menuItems}
         />
       </div>

From 894b3484305aa81b6c36b84d58dfa83e37e89d5b Mon Sep 17 00:00:00 2001
From: JAESEON PARK <ddorri83@naver.com>
Date: Wed, 25 Feb 2026 02:38:45 +0900
Subject: [PATCH 16/21] =?UTF-8?q?fix:=20build=20=EC=98=A4=EB=A5=98?=
 =?UTF-8?q?=EC=82=AC=ED=95=AD=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/workspace/WorkspaceCard.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/workspace/WorkspaceCard.tsx b/src/components/workspace/WorkspaceCard.tsx
index 45e4eca..1f25ee8 100644
--- a/src/components/workspace/WorkspaceCard.tsx
+++ b/src/components/workspace/WorkspaceCard.tsx
@@ -47,7 +47,7 @@ export default function WorkspaceCard({ workspace: w, menuItems }: TProps) {
         <DropdownMenu
           trigger={<VectorIcon aria-hidden="true" />}
           aria-label={`${w.name} 워크스페이스 메뉴`}
-          triggerClassName="h-10 w-10 rounded-xl hover:bg-gray-100 transition-colors flex items-center justify-center"
+          className="h-10 w-10 rounded-xl hover:bg-gray-100 transition-colors flex items-center justify-center"
           items={menuItems}
         />
       </div>

From a3bb04424c20bec9b9bd5e9121eb96eacdcc0beb Mon Sep 17 00:00:00 2001
From: JAESEON PARK <ddorri83@naver.com>
Date: Wed, 25 Feb 2026 02:42:51 +0900
Subject: [PATCH 17/21] =?UTF-8?q?fix:=20=EC=BD=94=EB=93=9C=EB=9E=98?=
 =?UTF-8?q?=EB=B9=97=20=EC=88=98=EC=A0=95=EC=82=AC=ED=95=AD=EB=B0=98?=
 =?UTF-8?q?=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/dropdownmenu/DropdownMenu.tsx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/common/dropdownmenu/DropdownMenu.tsx b/src/components/common/dropdownmenu/DropdownMenu.tsx
index 0485a4a..9037b7e 100644
--- a/src/components/common/dropdownmenu/DropdownMenu.tsx
+++ b/src/components/common/dropdownmenu/DropdownMenu.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useRef, useState } from "react";
+import React, { useEffect, useId, useRef, useState } from "react";
 import { twMerge } from "tailwind-merge";
 
 export type TMenuItem = {
@@ -21,6 +21,7 @@ export function DropdownMenu({
 }) {
   const [open, setOpen] = useState(false);
   const ref = useRef<HTMLDivElement | null>(null);
+  const menuId = useId();
 
   useEffect(() => {
     const onDocClick = (e: MouseEvent) => {
@@ -40,7 +41,7 @@ export function DropdownMenu({
         tabIndex={0}
         aria-haspopup="menu"
         aria-expanded={open}
-        aria-controls="dropdown-menu"
+        aria-controls={menuId}
         aria-label={ariaLabel}
         onClick={() => setOpen((v) => !v)}
         onKeyDown={(e) => {
@@ -54,7 +55,7 @@ export function DropdownMenu({
       </div>
       {open && (
         <div
-          id="dropdown-menu"
+          id={menuId}
           role="menu"
           className="absolute right-0 mt-2 w-56 max-w-[calc(100vw-40px)] rounding-15 bg-brand-200 py-3 px-1 shadow-Medium z-50"
         >

From 0c2b0054216134137c3e2fe413b8fa5974f2cd9c Mon Sep 17 00:00:00 2001
From: JAESEON PARK <ddorri83@naver.com>
Date: Wed, 25 Feb 2026 11:44:43 +0900
Subject: [PATCH 18/21] =?UTF-8?q?fix:=20=EB=93=9C=EB=9E=8D=EB=8B=A4?=
 =?UTF-8?q?=EC=9A=B4=20=EB=A9=94=EB=89=B4=20cursor-pointer=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80,=EC=95=84=EC=9D=B4=EC=BD=98=20hover=20=EC=83=89?=
 =?UTF-8?q?=EC=83=81=20=EB=B0=8F=20=EA=B8=B0=EB=B3=B8=20=EC=BB=AC=EB=9F=AC?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/icon/workspace/edit-contained.svg   |  2 +-
 src/assets/icon/workspace/userProfile.svg      |  2 +-
 .../common/dropdownmenu/DropdownMenu.tsx       | 18 +++++++++++++++---
 src/components/workspace/WorkspaceCard.tsx     |  2 +-
 src/pages/workspace/Workspace.tsx              |  4 ++--
 5 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/assets/icon/workspace/edit-contained.svg b/src/assets/icon/workspace/edit-contained.svg
index 1969f32..1420a4f 100644
--- a/src/assets/icon/workspace/edit-contained.svg
+++ b/src/assets/icon/workspace/edit-contained.svg
@@ -1,3 +1,3 @@
 <svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M6.93649 2.37731H3.38244C2.20472 2.37731 1.25 3.332 1.25 4.50967V11.6176C1.25 12.7953 2.20472 13.75 3.38244 13.75H10.4906C11.6683 13.75 12.623 12.7953 12.623 11.6176L12.623 8.06365M4.80406 10.196L7.39022 9.67491C7.52751 9.64725 7.65357 9.57964 7.75258 9.48059L13.5419 3.68823C13.8195 3.41051 13.8193 2.96035 13.5415 2.68287L12.3151 1.4579C12.0374 1.18053 11.5875 1.18072 11.31 1.45832L5.52006 7.25129C5.42125 7.35015 5.35378 7.47595 5.32609 7.61295L4.80406 10.196Z" stroke="#212121" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M6.93649 2.37731H3.38244C2.20472 2.37731 1.25 3.332 1.25 4.50967V11.6176C1.25 12.7953 2.20472 13.75 3.38244 13.75H10.4906C11.6683 13.75 12.623 12.7953 12.623 11.6176L12.623 8.06365M4.80406 10.196L7.39022 9.67491C7.52751 9.64725 7.65357 9.57964 7.75258 9.48059L13.5419 3.68823C13.8195 3.41051 13.8193 2.96035 13.5415 2.68287L12.3151 1.4579C12.0374 1.18053 11.5875 1.18072 11.31 1.45832L5.52006 7.25129C5.42125 7.35015 5.35378 7.47595 5.32609 7.61295L4.80406 10.196Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/src/assets/icon/workspace/userProfile.svg b/src/assets/icon/workspace/userProfile.svg
index e1a5aec..4aedf75 100644
--- a/src/assets/icon/workspace/userProfile.svg
+++ b/src/assets/icon/workspace/userProfile.svg
@@ -1,3 +1,3 @@
 <svg width="14" height="13" viewBox="0 0 14 13" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.26588 11.4635L9.26606 9.45491C9.26616 8.34542 8.36677 7.44595 7.25728 7.44595H2.75901C1.64968 7.44595 0.750351 8.34517 0.750226 9.45451L0.75 11.4635M12.7498 11.4636L12.75 9.45502C12.7501 8.34553 11.8507 7.44606 10.7412 7.44606M8.87896 1.14463C9.37227 1.51065 9.69197 2.09744 9.69197 2.75889C9.69197 3.42035 9.37227 4.00713 8.87896 4.37316M7.05862 2.75878C7.05862 3.86821 6.15926 4.76757 5.04984 4.76757C3.94042 4.76757 3.04105 3.86821 3.04105 2.75878C3.04105 1.64936 3.94042 0.75 5.04984 0.75C6.15926 0.75 7.05862 1.64936 7.05862 2.75878Z" stroke="#212121" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.26588 11.4635L9.26606 9.45491C9.26616 8.34542 8.36677 7.44595 7.25728 7.44595H2.75901C1.64968 7.44595 0.750351 8.34517 0.750226 9.45451L0.75 11.4635M12.7498 11.4636L12.75 9.45502C12.7501 8.34553 11.8507 7.44606 10.7412 7.44606M8.87896 1.14463C9.37227 1.51065 9.69197 2.09744 9.69197 2.75889C9.69197 3.42035 9.37227 4.00713 8.87896 4.37316M7.05862 2.75878C7.05862 3.86821 6.15926 4.76757 5.04984 4.76757C3.94042 4.76757 3.04105 3.86821 3.04105 2.75878C3.04105 1.64936 3.94042 0.75 5.04984 0.75C6.15926 0.75 7.05862 1.64936 7.05862 2.75878Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/src/components/common/dropdownmenu/DropdownMenu.tsx b/src/components/common/dropdownmenu/DropdownMenu.tsx
index 9037b7e..160da39 100644
--- a/src/components/common/dropdownmenu/DropdownMenu.tsx
+++ b/src/components/common/dropdownmenu/DropdownMenu.tsx
@@ -70,13 +70,25 @@ export function DropdownMenu({
                     setOpen(false);
                   }}
                   className={twMerge(
-                    "flex w-full items-center gap-3 rounding-15 px-5 py-4 text-left font-body1 transition-fast",
+                    "group flex w-full items-center gap-3 rounding-15 px-5 py-4 text-left font-body1 transition-fast",
                     it.active
                       ? "bg-brand-300 text-status-blue"
-                      : "text-text-main hover:bg-brand-300",
+                      : "text-text-main hover:bg-brand-300 hover:text-status-blue",
                   )}
                 >
-                  {it.icon}
+                  {it.icon ? (
+                    <span
+                      className={twMerge(
+                        "inline-flex h-5 w-5 items-center justify-center text-text-main",
+                        it.active
+                          ? "text-status-blue"
+                          : "group-hover:text-status-blue",
+                      )}
+                      aria-hidden="true"
+                    >
+                      {it.icon}
+                    </span>
+                  ) : null}
                   <span
                     className={twMerge(
                       "whitespace-nowrap",
diff --git a/src/components/workspace/WorkspaceCard.tsx b/src/components/workspace/WorkspaceCard.tsx
index 1f25ee8..ee83f66 100644
--- a/src/components/workspace/WorkspaceCard.tsx
+++ b/src/components/workspace/WorkspaceCard.tsx
@@ -47,7 +47,7 @@ export default function WorkspaceCard({ workspace: w, menuItems }: TProps) {
         <DropdownMenu
           trigger={<VectorIcon aria-hidden="true" />}
           aria-label={`${w.name} 워크스페이스 메뉴`}
-          className="h-10 w-10 rounded-xl hover:bg-gray-100 transition-colors flex items-center justify-center"
+          className="h-10 w-10 cursor-pointer rounded-xl hover:bg-gray-100 transition-colors flex items-center justify-center"
           items={menuItems}
         />
       </div>
diff --git a/src/pages/workspace/Workspace.tsx b/src/pages/workspace/Workspace.tsx
index b83d31b..817cb24 100644
--- a/src/pages/workspace/Workspace.tsx
+++ b/src/pages/workspace/Workspace.tsx
@@ -61,14 +61,14 @@ export default function WorkspacePage() {
 
   const menuItems = (id: TWorkspace["id"]): TMenuItem[] => [
     {
-      icon: <EditContainIcon />,
+      icon: <EditContainIcon className="h-5 w-5 fill-none stroke-current" />,
       label: "정보 수정하기",
       onClick: () => {
         void navigate(`/workspace/${id}/settings`);
       },
     },
     {
-      icon: <UserProfileIcon />,
+      icon: <UserProfileIcon className="h-5 w-5 fill-none stroke-current" />,
       label: "멤버 관리",
       onClick: () => alert("멤버 관리 기능은 추후 연결 예정"),
     },

From 4c69cbfe16fed1aa04c93bab2948d5395819ca2b Mon Sep 17 00:00:00 2001
From: JAESEON PARK <ddorri83@naver.com>
Date: Wed, 25 Feb 2026 11:56:05 +0900
Subject: [PATCH 19/21] =?UTF-8?q?style:=20=EC=A1=B0=EC=A7=81=20=EA=B2=80?=
 =?UTF-8?q?=EC=83=89=20input=20=EA=B8=B0=EB=B3=B8=20ring=20=EC=8A=A4?=
 =?UTF-8?q?=ED=83=80=EC=9D=BC=20=EB=B0=8F=20hover/focus=20=EC=83=81?=
 =?UTF-8?q?=ED=83=9C=20=EA=B0=9C=EC=84=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/input/Input.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/common/input/Input.tsx b/src/components/common/input/Input.tsx
index a8b7261..ff25249 100644
--- a/src/components/common/input/Input.tsx
+++ b/src/components/common/input/Input.tsx
@@ -51,12 +51,12 @@ const Input = forwardRef<HTMLInputElement, IInputProps>(
         )}
         <div
           className={twMerge(
-            "flex items-center w-full h-input bg-gray-50 border-transparent rounded-component-md transition-colors duration-200 ease-out overflow-hidden",
+            "flex items-center w-full h-input bg-white ring-1 ring-logo-1/30 rounded-component-md transition-colors duration-200 ease-out overflow-hidden",
             error
-              ? "ring-2 ring-status-red bg-status-red/5"
+              ? "ring-2 ring-status-red bg-status-red/5 border-transparent"
               : success
-                ? "ring-2 ring-logo-1 bg-white"
-                : "hover:bg-gray-100 focus-within:bg-white focus-within:ring-2 focus-within:ring-logo-1/30 focus-within:border-transparent",
+                ? "bg-white ring-1 ring-logo-1/30"
+                : "hover:bg-gray-100 hover:ring-logo-1/40 focus-within:bg-white focus-within:ring-2 focus-within:ring-logo-1/50",
             containerClassName,
           )}
         >

From 9433b52689064d89a2599d4dbd489a486cfede06 Mon Sep 17 00:00:00 2001
From: JAESEON PARK <ddorri83@naver.com>
Date: Wed, 25 Feb 2026 12:27:19 +0900
Subject: [PATCH 20/21] =?UTF-8?q?fix:=20=EC=BD=94=EB=93=9C=EB=9E=98?=
 =?UTF-8?q?=EB=B9=97=20=EC=88=98=EC=A0=95=EC=82=AC=ED=95=AD=20=EB=B0=98?=
 =?UTF-8?q?=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/input/Input.tsx |  4 ++--
 src/pages/workspace/Workspace.tsx     | 18 ++++++++++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/components/common/input/Input.tsx b/src/components/common/input/Input.tsx
index ff25249..577c44f 100644
--- a/src/components/common/input/Input.tsx
+++ b/src/components/common/input/Input.tsx
@@ -53,9 +53,9 @@ const Input = forwardRef<HTMLInputElement, IInputProps>(
           className={twMerge(
             "flex items-center w-full h-input bg-white ring-1 ring-logo-1/30 rounded-component-md transition-colors duration-200 ease-out overflow-hidden",
             error
-              ? "ring-2 ring-status-red bg-status-red/5 border-transparent"
+              ? "ring-2 ring-status-red bg-status-red/5"
               : success
-                ? "bg-white ring-1 ring-logo-1/30"
+                ? "rubg-2 ring-status-green bg-status-green/5"
                 : "hover:bg-gray-100 hover:ring-logo-1/40 focus-within:bg-white focus-within:ring-2 focus-within:ring-logo-1/50",
             containerClassName,
           )}
diff --git a/src/pages/workspace/Workspace.tsx b/src/pages/workspace/Workspace.tsx
index 817cb24..312487f 100644
--- a/src/pages/workspace/Workspace.tsx
+++ b/src/pages/workspace/Workspace.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo, useRef, useState } from "react";
+import React, { useEffect, useMemo, useRef, useState } from "react";
 import { useNavigate } from "react-router-dom";
 
 import type { TWorkspace } from "@/types/workspace/workspace";
@@ -28,8 +28,10 @@ export default function WorkspacePage() {
   const openFile = () => {
     if (!fileRef.current) return;
     fileRef.current.value = "";
-    fileRef.current?.click();
+    fileRef.current.click();
   };
+  const [logoFile, setLogoFile] = useState<File | null>(null);
+  const [logoPreview, setLogoPreview] = useState<string | null>(null);
   const workspaces: TWorkspace[] = useMemo(
     () => [
       {
@@ -82,8 +84,17 @@ export default function WorkspacePage() {
   const onPickFile = (e: React.ChangeEvent<HTMLInputElement>) => {
     const file = e.target.files?.[0];
     if (!file) return;
+    setLogoFile(file);
+    setLogoPreview(URL.createObjectURL(file));
   };
 
+  // TODO: 모달 닫힐때 preview URL 해제필요
+  useEffect(() => {
+    return () => {
+      if (logoPreview) URL.revokeObjectURL(logoPreview);
+    };
+  }, [logoPreview]);
+
   // TODO: API 연동 후에 생성 동작 연결하기
   const onSubmitCreate = () => {
     alert("API 연동 후에 생성 기능 연결예정");
@@ -100,6 +111,7 @@ export default function WorkspacePage() {
       <div className="mb-6 flex flex-col gap-4 sm:flex-row sm:items-center">
         <div className="flex-1">
           <Input
+            aria-label="조직 검색"
             placeholder="조직을 검색하세요"
             value={query}
             onChange={(e) => setQuery(e.target.value)}
@@ -107,6 +119,7 @@ export default function WorkspacePage() {
           />
         </div>
         <Button
+          type="button"
           onClick={onOpenCreate}
           size="big"
           variant="primary"
@@ -195,6 +208,7 @@ export default function WorkspacePage() {
               onClick={onSubmitCreate}
               disabled={!newName.trim()}
               className="mx-auto px-10 mt-10"
+              type="button"
             >
               생성하기
             </Button>

From 09fff8cc75b1ab1d7ac7f80886d58eb636f250cc Mon Sep 17 00:00:00 2001
From: JAESEON PARK <ddorri83@naver.com>
Date: Wed, 25 Feb 2026 12:33:06 +0900
Subject: [PATCH 21/21] =?UTF-8?q?fix:=20build=20=EC=97=90=EB=9F=AC=20?=
 =?UTF-8?q?=EC=B2=98=EB=A6=AC(logoFile=20=EC=95=84=EC=A7=81=20=EC=82=AC?=
 =?UTF-8?q?=EC=9A=A9=EC=A0=84=EC=9D=B4=EB=9D=BC=20=EB=82=9C=20=EC=97=90?=
 =?UTF-8?q?=EB=9F=AC,=20=EC=8B=A4=EC=A0=9C=EC=82=AC=EC=9A=A9=EC=9C=BC?=
 =?UTF-8?q?=EB=A1=9C=20=EC=9D=BC=EB=8B=A8=20=EC=B2=98=EB=A6=AC=ED=95=B4?=
 =?UTF-8?q?=EB=91=A0)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/workspace/Workspace.tsx | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/pages/workspace/Workspace.tsx b/src/pages/workspace/Workspace.tsx
index 312487f..c2b2625 100644
--- a/src/pages/workspace/Workspace.tsx
+++ b/src/pages/workspace/Workspace.tsx
@@ -97,6 +97,16 @@ export default function WorkspacePage() {
 
   // TODO: API 연동 후에 생성 동작 연결하기
   const onSubmitCreate = () => {
+    const form = new FormData();
+    form.append("name", newName.trim());
+    form.append("description", newDesc.trim());
+    if (logoFile) form.append("logo", logoFile);
+
+    console.log("create payload", {
+      name: newName.trim(),
+      description: newDesc.trim(),
+      logoFile,
+    });
     alert("API 연동 후에 생성 기능 연결예정");
   };