Merge branch 'dev' into feature/profilePage

src/frontend/src/components/headerComponent/index.tsx

@@ -149,16 +149,21 @@ export default function Header(): JSX.Element {
                   <DropdownMenuLabel>My Account</DropdownMenuLabel>
                   <DropdownMenuSeparator />
                   {isAdmin && (
-                    <DropdownMenuItem onClick={() => navigate("/admin")}>
+                    <DropdownMenuItem
+                      className="cursor-pointer"
+                      onClick={() => navigate("/admin")}
+                    >
                       Admin Page
                     </DropdownMenuItem>
                   )}
                   <DropdownMenuItem
+                    className="cursor-pointer"
                     onClick={() => navigate("/account/settings")}
                   >
                     Profile Settings
                   </DropdownMenuItem>
                   <DropdownMenuItem
+                    className="cursor-pointer"
                     onClick={() => {
                       logout();
                       navigate("/login");

src/frontend/src/components/inputComponent/index.tsx

@@ -54,7 +54,7 @@ export default function InputComponent({
         </Form.Control>
       ) : (
         <Input
-          type={password && !pwdVisible ? "password" : "text"}
+          type="text"
           value={value}
           disabled={disabled}
           required={required}

src/frontend/src/controllers/API/index.ts

@@ -471,7 +471,7 @@ export async function updateUser(user_id: string, user: Users) {
 
 export async function getApiKey() {
   try {
-    const res = await api.get(`${BASE_URL_API}api_key`);
+    const res = await api.get(`${BASE_URL_API}api_key/`);
     if (res.status === 200) {
       return res.data;
     }
@@ -483,7 +483,7 @@ export async function getApiKey() {
 
 export async function createApiKey(name: string) {
   try {
-    const res = await api.post(`${BASE_URL_API}api_key`, { name });
+    const res = await api.post(`${BASE_URL_API}api_key/`, { name });
     if (res.status === 200) {
       return res.data;
     }

src/frontend/src/pages/loginPage/index.tsx

@@ -32,8 +32,8 @@ export default function LoginPage(): JSX.Element {
 
   function signIn() {
     const user: LoginType = {
-      username: username,
-      password: password,
+      username: username.trim(),
+      password: password.trim(),
     };
     onLogin(user)
       .then((user) => {

src/frontend/src/pages/signUpPage/index.tsx

@@ -33,8 +33,8 @@ export default function SignUp(): JSX.Element {
   function handleSignup(): void {
     const { username, password } = inputState;
     const newUser: UserInputType = {
-      username,
-      password,
+      username: username.trim(),
+      password: password.trim(),
     };
     addUser(newUser)
       .then((user) => {