l-min-components 1.0.325 → 1.0.334

package/package.json

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

package/src/components/AppMainLayout/index.jsx

@@ -36,6 +36,8 @@ const AppMainLayout = () => {
   const [hasLayoutBackgroundImage, setHasLayoutBackgroundImage] =
     useState(false);
   const [sideMenuLayout, setSideMenuLayout] = useState(true);
+  const [defaultAcct, setDefaultAcct] = useState("");
+  const centerLayoutStyle = {};
 
   useEffect(() => {
     if (window.location.host.includes("coming")) {
@@ -45,6 +47,21 @@ const AppMainLayout = () => {
     }
   }, []);
 
+  useEffect(() => {
+    let cookieValue = null;
+    const cookieName = "defaultAccountType";
+    // Retrieve the value of the cookie
+    const cookies = document.cookie.split(";");
+    for (let i = 0; i < cookies.length; i++) {
+      const cookie = cookies[i].trim();
+      if (cookie.startsWith(cookieName + "=")) {
+        cookieValue = cookie.substring(cookieName.length + 1);
+        setDefaultAcct(cookieValue)
+        break;
+      }
+    }
+  }, [defaultAcct]);
+  
   return (
     <OutletContext.Provider
       value={{
@@ -64,6 +81,7 @@ const AppMainLayout = () => {
         setPage,
         selectedCourseId,
         setSelectedCourseId,
+        centerLayoutStyle,
       }}
     >
       <Layout
@@ -89,7 +107,7 @@ const AppMainLayout = () => {
                         ? "instructor"
                         : window.location.pathname.includes("developer")
                         ? "developer"
-                        : "developer"
+                        : defaultAcct
                     }
                     isOpen={isOpen}
                     setIsOpen={setIsOpen}
@@ -98,7 +116,7 @@ const AppMainLayout = () => {
               </>
             )}
           </LeftLayout>
-          <CenterLayout isOpen={isOpen}>
+          <CenterLayout isOpen={isOpen} style={centerLayoutStyle}>
             <Outlet />
           </CenterLayout>
 

package/src/components/header/account-dropdown.jsx

@@ -157,9 +157,9 @@ const AccountDropdown = (props) => {
                     props?.setSelectedAccount(instructorItem);
                     handleSetDefaultAccount(instructorItem?.id);
                     if (window.location.port) {
-                      window.location.href = `${window.location.protocol}//${window.location.hostname}:${window.location.port}/instructor`;
+                      window.location.href = `${window.location.protocol}//${window.location.hostname}:${window.location.port}/instructor/dashboard`;
                     } else {
-                      window.location.href = `${window.location.protocol}//${window.location.hostname}/instructor`;
+                      window.location.href = `${window.location.protocol}//${window.location.hostname}/instructor/dashboard`;
                     }
                   }}
                   key={idx}
@@ -193,9 +193,9 @@ const AccountDropdown = (props) => {
                     props?.setSelectedAccount(enterpriseItem);
                     handleSetDefaultAccount(enterpriseItem?.id);
                     if (window.location.port) {
-                      window.location.href = `${window.location.protocol}//${window.location.hostname}:${window.location.port}/enterprise`;
+                      window.location.href = `${window.location.protocol}//${window.location.hostname}:${window.location.port}/enterprise/dashboard`;
                     } else {
-                      window.location.href = `${window.location.protocol}//${window.location.hostname}/enterprise`;
+                      window.location.href = `${window.location.protocol}//${window.location.hostname}/enterprise/dashboard`;
                     }
                   }}
                   key={idx}
@@ -217,6 +217,42 @@ const AccountDropdown = (props) => {
               ))}
             </div>
           )}
