Merge frontend into dev
This commit is contained in:
		
						commit
						6cd940866e
					
				
					 5 changed files with 32 additions and 54 deletions
				
			
		
							
								
								
									
										27
									
								
								frontend/src/Pages/AdminPages/AdminMenuPage.tsx
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										27
									
								
								frontend/src/Pages/AdminPages/AdminMenuPage.tsx
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,27 @@ | |||
| import { Link } from "react-router-dom"; | ||||
| import BasicWindow from "../../Components/BasicWindow"; | ||||
| 
 | ||||
| function AdminMenuPage(): JSX.Element { | ||||
|   const content = ( | ||||
|     <> | ||||
|       <h1 className="font-bold text-[30px] mb-[20px]">Administrator Menu</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]"> | ||||
|         <Link to="/admin-users-page"> | ||||
|           <h1 className="font-bold underline text-[30px] cursor-pointer"> | ||||
|             Manage Users | ||||
|           </h1> | ||||
|         </Link> | ||||
|         <Link to="/admin-projects-page"> | ||||
|           <h1 className="font-bold underline text-[30px] cursor-pointer"> | ||||
|             Manage Projects | ||||
|           </h1> | ||||
|         </Link> | ||||
|       </div> | ||||
|     </> | ||||
|   ); | ||||
| 
 | ||||
|   const buttons = <></>; | ||||
| 
 | ||||
|   return <BasicWindow username="Admin" content={content} buttons={buttons} />; | ||||
| } | ||||
| export default AdminMenuPage; | ||||
|  | @ -1,36 +0,0 @@ | |||
| import reactLogo from "../assets/react.svg"; | ||||
| import viteLogo from "/vite.svg"; | ||||
| import "../index.css"; | ||||
| import { CountButton } from "../Components/CountButton"; | ||||
| import { Link } from "react-router-dom"; | ||||
| 
 | ||||
| /** | ||||
|  * The home page of the application | ||||
|  * @returns {JSX.Element} The home page | ||||
|  */ | ||||
| export default function HomePage(): JSX.Element { | ||||
|   return ( | ||||
|     <> | ||||
|       <div> | ||||
|         <a href="https://vitejs.dev" target="_blank" rel="noreferrer"> | ||||
|           <img src={viteLogo} className="logo h-32 p-5" alt="Vite logo" /> | ||||
|         </a> | ||||
|         <a href="https://react.dev" target="_blank" rel="noreferrer"> | ||||
|           <img | ||||
|             src={reactLogo} | ||||
|             className="logo react h-32 p-5" | ||||
|             alt="React logo" | ||||
|           /> | ||||
|         </a> | ||||
|       </div> | ||||
|       <h1>Vite + React</h1> | ||||
|       <div className="card flex flex-col items-center space-y-4"> | ||||
|         <CountButton /> | ||||
|         <Link to="/settings">To Settings</Link> | ||||
|       </div> | ||||
|       <p className="read-the-docs"> | ||||
|         Click on the Vite and React logos to learn more | ||||
|       </p> | ||||
|     </> | ||||
|   ); | ||||
| } | ||||
|  | @ -1,17 +0,0 @@ | |||
| import "../index.css"; | ||||
| import { Link } from "react-router-dom"; | ||||
| 
 | ||||
| /** | ||||
|  * The settings page of the application | ||||
|  * @returns {JSX.Element} The settings page | ||||
|  */ | ||||
| export default function SettingsPage(): JSX.Element { | ||||
|   return ( | ||||
|     <> | ||||
|       <h1>Very Fancy Settings Page</h1> | ||||
|       <div className="card"> | ||||
|         <Link to="/">To Home</Link> | ||||
|       </div> | ||||
|     </> | ||||
|   ); | ||||
| } | ||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Imbus
						Imbus