Skip to content

Commit f7aa50c

Browse files
authored
Merge pull request #30 from duylongpro99/development
comment route to check env
2 parents 2f15839 + c1df073 commit f7aa50c

File tree

2 files changed

+71
-67
lines changed

2 files changed

+71
-67
lines changed
Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Navbar } from "./(navbar)/navbar";
22
import { Toolbar } from "./(toolbar)/toolbar";
33
import { Editor } from "./editor";
4-
import { Room } from "./room";
4+
// import { Room } from "./room";
55

66
interface Props {
77
params: Promise<{ documentId: string }>;
@@ -10,20 +10,22 @@ const Page: React.FC<Props> = async ({ params }) => {
1010
const { documentId } = await params;
1111
console.info(":Document:", documentId);
1212

13+
// <Room>
1314
return (
14-
<Room>
15-
<div className="min-h-screen bg-[#fafbfd]">
16-
<div className="flex flex-col px-4 pt-2 gap-y-2 fixed top-0 left-0 right-0 z-10 bg-[#fafbfd] print:hidden">
17-
<Navbar />
18-
<Toolbar />
19-
</div>
15+
<div className="min-h-screen bg-[#fafbfd]">
16+
<div className="flex flex-col px-4 pt-2 gap-y-2 fixed top-0 left-0 right-0 z-10 bg-[#fafbfd] print:hidden">
17+
<Navbar />
18+
<Toolbar />
19+
</div>
2020

21-
<div className="pt-[114px] print:pt-0">
22-
<Editor />
23-
</div>
21+
<div className="pt-[114px] print:pt-0">
22+
<Editor />
2423
</div>
25-
</Room>
24+
</div>
2625
);
26+
{
27+
/* </Room> */
28+
}
2729
};
2830

2931
export default Page;
Lines changed: 58 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
"use client";
22

3-
import { FullscreenLoader } from "@/components/fullscreen-loader";
4-
import { useToast } from "@/hooks/use-toast";
5-
import {
6-
ClientSideSuspense,
7-
LiveblocksProvider,
8-
RoomProvider,
9-
} from "@liveblocks/react/suspense";
10-
import { useParams } from "next/navigation";
11-
import { ReactNode, useEffect, useMemo, useState } from "react";
12-
import { getUsers } from "./action";
3+
import { ReactNode } from "react";
4+
5+
// import { FullscreenLoader } from "@/components/fullscreen-loader";
6+
// import { useToast } from "@/hooks/use-toast";
7+
// import {
8+
// ClientSideSuspense,
9+
// LiveblocksProvider,
10+
// RoomProvider,
11+
// } from "@liveblocks/react/suspense";
12+
// import { useParams } from "next/navigation";
13+
// import { ReactNode, useEffect, useMemo, useState } from "react";
14+
// import { getUsers } from "./action";
1315

1416
type User = {
1517
id: string;
@@ -18,56 +20,56 @@ type User = {
1820
};
1921

2022
export function Room({ children }: { children: ReactNode }) {
21-
const params = useParams<{ documentId: string }>();
22-
const { toast } = useToast();
23+
// const params = useParams<{ documentId: string }>();
24+
// const { toast } = useToast();
2325

24-
const [users, setUsers] = useState<User[]>([]);
26+
// const [users, setUsers] = useState<User[]>([]);
2527

26-
const fetchUsers = useMemo(
27-
() => async () => {
28-
try {
29-
const users = await getUsers();
30-
setUsers(users);
31-
} catch {
32-
toast({
33-
title: "Error",
34-
description: "Failed to fetch users",
35-
variant: "destructive",
36-
});
37-
}
38-
},
39-
[toast]
40-
);
28+
// const fetchUsers = useMemo(
29+
// () => async () => {
30+
// try {
31+
// const users = await getUsers();
32+
// setUsers(users);
33+
// } catch {
34+
// toast({
35+
// title: "Error",
36+
// description: "Failed to fetch users",
37+
// variant: "destructive",
38+
// });
39+
// }
40+
// },
41+
// [toast]
42+
// );
4143

42-
useEffect(() => {
43-
fetchUsers();
44-
}, [fetchUsers]);
44+
// useEffect(() => {
45+
// fetchUsers();
46+
// }, [fetchUsers]);
4547

4648
return (
47-
<LiveblocksProvider
48-
authEndpoint={"/api/auth/liveblocks"}
49-
throttle={16}
50-
resolveUsers={({ userIds }) =>
51-
userIds.map((id) => users.find((u) => u.id === id))
52-
}
53-
resolveMentionSuggestions={({ text }) => {
54-
let filterUsers = users;
55-
if (text) {
56-
filterUsers = users.filter((u) =>
57-
u.name.toLowerCase().includes(text.toLowerCase())
58-
);
59-
}
60-
return filterUsers.map((u) => u.id);
61-
}}
62-
resolveRoomsInfo={() => []}
63-
>
64-
<RoomProvider id={params.documentId}>
65-
<ClientSideSuspense
66-
fallback={<FullscreenLoader label="Document loading..." />}
67-
>
68-
{children}
69-
</ClientSideSuspense>
70-
</RoomProvider>
71-
</LiveblocksProvider>
49+
// <LiveblocksProvider
50+
// authEndpoint={"/api/auth/liveblocks"}
51+
// throttle={16}
52+
// resolveUsers={({ userIds }) =>
53+
// userIds.map((id) => users.find((u) => u.id === id))
54+
// }
55+
// resolveMentionSuggestions={({ text }) => {
56+
// let filterUsers = users;
57+
// if (text) {
58+
// filterUsers = users.filter((u) =>
59+
// u.name.toLowerCase().includes(text.toLowerCase())
60+
// );
61+
// }
62+
// return filterUsers.map((u) => u.id);
63+
// }}
64+
// resolveRoomsInfo={() => []}
65+
// >
66+
// <RoomProvider id={params.documentId}>
67+
// <ClientSideSuspense
68+
// fallback={<FullscreenLoader label="Document loading..." />}
69+
// >
70+
<>{children}</>
71+
// </ClientSideSuspense>
72+
// </RoomProvider>
73+
// </LiveblocksProvider>
7274
);
7375
}

0 commit comments

Comments
 (0)