+          {props?.personalAccountData?.length > 0 && (
+            <div>
+              <h3>Personal account</h3>
+              {props?.personalAccountData?.map((personalItem, idx) => (
+                <div
+                  className={`account-info ${
+                    personalItem === props?.selectedAccount ? "activated" : ""
+                  }`}
+                  onClick={() => {
+                    props?.setSelectedAccount(personalItem);
+                    handleSetDefaultAccount(personalItem?.id);
+                    if (window.location.port) {
+                      window.location.href = `${window.location.protocol}//${window.location.hostname}:${window.location.port}/personal/dashboard`;
+                    } else {
+                      window.location.href = `${window.location.protocol}//${window.location.hostname}/personal/dashboard`;
+                    }
+                  }}
+                  key={idx}
+                >
+                  <div className="avatar-container">
+                    <img
+                      src={personalItem?.profile_photo?.url || props.avatar}
+                      alt="account photo"
+                    />
+                  </div>
+                  <div className="account-details">
+                    <h1>
+                      {" "}
+                      {personalItem?.display_name || props.accountName}
+                    </h1>
+                    <span>{props.notificationCount} </span>
+                  </div>
+                </div>
+              ))}
+            </div>
+          )}
           {/* // )} */}
         </AccountDropdownBody>
 

package/src/components/header/index.jsx

@@ -176,7 +176,7 @@ const HeaderComponent = (props) => {
     };
   }, [setIsOpen]);
 
-  // get current default account and store in cookie
+  // get current default account and store in cookie (from api)
   useEffect(() => {
     if (getDefaultAccount?.data) {
       const date = new Date();
@@ -201,6 +201,13 @@ const HeaderComponent = (props) => {
     }
   }, [getDefaultAccount?.response]);
 
+  // get current default account and store in cookie from path
+  useEffect(() => {
+    if (pathname?.includes("personal")) {
+      // document.cookie = "activeAccount" + path;
+    }
+  }, []);
+
   return (
     <Navbar>
       <img src={logo} alt="Learngual logo" />

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

@@ -106,8 +106,7 @@ const SideMenu = ({
         return (statusText = true);
       }
       if (
-        window.location.pathname.includes("/enterprise/reports") &&
-        path === "/enterprise/reports"
+        window.location.pathname.includes("/enterprise/reports") 
       ) {
         return (statusText = true);
       }
@@ -215,18 +214,13 @@ const SideMenu = ({
           }
 
           if (
-            window.location.hostname.includes("staging") &&
-            window.location.hostname.includes("enterprise")
+            window.location.hostname.includes("staging")
           ) {
-            window.location.href = `https://developer-staging-01.learngual.com${path}`;
+            window.location.href = `https://559staging.learngual.com${path}`;
           } else if (window.location.hostname.includes("localhost")) {
             window.location.href = `http://localhost:${window.location.port}${path}`;
-          } else if (
-            window.location.hostname.includes("enterprise") &&
-            !window.location.hostname.includes("staging")
-          ) {
-            window.location.href = `https://developer.learngual.com${path}`;
-          }
+          } 
+          
         }}
         // to={route.path}
         key={index}

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

@@ -49,9 +49,9 @@ export const NavigationItemContainer = styled.p`
   position: relative;
   padding: ${({ minimal }) => (minimal ? "12px 16px" : "12px 12px")};
   color: ${({ active }) =>
-    active ? "rgb(255, 255, 255)" : "rgba(255, 255, 255, 0.625)"};
+    active ? "rgb(255, 255, 255) !important" : "rgba(255, 255, 255, 0.625) !important"};
   &:hover {
-    color: #ffffff;
+    color: #ffffff !important;
     background-color: #31cdcd;
 
     > div {
@@ -91,6 +91,7 @@ export const TextContainer = styled.div`
   font-size: 16px;
   letter-spacing: 0.32px;
   font-weight: 600;
+  color: inherit;
 `;
 
 export const NotificationCount = styled.div`

package/src/hooks/leftNavMenu.jsx

@@ -125,7 +125,7 @@ export const sideMenuOptions = [
         notifications: null,
       },
       {
-        path: "/enterprise/reports",
+        path: "/enterprise/reports/students",
         icon: <AwardIcon />,
         iconActive: <AwardIconActive />,
         text: "Reports",