hide match button and remove redundant buttons

Author: Kurtyjlee

docker-compose.prod.yml

@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   redis-server:
     image: redis:latest

docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   redis-server:
     image: redis:latest

peerprep-fe/src/app/match/layout.tsx

@@ -0,0 +1,13 @@
+import React from 'react';
+import Navbar from '@/components/navbar/Navbar';
+
+const MatchLayout: React.FC<{ children: React.ReactNode }> = ({ children }) => {
+  return (
+    <>
+      <Navbar />
+      <main>{children}</main>
+    </>
+  );
+};
+
+export default MatchLayout;

peerprep-fe/src/app/match/page.tsx

@@ -2,7 +2,6 @@
 
 import { useState, useEffect } from 'react';
 import { useRouter } from 'next/navigation';
-import { User, Code } from 'lucide-react';
 import { Button } from '@/components/ui/button';
 import { useAuthStore } from '@/state/useAuthStore';
 import { useWebSocket } from '@/hooks/useWebsocket';
@@ -76,14 +75,7 @@ export default function LoadingPage() {
   };
 
   return (
-    <div className="flex min-h-screen flex-col bg-[#1a1f2e] text-gray-300">
-      <header className="flex items-center justify-between border-b border-gray-700 p-4">
-        <div className="flex items-center space-x-2">
-          <Code className="h-6 w-6" />
-          <span className="text-lg font-semibold">PeerPrep</span>
-        </div>
-        <User className="h-6 w-6" />
-      </header>
+    <div className="flex min-h-screen flex-col bg-gray-900 p-6 text-gray-100">
       <main className="flex flex-grow flex-col items-center justify-center space-y-6 px-4">
         {matchStatus === 'searching' && (
           <>

peerprep-fe/src/components/dialogs/PreMatch.tsx

@@ -12,7 +12,6 @@ import {
 import { Button } from '@/components/ui/button';
 import { FilterSelect } from '@/app/(main)/components/filter/FilterSelect';
 import { TopicsPopover } from '@/app/(main)/components/filter/TopicsPopover';
-// import { sendMessageToQueue } from '@/lib/rabbitmq';
 import { axiosClient } from '@/network/axiosClient';
 import { DIFFICULTY_OPTIONS } from '@/lib/constants';
 import { UserMatchingRequest } from '@/types/types';
@@ -33,7 +32,6 @@ export function PreMatch() {
         difficulty: difficulty,
         type: 'match',
       };
-      // await sendMessageToQueue(message);
       await axiosClient.post('/matching/send', message);
       setOpen(false);
       router.push('/match');

peerprep-fe/src/components/navbar/Navbar.tsx

@@ -46,9 +46,6 @@ export default function Navbar() {
               Admin
             </Link>
           )}
-          <Link href="/" className="text-gray-300 hover:text-white">
-            Questions
-          </Link>
           {/* Admin users should be able to add questions instead of match */}
           {path === '/admin' ? (
             <Button
@@ -57,7 +54,7 @@ export default function Navbar() {
             >
               Add Question
             </Button>
-          ) : path !== '/match' ? (
+          ) : path !== '/match' && isAuth ? (
             <PreMatch />
           ) : null}
           {isAuth ? (
@@ -90,11 +87,6 @@ export default function Navbar() {
                     Profile
                   </Link>
                 </DropdownMenuItem>
-                <DropdownMenuItem asChild>
-                  <Link href="/settings" className="w-full">
-                    Settings
-                  </Link>
-                </DropdownMenuItem>
                 <DropdownMenuItem onClick={handleLogout}>
                   <LogOut className="mr-2 h-4 w-4" />
                   <span>Sign out</span>