From d898277c4d1b5d4ea718331ecc79cdd85b98cf4a Mon Sep 17 00:00:00 2001
From: Aditya <as2397@hw.ac.uk>
Date: Sun, 9 Mar 2025 10:41:32 +0400
Subject: [PATCH 01/13] Enhance user selection functionality to include user
 role and update account menu for super user access

---
 backend/users.py                              | 25 +++++++++++++++----
 frontend/src/app/ui/dashboard/accountMenu.jsx | 23 +++++++++++------
 2 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/backend/users.py b/backend/users.py
index 55aa01d..6d4d3d7 100644
--- a/backend/users.py
+++ b/backend/users.py
@@ -100,23 +100,38 @@ def delete_user(user_name: str, user_password: str):
     return {"success": message}
 
 def select_user(user: str):
-    """Set the selected user and persist it."""
+    """Set the selected user and persist it along with their role."""
     global selected_user
     selected_user = user
+
+    users = load_users()
+    selected_user_data = next((u for u in users if u["user_name"] == selected_user), None)
+
+    if selected_user_data:
+        user_role = selected_user_data["user_role"]
+    else:
+        user_role = "unknown"
+
     with open(SELECTED_USER_FILE, "w") as f:
-        json.dump({"selected_user": selected_user}, f)
+        json.dump({"selected_user": selected_user, "user_role": user_role}, f)
+
     message = f"Logged in as {selected_user}"
     updates.append(message)
-    return {"success": message}
+    
+    return {"success": message, "selected_user": selected_user, "user_role": user_role}
 
 def get_selected_user():
-    """Retrieve the currently selected user."""
+    """Retrieve the currently selected user and their role."""
     global selected_user
+    user_role = ""
+
     if os.path.exists(SELECTED_USER_FILE):
         with open(SELECTED_USER_FILE, "r") as f:
             data = json.load(f)
             selected_user = data.get("selected_user", "")
-    return {"selected_user": selected_user}
+            user_role = data.get("user_role", "")
+
+    return {"selected_user": selected_user, "user_role": user_role}
 
 ## USERS DEVICE MANAGEMENT ##
 def create_selected_user_devices_json():
diff --git a/frontend/src/app/ui/dashboard/accountMenu.jsx b/frontend/src/app/ui/dashboard/accountMenu.jsx
index c1c27f1..bbc3505 100644
--- a/frontend/src/app/ui/dashboard/accountMenu.jsx
+++ b/frontend/src/app/ui/dashboard/accountMenu.jsx
@@ -21,6 +21,7 @@ export default function AccountMenu() {
   const router = useRouter();
   const [anchorEl, setAnchorEl] = React.useState(null);
   const [selectedUser, setSelectedUser] = React.useState("Loading...");
+  const [isSuperUser, setIsSuperUser] = React.useState(false);
 
   const open = Boolean(anchorEl);
   
@@ -42,7 +43,6 @@ export default function AccountMenu() {
     }
   };
 
