fix: fix missed merge conflicts

Author: aidanprior

client/src/App.tsx

@@ -11,11 +11,7 @@ import { UserDetails } from './types';
 
 const App: React.FC = () => {
   const [isDarkMode, setIsDarkMode] = useState(false); // Dark mode state
-<<<<<<< HEAD
   const [user, setUser] = useState<UserDetails | null>(null);
-=======
-  const [user, setUser] = useState<Record<string, string> | null>(null);
->>>>>>> dev
 
   const toggleDarkMode = () => {
     setIsDarkMode((prev) => !prev);

client/src/pages/Login.tsx

@@ -3,19 +3,11 @@ import { useNavigate, Link } from 'react-router-dom';
 import { UserDetails } from '../types';
 
 const Login: React.FC<{
-<<<<<<< HEAD
   setUser: React.Dispatch<React.SetStateAction<UserDetails | null>>;
 }> = ({ setUser }) => {
   const [localUsername, setLocalUsername] = useState('');
   const [email, setEmail] = useState('');
   const [password, setPassword] = useState('');
-=======
-  setUser: React.Dispatch<React.SetStateAction<Record<string, string> | null>>;
-}> = ({ setUser }) => {
-  const [localUsername, setLocalUsername] = useState("");
-  const [email, setEmail] = useState("");
-  const [password, setPassword] = useState("");
->>>>>>> dev
   const [error, setError] = useState<string | null>(null);
   const navigate = useNavigate();
 

client/src/pages/Profile.tsx

@@ -1,5 +1,4 @@
 import React from 'react';
-<<<<<<< HEAD
 import { AWSCredentials, ProfileProps, UserDetails } from '../types';
 
 const Profile: React.FC<ProfileProps> = ({ isDarkMode, user, setUser }) => {
@@ -38,11 +37,6 @@ const Profile: React.FC<ProfileProps> = ({ isDarkMode, user, setUser }) => {
         console.error(error);
       });
   }
-=======
-import { ProfileProps } from "../types";
-
-const Profile: React.FC<ProfileProps> = ({ isDarkMode, user }) => {
->>>>>>> dev
 
   return (
     <div className={`profile-container ${isDarkMode ? 'dark-mode' : ''}`}>
@@ -56,7 +50,6 @@ const Profile: React.FC<ProfileProps> = ({ isDarkMode, user }) => {
           </div>
           <div className="profile-info">
             <div className="info-container">
-<<<<<<< HEAD
               <p>Username: {user?.username ?? 'Not Logged In'}</p>
             </div>
             <div className="info-container">
@@ -68,22 +61,6 @@ const Profile: React.FC<ProfileProps> = ({ isDarkMode, user }) => {
             <div className="info-container">
               <p>Work Phone: {user?.work_phone ?? 'Not Logged In'}</p>
             </div>
-=======
-              <p>Username: {user?.username ?? "Not Logged In"}</p>
-            </div>
-            <div className="info-container">
-              <p>Display Name: {user?.display_name ?? "Not Logged In"}</p>
-            </div>
-            <div className="info-container">
-              <p>Work Email: {user?.work_email ?? "Not Logged In"}</p>
-            </div>
-            <div className="info-container">
-              <p>Work Phone: {user?.work_phone ?? "Not Logged In"}</p>
-            </div>
-            {/* <div className="info-container">
-              <p>Company: {user.company}</p>
-            </div> */}
->>>>>>> dev
             <img
               className="aws-logo"
               src="https://a0.awsstatic.com/libra-css/images/logos/aws_logo_smile_1200x630.png"
@@ -103,7 +80,6 @@ const Profile: React.FC<ProfileProps> = ({ isDarkMode, user }) => {
           <label htmlFor="region">Enter Region</label>
           <input type="text" id="region" name="region" />
         </div>
-<<<<<<< HEAD
         <button className="submit-button" onClick={handleCredentialSubmit}>
           Submit
         </button>
@@ -113,19 +89,10 @@ const Profile: React.FC<ProfileProps> = ({ isDarkMode, user }) => {
           target="_blank"
           rel="noopener noreferrer"
         >
-=======
-        <button className="submit-button">Submit</button>
-        {/* <button className="logout-button logout-button-styled" >Logout</button> */}
-        <a className="aws-login-button submit-button" href='https://aws.amazon.com' target="_blank" rel="noopener noreferrer">
->>>>>>> dev
           AWS Log-in Information
         </a>
       </div>
 
-<<<<<<< HEAD
-=======
-      
->>>>>>> dev
       {/*}
       <div className="right-container">
         <div className="settings-section">