Compare commits

...

40 commits

Author SHA1 Message Date
Imbus
baade40d77 Merge branch 'gruppDM' into frontend 2024-03-14 18:39:51 +01:00
Imbus
3bf0c34a5f Merge branch 'gruppDM' into frontend 2024-03-14 18:36:27 +01:00
Davenludd
8690e381c8 Add links to navigate between pages projectPage & NewTimeReport 2024-03-14 15:49:13 +01:00
Davenludd
41e1c32ee0 Added time report component to various pages 2024-03-14 15:17:38 +01:00
Mattias
46c4a5dc92 Added more paths in main 2024-03-14 14:59:57 +01:00
Davenludd
03e2be0a46 Add AdminProjectChangeUserRole page & buttons 2024-03-14 14:53:51 +01:00
Davenludd
39edc419df Add AdminProjectViewMemberInfo page & buttons 2024-03-14 14:53:51 +01:00
Davenludd
027bce6dfc Add AdminProjectAddMember page & buttons 2024-03-14 14:53:51 +01:00
Davenludd
da730a2d18 Add AdminProjectManageMembers page & buttons 2024-03-14 14:53:51 +01:00
Davenludd
dd370d86e3 Add AdminProjectStatistics page & buttons 2024-03-14 14:53:51 +01:00
Davenludd
ca7e4c6189 Add AdminProjectPage page & buttons 2024-03-14 14:53:51 +01:00
Mattias
19e3567c78 More paths in main 2024-03-14 14:42:26 +01:00
Davenludd
6a68ad1c3f Add AdminAddProject page & buttons 2024-03-14 14:39:34 +01:00
Davenludd
3047db28f6 Add AdminManageProjects page & buttons 2024-03-14 14:39:34 +01:00
Davenludd
2d5de569ae Add AdminChangeUsername page & buttons 2024-03-14 14:39:34 +01:00
Davenludd
5a6fe1c472 Add AdminViewUserInfo page & buttons 2024-03-14 14:39:34 +01:00
Mattias
1b3660eb83 Added more paths in main 2024-03-14 14:33:43 +01:00
Davenludd
69df212fde Add AdminAddUser page & buttons 2024-03-14 14:30:56 +01:00
Davenludd
434879c26c Add AdminManageUsers page & buttons 2024-03-14 14:30:56 +01:00
Mattias
c5d5c389dd Added new paths in main 2024-03-14 14:29:10 +01:00
Davenludd
03f350f303 Made a new component for time reporting 2024-03-14 13:21:19 +01:00
Davenludd
7e319e34c9 Change logo 2024-03-14 11:08:07 +01:00
Mattias
60774f6324 Added more paths in main 2024-03-14 11:00:55 +01:00
Mattias
db647c6e7c Added buttons 2024-03-14 11:00:55 +01:00
Mattias
45749afe69 Added buttons 2024-03-14 11:00:55 +01:00
Davenludd
2cce3f3ab4 Add time/activity and time/role buttons to PMProjectMembers page 2024-03-14 10:59:51 +01:00
Davenludd
a67e43e537 Add back button to PMUnsignedReports component 2024-03-14 10:57:42 +01:00
Davenludd
ce5d6d2837 Add "Back" button to PMTotalTimeRole component 2024-03-14 10:56:01 +01:00
Davenludd
f9260976df Add "Back" button to PMTotalTimeActivity component 2024-03-14 10:55:30 +01:00
Davenludd
5c0cf5fc33 Add buttons to PMViewUnsignedReport component 2024-03-14 10:54:37 +01:00
Davenludd
8a2724de5e Add save and back buttons to PMChangeRole component 2024-03-14 10:52:48 +01:00
Davenludd
7aa83b1d99 Add back button to PMOtherUsersTR component 2024-03-14 10:50:52 +01:00
Davenludd
2c9d3baafa Added button to PMProjectMembers 2024-03-14 10:49:15 +01:00
Davenludd
a5f15e5c06 Create all files for ProjectManagerPages 2024-03-14 10:41:10 +01:00
Mattias
c1aa0769bb Added path in main 2024-03-14 10:33:00 +01:00
Mattias
6be1060cff Added buttons to UserEditTimeReportPage 2024-03-14 10:32:39 +01:00
Mattias
42498ca1c4 Changed name on exampletext 2024-03-13 16:18:06 +01:00
Davenludd
029fdd85b9 Minor change LoginPage 2024-03-13 16:11:36 +01:00
Davenludd
8bb4a1c893 Change logo to svg 2024-03-13 16:07:52 +01:00
Mattias
7c51f586ce Created three new empty pages for basic user 2024-03-13 14:18:06 +01:00
30 changed files with 773 additions and 11 deletions

