Merge frontend with dev

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

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

frontend/src/Pages/ProjectManagerPages/PMOtherUsersTR.tsx

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

frontend/src/Pages/ProjectManagerPages/PMProjectMembers.tsx

@@ -0,0 +1,32 @@
+import BasicWindow from "../../Components/BasicWindow";
+import Button from "../../Components/Button";
+
+function PMProjectMembers(): JSX.Element {
+  const content = <></>;
+
+  const buttons = (
+    <>
+      <Button
+        text="Time / Activity"
+        onClick={(): void => {
+          return;
+        }}
+      />
+      <Button
+        text="Time / Role"
+        onClick={(): void => {
+          return;
+        }}
+      />
+      <Button
+        text="Back"
+        onClick={(): void => {
+          return;
+        }}
+      />
+    </>
+  );
+
+  return <BasicWindow username="Admin" content={content} buttons={buttons} />;
+}
+export default PMProjectMembers;

frontend/src/Pages/ProjectManagerPages/PMTotalTimeActivity.tsx

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

frontend/src/Pages/ProjectManagerPages/PMTotalTimeRole.tsx

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

frontend/src/Pages/ProjectManagerPages/PMUnsignedReports.tsx

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

frontend/src/Pages/ProjectManagerPages/PMViewUnsignedReport.tsx

@@ -0,0 +1,32 @@
+import BasicWindow from "../../Components/BasicWindow";
+import Button from "../../Components/Button";
+
+function PMViewUnsignedReport(): JSX.Element {
+  const content = <></>;
+
+  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} />;
+}
+export default PMViewUnsignedReport;

frontend/src/Pages/UserPages/UserEditTimeReportPage.tsx

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

frontend/src/Pages/UserPages/UserNewTimeReportPage.tsx

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

frontend/src/Pages/UserPages/UserViewTimeReportsPage.tsx

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

frontend/src/Pages/YourProjectsPage.tsx

@@ -12,13 +12,13 @@ function YourProjectsPage(): JSX.Element {
           </h1>
         </Link>
         <h1 className="underline text-[24px] cursor-pointer font-bold">
-          ProjectNameExample
+          ProjectNameExample2
         </h1>
         <h1 className="underline text-[24px] cursor-pointer font-bold">
-          ProjectNameExample
+          ProjectNameExample3
         </h1>
         <h1 className="underline text-[24px] cursor-pointer font-bold">
-          ProjectNameExample
+          ProjectNameExample4
         </h1>
       </div>
     </>