tracet2t · Asfik-1999 · Aug 27, 2024 · Aug 27, 2024 · Aug 27, 2024 · Aug 27, 2024
diff --git a/server/package-lock.json b/server/package-lock.json
diff --git a/server/prisma/seed.mjs b/server/prisma/seed.mjs
@@ -40,7 +40,7 @@ async function main() {
     }
   });
 
-  
+
   // console.log({ mentor1, mentor2, student1, student2, student3, feedback1, feedback2, report1, report2 });
 } catch (error) {
   console.error('Error seeding data:', error);

diff --git a/...lic/Climate change related issues - Unit 2 Session 04 & 05 (Academic year 2022-2023).pdf b/...lic/Climate change related issues - Unit 2 Session 04 & 05 (Academic year 2022-2023).pdf
diff --git a/server/public/t2t logo.png b/server/public/t2t logo.png
diff --git a/server/src/app/layout.tsx b/server/src/app/layout.tsx
@@ -1,9 +1,11 @@
 import './index.css';
 import type { Metadata } from "next";
 import { Inter } from "next/font/google";
+import ConditionalLayout from "@/components/ConditionalLayout";
 import { ToastContainer } from 'react-toastify';
 import 'react-toastify/dist/ReactToastify.css'; 
 
+
 const inter = Inter({ subsets: ["latin"] });
 
 export const metadata: Metadata = {
@@ -18,9 +20,11 @@ export default function RootLayout({
 }>) {
   return (
     <html lang="en">
-      <body className={inter.className}>
-        {children}
-        <ToastContainer
+
+      <body className={`${inter.className} relative`}>
+        <ConditionalLayout>
+          {children}
+           <ToastContainer
           position="top-right"
           autoClose={5000}
           hideProgressBar={false}
@@ -31,6 +35,9 @@ export default function RootLayout({
           draggable
           pauseOnHover
         />
+        </ConditionalLayout>
+
+
       </body>
     </html>
   );

diff --git a/server/src/components/ConditionalLayout.tsx b/server/src/components/ConditionalLayout.tsx
@@ -0,0 +1,36 @@
+// src/components/ConditionalLayout.tsx
+import getSession from "@/server_actions/getSession";
+import ProfileCard from "@/components/ProfileCard";
+
+
+const ConditionalLayout: React.FC<{ children: React.ReactNode }> = async ({ children }) => {
+  const session = await getSession(); // Fetch session directly on the server
+  const authenticated = session.isAuthenticated();
+
+  return (
+    <>
+      {authenticated && (
+        <>
+          {/* Logo in the top-left corner */}
+          <div className="absolute top-4 left-4 mb-15" >
+            <img
+              src="../t2t logo.png" // Ensure correct file path and name
+              alt="T2T Logo"
+              className="w-24 h-auto" // Adjust size as needed
+            />
+          </div>
+
+          {/* ProfileCard component in the top-right corner */}
+          <div className="absolute top-4 right-4">
+            <ProfileCard />
+          </div>
+        </>
+      )}
+      <main className="p-4">
+        {children}
+      </main>
+    </>
+  );
+};
+
+export default ConditionalLayout;
diff --git a/server/src/components/ProfileCard.tsx b/server/src/components/ProfileCard.tsx
@@ -0,0 +1,58 @@
+"use client";
+
+import { useState } from "react";
+import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
+import { Card, CardContent, CardHeader, CardTitle, CardFooter } from "@/components/ui/card";
+
+export default function ProfileCard() {
+  const [isCardVisible, setIsCardVisible] = useState(false);
+
+  // Toggle the visibility of the card
+  const toggleCardVisibility = () => {
+    setIsCardVisible(!isCardVisible);
+  };
+
+  return (
+    <div className="relative">
+      {/* Button to toggle the visibility of the profile card */}
+      <button onClick={toggleCardVisibility} className="absolute top-4 right-4">
+        <Avatar>
+          <AvatarImage src="https://github.com/shadcn.png" />
+          <AvatarFallback>CN</AvatarFallback>
+        </Avatar>
+      </button>
+
+      {/* Conditional rendering of the profile card */}
+      {isCardVisible && (
+        <div className="absolute top-16 right-0 bg-gradient-to-b from-blue-100 to-blue-200 p-3 border border-gray-200 rounded shadow-lg">
+          <Card className="w-56 rounded-lg overflow-hidden shadow-xl">
+            {/* Card header with avatar and green background */}
+            <CardHeader className="relative flex flex-col items-center justify-center bg-green-400 h-28 p-3">
+              <Avatar className="w-20 h-20 border-4 border-white absolute -bottom-10">
+                <AvatarImage src="https://github.com/shadcn.png" />
+                <AvatarFallback>CN</AvatarFallback>
+              </Avatar>
+            </CardHeader>
+
+            {/* Card content displaying the user's name and email */}
+            <CardContent className="mt-12 text-center p-2">
+              <CardTitle className="text-md font-semibold">Mohamed Asfik</CardTitle>
+              <p className="text-xs text-gray-700">[email protected]</p>
+            </CardContent>
+
+            {/* Card footer with the logout button */}
+            <CardFooter className="flex justify-center p-2">
+              {/* Remove the logout functionality */}
+              <button
+                className="bg-gray-500 text-white py-1 px-3 rounded-md hover:bg-gray-600"
+
+              >
+                Logout
+              </button>
+            </CardFooter>
+          </Card>
+        </div>
+      )}
+    </div>
+  );
+}
diff --git a/server/src/components/calendar.tsx b/server/src/components/calendar.tsx
@@ -12,8 +12,7 @@ import {
   AlertDialogDescription,
   AlertDialogFooter,
   AlertDialogHeader,
-  AlertDialogTitle,
-  AlertDialogTrigger,
+  AlertDialogTitle
 } from "@/components/ui/alert-dialog";
 import { Input } from "@/components/ui/input";
 import { Button } from "@/components/ui/button";
@@ -634,4 +633,4 @@ const TaskCalendar: React.FC<TaskCalendarProps> = ({ selectedUser }) => {
   );
 };
 
-export default TaskCalendar;
+export default TaskCalendar;
-Original file line number
+Diff line change
@@ Expand Up / @@ -40,7 +40,7 @@ async function main() { @@
         }
       });
       // console.log({ mentor1, mentor2, student1, student2, student3, feedback1, feedback2, report1, report2 });
     } catch (error) {
       console.error('Error seeding data:', error);
@@ Expand Down @@