View file

@ -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"
/>

View file

@ -0,0 +1,59 @@
function NewTimeReport(): JSX.Element {
const activities = [
"Development",
"Meeting",
"Administration",
"Own Work",
"Studies",
"Testing",
];
return (
<>
<div className="border-4 border-black bg-white flex flex-col justify-start min-h-[65vh] h-fit w-[50vw] rounded-3xl overflow-scroll space-y-[2vh] p-[30px] items-center">
<input
className="w-fill h-[5vh] font-sans text-[3vh] pl-[1vw] rounded-full text-center pt-[1vh] pb-[1vh] border-2 border-black"
type="week"
placeholder="Week"
onKeyDown={(event) => {
event.preventDefault();
}}
onPaste={(event) => {
event.preventDefault();
}}
/>
<table className="w-full text-center divide-y divide-x divide-white text-[30px]">
<thead>
<tr>
<th className="w-1/2 py-2 border-b-2 border-black">Activity</th>
<th className="w-1/2 py-2 border-b-2 border-black">
Total Time (min)
</th>
</tr>
</thead>
<tbody className="divide-y divide-black">
{activities.map((activity, index) => (
<tr key={index} className="h-[10vh]">
<td>{activity}</td>
<td>
<input
type="number"
min="0"
className="border-2 border-black rounded-md text-center w-1/2"
onKeyDown={(event) => {
const keyValue = event.key;
if (!/\d/.test(keyValue) && keyValue !== "Backspace")
event.preventDefault();
}}
/>
</td>
</tr>
))}
</tbody>
</table>
</div>
</>
);
}
export default NewTimeReport;

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -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";

View file

@ -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;

View file

@ -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;

View file

@ -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;

View file

@ -0,0 +1,28 @@
import BasicWindow from "../../Components/BasicWindow";
import Button from "../../Components/Button";
import TimeReport from "../../Components/TimeReport";
function PMTotalTimeActivity(): JSX.Element {
const content = (
<>
<h1 className="font-bold text-[30px] mb-[20px]">
Total Time Per Activity
</h1>
<TimeReport />
</>
);
const buttons = (
<>
<Button
text="Back"
onClick={(): void => {
return;
}}
/>
</>
);
return <BasicWindow username="Admin" content={content} buttons={buttons} />;
}
export default PMTotalTimeActivity;

View file

@ -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;

View file

@ -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;

View file

