Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

사이트 접속 안되는 문제 해결 #383

Merged
merged 1 commit into from
Dec 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
interface WorkspaceNavProps {
workspaceTitle: string;
}

export function WorkspaceNav({ workspaceTitle }: WorkspaceNavProps) {
// 빌드 에러 해결을 위한 임시 코드.
console.log(workspaceTitle);
// TODO: 워크스페이스 이름 받아야함
export function WorkspaceNav() {
return (
<div className="flex flex-row items-center justify-center gap-2">
<h1 className="text-md font-semibold">{"환영합니다 👋🏻"}</h1>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
import { useEffect } from "react";
import { useNavigate } from "@tanstack/react-router";
import { useCurrentWorkspace } from "@/features/workspace/model/workspaceQuries";
import { useGetUser } from "@/features/auth";

import { useCurrentWorkspace } from "../model/workspaceQuries";

export const useProtectedWorkspace = () => {
const navigate = useNavigate();
const { isLoading: isUserLoading } = useGetUser();
const {
data: workspaceData,
isLoading: isWorkspaceLoading,
error,
} = useCurrentWorkspace();

useEffect(() => {
if (!isUserLoading && !isWorkspaceLoading && (error || !workspaceData)) {
if (!isWorkspaceLoading && (error || !workspaceData)) {
navigate({ to: "/" });
}
}, [isUserLoading, isWorkspaceLoading, workspaceData, error, navigate]);
}, [isWorkspaceLoading, workspaceData, error, navigate]);

return {
isLoading: isUserLoading || isWorkspaceLoading,
isLoading: isWorkspaceLoading,
workspaceData,
};
};
1 change: 0 additions & 1 deletion apps/frontend/src/shared/lib/useWorkspace.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@ export function useWorkspace(): string {
(match) => match.routeId === "/workspace/$workspaceId",
);
const workspaceId = workspaceMatch?.params.workspaceId ?? "main";
console.log(workspaceId);
return workspaceId;
}
12 changes: 5 additions & 7 deletions apps/frontend/src/widgets/TopNavView/ui/index.tsx
Original file line number Diff line number Diff line change
@@ -1,34 +1,32 @@
import { Menu, X } from "lucide-react";

import { WorkspaceNav } from "@/features/pageSidebar";
import { useUserWorkspace } from "@/features/workspace";
import { UserInfoView } from "@/widgets/UserInfoView";
import { Divider } from "@/shared/ui";
import { useWorkspace } from "@/shared/lib";

interface TopNavProps {
onExpand: () => void;
isExpanded: boolean;
}
export function TopNavView({ onExpand, isExpanded }: TopNavProps) {
const workspace = useWorkspace();
const { data } = useUserWorkspace();
/* const workspace = useWorkspace();
const { data } = useUserWorkspace(); */

const getWorkspaceTitle = () => {
/* const getWorkspaceTitle = () => {
if (!workspace) return "공용 워크스페이스";

return (
data?.workspaces.find((w) => w.workspaceId === workspace)?.title ??
"로딩 중..."
);
};
}; */

return (
<div className="flex w-full flex-row items-center justify-between">
<div className="flex flex-row items-center gap-2">
<UserInfoView />
<Divider direction="vertical" className="h-3" />
<WorkspaceNav workspaceTitle={getWorkspaceTitle()} />
<WorkspaceNav />
</div>
<div className="flex h-7 w-7 items-center justify-center">
<button onClick={onExpand}>
Expand Down
Loading