fix: 머지 충돌 해결

Author: djk01281

apps/frontend/src/app/routeTree.gen.ts

@@ -10,85 +10,104 @@
 
 // Import Routes
 
-import { Route as rootRoute } from "./routes/__root";
-import { Route as IndexImport } from "./routes/index";
-import { Route as WorkspaceWorkspaceIdImport } from "./routes/workspace/$workspaceId";
+import { Route as rootRoute } from './routes/__root'
+import { Route as IndexImport } from './routes/index'
+import { Route as JoinIndexImport } from './routes/join/index'
+import { Route as WorkspaceWorkspaceIdImport } from './routes/workspace/$workspaceId'
 
 // Create/Update Routes
 
 const IndexRoute = IndexImport.update({
-  id: "/",
-  path: "/",
+  id: '/',
+  path: '/',
   getParentRoute: () => rootRoute,
-} as any);
+} as any)
+
+const JoinIndexRoute = JoinIndexImport.update({
+  id: '/join/',
+  path: '/join/',
+  getParentRoute: () => rootRoute,
+} as any)
 
 const WorkspaceWorkspaceIdRoute = WorkspaceWorkspaceIdImport.update({
-  id: "/workspace/$workspaceId",
-  path: "/workspace/$workspaceId",
+  id: '/workspace/$workspaceId',
+  path: '/workspace/$workspaceId',
   getParentRoute: () => rootRoute,
-} as any);
+} as any)
 
 // Populate the FileRoutesByPath interface
 
-declare module "@tanstack/react-router" {
+declare module '@tanstack/react-router' {
   interface FileRoutesByPath {
-    "/": {
-      id: "/";
-      path: "/";
-      fullPath: "/";
-      preLoaderRoute: typeof IndexImport;
-      parentRoute: typeof rootRoute;
-    };
-    "/workspace/$workspaceId": {
-      id: "/workspace/$workspaceId";
-      path: "/workspace/$workspaceId";
-      fullPath: "/workspace/$workspaceId";
-      preLoaderRoute: typeof WorkspaceWorkspaceIdImport;
-      parentRoute: typeof rootRoute;
-    };
+    '/': {
+      id: '/'
+      path: '/'
+      fullPath: '/'
+      preLoaderRoute: typeof IndexImport
+      parentRoute: typeof rootRoute
+    }
+    '/workspace/$workspaceId': {
+      id: '/workspace/$workspaceId'
+      path: '/workspace/$workspaceId'
+      fullPath: '/workspace/$workspaceId'
+      preLoaderRoute: typeof WorkspaceWorkspaceIdImport
+      parentRoute: typeof rootRoute
+    }
+    '/join/': {
+      id: '/join/'
+      path: '/join'
+      fullPath: '/join'
+      preLoaderRoute: typeof JoinIndexImport
+      parentRoute: typeof rootRoute
+    }
   }
 }
 
 // Create and export the route tree
 
 export interface FileRoutesByFullPath {
-  "/": typeof IndexRoute;
-  "/workspace/$workspaceId": typeof WorkspaceWorkspaceIdRoute;
+  '/': typeof IndexRoute
+  '/workspace/$workspaceId': typeof WorkspaceWorkspaceIdRoute
+  '/join': typeof JoinIndexRoute
 }
 
 export interface FileRoutesByTo {
-  "/": typeof IndexRoute;
-  "/workspace/$workspaceId": typeof WorkspaceWorkspaceIdRoute;
+  '/': typeof IndexRoute
+  '/workspace/$workspaceId': typeof WorkspaceWorkspaceIdRoute
+  '/join': typeof JoinIndexRoute
 }
 
 export interface FileRoutesById {
-  __root__: typeof rootRoute;
-  "/": typeof IndexRoute;
-  "/workspace/$workspaceId": typeof WorkspaceWorkspaceIdRoute;
+  __root__: typeof rootRoute
+  '/': typeof IndexRoute
+  '/workspace/$workspaceId': typeof WorkspaceWorkspaceIdRoute
+  '/join/': typeof JoinIndexRoute
 }
 
 export interface FileRouteTypes {
-  fileRoutesByFullPath: FileRoutesByFullPath;
-  fullPaths: "/" | "/workspace/$workspaceId";
-  fileRoutesByTo: FileRoutesByTo;
-  to: "/" | "/workspace/$workspaceId";
-  id: "__root__" | "/" | "/workspace/$workspaceId";
-  fileRoutesById: FileRoutesById;
+  fileRoutesByFullPath: FileRoutesByFullPath
+  fullPaths: '/' | '/workspace/$workspaceId' | '/join'
+  fileRoutesByTo: FileRoutesByTo
+  to: '/' | '/workspace/$workspaceId' | '/join'
+  id: '__root__' | '/' | '/workspace/$workspaceId' | '/join/'
+  fileRoutesById: FileRoutesById
 }
 
 export interface RootRouteChildren {
-  IndexRoute: typeof IndexRoute;
-  WorkspaceWorkspaceIdRoute: typeof WorkspaceWorkspaceIdRoute;
+  IndexRoute: typeof IndexRoute
+  WorkspaceWorkspaceIdRoute: typeof WorkspaceWorkspaceIdRoute
+  JoinIndexRoute: typeof JoinIndexRoute
 }
 
 const rootRouteChildren: RootRouteChildren = {
   IndexRoute: IndexRoute,
   WorkspaceWorkspaceIdRoute: WorkspaceWorkspaceIdRoute,
-};
+  JoinIndexRoute: JoinIndexRoute,
+}
 
 export const routeTree = rootRoute
   ._addFileChildren(rootRouteChildren)
