Merge branch 'main' of http://192.168.1.163:3000/inmake/stream.graff.tech-new

client/src/pages/HomePage.tsx

@@ -4,7 +4,13 @@ import { useMe, useLogout } from "../hooks/useAuth";
 import { useNavigate } from "react-router";
 import ShareFilledIcon from "../components/icons/ShareFilledIcon";
 import usePopupStore from "../store/popupStore";
+<<<<<<< HEAD
 import ParticipantsPopup from "../components/popups/ParticipantsPopup";
+=======
+import SettingsModal from "../components/modals/SettingsModal";
+import useModalStore from "../store/modalStore";
+import CogFilledIcon from "../components/icons/CogFilledIcon";
+>>>>>>> 79fb7f2748fcb76e887daa397ff450afc389a2b3
 
 function HomePage() {
   const { data: user } = useMe();
@@ -17,6 +23,7 @@ function HomePage() {
   };
 
   const { setPopup } = usePopupStore();
+  const { setModal } = useModalStore();
 
   return (
     <div className="py-8 min-h-screen bg-gray-50">
@@ -28,13 +35,30 @@ function HomePage() {
 
           <FloatingActionButton
             variant="default"
+<<<<<<< HEAD
             onClick={() => setPopup(<ParticipantsPopup />)}
+=======
+            onClick={() =>
+              setPopup(
+                <SharePopup link={"https://estate.stream/ahdy12jdco1"} />
+              )
+            }
+>>>>>>> 79fb7f2748fcb76e887daa397ff450afc389a2b3
           >
             <div className="2xl:size-[1.111vw] size-4 text-white">
               <ShareFilledIcon />
             </div>
           </FloatingActionButton>
 
+          <FloatingActionButton
+            variant="default"
+            onClick={() => setModal(<SettingsModal />)}
+          >
+            <div className="2xl:size-[1.111vw] size-4 text-white">
+              <CogFilledIcon />
+            </div>
+          </FloatingActionButton>
+
           <div className="space-y-4">
             <div className="p-4 bg-blue-50 rounded-lg border border-blue-200">
               <h2 className="mb-2 text-xl font-semibold">