diff --git a/Frontend/power-tracker/src/components/manageProcesses.tsx b/Frontend/power-tracker/src/components/manageProcesses.tsx
index 0e2bfa5fa87be6341143ad7c311c84628bfcaa9e..067ba3cc9db0bdf24ecac773d784cc80dbb95733 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 08accc38b5e6d08eff4cf364c5aa6b8dd96f8cd2..d7e99cf754248d825bea3cdf45aa2d7220d6c817 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 31b71298623f4d374149993c2838a47145f0bcc5..2af5cd275bff884b0e5078d643ba4cc2c7cccba1 100644
--- a/Frontend/power-tracker/src/pages/ManageSensors.tsx
+++ b/Frontend/power-tracker/src/pages/ManageSensors.tsx
@@ -425,7 +425,7 @@ function ManageSensors() {
<TopBar></TopBar>
<main>
- {/* Page load error */}3
+ {/* Page load error */}
<AlertDialog open={open}>
<AlertDialogContent>
<AlertDialogHeader>
@@ -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 22679288ef75a4ed696e3fdc41e725acf318b986..9138f3f833a6e76445d50579905f0886adf474bc 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 (
<>