From bece5cb34c66ed96e4f8406216cb1f02e9de278a Mon Sep 17 00:00:00 2001
From: Tay Yi Hsuen <tayyihsuen@gmail.com>
Date: Tue, 14 Nov 2023 17:14:21 +0800
Subject: [PATCH] Create release 1.2.1 (#256)

Fix some frontend bugs and increase CPU usage

---------

Co-authored-by: Ong Jun Xiong <junxiongong2@gmail.com>
Co-authored-by: chunweii <47494777+chunweii@users.noreply.github.com>
Co-authored-by: Charisma Kausar <charisma.kausar@gmail.com>
---
 .../Prod_Node_Specifications.md               | 12 ++++
 .../admin-service-deployment.yaml             |  2 +-
 .../collaboration-service-deployment.yaml     |  2 +-
 .../frontend-deployment.yaml                  |  2 +-
 .../gateway-deployment.yaml                   |  2 +-
 .../matching-service-deployment.yaml          |  2 +-
 .../question-service-deployment.yaml          |  2 +-
 .../user-service-deployment.yaml              |  2 +-
 frontend/src/components/common/navbar.tsx     | 64 ++++++++++---------
 frontend/src/components/room/code-editor.tsx  | 13 +---
 frontend/src/components/room/description.tsx  |  2 +-
 frontend/src/pages/attempt/[id]/index.tsx     |  2 +-
 frontend/src/pages/questions/_form.tsx        |  4 ++
 13 files changed, 59 insertions(+), 52 deletions(-)
 create mode 100644 deployment/gke-prod-manifests/Prod_Node_Specifications.md

diff --git a/deployment/gke-prod-manifests/Prod_Node_Specifications.md b/deployment/gke-prod-manifests/Prod_Node_Specifications.md
new file mode 100644
index 00000000..08876180
--- /dev/null
+++ b/deployment/gke-prod-manifests/Prod_Node_Specifications.md
@@ -0,0 +1,12 @@
+# Specifications for GKE Nodes
+The nodes used in GKE are of the machine type e2-standard-4
+
+| Key | Value |
+|-----|-------|
+| vCPUs per node | 4     |
+| Memory size | 16 GB |
+| Boot disk size | 50 GB |
+| Node image type | cos_containerd |
+
+The GKE cluster is created in asia-southeast1 region across all 3 availability zones.
+1 node is created per zone.
diff --git a/deployment/gke-prod-manifests/admin-service-deployment.yaml b/deployment/gke-prod-manifests/admin-service-deployment.yaml
index d29c52ca..e82736c0 100644
--- a/deployment/gke-prod-manifests/admin-service-deployment.yaml
+++ b/deployment/gke-prod-manifests/admin-service-deployment.yaml
@@ -37,6 +37,6 @@ spec:
             # You must specify requests for CPU to autoscale
             # based on CPU utilization
             requests:
-              cpu: "100m"
+              cpu: "250m"
       restartPolicy: Always
 status: {}
diff --git a/deployment/gke-prod-manifests/collaboration-service-deployment.yaml b/deployment/gke-prod-manifests/collaboration-service-deployment.yaml
index e2925d29..6118b9f4 100644
--- a/deployment/gke-prod-manifests/collaboration-service-deployment.yaml
+++ b/deployment/gke-prod-manifests/collaboration-service-deployment.yaml
@@ -54,6 +54,6 @@ spec:
             # You must specify requests for CPU to autoscale
             # based on CPU utilization
             requests:
-              cpu: "100m"
+              cpu: "250m"
       restartPolicy: Always
 status: {}
diff --git a/deployment/gke-prod-manifests/frontend-deployment.yaml b/deployment/gke-prod-manifests/frontend-deployment.yaml
index af4896cf..9db64d39 100644
--- a/deployment/gke-prod-manifests/frontend-deployment.yaml
+++ b/deployment/gke-prod-manifests/frontend-deployment.yaml
@@ -29,6 +29,6 @@ spec:
             # You must specify requests for CPU to autoscale
             # based on CPU utilization
             requests:
-              cpu: "100m"
+              cpu: "250m"
       restartPolicy: Always
 status: {}
diff --git a/deployment/gke-prod-manifests/gateway-deployment.yaml b/deployment/gke-prod-manifests/gateway-deployment.yaml
index 536d6cc5..3e3cde39 100644
--- a/deployment/gke-prod-manifests/gateway-deployment.yaml
+++ b/deployment/gke-prod-manifests/gateway-deployment.yaml
@@ -53,6 +53,6 @@ spec:
             # You must specify requests for CPU to autoscale
             # based on CPU utilization
             requests:
-              cpu: "100m"
+              cpu: "250m"
       restartPolicy: Always
 status: {}
diff --git a/deployment/gke-prod-manifests/matching-service-deployment.yaml b/deployment/gke-prod-manifests/matching-service-deployment.yaml
index c9ff6b37..0829c048 100644
--- a/deployment/gke-prod-manifests/matching-service-deployment.yaml
+++ b/deployment/gke-prod-manifests/matching-service-deployment.yaml
@@ -41,6 +41,6 @@ spec:
             # You must specify requests for CPU to autoscale
             # based on CPU utilization
             requests:
-              cpu: "100m"
+              cpu: "250m"
       restartPolicy: Always
 status: {}
diff --git a/deployment/gke-prod-manifests/question-service-deployment.yaml b/deployment/gke-prod-manifests/question-service-deployment.yaml
index 1b31e463..c55b717f 100644
--- a/deployment/gke-prod-manifests/question-service-deployment.yaml
+++ b/deployment/gke-prod-manifests/question-service-deployment.yaml
@@ -37,6 +37,6 @@ spec:
             # You must specify requests for CPU to autoscale
             # based on CPU utilization
             requests:
-              cpu: "100m"
+              cpu: "250m"
       restartPolicy: Always
 status: {}
diff --git a/deployment/gke-prod-manifests/user-service-deployment.yaml b/deployment/gke-prod-manifests/user-service-deployment.yaml
index 0803f176..10b726d8 100644
--- a/deployment/gke-prod-manifests/user-service-deployment.yaml
+++ b/deployment/gke-prod-manifests/user-service-deployment.yaml
@@ -37,6 +37,6 @@ spec:
             # You must specify requests for CPU to autoscale
             # based on CPU utilization
             requests:
-              cpu: "100m"
+              cpu: "250m"
       restartPolicy: Always
 status: {}
diff --git a/frontend/src/components/common/navbar.tsx b/frontend/src/components/common/navbar.tsx
index 5581216c..575e879a 100644
--- a/frontend/src/components/common/navbar.tsx
+++ b/frontend/src/components/common/navbar.tsx
@@ -79,7 +79,6 @@ export default function Navbar() {
             </div>
           )}
         </div>
