Merge branch 'main' into 'add/widgets/theme'

# Conflicts:
#   client/src/App.jsx

client/src/components/layout/Sidebar/Sidebar.jsx

@@ -57,19 +57,19 @@ export const Users = createIcon({
   ),
 });
 
-export default function Sidebar() {
+export default function Sidebar({ onChangeView }) {
   const [isOpen, setIsOpen] = useState(true);
+  const [activeButton, setActiveButton] = useState(0)
 
     // this list of btns will come from the db (not every usr will have access to admin)
   const buttons = [
-    {icon: PushPin, name: "Dashboard"},
-    {icon: Globe, name: "Global Map"},
-    {icon: MapMarker, name: "Regional Map"},
-    {icon: FaVolcano, name: "Volcano"},
-    {icon: Users, name: "Admin"}
+    {icon: PushPin, name: "Dashboard", view: "widget"},
+    {icon: Globe, name: "Global Map", view: "global"},
+    {icon: MapMarker, name: "Regional Map", view: "regional"},
+    {icon: FaVolcano, name: "Volcano", view: "volcano"},
+    {icon: Users, name: "Admin", view: "admin"}
   ];
   
-  const [activeButton, setActiveButton] = useState(0)
   const recipe = useSlotRecipe({ key: "sidebar" });
   const styles = recipe();
 
@@ -99,7 +99,10 @@ export default function Sidebar() {
         return (
           <Button key={idx} 
                   css={styles.buttons} 
-                  onClick={() => setActiveButton(idx)} 
+                  onClick={() => {
+                    setActiveButton(idx);
+                    onChangeView(button.view); // Trigger state change in Dashboard
+                  }} 
                   bg={activeButton === idx ? "primary":undefined} 
                   justifyContent="flex-start"
           >