ui

NIUANULP · Aug 13, 2024 · 82f06f3 · 82f06f3
1 parent 4f47833
commit 82f06f3
Show file tree

Hide file tree

Showing 6 changed files with 317 additions and 164 deletions.
diff --git a/packages/nulp_elite/src/App.js b/packages/nulp_elite/src/App.js
@@ -53,8 +53,8 @@ import votingDashboard from "pages/voting/votingDashboard";
 import pollsDetails from "pages/voting/pollsDetails";
 const urlConfig = require("./configs/urlConfig.json");
 const routeConfig = require("./configs/routeConfig.json");
-import PopupForm from "pages/profileData"
-import axios from 'axios';
+import PopupForm from "pages/profileData";
+import axios from "axios";
 
 function App() {
   // const [t] = useTranslation();
@@ -66,7 +66,7 @@ function App() {
   const [checkPref, setCheckPref] = React.useState(true);
   const _userId = util.userId();
   const [orgId, setOrgId] = useState();
-  const[userData,setUserData]=React.useState(false)
+  const [userData, setUserData] = React.useState(false);
 
   const routes = [
     {
@@ -241,27 +241,25 @@ function App() {
         console.error("Error fetching user data:", error);
       }
     };
-    const UserData=async()=>{
-const url = `${urlConfig.URLS.POFILE_PAGE.USER_READ}`
-const requestBody={
-  user_ids:[_userId]
-}
-const response=await axios.post(url,requestBody);
-const Data=response.data;
-console.log("Data of user----------- ",Data);
-if(
-    Array.isArray(Data?.result) && Data.result.length === 0 ||
-    (Array.isArray(Data?.result) && Data.result.length > 0 &&
-        (
-            Data.result[0]?.designation === null ||
+    const UserData = async () => {
+      const url = `${urlConfig.URLS.POFILE_PAGE.USER_READ}`;
+      const requestBody = {
+        user_ids: [_userId],
+      };
+      const response = await axios.post(url, requestBody);
+      const Data = response.data;
+      console.log("Data of user----------- ", Data);
+      if (
+        (Array.isArray(Data?.result) && Data.result.length === 0) ||
+        (Array.isArray(Data?.result) &&
+          Data.result.length > 0 &&
+          (Data.result[0]?.designation === null ||
             Data.result[0]?.user_type === null ||
-            Data.result[0]?.organisation === null
-        )
-    )
-){
-  setUserData(true)
-}
-    }
+            Data.result[0]?.organisation === null))
+      ) {
+        setUserData(true);
+      }
+    };
     const fetchData = async () => {
       try {
         const url = `${urlConfig.URLS.LEARNER_PREFIX}${urlConfig.URLS.USER.GET_PROFILE}${_userId}`;
@@ -318,12 +316,12 @@ if(
             onClose={() => setCheckPref(true)}
           />
         )}
-        {userData && (<PopupForm
-        open={userData}
-        handleClose={()=> setUserData(false)}
-        ></PopupForm>
+        {userData && (
+          <PopupForm
+            open={userData}
+            handleClose={() => setUserData(false)}
+          ></PopupForm>
         )}
-
 
         <Router>
           <Routes>

diff --git a/packages/nulp_elite/src/components/domainCarousel.js b/packages/nulp_elite/src/components/domainCarousel.js
@@ -48,6 +48,7 @@ export default function DomainCarousel({
   domains,
   onSelectDomain,
   selectedDomainCode,
+  keepOpen,
 }) {
   const { t } = useTranslation();
   const [isLoading, setIsLoading] = useState(true); // Initial loading state
@@ -66,12 +67,16 @@ export default function DomainCarousel({
   // const navigate = useNavigate();
   const [userDomain, setUserDomain] = useState(null);
 
-  const [isBoxVisible, setIsBoxVisible] = useState(false);
+  const [isBoxVisible, setIsBoxVisible] = useState(keepOpen ? keepOpen : false);
 
   const handleClick = () => {
     // setIsBoxVisible(true);
     setIsBoxVisible(!isBoxVisible);
-    document.body.classList.add("domain-fixed");
+    if (!isBoxVisible) {
+      document.body.classList.add("domain-fixed");
+    } else {
+      document.body.classList.remove("domain-fixed");
+    }
   };
   useEffect(() => {
     // Simulate loading completion after a delay
@@ -84,6 +89,7 @@ export default function DomainCarousel({
 
   useEffect(() => {
     const domain = sessionStorage.getItem("userDomain");
+
     setUserDomain(domain);
   }, []);