diff --git a/frontend/postcss.config.js b/frontend/postcss.config.js index 2e7af2b..2aa7205 100644 --- a/frontend/postcss.config.js +++ b/frontend/postcss.config.js @@ -3,4 +3,4 @@ export default { tailwindcss: {}, autoprefixer: {}, }, -} +}; diff --git a/frontend/src/Components/BasicWindow.tsx b/frontend/src/Components/BasicWindow.tsx index 9899fa1..1835d6a 100644 --- a/frontend/src/Components/BasicWindow.tsx +++ b/frontend/src/Components/BasicWindow.tsx @@ -1,18 +1,22 @@ -import Header from './Header'; -import Footer from './Footer'; +import Header from "./Header"; +import Footer from "./Footer"; -function BasicWindow({ username, content, buttons }: { username: string, content: React.ReactNode, buttons:React.ReactNode }) { +function BasicWindow({ + username, + content, + buttons, +}: { + username: string; + content: React.ReactNode; + buttons: React.ReactNode; +}): JSX.Element { return (
-
- {content} -
-
- {buttons} -
+
{content}
+
); } -export default BasicWindow; \ No newline at end of file +export default BasicWindow; diff --git a/frontend/src/Components/Button.tsx b/frontend/src/Components/Button.tsx index a00f5e1..cf6a887 100644 --- a/frontend/src/Components/Button.tsx +++ b/frontend/src/Components/Button.tsx @@ -1,10 +1,18 @@ -function Button({text, onClick}: {text: string; onClick: () => void;}){ - return +function Button({ + text, + onClick, +}: { + text: string; + onClick: () => void; +}): JSX.Element { + return ( + + ); } -export default Button; \ No newline at end of file +export default Button; diff --git a/frontend/src/Components/Footer.tsx b/frontend/src/Components/Footer.tsx index f1c7e29..a3b7469 100644 --- a/frontend/src/Components/Footer.tsx +++ b/frontend/src/Components/Footer.tsx @@ -1,13 +1,13 @@ -import React from 'react'; +import React from "react"; -function Footer({ children }: { children: React.ReactNode }) { +function Footer({ children }: { children: React.ReactNode }): JSX.Element { return ( ); } -export default Footer; \ No newline at end of file +export default Footer; diff --git a/frontend/src/Components/Header.tsx b/frontend/src/Components/Header.tsx index fde1fbf..5c642b8 100644 --- a/frontend/src/Components/Header.tsx +++ b/frontend/src/Components/Header.tsx @@ -1,41 +1,54 @@ -import React, { useState } from 'react'; -import { Link } from 'react-router-dom'; +import { useState } from "react"; +import { Link } from "react-router-dom"; - -function Header({ username }: { username: string }) { +function Header({ username }: { username: string }): JSX.Element { const [isOpen, setIsOpen] = useState(false); - const handleLogout = () => { + const handleLogout = (): void => { // Add any logout logic here }; return ( -
+
- TTIME Logo + TTIME Logo - -
setIsOpen(true)} - onMouseLeave={() => setIsOpen(false)} + onMouseEnter={() => { + setIsOpen(true); + }} + onMouseLeave={() => { + setIsOpen(false); + }} > - + {isOpen && (
- +
)}
); - } +} export default Header; - diff --git a/frontend/src/Pages/ProjectManagerPages/PMProjectPage.tsx b/frontend/src/Pages/ProjectManagerPages/PMProjectPage.tsx index 80f35ad..009a5bd 100644 --- a/frontend/src/Pages/ProjectManagerPages/PMProjectPage.tsx +++ b/frontend/src/Pages/ProjectManagerPages/PMProjectPage.tsx @@ -1,26 +1,38 @@ import BasicWindow from "../../Components/BasicWindow"; import Button from "../../Components/Button"; -function PMProjectPage() { - - const content = -<> -

ProjectNameExample

-
-

Your Time Reports

-

New Time Report

-

Statistics

-

Unsigned Time Reports

-
- - - const buttons = - <> -