jett.admin.npmpackage 2.0.4 → 2.0.5

package/dist/index.css

@@ -1279,11 +1279,6 @@
       color: var(--color-red-100);
     }
   }
-  .dark\:text-red-400 {
-    &:where(.dark, .dark *) {
-      color: var(--color-red-400);
-    }
-  }
   .dark\:text-white {
     &:where(.dark, .dark *) {
       color: var(--color-white);

package/dist/index.js

@@ -627,9 +627,6 @@ var additionalItemsConstant = [
   }
 ];
 
-// src/assests/logo/logo-white.svg
-var logo_white_default = "./logo-white-RYMEJOWI.svg";
-
 // src/sideBar/SideBar.jsx
 var import_js_cookie = __toESM(require("js-cookie"));
 
@@ -720,6 +717,54 @@ var CustomSelect = ({
   );
 };
 
+// src/utils/cookieHelpers.js
+var JETT_ID_COOKIE_NAME = "jett-id";
+function getCookie(name) {
+  if (typeof document === "undefined" || !document.cookie) return null;
+  const match = document.cookie.match(
+    new RegExp("(^|\\s)" + name + "=([^;]+)")
+  );
+  return match ? decodeURIComponent(match[2].trim()) : null;
+}
+function decodeBase64(value) {
+  try {
+    let base64 = value.replace(/-/g, "+").replace(/_/g, "/");
+    const pad = base64.length % 4;
+    if (pad) base64 += "=".repeat(4 - pad);
+    return atob(base64);
+  } catch {
+    return "";
+  }
+}
+function getJettIdCookieData() {
+  const raw = getCookie(JETT_ID_COOKIE_NAME);
+  if (!raw) return null;
+  try {
+    const decoded = decodeBase64(raw);
+    if (!decoded) return null;
+    const data = JSON.parse(decoded);
+    return data && typeof data === "object" ? data : null;
+  } catch {
+    return null;
+  }
+}
+function getLogoFromJettIdCookie() {
+  const data = getJettIdCookieData();
+  if (!(data == null ? void 0 : data.CDNBasePath)) return null;
+  const logoPath = (data.OrgLogo || data.TmcLogo || "").trim();
+  if (!logoPath) return null;
+  return {
+    logoPath,
+    CDNBasePath: data.CDNBasePath
+  };
+}
+function buildLogoUrl(CDNBasePath, logoPath) {
+  const base = (CDNBasePath || "").replace(/\/$/, "");
+  const path = (logoPath || "").replace(/^\//, "");
+  if (!base || !path) return "";
+  return `${base}/${path}`;
+}
+
 // src/sideBar/SideBar.jsx
 var AppSideBar = ({
   username,
@@ -728,7 +773,7 @@ var AppSideBar = ({
   additionalItems,
   sideBarLogo
 }) => {
-  var _a, _b;
+  var _a, _b, _c, _d;
   const [authData, setAuthData] = (0, import_react12.useState)(null);
   const [selectedCountry, setSelectedCountry] = (0, import_react12.useState)("dubai");
   const [isMobileMenuOpen, setIsMobileMenuOpen] = (0, import_react12.useState)(false);
@@ -947,7 +992,13 @@ var AppSideBar = ({
   };
   const navItemsLocal = navItems ?? navItemsConstant;
   const additionalItemsLocal = additionalItems ?? additionalItemsConstant;
-  const sideBarLogoLocal = sideBarLogo ?? logo_white_default;
+  const logoFromCookie = getLogoFromJettIdCookie();
+  const logoUrlFromCookie = logoFromCookie ? buildLogoUrl(logoFromCookie.CDNBasePath, logoFromCookie.logoPath) : null;
+  const logoUrlFromUserInfo = ((_a = authData == null ? void 0 : authData.userInfo) == null ? void 0 : _a.CDNBasePath) && ((_b = authData == null ? void 0 : authData.userInfo) == null ? void 0 : _b.OrgLogo) ? buildLogoUrl(
+    authData.userInfo.CDNBasePath,
+    authData.userInfo.OrgLogo
+  ) : null;
+  const sideBarLogoLocal = sideBarLogo ?? logoUrlFromCookie ?? logoUrlFromUserInfo ?? null;
   const detectAndSetActiveMenu = (0, import_react12.useCallback)(() => {
     const currentPath = window.location.pathname;
     const currentSearch = window.location.search;
@@ -1034,10 +1085,10 @@ var AppSideBar = ({
       "aria-label": "Toggle menu"
     },
     isMobileMenuOpen ? /* @__PURE__ */ import_react12.default.createElement(import_lucide_react6.X, { className: "w-6 h-6 text-gray-700 dark:text-[#f4f4f5cc]" }) : /* @__PURE__ */ import_react12.default.createElement(import_lucide_react6.Menu, { className: "w-6 h-6 text-gray-700 dark:text-[#f4f4f5cc]" })
-  ), /* @__PURE__ */ import_react12.default.createElement("div", { className: "flex-1 flex justify-center" }, sideBarLogo && /* @__PURE__ */ import_react12.default.createElement(
+  ), /* @__PURE__ */ import_react12.default.createElement("div", { className: "flex-1 flex justify-center" }, sideBarLogoLocal && /* @__PURE__ */ import_react12.default.createElement(
     "img",
     {
-      src: sideBarLogo,
+      src: sideBarLogoLocal,
       alt: "sidebarLogo",
       width: 108,
       height: 40,
@@ -1054,10 +1105,10 @@ var AppSideBar = ({
     {
       className: `fixed top-0 left-0 md:relative w-[320px] transition-all ease-in-out delay-100 bg-white dark:bg-[#18181b] border-r border-gray-200 dark:border-[#303036] flex flex-col p-4 pt-20 md:pt-4 h-full max-h-[100vh] xs:max-md:z-40 md:max-lg:w-[280px] ${isMobileMenuOpen ? "translate-x-0" : "-translate-x-full md:translate-x-0"}`
     },
-    /* @__PURE__ */ import_react12.default.createElement("div", { className: "p-2 mb-2 hidden md:block" }, /* @__PURE__ */ import_react12.default.createElement("div", { className: "flex items-center justify-center w-full h-[60px] mb-2" }, sideBarLogo && /* @__PURE__ */ import_react12.default.createElement(
+    /* @__PURE__ */ import_react12.default.createElement("div", { className: "p-2 mb-2 hidden md:block" }, /* @__PURE__ */ import_react12.default.createElement("div", { className: "flex items-center justify-center w-full h-[60px] mb-2" }, sideBarLogoLocal && /* @__PURE__ */ import_react12.default.createElement(
       "img",
       {
-        src: sideBarLogo,
+        src: sideBarLogoLocal,
         alt: "sidebarLogo",
         width: 108,
         height: 40,
@@ -1138,7 +1189,7 @@ var AppSideBar = ({
           window.location.href = "/profile";
         }
       },
-      /* @__PURE__ */ import_react12.default.createElement("div", { className: "flex items-center gap-3" }, /* @__PURE__ */ import_react12.default.createElement("span", { className: "relative flex shrink-0 overflow-hidden dark:bg-[#27272a] rounded-full h-10 w-10" }, /* @__PURE__ */ import_react12.default.createElement("span", { className: "flex h-full w-full items-center justify-center !text-[16px] !font-normal border border-gray-200 dark:border-[#303036] rounded-full bg-muted dark:text-white" }, ((_a = authData == null ? void 0 : authData.userInfo) == null ? void 0 : _a.UserName) ? authData.userInfo.UserName.split("")[0] : "A")), /* @__PURE__ */ import_react12.default.createElement("div", null, /* @__PURE__ */ import_react12.default.createElement("p", { className: "!font-semibold dark:text-white !text-[16px]" }, ((_b = authData == null ? void 0 : authData.userInfo) == null ? void 0 : _b.UserName) ? authData.userInfo.UserName : "Admin"), /* @__PURE__ */ import_react12.default.createElement("p", { className: "!text-[14px] !font-normal dark:text-[#f4f4f5cc]" }, role)))
+      /* @__PURE__ */ import_react12.default.createElement("div", { className: "flex items-center gap-3" }, /* @__PURE__ */ import_react12.default.createElement("span", { className: "relative flex shrink-0 overflow-hidden dark:bg-[#27272a] rounded-full h-10 w-10" }, /* @__PURE__ */ import_react12.default.createElement("span", { className: "flex h-full w-full items-center justify-center !text-[16px] !font-normal border border-gray-200 dark:border-[#303036] rounded-full bg-muted dark:text-white" }, ((_c = authData == null ? void 0 : authData.userInfo) == null ? void 0 : _c.UserName) ? authData.userInfo.UserName.split("")[0] : "A")), /* @__PURE__ */ import_react12.default.createElement("div", null, /* @__PURE__ */ import_react12.default.createElement("p", { className: "!font-semibold dark:text-white !text-[16px]" }, ((_d = authData == null ? void 0 : authData.userInfo) == null ? void 0 : _d.UserName) ? authData.userInfo.UserName : "Admin"), /* @__PURE__ */ import_react12.default.createElement("p", { className: "!text-[14px] !font-normal dark:text-[#f4f4f5cc]" }, role)))
     ))
   ));
 };

package/dist/index.mjs

@@ -594,9 +594,6 @@ var additionalItemsConstant = [
   }
 ];
 
-// src/assests/logo/logo-white.svg
-var logo_white_default = "./logo-white-RYMEJOWI.svg";
-
 // src/sideBar/SideBar.jsx
 import Cookies from "js-cookie";
 
@@ -687,6 +684,54 @@ var CustomSelect = ({
   );
 };
 
+// src/utils/cookieHelpers.js
+var JETT_ID_COOKIE_NAME = "jett-id";
+function getCookie(name) {
+  if (typeof document === "undefined" || !document.cookie) return null;
+  const match = document.cookie.match(
+    new RegExp("(^|\\s)" + name + "=([^;]+)")
+  );
+  return match ? decodeURIComponent(match[2].trim()) : null;
+}
+function decodeBase64(value) {
+  try {
+    let base64 = value.replace(/-/g, "+").replace(/_/g, "/");
+    const pad = base64.length % 4;
+    if (pad) base64 += "=".repeat(4 - pad);
+    return atob(base64);
+  } catch {
+    return "";
+  }
+}
+function getJettIdCookieData() {
+  const raw = getCookie(JETT_ID_COOKIE_NAME);
+  if (!raw) return null;
+  try {
+    const decoded = decodeBase64(raw);
+    if (!decoded) return null;
+    const data = JSON.parse(decoded);
+    return data && typeof data === "object" ? data : null;
+  } catch {
+    return null;
+  }
+}
+function getLogoFromJettIdCookie() {
+  const data = getJettIdCookieData();
+  if (!(data == null ? void 0 : data.CDNBasePath)) return null;
+  const logoPath = (data.OrgLogo || data.TmcLogo || "").trim();
+  if (!logoPath) return null;
+  return {
+    logoPath,
+    CDNBasePath: data.CDNBasePath
+  };
+}
+function buildLogoUrl(CDNBasePath, logoPath) {
+  const base = (CDNBasePath || "").replace(/\/$/, "");
+  const path = (logoPath || "").replace(/^\//, "");
+  if (!base || !path) return "";
+  return `${base}/${path}`;
+}
+
 // src/sideBar/SideBar.jsx
 var AppSideBar = ({
   username,
@@ -695,7 +740,7 @@ var AppSideBar = ({
   additionalItems,
   sideBarLogo
 }) => {
-  var _a, _b;
+  var _a, _b, _c, _d;
   const [authData, setAuthData] = useState3(null);
   const [selectedCountry, setSelectedCountry] = useState3("dubai");
   const [isMobileMenuOpen, setIsMobileMenuOpen] = useState3(false);
@@ -914,7 +959,13 @@ var AppSideBar = ({
   };
   const navItemsLocal = navItems ?? navItemsConstant;
   const additionalItemsLocal = additionalItems ?? additionalItemsConstant;
-  const sideBarLogoLocal = sideBarLogo ?? logo_white_default;
+  const logoFromCookie = getLogoFromJettIdCookie();
+  const logoUrlFromCookie = logoFromCookie ? buildLogoUrl(logoFromCookie.CDNBasePath, logoFromCookie.logoPath) : null;
+  const logoUrlFromUserInfo = ((_a = authData == null ? void 0 : authData.userInfo) == null ? void 0 : _a.CDNBasePath) && ((_b = authData == null ? void 0 : authData.userInfo) == null ? void 0 : _b.OrgLogo) ? buildLogoUrl(
+    authData.userInfo.CDNBasePath,
+    authData.userInfo.OrgLogo
+  ) : null;
+  const sideBarLogoLocal = sideBarLogo ?? logoUrlFromCookie ?? logoUrlFromUserInfo ?? null;
   const detectAndSetActiveMenu = useCallback(() => {
     const currentPath = window.location.pathname;
     const currentSearch = window.location.search;
@@ -1001,10 +1052,10 @@ var AppSideBar = ({
       "aria-label": "Toggle menu"
     },
     isMobileMenuOpen ? /* @__PURE__ */ React12.createElement(X, { className: "w-6 h-6 text-gray-700 dark:text-[#f4f4f5cc]" }) : /* @__PURE__ */ React12.createElement(Menu, { className: "w-6 h-6 text-gray-700 dark:text-[#f4f4f5cc]" })
-  ), /* @__PURE__ */ React12.createElement("div", { className: "flex-1 flex justify-center" }, sideBarLogo && /* @__PURE__ */ React12.createElement(
+  ), /* @__PURE__ */ React12.createElement("div", { className: "flex-1 flex justify-center" }, sideBarLogoLocal && /* @__PURE__ */ React12.createElement(
     "img",
     {
-      src: sideBarLogo,
+      src: sideBarLogoLocal,
       alt: "sidebarLogo",
       width: 108,
       height: 40,
@@ -1021,10 +1072,10 @@ var AppSideBar = ({
     {
       className: `fixed top-0 left-0 md:relative w-[320px] transition-all ease-in-out delay-100 bg-white dark:bg-[#18181b] border-r border-gray-200 dark:border-[#303036] flex flex-col p-4 pt-20 md:pt-4 h-full max-h-[100vh] xs:max-md:z-40 md:max-lg:w-[280px] ${isMobileMenuOpen ? "translate-x-0" : "-translate-x-full md:translate-x-0"}`
     },
-    /* @__PURE__ */ React12.createElement("div", { className: "p-2 mb-2 hidden md:block" }, /* @__PURE__ */ React12.createElement("div", { className: "flex items-center justify-center w-full h-[60px] mb-2" }, sideBarLogo && /* @__PURE__ */ React12.createElement(
+    /* @__PURE__ */ React12.createElement("div", { className: "p-2 mb-2 hidden md:block" }, /* @__PURE__ */ React12.createElement("div", { className: "flex items-center justify-center w-full h-[60px] mb-2" }, sideBarLogoLocal && /* @__PURE__ */ React12.createElement(
       "img",
       {
-        src: sideBarLogo,
+        src: sideBarLogoLocal,
         alt: "sidebarLogo",
         width: 108,
         height: 40,
@@ -1105,7 +1156,7 @@ var AppSideBar = ({
           window.location.href = "/profile";
         }
       },
-      /* @__PURE__ */ React12.createElement("div", { className: "flex items-center gap-3" }, /* @__PURE__ */ React12.createElement("span", { className: "relative flex shrink-0 overflow-hidden dark:bg-[#27272a] rounded-full h-10 w-10" }, /* @__PURE__ */ React12.createElement("span", { className: "flex h-full w-full items-center justify-center !text-[16px] !font-normal border border-gray-200 dark:border-[#303036] rounded-full bg-muted dark:text-white" }, ((_a = authData == null ? void 0 : authData.userInfo) == null ? void 0 : _a.UserName) ? authData.userInfo.UserName.split("")[0] : "A")), /* @__PURE__ */ React12.createElement("div", null, /* @__PURE__ */ React12.createElement("p", { className: "!font-semibold dark:text-white !text-[16px]" }, ((_b = authData == null ? void 0 : authData.userInfo) == null ? void 0 : _b.UserName) ? authData.userInfo.UserName : "Admin"), /* @__PURE__ */ React12.createElement("p", { className: "!text-[14px] !font-normal dark:text-[#f4f4f5cc]" }, role)))
+      /* @__PURE__ */ React12.createElement("div", { className: "flex items-center gap-3" }, /* @__PURE__ */ React12.createElement("span", { className: "relative flex shrink-0 overflow-hidden dark:bg-[#27272a] rounded-full h-10 w-10" }, /* @__PURE__ */ React12.createElement("span", { className: "flex h-full w-full items-center justify-center !text-[16px] !font-normal border border-gray-200 dark:border-[#303036] rounded-full bg-muted dark:text-white" }, ((_c = authData == null ? void 0 : authData.userInfo) == null ? void 0 : _c.UserName) ? authData.userInfo.UserName.split("")[0] : "A")), /* @__PURE__ */ React12.createElement("div", null, /* @__PURE__ */ React12.createElement("p", { className: "!font-semibold dark:text-white !text-[16px]" }, ((_d = authData == null ? void 0 : authData.userInfo) == null ? void 0 : _d.UserName) ? authData.userInfo.UserName : "Admin"), /* @__PURE__ */ React12.createElement("p", { className: "!text-[14px] !font-normal dark:text-[#f4f4f5cc]" }, role)))
     ))
   ));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jett.admin.npmpackage",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "exports": {