-  // Fetch selected user from the backend
   React.useEffect(() => {
     const fetchSelectedUser = async () => {
       try {
@@ -52,6 +52,8 @@ export default function AccountMenu() {
         }
         const data = await response.json();
         setSelectedUser(data.selected_user || "Unknown User");
+        setIsSuperUser(data.user_role === "super_user");
+        console.log("Fetched user role:", data.user_role);
       } catch (error) {
         console.error("Error fetching user:", error);
         setSelectedUser("Error fetching user");
@@ -61,6 +63,9 @@ export default function AccountMenu() {
     fetchSelectedUser();
   }, []);
 
+  // Log just before rendering
+  // console.log("isSuperUser:", isSuperUser);
+
   return (
     <React.Fragment>
       <Box sx={{ display: "flex", alignItems: "center", textAlign: "center" }}>
@@ -122,15 +127,17 @@ export default function AccountMenu() {
             color: "primary.main",
           }}
         >
-          <Avatar /> {selectedUser}
+          <Avatar sx={{pt: 0.5}}>{selectedUser.charAt(0)}</Avatar> {selectedUser}
         </MenuItem>
         <Divider />
-        <MenuItem onClick={handleClose} sx={{ fontFamily: "JetBrains Mono" }}>
-          <ListItemIcon>
-            <PersonAdd fontSize="small" sx={{ color: "primary.main" }} />
-          </ListItemIcon>
-          Add another account
-        </MenuItem>
+        {isSuperUser && (
+          <MenuItem onClick={handleClose} sx={{ fontFamily: "JetBrains Mono" }}>
+            <ListItemIcon>
+              <PersonAdd fontSize="small" sx={{ color: "primary.main" }} />
+            </ListItemIcon>
+            Add another account
+          </MenuItem>
+        )}
         <MenuItem onClick={handleClose} sx={{ fontFamily: "JetBrains Mono" }}>
           <ListItemIcon>
             <Settings fontSize="small" sx={{ color: "primary.main" }} />

From e4556f7d42bef341cd45ab3be0b4bf827165274a Mon Sep 17 00:00:00 2001
From: Aditya <as2397@hw.ac.uk>
Date: Sun, 9 Mar 2025 11:08:31 +0400
Subject: [PATCH 02/13] Add super user role check to conditionally render Add
 Device button

---
 frontend/src/app/devices/page.jsx             | 40 +++++++++++++------
 frontend/src/app/ui/dashboard/accountMenu.jsx |  2 +-
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/frontend/src/app/devices/page.jsx b/frontend/src/app/devices/page.jsx
index 00b7323..6931f41 100644
--- a/frontend/src/app/devices/page.jsx
+++ b/frontend/src/app/devices/page.jsx
@@ -38,6 +38,7 @@ const Devices = () => {
   const [openAddDialog, setOpenAddDialog] = useState(false);
   const [notConnectedDevices, setNotConnectedDevices] = useState([]);
   const [selectedDeviceId, setSelectedDeviceId] = useState(null);
+  const [isSuperUser, setIsSuperUser] = useState(false);
   // const [selectedDeviceName, setSelectedDeviceName] = useState("");
 
   const disappearingStyle = {
@@ -46,6 +47,17 @@ const Devices = () => {
   };
 
   useEffect(() => {
+    fetch("http://localhost:8000/selected_user")
+      .then((res) => res.json())
+      .then((data) => {
+        setIsSuperUser(data.user_role === "super_user");
+      })
+      .catch((err) => {
+        console.error("Error fetching user role:", err);
+        setIsSuperUser(false);
+      });
+
+    // Fetch devices information
     fetch("http://localhost:8000/device_info")
       .then((res) => res.json())
       .then((data) => {
@@ -259,19 +271,21 @@ const Devices = () => {
             marginBottom: 3,
           }}
         >
-          <Button
-            variant="contained"
-            startIcon={<AddIcon />}
-            onClick={handleAddDeviceClick}
-            sx={{
-              fontFamily: "JetBrains Mono",
-              fontWeight: 600,
-              textTransform: "none",
-              color: "white",
-            }}
-          >
-            Add Device
-          </Button>
+          {isSuperUser && (
+            <Button
+              variant="contained"
+              startIcon={<AddIcon />}
+              onClick={handleAddDeviceClick}
+              sx={{
+                fontFamily: "JetBrains Mono",
+                fontWeight: 600,
+                textTransform: "none",
+                color: "white",
+              }}
+            >
+              Add Device
+            </Button>
+          )}
         </Box>
 
         <Grid container spacing={3}>
diff --git a/frontend/src/app/ui/dashboard/accountMenu.jsx b/frontend/src/app/ui/dashboard/accountMenu.jsx
index bbc3505..a3f2a48 100644
--- a/frontend/src/app/ui/dashboard/accountMenu.jsx
+++ b/frontend/src/app/ui/dashboard/accountMenu.jsx
@@ -78,7 +78,7 @@ export default function AccountMenu() {
             aria-haspopup="true"
             aria-expanded={open ? "true" : undefined}
           >
-            <Avatar sx={{ width: 32, height: 32 }}>{selectedUser.charAt(0)}</Avatar>
+            <Avatar sx={{ width: 32, height: 32, pt:0.5 }}>{selectedUser.charAt(0)}</Avatar>
           </IconButton>
         </Tooltip>
       </Box>

From a5745b65d9269e652b33eb9352ac898f508b911e Mon Sep 17 00:00:00 2001
From: Aditya <as2397@hw.ac.uk>
Date: Sun, 9 Mar 2025 11:31:22 +0400
Subject: [PATCH 03/13] Add user dialog component and integrate with account
 menu for super user

---
 frontend/src/app/ui/dashboard/accountMenu.jsx |  11 +-
 frontend/src/app/ui/newUserDialogue.jsx       | 136 ++++++++++++++++++
 2 files changed, 146 insertions(+), 1 deletion(-)
 create mode 100644 frontend/src/app/ui/newUserDialogue.jsx

diff --git a/frontend/src/app/ui/dashboard/accountMenu.jsx b/frontend/src/app/ui/dashboard/accountMenu.jsx
index a3f2a48..16ec365 100644
--- a/frontend/src/app/ui/dashboard/accountMenu.jsx
+++ b/frontend/src/app/ui/dashboard/accountMenu.jsx
@@ -12,6 +12,8 @@ import PersonAdd from "@mui/icons-material/PersonAdd";
 import Settings from "@mui/icons-material/Settings";
 import Logout from "@mui/icons-material/Logout";
 
+import AddUserDialog from "../newUserDialogue";
+
 import { signOut } from "firebase/auth";
 import { auth } from "@/app/firebase/config";
 
@@ -22,6 +24,7 @@ export default function AccountMenu() {
   const [anchorEl, setAnchorEl] = React.useState(null);
   const [selectedUser, setSelectedUser] = React.useState("Loading...");
   const [isSuperUser, setIsSuperUser] = React.useState(false);
+  const [openUserDialog, setOpenUserDialog] = React.useState(false);
 
   const open = Boolean(anchorEl);
   
@@ -131,7 +134,7 @@ export default function AccountMenu() {
         </MenuItem>
         <Divider />
         {isSuperUser && (
-          <MenuItem onClick={handleClose} sx={{ fontFamily: "JetBrains Mono" }}>
+          <MenuItem onClick={() => setOpenUserDialog(true)} sx={{ fontFamily: "JetBrains Mono" }}>
             <ListItemIcon>
               <PersonAdd fontSize="small" sx={{ color: "primary.main" }} />
             </ListItemIcon>
@@ -151,6 +154,12 @@ export default function AccountMenu() {
           Logout
         </MenuItem>
       </Menu>
+
+      <AddUserDialog
+        open={openUserDialog}
+        onClose={() => setOpenUserDialog(false)}
+        // onSave={handleSaveUser}
+      />
     </React.Fragment>
   );
 }
diff --git a/frontend/src/app/ui/newUserDialogue.jsx b/frontend/src/app/ui/newUserDialogue.jsx
new file mode 100644
index 0000000..5fd0f69
--- /dev/null
+++ b/frontend/src/app/ui/newUserDialogue.jsx
@@ -0,0 +1,136 @@
+import { useState, useEffect } from "react";
+import {
+  Dialog,
+  DialogTitle,
+  DialogContent,
+  DialogActions,
+  TextField,
+  Button,
+  FormControl,
+  InputLabel,
+  Select,
+  MenuItem,
+  Checkbox,
+  ListItemText,
+  Chip,
+  Box,
+} from "@mui/material";
+
+const AddUserDialog = ({ open, onClose, onSave }) => {
+  const [username, setUsername] = useState("");
+  const [password, setPassword] = useState("");
+  const [devices, setDevices] = useState([]);
+  const [selectedDevices, setSelectedDevices] = useState([]);
+
+  useEffect(() => {
+    // Fetch available devices from the API
+    fetch("http://localhost:8000/device_info")
+      .then((res) => res.json())
+      .then((data) => {
+        const allDevices = data.smart_home_devices || [];
+        setDevices(allDevices);
+      })
+      .catch((err) => console.error("Error fetching devices:", err));
+  }, []);
+
+  const handleDeviceChange = (event) => {
+    const { value } = event.target;
+    setSelectedDevices(value);
+  };
+
+  const handleSubmit = () => {
+    const newUser = {
+      username,
+      password,
+      devices: selectedDevices,
+    };
+
+    onSave(newUser);
+    onClose();
+  };
+
+  const handleClose = () => {
+    setUsername("");
+    setPassword("");
+    setSelectedDevices([]);
+    onClose();
+  };
+
+  return (
+    <Dialog open={open} onClose={handleClose} fullWidth maxWidth="sm">
+      <DialogTitle sx={{ fontFamily: "Jetbrains Mono", color: "primary.main" }}>
+        Add New User
+      </DialogTitle>
+      <DialogContent>
+        <TextField
+          autoFocus
+          margin="dense"
+          label="Username"
+          fullWidth
+          value={username}
+          onChange={(e) => setUsername(e.target.value)}
+          sx={{ fontFamily: "Jetbrains Mono" }}
+        />
+        <TextField
+          margin="dense"
+          label="Password"
+          type="password"
+          fullWidth
+          value={password}
+          onChange={(e) => setPassword(e.target.value)}
+          sx={{ fontFamily: "Jetbrains Mono" }}
+        />
+
+        {/* Device Selection */}
+        <FormControl fullWidth sx={{ marginTop: 2 }}>
+          <InputLabel id="device-select-label">Select Devices</InputLabel>
+          <Select
+            labelId="device-select-label"
+            multiple
+            value={selectedDevices}
+            onChange={handleDeviceChange}
+            renderValue={(selected) =>
+              selected
+                .map((id) => devices.find((device) => device.id === id)?.name)
+                .join(", ")
+            }
+          >
+            {devices.map((device) => (
+              <MenuItem key={device.id} value={device.id}>
+                <Checkbox checked={selectedDevices.includes(device.id)} />
+                <ListItemText primary={device.name} />
+              </MenuItem>
+            ))}
+          </Select>
+        </FormControl>
+
+        {/* Selected Devices as Chips */}
+        <Box sx={{ marginTop: 2, display: "flex", flexWrap: "wrap", gap: 1 }}>
+          {selectedDevices.map((deviceId) => {
+            const device = devices.find((d) => d.id === deviceId);
+            return (
+              <Chip
+                key={deviceId}
+                label={device?.name || "Unknown"}
+                onDelete={() =>
+                  setSelectedDevices((prev) =>
+                    prev.filter((id) => id !== deviceId)
+                  )
+                }
+                sx={{ fontFamily: "Jetbrains Mono" }}
+              />
+            );
+          })}
+        </Box>
+      </DialogContent>
+      <DialogActions>
+        <Button onClick={handleClose}>Cancel</Button>
+        <Button onClick={handleSubmit} variant="contained" color="primary">
+          Save
+        </Button>
+      </DialogActions>
+    </Dialog>
+  );
+};
+
+export default AddUserDialog;

From f16a69857fc2d17e03e2f38bfae4716e2621fe4f Mon Sep 17 00:00:00 2001
From: Aditya <as2397@hw.ac.uk>
Date: Sun, 9 Mar 2025 11:33:16 +0400
Subject: [PATCH 04/13] Adjust margin top for device selection in Add User
 dialog

---
 frontend/src/app/ui/newUserDialogue.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/app/ui/newUserDialogue.jsx b/frontend/src/app/ui/newUserDialogue.jsx
index 5fd0f69..3042048 100644
--- a/frontend/src/app/ui/newUserDialogue.jsx
+++ b/frontend/src/app/ui/newUserDialogue.jsx
@@ -82,7 +82,7 @@ const AddUserDialog = ({ open, onClose, onSave }) => {
         />
 
         {/* Device Selection */}
-        <FormControl fullWidth sx={{ marginTop: 2 }}>
+        <FormControl fullWidth sx={{ marginTop: 1 }}>
           <InputLabel id="device-select-label">Select Devices</InputLabel>
           <Select
             labelId="device-select-label"

From 8dd4ac01df7e72aead3a2a65c0de9d79310a75bb Mon Sep 17 00:00:00 2001
From: Aditya <as2397@hw.ac.uk>
Date: Sun, 9 Mar 2025 12:21:19 +0400
Subject: [PATCH 05/13] Add device allocation support to add_user function

---
 backend/users.py       | 19 ++++++++++++++-----
 database/users_db.json | 12 ++++++++++++
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/backend/users.py b/backend/users.py
index 6d4d3d7..cfc6805 100644
--- a/backend/users.py
+++ b/backend/users.py
@@ -18,6 +18,7 @@ def load_devices():
             except json.JSONDecodeError:
                 return []
 
+
 def load_users():
     """Load user data from users_db.json."""
     if os.path.exists(USER_DB_FILE):
@@ -30,12 +31,14 @@ def load_users():
                 return []
     return []
 
+
 def save_users(users):
     """Save updated user data back to users_db.json."""
     with open(USER_DB_FILE, "w") as f:
         json.dump({"users": users}, f, indent=4)
 
-def add_user(user_name: str, user_password: str):
+
+def add_user(user_name: str, user_password: str, allocated_device_ids: list = None):
     """Adds a new user with correct role and allocated devices."""
     users = load_users()
     available_devices = load_devices()
@@ -45,7 +48,10 @@ def add_user(user_name: str, user_password: str):
         allocated_devices = available_devices
     else:
         user_role = "sub_user"
-        allocated_devices = []
+        if allocated_device_ids:
+            allocated_devices = [str(device_id) for device_id in allocated_device_ids]
+        else:
+            allocated_devices = []
 
     new_user_id = (max(user["user_id"] for user in users) + 1) if users else 1
 
@@ -57,8 +63,6 @@ def add_user(user_name: str, user_password: str):
         "user_role": user_role
     }
 
-    # print(new_user)
-
     users.append(new_user)
     save_users(users)
 
@@ -67,6 +71,7 @@ def add_user(user_name: str, user_password: str):
 
     return {"success": message, "user": new_user}
 
+
 def delete_user(user_name: str, user_password: str):
     """Deletes a user from the system if the given password matches. If deleting the super user, assign the position to the next user.
        Re-indexes user IDs to maintain sequential order.
@@ -99,6 +104,7 @@ def delete_user(user_name: str, user_password: str):
     updates.append(message)
     return {"success": message}
 
+
 def select_user(user: str):
     """Set the selected user and persist it along with their role."""
     global selected_user
@@ -120,6 +126,7 @@ def select_user(user: str):
     
     return {"success": message, "selected_user": selected_user, "user_role": user_role}
 
+
 def get_selected_user():
     """Retrieve the currently selected user and their role."""
     global selected_user
@@ -133,6 +140,7 @@ def get_selected_user():
 
     return {"selected_user": selected_user, "user_role": user_role}
 
+
 ## USERS DEVICE MANAGEMENT ##
 def create_selected_user_devices_json():
     """Create a JSON file with the selected users allocated devices"""
@@ -162,6 +170,7 @@ def create_selected_user_devices_json():
     with open(SELECTED_USER_FILE, "w") as f:
         json.dump({"user"})
 
+
 def getUpdates():
     global updates
     messages = updates[:]
@@ -170,4 +179,4 @@ def getUpdates():
 
 # DEBUGGING SHIT DONT MIND
 # load_users()
-# add_user("Aditya S", "0000")
\ No newline at end of file
+# add_user("Aditya S", "0000", [1, 2, 3, 4])
\ No newline at end of file
diff --git a/database/users_db.json b/database/users_db.json
index 55e0cbd..9888689 100644
--- a/database/users_db.json
+++ b/database/users_db.json
@@ -29,6 +29,18 @@
             "user_password": "9999",
             "allocated_devices": [],
             "user_role": "sub_user"
+        },
+        {
+            "user_id": 4,
+            "user_name": "Aditya S",
+            "user_password": "0000",
+            "allocated_devices": [
+                "1",
+                "2",
+                "3",
+                "4"
+            ],
+            "user_role": "sub_user"
         }
     ]
 }
\ No newline at end of file

From 42f2763f4c3599e4a7c06bab168624de500185f5 Mon Sep 17 00:00:00 2001
From: Aditya <as2397@hw.ac.uk>
Date: Sun, 9 Mar 2025 12:31:11 +0400
Subject: [PATCH 06/13] Remove unused user entry from users database

---
 database/users_db.json | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/database/users_db.json b/database/users_db.json
index 9888689..55e0cbd 100644
--- a/database/users_db.json
+++ b/database/users_db.json
@@ -29,18 +29,6 @@
             "user_password": "9999",
             "allocated_devices": [],
             "user_role": "sub_user"
-        },
-        {
-            "user_id": 4,
-            "user_name": "Aditya S",
-            "user_password": "0000",
-            "allocated_devices": [
-                "1",
-                "2",
-                "3",
-                "4"
-            ],
-            "user_role": "sub_user"
         }
     ]
 }
\ No newline at end of file

From 50081222a9ce86a838821fd1d5365230bfe97276 Mon Sep 17 00:00:00 2001
From: Aditya <as2397@hw.ac.uk>
Date: Sun, 9 Mar 2025 13:41:05 +0400
Subject: [PATCH 07/13] Update font family for device names in Add User dialog

---
 frontend/src/app/ui/newUserDialogue.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/app/ui/newUserDialogue.jsx b/frontend/src/app/ui/newUserDialogue.jsx
index 3042048..b440f1b 100644
--- a/frontend/src/app/ui/newUserDialogue.jsx
+++ b/frontend/src/app/ui/newUserDialogue.jsx
@@ -98,7 +98,7 @@ const AddUserDialog = ({ open, onClose, onSave }) => {
             {devices.map((device) => (
               <MenuItem key={device.id} value={device.id}>
                 <Checkbox checked={selectedDevices.includes(device.id)} />
-                <ListItemText primary={device.name} />
+                <ListItemText sx={{fontFamily: "Jetbrains Mono"}} primary={device.name} />
               </MenuItem>
             ))}
           </Select>

From 8cab8e55108680d89455e1c682b21f07bed501b1 Mon Sep 17 00:00:00 2001
From: Aditya <as2397@hw.ac.uk>
Date: Sun, 9 Mar 2025 14:21:53 +0400
Subject: [PATCH 08/13] Apply Jetbrains Mono font to input fields and device
 selection in Add User dialog

---
 frontend/src/app/ui/newUserDialogue.jsx | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/frontend/src/app/ui/newUserDialogue.jsx b/frontend/src/app/ui/newUserDialogue.jsx
index b440f1b..9d38d91 100644
--- a/frontend/src/app/ui/newUserDialogue.jsx
+++ b/frontend/src/app/ui/newUserDialogue.jsx
@@ -66,6 +66,9 @@ const AddUserDialog = ({ open, onClose, onSave }) => {
           autoFocus
           margin="dense"
           label="Username"
+          InputLabelProps={{
+            sx: { fontFamily: "Jetbrains Mono" }
+          }}
           fullWidth
           value={username}
           onChange={(e) => setUsername(e.target.value)}
@@ -74,6 +77,9 @@ const AddUserDialog = ({ open, onClose, onSave }) => {
         <TextField
           margin="dense"
           label="Password"
+          InputLabelProps={{
+            sx: { fontFamily: "Jetbrains Mono" }
+          }}
           type="password"
           fullWidth
           value={password}
@@ -83,7 +89,7 @@ const AddUserDialog = ({ open, onClose, onSave }) => {
 
         {/* Device Selection */}
         <FormControl fullWidth sx={{ marginTop: 1 }}>
-          <InputLabel id="device-select-label">Select Devices</InputLabel>
+          <InputLabel id="device-select-label" sx={{fontFamily: "Jetbrains Mono"}}>Select Devices</InputLabel>
           <Select
             labelId="device-select-label"
             multiple
@@ -94,10 +100,11 @@ const AddUserDialog = ({ open, onClose, onSave }) => {
                 .map((id) => devices.find((device) => device.id === id)?.name)
                 .join(", ")
             }
+            sx={{ fontFamily: "Jetbrains Mono" }}
           >
             {devices.map((device) => (
-              <MenuItem key={device.id} value={device.id}>
-                <Checkbox checked={selectedDevices.includes(device.id)} />
+              <MenuItem key={device.id} value={device.id} sx={{fontFamily: "Jetbrains Mono"}}> {/* Ensure font applied here too */}
+                <Checkbox sx={{fontFamily: "Jetbrains Mono"}} checked={selectedDevices.includes(device.id)} />
                 <ListItemText sx={{fontFamily: "Jetbrains Mono"}} primary={device.name} />
               </MenuItem>
             ))}

From acf4cf073855a37044622b1bb776bd5f38df1197 Mon Sep 17 00:00:00 2001
From: Diing Juach <Djd2000@hw.ac.uk>
Date: Sun, 9 Mar 2025 17:27:11 +0400
Subject: [PATCH 09/13] commit

---
 backend/fastAPI.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/backend/fastAPI.py b/backend/fastAPI.py
index 849fe1a..3b42896 100644
--- a/backend/fastAPI.py
+++ b/backend/fastAPI.py
@@ -1,3 +1,4 @@
+from typing import List
 import devices_json as dj
 import users
 
@@ -95,9 +96,9 @@ def get_selected_user():
     return users.get_selected_user()
 
 @app.post("/add_user/{user_name}/{user_password}")
-def add_new_user(user_name: str, user_password: str):
+def add_new_user(user_name: str, user_password: str, user_info: List[str]):
     """Adds a new user with the given name and password."""
-    return users.add_user(user_name, user_password)
+    return users.add_user(user_name, user_password, user_info)
 
 @app.delete("/delete_user/{user_name}/{user_password}")
 def delete_user(user_name: str, user_password: str):

From 60f8ed50a8ed5754f13c1e254ce5e20c09d74bbd Mon Sep 17 00:00:00 2001
From: Aditya <as2397@hw.ac.uk>
Date: Sun, 9 Mar 2025 17:38:58 +0400
Subject: [PATCH 10/13] Apply Jetbrains Mono font to avatars in Account Menu

---
 frontend/src/app/ui/dashboard/accountMenu.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/ui/dashboard/accountMenu.jsx b/frontend/src/app/ui/dashboard/accountMenu.jsx
index 16ec365..6794e81 100644
--- a/frontend/src/app/ui/dashboard/accountMenu.jsx
+++ b/frontend/src/app/ui/dashboard/accountMenu.jsx
@@ -81,7 +81,7 @@ export default function AccountMenu() {
             aria-haspopup="true"
             aria-expanded={open ? "true" : undefined}
           >
-            <Avatar sx={{ width: 32, height: 32, pt:0.5 }}>{selectedUser.charAt(0)}</Avatar>
+            <Avatar sx={{ width: 32, height: 32, fontFamily: "Jetbrains Mono" }}>{selectedUser.charAt(0)}</Avatar>
           </IconButton>
         </Tooltip>
       </Box>
@@ -130,7 +130,7 @@ export default function AccountMenu() {
             color: "primary.main",
           }}
         >
-          <Avatar sx={{pt: 0.5}}>{selectedUser.charAt(0)}</Avatar> {selectedUser}
+          <Avatar sx={{ fontFamily: "Jetbrains Mono" }}>{selectedUser.charAt(0)}</Avatar> {selectedUser}
         </MenuItem>
         <Divider />
         {isSuperUser && (

From 2cdd5e33b57b28735f301f73baae5c41d0c63e1e Mon Sep 17 00:00:00 2001
From: Aditya <as2397@hw.ac.uk>
Date: Sun, 9 Mar 2025 18:13:25 +0400
Subject: [PATCH 11/13] Refactor add user functionality to use Pydantic model
 and update API endpoint

---
 backend/fastAPI.py                      | 16 +++++++++++-----
 frontend/src/app/ui/newUserDialogue.jsx | 20 +++++++++++++++-----
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/backend/fastAPI.py b/backend/fastAPI.py
index 3b42896..70353cf 100644
--- a/backend/fastAPI.py
+++ b/backend/fastAPI.py
@@ -1,4 +1,5 @@
-from typing import List
+from typing import List, Optional
+from pydantic import BaseModel
 import devices_json as dj
 import users
 
@@ -25,6 +26,11 @@
     allow_headers=["*"],
 )
 
+class UserRequest(BaseModel):
+    user_name: str
+    user_password: str
+    allocated_devices: Optional[List[str]] = None
+
 @app.on_event("startup")
 async def startup_event():
     """Starts device updates when the FastAPI server starts."""
@@ -95,10 +101,10 @@ def get_selected_user():
     """Returns the selected user"""
     return users.get_selected_user()
 
-@app.post("/add_user/{user_name}/{user_password}")
-def add_new_user(user_name: str, user_password: str, user_info: List[str]):
-    """Adds a new user with the given name and password."""
-    return users.add_user(user_name, user_password, user_info)
+@app.post("/add_user/")
+def add_new_user(user: UserRequest):
+    """Adds a new user with the given name, password, and optional allocated devices."""
+    return users.add_user(user.user_name, user.user_password, user.allocated_devices or [])
 
 @app.delete("/delete_user/{user_name}/{user_password}")
 def delete_user(user_name: str, user_password: str):
diff --git a/frontend/src/app/ui/newUserDialogue.jsx b/frontend/src/app/ui/newUserDialogue.jsx
index 9d38d91..7b41dcc 100644
--- a/frontend/src/app/ui/newUserDialogue.jsx
+++ b/frontend/src/app/ui/newUserDialogue.jsx
@@ -40,13 +40,23 @@ const AddUserDialog = ({ open, onClose, onSave }) => {
 
   const handleSubmit = () => {
     const newUser = {
-      username,
-      password,
-      devices: selectedDevices,
+      user_name: username,
+      user_password: password,
+      allocated_devices: selectedDevices.map(String), // Ensure they are strings
     };
 
-    onSave(newUser);
-    onClose();
+    fetch("http://localhost:8000/add_user/", {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify(newUser),
+    })
+      .then((res) => res.json())
+      .then((data) => {
+        handleClose();
+      })
+      .catch((err) => console.error("Error adding user:", err));
   };
 
   const handleClose = () => {

From 37d026b3ed9333b1e37d6d9996abb8acd63ae4d8 Mon Sep 17 00:00:00 2001
From: Aditya <as2397@hw.ac.uk>
Date: Sun, 9 Mar 2025 18:15:22 +0400
Subject: [PATCH 12/13] Remove commented-out code for FastAPI initialization in
 backend/fastAPI.py

---
 backend/fastAPI.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/backend/fastAPI.py b/backend/fastAPI.py
index 70353cf..17b25ff 100644
--- a/backend/fastAPI.py
+++ b/backend/fastAPI.py
@@ -14,7 +14,6 @@
 USER_DB_PATH = os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", "database", "users_db.json")
 # print(USER_DB_PATH) # For testing purposes
 
-# FastAPI initialization and routes
 app = FastAPI()
 
 # Add CORS Middleware

From 8bd9440ca472ac9f57ac3d2f1c3d5899e94e402c Mon Sep 17 00:00:00 2001
From: Aditya <as2397@hw.ac.uk>
Date: Sun, 9 Mar 2025 18:21:14 +0400
Subject: [PATCH 13/13] Show edit and delete icons only for super users in
 devices page

---
 frontend/src/app/devices/page.jsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/frontend/src/app/devices/page.jsx b/frontend/src/app/devices/page.jsx
index 6931f41..e786385 100644
--- a/frontend/src/app/devices/page.jsx
+++ b/frontend/src/app/devices/page.jsx
@@ -350,13 +350,14 @@ const Devices = () => {
                     }}
                     onClick={() => handleEdit(device.id, device.name)}
                   >
-                    <EditIcon sx={{ fontSize: 20 }} />
+                    {isSuperUser && <EditIcon sx={{ fontSize: 20 }} />}
                   </IconButton>
+
                   <IconButton
                     sx={{ position: "absolute", bottom: 8, right: 8 }}
                     onClick={() => handleDeleteClick(device.id)}
                   >
-                    <DeleteIcon sx={{ fontSize: 20 }} />
+                    {isSuperUser && <DeleteIcon sx={{ fontSize: 20 }} />}
                   </IconButton>
                 </CardContent>
               </Card>