l-min-components 1.0.1135 → 1.0.1137

package/package.json

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

package/src/components/AppMainLayout/index.jsx

@@ -218,8 +218,6 @@ const AppMainLayout = ({ children }) => {
     translateData,
   } = useTranslation(wordBank);
 
-  // use this to check if we're on the demo app and remove most of the navbar items except the demo icon and text
-  const isDemo = window.location.hostname.includes("demo");
   return (
     <OutletContext.Provider
       value={{
@@ -275,7 +273,7 @@ const AppMainLayout = ({ children }) => {
               <MainLayout coming={coming}>
                 <LeftLayout>
                   <SideBar routes={leftNavMenu} findText={findText} />
-                  {!coming && !isDemo && (
+                  {!coming && (
                     <>
                       {sideMenuLayout && (
                         <SideMenu
@@ -328,7 +326,7 @@ const AppMainLayout = ({ children }) => {
                   )}
                 </CenterLayout>
 
-                {rightLayout && !coming && !isDemo && (
+                {rightLayout && !coming && (
                   <RightLayout>
                     {rightComponent ??
                       (window.location.pathname.includes("enterprise") &&

package/src/components/header/index.jsx

@@ -312,16 +312,17 @@ const HeaderComponent = (props) => {
     window.location.pathname.includes("developer");
 
   // Determine the label based on the current path
+  const hostname = window.location.hostname;
+
   const getNavLinkLabel = () => {
     const path = window.location.pathname;
-    const hostname = window.location.hostname;
     if (path.includes("fun")) return "Fun";
     if (path.includes("community")) return "Community";
     if (path.includes("explore")) return "Explore";
     if (path.includes("connect")) return "Connect";
     if (path.includes("dictionary")) return "Dictionary";
     if (hostname.includes("demo")) return "Demo";
-    return props.findText("Learning");
+    return "Learning";
   };
   const getNavLinkIcon = () => {
     const path = window.location.pathname;
@@ -444,9 +445,6 @@ const HeaderComponent = (props) => {
 
   const value = localStorage.getItem("defaultLang");
 
-  // use this to check if we're on the demo app and remove most of the navbar items except the demo icon and text
-  const isDemo = window.location.hostname.includes("demo");
-
   return (
     <Navbar>
       <img src={logo} alt="Learngual logo" />
@@ -462,65 +460,63 @@ const HeaderComponent = (props) => {
           </a>
         </li>
 
-        {!isDemo && (
-          <>
-            <li>
-              <a
-                onClick={() => {
+        <>
+          <li>
+            <a
+              onClick={() => {
+                window.location.hostname.includes("coming")
+                  ? (window.location.href =
+                      "https://www.learngual.com/settings/account")
+                  : (window.location.href = "/settings/account");
+              }}
+              className={
+                window.location.pathname.includes("settings") ? "active" : ""
+              }
+              style={{ cursor: "pointer" }}
+            >
+              <SettingIcon /> {props.findText("Settings")}
+            </a>
+          </li>
+          <li>
+            <a
+              // href={`https://559staging.learngual.com/${
+              //   selectedAccount?.type
+              //     ? selectedAccount?.type?.toLowerCase()
+              //     : userAccountsDetail?.data?.[0]?.type?.toLowerCase()
+              // }/notifications/`}
+
+              onClick={(e) => {
+                if (isPendingDelete) {
+                  e.preventDefault();
+                  e.stopPropagation();
+                } else {
                   window.location.hostname.includes("coming")
-                    ? (window.location.href =
-                        "https://www.learngual.com/settings/account")
-                    : (window.location.href = "/settings/account");
-                }}
-                className={
-                  window.location.pathname.includes("settings") ? "active" : ""
+                    ? (window.location.href = `https://www.learngual.com/auth/sign-in`)
+                    : (window.location.href = `/${
+                        selectedAccount?.type
+                          ? selectedAccount?.type?.toLowerCase()
+                          : userAccountsDetail?.data?.[0]?.type?.toLowerCase()
+                      }/notifications/`);
                 }
-                style={{ cursor: "pointer" }}
-              >
-                <SettingIcon /> {props.findText("Settings")}
-              </a>
-            </li>
-            <li>
-              <a
-                // href={`https://559staging.learngual.com/${
-                //   selectedAccount?.type
-                //     ? selectedAccount?.type?.toLowerCase()
-                //     : userAccountsDetail?.data?.[0]?.type?.toLowerCase()
-                // }/notifications/`}
-
-                onClick={(e) => {
-                  if (isPendingDelete) {
-                    e.preventDefault();
-                    e.stopPropagation();
-                  } else {
-                    window.location.hostname.includes("coming")
-                      ? (window.location.href = `https://www.learngual.com/auth/sign-in`)
-                      : (window.location.href = `/${
-                          selectedAccount?.type
-                            ? selectedAccount?.type?.toLowerCase()
-                            : userAccountsDetail?.data?.[0]?.type?.toLowerCase()
-                        }/notifications/`);
-                  }
-                }}
-                className={
-                  window.location.pathname.includes("notifications")
-                    ? "active"
-                    : isPendingDelete
-                    ? "disabled"
-                    : ""
-                }
-                style={{ cursor: isPendingDelete ? "not-allowed" : "pointer" }}
-              >
-                {unreadNotificationData?.data?.count > 0 ? (
-                  <NotificationIcon />
-                ) : (
-                  <NotificationEmptyIcon />
-                )}
-                {props.findText("Notifications")}
-              </a>
-            </li>
-          </>
-        )}
+              }}
+              className={
+                window.location.pathname.includes("notifications")
+                  ? "active"
+                  : isPendingDelete
+                  ? "disabled"
+                  : ""
+              }
+              style={{ cursor: isPendingDelete ? "not-allowed" : "pointer" }}
+            >
+              {unreadNotificationData?.data?.count > 0 ? (
+                <NotificationIcon />
+              ) : (
+                <NotificationEmptyIcon />
+              )}
+              {props.findText("Notifications")}
+            </a>
+          </li>
+        </>
         {/* <li style={{ marginLeft: "20%", cursor: "pointer" }}>
           <a
             onClick={() => {
@@ -541,14 +537,13 @@ const HeaderComponent = (props) => {
 
       </Help> */}
 
-      {!isDemo && (
-        <NavGroup
-          onClick={() => {
-            setLanguageDropdown();
-            setIsOpen();
-          }}
-        >
-          {/* {(!isDeveloper || !window.location.hostname.includes("coming")) && ( // when developer and on staging, don't show
+      <NavGroup
+        onClick={() => {
+          setLanguageDropdown();
+          setIsOpen();
+        }}
+      >
+        {/* {(!isDeveloper || !window.location.hostname.includes("coming")) && ( // when developer and on staging, don't show
           <SearchInputGroup>
             <SearchIcon />
             <SearchInput
@@ -570,96 +565,90 @@ const HeaderComponent = (props) => {
           </SearchInputGroup>
         )} */}
 
+        <div className="language_dropdown" onClick={(e) => e.stopPropagation()}>
           <div
-            className="language_dropdown"
-            onClick={(e) => e.stopPropagation()}
+            className="drop_holder"
+            onClick={() => {
+              setLanguageDropdown(!languageDropdown);
+              setIsOpen();
+            }}
           >
-            <div
-              className="drop_holder"
-              onClick={() => {
-                setLanguageDropdown(!languageDropdown);
-                setIsOpen();
-              }}
-            >
-              <img src={selectedLanguageData[value] || usFlag} alt="" />
-              <ArrowDownIcon />
-            </div>
-            {languageDropdown && (
-              <LanguageDropdown
-                languageDropdown={languageDropdown}
-                setLanguageDropdown={setLanguageDropdown}
-                findText={props.findText}
-                defaultLang={props.defaultLang}
-                setDefaultLang={props.setDefaultLang}
-                setIsTranslationsLoading={props.setIsTranslationsLoading}
-              />
-            )}
+            <img src={selectedLanguageData[value] || usFlag} alt="" />
+            <ArrowDownIcon />
           </div>
-          {selectedAccount && (
-            <UserProfile
-              onClick={(e) => {
-                e.stopPropagation();
-                setIsOpen(!isOpen);
-                setLanguageDropdown();
-              }}
-              ref={secondContainerRef}
-            >
-              <div className="user-img-container">
-                <img
-                  src={selectedAccount?.profile_photo?.url || avatar}
-                  alt="profile"
-                />
-              </div>
-              <div className="user-info-container">
-                <h5 style={{ textTransform: "capitalize" }}>
-                  {selectedAccount?.metadata?.organization_name ||
-                    selectedAccount?.display_name}
-                </h5>
-                <h6 style={{ textTransform: "capitalize" }}>
-                  {selectedAccount?.type?.toLowerCase()}
-                </h6>
-              </div>
-              <ArrowDownIcon width={16} height={10} />
-            </UserProfile>
-          )}
-        </NavGroup>
-      )}
-
-      {!isDemo && (
-        <>
-          {isOpen && (
-            <AccountDropdown
-              avatar={avatar}
-              activeAccountName={selectedAccount?.display_name}
-              activeAccountType={"Personal Account"}
-              accountName={"Default name"}
-              accountType={"Default Account"}
-              notificationCount={"5"}
-              isOpen={isOpen}
-              setIsOpen={setIsOpen}
-              data={userAccountsDetail}
-              selectedAccount={selectedAccount}
-              setSelectedAccount={setSelectedAccount}
-              developerAccountData={developerAccountData}
-              setDeveloperAccountData={setDeveloperAccountData}
-              personalAccountData={personalAccountData}
-              setPersonalAccountData={setPersonalAccountData}
-              instructorAccountData={instructorAccountData}
-              setInstructorAccountData={setInstructorAccountData}
-              enterpriseAccountData={enterpriseAccountData}
-              setEnterpriseAccountData={setEnterpriseAccountData}
-              setGeneralData={setGeneralData}
-              userAccountsDetail={userAccountsDetail}
-              userDetails={userDetails}
-              setDefaultAccount={setDefaultAccount}
-              handleSetDefaultAccount={handleSetDefaultAccount}
-              ref={acctDropdownContainerRef}
-              hasDeveloperAccount={hasDeveloperAccount}
+          {languageDropdown && (
+            <LanguageDropdown
+              languageDropdown={languageDropdown}
+              setLanguageDropdown={setLanguageDropdown}
               findText={props.findText}
+              defaultLang={props.defaultLang}
+              setDefaultLang={props.setDefaultLang}
+              setIsTranslationsLoading={props.setIsTranslationsLoading}
             />
           )}
-        </>
-      )}
+        </div>
+        {selectedAccount && (
+          <UserProfile
+            onClick={(e) => {
+              e.stopPropagation();
+              setIsOpen(!isOpen);
+              setLanguageDropdown();
+            }}
+            ref={secondContainerRef}
+          >
+            <div className="user-img-container">
+              <img
+                src={selectedAccount?.profile_photo?.url || avatar}
+                alt="profile"
+              />
+            </div>
+            <div className="user-info-container">
+              <h5 style={{ textTransform: "capitalize" }}>
+                {selectedAccount?.metadata?.organization_name ||
+                  selectedAccount?.display_name}
+              </h5>
+              <h6 style={{ textTransform: "capitalize" }}>
+                {selectedAccount?.type?.toLowerCase()}
+              </h6>
+            </div>
+            <ArrowDownIcon width={16} height={10} />
+          </UserProfile>
+        )}
+      </NavGroup>
+
+      <>
+        {isOpen && (
+          <AccountDropdown
+            avatar={avatar}
+            activeAccountName={selectedAccount?.display_name}
+            activeAccountType={"Personal Account"}
+            accountName={"Default name"}
+            accountType={"Default Account"}
+            notificationCount={"5"}
+            isOpen={isOpen}
+            setIsOpen={setIsOpen}
+            data={userAccountsDetail}
+            selectedAccount={selectedAccount}
+            setSelectedAccount={setSelectedAccount}
+            developerAccountData={developerAccountData}
+            setDeveloperAccountData={setDeveloperAccountData}
+            personalAccountData={personalAccountData}
+            setPersonalAccountData={setPersonalAccountData}
+            instructorAccountData={instructorAccountData}
+            setInstructorAccountData={setInstructorAccountData}
+            enterpriseAccountData={enterpriseAccountData}
+            setEnterpriseAccountData={setEnterpriseAccountData}
+            setGeneralData={setGeneralData}
+            userAccountsDetail={userAccountsDetail}
+            userDetails={userDetails}
+            setDefaultAccount={setDefaultAccount}
+            handleSetDefaultAccount={handleSetDefaultAccount}
+            ref={acctDropdownContainerRef}
+            hasDeveloperAccount={hasDeveloperAccount}
+            findText={props.findText}
+          />
+        )}
+      </>
     </Navbar>
   );
 };