diff --git a/client/src/components/Canvas/Canvas.jsx b/client/src/components/Canvas/Canvas.jsx
index 5b3158b..1e9c6a9 100644
--- a/client/src/components/Canvas/Canvas.jsx
+++ b/client/src/components/Canvas/Canvas.jsx
@@ -6,14 +6,15 @@ import Account from "./views/Account"
import Settings from "./views/Settings"
import Home from "./views/Home";
import { DASHBOARD_VIEWS } from "@/constants/viewKeys";
+import { chakra } from "@chakra-ui/react";
export default function Canvas({...props}) {
const { view } = props;
return (
- <>
+
{/* Check if view is a tab inside the Canvas Header */}
{ DASHBOARD_VIEWS.includes(view) && (
-
+
)}
{view === "global" && }
{view === "regional" && }
@@ -21,6 +22,6 @@ export default function Canvas({...props}) {
{view === "admin" && }
{view === "account" && }
{view === "settings" && }
- >
+
);
}
\ No newline at end of file
diff --git a/client/src/components/Canvas/CanvasComponents/AlertLevelWidget.jsx b/client/src/components/Canvas/CanvasComponents/AlertLevelWidget.jsx
index ba880ca..a66f0f0 100644
--- a/client/src/components/Canvas/CanvasComponents/AlertLevelWidget.jsx
+++ b/client/src/components/Canvas/CanvasComponents/AlertLevelWidget.jsx
@@ -1,10 +1,27 @@
import Widget from "./Widget";
-import { Text } from "@chakra-ui/react";
+import { HStack, Box, Field, Input, Button } from "@chakra-ui/react";
+import { useForm } from "react-hook-form";
export default function AlertLevel({id, isEditable, isDelete, DeleteWidget}) {
+ const { register, handleSubmit } = useForm();
+ const onSubmit = (data) => console.log(data);
+
return (
- Input volcano and country
+
+
+
+ Country Name
+
+
+
+
);
}
\ No newline at end of file
diff --git a/client/src/components/Canvas/CanvasComponents/Widget.jsx b/client/src/components/Canvas/CanvasComponents/Widget.jsx
index d1ecaa2..4cd41c2 100644
--- a/client/src/components/Canvas/CanvasComponents/Widget.jsx
+++ b/client/src/components/Canvas/CanvasComponents/Widget.jsx
@@ -16,11 +16,11 @@ export default function Widget({ id, title, isEditable, isDelete, DeleteWidget,
>
):(
<>
- {title}
+ {title}
>
)}
-
+
{children}
>
diff --git a/client/src/components/Canvas/views/Home.jsx b/client/src/components/Canvas/views/Home.jsx
index 68558f2..8233705 100644
--- a/client/src/components/Canvas/views/Home.jsx
+++ b/client/src/components/Canvas/views/Home.jsx
@@ -67,7 +67,7 @@ export default function Home({...props}) {
const DeleteWidget = (ID) => {
console.log("Deleting widget with id: ", ID);
setLayout(layout => layout.filter(w => w.i !== ID));
- // add removal for widgetArray here
+ setWidgetArray(widgetArray => widgetArray.filter(w => w.i !== ID));
}
const DeleteAll = () => {
@@ -89,8 +89,8 @@ export default function Home({...props}) {
return (
/* HEADER */
@@ -129,7 +130,7 @@ export default function Home({...props}) {
-
+
{isEditable ? (
<>
diff --git a/client/src/components/Canvas/views/HomeTabs/MyDashboard.jsx b/client/src/components/Canvas/views/HomeTabs/MyDashboard.jsx
index 82b31bf..6cfcffd 100644
--- a/client/src/components/Canvas/views/HomeTabs/MyDashboard.jsx
+++ b/client/src/components/Canvas/views/HomeTabs/MyDashboard.jsx
@@ -25,6 +25,7 @@ export default function MyDashboard({layout, onLayoutChange, isEditable, isDelet
return (
{
const Widget = item.widget;
return (
-
+
)
diff --git a/client/src/theme.js b/client/src/theme.js
index ba8c4b7..26a033c 100644
--- a/client/src/theme.js
+++ b/client/src/theme.js
@@ -71,7 +71,8 @@ const widgetRecipe = defineSlotRecipe({
border: "1px solid",
borderColor: "{base300}",
textAlign: "center",
- height: "100%"
+ height: "100%",
+ position: "fixed"
},
header: {
flexShrink: "0",
@@ -152,6 +153,9 @@ const config = defineConfig({
filter: "invert(100%) hue-rotate(180deg) brightness(95%) contrast(90%)",
}
},
+ ".react-grid-item": {
+ transition: "none !important"
+ },
},
theme: {
semanticTokens: {