From 98b83f7d27d04f0ab610aa816a06c21e4f7c5421 Mon Sep 17 00:00:00 2001
From: ManojNathIC <manoj_n@tekditechnologies.com>
Date: Fri, 5 Jul 2024 11:00:00 +0530
Subject: [PATCH 1/2] Task #0000: Registration routing

---
 .../nulp_elite/src/configs/routeConfig.json   |  4 ++--
 .../nulp_elite/src/pages/profile/Profile.js   | 20 +++++++++----------
 .../nulp_elite/src/pages/registration/Otp.js  |  4 +++-
 .../src/pages/registration/Registration.js    |  9 +++++----
 4 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/packages/nulp_elite/src/configs/routeConfig.json b/packages/nulp_elite/src/configs/routeConfig.json
index 9600208f..881c53bb 100644
--- a/packages/nulp_elite/src/configs/routeConfig.json
+++ b/packages/nulp_elite/src/configs/routeConfig.json
@@ -46,13 +46,13 @@
       "CERTIFICATE_OLD": "/webapp/certificateOld"
     },
     "SIGNUP_PAGE": {
-      "SIGNUP": "/webapp/signup"
+      "SIGNUP": "/signup"
     },
     "TERMS_PAGE": {
       "TERMS": "/webapp/terms"
     },
     "OTP_PAGE": {
-      "OTP": "/webapp/otp"
+      "OTP": "/otp"
     },
     "VIEW_ALL_PAGE": {
       "VIEW_ALL": "/webapp/view-all",
diff --git a/packages/nulp_elite/src/pages/profile/Profile.js b/packages/nulp_elite/src/pages/profile/Profile.js
index 9c65fca7..b5e4d128 100644
--- a/packages/nulp_elite/src/pages/profile/Profile.js
+++ b/packages/nulp_elite/src/pages/profile/Profile.js
@@ -961,17 +961,17 @@ const Profile = () => {
                             /{MAX_CHARS}
                           </Typography>
                         </Box>
-                        <Typography className="h4-title">
+                        {/* <Typography className="h4-title">
                           {t("Profile image")}
-                        </Typography>
-                        <Box
+                        </Typography> */}
+                        {/* <Box
                           py={1}
                           sx={{
                             display: "flex",
                             justifyContent: "space-between",
                           }}
-                        >
-                          <Box sx={{ flex: "0 0 auto" }}>
+                        > */}
+                        {/* <Box sx={{ flex: "0 0 auto" }}>
                             {previewUrl && (
                               <img
                                 src={previewUrl}
@@ -984,8 +984,8 @@ const Profile = () => {
                                 }}
                               />
                             )}
-                          </Box>
-                          <Box
+                          </Box> */}
+                        {/* <Box
                             sx={{
                               flex: "1 1 auto",
                               display: "flex",
@@ -1034,8 +1034,8 @@ const Profile = () => {
                                 {t("upload")}
                               </Button>
                             )}
-                          </Box>
-                        </Box>
+                          </Box> */}
+                        {/* </Box> */}
                         <Box pt={4} className="d-flex jc-en">
                           <Button
                             className="custom-btn-default mr-5"
@@ -1178,4 +1178,4 @@ const Profile = () => {
   );
 };
 
-export default Profile;
\ No newline at end of file
+export default Profile;
diff --git a/packages/nulp_elite/src/pages/registration/Otp.js b/packages/nulp_elite/src/pages/registration/Otp.js
index 4939dd09..f68edbc9 100644
--- a/packages/nulp_elite/src/pages/registration/Otp.js
+++ b/packages/nulp_elite/src/pages/registration/Otp.js
@@ -441,7 +441,9 @@ const Otp = () => {
             }}
           >
             {t("ALREADY_HAVE_AN_ACCOUNT")}{" "}
-            <Link href={`/all${window.location.search}`}>{t("LOGIN")}</Link>
+            <Link href={`/webapp/all${window.location.search}`}>
+              {t("LOGIN")}
+            </Link>
           </Typography>
         </Box>
       </Container>