-  ._addFileTypes<FileRouteTypes>();
+  ._addFileTypes<FileRouteTypes>()
 
 /* ROUTE_MANIFEST_START
 {
@@ -97,14 +116,18 @@ export const routeTree = rootRoute
       "filePath": "__root.tsx",
       "children": [
         "/",
-        "/workspace/$workspaceId"
+        "/workspace/$workspaceId",
+        "/join/"
       ]
     },
     "/": {
       "filePath": "index.tsx"
     },
     "/workspace/$workspaceId": {
       "filePath": "workspace/$workspaceId.tsx"
+    },
+    "/join/": {
+      "filePath": "join/index.tsx"
     }
   }
 }

apps/frontend/src/routes/join/index.tsx …s/frontend/src/app/routes/join/index.tsxapps/frontend/src/routes/join/index.tsx renamed to apps/frontend/src/app/routes/join/index.tsx apps/frontend/src/routes/join/index.tsx renamed to apps/frontend/src/app/routes/join/index.tsx

@@ -1,8 +1,9 @@
 import { useEffect } from "react";
 import { createFileRoute, useNavigate } from "@tanstack/react-router";
-import { useValidateWorkspaceInviteLink } from "@/features/workspace/model/useWorkspaceInvite";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 
+import { useValidateWorkspaceInviteLink } from "@/features/workspace";
+
 const joinQueryClient = new QueryClient();
 
 function JoinWrapper() {

apps/frontend/src/features/auth/model/useAuth.ts

@@ -0,0 +1,26 @@
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+
+import { getUser, logout } from "../api/authApi";
+
+export const useGetUser = () => {
+  return useQuery({
+    queryKey: ["user"],
+    queryFn: getUser,
+    retry: false,
+    refetchOnWindowFocus: false,
+  });
+};
+
+export const useLogout = () => {
+  const queryClient = useQueryClient();
+
+  const logoutMutation = useMutation({
+    mutationFn: logout,
+    onSuccess: async () => {
+      queryClient.setQueryData(["user"], null);
+      await queryClient.invalidateQueries({ queryKey: ["user"] });
+    },
+  });
+
+  return logoutMutation;
+};

apps/frontend/src/features/workspace/index.ts

@@ -1,5 +1,6 @@
 export { useUserWorkspace } from "./model/workspaceQuries";
-export { useProtectedWorkspace } from "./model/use";
+export { useProtectedWorkspace } from "./model/useProtectedWorkspace";
+export { useValidateWorkspaceInviteLink } from "./model/workspaceMutations";
 
 export { ShareTool } from "./ui/ShareTool";
 export { WorkspaceAddButton } from "./ui/WorkspaceAddButton";

apps/frontend/src/features/workspace/model/useProtectedWorkspace.ts

@@ -1,6 +1,6 @@
 import { useEffect } from "react";
 import { useNavigate } from "@tanstack/react-router";
-import { useCurrentWorkspace } from "@/features/workspace/model/useWorkspace";
+import { useCurrentWorkspace } from "@/features/workspace/model/workspaceQuries";
 
 export const useProtectedWorkspace = () => {
   const navigate = useNavigate();

apps/frontend/src/features/workspace/model/workspaceMutations.ts

@@ -9,6 +9,7 @@ import {
   createWorkspaceInviteLink,
   validateWorkspaceInviteLink,
 } from "../api/worskspaceInviteApi";
+import { useWorkspace } from "@/shared/lib";
 
 // response로 workspaceId가 오는데 userWorkspace를 어떻게 invalidate 할까?
 // login state에 있는 userId로?
@@ -48,9 +49,9 @@ export const useValidateWorkspaceInviteLink = () => {
 
 export const useToggleWorkspaceStatus = (
   currentStatus: "public" | "private" | undefined,
-  currentWorkspaceId: string,
 ) => {
   const queryClient = useQueryClient();
+  const currentWorkspaceId = useWorkspace();
 
   return useMutation({
     mutationFn: () => {
@@ -67,6 +68,7 @@ export const useToggleWorkspaceStatus = (
     },
     onSuccess: () => {
       queryClient.invalidateQueries({ queryKey: ["userWorkspace"] });
+      queryClient.invalidateQueries({ queryKey: ["currentWorkspace"] });
     },
   });
 };

apps/frontend/src/features/workspace/model/workspaceQuries.ts

@@ -1,10 +1,27 @@
 import { useQuery } from "@tanstack/react-query";
 
-import { getUserWorkspaces } from "../api/workspaceApi";
+import { getUserWorkspaces, getCurrentWorkspace } from "../api/workspaceApi";
+import { useGetUser } from "@/features/auth";
+import { useWorkspace } from "@/shared/lib/useWorkspace";
 
 export const useUserWorkspace = () => {
   return useQuery({
     queryKey: ["userWorkspace"],
     queryFn: getUserWorkspaces,
   });
 };
+
+export const useCurrentWorkspace = () => {
+  const workspaceId = useWorkspace();
+  const { data: user, isError } = useGetUser();
+
+  const snowflakeId = isError ? "null" : (user?.snowflakeId ?? "null");
+
+  return useQuery({
+    queryKey: ["currentWorkspace", workspaceId, snowflakeId],
+    queryFn: () => getCurrentWorkspace(workspaceId, snowflakeId),
+    enabled: Boolean(workspaceId),
+    retry: false,
+    refetchOnWindowFocus: false,
+  });
+};

apps/frontend/src/features/workspace/ui/ShareTool/SharePanel.tsx

@@ -1,13 +1,13 @@
 import { useState } from "react";
-import { Switch } from "@/shared/ui/Switch";
 import { Globe2, Lock, Copy, CheckCheck } from "lucide-react";
-import { useCreateWorkspaceInviteLink } from "../../model/useWorkspaceInvite";
-import { useCurrentWorkspace } from "../../model/workspaceQuries";
 
+import { useCreateWorkspaceInviteLink } from "../../model/workspaceMutations";
+import { useCurrentWorkspace } from "../../model/workspaceQuries";
 import { useToggleWorkspaceStatus } from "../../model/workspaceMutations";
 import { useWorkspaceStatus } from "../../model/useWorkspaceStatus";
 import { useGetUser } from "@/features/auth";
 import { useWorkspace } from "@/shared/lib";
+import { Switch } from "@/shared/ui";
 
 const createFrontendUrl = (apiUrl: string, currentWorkspaceId: string) => {
   const searchParams = new URLSearchParams();