Skip to content

Commit 068ec80

Browse files
committed
Fix styling and add chat component
1 parent aa809a4 commit 068ec80

File tree

4 files changed

+61
-25
lines changed

4 files changed

+61
-25
lines changed

frontend/src/app/collab/page.tsx

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,19 @@ export default function CollabPage() {
99
<SessionHeader />
1010

1111
<div className="flex flex-1 w-full bg-stone-800 ">
12-
<QuestionComponent />
13-
<CodingComponent />
14-
<ChatComponent />
12+
13+
<div className="flex-1">
14+
<QuestionComponent/>
15+
</div>
16+
17+
<div className="flex-[2] h-full">
18+
<CodingComponent/>
19+
</div>
20+
21+
<div className="flex-1 p-5">
22+
<ChatComponent/>
23+
</div>
24+
1525
</div>
1626
</main>
1727
);
Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
import { Button } from "@/components/ui/button";
2+
import { Input } from "@/components/ui/input";
3+
import { ChevronRightIcon } from "lucide-react";
4+
15
export default function ChatComponent() {
2-
return <div className="h-full w-[25%]"></div>;
6+
7+
const chatMessages = ["HELLO", "HOW ARE YOU?"]
8+
9+
return (
10+
<div className="flex flex-col h-full bg-stone-900 p-10">
11+
12+
<div className="flex bg-stone-500 h-full mb-5 rounded-lg">
13+
14+
</div>
15+
16+
<div className="flex w-full mt-auto gap-2">
17+
<Input className="bg-white" />
18+
<Button variant="secondary" size="icon" className="size-9">
19+
<ChevronRightIcon/>
20+
</Button>
21+
</div>
22+
</div>
23+
);
324
}

frontend/src/app/components/collab/CodingComponent.tsx

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,15 @@ import {
66
DropdownMenuContent,
77
DropdownMenuGroup,
88
DropdownMenuItem,
9-
DropdownMenuLabel,
10-
DropdownMenuPortal,
11-
DropdownMenuSeparator,
12-
DropdownMenuShortcut,
13-
DropdownMenuSub,
14-
DropdownMenuSubContent,
15-
DropdownMenuSubTrigger,
169
DropdownMenuTrigger,
1710
} from "@/components/ui/dropdown-menu";
1811
import { useState } from "react";
1912
import { Button } from "@/components/ui/button";
13+
import { ChevronDown } from "lucide-react";
2014

2115
export default function CodingComponent() {
2216
const [codeContent, setCodeContent] = useState<string>("");
23-
const [selectedLanguage, setSeletedLanguage] = useState<string>("Javascript");
17+
const [selectedLanguage, setSeletedLanguage] = useState<string>("JavaScript");
2418

2519
function setInitialContent(value: string | undefined) {
2620
if (value != undefined) {
@@ -29,30 +23,41 @@ export default function CodingComponent() {
2923
}
3024

3125
return (
32-
<div className="h-full w-[50%] mt-10">
26+
<div className="h-full mt-10">
3327
<div className="mb-4">
3428
<DropdownMenu>
35-
<DropdownMenuTrigger asChild>
36-
<Button className="w-40 bg-white text-black">
37-
{selectedLanguage}{" "}
29+
<DropdownMenuTrigger asChild className="flex justify-between">
30+
<Button className="w-40 bg-white text-black hover:bg-gray-500">
31+
{selectedLanguage} <ChevronDown />
3832
</Button>
3933
</DropdownMenuTrigger>
40-
<DropdownMenuContent className="w-10" align="center">
34+
<DropdownMenuContent className="w-10" align="start">
4135
<DropdownMenuGroup>
42-
<DropdownMenuItem>Javascript</DropdownMenuItem>
43-
<DropdownMenuItem>Python</DropdownMenuItem>
44-
<DropdownMenuItem>C</DropdownMenuItem>
45-
<DropdownMenuItem>C++</DropdownMenuItem>
46-
<DropdownMenuItem>Java</DropdownMenuItem>
36+
<DropdownMenuItem
37+
onClick={() => setSeletedLanguage("JavaScript")}
38+
>
39+
Javascript
40+
</DropdownMenuItem>
41+
<DropdownMenuItem onClick={() => setSeletedLanguage("Python")}>
42+
Python
43+
</DropdownMenuItem>
44+
<DropdownMenuItem onClick={() => setSeletedLanguage("C")}>
45+
C
46+
</DropdownMenuItem>
47+
<DropdownMenuItem onClick={() => setSeletedLanguage("C++")}>
48+
C++
49+
</DropdownMenuItem>
50+
<DropdownMenuItem onClick={() => setSeletedLanguage("Java")}>
51+
Java
52+
</DropdownMenuItem>
4753
</DropdownMenuGroup>
4854
</DropdownMenuContent>
4955
</DropdownMenu>
5056
</div>
5157
<Editor
5258
height="85vh"
5359
theme="vs-dark"
54-
defaultLanguage="python"
55-
defaultValue="Enter your code here..."
60+
defaultLanguage={selectedLanguage.toLowerCase()}
5661
onChange={(value) => setInitialContent(value)}
5762
></Editor>
5863
</div>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
export default function QuestionComponent() {
2-
return <div className="h-full w-[25%]">Helo</div>;
2+
return <div>Helo</div>;
33
}

0 commit comments

Comments
 (0)