Merge branch 'canvas/doing-stuff' into 'main'

alert level has a complete form

See merge request vkuchenik/website-framework!55

client/src/components/Canvas/CanvasComponents/AddWidgetMenu.jsx

@@ -1,18 +1,8 @@
 import { IoIosArrowBack } from "react-icons/io";
 import { Menu, Portal } from "@chakra-ui/react";
-import { v4 as uuid } from 'uuid';
 import AlertLevel from "./AlertLevelWidget";
 
-export default function AddWidgetMenu({onAddWidget, widgetArray, setWidgetArray}) {
-  function appendWidget(name) {
-    const newID = uuid();      // could be replaced with something else like guid
-    setWidgetArray([           // updating widget array containing info on the types of widgets
-      ...widgetArray,
-      {i: newID, widget: name}
-    ]);
-    onAddWidget(newID);       // updating array containing info on layout of widgets
-  }
-
+export default function AddWidgetMenu({appendWidget}) {
   return (
     <Menu.Root>
       <Menu.TriggerItem>
@@ -23,10 +13,22 @@ export default function AddWidgetMenu({onAddWidget, widgetArray, setWidgetArray}
           <Menu.Content>
             <Menu.Item 
               value="AlertLevel" 
-              onClick={() => appendWidget(AlertLevel)}
+              onClick={() => appendWidget(AlertLevel, 3, 6, 3, 6, 3, 6)}  // width and height are passed through here for each widget
             >
               Alert Level
             </Menu.Item>
+            <Menu.Item>
+              CO2
+            </Menu.Item>
+            <Menu.Item>
+              IVANS
+            </Menu.Item>
+            <Menu.Item>
+              Plume Heights
+            </Menu.Item>
+            <Menu.Item>
+              Alert Level Changes
+            </Menu.Item>
           </Menu.Content>
         </Menu.Positioner>
       </Portal>

client/src/components/Canvas/CanvasComponents/AlertLevelWidget.jsx

@@ -1,27 +1,65 @@
 import Widget from "./Widget";
-import { HStack, Box, Field, Input, Button } from "@chakra-ui/react";
+import { Stack, Box, Field, Input, Button, Text } from "@chakra-ui/react";
 import { useForm } from "react-hook-form";
+import { useState } from "react";
 
 export default function AlertLevel({id, isEditable, isDelete, DeleteWidget}) {
   const { register, handleSubmit } = useForm();
-  const onSubmit = (data) => console.log(data);
+  const onSubmit = (data) => {
+    console.log(data);
+    setIsSubmit(true);
+  }
+  const [isSubmit, setIsSubmit] = useState(false);
 
+  // Prop Forwarding
+  const widgetProps = { id, isEditable, isDelete, DeleteWidget, isSubmit, setIsSubmit }
   return (
-    <Widget id={id} title="Alert Level" isEditable={isEditable} isDelete={isDelete} DeleteWidget={DeleteWidget}>
+    <Widget title="Alert Level" {...widgetProps}>
+      {!isSubmit ? (
         <Box 
           as="form" 
           onSubmit={handleSubmit(onSubmit)}
           width="100%"
           height="100%"
-        p={2}
+          pt={1}
+          pl={3}
+          pr={3}
+          display="flex"
+          flexDir="column"
+          gap="3"
         >
           <Field.Root orientation="horizontal" >
-            <HStack display="flex" spacing={4} align="center" width="100%">
-              <Field.Label display="flex" whiteSpace="nowrap">Country Name</Field.Label>
+            <Stack direction="column" gap="3" width="100%">
+              <Stack direction="row" display="flex" flexShrink={1} spacing={4} align="center" width="100%">
+                <Field.Label whiteSpace="nowrap" fontWeight="bold">Country Name</Field.Label>
                 <Input {...register("countryname")} placeholder="Enter country name"/>
-            </HStack>
+              </Stack>
+              <Stack direction="row" display="flex" spacing={4} align="center" width="100%">
+                <Field.Label display="flex" whiteSpace="nowrap" fontWeight="bold">Volcano Name</Field.Label>
+                <Input {...register("countryname")} placeholder="Enter volcano name"/>
+              </Stack>
+            </Stack>
           </Field.Root>
+          <Button type="submit" size="sm" onClick={() => setIsSubmit(true)}>Submit</Button>
         </Box>
+      ):(
+        <Box p={1} mt={1} ml="auto" mr="auto" width="200px">
+          <Box
+            bg="bg" 
+            shadow="md" 
+            borderRadius="md"
+            p={8}
+            width="200px"
+            height="10px"
+            textAlign="center"
+            display="flex"
+            alignItems="center"
+            justifyContent="center"
+          >
+            <Text fontsize="2xl" fontWeight="bold" color="gray.700">Alert Level Data Coming Soon.</Text>
+          </Box>
+        </Box>
+      )}
     </Widget>
   );
 }

client/src/components/Canvas/CanvasComponents/SettingsButton.jsx

@@ -2,7 +2,8 @@ import { IconButton, Menu, Portal } from "@chakra-ui/react";
 import { FiSettings } from "react-icons/fi";
 import AddWidgetMenu from "./AddWidgetMenu";
 
-export function SettingsButton({onAddWidget, onEditWidgets, onDeleteWidgets, widgetArray, setWidgetArray}) {    
+export function SettingsButton({ onEditWidgets, onDeleteWidgets, appendWidget}) {  
+  const addWidgetMenuProps = { appendWidget }
   return (
     <Menu.Root>
       <Menu.Trigger asChild >
@@ -13,7 +14,7 @@ export function SettingsButton({onAddWidget, onEditWidgets, onDeleteWidgets, wid
       <Portal>
         <Menu.Positioner>
           <Menu.Content>
-            <AddWidgetMenu onAddWidget={onAddWidget} setWidgetArray={setWidgetArray} widgetArray={widgetArray}/>
+            <AddWidgetMenu {...addWidgetMenuProps}/>
             <Menu.Item onClick={onEditWidgets} value ="editwidget">Edit Widgets</Menu.Item>
             <Menu.Item 
               onClick={onDeleteWidgets}
@@ -28,8 +29,3 @@ export function SettingsButton({onAddWidget, onEditWidgets, onDeleteWidgets, wid
     </Menu.Root>
   );
 }
-
-
-
-
-

client/src/components/Canvas/CanvasComponents/Widget.jsx

@@ -1,10 +1,13 @@
 import { useSlotRecipe, chakra, Flex, CloseButton, Text, IconButton } from "@chakra-ui/react"
-import { FaEllipsisH } from "react-icons/fa";
+import { GrUndo } from "react-icons/gr";
 
-export default function Widget({ id, title, isEditable, isDelete, DeleteWidget, children }) {
+export default function Widget(props) {
+  // deconstructing props
+  const { id, title, isEditable, isDelete, DeleteWidget, isSubmit, setIsSubmit, children } = props;
   const recipe = useSlotRecipe({ key: "widget" });
   const styles = recipe();
 
+
   return (
     <>
       <chakra.div css={styles.header} cursor={isEditable ? "move":"default"}>
@@ -19,12 +22,14 @@ export default function Widget({ id, title, isEditable, isDelete, DeleteWidget,
           <>
             <Flex flexDirection="row" justifyContent="space-between" alignItems="center">
               <Text className="widget-handle" w="100%" display="flex" alignItems="center" height="32px" fontWeight="bold">{title}</Text>
-              <IconButton size="xs" bg="base300" cursor="pointer"><FaEllipsisH fill="text"/></IconButton>
+              {isSubmit ? (
+                <IconButton onClick={() => setIsSubmit(false)} size="xs" bg="base300" cursor="pointer"><GrUndo fill="text" /></IconButton>
+              ):(null)}
             </Flex>
           </>
         )}
       </chakra.div>
-      <chakra.div height="100%" mb="3">
+      <chakra.div height="100%" mb="2">
         {children}
       </chakra.div>
     </>

client/src/components/Canvas/views/Home.jsx

@@ -9,23 +9,27 @@ import { RemoteSensing } from "./HomeTabs/RemoteSensing";
 import { CancelButton } from "../CanvasComponents/CancelButton";
 import { SaveButton } from "../CanvasComponents/SaveButton";
 import DeleteAllButton from "../CanvasComponents/DeleteAllButton";
+import { v4 as uuid } from 'uuid';
+
 
 export default function Home({...props}) {
   // deconstructing props
   const { view, layout, setLayout, setOriginalLayout, onLayoutChange, onChangeView, onCancel, 
     isDelete, setIsDelete, isEditable, setIsEditable, widgetArray, setWidgetArray } = props;
 
-  const onAddWidget = (ID) => {
+  const onAddWidget = (ID, w, h, minw, minh, maxw, maxh) => {
     setLayout(prev => [
       ...prev,
       {
         i: ID,
         x: (prev.length * 3) % 12,
         y: Infinity,
-        w: 2, 
-        h: 5,
-        minW: 2,
-        minH: 5,
+        w: w, 
+        h: h,
+        minW: minw,
+        minH: minh,
+        maxW: maxw,
+        maxH: maxh,
         static: false,
         resizeHandles: ['se']
       }
@@ -33,6 +37,15 @@ export default function Home({...props}) {
     onEditWidgets();
   };
 
+  function appendWidget(name, w, h, minw, minh, maxw, maxh) {
+    const newID = uuid();      // could be replaced with something else like guid
+    setWidgetArray([           // updating widget array containing info on the types of widgets
+      ...widgetArray,
+      {i: newID, widget: name }
+    ]);
+    onAddWidget(newID, w, h, minw, minh, maxw, maxh);       // updating array containing info on layout of widgets
+  }
+
   const onEditWidgets = () => {
     console.log("widgets are now editable");
     setOriginalLayout(layout); // Backup layout before editing
@@ -87,7 +100,7 @@ export default function Home({...props}) {
 
   // Prop Forwarding
   const MyDashboardProps = { layout, onLayoutChange, isEditable, isDelete, DeleteWidget, widgetArray };
-  const settingsButtonProps = { onAddWidget, onEditWidgets, onDeleteWidgets, setWidgetArray, widgetArray };
+  const settingsButtonProps = { onEditWidgets, onDeleteWidgets, appendWidget };
   
   return (
     /* HEADER */
@@ -109,7 +122,7 @@ export default function Home({...props}) {
 				top="0"
         zIndex="dropdown" // zIndex: 1100
 				bg="base200"
-				px={6}
+				px={5}
 				pt={3}
 				align="center"
 				justify="space-between"

client/src/components/Canvas/views/HomeTabs/MyDashboard.jsx

@@ -13,6 +13,7 @@ export default function MyDashboard({layout, onLayoutChange, isEditable, isDelet
 
   console.log("widgetArray: ", widgetArray);
   console.log("layout: ", layout);
+
   if (widgetArray.length && layout.length) {
     const widgetMap = new Map(widgetArray.map(item => [item.i, item]));
     merged = layout.map(item => {
@@ -29,17 +30,16 @@ export default function MyDashboard({layout, onLayoutChange, isEditable, isDelet
         useCSSTransforms={false}  // remove the sliding animation of the widgets
         className="layout"
         layout={layout}
-        cols={12} // Total columns in grid
-        rowHeight={30} //Height of a single row in px
+        cols={16} // Total columns in grid
+        rowHeight={30} // Height of a single row in px
         isBounded={true} // Total width of the grid
-        margin={[10, 10]} // [horizontal, vertical] gap
+        margin={[15, 5]} // [horizontal, vertical] gap
         onLayoutChange={onLayoutChange}
         draggableHandle=".widget-handle" // Make only the header draggable
         onDragStart={handleDragStart}
         onDragStop={handleDragStop}
         position="relative"
         resizeHandle={<CustomResizeHandle isVisable={isEditable} />}
-        isResizable={isEditable}
       >
         {merged.map((item) => {
           const Widget = item.widget;

client/src/components/Dashboard.jsx

@@ -1,7 +1,7 @@
 import Header from './Header/Header.jsx';
 import Sidebar from './Sidebar/Sidebar.jsx';
 import Canvas from './Canvas/Canvas.jsx';
-import { Grid, GridItem, useRecipe } from '@chakra-ui/react';
+import { Grid, GridItem, useRecipe, Dialog } from '@chakra-ui/react';
 import { useState } from 'react';
 
 export default function Dashboard() {

client/src/css/index.css

@@ -1,4 +1,3 @@
 :root {
   font-family: Georgia, 'Times New Roman', Times, serif;
-  color: #19332D;
 }