Skip to content

Commit 72a04d7

Browse files
committed
fix: 초기 렌더링 해결
1 parent 303e2bd commit 72a04d7

File tree

6 files changed

+14
-33
lines changed

6 files changed

+14
-33
lines changed

apps/backend/src/app.module.ts

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,30 +20,21 @@ import { AuthModule } from './auth/auth.module';
2020
import { UserModule } from './user/user.module';
2121
import { WorkspaceModule } from './workspace/workspace.module';
2222
import { RoleModule } from './role/role.module';
23-
import { RedisService } from './redis/redis.service';
24-
import { RedisModule } from './redis/redis.module';
25-
import { ScheduleModule } from '@nestjs/schedule';
26-
import { TasksService } from './tasks/tasks.service';
2723

2824
@Module({
2925
imports: [
30-
ScheduleModule.forRoot(),
3126
ServeStaticModule.forRoot({
3227
rootPath: path.join(__dirname, '..', '..', 'frontend', 'dist'),
3328
}),
3429
ConfigModule.forRoot({
3530
isGlobal: true,
36-
envFilePath: '/app/.env', // * docker 내부 디렉터리 기준
31+
envFilePath: path.join(__dirname, '..', '.env'), // * nest 디렉터리 기준
3732
}),
3833
TypeOrmModule.forRootAsync({
3934
imports: [ConfigModule],
4035
inject: [ConfigService],
4136
useFactory: (configService: ConfigService) => ({
42-
type: 'postgres',
43-
host: configService.get('DB_HOST'),
44-
port: configService.get('DB_PORT'),
45-
username: configService.get('DB_USER'),
46-
password: configService.get('DB_PASSWORD'),
37+
type: 'sqlite',
4738
database: configService.get('DB_NAME'),
4839
entities: [Node, Page, Edge, User, Workspace, Role],
4940
logging: true,
@@ -59,9 +50,8 @@ import { TasksService } from './tasks/tasks.service';
5950
UserModule,
6051
WorkspaceModule,
6152
RoleModule,
62-
RedisModule,
6353
],
6454
controllers: [AppController],
65-
providers: [AppService, RedisService, TasksService],
55+
providers: [AppService],
6656
})
6757
export class AppModule {}

apps/frontend/src/app/App.tsx

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,16 @@
1-
import { useEffect } from "react";
2-
import * as Y from "yjs";
3-
41
import { useSyncedUsers } from "@/entities/user";
52
import { SideWrapper } from "@/shared/ui";
63
import { CanvasView } from "@/widgets/CanvasView";
74
import { EditorView } from "@/widgets/EditorView";
85
import { PageSideBarView } from "@/widgets/PageSideBarView";
96
import { CanvasToolsView } from "@/widgets/CanvasToolsView";
10-
import { useWorkspace } from "@/shared/lib/useWorkspace";
11-
import useYDocStore from "@/shared/model/ydocStore";
7+
128
import { useGetUser } from "@/features/auth/model/useAuth";
139

1410
function App() {
1511
useSyncedUsers();
1612
useGetUser();
1713

18-
const workspace = useWorkspace();
19-
const { setYDoc } = useYDocStore();
20-
21-
useEffect(() => {
22-
const doc = new Y.Doc({ guid: workspace });
23-
setYDoc(doc);
24-
}, [workspace, setYDoc]);
25-
2614
return (
2715
<div className="fixed inset-0 bg-white">
2816
<SideWrapper side="right" className="z-50">

apps/frontend/src/entities/page/api/pageApi.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ export const getPage = async (id: number) => {
1414
return res.data.page;
1515
};
1616

17-
export const getPages = async () => {
18-
const url = "/api/page/main";
17+
// TODO: 임시
18+
export const getPages = async (workspaceId: string) => {
19+
const url = `/api/page/workspace/${workspaceId}`;
1920

2021
const res = await Get<GetPagesResponse>(url);
2122
return res.data.pages;

apps/frontend/src/features/canvas/model/useCanvas.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ export interface YNode extends Node {
3030
export const useCanvas = () => {
3131
const [nodes, setNodes, onNodesChange] = useNodesState<Node>([]);
3232
const [edges, setEdges, onEdgesChange] = useEdgesState<Edge>([]);
33-
const { pages } = usePages();
3433
const queryClient = useQueryClient();
3534
const { ydoc } = useYDocStore();
3635

3736
const workspace = useWorkspace();
37+
const { pages } = usePages(workspace);
3838

3939
const { cursors, handleMouseMove, handleNodeDrag, handleMouseLeave } =
4040
useCollaborativeCursors({

apps/frontend/src/features/pageSidebar/api/usePages.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ export const useDeletePage = () => {
4949
});
5050
};
5151

52-
export const usePages = () => {
52+
export const usePages = (workspaceId: string) => {
5353
const { data: pages, isError } = useQuery({
54-
queryKey: ["pages"],
55-
queryFn: getPages,
54+
queryKey: ["pages", workspaceId],
55+
queryFn: workspaceId ? () => getPages(workspaceId) : skipToken,
5656
});
5757

5858
return { pages, isError };

apps/frontend/src/features/pageSidebar/ui/Tools/index.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@ import { useCreatePage, usePages } from "@/features/pageSidebar/api/usePages";
66
import { usePageStore } from "../../model/pageStore";
77
import useYDocStore from "@/shared/model/ydocStore";
88
import { initializeYText } from "@/shared/model";
9+
import { useWorkspace } from "@/shared/lib/useWorkspace";
910

1011
export function Tools() {
1112
const { setCurrentPage } = usePageStore();
12-
const { pages } = usePages();
13+
const workspace = useWorkspace();
14+
const { pages } = usePages(workspace);
1315
const createMutation = useCreatePage();
1416
const { ydoc } = useYDocStore();
1517

0 commit comments

Comments
 (0)