add: volcano drop down filter w/ multiselect capabilities in widget settings. UI only! No functionality has been built yet

- alert level changes now display accurate color.
- comm coor report no longer has dark loading screen in lt mode. login input text no longer white in dark mode

client/src/components/Widgets/AlertChanges.jsx

@@ -1,28 +1,51 @@
-import {useDashboardStore} from "@/store/useDashboardStore.jsx";
+import { useDashboardStore } from "@/store/useDashboardStore.jsx";
 import VdapApi from "../../hooks/useVdapApi.js";
 import useBuildUrl from "../../hooks/useBuildUrl.js";
-import { Footprints, Plane, Sailboat, TrendingUp, TrendingDown } from 'lucide-react';
-import {Box, Collapsible, Flex, Spinner, Text, Timeline, Center} from "@chakra-ui/react";
+import {
+  Footprints,
+  Plane,
+  Sailboat,
+  TrendingUp,
+  TrendingDown,
+} from "lucide-react";
+import {
+  Box,
+  Collapsible,
+  Flex,
+  Spinner,
+  Text,
+  Timeline,
+  Center,
+} from "@chakra-ui/react";
 import { useMemo, useCallback } from "react";
 
+export default function AlertChanges({ settings, widgetID }) {
+  // 0) CREATE SELF AWARENESS, by finding this specific widgets object in the state-list of active/displayed widgets
+  const thisWidget = useDashboardStore(
+    useCallback(
+      (state) => state.widgets.find((widget) => widget.id === widgetID),
+      [widgetID],
+    ),
+  );
 
-export default function AlertChanges({ settings, widgetID}) {
-  // Find this specific widgets object in the state list of active & displayed widgets
-  const thisWidget = useDashboardStore(useCallback((state) =>
-    state.widgets.find((widget) => widget.id === widgetID), [widgetID]
-  ));
+  // 1) BUILD URL, default is 7 days past
+  const url = useBuildUrl(
+    "/api/v2/alert_changes",
+    settings?.startDate,
+    settings?.endDate,
+  );
 
-  // build url, default is 7 days past
-  const url = useBuildUrl('/api/v2/alert_changes', settings?.startDate, settings?.endDate);
+  // 2) CALL API hook to retrieve data
+  const { data: apiData, isLoading, error } = VdapApi(url);
 
-  // call api hook to retrieve data
-  const {data: apiData, isLoading, error} = VdapApi(url);
-
-  const data = useMemo(() => {
+  // 3) SORT the data by grouping into volcanoes and sorting form newest to oldest
+  //    doing this 1st bc the filters might change w/ user input but the sorts (currently) wont and thus will
+  //    only run when the api retrieves new data
+  const sortedData = useMemo(() => {
     if (apiData.length === 0) return [];
 
     // .reduce() is a built-in array method used to transform an entire array into a single value (like an object)
-    // here it returns a single massive object w/ volcano names as keys
+    // here we sort the data by volcano, and return it as a single massive object w/ volcano names as keys
     const grouped = apiData.reduce((accumulator, item) => {
       if (!accumulator[item.volcano]) accumulator[item.volcano] = [];
       accumulator[item.volcano].push(item);
@@ -33,33 +56,97 @@ export default function AlertChanges({ settings, widgetID}) {
     const group_arr = Object.entries(grouped);
 
     // sort data newest to oldest within each volcano
-    const sorted = group_arr.map((item) =>
-      [
-        item[0], // volcano name
-        [...(item[1])].sort((a, b) =>
-          new Date(b.alert_start_date_local) - new Date(a.alert_start_date_local))
-      ]
+    const sorted = group_arr.map((item) => [
+      item[0], // volcano name
+      [...item[1]].sort( // item[1] is the array of al changes for a volcano
+        (a, b) =>
+          new Date(b.alert_start_date_local) -
+          new Date(a.alert_start_date_local),
+      ),
+    ]);
+
+    // the volcanoes with the most recent issued alert level change appear at the top of the list (newest -> oldest)
+    const sorted_entries = [...sorted].sort(
+      (a, b) =>
+        new Date(b[1][0].alert_start_date_local) -
+        new Date(a[1][0].alert_start_date_local),
     );
 
-    // volcano with most recent alert level change appears at top of list
-    const sorted_entries = [...sorted].sort((a, b) => new Date(b[1][0].alert_start_date_local) - new Date(a[1][0].alert_start_date_local));
-
+    // additionally, seperates out data into domains within a volcano for sm widgets,
+    // to list all most recent al changes w/in a volcano w/in a domain
     if (thisWidget?.size === "small") {
-      return (sorted_entries.map((volcano) => {
+      return sorted_entries.map((volcano) => {
         const domain = volcano[1].reduce((acc, curr) => {
-          if (!acc[curr.alert_scheme_domain]) acc[curr.alert_scheme_domain] = [];
+          if (!acc[curr.alert_scheme_domain])
+            acc[curr.alert_scheme_domain] = [];
           acc[curr.alert_scheme_domain].push(curr);
           return acc;
         }, {});
 
         const domain_arr = Object.entries(domain);
+        console.log("sm data: ", [volcano[0], domain_arr]);
         return [volcano[0], domain_arr];
-      }));
+      });
     }
 
+    console.log("lg data: ", sorted_entries);
     return sorted_entries;
   }, [apiData, thisWidget]);
 
+  // 4) FILTER according to what is set in the widgets settings
+  const filteredData = useMemo(() => {
+    if (sortedData.length === 0) return [];
+    let filtered_arr = [];
+
+    // must show at least one inc or dec alert levels, otherwise no data is displayed
+    if (
+      !settings?.filters?.levelIncreases &&
+      !settings?.filters?.levelDecreases
+    )
+      return [];
+
+    // return all data
+    if (
+      settings?.filters?.levelIncreases &&
+      settings?.filters?.levelDecreases &&
+      !settings?.filters.elevatedLevels
+    )
+      return sortedData;
+
+    // only elevated alert levels
+    filtered_arr = settings?.filters.elevatedLevels
+      ? sortedData.map((volcano) => [
+          volcano[0],
+          volcano[1].filter(
+            (item) =>
+              item.alert_scheme_highest - Number(item.alert_level_rank) <= 1,
+          ),
+        ])
+        .filter((volcano) => volcano[1].length > 0)
+      : sortedData;
+
+    // only decreases (rm inc)
+    filtered_arr = !settings?.filters.levelIncreases
+      ? filtered_arr.map((volcano) => [
+          volcano[0],
+          volcano[1].filter((item) => !(item.change_type === "increase")),
+        ])
+        .filter((volcano) => volcano[1].length > 0)
+      : filtered_arr;
+
+    // only increases (rm dec)
+    filtered_arr = !settings?.filters?.levelDecreases
+      ? filtered_arr.map((volcano) => [
+          volcano[0],
+          volcano[1].filter((item) => !(item.change_type === "decrease")),
+        ])
+        .filter((volcano) => volcano[1].length > 0)
+      : filtered_arr;
+
+    console.log("filtered_arr: ", filtered_arr);
+    return filtered_arr;
+  }, [sortedData, settings]);
+
   // Alert colors are now light/dark mode responsive
   const alertColors = {
     Red: "alertRed",
@@ -68,153 +155,295 @@ export default function AlertChanges({ settings, widgetID}) {
     Green: "alertGreen",
   };
 
-  if (isLoading) return (
-    <Flex w="100%" h="100%" align="center" justify="center" bg="transparent">
-      <Spinner size="xl" color="blue.400" thickness="4px"/>
-    </Flex>
-  );
+  const options = {
+    year: "numeric",
+    month: "short",
+    day: "numeric",
+    hour: "numeric",
+    minute: "2-digit",
+    second: "2-digit",
+    timeZoneName: "short"
+  };
 
-  if (error) return (
-    <Flex w="100%" h="100%" align="center" justify="center" bg="transparent">
-      <Text color="red.400">{error}</Text>
-    </Flex>
-  );
+  if (isLoading)
+    return (
+      <Flex w="100%" h="100%" align="center" justify="center" bg="transparent">
+        <Spinner size="xl" color="blue.400" thickness="4px" />
+      </Flex>
+    );
 
-  if (data.length === 0) return (
-    <Flex w="100%" h="100%" align="center" justify="center" bg="transparent">
-      <Text textAlign="center" color="widgetTextMuted">No flight level data available for the selected dates.</Text>
-    </Flex>
-  );
+  if (error)
+    return (
+      <Flex w="100%" h="100%" align="center" justify="center" bg="transparent">
+        <Text color="red.400">{error}</Text>
+      </Flex>
+    );
+
+  if (filteredData.length === 0)
+    return (
+      <Flex w="100%" h="100%" align="center" justify="center" bg="transparent">
+        <Text textAlign="center" color="widgetTextMuted">
+          No alert level data available for the selected dates.
+        </Text>
+      </Flex>
+    );
 
   return (
-    // bg="transparent" to let the glass panel show through
-    <Box display="flex" flexDirection="column" gap={2} p={2} w="100%" h="100%" bg="transparent" overflowY="auto">
-      {data.map((volcano, index) => {
-        if (thisWidget?.size === "large") return (
-          <Collapsible.Root key={index} w="100%">
-            <Collapsible.Context>
-              {(collapsible) => (
-                <>
+    <Box
+      display="flex"
+      flexDirection="column"
+      gap={2}
+      p={2}
+      w="100%"
+      h="100%"
+      bg="transparent"
+      overflowY="auto"
+    >
+      {filteredData.map((volcano, index) => {
+        if (thisWidget?.size === "large")
+          return (
+            <Collapsible.Root key={index} w="100%">
+              <Collapsible.Context>
+                {(collapsible) => (
                   <Collapsible.Trigger w="100%">
-                    <Flex direction="row"
-                          w="100%"
-                          justify="space-between" align="center"
-                          p={1} pl={3} pr={3}
-                          borderTopRadius="lg"
-                          borderBottomRadius={collapsible.open ? "0" : "lg"}
-                          bg="widgetItemBg"
+                    <Flex
+                      direction="row"
+                      w="100%"
+                      justify="space-between"
+                      align="center"
+                      p={1}
+                      pl={3}
+                      pr={3}
+                      borderTopRadius="lg"
+                      borderBottomRadius={collapsible.open ? "0" : "lg"}
+                      bg="widgetItemBg"
                     >
-                      <Flex direction="column" w="100%" minW={0} textAlign="left">
-                        <Text truncate color="text" fontWeight="medium">{volcano[0]}</Text>
-                        <Text truncate fontSize="xs" color="widgetTextMuted">{volcano[1][0]?.alert_start_date_local}</Text>
+                      <Flex
+                        direction="column"
+                        w="100%"
+                        minW={0}
+                        textAlign="left"
+                      >
+                        <Text truncate color="text" fontWeight="medium">
+                          {volcano[0]}
+                        </Text>
+                        <Text truncate fontSize="xs" color="widgetTextMuted">
+                          {new Date(volcano[1][0]?.alert_start_date_local)
+                            .toLocaleString('en-US', options)
+                          }
+                        </Text>
                       </Flex>
-                      <Flex w="100%" minW={0} justify="right">
-                        <Text truncate pl={2} pr={2} borderRadius="lg" bg="widgetBadgeBg" color="text" fontWeight="semibold">
+                      <Flex w="100%" minW={0} justify="right" gap={2}>
+                        <Text
+                          truncate
+                          pl={2}
+                          pr={2}
+                          borderRadius="lg"
+                          bg="widgetBadgeBg"
+                          color="text"
+                          fontWeight="semibold"
+                        >
                           {volcano[1][0]?.alert_level_name}
                         </Text>
+                        <Flex w="fit">
+                          {volcano[1][0]?.change_type === "increase" ? (
+                            <TrendingUp />
+                          ) : (
+                            <TrendingDown />
+                          )}
+                        </Flex>
                       </Flex>
                     </Flex>
                   </Collapsible.Trigger>
+                )}
+              </Collapsible.Context>
 
-                  <Collapsible.Content w="100%" p={3} borderBottomRadius="lg" bg="widgetItemExpandedBg">
-                    <Timeline.Root size="md" variant="subtle">
-                      {volcano[1]?.map((object, index) => (
-                        <Timeline.Item key={index} w="100%" h="100%">
-                          <Timeline.Connector >
-                            <Timeline.Indicator outline="none" bg="widgetBadgeBg" color="iconColor" size="lg">
-                              {object?.alert_scheme_domain === "terrestrial" && <Footprints size={15} />}
-                              {object?.alert_scheme_domain === "aviation" && <Plane size={15} />}
-                              {object?.alert_scheme_domain === "maritime" && <Sailboat size={15} />}
-                            </Timeline.Indicator>
-                            <Timeline.Indicator h="50%" outline="none" bg="widgetBadgeBg" color="iconColor" size="lg">
-                              {object?.change_type === "increase" ? <TrendingUp /> : <TrendingDown />}
-                            </Timeline.Indicator>
-                          </Timeline.Connector>
-                          <Timeline.Content w="100%" h="100%">
-                            <Timeline.Description w="100%" h="100%" gap={1}>
-                              <Flex direction="column" gap={1}>
-                                <Text w="100%" h="100%" color="widgetTextMuted">{object?.alert_start_date_local}</Text>
-                                <Text w="100%" h="100%"
-                                      color={alertColors[object?.alert_level_name] || "text"}
-                                      fontSize="md"
-                                      fontWeight="semibold"
-                                >
-                                  {object?.alert_level_name}
-                                </Text>
-                                <Flex w="100%" h="20px" direction="row" justify="left" align="center">
-                                  <Text color="widgetTextMuted">Alert Scale: </Text>
-                                  {(Array.from({ length: Number(object?.alert_scheme_highest) - Number(object?.alert_scheme_lowest) + 1}, (v, i) => Number(object?.alert_scheme_lowest) + i))
-                                    .map((num) => (
-                                      <Center
-                                        key={num}
-                                        w="20px" h="100%"
-                                        color="text"
-                                        bg={num === Number(object?.alert_level_rank) ? "widgetBadgeBg" : "transparent"}
-                                        borderRadius={num === Number(object?.alert_level_rank) ? "xl" : "none"}
-                                        textAlign="center"
-                                        fontSize="sm"
-                                        fontWeight="bold"
-                                      >
-                                        {num}
-                                      </Center>
-                                    ))
+              <Collapsible.Content
+                w="100%"
+                p={3}
+                borderBottomRadius="lg"
+                bg="widgetItemExpandedBg"
+              >
+                <Timeline.Root size="md" variant="subtle">
+                  {volcano[1]?.map((object, index) => (
+                    <Timeline.Item key={index} w="100%" h="100%">
+                      <Timeline.Connector>
+                        <Timeline.Indicator
+                          outline="none"
+                          bg="widgetBadgeBg"
+                          color="iconColor"
+                          size="lg"
+                        >
+                          {object?.alert_scheme_domain ===
+                            "terrestrial" && <Footprints size={15} />}
+                          {object?.alert_scheme_domain === "aviation" && (
+                            <Plane size={15} />
+                          )}
+                          {object?.alert_scheme_domain === "maritime" && (
+                            <Sailboat size={15} />
+                          )}
+                        </Timeline.Indicator>
+                        <Timeline.Indicator
+                          h="50%"
+                          outline="none"
+                          bg="transparent"
+                          color="iconColor"
+                          size="lg"
+                        >
+                          {object?.change_type === "increase" ? (
+                            <TrendingUp />
+                          ) : (
+                            <TrendingDown />
+                          )}
+                        </Timeline.Indicator>
+                      </Timeline.Connector>
+                      <Timeline.Content w="100%" h="100%">
+                        <Timeline.Description w="100%" h="100%" gap={1}>
+                          <Flex direction="column" gap={1}>
+                            <Text
+                              w="100%"
+                              h="100%"
+                              color="widgetTextMuted"
+                            >
+                              {new Date(object?.alert_start_date_local)
+                                .toLocaleString('en-US', {...options, timeZone: 'UTC'})
+                              }
+                            </Text>
+                            <Text
+                              w="100%"
+                              h="100%"
+                              color={
+                                alertColors[object?.alert_level_name] ||
+                                "text"
+                              }
+                              fontSize="md"
+                              fontWeight="semibold"
+                            >
+                              {object?.alert_level_name}
+                            </Text>
+                            <Flex
+                              w="100%"
+                              h="20px"
+                              direction="row"
+                              justify="left"
+                              align="center"
+                            >
+                              <Text color="widgetTextMuted">
+                                Alert Scale:{" "}
+                              </Text>
+                              {Array.from(
+                                {
+                                  length:
+                                    Number(object?.alert_scheme_highest) -
+                                    Number(object?.alert_scheme_lowest) +
+                                    1,
+                                },
+                                (v, i) =>
+                                  Number(object?.alert_scheme_lowest) + i,
+                              ).map((num) => (
+                                <Center
+                                  key={num}
+                                  w="20px"
+                                  h="100%"
+                                  color="text"
+                                  bg={
+                                    num ===
+                                    Number(object?.alert_level_rank)
+                                      ? "widgetBadgeBg"
+                                      : "transparent"
                                   }
-                                </Flex>
-                              </Flex>
-                            </Timeline.Description>
-                          </Timeline.Content>
-                        </Timeline.Item>
-                      ))}
-                    </Timeline.Root>
-                  </Collapsible.Content>
-                </>
-              )}
-            </Collapsible.Context>
-          </Collapsible.Root>
-        )
-        else if (thisWidget?.size === "small") return (
-          volcano[1]?.map((domain, index) => (
+                                  borderRadius={
+                                    num ===
+                                    Number(object?.alert_level_rank)
+                                      ? "xl"
+                                      : "none"
+                                  }
+                                  textAlign="center"
+                                  fontSize="sm"
+                                  fontWeight="bold"
+                                >
+                                  {num}
+                                </Center>
+                              ))}
+                            </Flex>
+                          </Flex>
+                        </Timeline.Description>
+                      </Timeline.Content>
+                    </Timeline.Item>
+                  ))}
+                </Timeline.Root>
+              </Collapsible.Content>
+            </Collapsible.Root>
+          );
+        else if (thisWidget?.size === "small")
+          return volcano[1]?.map((domain, index) => (
             <Flex
               key={index}
               direction="row"
               w="100%"
               gap={2}
-              justify="space-between" align="center"
-              p={1} pl={3} pr={3}
+              justify="space-between"
+              align="center"
+              p={1}
+              pl={3}
+              pr={3}
               borderRadius="lg"
               bg="widgetItemBg"
             >
-              <Flex direction="column" w="100%" minW={0} textAlign="left" color="text">
+              <Flex
+                direction="column"
+                w="100%"
+                minW={0}
+                textAlign="left"
+                color="text"
+              >
                 <Flex direction="row" w="100%" gap={2} align="center">
                   <Flex color="iconColor">
-                    {domain[0] === "aviation" && <Plane size={15}/>}
-                    {domain[0] === "terrestrial" && <Footprints size={15}/>}
-                    {domain[0] === "maritime" && <Sailboat size={15}/>}
+                    {domain[0] === "aviation" && <Plane size={15} />}
+                    {domain[0] === "terrestrial" && <Footprints size={15} />}
+                    {domain[0] === "maritime" && <Sailboat size={15} />}
                   </Flex>
-                  <Text truncate fontWeight="medium">{volcano[0] || ""}</Text>
+                  <Text truncate fontWeight="medium">
+                    {volcano[0] || ""}
+                  </Text>
                 </Flex>
-                <Text truncate w="100%" fontSize="xs" color="widgetTextMuted">{domain[1]?.[0]?.alert_start_date_local || ""}</Text>
+                <Text truncate w="100%" fontSize="xs" color="widgetTextMuted">
+                  {domain[1]?.[0]?.alert_start_date_local || ""}
+                </Text>
               </Flex>
 
-              <Flex direction="row" w="100%" minW={0} justify="right" gap={2} color="text">
+              <Flex
+                direction="row"
+                w="100%"
+                minW={0}
+                justify="right"
+                gap={2}
+                color="text"
+              >
                 <Flex w="25px" justify="right" color="iconColor">
-                  {domain[1]?.[0]?.change_type === "increase" ? <TrendingUp/> : <TrendingDown/>}
+                  {domain[1]?.[0]?.change_type === "increase" ? (
+                    <TrendingUp />
+                  ) : (
+                    <TrendingDown />
+                  )}
                 </Flex>
                 <Text
                   truncate
-                  pl={2} pr={2}
+                  pl={2}
+                  pr={2}
                   borderRadius="lg"
                   bg="widgetBadgeBg"
-                  color={alertColors[domain[1]?.[0]?.alert_level_name] || "text"}
+                  color={
+                    alertColors[domain[1]?.[0]?.alert_level_name] || "text"
+                  }
                   fontWeight="semibold"
                 >
                   {domain[1]?.[0]?.alert_level_name}
                 </Text>
               </Flex>
             </Flex>
-          ))
-        );
+          ));
       })}
     </Box>
-  )
-}
+  );
+}

client/src/components/Widgets/CommCoorReport.jsx

@@ -115,19 +115,19 @@ export default function CommCoorReport({ settings, widgetID }) {
   }, [settings, widgetID, updateSettings, apiData]);
 
   if (isLoading) return (
-    <Flex w="100%" h="100%" align="center" justify="center" borderRadius="lg" bg="gray.800">
+    <Flex w="100%" h="100%" align="center" justify="center" borderRadius="lg" bg="transparent">
       <Spinner size="xl" color="blue.400" thickness="4px"/>
     </Flex>
   );
 
   if (error) return (
-    <Flex w="100%" h="100%" align="center" justify="center" textAlign="center" borderRadius="lg" bg="gray.800">
+    <Flex w="100%" h="100%" align="center" justify="center" textAlign="center" borderRadius="lg" bg="transparent">
       <Text color="red.400">{error}</Text>
     </Flex>
   );
 
   if (!apiData) return (
-    <Flex w="100%" h="100%" align="center" justify="center" borderRadius="lg" bg="gray.800">
+    <Flex w="100%" h="100%" align="center" justify="center" borderRadius="lg" bg="transparent">
       <Text textAlign="center" color="gray.400">No data</Text>
     </Flex>
   );

client/src/components/Widgets/IvansAlerts.jsx

@@ -111,18 +111,17 @@ export default function IvansAlerts({ settings, widgetID }) {
                   <Collapsible.Content w="100%" h="auto">
                     {/* This box needs to be at h="100%" for the pdf toolbar to appear */}
                     <Box w="100%" h="100%" p={1} borderBottomRadius="lg" bg="widgetItemExpandedBg">
-                      <Flex direction="column" gap={2} bg="widgetItemBg" borderRadius="lg" p={2} align="end">
-                        <Text w="100%" h="100%" fontSize="sm" color="text" textAlign="left" whiteSpace="pre-line">{item?.summary}</Text>
+                      <Flex direction="column" gap={2} borderRadius="lg" p={2} align="start">
                         <Text w="fit" fontSize="sm" color="text" pl={1} pr={1} bg="widgetBadgeBg" borderRadius="md">Preparer: {item?.preparer}</Text>
+                        <Text w="100%" h="100%" fontSize="sm" color="text" textAlign="left" whiteSpace="pre-line">{item?.summary}</Text>
                       </Flex>
                       {item?.files?.map((file, index) => {
                         return (
                           <Box w="100%" h="100%" key={index} p={1}>
-                            <br />
                             <Flex mb={2} justify="space-between">
                               <Text pl={1} pr={1} bg="widgetBadgeBg" borderRadius="md" fontSize="xs" color="text">{file?.name}</Text>
                               <Box borderRadius="lg" bg="widgetBadgeBg" color="text" pl={1} pr={1} fontSize={13} asChild>
-                                <a href={`${file?.url}#view=FitV&toolbar=1`} target="_blank" rel="noopener noreferrer">
+                                <a href={`${file?.url}#view=FitV&toolbar=0`} target="_blank" rel="noopener noreferrer">
                                   Open
                                 </a>
                               </Box>

client/src/components/Widgets/RemoteSensing.jsx

@@ -96,7 +96,7 @@ export default function RemoteSensing({ settings, widgetID }) {
                   <Collapsible.Content w="100%" h="auto">
                     {/* This box needs to be at h="100%" for the pdf toolbar to appear */}
                     <Box w="100%" h="100%" p={1} borderBottomRadius="lg" bg="widgetItemExpandedBg">
-                      <Flex direction="column" gap={2} bg="widgetItemBg" borderRadius="lg" p={2} align="end">
+                      <Flex direction="column" gap={2} borderRadius="lg" p={2} align="end">
                         <Text w="100%" h="100%" fontSize="sm" color="text" textAlign="left" whiteSpace="pre-line">{item?.summary}</Text>
                         <Text w="fit" fontSize="sm" color="text" pl={1} pr={1} bg="widgetBadgeBg" borderRadius="md">Source: {item?.sender}</Text>
                       </Flex>

client/src/components/Widgets/settings/AlertChangeSettings.jsx

@@ -1,38 +1,289 @@
-import {Flex, Slider, Switch} from "@chakra-ui/react";
-import {useDashboardStore} from "@/store/useDashboardStore.jsx";
+import {
+  Flex,
+  Slider,
+  Switch,
+  Text,
+  Field,
+  Fieldset,
+  Input,
+  CheckboxCard,
+  CheckboxGroup,
+  Combobox,
+  Portal,
+  useFilter,
+  useListCollection,
+  Wrap,
+  Badge
+} from "@chakra-ui/react";
+import { useDashboardStore } from "@/store/useDashboardStore.jsx";
+import { useState, useMemo } from "react";
 
-export default function IvansAlertsSettings({ widgetId, currentSettings }) {
-  const updateSettings = useDashboardStore(state => state.updateWidgetSettings);
+export default function AlertChangeSettings({ widgetId, currentSettings }) {
+  const updateSettings = useDashboardStore(
+    (state) => state.updateWidgetSettings,
+  );
+  const [startError, setStartError] = useState(null);
+  const [endError, setEndError] = useState(null);
 
   console.log("currentSettings:", currentSettings);
 
+  const [selectedVolcanoes, setSelectedVolcanoes] = useState([]);
+  const { startsWith } = useFilter({ sensitivity: "base" });
+
+  const { collection, filter, reset } = useListCollection({
+    initialItems: volcanoes,
+    filter: startsWith,
+    limit: 10,
+  });
+
+  const handleValueChange = (details) => {
+    setSelectedVolcanoes(details.value)
+  }
+
   return (
-    <Flex flexDirection="column" justifyContent="space-between" align="center" gap={2} pb={2}>
-      {/* SLIDER DATE RANGE SELECTION */}
-      <Slider.Root
-        w="90%" h="100%"
-        min={1} max={14}
-        defaultValue={[1]}
-        step={1}
-        onValueChangeEnd={(e) => {
-          console.log("change end", e);
-          const day = new Date(Date.now() - (e.value[0])*86400000).toLocaleDateString('en-CA');
-          updateSettings(widgetId, {...currentSettings, startDate: day});
-        }}
-      >
-        <Slider.Label>{currentSettings?.startDate} to {currentSettings?.endDate}</Slider.Label>
-        <Slider.Control>
-          <Slider.Track>
-            <Slider.Range />
-          </Slider.Track>
-          <Slider.Thumbs />
-          <Slider.MarkerGroup p={3}>
-            <Slider.Marker value={1} whiteSpace="nowrap">today</Slider.Marker>
-            <Slider.Marker value={7} whiteSpace="nowrap">1 week ago</Slider.Marker>
-            <Slider.Marker value={14} whiteSpace="nowrap">2 weeks ago</Slider.Marker>
-          </Slider.MarkerGroup>
-        </Slider.Control>
-      </Slider.Root>
+    <Flex direction="column" gap={4} pb={2} overflowY="auto">
+      <Fieldset.Root>
+        <Fieldset.Content>
+          {/* SELECTING DATE RANGE */}
+          <Flex direction="column" w="100%" h="100%" justify="center" gap="2">
+            <Flex direction="column">
+              <Text w="100%" fontWeight="bold">
+                Date Range Selection
+              </Text>
+              <hr /> {/*line seperator*/}
+            </Flex>
+
+            {/* start date */}
+            <Field.Root invalid={!!startError}>
+              <Flex
+                direction="row"
+                w="100%"
+                h="100%"
+                align="center"
+                justify="center"
+              >
+                <Text w="50%" align="center" justify="center" color="gray.700">
+                  Start Date
+                </Text>
+                <Flex direction="column" w="100%">
+                  <Input
+                    type="date"
+                    w="100%"
+                    borderRadius="lg"
+                    value={currentSettings?.startDate || ""}
+                    onChange={(e) => {
+                      const value = e.target.value;
+                      updateSettings(widgetId, {
+                        ...currentSettings,
+                        startDate: value,
+                      });
+
+                      const dateSelected = new Date(value);
+                      const today = new Date();
+                      today.setHours(0, 0, 0, 0);
+
+                      if (value && dateSelected > today)
+                        setStartError("Can't Choose a Future Date");
+                      else setStartError("");
+                    }}
+                  />
+                  {startError && (
+                    <Field.ErrorText>{startError}</Field.ErrorText>
+                  )}
+                </Flex>
+              </Flex>
+            </Field.Root>
+
+            {/* end date */}
+            <Field.Root invalid={!!endError}>
+              <Flex
+                direction="row"
+                w="100%"
+                h="100%"
+                align="center"
+                justify="center"
+              >
+                <Text w="50%" align="center" justify="center" color="gray.700">
+                  End Date
+                </Text>
+                <Flex direction="column" w="100%">
+                  <Input
+                    type="date"
+                    w="100%"
+                    borderRadius="lg"
+                    value={currentSettings?.endDate || ""}
+                    onChange={(e) => {
+                      const value = e.target.value;
+                      updateSettings(widgetId, {
+                        ...currentSettings,
+                        endDate: value,
+                      });
+
+                      const dateSelected = new Date(value);
+                      const today = new Date();
+                      today.setHours(0, 0, 0, 0);
+
+                      if (value && dateSelected > today)
+                        setEndError("Can't Choose a Future Date");
+                      else setEndError("");
+                    }}
+                  />
+                  {endError && <Field.ErrorText>{endError}</Field.ErrorText>}
+                </Flex>
+              </Flex>
+            </Field.Root>
+          </Flex>
+
+          {/* FILTERS */}
+          <CheckboxGroup w="100%">
+            <Flex direction="column" w="100%" gap={2}>
+              <Flex direction="column" w="100%">
+                <Text w="fit" fontWeight="bold">
+                  Filters
+                </Text>
+                <hr /> {/*line seperator*/}
+              </Flex>
+
+              {/* level increases */}
+              <CheckboxCard.Root
+                size="sm"
+                variant="surface"
+                borderRadius="lg"
+                defaultChecked={currentSettings?.filters?.levelIncreases}
+                onCheckedChange={(e) => {
+                  updateSettings(widgetId, {
+                    ...currentSettings,
+                    filters: {
+                      ...currentSettings.filters,
+                      levelIncreases: e.checked,
+                    },
+                  });
+                }}
+              >
+                <CheckboxCard.HiddenInput /> {/* when removed can't check/uncheck box */}
+                <CheckboxCard.Control>
+                  <CheckboxCard.Content>
+                    <CheckboxCard.Label fontWeight={400}>
+                      Level Increases
+                    </CheckboxCard.Label>
+                  </CheckboxCard.Content>
+                  <CheckboxCard.Indicator />
+                </CheckboxCard.Control>
+              </CheckboxCard.Root>
+
+              {/* level decreases */}
+              <CheckboxCard.Root
+                size="sm"
+                variant="surface"
+                borderRadius="lg"
+                defaultChecked={currentSettings?.filters?.levelDecreases}
+                onCheckedChange={(e) => {
+                  updateSettings(widgetId, {
+                    ...currentSettings,
+                    filters: {
+                      ...currentSettings.filters,
+                      levelDecreases: e.checked,
+                    },
+                  });
+                }}
+              >
+                <CheckboxCard.HiddenInput />
+                <CheckboxCard.Control>
+                  <CheckboxCard.Content>
+                    <CheckboxCard.Label fontWeight={400}>
+                      Level Decreases
+                    </CheckboxCard.Label>
+                  </CheckboxCard.Content>
+                  <CheckboxCard.Indicator />
+                </CheckboxCard.Control>
+              </CheckboxCard.Root>
+
+              {/* elevated levels */}
+              <CheckboxCard.Root
+                size="sm"
+                variant="surface"
+                borderRadius="lg"
+                defaultChecked={currentSettings?.filters?.elevatedLevels}
+                onCheckedChange={(e) => {
+                  updateSettings(widgetId, {
+                    ...currentSettings,
+                    filters: {
+                      ...currentSettings.filters,
+                      elevatedLevels: e.checked,
+                    },
+                  });
+                }}
+              >
+                <CheckboxCard.HiddenInput />
+                <CheckboxCard.Control>
+                  <CheckboxCard.Content>
+                    <CheckboxCard.Label fontWeight={400}>
+                      Only Elevated Levels
+                    </CheckboxCard.Label>
+                  </CheckboxCard.Content>
+                  <CheckboxCard.Indicator />
+                </CheckboxCard.Control>
+              </CheckboxCard.Root>
+            </Flex>
+          </CheckboxGroup>
+
+          {/* select volcano to filter on */}
+          <Combobox.Root
+            mt={1}
+            variant="subtle"
+            multiple
+            openOnClick
+            collection={collection}
+            onValueChange={handleValueChange}
+            onInputValueChange={(e) => filter(e.inputValue)}
+          >
+
+            <Wrap gap="2">
+              {selectedVolcanoes.map((volcano) => (
+                <Badge key={volcano}>{volcano}</Badge>
+              ))}
+            </Wrap>
+
+            <Combobox.Label fontSize="xs" >Select Volcano (s)</Combobox.Label>
+
+            <Combobox.Control>
+              <Combobox.Input placeholder="Type to search" borderRadius="lg"/>
+              <Combobox.IndicatorGroup>
+                <Combobox.ClearTrigger />
+                <Combobox.Trigger onClick={reset} />
+              </Combobox.IndicatorGroup>
+            </Combobox.Control>
+            <Portal>
+              <Combobox.Positioner>
+                <Combobox.Content>
+                  {volcanoes.map((item) => (
+                    <Combobox.Item item={item} key={item.value}>
+                      {item.label}
+                      <Combobox.ItemIndicator />
+                    </Combobox.Item>
+                  ))}
+                  <Combobox.Empty>No items found</Combobox.Empty>
+                </Combobox.Content>
+              </Combobox.Positioner>
+            </Portal>
+          </Combobox.Root>
+        </Fieldset.Content>
+      </Fieldset.Root>
     </Flex>
-  )
-}
+  );
+}
+
+const volcanoes = [
+  { label: "Mt. St. Helens", value: "helens" },
+  { label: "Mt. Adams", value: "adams" },
+  { label: "Rainier", value: "rainier" },
+  { label: "The Three Sisters", value: "three sisters" },
+  { label: "Fuego", value: "fuego" },
+  { label: "Laki Laki", value: "lakilaki" },
+  { label: "Lewotobi", value: "lewotobi" },
+  { label: "Karangatang", value: "karangatang" },
+  { label: "Cotopaxi", value: "cotopaxi" },
+  { label: "Merapi", value: "merapi" },
+  { label: "Marapi", value: "marapi" },
+  { label: "Kick 'Em Jenny", value: "kick em jenny"}
+]

client/src/constants/widgetRegistry.jsx

@@ -99,6 +99,12 @@ export const WIDGET_REGISTRY = {
         defaultSettings: {
             startDate: getStartDate(),
             endDate: getEndDate(),
+            filters: {
+                levelIncreases: true,
+                levelDecreases: true,
+                elevatedLevels: false,    // will filter to show only volcanoes in their top 2 highest alert levels
+                volcanoes: 'all', // filter on what volcanoes to display, defaults to 'all' instead of listing every volc
+            },
         },
         allowedSizes: {
             small: { w: 3, h: 6 },

client/src/pages/auth/Login.jsx

@@ -65,7 +65,7 @@ const Login = () => {
 
   return (
       <Flex p={8} bg="gray.50" _dark={{ bg: "gray.900" }} flex="1" minH="100vh" align="center" justify="center">
-        <Box w="full" maxW="450px" bg="white" _dark={{ bg: "gray.800", borderColor: "gray.700" }} p={8} borderRadius="2xl" boxShadow="sm" borderWidth="1px" borderColor="gray.200">
+        <Box w="full" maxW="450px" bg="white" borderColor="gray.200" _dark={{ bg: "gray.800", borderColor: "gray.700" }} p={8} borderRadius="2xl" boxShadow="sm" borderWidth="1px">
           <Stack gap={6} align="stretch" as="form" onSubmit={handleSubmit}>
 
             <Stack gap={2} textAlign="center">
@@ -88,6 +88,7 @@ const Login = () => {
                   onChange={(e) => setUsername(e.target.value)}
                   placeholder="jdoe"
                   {...fieldStyles}
+                  color="gray.800"
               />
             </Field.Root>
 
@@ -102,8 +103,9 @@ const Login = () => {
                   type="password"
                   value={password}
                   onChange={(e) => setPassword(e.target.value)}
-                  placeholder="••••••••"
+                  // placeholder="••••••••" // not a necessary placeholder
                   {...fieldStyles}
+                  color="gray.800"
               />
             </Field.Root>
 

client/src/theme.js

@@ -353,7 +353,7 @@ const glassPopoverRecipe = defineSlotRecipe({
       borderRadius: "xl",
       p: 3,
       boxShadow: "lg",
-      bg: {base: "rgba(255, 255, 255, 0.85)", _dark: "rgba(20, 22, 25, 0.85)"},
+      bg: {base: "rgba(255, 255, 255, 0.95)", _dark: "rgba(20, 22, 25, 0.95)"},
       backdropFilter: "blur(15px)",
       WebkitBackdropFilter: "blur(15px)",
     },
@@ -530,12 +530,13 @@ export const rawWidgetColors = {
    ========================================================================== */
 const config = defineConfig({
   globalCss: {
+    // the shadow box behind widgets when editing layout
     ".react-grid-placeholder": {
       background: "#c0d2e3ff !important",
       borderColor: "#a9b6c2ff !important",
       boxShadow: "0 0 10px #c0d2e3ff !important",
       opacity: "1 !important",
-      borderRadius: "5px",
+      borderRadius: "3xl",
       _dark: {
         background: "#393c3fff !important",
         borderColor: "#000000ff !important",
@@ -543,9 +544,6 @@ const config = defineConfig({
         opacity: "1 !important",
       },
     },
-    ".react-resizable-handle-se": {
-      zIndex: "1",
-    },
     "*": {
       scrollbarWidth: "thin",
       scrollbarColor: "#a0aec0 transparent",
@@ -566,6 +564,7 @@ const config = defineConfig({
     "::-webkit-scrollbar-track": {
       background: "transparent",
     },
+    // this is what changes the maps colors to 'dark mode'
     ".leaflet-control-zoom-in, .leaflet-control-zoom-out, .leaflet-control-attribution, .leaflet-container": {
       _dark: {
         filter: "invert(100%) hue-rotate(180deg) brightness(95%) contrast(90%)",
@@ -574,9 +573,10 @@ const config = defineConfig({
     ".leaflet-container": {
       fontFamily: "system-ui, sans-serif !important",
     },
-    ".react-grid-item": {
-      transition: "none !important"
-    },
+    // removes the animation of moving widgets, seems very harsh and jumpy w/o animation
+    // ".react-grid-item": {
+    //   transition: "none !important"
+    // },
   },
   theme: {
     semanticTokens: {
@@ -584,8 +584,8 @@ const config = defineConfig({
         text: { value: { base: "#000000", _dark: "#FFFFFF" } },
         textInverted: { value: { base: "#000000", _dark: "#FFFFFF" } }, // Fixed: Properly inverted
         MainBackground: { value: { base: "#F9F9F9", _dark: "#141414" } },
-        titleColor: { value: { base: "gray.800", _dark: "#FFFFFF" } },
-        iconColor: { value: { base: "gray.600", _dark: "gray.300" } }, // Fixed: Visible in dark mode
+        titleColor: { value: { base: "colors.gray.800", _dark: "#FFFFFF" } },
+        iconColor: { value: { base: "colors.gray.600", _dark: "colors.gray.300" } }, // Fixed: Visible in dark mode
         glassSeperator: { value: { base: "#0000001A", _dark: "#FFFFFF3F" } },
         gooeyButtonBackground: {value: {base: "rgba(255, 255, 255, 0.1)", _dark: "rgba(255, 255, 255, 0.1)"}},
 
@@ -593,13 +593,13 @@ const config = defineConfig({
         widgetItemBg: { value: { base: "rgba(0, 0, 0, 0.04)", _dark: "rgba(255, 255, 255, 0.05)" } },
         widgetItemExpandedBg: { value: { base: "rgba(0, 0, 0, 0.08)", _dark: "rgba(0, 0, 0, 0.3)" } },
         widgetBadgeBg: { value: { base: "rgba(255, 255, 255, 0.6)", _dark: "rgba(0, 0, 0, 0.5)" } },
-        widgetTextMuted: { value: { base: "gray.600", _dark: "gray.400" } },
+        widgetTextMuted: { value: { base: "colors.gray.600", _dark: "colors.gray.400" } },
 
         // ALERT COLORS
-        alertRed: { value: { base: "red.600", _dark: "red.400" } },
-        alertOrange: { value: { base: "orange.600", _dark: "orange.400" } },
-        alertYellow: { value: { base: "yellow.600", _dark: "yellow.400" } },
-        alertGreen: { value: { base: "green.600", _dark: "green.400" } },
+        alertRed: { value: { base: "colors.red.600", _dark: "colors.red.400" } },
+        alertOrange: { value: { base: "colors.orange.600", _dark: "colors.orange.400" } },
+        alertYellow: { value: { base: "colors.yellow.600", _dark: "colors.yellow.400" } },
+        alertGreen: { value: { base: "colors.green.600", _dark: "colors.green.400" } },
       },
     },
     tokens: {