l-min-components 1.0.788 → 1.0.794

package/package.json

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

package/src/components/deactivated/index.jsx

@@ -40,7 +40,7 @@ const GracePeriod = ({
         <div
           onClick={() => {
             window.location.href =
-              "https://559staging.learngual.com/settings/payment/";
+              "https://559staging.learngual.com/settings/payment";
           }}
         >
           <Button

package/src/components/header/index.jsx

@@ -61,8 +61,13 @@ const HeaderComponent = (props) => {
     handleGetNotification,
   } = useHeader();
   const { pathname } = useLocation();
-  const { setGeneralData, generalData, notificationMarkReadData, findText, defaultLang } =
-    useContext(OutletContext);
+  const {
+    setGeneralData,
+    generalData,
+    notificationMarkReadData,
+    findText,
+    defaultLang,
+  } = useContext(OutletContext);
   const [selectedAccount, setSelectedAccount] = useState();
   const { setDefaultAccount, handleSetDefaultAccount } = useHeader();
 
@@ -365,7 +370,13 @@ const HeaderComponent = (props) => {
   }, [notificationMarkReadData?.response]);
   const value = JSON?.parse(localStorage.getItem("defaultLang"));
   const currentFlag = value?.flag;
-console.log("defaultLang", defaultLang)
+  console.log("defaultLang", defaultLang);
+
+  // When Developer and on staging
+  const isDeveloper =
+    generalData?.selectedAccount?.type === "DEVELOPER" &&
+    window.location.hostname.includes("staging");
+
   return (
     <Navbar>
       <img src={logo} alt="Learngual logo" />
@@ -373,7 +384,8 @@ console.log("defaultLang", defaultLang)
         onClick={() => {
           setLanguageDropdown();
           setIsOpen();
-        }}>
+        }}
+      >
         <li>
           <a className={isHomePage() ? "active" : ""}>
             <BookIcon /> {getNavLinkLabel()}
@@ -398,7 +410,8 @@ console.log("defaultLang", defaultLang)
             className={
               window.location.pathname.includes("settings") ? "active" : ""
             }
-            style={{ cursor: "pointer" }}>
+            style={{ cursor: "pointer" }}
+          >
             <SettingIcon /> {findText("Settings")}
           </a>
         </li>
@@ -412,7 +425,8 @@ console.log("defaultLang", defaultLang)
             className={
               window.location.pathname.includes("notifications") ? "active" : ""
             }
-            style={{ cursor: "pointer" }}>
+            style={{ cursor: "pointer" }}
+          >
             {unreadNotificationData?.data?.count > 0 ? (
               <NotificationIcon />
             ) : (
@@ -427,28 +441,29 @@ console.log("defaultLang", defaultLang)
         onClick={() => {
           setLanguageDropdown();
           setIsOpen();
-        }}>
-        <SearchInputGroup>
-          <SearchIcon />
-          <SearchInput
-            type={props.inputType}
-            value={props.value}
-            id={props.inputId}
-            placeholder={props.placeholder}
-            style={props.inputStyles}
-            onChange={props.onChange}
-            onFocus={() => setSearchResultOpen(true)}
-            onBlur={() => setSearchResultOpen(false)}
-          />
-
-          {searchResultOpen && (
-            <div className="search-result-wrapper">
-              <p>
-                {/* Website <span>UIUX </span> Design */}
-              </p>
-            </div>
-          )}
-        </SearchInputGroup>
+        }}
+      >
+        {!isDeveloper && ( // when developer and on staging, don't show
+          <SearchInputGroup>
+            <SearchIcon />
+            <SearchInput
+              type={props.inputType}
+              value={props.value}
+              id={props.inputId}
+              placeholder={props.placeholder}
+              style={props.inputStyles}
+              onChange={props.onChange}
+              onFocus={() => setSearchResultOpen(true)}
+              onBlur={() => setSearchResultOpen(false)}
+            />
+
+            {searchResultOpen && (
+              <div className="search-result-wrapper">
+                <p>{/* Website <span>UIUX </span> Design */}</p>
+              </div>
+            )}
+          </SearchInputGroup>
+        )}
 
         <div className="language_dropdown" onClick={(e) => e.stopPropagation()}>
           <div
@@ -456,7 +471,8 @@ console.log("defaultLang", defaultLang)
             onClick={() => {
               setLanguageDropdown(!languageDropdown);
               setIsOpen();
-            }}>
+            }}
+          >
             <img src={currentFlag || usFlag} alt="" />
             <ArrowDownIcon />
           </div>
@@ -474,7 +490,8 @@ console.log("defaultLang", defaultLang)
               setIsOpen(!isOpen);
               setLanguageDropdown();
             }}
-            ref={secondContainerRef}>
+            ref={secondContainerRef}
+          >
             <div className="user-img-container">
               <img
                 src={selectedAccount?.profile_photo?.url || avatar}

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

@@ -44,8 +44,11 @@ const SideMenu = ({
   // Normal route filter
   const [filteredRoutes, setFilteredRoutes] = useState();
 
-  const isPersonal =  generalData?.selectedAccount?.type === "PERSONAL" && window.location.hostname.includes("staging")
-  
+  // When personal and on staging
+  const isPersonal =
+    generalData?.selectedAccount?.type === "PERSONAL" &&
+    window.location.hostname.includes("staging");
+
   useEffect(() => {
     if (userType) {
       setFilteredRoutes(
@@ -303,14 +306,10 @@ const SideMenu = ({
         )}
         minimal={isOpen}
       >
-        {!isPersonal && (
-          <>
-            <IconContainer active={active}>
-              {active ? iconActive : icon}
-            </IconContainer>
-            <TextContainer minimal={isOpen}>{text}</TextContainer>
-          </>
-        )}
+        <IconContainer active={active}>
+          {active ? iconActive : icon}
+        </IconContainer>
+        <TextContainer minimal={isOpen}>{text}</TextContainer>
 
         {notifications && (
           <NotificationCount minimal={isOpen}>
@@ -328,10 +327,13 @@ const SideMenu = ({
     >
       <UserCard user={user} isOpen={isOpen} />
 
-      <NavigationContainer>
-        {routeFilter && routeFilter?.map(renderNavigationItem)}
-      </NavigationContainer>
-
+      {!isPersonal && (
+        <>
+          <NavigationContainer>
+            {routeFilter && routeFilter?.map(renderNavigationItem)}
+          </NavigationContainer>
+        </>
+      )}
       <LogoutButtonContainer onClick={onLogout}>
         <IconContainer>{/* <CiLogout /> */}</IconContainer>
         {/* <TextContainer minimal={isOpen}>Log out</TextContainer> */}