finalize before merge

stamford-syntax-club · Jun 10, 2024 · 3126c12 · 3126c12
1 parent a991da2
commit 3126c12
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/apps/web/app/courses/[courseCode]/page.tsx b/apps/web/app/courses/[courseCode]/page.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { Center, Container, Divider, Flex, Pagination, Stack, Title, Text, Loader, Alert, Button } from "@mantine/core";
+import { Center, Container, Divider, Flex, Pagination, Stack, Title, Text, Loader, Alert } from "@mantine/core";
 import { MyReviewCard, ReviewCard } from "@components/ui/review-card";
 import { useEffect, useMemo, useState } from "react";
 import type { PaginatedResponse } from "types/pagination";

diff --git a/apps/web/app/guidelines/page.tsx b/apps/web/app/guidelines/page.tsx
@@ -1,7 +1,7 @@
 "use client";
 import React, { useState } from "react";
 import { guideline, aspects } from "./data";
-import { Container, Text, Title, Button, Group, Collapse, Box, List, Flex, Center } from "@mantine/core";
+import { Container, Text, Title, Button, Group, Collapse, Box, List, Flex } from "@mantine/core";
 import { IconBook, IconKey, IconCirclePlus, IconOctagonMinus, IconChecklist } from "@tabler/icons-react";
 
 export default function Guideline(): JSX.Element {
@@ -32,7 +32,7 @@ export default function Guideline(): JSX.Element {
 					<Group wrap="nowrap" justify="center" align="center">
 						<IconKey size={26} className=" flex flex-shrink-0" />
 						<Title fw={700} className="text-center text-2xl">
-							Consider Key Aspect of the course
+							Consider Key Aspect of the Course
 						</Title>
 						<IconKey size={26} className=" flex flex-shrink-0" />
 					</Group>

diff --git a/apps/web/components/core/application-navbar.tsx b/apps/web/components/core/application-navbar.tsx
@@ -27,7 +27,6 @@ export const navItems = [
 	{
 		label: "Guidelines",
 		href: "/guidelines",
-		newTab: false,
 		icon: <IconCheckbox />
 	}
 ];

diff --git a/apps/web/components/ui/write-review-form.tsx b/apps/web/components/ui/write-review-form.tsx
@@ -26,12 +26,21 @@ interface WriteReviewFormProps {
 
 const reviewGuidelines = [
 	{
-		text: "Your review will be displayed anonymously to the public after approval.",
+		text: <Text>Your review will be displayed anonymously to the public after approval.</Text>,
 		color: "blue",
 		displayIcon: <IconAlertCircle size={25} />
 	},
 	{
-		text: "Kindly refrain from mentioning names and write your reviews with respect. Constructive criticism is encouraged.",
+		text: (
+			<div>
+				Kindly refrain from mentioning names and write your reviews with respect.{" "}
+				<span className="underline">
+					<Link href="/guidelines" target="_blank">
+						Click here to learn more
+					</Link>
+				</span>
+			</div>
+		),
 		color: "yellow",
 		displayIcon: <IconAlertTriangle size={25} />
 	}
@@ -124,7 +133,7 @@ export default function WriteReviewForm({ courseCode, onSubmit, previousReview }
 				<Blockquote key={`review_guideline_${guide.text}`} color={guide.color} w="100%" p="sm" mb="xs">
 					<Flex justify="flex-start" gap="sm">
 						{guide.displayIcon}
-						<Text>{guide.text}</Text>
+						{guide.text}
 					</Flex>
 				</Blockquote>
 			))}
@@ -143,13 +152,7 @@ export default function WriteReviewForm({ courseCode, onSubmit, previousReview }
 
 				<MarkdownEditor editor={markdownEditor} />
 
-				<Flex gap="sm" justify="space-between" align="center">
-					<Link href="/guidelines" target="blank">
-						<Text c="lightblue" fw={500} className="underline">
-							Learn about our review guidelines here
-						</Text>
-					</Link>
-
+				<Flex gap="sm" justify="end" align="center">
 					<Button type="submit" my="sm" className="min-w-36">
 						Submit Review
 					</Button>