Merge branch 'master' of https://github.com/CS3219-AY2324S1/ay2324s1-…

…course-assessment-g11 into settings-page

.github/workflows/integration.yml

@@ -12,8 +12,8 @@ env:
   FIREBASE_AUTH_EMULATOR_HOST: "127:0:0:1:9099"
   FIREBASE_TOKEN: ${{ secrets.FIREBASE_CI_TOKEN }}
   FIREBASE_SERVICE_ACCOUNT: ${{ secrets.FIREBASE_SERVICE_ACCOUNT }}
-  DATABASE_URL: ${{ secrets.TEST_DATABASE_URL }}
-  DATABASE_PASSWORD: ${{ secrets.TEST_DATABASE_PASSWORD }}
+  PRISMA_DATABASE_URL: ${{ secrets.SYSTEMTEST_DATABASE_URL }}
+  PRISMA_DATABASE_PASSWORD: ${{ secrets.SYSTEMTEST_DATABASE_PASSWORD }}
 
 jobs:
   mainbuild:

README.md

@@ -133,7 +133,7 @@ docker image prune -f
 
 Next steps:
 
-1. Set the DATABASE_URL in the .env file to point to your existing database. If
+1. Set the PRISMA_DATABASE_URL in the .env file to point to your existing database. If
    your database has no tables yet, read https://pris.ly/d/getting-started
 2. Set the provider of the datasource block in schema.prisma to match your
    database: postgresql, mysql, sqlite, sqlserver, mongodb or cockroachdb.

docker-compose.yml

@@ -10,7 +10,7 @@ services:
       - "5001:5001"
     environment:
       PORT: 5001
-      DATABASE_URL: ${DATABASE_URL}
+      PRISMA_DATABASE_URL: ${DATABASE_URL}
 
   matching-service:
     build:
@@ -21,7 +21,7 @@ services:
       - "5002:5002"
     environment:
       PORT: 5002
-      DATABASE_URL: ${DATABASE_URL}
+      PRISMA_DATABASE_URL: ${DATABASE_URL}
 
   collaboration-service:
     build:
@@ -32,7 +32,7 @@ services:
       - "5003:5003"
     environment:
       PORT: 5003
-      DATABASE_URL: ${DATABASE_URL}
+      PRISMA_DATABASE_URL: ${DATABASE_URL}
 
   question-service:
     build:

frontend/src/components/common/navbar.tsx

@@ -42,8 +42,46 @@ export default function Navbar() {
     }
   }, [currentPage]);
 
+  const { user: currentUser, authIsReady } = useContext(AuthContext);
+  const [activeTab, setActiveTab] = useState<TabsOptions>(TabsOptions.NULL);
+
+  const { login } = useLogin();
+  const { logout } = useLogout();
+  const router = useRouter();
+
+  const currentPage = router.pathname;
+
+  useEffect(() => {
+    if (currentPage === "/interviews") {
+      setActiveTab(TabsOptions.INTERVIEWS);
+    } else if (currentPage === "/questions") {
+      setActiveTab(TabsOptions.QUESTIONS);
+    } else {
+      setActiveTab(TabsOptions.NULL);
+    }
+  }, [currentPage]);
+
   return (
     <header>
+      <div className="flex h-20 bg-card justify-between items-center px-12">
+        <div className="flex gap-20 justify-center items-center">
+          <Link href="/"><Image src="/CodeParty.svg" alt="CodeParty logo" width={125} height={25} /></Link>
+          {currentUser && <div className="h-12 flex justify-center items-center">
+            <Tabs value={activeTab}>
+              <TabsList>
+                <Link href="/interviews">
+                  <TabsTrigger value="interviews" className="h-20 w-36 hover:bg-accent duration-100">
+                    Interviews
+                  </TabsTrigger>
+                </Link>
+                <Link href="/questions">
+                  <TabsTrigger value="questions" className="h-20 w-36 hover:bg-accent duration-100">
+                    Questions
+                  </TabsTrigger>
+                </Link>
+              </TabsList>
+            </Tabs>
+          </div>}
       <div className="flex h-20 bg-card justify-between items-center px-12">
         <div className="flex gap-20 justify-center items-center">
           <Link href="/"><Image src="/CodeParty.svg" alt="CodeParty logo" width={125} height={25} /></Link>

prisma/schema.prisma

@@ -7,7 +7,7 @@ generator client {
 
 datasource db {
   provider = "postgresql"
-  url      = env("DATABASE_URL")
+  url      = env("PRISMA_DATABASE_URL")
 }
 
 // todo rename for colalboration service

services/user-service/README.md

@@ -1,7 +1,7 @@
 # User Service
 
 ## Pre-requisites:
-You need to set the environment variable `DATABASE_URL` in `prisma/schema.prisma`. 
+You need to set the environment variable `PRISMA_DATABASE_URL` in `prisma/schema.prisma`. 
 
 If you do so with an `.env` file, you need to generate the prisma client/migrate prisma as follows:
 
@@ -72,8 +72,8 @@ What this command does:
 
 You need to pass in the following environment variables through the above-mentioned `.env`-type file:
 ```
-DATABASE_URL="postgresql://postgres:${password}@localhost:5430/peerprepdb-user-service-systemtest?schema=public"
-DATABASE_PASSWORD="${The password you want to pass in. This must match the password in the above variable}"
+PRISMA_DATABASE_URL="postgresql://postgres:${password}@localhost:5430/peerprepdb-user-service-systemtest?schema=public"
+PRISMA_DATABASE_PASSWORD="${The password you want to pass in. This must match the password in the above variable}"
 ```
 
 If you want to run this in a CI workflow, run:

services/user-service/src/db/prismaClient.ts

@@ -1,7 +1,7 @@
 import {PrismaClient} from '@prisma/client';
 
 const prismaClient : PrismaClient = new PrismaClient({
-  datasourceUrl: process.env.DATABASE_URL
+  datasourceUrl: process.env.PRISMA_DATABASE_URL
 });
 
 export default prismaClient;

services/user-service/systemtest/user-service-postgre-Docker-compose.yml

@@ -8,4 +8,4 @@ services:
     environment:
       POSTGRES_USER: postgres
       POSTGRES_DB: peerprepdb-user-service-systemtest
-      POSTGRES_PASSWORD: ${DATABASE_PASSWORD}
+      POSTGRES_PASSWORD: ${PRISMA_DATABASE_PASSWORD}