move: 폴더 구조 변경

src/app/(providers)/(root)/[workspaceId]/page.tsx

@@ -1,5 +1,40 @@
-const HomePage = () => {
-  return <main>hello!</main>;
+'use client';
+import useWorkspaceUser from '@/hooks/useWorkspaceUser';
+import useUserStore from '@/store/userStore';
+import { useShallow } from 'zustand/react/shallow';
+import Header from './_components/Header';
+import HomeMemberCard from './_components/HomeMemberCard';
+import MemberExistComponent from './_components/MemberExistComponent';
+import MemberNotExistComponent from './_components/MemberNotExistComponent';
+
+const Homepage = () => {
+  const userInfo = {
+    name: '이름',
+    position: 'Position',
+    status: 'Status'
+  };
+  const workspaceUserList = [];
+
+  const { workspaceUserId, workspaceList } = useUserStore(
+    useShallow((state) => ({
+      workspaceUserId: state.workspaceUserId,
+      workspaceList: state.workspaceList
+    }))
+  );
+  console.log(workspaceUserId);
+  const { workspaceUser } = useWorkspaceUser(workspaceUserId);
+  console.log(workspaceUser);
+  if (!workspaceUser) return;
+  return (
+    <div>
+      <Header />
+      <main className="px-[16px] mt-[26px]">
+        <HomeMemberCard name={workspaceUser.name} position={workspaceUser.position} status={workspaceUser.state} />
+
+        {workspaceUserList.length === 0 ? <MemberNotExistComponent /> : <MemberExistComponent />}
+      </main>
+    </div>
+  );
 };
 
-export default HomePage;
+export default Homepage;

src/app/(providers)/(root)/auth/login/page.tsx

@@ -1,13 +1,13 @@
 'use client';
+import useShallowSelector from '@/hooks/useShallowSelector';
+import { useAuthStore } from '@/providers/AuthStoreProvider';
+import { AuthStoreTypes } from '@/store/authStore';
+import useUserStore from '@/store/userStore';
 import { supabase } from '@/utils/supabase/supabaseClient';
 import { useMutation } from '@tanstack/react-query';
 import { useRouter } from 'next/navigation';
 import { useEffect, useState } from 'react';
 import BackButton from '../_components/BackButton';
-import useShallowSelector from '@/hooks/useShallowSelector';
-import { AuthStoreTypes } from '@/store/authStore';
-import { useAuthStore } from '@/providers/AuthStoreProvider';
-import useUserStore from '@/store/userStore';
 
 type UserType = {
   user: AuthStoreTypes['user'];
@@ -58,7 +58,7 @@ const LoginPage = () => {
       }
 
       setUserData(session.user.id, workspaceUserData.workspace_id);
-      route.push('/home'); // TODO : 메인 홈 으로 이동
+      route.push(`/${workspaceUserData.workspace_id}`); // TODO : 메인 홈 으로 이동
     }
   });
 
@@ -67,7 +67,7 @@ const LoginPage = () => {
   useEffect(() => {
     if (user) {
       // alert('이미 로그인 중입니다.');
-      route.push('/home'); // TODO : 메인 홈 화면 이동 변경
+      // route.push('/home'); // TODO : 메인 홈 화면 이동 변경
     }
   }, []);
 

src/app/(providers)/(root)/[workspaceId]/(homeLayout)/layout.tsx → src/app/(providers)/(root)/layout.tsx

@@ -5,7 +5,7 @@ import { StrictPropsWithChildren } from '@/types/common';
 import { useEffect } from 'react';
 import { useShallow } from 'zustand/react/shallow';
 
-const HomeLayout = ({ children }: StrictPropsWithChildren) => {
+const RootLayout = ({ children }: StrictPropsWithChildren) => {
   const { userId, workspaceId, setWorkspaceData } = useUserStore(
     useShallow((state) => ({
       userId: state.userId,
@@ -27,4 +27,4 @@ const HomeLayout = ({ children }: StrictPropsWithChildren) => {
   return <>{children}</>;
 };
 
-export default HomeLayout;
+export default RootLayout;

src/app/api/workspace-list/route.ts

@@ -21,7 +21,7 @@ export const GET = async (request: NextRequest) => {
     const workspaceList = workspaceListData?.map((workspace) => {
       const workspaceUserId = workspace.id;
       const workspaceInfo = workspace.workspace_id;
-      console.log(workspace, workspaceInfo, workspaceListData);
+      // console.log(workspace, workspaceInfo, workspaceListData);
       return { workspace_user_id: workspaceUserId, ...workspaceInfo };
     });
     const data = {

src/hooks/useWorkspaceUser.ts

@@ -2,16 +2,14 @@ import api from '@/api/api';
 import { Tables } from '@/types/supabase';
 import { useMutation, useQuery } from '@tanstack/react-query';
 
-const FAKE_WORKSPACE_USER_ID = '9f144ad8-59c1-4da1-be3d-e9e1c207eddb';
-
-const useWorkspaceUser = () => {
+const useWorkspaceUser = (userId: string) => {
   const {
     data: workspaceUser,
     isPending,
     isError
   } = useQuery({
     queryKey: ['workspaceUser'],
-    queryFn: () => api.workspaceUser.getWorkspaceUser(FAKE_WORKSPACE_USER_ID)
+    queryFn: () => api.workspaceUser.getWorkspaceUser(userId)
   });
 
   const { mutateAsync: updateWorkspaceUser } = useMutation({