Change logo

frontend/src/Components/Header.tsx

@@ -15,7 +15,7 @@ function Header({ username }: { username: string }): JSX.Element {
     >
       <Link to="/your-projects">
         <img
-          src="/src/assets/TTIMElogo.png"
+          src="/src/assets/Logo.svg"
           alt="TTIME Logo"
           className="w-11 h-14 cursor-pointer"
         />

frontend/src/Pages/LoginPage.tsx

@@ -1,5 +1,5 @@
 import Button from "../Components/Button";
-import Logo from "/src/assets/TTIMElogo.png";
+import Logo from "/src/assets/Logo.svg";
 import "./LoginPage.css";
 import { useEffect } from "react";
 import { Link } from "react-router-dom";

frontend/src/Pages/ProjectManagerPages/PMChangeRole.tsx

@@ -1,9 +1,25 @@
 import BasicWindow from "../../Components/BasicWindow";
+import Button from "../../Components/Button";
 
 function ChangeRole(): JSX.Element {
   const content = <></>;
 
-  const buttons = <></>;
+  const buttons = (
+    <>
+      <Button
+        text="Save"
+        onClick={(): void => {
+          return;
+        }}
+      />
+      <Button
+        text="Back"
+        onClick={(): void => {
+          return;
+        }}
+      />
+    </>
+  );
 
   return <BasicWindow username="Admin" content={content} buttons={buttons} />;
 }

frontend/src/Pages/ProjectManagerPages/PMProjectMembers.tsx

@@ -6,6 +6,18 @@ function PMProjectMembers(): JSX.Element {
 
   const buttons = (
     <>
+      <Button
+        text="Time / Activity"
+        onClick={(): void => {
+          return;
+        }}
+      />
+      <Button
+        text="Time / Role"
+        onClick={(): void => {
+          return;
+        }}
+      />
       <Button
         text="Back"
         onClick={(): void => {

frontend/src/Pages/ProjectManagerPages/PMTotalTimeActivity.tsx

@@ -1,9 +1,19 @@
 import BasicWindow from "../../Components/BasicWindow";
+import Button from "../../Components/Button";
 
 function PMTotalTimeActivity(): JSX.Element {
   const content = <></>;
 
-  const buttons = <></>;
+  const buttons = (
+    <>
+      <Button
+        text="Back"
+        onClick={(): void => {
+          return;
+        }}
+      />
+    </>
+  );
 
   return <BasicWindow username="Admin" content={content} buttons={buttons} />;
 }

frontend/src/Pages/ProjectManagerPages/PMTotalTimeRole.tsx

@@ -1,9 +1,19 @@
 import BasicWindow from "../../Components/BasicWindow";
+import Button from "../../Components/Button";
 
 function PMTotalTimeRole(): JSX.Element {
   const content = <></>;
 
-  const buttons = <></>;
+  const buttons = (
+    <>
+      <Button
+        text="Back"
+        onClick={(): void => {
+          return;
+        }}
+      />
+    </>
+  );
 
   return <BasicWindow username="Admin" content={content} buttons={buttons} />;
 }

frontend/src/Pages/ProjectManagerPages/PMUnsignedReports.tsx

@@ -1,9 +1,19 @@
 import BasicWindow from "../../Components/BasicWindow";
+import Button from "../../Components/Button";
 
 function PMUnsignedReports(): JSX.Element {
   const content = <></>;
 
-  const buttons = <></>;
+  const buttons = (
+    <>
+      <Button
+        text="Back"
+        onClick={(): void => {
+          return;
+        }}
+      />
+    </>
+  );
 
   return <BasicWindow username="Admin" content={content} buttons={buttons} />;
 }

frontend/src/Pages/ProjectManagerPages/PMViewUnsignedReport.tsx

@@ -1,9 +1,31 @@
 import BasicWindow from "../../Components/BasicWindow";
+import Button from "../../Components/Button";
 
 function PMViewUnsignedReport(): JSX.Element {
   const content = <></>;
 
-  const buttons = <></>;
+  const buttons = (
+    <>
+      <Button
+        text="Sign"
+        onClick={(): void => {
+          return;
+        }}
+      />
+      <Button
+        text="Save"
+        onClick={(): void => {
+          return;
+        }}
+      />
+      <Button
+        text="Back"
+        onClick={(): void => {
+          return;
+        }}
+      />
+    </>
+  );
 
   return <BasicWindow username="Admin" content={content} buttons={buttons} />;
 }

frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx

@@ -1,9 +1,25 @@
 import BasicWindow from "../../Components/BasicWindow";
+import Button from "../../Components/Button";
 
 function UserNewTimeReportPage(): JSX.Element {
   const content = <></>;
 
-  const buttons = <></>;
+  const buttons = (
+    <>
+      <Button
+        text="Submit"
+        onClick={(): void => {
+          return;
+        }}
+      />
+      <Button
+        text="Back"
+        onClick={(): void => {
+          return;
+        }}
+      />
+    </>
+  );
 
   return <BasicWindow username="Admin" content={content} buttons={buttons} />;
 }

frontend/src/Pages/UserPages/UserViewTimeReportsPage.tsx

@@ -1,9 +1,19 @@
 import BasicWindow from "../../Components/BasicWindow";
+import Button from "../../Components/Button";
 
 function UserViewTimeReportsPage(): JSX.Element {
   const content = <></>;
 
-  const buttons = <></>;
+  const buttons = (
+    <>
+      <Button
+        text="Back"
+        onClick={(): void => {
+          return;
+        }}
+      />
+    </>
+  );
 
   return <BasicWindow username="Admin" content={content} buttons={buttons} />;
 }

frontend/src/main.tsx

@@ -7,6 +7,12 @@ import YourProjectsPage from "./Pages/YourProjectsPage.tsx";
 import UserProjectPage from "./Pages/UserPages/UserProjectPage.tsx";
 import AdminMenuPage from "./Pages/AdminPages/AdminMenuPage.tsx";
 import UserEditTimeReportPage from "./Pages/UserPages/UserEditTimeReportPage.tsx";
+import UserNewTimeReportPage from "./Pages/UserPages/UserNewTimeReportPage.tsx";
+import UserViewTimeReportsPage from "./Pages/UserPages/UserViewTimeReportsPage.tsx";
+import PMChangeRole from "./Pages/ProjectManagerPages/PMChangeRole.tsx";
+import PMOtherUsersTR from "./Pages/ProjectManagerPages/PMOtherUsersTR.tsx";
+import PMProjectMembers from "./Pages/ProjectManagerPages/PMProjectMembers.tsx";
+import PMProjectPage from "./Pages/ProjectManagerPages/PMProjectPage.tsx";
 
 // This is where the routes are mounted
 const router = createBrowserRouter([
@@ -14,21 +20,45 @@ const router = createBrowserRouter([
     path: "/",
     element: <LoginPage />,
   },
+  {
+    path: "/admin-menu",
+    element: <AdminMenuPage />,
+  },
   {
     path: "/your-projects",
     element: <YourProjectsPage />,
   },
+  {
+    path: "/edit-time-report",
+    element: <UserEditTimeReportPage />,
+  },
+  {
+    path: "/new-time-report",
+    element: <UserNewTimeReportPage />,
+  },
   {
     path: "/project",
     element: <UserProjectPage />,
   },
   {
-    path: "/admin-menu",
+    path: "/project-page",
-    element: <AdminMenuPage />,
+    element: <UserViewTimeReportsPage />,
   },
   {
-    path: "/edit-time-report",
+    path: "/change-role",
-    element: <UserEditTimeReportPage />,
+    element: <PMChangeRole />,
+  },
+  {
+    path: "/other-users-time-reports",
+    element: <PMOtherUsersTR />,
+  },
+  {
+    path: "/project-members",
+    element: <PMProjectMembers />,
+  },
+  {
+    path: "/PM-project-page",
+    element: <PMProjectPage />,
   },
 ]);