Merge branch 'frontend' into dev
This commit is contained in:
		
						commit
						df7ca1ab90
					
				
					 19 changed files with 496 additions and 20 deletions
				
			
		
							
								
								
									
										26
									
								
								frontend/src/Pages/AdminPages/AdminAddProject.tsx
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										26
									
								
								frontend/src/Pages/AdminPages/AdminAddProject.tsx
									
										
									
									
									
										Normal 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; | ||||
							
								
								
									
										26
									
								
								frontend/src/Pages/AdminPages/AdminAddUser.tsx
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										26
									
								
								frontend/src/Pages/AdminPages/AdminAddUser.tsx
									
										
									
									
									
										Normal 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; | ||||
							
								
								
									
										26
									
								
								frontend/src/Pages/AdminPages/AdminChangeUsername.tsx
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										26
									
								
								frontend/src/Pages/AdminPages/AdminChangeUsername.tsx
									
										
									
									
									
										Normal 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; | ||||
							
								
								
									
										26
									
								
								frontend/src/Pages/AdminPages/AdminManageProjects.tsx
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										26
									
								
								frontend/src/Pages/AdminPages/AdminManageProjects.tsx
									
										
									
									
									
										Normal 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; | ||||
							
								
								
									
										26
									
								
								frontend/src/Pages/AdminPages/AdminManageUsers.tsx
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										26
									
								
								frontend/src/Pages/AdminPages/AdminManageUsers.tsx
									
										
									
									
									
										Normal 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; | ||||
							
								
								
									
										26
									
								
								frontend/src/Pages/AdminPages/AdminProjectAddMember.tsx
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										26
									
								
								frontend/src/Pages/AdminPages/AdminProjectAddMember.tsx
									
										
									
									
									
										Normal 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; | ||||
							
								
								
									
										26
									
								
								frontend/src/Pages/AdminPages/AdminProjectChangeUserRole.tsx
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										26
									
								
								frontend/src/Pages/AdminPages/AdminProjectChangeUserRole.tsx
									
										
									
									
									
										Normal 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; | ||||
							
								
								
									
										26
									
								
								frontend/src/Pages/AdminPages/AdminProjectManageMembers.tsx
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										26
									
								
								frontend/src/Pages/AdminPages/AdminProjectManageMembers.tsx
									
										
									
									
									
										Normal 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; | ||||
							
								
								
									
										26
									
								
								frontend/src/Pages/AdminPages/AdminProjectPage.tsx
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										26
									
								
								frontend/src/Pages/AdminPages/AdminProjectPage.tsx
									
										
									
									
									
										Normal 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; | ||||
							
								
								
									
										20
									
								
								frontend/src/Pages/AdminPages/AdminProjectStatistics.tsx
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										20
									
								
								frontend/src/Pages/AdminPages/AdminProjectStatistics.tsx
									
										
									
									
									
										Normal 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; | ||||
							
								
								
									
										26
									
								
								frontend/src/Pages/AdminPages/AdminProjectViewMemberInfo.tsx
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										26
									
								
								frontend/src/Pages/AdminPages/AdminProjectViewMemberInfo.tsx
									
										
									
									
									
										Normal 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; | ||||
							
								
								
									
										26
									
								
								frontend/src/Pages/AdminPages/AdminViewUserInfo.tsx
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										26
									
								
								frontend/src/Pages/AdminPages/AdminViewUserInfo.tsx
									
										
									
									
									
										Normal 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; | ||||
|  | @ -1,8 +1,16 @@ | |||
| import BasicWindow from "../../Components/BasicWindow"; | ||||
| import Button from "../../Components/Button"; | ||||
| import TimeReport from "../../Components/TimeReport"; | ||||
| 
 | ||||
| function PMTotalTimeActivity(): JSX.Element { | ||||
|   const content = <></>; | ||||
|   const content = ( | ||||
|     <> | ||||
|       <h1 className="font-bold text-[30px] mb-[20px]"> | ||||
|         Total Time Per Activity | ||||
|       </h1> | ||||
|       <TimeReport /> | ||||
|     </> | ||||
|   ); | ||||
| 
 | ||||
|   const buttons = ( | ||||
|     <> | ||||
|  |  | |||
|  | @ -1,8 +1,16 @@ | |||
| import BasicWindow from "../../Components/BasicWindow"; | ||||
| import Button from "../../Components/Button"; | ||||
| import TimeReport from "../../Components/TimeReport"; | ||||
| 
 | ||||
| function PMViewUnsignedReport(): JSX.Element { | ||||
|   const content = <></>; | ||||
|   const content = ( | ||||
|     <> | ||||
|       <h1 className="font-bold text-[30px] mb-[20px]"> | ||||
|         Username's Time Report | ||||
|       </h1> | ||||
|       <TimeReport /> | ||||
|     </> | ||||
|   ); | ||||
| 
 | ||||
|   const buttons = ( | ||||
|     <> | ||||
|  |  | |||
|  | @ -1,8 +1,14 @@ | |||
| import BasicWindow from "../../Components/BasicWindow"; | ||||
| import Button from "../../Components/Button"; | ||||
| import NewTimeReport from "../../Components/TimeReport"; | ||||
| 
 | ||||
| function UserEditTimeReportPage(): JSX.Element { | ||||
|   const content = <></>; | ||||
|   const content = ( | ||||
|     <> | ||||
|       <h1 className="font-bold text-[30px] mb-[20px]">Edit Time Report</h1> | ||||
|       <NewTimeReport /> | ||||
|     </> | ||||
|   ); | ||||
| 
 | ||||
|   const buttons = ( | ||||
|     <> | ||||
|  |  | |||
|  | @ -1,8 +1,15 @@ | |||
| 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 = <></>; | ||||
|   const content = ( | ||||
|     <> | ||||
|       <h1 className="font-bold text-[30px] mb-[20px]">New Time Report</h1> | ||||
|       <NewTimeReport /> | ||||
|     </> | ||||
|   ); | ||||
| 
 | ||||
|   const buttons = ( | ||||
|     <> | ||||
|  | @ -12,12 +19,14 @@ function UserNewTimeReportPage(): JSX.Element { | |||
|           return; | ||||
|         }} | ||||
|       /> | ||||
|       <Button | ||||
|         text="Back" | ||||
|         onClick={(): void => { | ||||
|           return; | ||||
|         }} | ||||
|       /> | ||||
|       <Link to="/project"> | ||||
|         <Button | ||||
|           text="Back" | ||||
|           onClick={(): void => { | ||||
|             return; | ||||
|           }} | ||||
|         /> | ||||
|       </Link> | ||||
|     </> | ||||
|   ); | ||||
| 
 | ||||
|  |  | |||
|  | @ -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> | ||||
|     </> | ||||
|   ); | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Imbus
						Imbus