From a66ed38e69242f42980330a66d4f5df75ee0c7ba Mon Sep 17 00:00:00 2001
From: martynmj <martynmj@stud.ntnu.no>
Date: Sun, 12 May 2024 21:51:43 +0200
Subject: [PATCH] fixed some bugs, wrong text,removed unused functions, small
 styling chnage

---
 .../src/components/manageProcesses.tsx        |  2 +-
 Frontend/power-tracker/src/pages/FAQ.tsx      |  6 +-
 .../power-tracker/src/pages/ManageSensors.tsx |  2 +-
 .../src/pages/adminUserConfig.tsx             | 61 +++----------------
 4 files changed, 13 insertions(+), 58 deletions(-)

diff --git a/Frontend/power-tracker/src/components/manageProcesses.tsx b/Frontend/power-tracker/src/components/manageProcesses.tsx
index 0e2bfa5..067ba3c 100644
--- a/Frontend/power-tracker/src/components/manageProcesses.tsx
+++ b/Frontend/power-tracker/src/components/manageProcesses.tsx
@@ -558,7 +558,7 @@ const ManageProcesses = () => {
             </AlertDialogTrigger>
             <AlertDialogContent>
               <AlertDialogHeader>
-                <AlertDialogTitle>Add machine to process</AlertDialogTitle>
+                <AlertDialogTitle>Add/remove machines to process</AlertDialogTitle>
                 <label>Process</label>
                 <select onChange={(e) => { const selectedIndex = e.target.selectedIndex; setProcessDropDown(e.target.value); setProcessDropDownId(processData.process[selectedIndex - 1].id) }} value={processDropDown}>
                   <option value={""}>Select an option</option>
diff --git a/Frontend/power-tracker/src/pages/FAQ.tsx b/Frontend/power-tracker/src/pages/FAQ.tsx
index 08accc3..d7e99cf 100644
--- a/Frontend/power-tracker/src/pages/FAQ.tsx
+++ b/Frontend/power-tracker/src/pages/FAQ.tsx
@@ -3,6 +3,7 @@ import TopBar from '@/components/topbar';
 import { ScrollArea } from '@/components/ui/scroll-area';
 import { Button } from '@/components/ui/button';
 import { Separator } from '@/components/ui/separator';
+import { ChevronsUp } from 'lucide-react';
 
 const MainComponent = () =>{
 
@@ -67,10 +68,11 @@ const MainComponent = () =>{
                     </ScrollArea>
 
                 </div>
+
                 <div className='rightbar'>
-                    <div className="flex justify-between">
+                    <div className="h-[100%] flex">
                         <div className="h-[100%] w-[50px]">
-                            <Button variant="secondary">^</Button>
+                            <Button variant="ghost" size="icon"><ChevronsUp /></Button>
                         </div>
 
                         <Separator orientation="vertical" />
diff --git a/Frontend/power-tracker/src/pages/ManageSensors.tsx b/Frontend/power-tracker/src/pages/ManageSensors.tsx
index 31b7129..a1c42cf 100644
--- a/Frontend/power-tracker/src/pages/ManageSensors.tsx
+++ b/Frontend/power-tracker/src/pages/ManageSensors.tsx
@@ -735,7 +735,7 @@ function ManageSensors() {
                             <TableCell>{machine.voltage}</TableCell>
                             <div className="center">
                                 <AlertDialog>
-                                <AlertDialogTrigger asChild>
+                                <AlertDialogTrigger asChild className="mx-[5px]">
                                     <Button size="sm" variant="outline">Edit</Button>
                                 </AlertDialogTrigger>
                                     <AlertDialogContent>
diff --git a/Frontend/power-tracker/src/pages/adminUserConfig.tsx b/Frontend/power-tracker/src/pages/adminUserConfig.tsx
index 2267928..9138f3f 100644
--- a/Frontend/power-tracker/src/pages/adminUserConfig.tsx
+++ b/Frontend/power-tracker/src/pages/adminUserConfig.tsx
@@ -102,7 +102,7 @@ function UserConfig() {
       setUserData(UserDat)
       setUsersToShow(UserDat)
     })
-  }, []);
+  }, [userData]);
 
   // when search term gets updated, redraw and filter list of users
   useEffect(() => {
@@ -141,7 +141,7 @@ function UserConfig() {
     };
 
   
-//ADD NEW DATA
+// Adding new User
 const addUser = ( firstName: string, lastName: string, email: string, password: string, permission: number) =>  {
 
   var token: string = ""
@@ -189,7 +189,7 @@ const addUser = ( firstName: string, lastName: string, email: string, password:
   })
 }
 
-///EDIT THE DATA
+// Editing User Data
 const editUser = ( id: number, firstName: string, lastName: string, email: string, password: string, permission: number) =>  {
   
   var token: string = ""
@@ -239,6 +239,7 @@ const editUser = ( id: number, firstName: string, lastName: string, email: strin
     setOpen(true)
   })
 }
+// Deleting a User
 const deleteUser = ( id: number) =>  {
 
 
@@ -264,7 +265,7 @@ const deleteUser = ( id: number) =>  {
       Users: prevState.Users.filter(user => user.id !== id)
     }));
 		  toast({
-			title: "Deleted Gateway.",
+			title: "Deleted User.",
 		})
   }).catch((error) => {
     console.log(error)
@@ -272,6 +273,7 @@ const deleteUser = ( id: number) =>  {
   })
 }
 
+// Retrieving data from API, saving fetched data
 async function fetchData(): Promise<UserData>{
   var data: UserData = { Users: [] };
   await axios.post(EgressAPI + '/userData',
@@ -296,20 +298,8 @@ const permissions: Permission[] = [
   { value: 2, label: 'Employee' },
 ];
 
-const translatePermissionValue = (value: number): string => {
-  const matchingPermission = permissions.find(permission => permission.value === value);
+// CLASSES AND INTERFACES
 
-  return matchingPermission ? matchingPermission.label : 'Unknown';
-};
-
-//Classes and interfaces here
-
-//Enum for which operation is used so easy implementation later on
-enum Operation {
-  add = 0,
-  edit = 1,
-  delete = 2,
-}
 // interface for user value from api
 interface User {
   id: number,
@@ -323,12 +313,6 @@ interface UserData {
   Users: User[]
 }
 
-//STUFF FOR SHOWING THE GET DATA AND MORE
-interface PermissionDropDownProps {
-  selectedValue: number;
-  onChange: (value: number) => void;
-}
-
 interface Permission {
   value: number;
   label: string;
@@ -341,38 +325,7 @@ type Users = {
   password: string;
   permission: number;
 }
-interface ManageUsersEdit {
-  isPopoutOpen: boolean;
-  handleClosePopout: () => void;
-  handleOpenPopout: () => void;
-  handleChangeOperation: (op: number) => void;
-  setassignValue: React.Dispatch<React.SetStateAction<number>>;
-  usersData: {
-    users: {
-      id: number;
-      email: string;
-      FirstName: string;
-      LastName: string;
-      permission: number;
-    }[];
-  }
-}
 
-//THE STUFF ON THE POPOUT SCREEN
-interface ManageUsersProps {
-  handleClosePopout: () => void;
-  op: Operation;
-  assignValue: number;
-  usersData: {
-    users: {
-        id: number;
-        email: string;
-        FirstName: string;
-        LastName: string;
-        permission: number;
-    }[];
-  }
-}
   // --------------------
   return (
     <>
-- 
GitLab