Fix/embed

client/src/app/(embed)/embed/page.tsx

@@ -1,9 +1,17 @@
+"use client";
 import CountryDetail from "@/containers/countries/countries-detail";
+import Popup from "@/containers/popup";
+
+import { useSyncCountry } from "@/app/store";
 
 export default function EmbedPage() {
+  const [country] = useSyncCountry();
+
   return (
-    <div className="max-w-md xl:max-w-xl 2xl:max-w-4xl">
-      <CountryDetail embed />
-    </div>
+    <Popup visibleKey={country} className="left-0 z-10">
+      <div className=" max-w-md xl:max-w-xl 2xl:max-w-4xl">
+        <CountryDetail embed />
+      </div>
+    </Popup>
   );
 }

client/src/app/api/auth/[...nextauth]/options.ts

@@ -53,9 +53,11 @@ export const authOptions: AuthOptions = {
 
       const sessionToken = session.sessionToken ?? token;
 
-      if (sessionToken && decoded.iat) {
+      if (sessionToken) {
         const now = new Date().getTime();
-        const exp = decoded.iat * 1000 + SESSION_MAX_AGE * 1000;
+        const exp = decoded.iat
+          ? decoded.iat * 1000 + SESSION_MAX_AGE * 1000
+          : SESSION_MAX_AGE * 1000;
 
         if (now < exp) {
           return {

client/src/containers/popup/index.tsx

@@ -9,7 +9,8 @@ import { cn } from "@/lib/classnames";
 const Popup = ({
   visibleKey,
   children,
-}: PropsWithChildren<{ visibleKey: string | number | null }>): JSX.Element => {
+  className,
+}: PropsWithChildren<{ visibleKey: string | number | null; className?: string }>): JSX.Element => {
   const [open, setOpen] = useState(false);
 
   const toggleOpen = () => setOpen((prev) => !prev);
@@ -25,6 +26,7 @@ const Popup = ({
           true,
         "-translate-x-full": !open && visibleKey,
         "translate-x-0": open && visibleKey,
+        [className || ""]: !!className,
       })}
     >
       <div className="relative z-10 h-full max-h-screen w-full overflow-auto rounded-br-3xl bg-white">

client/src/containers/welcome-message/index.tsx

@@ -15,6 +15,7 @@ import { useGetWelcomeMessage } from "@/types/generated/welcome-message";
 
 import { Button } from "@/components/ui/button";
 import { Dialog, DialogContent } from "@/components/ui/dialog";
+import isEmpty from "lodash-es/isEmpty";
 
 export default function WelcomeMessage() {
   const videoRef = useRef<ReactPlayer>(null);
@@ -40,7 +41,7 @@ export default function WelcomeMessage() {
   const handleFullscreen = () => {
     setFullscreen(screenfull?.isFullscreen);
   };
-
+  
   useEffect(() => {
     if (screenfull.isEnabled) {
       screenfull.on("change", handleFullscreen);

cms/config/sync/user-role.admin.json

@@ -430,4 +430,4 @@
       "action": "plugin::users-permissions.user.update"
     }
   ]
-}
+}

cms/config/sync/user-role.authenticated.json

@@ -195,9 +195,6 @@
     {
       "action": "plugin::email.email.send"
     },
-    {
-      "action": "plugin::import-export-entries.export.exportData"
-    },
     {
       "action": "plugin::import-export-entries.import.importData"
     },
@@ -253,4 +250,4 @@
       "action": "plugin::users-permissions.user.update"
     }
   ]
-}
+}

cms/config/sync/user-role.contributor.json

@@ -207,9 +207,6 @@
     {
       "action": "plugin::content-type-builder.content-types.getContentTypes"
     },
-    {
-      "action": "plugin::import-export-entries.export.exportData"
-    },
     {
       "action": "plugin::import-export-entries.import.importData"
     },
@@ -277,4 +274,4 @@
       "action": "plugin::users-permissions.user.update"
     }
   ]
-}
+}