merge to develop

apps/web/src/app/desktop/component/retrospect/template/list/index.tsx

@@ -34,6 +34,8 @@ export function TemplateList() {
 
   // * @see AddSpacePage.tsx - 첫 스페이스와 회고 생성시에 템플릿 선택 화면으로 이동할 때 URL 파라미터로 타입을 넘겨줘요
   const type = searchParams.get("template_type") || "";
+  const isInitialCreateRetrospect = type === "new_space";
+
   const DEFAULT_TAB = ["기본", "커스텀"] as const;
 
   const { tabs, curTab, selectTab } = useTabs(DEFAULT_TAB);
@@ -50,7 +52,8 @@ export function TemplateList() {
   return (
     <>
       {/* ---------- 템플릿 탭 UI ---------- */}
-      <TemplateListTab tabs={tabs} curTab={curTab} selectTab={selectTab} TabComp={TemplateListTabButton} />
+      {/* 스페이스 신규 생성일 경우에는 선택(기본 및 커스텀) 탭을 노출시키지 않는다. */}
+      {!isInitialCreateRetrospect && <TemplateListTab tabs={tabs} curTab={curTab} selectTab={selectTab} TabComp={TemplateListTabButton} />}
 
       {/* ---------- 템플릿 카드 리스트 UI ---------- */}
       <div

apps/web/src/app/desktop/space/modify/ModifySpacePage.tsx

@@ -6,11 +6,13 @@ import { Spacing } from "@/component/common/Spacing";
 import useModifySpace, { MODIFY_SPACE_ID_QUERY_KEY } from "@/hooks/app/space/useModifySpace";
 import useDesktopBasicModal from "@/hooks/useDesktopBasicModal";
 import { css } from "@emotion/react";
+import { useState } from "react";
 import { useSearchParams } from "react-router-dom";
 
 // 데스크톱 환경에서는 해당 수정 페이지가 모달 안에 이식되어요
 export default function ModifySpacePage() {
   const [searchParams] = useSearchParams();
+  const [isChangedImage, setIsChangedImage] = useState(false);
   const spaceId = searchParams.get(MODIFY_SPACE_ID_QUERY_KEY) as string;
   const {
     data,
@@ -28,7 +30,7 @@ export default function ModifySpacePage() {
 
   const initialName = data?.name || "";
   const initialIntroduction = data?.introduction || "";
-  const isUnchanged = name === initialName && introduction === initialIntroduction;
+  const isUnchanged = !isChangedImage && name === initialName && introduction === initialIntroduction;
 
   if (isLoading || isPending) return <LoadingModal />;
 
@@ -41,7 +43,15 @@ export default function ModifySpacePage() {
         height: 100%;
       `}
     >
-      <ImageUploader defaultImg={data?.bannerUrl} setImgFile={setImgFile} />
+      <ImageUploader
+        defaultImg={data?.bannerUrl}
+        setImgFile={setImgFile}
+        onChange={(file) => {
+          if (file && file instanceof File) {
+            setIsChangedImage(true);
+          }
+        }}
+      />
       <Spacing size={4} />
       <InputLabelContainer id={"name"}>
         <Label>프로젝트 명</Label>

apps/web/src/component/common/ImageUploader/ImageUploader.tsx

@@ -9,9 +9,10 @@ import { getDeviceType } from "@/utils/deviceUtils";
 type ImageUploaderProps = {
   defaultImg?: string;
   setImgFile: React.Dispatch<React.SetStateAction<File | null>>;
+  onChange?: (file: File | undefined) => void;
 };
 
-export const ImageUploader = ({ defaultImg, setImgFile }: ImageUploaderProps) => {
+export const ImageUploader = ({ defaultImg, setImgFile, onChange }: ImageUploaderProps) => {
   const [imgUrl, setImgUrl] = useState(defaultImg || DefaultSpaceImgUrl);
   const { isDesktop } = getDeviceType();
 
@@ -31,6 +32,7 @@ export const ImageUploader = ({ defaultImg, setImgFile }: ImageUploaderProps) =>
         setImgFile(file);
       };
     }
+    onChange?.(file);
   };
 
   const handleImageClick = () => {

apps/web/src/hooks/api/space/members/useApiKickMembers.ts

@@ -8,7 +8,7 @@ export const useApiKickMember = (spaceId: string) => {
   const queryClient = useQueryClient();
 
   const apiKickMember = async ({ spaceId, memberId }: { spaceId: string; memberId: string }) => {
-    const response = await api.patch(`/api/space/kick?spaceId=${spaceId}&memberId=${memberId}`);
+    const response = await api.patch(`/api/space/kick`, { spaceId, memberId });
     return response;
   };
 
@@ -18,6 +18,9 @@ export const useApiKickMember = (spaceId: string) => {
       await queryClient.invalidateQueries({
         queryKey: ["getMembers", spaceId],
       });
+      await queryClient.invalidateQueries({
+        queryKey: ["getSpaceInfo", spaceId],
+      });
       toast.success("해당 팀원을 추방시켰습니다.");
     },
     onError: (error) => {

apps/web/src/router/index.tsx

@@ -133,7 +133,6 @@ const deviceSpecificRoutes: RouteChildren[] = [
     auth: true,
     deviceType: "desktop",
   },
-
   // 로그인 관련
   {
     path: "login",
@@ -147,7 +146,6 @@ const deviceSpecificRoutes: RouteChildren[] = [
     auth: false,
     deviceType: "desktop",
   },
-
   // 회고 작성 - 모바일
   {
     path: "write",
@@ -390,17 +388,17 @@ const router = ({ layoutType }: { layoutType: "mobile" | "desktop" }) => {
   if (layoutType === "mobile") {
     return createBrowserRouter([
       {
-        path: "/*",
-        element: <Navigate to="/m" replace />,
+        path: "/desktop/*",
+        element: <Navigate to="/" replace />,
       },
       {
-        path: "/m",
+        path: "/",
         element: <MobileGlobalLayout />,
         errorElement: <Error />,
         children: routerChildren,
       },
       {
-        path: "/",
+        path: "*",
         element: <MobileGlobalLayout />,
         errorElement: <Error />,
         children: commonRoutes.map((route) => ({
@@ -412,17 +410,17 @@ const router = ({ layoutType }: { layoutType: "mobile" | "desktop" }) => {
   } else {
     return createBrowserRouter([
       {
-        path: "/m/*",
-        element: <Navigate to="/" replace />,
+        path: "/*",
+        element: <Navigate to="/desktop" replace />,
       },
       {
-        path: "/",
+        path: "/desktop",
         element: <DesktopGlobalLayout />,
         errorElement: <Error />,
         children: routerChildren,
       },
       {
-        path: "/",
+        path: "*",
         element: <DesktopGlobalLayout />,
         errorElement: <Error />,
         children: commonRoutes.map((route) => ({

packages/shared/constants/paths/index.ts

@@ -2,7 +2,7 @@ import { getDeviceType } from "@/utils/deviceUtils";
 
 export const createPaths = () => {
   const { deviceType } = getDeviceType();
-  const prefix = deviceType === "mobile" ? "/m" : "";
+  const prefix = deviceType === "mobile" ? "" : "/desktop";
 
   return {
     login: () => `${prefix}/login` as const,