diff --git a/packages/nulp_elite/src/pages/registration/Registration.js b/packages/nulp_elite/src/pages/registration/Registration.js
index 5027940a..5a468134 100644
--- a/packages/nulp_elite/src/pages/registration/Registration.js
+++ b/packages/nulp_elite/src/pages/registration/Registration.js
@@ -127,7 +127,7 @@ const Registration = () => {
       setError(null);
 
       try {
-        const url = `${urlConfig.URLS.LEARNER_PREFIX}${urlConfig.URLS.USER.EMAIL_EXIST}${formik.values.email}?captchaResponse=${captchaResponse}`;
+        const url = `${urlConfig.URLS.LEARNER_PREFIX}user/${urlConfig.URLS.USER.EMAIL_EXIST}/${formik.values.email}?captchaResponse=${captchaResponse}`;
 
         const response = await fetch(url, {
           method: "GET",
@@ -149,7 +149,7 @@ const Registration = () => {
           generateOtp(formik.values.email);
         }
       } catch (error) {
-        showErrorMessage(t("EMAIL_ALREADY_EXIST"));
+        showErrorMessage(t("SOMETHING WENT WRONG"));
       } finally {
         setIsLoading(false);
       }
@@ -203,7 +203,7 @@ const Registration = () => {
     };
   };
   if (goToOtp) {
-    return <Navigate to={`/otp${window.location.search}`} />;
+    return <Navigate to={`/webapp/otp${window.location.search}`} />;
   }
 
   const onChange = (value) => {
@@ -497,7 +497,8 @@ const Registration = () => {
                 marginTop: "10px",
               }}
             >
-              {t("ALREADY_HAVE_AN_ACCOUNT")} <Link href="/all">Log in</Link>
+              {t("ALREADY_HAVE_AN_ACCOUNT")}{" "}
+              <Link href="/webapp/all">Log in</Link>
             </Typography>
           </Box>
           <Box py={1}>{error && <p className="form-error">{error}</p>}</Box>

From 65421a432d058fb7b0aa79a58f2430b3364f1160 Mon Sep 17 00:00:00 2001
From: ManojNathIC <manoj_n@tekditechnologies.com>
Date: Sat, 6 Jul 2024 12:40:40 +0530
Subject: [PATCH 2/2] Task #0000: Workspace visibility option logic and user
 domain wise content

---
 packages/nulp_elite/src/App.js                | 12 ++++
 .../src/components/domainCarousel.js          | 44 +++++++-------
 packages/nulp_elite/src/components/header.js  | 58 ++++++++++++-------
 .../src/pages/content/AllContent.js           |  8 ++-
 4 files changed, 78 insertions(+), 44 deletions(-)

diff --git a/packages/nulp_elite/src/App.js b/packages/nulp_elite/src/App.js
index 722c53c8..29551d48 100644
--- a/packages/nulp_elite/src/App.js
+++ b/packages/nulp_elite/src/App.js
@@ -197,6 +197,18 @@ function App() {
         const data = await response.json();
         const rootOrgId = data.result.response.rootOrgId;
         sessionStorage.setItem("rootOrgId", rootOrgId);
+        sessionStorage.setItem(
+          "userDomain",
+          data.result.response.framework.board
+        );
+        const rolesData = data.result.response.roles;
+        const roles = rolesData?.map((roleObject) => roleObject.role);
+
+        // Convert the roles array to a JSON string
+        const rolesJson = JSON.stringify(roles);
+
+        // Save the JSON string to sessionStorage
+        sessionStorage.setItem("roles", rolesJson);
         console.log(data.result.response.framework.board);
         localStorage.setItem(
           "defaultFramework",
diff --git a/packages/nulp_elite/src/components/domainCarousel.js b/packages/nulp_elite/src/components/domainCarousel.js
index 718f1519..04608b86 100644
--- a/packages/nulp_elite/src/components/domainCarousel.js
+++ b/packages/nulp_elite/src/components/domainCarousel.js
@@ -47,6 +47,12 @@ export default function DomainCarousel({
   const [activeDomain, setActiveDomain] = useState(null);
   const [scrolled, setScrolled] = useState(false);
   // const navigate = useNavigate();
+  const [userDomain, setUserDomain] = useState(null);
+
+  useEffect(() => {
+    const domain = sessionStorage.getItem("userDomain");
+    setUserDomain(domain);
+  }, []);
 
   const handleResize = () => {
     setIsMobile(window.innerWidth <= 767);
@@ -124,9 +130,9 @@ export default function DomainCarousel({
           <Carousel
             swipeable={true}
             draggable={true}
-            showDots={["mobile"]} // Show dots only if there are more than 4 items
+            showDots={["mobile"]}
             responsive={responsive}
-            ssr={true} // means to render carousel on server-side.
+            ssr={true}
             infinite={true}
             autoPlaySpeed={1000}
             keyBoardControl={true}
@@ -140,7 +146,11 @@ export default function DomainCarousel({
               itemsArray?.slice(0, 10).map((domain, index) => (
                 <Box
                   className={`my-class ${
-                    activeStates === index ? "carousel-active-ui" : ""
+                    activeStates === index
+                      ? "carousel-active-ui"
+                      : userDomain === domain.code
+                      ? "carousel-active-ui"
+                      : ""
                   }`}
                   onClick={(e) =>
                     handleDomainClick(domain.code, index, domain.name)
@@ -175,10 +185,7 @@ export default function DomainCarousel({
                   <Box sx={{ alignSelf: "center" }} className="cursor-pointer">
                     <Typography
                       level="title-md"
-                      style={{
-                        fontSize: "12px",
-                        textAlign: "center",
-                      }}
+                      style={{ fontSize: "12px", textAlign: "center" }}
                       className="domainText"
                     >
                       {domain.name}
@@ -192,7 +199,7 @@ export default function DomainCarousel({
         <>
           <Box className="carousel-bx scrolled">
             <Box className="text-white h5-title pl-20 pb-15">
-              Select your prefered domain :
+              Select your preferred domain:
             </Box>
 
             <Box
@@ -206,7 +213,11 @@ export default function DomainCarousel({
                 itemsArray?.slice(0, 10).map((domain, index) => (
                   <Box
                     className={`my-class ${
-                      activeStates === index ? "carousel-active-ui" : ""
+                      activeStates === index
+                        ? "carousel-active-ui"
+                        : userDomain === domain.code
+                        ? "carousel-active-ui"
+                        : ""
                     }`}
                     onClick={(e) =>
                       handleDomainClick(domain.code, index, domain.name)
@@ -219,24 +230,15 @@ export default function DomainCarousel({
                     onMouseEnter={(event) => handleMouseEnter(index)}
                     onMouseLeave={handleMouseLeave}
                   >
-                    <Box className=" cursor-pointer">
-                      <Box className=" cursor-pointer">
-                        {/* {(domain.image != undefined) && <img src={require(baseImgUrl+domain.image)}  style={{width:'40px',objectFit:'contain'}} alt={domain.name} />}
-                {(domain.image == undefined)&& <img src={require("../assets/swm.png")}  style={{width:'40px',objectFit:'contain'}} alt={domain.name} />} */}
-                        {/* <Tooltip title={domain.description}> */}
+                    <Box className="cursor-pointer">
+                      <Box className="cursor-pointer">
                         <img
                           className="domainHover"
                           src={require(`../assets/domainImgs${domain.image}`)}
                           alt={domain.name}
                         />
-
-                        {/* </Tooltip> */}
-
-                        {/* <img src={require("../assets/swm.png")}  style={{width:'40px',objectFit:'contain'}} alt={domain.name} /> */}
                       </Box>
-
-                      {/* {(activeDomain === index || activeStates === index) && ( */}
-                      <span className=" cursor-pointer domainText">
+                      <span className="cursor-pointer domainText">
                         {domain.name}
                       </span>
                       {/* )} */}
diff --git a/packages/nulp_elite/src/components/header.js b/packages/nulp_elite/src/components/header.js
index ac7d7b9f..00ea5af0 100644
--- a/packages/nulp_elite/src/components/header.js
+++ b/packages/nulp_elite/src/components/header.js
@@ -55,7 +55,15 @@ function Header({ globalSearchQuery }) {
   const navigate = useNavigate();
   const _userId = util.userId();
   const [userData, setUserData] = useState(null);
-
+  const [roles, setRoles] = useState([]);
+  // Retrieve roles from sessionStorage
+  const rolesJson = sessionStorage.getItem("roles");
+  useEffect(() => {
+    if (rolesJson) {
+      const parsedRoles = JSON.parse(rolesJson);
+      setRoles(parsedRoles);
+    }
+  }, []);
   const handleOpenNavMenu = (event) => {
     setAnchorElNav(event.currentTarget);
   };
@@ -496,16 +504,20 @@ function Header({ globalSearchQuery }) {
                     {t("PROFILE")}
                   </Link>
                 </MenuItem>
-                <MenuItem>
-                  <Link
-                    target="_blank"
-                    href="https://nulp.niua.org/workspace/content/create"
-                    underline="none"
-                    textAlign="center"
-                  >
-                    {t("WORKSPACE")}
-                  </Link>
-                </MenuItem>
+                {/* Check if roles array is empty or contains "PUBLIC" */}
+                {(roles && roles.length === 0) ||
+                (roles.length === 1 && roles.includes("PUBLIC")) ? null : (
+                  <MenuItem>
+                    <Link
+                      target="_blank"
+                      href="/workspace/content/create"
+                      underline="none"
+                      textAlign="center"
+                    >
+                      {t("WORKSPACE")}
+                    </Link>
+                  </MenuItem>
+                )}
                 <MenuItem>
                   <Link
                     href={routeConfig.ROUTES.HELP_PAGE.HELP}
@@ -746,16 +758,20 @@ function Header({ globalSearchQuery }) {
                         {t("PROFILE")}
                       </Link>
                     </MenuItem>
-                    <MenuItem>
-                      <Link
-                        target="_blank"
-                        href="https://nulp.niua.org/workspace/content/create"
-                        underline="none"
-                        textAlign="center"
-                      >
-                        {t("WORKSPACE")}
-                      </Link>
-                    </MenuItem>
+                    {/* Check if roles array is empty or contains "PUBLIC" */}
+                    {(roles && roles.length === 0) ||
+                    (roles.length === 1 && roles.includes("PUBLIC")) ? null : (
+                      <MenuItem>
+                        <Link
+                          target="_blank"
+                          href="/workspace/content/create"
+                          underline="none"
+                          textAlign="center"
+                        >
+                          {t("WORKSPACE")}
+                        </Link>
+                      </MenuItem>
+                    )}
                     <MenuItem>
                       <Link
                         href={routeConfig.ROUTES.HELP_PAGE.HELP}
diff --git a/packages/nulp_elite/src/pages/content/AllContent.js b/packages/nulp_elite/src/pages/content/AllContent.js
index 0c71c5aa..6da8a39b 100644
--- a/packages/nulp_elite/src/pages/content/AllContent.js
+++ b/packages/nulp_elite/src/pages/content/AllContent.js
@@ -36,7 +36,6 @@ import SkeletonLoader from "components/skeletonLoader";
 import NoResult from "./noResultFound";
 const routeConfig = require("../../configs/routeConfig.json");
 
-
 const responsiveCard = {
   superLargeDesktop: {
     breakpoint: { max: 4000, min: 3000 },
@@ -101,6 +100,11 @@ const AllContent = () => {
   };
 
   useEffect(() => {
+    const userDomain = sessionStorage.getItem("userDomain");
+    if (userDomain) {
+      setSelectedDomain(userDomain);
+      setDomainName(userDomain);
+    }
     fetchData();
     fetchDomains();
   }, []);
@@ -435,7 +439,7 @@ const AllContent = () => {
             );
           })
         ) : (
-         <NoResult />
+          <NoResult />
         )}
       </Container>
       <FloatingChatIcon />