l-min-components 1.0.264 → 1.0.268

package/package.json

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

package/src/components/AppMainLayout/index.styled.js

@@ -26,6 +26,9 @@ export const CenterLayout = styled.div`
   /* max-width: 900px; */
   margin: ${({ isOpen }) =>
     isOpen ? "0px 252px 0 336px" : "0px 252px 0 145px"};
+  @media screen and (max-width: 1023px) {
+    margin-right: 0;
+  }
   overflow-y: scroll;
   transition: all 0.3s;
   scrollbar-width: thin;

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

@@ -35,8 +35,15 @@ const AccountDropdown = (props) => {
             ? ".localhost"
             : ".learngual.com"
         }; path=/; expires=${date.toUTCString()};`;
+      props?.setGeneralData((generalData) => ({
+        ...generalData,
+        accounts: props?.userAccountsDetail?.data,
+        user: props?.userDetails?.data,
+        selectedAccount: props?.selectedAccount,
+      }));
     }
   }, [props?.selectedAccount]);
+  console.log(props?.selectedAccount, "selected");
   return (
     <>
       <AccountDropdownLayout>
@@ -50,8 +57,7 @@ const AccountDropdown = (props) => {
           <div>
             <h1>
               {" "}
-              {props?.selectedAccount?.display_name ||
-                props?.selectedAccount?.metadata?.organization_name ||
+              {props?.selectedAccount?.metadata?.organization_name ||
                 props?.activeAccountName}
             </h1>
             <h2 style={{ textTransform: "capitalize" }}>
@@ -125,7 +131,11 @@ const AccountDropdown = (props) => {
                     />
                   </div>
                   <div className="account-details">
-                    <h1> {developerItem?.display_name || props.accountName}</h1>
+                    <h1>
+                      {" "}
+                      {developerItem?.metadata?.organization_name ||
+                        props.accountName}
+                    </h1>
                     {/* <span>{props.notificationCount} </span> */}
                   </div>
                 </div>

package/src/components/header/index.jsx

@@ -61,6 +61,7 @@ const HeaderComponent = (props) => {
         ...generalData,
         accounts: userAccountsDetail?.data,
         user: userDetails?.data,
+        selectedAccount,
       }));
       const cookies = document.cookie;
       const cookieArray = cookies.split(";");
@@ -274,10 +275,7 @@ const HeaderComponent = (props) => {
               />
             </div>
             <div className="user-info-container">
-              <h5>
-                {selectedAccount?.display_name ||
-                  selectedAccount?.metadata?.organization_name}
-              </h5>
+              <h5>{selectedAccount?.metadata?.organization_name}</h5>
               <h6 style={{ textTransform: "capitalize" }}>
                 {selectedAccount?.type?.toLowerCase()}
               </h6>
@@ -308,6 +306,9 @@ const HeaderComponent = (props) => {
           setInstructorAccountData={setInstructorAccountData}
           enterpriseAccountData={enterpriseAccountData}
           setEnterpriseAccountData={setEnterpriseAccountData}
+          setGeneralData={setGeneralData}
+          userAccountsDetail={userAccountsDetail}
+          userDetails={userDetails}
         />
       )}
     </Navbar>

package/src/components/header/index.styled.js

@@ -299,7 +299,7 @@ export const AccountDropdownLayout = styled.div`
   flex-direction: column;
   position: absolute;
   top: 65px;
-  right: 0;
+  right: 20px;
   z-index: 5;
 `;
 
@@ -393,7 +393,7 @@ export const AccountDropdownBody = styled.div`
     }
   }
   & .activated {
-    background-color: rgba(239, 248, 248, 1);
+    background-color: rgba(0, 194, 194, 0.15);
   }
 
   & .account-details {

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

@@ -16,7 +16,6 @@ const UserCard = ({ user, isOpen }) => {
   const { handleGetUserDetails, userDetails } = useHeader();
   const [organizationName, setOrganizationName] = useState();
   const { generalData } = useContext(OutletContext);
-  console.log(generalData, "data");
   useEffect(() => {
     handleGetUserDetails();
     if (generalData?.accounts) {
@@ -33,13 +32,15 @@ const UserCard = ({ user, isOpen }) => {
           break;
         }
       }
+
       generalData?.accounts?.results?.map((account, idx) => {
         if (account?.id === activeDeveloperAccount) {
           return setOrganizationName(account?.metadata?.organization_name);
         }
       });
     }
-  }, []);
+  }, [generalData]);
+  console.log(generalData, "data");
 
   return (
     <UserCardContainer isOpen={isOpen}>