@ -0,0 +1,40 @@
import BasicWindow from "../../Components/BasicWindow";
import Button from "../../Components/Button";
import TimeReport from "../../Components/TimeReport";
function PMViewUnsignedReport(): JSX.Element {
const content = (
<>
<h1 className="font-bold text-[30px] mb-[20px]">
Username&apos;s Time Report
</h1>
<TimeReport />
</>
);
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;

View file

@ -0,0 +1,32 @@
import BasicWindow from "../../Components/BasicWindow";
import Button from "../../Components/Button";
import NewTimeReport from "../../Components/TimeReport";
function UserEditTimeReportPage(): JSX.Element {
const content = (
<>
<h1 className="font-bold text-[30px] mb-[20px]">Edit Time Report</h1>
<NewTimeReport />
</>
);
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;

View file

@ -0,0 +1,35 @@
import BasicWindow from "../../Components/BasicWindow";
import Button from "../../Components/Button";
import NewTimeReport from "../../Components/TimeReport";
import { Link } from "react-router-dom";
function UserNewTimeReportPage(): JSX.Element {
const content = (
<>
<h1 className="font-bold text-[30px] mb-[20px]">New Time Report</h1>
<NewTimeReport />
</>
);
const buttons = (
<>
<Button
text="Submit"
onClick={(): void => {
return;
}}
/>
<Link to="/project">
<Button
text="Back"
onClick={(): void => {
return;
}}
/>
</Link>
</>
);
return <BasicWindow username="Admin" content={content} buttons={buttons} />;
}
export default UserNewTimeReportPage;

View file

@ -5,16 +5,16 @@ import Button from "../../Components/Button";
function UserProjectPage(): JSX.Element {
const content = (
<>
<Link to="/settingsPage">
<h1 className="font-bold text-[30px] mb-[20px]">ProjectNameExample</h1>
</Link>
<h1 className="font-bold text-[30px] mb-[20px]">ProjectNameExample</h1>
<div className="border-4 border-black bg-white flex flex-col items-center justify-center min-h-[65vh] h-fit w-[50vw] rounded-3xl content-center overflow-scroll space-y-[10vh] p-[30px]">
<h1 className="font-bold underline text-[30px] cursor-pointer">
Your Time Reports
</h1>
<h1 className="font-bold underline text-[30px] cursor-pointer">
New Time Report
</h1>
<Link to="/new-time-report">
<h1 className="font-bold underline text-[30px] cursor-pointer">
New Time Report
</h1>
</Link>
</div>
</>
);

View file

@ -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;

View file

@ -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>
</>

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 348 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 261 KiB

View file

@ -6,6 +6,29 @@ import LoginPage from "./Pages/LoginPage.tsx";
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";
import PMTotalTimeActivity from "./Pages/ProjectManagerPages/PMTotalTimeActivity.tsx";
import PMTotalTimeRole from "./Pages/ProjectManagerPages/PMTotalTimeRole.tsx";
import PMUnsignedReports from "./Pages/ProjectManagerPages/PMUnsignedReports.tsx";
import PMViewUnsignedReport from "./Pages/ProjectManagerPages/PMViewUnsignedReport.tsx";
import AdminManageUsers from "./Pages/AdminPages/AdminManageUsers.tsx";
import AdminViewUserInfo from "./Pages/AdminPages/AdminViewUserInfo.tsx";
import AdminManageProjects from "./Pages/AdminPages/AdminManageProjects.tsx";
import AdminAddProject from "./Pages/AdminPages/AdminAddProject.tsx";
import AdminAddUser from "./Pages/AdminPages/AdminAddUser.tsx";
import AdminChangeUsername from "./Pages/AdminPages/AdminChangeUsername.tsx";
import AdminProjectAddMember from "./Pages/AdminPages/AdminProjectAddMember.tsx";
import AdminProjectChangeUserRole from "./Pages/AdminPages/AdminProjectChangeUserRole.tsx";
import AdminProjectManageMembers from "./Pages/AdminPages/AdminProjectManageMembers.tsx";
import AdminProjectStatistics from "./Pages/AdminPages/AdminProjectStatistics.tsx";
import AdminProjectViewMemberInfo from "./Pages/AdminPages/AdminProjectViewMemberInfo.tsx";
import AdminProjectPage from "./Pages/AdminPages/AdminProjectPage.tsx";
// This is where the routes are mounted
const router = createBrowserRouter([
@ -17,14 +40,106 @@ const router = createBrowserRouter([
path: "/your-projects",
element: <YourProjectsPage />,
},
{
path: "/edit-time-report",
element: <UserEditTimeReportPage />,
},
{
path: "/new-time-report",
element: <UserNewTimeReportPage />,
},
{
path: "/project",
element: <UserProjectPage />,
},
{
path: "/project-page",
element: <UserViewTimeReportsPage />,
},
{
path: "/change-role",
element: <PMChangeRole />,
},
{
path: "/other-users-time-reports",
element: <PMOtherUsersTR />,
},
{
path: "/project-members",
element: <PMProjectMembers />,
},
{
path: "/PM-project-page",
element: <PMProjectPage />,
},
{
path: "/PM-time-activity",
element: <PMTotalTimeActivity />,
},
{
path: "/PM-time-role",
element: <PMTotalTimeRole />,
},
{
path: "/PM-unsigned-reports",
element: <PMUnsignedReports />,
},
{
path: "/PM-view-unsigned-report",
element: <PMViewUnsignedReport />,
},
{
path: "/admin-add-project",
element: <AdminAddProject />,
},
{
path: "/admin-add-user",
element: <AdminAddUser />,
},
{
path: "/admin-change-username",
element: <AdminChangeUsername />,
},
{
path: "/admin-manage-projects",
element: <AdminManageProjects />,
},
{
path: "/admin-manage-users",
element: <AdminManageUsers />,
},
{
path: "/admin-menu",
element: <AdminMenuPage />,
},
{
path: "/admin-project-add-member",
element: <AdminProjectAddMember />,
},
{
path: "/admin-project-change-user-role",
element: <AdminProjectChangeUserRole />,
},
{
path: "/admin-project-manage-members",
element: <AdminProjectManageMembers />,
},
{
path: "/admin-project-page",
element: <AdminProjectPage />,
},
{
path: "/admin-project-statistics",
element: <AdminProjectStatistics />,
},
{
path: "/admin-project-view-members",
element: <AdminProjectViewMemberInfo />,
},
{
path: "/admin-view-user",
element: <AdminViewUserInfo />,
},
]);
// Semi-hacky way to get the root element