-        {isAdmin && <p>Admin Page</p>}
         {!currentUser && (
           <div className="grid grid-cols-2 gap-4">
             <Button variant={"outline"} onClick={login}>
@@ -89,36 +88,39 @@ export default function Navbar() {
           </div>
         )}
         {currentUser && (
-          <DropdownMenu>
-            <DropdownMenuTrigger asChild>
-              <Button
-                variant="ghost"
-                className="flex justify-center items-center gap-2 h-14"
-              >
-                <Avatar className="h-10 w-10">
-                  <AvatarImage
-                    src={currentUser.photoURL || ""}
-                    className="rounded-full"
-                  />
-                </Avatar>
-                <ChevronDown className="w-6 h-6" />
-              </Button>
-            </DropdownMenuTrigger>
-            <DropdownMenuContent align="end">
-              <DropdownMenuLabel
-                className="hover:bg-card"
-                onClick={() => router.push("/profile")}
-              >
-                Profile
-              </DropdownMenuLabel>
-              <DropdownMenuLabel className="hover:bg-card" onClick={() => router.push("/settings")}>
-                Settings
-              </DropdownMenuLabel>
-              <DropdownMenuLabel className="hover:bg-card" onClick={logout}>
-                Log Out
-              </DropdownMenuLabel>
-            </DropdownMenuContent>
-          </DropdownMenu>
+          <div className="flex items-center gap-x-4">
+            {isAdmin && <p>Admin</p>}
+            <DropdownMenu>
+              <DropdownMenuTrigger asChild>
+                <Button
+                  variant="ghost"
+                  className="flex justify-center items-center gap-2 h-14"
+                >
+                  <Avatar className="h-10 w-10">
+                    <AvatarImage
+                      src={currentUser.photoURL || ""}
+                      className="rounded-full"
+                    />
+                  </Avatar>
+                  <ChevronDown className="w-6 h-6" />
+                </Button>
+              </DropdownMenuTrigger>
+              <DropdownMenuContent align="end">
+                <DropdownMenuLabel
+                  className="hover:bg-card"
+                  onClick={() => router.push("/profile")}
+                >
+                  Profile
+                </DropdownMenuLabel>
+                <DropdownMenuLabel className="hover:bg-card" onClick={() => router.push("/settings")}>
+                  Settings
+                </DropdownMenuLabel>
+                <DropdownMenuLabel className="hover:bg-card" onClick={logout}>
+                  Log Out
+                </DropdownMenuLabel>
+              </DropdownMenuContent>
+            </DropdownMenu>
+          </div>
         )}
       </div>
     </header>
diff --git a/frontend/src/components/room/code-editor.tsx b/frontend/src/components/room/code-editor.tsx
index 961d708f..68a15770 100644
--- a/frontend/src/components/room/code-editor.tsx
+++ b/frontend/src/components/room/code-editor.tsx
@@ -175,17 +175,6 @@ export default function CodeEditor({
             </Command>
           </PopoverContent>
         </Popover>
-        <div className="flex flex-row gap-2 justify-end">
-          <Button variant="secondary" size="icon">
-            <Undo />
-          </Button>
-          <Button variant="secondary" size="icon">
-            <Redo />
-          </Button>
-          <Button variant="secondary" size="icon">
-            <Settings />
-          </Button>
-        </div>
       </div>
       <Editor
         key={frameWork}
@@ -211,7 +200,7 @@ export default function CodeEditor({
                 onClick={() => handleOnSubmitClick(false)}
                 disabled={isSubmitting}
               >
-                Submit as unsolved
+                Submit as Unsolved
               </Button>
               <Button
                 size={"sm"}
diff --git a/frontend/src/components/room/description.tsx b/frontend/src/components/room/description.tsx
index 9ede381b..c0a82557 100644
--- a/frontend/src/components/room/description.tsx
+++ b/frontend/src/components/room/description.tsx
@@ -34,7 +34,7 @@ export default function Description({
       <div className="flex flex-row items-center justify-between py-2">
         <div className="flex items-center justify-center">
           <TypographyH2 className="w-fit">{question.title}</TypographyH2>
-          <Badge variant="secondary" className="h-min">
+          <Badge variant="secondary" className="h-min ml-2">
             <TypographySmall className={getDifficultyColor(question.difficulty as Difficulty)}>
               {question.difficulty}
             </TypographySmall>
diff --git a/frontend/src/pages/attempt/[id]/index.tsx b/frontend/src/pages/attempt/[id]/index.tsx
index 829b6305..a4c4cc9d 100644
--- a/frontend/src/pages/attempt/[id]/index.tsx
+++ b/frontend/src/pages/attempt/[id]/index.tsx
@@ -84,7 +84,7 @@ export default function Page() {
       <div>
         <Label className="text-primary">Solution</Label>
         <TypographyBody>{attempt?.solved ? "Solved": "Unsolved"}</TypographyBody>
-        <Textarea disabled={true} className="my-4" defaultValue={attempt?.answer || ""}>
+        <Textarea disabled={true} className="my-4" rows={10} defaultValue={attempt?.answer || ""}>
         </Textarea>
       </div></>}
     </div> 
diff --git a/frontend/src/pages/questions/_form.tsx b/frontend/src/pages/questions/_form.tsx
index 59978b92..99c25173 100644
--- a/frontend/src/pages/questions/_form.tsx
+++ b/frontend/src/pages/questions/_form.tsx
@@ -178,6 +178,7 @@ export default function QuestionsForm({
                 <Textarea
                   placeholder="Write your question here in markdown format. Your question may be sanitized to remove harmful HTML tags."
                   className="resize-none"
+                  rows={10}
                   {...field}
                 />
               </FormControl>
@@ -229,6 +230,7 @@ export default function QuestionsForm({
                 <Textarea
                   placeholder="Write your code here."
                   className="resize-none"
+                  rows={10}
                   {...field}
                   value={field.value || defaultCodes["c++"]}
                 />
@@ -247,6 +249,7 @@ export default function QuestionsForm({
                 <Textarea
                   placeholder="Write your code here."
                   className="resize-none"
+                  rows={10}
                   {...field}
                   value={field.value || defaultCodes["java"]}
                 />
@@ -265,6 +268,7 @@ export default function QuestionsForm({
                 <Textarea
                   placeholder="Write your code here."
                   className="resize-none"
+                  rows={10}
                   {...field}
                   value={field.value || defaultCodes["python"]}
                 />