Skip to content

Commit 09be555

Browse files
yewonJinyewonJin
committed
Merge branch 'develop' into feature-be-#276 
2 parents 9040348 + 3fc0405 commit 09be555

File tree

118 files changed

+913
-771
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+913
-771
lines changed

‎apps/frontend/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
</head>
99
<body>
1010
<div id="root"></div>
11-
<script type="module" src="/src/main.tsx"></script>
11+
<script type="module" src="/src/app/main.tsx"></script>
1212
</body>
1313
</html>

apps/frontend/src/assets/fonts/Pretendard-Bold.subset.woff2 renamed to apps/frontend/public/fonts/Pretendard-Bold.subset.woff2

File renamed without changes.

apps/frontend/src/assets/fonts/Pretendard-Medium.subset.woff2 renamed to apps/frontend/public/fonts/Pretendard-Medium.subset.woff2

File renamed without changes.

apps/frontend/src/assets/fonts/Pretendard-SemiBold.subset.woff2 renamed to apps/frontend/public/fonts/Pretendard-SemiBold.subset.woff2

File renamed without changes.

apps/frontend/public/logo.png renamed to apps/frontend/public/icons/logo.png

File renamed without changes.

apps/frontend/public/vite.svg renamed to apps/frontend/public/icons/vite.svg

File renamed without changes.

apps/frontend/public/warning-icon.png renamed to apps/frontend/public/icons/warning-icon.png

File renamed without changes.

apps/frontend/public/workspace-logo.svg renamed to apps/frontend/public/icons/workspace-logo.svg

File renamed without changes.

‎apps/frontend/src/api/page.ts‎

Lines changed: 0 additions & 74 deletions
This file was deleted.

apps/frontend/src/App.tsx renamed to apps/frontend/src/app/App.tsx

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
22

3-
import Sidebar from "./components/sidebar";
4-
import EditorView from "./components/EditorView";
5-
import SideWrapper from "./components/layout/SideWrapper";
6-
import Canvas from "./components/canvas";
7-
import CanvasTools from "./components/canvasTools";
8-
9-
import { useSyncedUsers } from "./hooks/useSyncedUsers";
3+
import { useSyncedUsers } from "@/entities/user/model";
4+
import { SideWrapper } from "@/shared/ui";
5+
import { CanvasView } from "@/widgets/CanvasView";
6+
import { EditorView } from "@/widgets/EditorView";
7+
import { PageSideBarView } from "@/widgets/PageSideBarView";
8+
import { CanvasToolsView } from "@/widgets/CanvasToolsView";
109

1110
const queryClient = new QueryClient();
1211

@@ -19,13 +18,13 @@ function App() {
1918
<SideWrapper side="right" className="z-50">
2019
<EditorView />
2120
</SideWrapper>
22-
<Canvas className="z-0 h-full w-full" />
21+
<CanvasView />
2322
<SideWrapper
2423
side="left"
2524
className="left-4 top-4 flex flex-row items-start gap-2"
2625
>
27-
<Sidebar />
28-
<CanvasTools />
26+
<PageSideBarView />
27+
<CanvasToolsView />
2928
</SideWrapper>
3029
</div>
3130
</QueryClientProvider>

0 commit comments

Comments
 (0)