l-min-components 1.7.1381 → 1.7.1382

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "l-min-components",
-  "version": "1.7.1381",
+  "version": "1.7.1382",
   "type": "module",
   "files": [
     "src/assets",

package/src/components/AppMainLayout/index.jsx

@@ -158,15 +158,22 @@ const AppMainLayout = ({ children }) => {
     if (getDefaultAccount?.data) {
       const date = new Date();
       date.setDate(date.getDate() + 28);
+
+      const domain = window.location.href.includes("localhost")
+        ? "localhost"
+        : window.location.hostname?.includes("ca")
+        ? ".learngual.ca"
+        : ".learngual.com";
+
       document.cookie =
         "defaultAccountID=" +
         getDefaultAccount?.data?.id +
-        `; path=/; expires=${date.toUTCString()};`;
+        `; domain=${domain}; path=/; expires=${date.toUTCString()};`;
 
       document.cookie =
         "defaultAccountType=" +
         getDefaultAccount?.data?.type +
-        `; path=/; expires=${date.toUTCString()};`;
+        `; domain=${domain}; path=/; expires=${date.toUTCString()};`;
 
       localStorage.setItem("defaultLang", getDefaultAccount?.data?.language);
 

package/src/components/header/index.jsx

@@ -10,15 +10,7 @@ import {
 import { ArrowDownIcon } from "./assets/svg/arrow-down";
 import AccountDropdown from "./account-dropdown";
 import avatar from "./assets/images/avatar.png";
-import {
-  Navbar,
-  NavGroup,
-  Nav,
-  SearchInputGroup,
-  SearchInput,
-  UserProfile,
-  Help,
-} from "./index.styled";
+import { Navbar, NavGroup, Nav, UserProfile } from "./index.styled";
 import useHeader from "./getHeaderDetails";
 import { FullPageLoader, OutletContext } from "..";
 import { useLocation } from "react-router-dom";

package/src/components/instructorAccountSwitcher/deleteCookies.jsx

@@ -11,16 +11,23 @@ const deleteCookies = (name) => {
     : "production";
   if (env === "staging") {
     Cookies.remove(name, {
+      domain: window.location.hostname?.includes("ca")
+        ? ".learngual.ca"
+        : ".learngual.com",
       expires: date,
       path: "/",
     });
   } else if (env === "local") {
     Cookies.remove(name, {
+      domain: "localhost",
       expires: date,
       path: "/",
     });
   } else {
     Cookies.remove(name, {
+      domain: window.location.hostname?.includes("ca")
+        ? ".learngual.ca"
+        : ".learngual.com",
       expires: date,
       path: "/",
     });

package/src/components/sideBar/sideMenu/index.jsx

@@ -83,11 +83,10 @@ const SideMenu = ({
   }, [affiliatesActive, filteredRoutes]);
 
   // Right bars
-  const EnterpriseRight = <EnterpriseRightBar />;
-  const InstructorRight = <InstructorRightBar />;
+  // const EnterpriseRight = <EnterpriseRightBar />;
+  // const InstructorRight = <InstructorRightBar />;
 
   const renderNavigationItem = (route, index) => {
-    console.log(route, "route");
     let notificationCount;
     const { icon, iconActive, text, notifications, path, affiliates, newTab } =
       route;

package/src/components/sideBar/userCard/index.jsx

@@ -20,19 +20,25 @@ const UserCard = ({ isOpen, findText }) => {
   useEffect(() => {
     if (generalData?.selectedAccount) {
       const date = new Date();
+      const domain = window.location.href.includes("localhost")
+        ? "localhost"
+        : window.location.hostname?.includes("ca")
+        ? ".learngual.ca"
+        : ".learngual.com";
+
       date.setDate(date.getDate() + 28);
       document.cookie =
         "activeDeveloperAccount=" +
         generalData?.selectedAccount?.id +
-        `; path=/; expires=${date.toUTCString()};`;
+        `; path=/; domain=${domain}; expires=${date.toUTCString()};`;
       document.cookie =
         "defaultAccountID=" +
         generalData?.selectedAccount?.id +
-        `; path=/; expires=${date.toUTCString()};`;
+        `; path=/; domain=${domain}; expires=${date.toUTCString()};`;
       document.cookie =
         "defaultAccountType=" +
         generalData?.selectedAccount?.type +
-        `; path=/; expires=${date.toUTCString()};`;
+        `; path=/; domain=${domain}; expires=${date.toUTCString()};`;
 
       handleSetDefaultAccount(generalData?.selectedAccount?.id);
 
@@ -45,7 +51,6 @@ const UserCard = ({ isOpen, findText }) => {
       }
     }
   }, [generalData]);
-  console.log(generalData, "data...");
 
   return (
     <UserCardContainer isOpen={isOpen}>

package/src/components/sideNav/index.jsx

@@ -24,16 +24,23 @@ const SideBar = ({ routes, findText }) => {
       : "production";
     if (env === "staging") {
       Cookies.remove(name, {
+        domain: window.location.hostname?.includes("ca")
+          ? ".learngual.ca"
+          : ".learngual.com",
         expires: date,
         path: "/",
       });
     } else if (env === "local") {
       Cookies.remove(name, {
+        domain: "localhost",
         expires: date,
         path: "/",
       });
     } else {
       Cookies.remove(name, {
+        domain: window.location.hostname?.includes("ca")
+          ? ".learngual.ca"
+          : ".learngual.com",
         expires: date,
         path: "/",
       });

package/src/hooks/leftNavMenu.jsx

@@ -83,7 +83,9 @@ export const leftNavMenu = [
     icon: <DictionaryIcon />,
   },
   {
-    path: "https://demo.learngual.com/type-select",
+    path: window.location.hostname.includes("ca")
+      ? "https://demo.learngual.ca/type-select"
+      : "https://demo.learngual.com/type-select",
     label: "Demo",
     icon: <CompuetrerIcon />,
   },
@@ -92,7 +94,9 @@ export const leftNavMenu = [
 export const getLeftRoutes = (accoutType) => {
   const leftNavMenu = [
     {
-      path: `https://www.learngual.com/${accoutType}`,
+      path: window.location.hostname.includes("ca")
+        ? `https://www.learngual.ca/${accoutType}`
+        : `https://www.learngual.com/${accoutType}`,
       label: "Learning",
       icon: <Learning />,
     },
@@ -122,7 +126,9 @@ export const getLeftRoutes = (accoutType) => {
       icon: <DictionaryIcon />,
     },
     {
-      path: "https://demo.learngual.com/type-select",
+      path: window.location.hostname.includes("ca")
+        ? "https://demo.learngual.ca/type-select"
+        : "https://demo.learngual.com/type-select",
       label: "Demo",
       icon: <CompuetrerIcon />,
     },

package/src/utils/deleteCookies.js

@@ -5,8 +5,8 @@ import Cookies from "js-cookie";
  * @param {string} name - Cookie name to delete
  * @param {Object} options - Cookie options (domain, expires, path)
  */
-const deleteSingleCookie = (name, options) => {
-  Cookies.remove(name, options);
+const deleteSingleCookie = (domain, name, options) => {
+  Cookies.remove(domain, name, options);
 };
 
 /**
@@ -30,16 +30,24 @@ const deleteCookies = (names) => {
   cookieNames.forEach((name) => {
     if (env === "local") {
       // For local environment
-      deleteSingleCookie(name, {
+      deleteSingleCookie("localhost", name, {
         expires: date,
         path: "/",
       });
     } else {
       // For staging and production environments
-      deleteSingleCookie(name, {
-        expires: date,
-        path: "/",
-      });
+      deleteSingleCookie(
+        window.location.href.includes("localhost")
+          ? "localhost"
+          : window.location.hostname?.includes("ca")
+          ? ".learngual.ca"
+          : ".learngual.com",
+        name,
+        {
+          expires: date,
+          path: "/",
+        }
+      );
     }
   });
 };