Imbus/TTime
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'dev' into gruppPP

Browse source
This commit is contained in:
Peter KW 2024-03-29 20:05:10 +01:00
commit 4ab23b3c3c
70 changed files with 3279 additions and 1171 deletions
Download patch file Download diff file Expand all files Collapse all files

16
frontend/src/Pages/AdminPages/AdminProjectPage.tsx
View file

@ -1,17 +1,26 @@
import { useParams } from "react-router-dom";
import { api } from "../../API/API";
import BackButton from "../../Components/BackButton";
import BasicWindow from "../../Components/BasicWindow";
import Button from "../../Components/Button";
async function handleDeleteProject(
projectName: string,
token: string,
): Promise<void> {
await api.removeProject(projectName, token);
}
function AdminProjectPage(): JSX.Element {
const content = <></>;
const { projectName } = useParams();
const token = localStorage.getItem("accessToken");
const buttons = (
<>
<Button
text="Delete"
onClick={(): void => {
return;
}}
onClick={() => handleDeleteProject(projectName, token)}
type="button"
/>
<BackButton />
@ -20,4 +29,5 @@ function AdminProjectPage(): JSX.Element {
return <BasicWindow content={content} buttons={buttons} />;
}
export default AdminProjectPage;

10
frontend/src/Pages/LoginPage.css
View file

@ -4,23 +4,23 @@ body{
@keyframes backgroundTransition {
0% {
background-image: url('src/assets/1.jpg');
background-image: url('../assets/1.jpg');
animation-timing-function: ease-out;
}
25% {
background-image: url('src/assets/2.jpg');
background-image: url('../assets/2.jpg');
animation-timing-function: ease-in;
}
50% {
background-image: url('src/assets/3.jpg');
background-image: url('../assets/3.jpg');
animation-timing-function: ease-out;
}
75% {
background-image: url('src/assets/4.jpg');
background-image: url('../assets/4.jpg');
animation-timing-function: ease-in;
}
100% {
background-image: url('src/assets/1.jpg');
background-image: url('../assets/1.jpg');
animation-timing-function: ease-out;
}
}

7
frontend/src/Pages/ProjectManagerPages/PMOtherUsersTR.tsx
View file

@ -1,8 +1,13 @@
import BasicWindow from "../../Components/BasicWindow";
import BackButton from "../../Components/BackButton";
import AllTimeReportsInProjectOtherUser from "../../Components/AllTimeReportsInProjectOtherUser";
function PMOtherUsersTR(): JSX.Element {
const content = <></>;
const content = (
<>
<AllTimeReportsInProjectOtherUser />
</>
);
const buttons = (
<>

14
frontend/src/Pages/ProjectManagerPages/PMProjectMembers.tsx
View file

@ -8,16 +8,13 @@ function PMProjectMembers(): JSX.Element {
const { projectName } = useParams();
const content = (
<>
<h1 className="font-bold text-[30px] mb-[20px]">
All Members In: {projectName}{" "}
</h1>
<ProjectMembers />
</>
);
const buttons = (
<>
<Link to="/PM-time-activity">
<Link to={`/PMtimeactivity/${projectName}`}>
<Button
text="Time / Activity"
onClick={(): void => {
@ -26,15 +23,6 @@ function PMProjectMembers(): JSX.Element {
type={"button"}
/>
</Link>
<Link to="/PM-time-role">
<Button
text="Time / Role"
onClick={(): void => {
return;
}}
type={"button"}
/>
</Link>
<BackButton />
</>
);

7
frontend/src/Pages/ProjectManagerPages/PMTotalTimeActivity.tsx
View file

@ -1,14 +1,11 @@
import BackButton from "../../Components/BackButton";
import BasicWindow from "../../Components/BasicWindow";
import TimeReport from "../../Components/NewWeeklyReport";
import TimePerActivity from "../../Components/TimePerActivity";
function PMTotalTimeActivity(): JSX.Element {
const content = (
<>
<h1 className="font-bold text-[30px] mb-[20px]">
Total Time Per Activity
</h1>
<TimeReport />
<TimePerActivity />
</>
);

7
frontend/src/Pages/ProjectManagerPages/PMTotalTimeRole.tsx
View file

@ -1,8 +1,13 @@
import BasicWindow from "../../Components/BasicWindow";
import BackButton from "../../Components/BackButton";
import TimePerRole from "../../Components/TimePerRole";
function PMTotalTimeRole(): JSX.Element {
const content = <></>;
const content = (
<>
<TimePerRole />
</>
);
const buttons = (
<>

7
frontend/src/Pages/ProjectManagerPages/PMUnsignedReports.tsx
View file

@ -1,8 +1,13 @@
import BasicWindow from "../../Components/BasicWindow";
import BackButton from "../../Components/BackButton";
import DisplayUnsignedReports from "../../Components/DisplayUnsignedReports";
function PMUnsignedReports(): JSX.Element {
const content = <></>;
const content = (
<>
<DisplayUnsignedReports />
</>
);
const buttons = (
<>

20
frontend/src/Pages/ProjectManagerPages/PMViewOtherUsersTR.tsx Normal file
View file

@ -0,0 +1,20 @@
import BasicWindow from "../../Components/BasicWindow";
import BackButton from "../../Components/BackButton";
import OtherUsersTR from "../../Components/OtherUsersTR";
function PMViewOtherUsersTR(): JSX.Element {
const content = (
<>
<OtherUsersTR />
</>
);
const buttons = (
<>
<BackButton />
</>
);
return <BasicWindow content={content} buttons={buttons} />;
}
export default PMViewOtherUsersTR;

22
frontend/src/Pages/ProjectManagerPages/PMViewUnsignedReport.tsx
View file

@ -1,34 +1,16 @@
import BackButton from "../../Components/BackButton";
import BasicWindow from "../../Components/BasicWindow";
import Button from "../../Components/Button";
import TimeReport from "../../Components/NewWeeklyReport";
import ViewOtherTimeReport from "../../Components/ViewOtherTimeReport";
function PMViewUnsignedReport(): JSX.Element {
const content = (
<>
<h1 className="font-bold text-[30px] mb-[20px]">
Username&apos;s Time Report
</h1>
<TimeReport />
<ViewOtherTimeReport />
</>
);
const buttons = (
<>
<Button
text="Sign"
onClick={(): void => {
return;
}}
type="button"
/>
<Button
text="Save"
onClick={(): void => {
return;
}}
type="button"
/>
<BackButton />
</>
);

1
frontend/src/Pages/UserPages/UserEditTimeReportPage.tsx
View file

@ -5,7 +5,6 @@ import EditWeeklyReport from "../../Components/EditWeeklyReport";
function UserEditTimeReportPage(): JSX.Element {
const content = (
<>
<h1 className="font-bold text-[30px] mb-[20px]">Edit Time Report</h1>
<EditWeeklyReport />
</>
);