Skip to content

Ts app lookin abs banger icl ts so beauti ❤️🌹 #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adityashibu merged 2 commits into from
Mar 19, 2025
Merged

Ts app lookin abs banger icl ts so beauti ❤️🌹 #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
acb6c6e
Idk what changed here
adityashibu Mar 19, 2025
680df23
Merge branch 'PowerHouse-Project:main' into main
adityashibu Mar 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions frontend/src/app/ui/energyChart.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,9 @@ const EnergyUsageChart = ({ data, timeRange }) => {
: dayjs(time).format("HH:mm")
}
/>
<YAxis label={{ value: "Power (W)", angle: -90, position: "insideLeft" }} />
<YAxis
label={{ value: "Power (W)", angle: -90, position: "insideLeft" }}
/>
<Tooltip
labelFormatter={(label) =>
`Time: ${
Expand All @@ -119,7 +121,9 @@ const EnergyUsageChart = ({ data, timeRange }) => {
</LineChart>
</ResponsiveContainer>
) : (
<Typography sx={{ fontSize: 16, fontStyle: "italic", textAlign: "center" }}>
<Typography
sx={{ fontSize: 16, fontStyle: "italic", textAlign: "center" }}
>
No data available yet...
</Typography>
)}
Expand Down
29 changes: 23 additions & 6 deletions frontend/src/app/ui/newUserDialogue.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ const AddUserDialog = ({ open, onClose, onSave }) => {
margin="dense"
label="Username"
InputLabelProps={{
sx: { fontFamily: "Jetbrains Mono" }
sx: { fontFamily: "Jetbrains Mono" },
}}
fullWidth
value={username}
Expand All @@ -88,7 +88,7 @@ const AddUserDialog = ({ open, onClose, onSave }) => {
margin="dense"
label="Password"
InputLabelProps={{
sx: { fontFamily: "Jetbrains Mono" }
sx: { fontFamily: "Jetbrains Mono" },
}}
type="password"
fullWidth
Expand All @@ -99,7 +99,12 @@ const AddUserDialog = ({ open, onClose, onSave }) => {

{/* Device Selection */}
<FormControl fullWidth sx={{ marginTop: 1 }}>
<InputLabel id="device-select-label" sx={{fontFamily: "Jetbrains Mono"}}>Select Devices</InputLabel>
<InputLabel
id="device-select-label"
sx={{ fontFamily: "Jetbrains Mono" }}
>
Select Devices
</InputLabel>
<Select
labelId="device-select-label"
multiple
Expand All @@ -113,9 +118,21 @@ const AddUserDialog = ({ open, onClose, onSave }) => {
sx={{ fontFamily: "Jetbrains Mono" }}
>
{devices.map((device) => (
<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
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>
))}
</Select>
Expand Down
131 changes: 99 additions & 32 deletions frontend/src/app/users/page.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@ const Keypad = ({ onKeyPress, onClear }) => {
};

return (
<Box sx={{ display: "grid", gridTemplateColumns: "repeat(3, 1fr)", gap: 1 }}>
<Box
sx={{ display: "grid", gridTemplateColumns: "repeat(3, 1fr)", gap: 1 }}
>
{[1, 2, 3, 4, 5, 6, 7].map((num) => (
<Button
key={num}
Expand Down Expand Up @@ -98,8 +100,6 @@ const Keypad = ({ onKeyPress, onClear }) => {
);
};



const Users = () => {
const [darkMode, setDarkMode] = useState(true);
const [users, setUsers] = useState([]);
Expand Down Expand Up @@ -141,8 +141,14 @@ const Users = () => {
}, []);

const handleNewUserSubmit = async () => {
if (newUsername.trim() === "" || newPassword.length !== 4 || isNaN(newPassword)) {
setError("Username must not be empty and password must be a 4-digit number.");
if (
newUsername.trim() === "" ||
newPassword.length !== 4 ||
isNaN(newPassword)
) {
setError(
"Username must not be empty and password must be a 4-digit number."
);
return;
}

Expand Down Expand Up @@ -185,7 +191,9 @@ const Users = () => {

try {
const response = await fetch(
`http://localhost:8000/delete_user/${encodeURIComponent(userToDelete.user_name)}/${encodeURIComponent(deletePassword)}`,
`http://localhost:8000/delete_user/${encodeURIComponent(
userToDelete.user_name
)}/${encodeURIComponent(deletePassword)}`,
{
method: "DELETE",
}
Expand Down Expand Up @@ -218,25 +226,30 @@ const Users = () => {
setPasswordInput("");
setPasswordValid(null);
};

const handlePasswordSubmit = async () => {
if (selectedUser && passwordInput === selectedUser.user_password) {
setPasswordValid(true);

try {
const response = await fetch(`http://localhost:8000/select_user/${selectedUser.user_name}`, {
method: "POST",
});

const response = await fetch(
`http://localhost:8000/select_user/${selectedUser.user_name}`,
{
method: "POST",
}
);

if (!response.ok) {
console.error("Failed to set selected user");
return;
}

const selectedResponse = await fetch("http://localhost:8000/selected_user");

const selectedResponse = await fetch(
"http://localhost:8000/selected_user"
);
const selectedData = await selectedResponse.json();
console.log("Selected user from API:", selectedData);

router.push("/dashboard");
} catch (error) {
console.error("Error setting selected user:", error);
Expand Down Expand Up @@ -355,12 +368,21 @@ const Users = () => {
)}

<Dialog open={openDialog} onClose={() => setOpenDialog(false)}>
<DialogTitle>
<DialogTitle>
Enter Password for {selectedUser ? selectedUser.user_name : "User"}
</DialogTitle>
</DialogTitle>
<DialogContent>
<DotInput value={passwordInput} maxLength={4} />
<Typography variant="h6" sx={{ textAlign: "center", mt: 2, mb:2, fontFamily: "JetBrains Mono", fontSize: {xs: "15px", md:"24px"} }}>
<Typography
variant="h6"
sx={{
textAlign: "center",
mt: 2,
mb: 2,
fontFamily: "JetBrains Mono",
fontSize: { xs: "15px", md: "24px" },
}}
>
Please enter your 4-digit password:
</Typography>

Expand Down Expand Up @@ -397,10 +419,20 @@ const Users = () => {
</DialogActions>
</Dialog>

<Dialog open={openNewUserDialog} onClose={() => setOpenNewUserDialog(false)}>
<DialogTitle sx={{fontFamily: "Jetbrains Mono", color: "primary.main"}}>Add New User</DialogTitle>
<Dialog
open={openNewUserDialog}
onClose={() => setOpenNewUserDialog(false)}
>
<DialogTitle
sx={{ fontFamily: "Jetbrains Mono", color: "primary.main" }}
>
Add New User
</DialogTitle>
<DialogContent>
<Typography variant="body1" sx={{ mb: 2, fontFamily: "JetBrains Mono" }}>
<Typography
variant="body1"
sx={{ mb: 2, fontFamily: "JetBrains Mono" }}
>
Enter a username and a 4-digit password.
</Typography>
<TextField
Expand All @@ -420,28 +452,49 @@ const Users = () => {
type="password"
value={newPassword}
onChange={(e) => setNewPassword(e.target.value)}
inputProps={{ maxLength: 4, pattern: "[0-9]*", inputMode: "numeric" }}
inputProps={{
maxLength: 4,
pattern: "[0-9]*",
inputMode: "numeric",
}}
sx={{ mb: 2 }}
/>
{error && <Typography color="error">{error}</Typography>}
</DialogContent>
<DialogActions>
<Button onClick={() => setOpenNewUserDialog(false)} color="primary" sx={{ fontFamily: "JetBrains Mono" }}>
<Button
onClick={() => setOpenNewUserDialog(false)}
color="primary"
sx={{ fontFamily: "JetBrains Mono" }}
>
Cancel
</Button>
<Button onClick={handleNewUserSubmit} color="primary" sx={{ fontFamily: "JetBrains Mono" }}>
<Button
onClick={handleNewUserSubmit}
color="primary"
sx={{ fontFamily: "JetBrains Mono" }}
>
Submit
</Button>
</DialogActions>
</Dialog>

<Dialog open={deleteDialogOpen} onClose={() => setDeleteDialogOpen(false)}>
<DialogTitle sx={{ fontFamily: "JetBrains Mono", color: "primary.main" }}>
<Dialog
open={deleteDialogOpen}
onClose={() => setDeleteDialogOpen(false)}
>
<DialogTitle
sx={{ fontFamily: "JetBrains Mono", color: "primary.main" }}
>
Confirm Delete
</DialogTitle>
<DialogContent>
<Typography variant="body1" sx={{ mb: 2, fontFamily: "JetBrains Mono" }}>
Selected user to delete: <strong>{userToDelete?.user_name}</strong>
<Typography
variant="body1"
sx={{ mb: 2, fontFamily: "JetBrains Mono" }}
>
Selected user to delete:{" "}
<strong>{userToDelete?.user_name}</strong>
</Typography>
<TextField
label="Enter 4-digit Password"
Expand All @@ -451,16 +504,30 @@ const Users = () => {
type="password"
value={deletePassword}
onChange={(e) => setDeletePassword(e.target.value)}
inputProps={{ maxLength: 4, pattern: "[0-9]*", inputMode: "numeric" }}
inputProps={{
maxLength: 4,
pattern: "[0-9]*",
inputMode: "numeric",
}}
sx={{ mb: 2 }}
/>
{deleteError && <Typography color="error">{deleteError}</Typography>}
{deleteError && (
<Typography color="error">{deleteError}</Typography>
)}
</DialogContent>
<DialogActions>
<Button onClick={() => setDeleteDialogOpen(false)} color="primary" sx={{ fontFamily: "JetBrains Mono" }}>
<Button
onClick={() => setDeleteDialogOpen(false)}
color="primary"
sx={{ fontFamily: "JetBrains Mono" }}
>
Cancel
</Button>
<Button onClick={handleConfirmDelete} color="error" sx={{ fontFamily: "JetBrains Mono" }}>
<Button
onClick={handleConfirmDelete}
color="error"
sx={{ fontFamily: "JetBrains Mono" }}
>
Delete
</Button>
</DialogActions>
Expand Down