Merge pull request #697 from NIUANULP/main

learnathon dev deployment
NIUANULP · Oct 14, 2024 · ec76e16 · ec76e16
2 parents 63a27cc + b054b23
commit ec76e16
Show file tree

Hide file tree

Showing 18 changed files with 57 additions and 136 deletions.
diff --git a/packages/nulp_elite/src/App.js b/packages/nulp_elite/src/App.js
@@ -326,8 +326,9 @@ function App() {
               />
             ))}
           </Routes>
-          <LernModal />
         </Router>
+      <LernModal />    
+
       </React.Suspense>
       {/* </ChakraProvider> */}
       {/* </ChakraProvider> */}

diff --git a/packages/nulp_elite/src/components/Footer.js b/packages/nulp_elite/src/components/Footer.js
@@ -161,7 +161,17 @@ export default function Footer() {
         </Box>
       </Box>
         <Box
-          className="xs-hide footer"
+          className="xs-hide"
+          style={{
+            background: "#065872",
+            color: "#fff",
+            padding: "15px 15px 13px",
+            marginTop: "auto",
+            position: 'absolute',
+            bottom: '0px',
+            width:'100%',
+            boxSizing: 'border-box'
+          }}
         >
           <Grid container spacing={2}>
             <Grid

diff --git a/packages/nulp_elite/src/components/VotingDrawerFilter.js b/packages/nulp_elite/src/components/VotingDrawerFilter.js
@@ -228,7 +228,7 @@ const VotingDrawerFilter = ({ onFilterChange }) => {
           </Box>
           <FormControl>
             <InputLabel htmlFor="outlined-adornment-search">
-            {t("SEARCH_FOR_A_POLL")}
+            {t("SEARCH_FOR_A_POLL")} 
             </InputLabel>
             <OutlinedInput
               id="outlined-adornment-search"

diff --git a/packages/nulp_elite/src/configs/urlConfig.json b/packages/nulp_elite/src/configs/urlConfig.json
@@ -145,8 +145,10 @@
       "ADD_CERTIFICATE": "v1/add/template",
       "ATTACH_CERTIFICATE": "v1/template/add",
       "CREATE_CERT_TEMPLATE": "asset/v1/create",
+      "UPLOAD_CERT_TEMPLATE": "asset/v1/upload"
       "UPLOAD_CERT_TEMPLATE": "asset/v1/upload",
       "CUSTOM_CERTIFICATE_CREATE": "/custom_event/certificate/create"
+
     },
     "COMPOSITE": {
       "SEARCH": "composite/v1/search",

diff --git a/packages/nulp_elite/src/pages/FAQPage.js b/packages/nulp_elite/src/pages/FAQPage.js
@@ -62,7 +62,7 @@ const FAQPage = () => {
   return (
     <div>
       <Header />
-      <Box sx={{ height: 'calc(100vh - 210px)', overflowY:'auto' }}>
+      <Box>
       {setLanguage && url && <Container maxWidth="xl" role="main" className="min-472 pb-30">
         {error && (
           <Alert severity="error" className="my-10">

diff --git a/packages/nulp_elite/src/pages/connections/AddConnections.js b/packages/nulp_elite/src/pages/connections/AddConnections.js
@@ -1289,7 +1289,7 @@ const AddConnections = () => {
     <Box>
       <Header />
       {toasterMessage && <ToasterCommon response={toasterMessage} />}
-      <Box sx={{ height: 'calc(100vh - 210px)', overflowY:'auto' }}>
+      <Box>
       <Container maxWidth="xl" role="main" className="pt-0 xs-pb-62 pt-108">
         {error && (
           <Alert severity="error" className="my-10">

diff --git a/packages/nulp_elite/src/pages/content/AllContent.js b/packages/nulp_elite/src/pages/content/AllContent.js
@@ -309,7 +309,7 @@ const AllContent = () => {
       <Header />
       {toasterMessage && <ToasterCommon response={toasterMessage} />}
 
-     <Box sx={{ height: 'calc(100vh - 210px)', overflowY:'auto' }}
+     <Box
      >
      {domain ? (
         <DomainCarousel onSelectDomain={handleDomainFilter} domains={domain} />

diff --git a/packages/nulp_elite/src/pages/content/CategoryPage.js b/packages/nulp_elite/src/pages/content/CategoryPage.js
@@ -248,7 +248,7 @@ const CategoryPage = () => {
   return (
     <>
       <Header />
-     <Box sx={{ height: 'calc(100vh - 210px)', overflowY:'auto' }}>
+     <Box>
       {toasterMessage && <ToasterCommon response={toasterMessage} />}
       {domain.length > 0 ? (
         <DomainCarousel onSelectDomain={handleDomainFilter} domains={domain} selectedDomainCode={preselectedDomain}/>

diff --git a/packages/nulp_elite/src/pages/content/joinCourse.js b/packages/nulp_elite/src/pages/content/joinCourse.js
@@ -158,6 +158,7 @@ const JoinCourse = () => {
         setCourseData(data);
         setUserData(data);
         if (_userId == data?.result?.content?.createdBy) {
+          console.log("here");
           setIsOwner(true);
         }
         let identifiers;
@@ -628,11 +629,11 @@ const JoinCourse = () => {
                   <Button
                     onClick={handleLeaveCourseClick} // Open confirmation dialog
                     className="custom-btn-danger xs-mt-10"
-                  >
-                    {" "}
-                    {t("LEAVE_COURSE")}
+
+                  > {t("LEAVE_COURSE")}
+
                   </Button>
-                )}
+                }
               </Box>
             </div>
 
@@ -995,7 +996,7 @@ const JoinCourse = () => {
     <div>
       <Header />
       {toasterMessage && <ToasterCommon response={toasterMessage} />}
-      <Box sx={{ height: "calc(100vh - 210px)", overflowY: "auto" }}>
+      <Box>
         <Snackbar
           open={showEnrollmentSnackbar}
           autoHideDuration={6000}

diff --git a/packages/nulp_elite/src/pages/content/pdf.js b/packages/nulp_elite/src/pages/content/pdf.js
@@ -20,7 +20,7 @@ const PDFContent = () => {
   return (
     <div>
       <Header />
-      <Box sx={{ height: 'calc(100vh - 210px)', overflowY:'auto' }}>
+      <Box>
       <Container maxWidth="md" role="main" className="container-pb">
         <Grid container spacing={2}>
           <Grid item xs={8}>

diff --git a/packages/nulp_elite/src/pages/events/dashboard.js b/packages/nulp_elite/src/pages/events/dashboard.js
@@ -552,7 +552,7 @@ const Dashboard = () => {
   return (
     <div>
       <Header />
-      <Box sx={{ height: 'calc(100vh - 210px)', overflowY:'auto' }}>
+      <Box>
       <Container
         maxWidth="xl"
         role="main"

diff --git a/packages/nulp_elite/src/pages/events/eventDetails.js b/packages/nulp_elite/src/pages/events/eventDetails.js
@@ -109,8 +109,6 @@ const EventDetails = () => {
   const [isChecked, setIsChecked] = useState(false);
   const [open, setOpen] = React.useState(false);
   const [recording, setRecording] = useState();
-  const [batchCertData,setBatchCertData] = useState();
-  const [isCertificateIssued , setIsCertificateIssued] = useState(true)
   const [isAllreadyFilledRegistation,setIsAlreadyFilledRegistration] = useState(true)
   const [isExpired , setIsExpired] = useState(false)
   const handleClickOpen = () => {
@@ -288,8 +286,6 @@ const formatTimeWithTimezone = (date) => {
     getUserData(_userId, "loggedIn");
     fetchMyEvents();
     getEventRecording();
-    fetchData();
-    checkCertificateAlreadyIssued();
     // checkEnrolledCourse();
   }, [_userId, eventId]);
 
@@ -312,7 +308,6 @@ const formatTimeWithTimezone = (date) => {
 
       const { result } = response.data;
       const { response: batchResponse } = result;
-      setBatchCertData(response.data.result)
 
       if (batchResponse && batchResponse.count === 0) {
         showErrorMessage(t("This course has no active Batches"));
@@ -460,83 +455,6 @@ const formatTimeWithTimezone = (date) => {
     });
   };
 
-  const fetchData = async () => {
-    try {
-      const url = `${urlConfig.URLS.LEARNER_PREFIX}${urlConfig.URLS.USER.GET_PROFILE}${_userId}?fields=${urlConfig.params.userReadParam.fields}`;
-
-      const header = "application/json";
-      const response = await fetch(url, {
-        // headers: {
-        //   "Content-Type": "application/json",
-        // },
-      });
-      const data = await response.json();
-      setUserData(data);
-    } catch (error) {
-      console.error("Error fetching user data:", error);
-      showErrorMessage(t("FAILED_TO_FETCH_DATA"));
-    }
-  };
-
-  const checkCertificateAlreadyIssued = async () => {
-    try{
-      const url = `${urlConfig.URLS.LEARNER_PREFIX}${urlConfig.URLS.CERTIFICATE.CERTIF_SEARCH}`;
-    const requestBody = {
-      filters: {
-        recipient: {
-            id: {
-                eq: _userId
-            }
-          }
-      }
-    }
-    const resopnse = await axios.post(url, requestBody);
-     setIsCertificateIssued(resopnse.data.some((item) => item.training?.id === eventId));
-
-    }catch(error){
-      console.log("error While calling API ");
-    }
-
-  }
-
- const generateCertificate = async () => {
-  const templateId = Object.keys(batchCertData?.response?.content[0]["certTemplates"])[0];
-  const certificateDetails = batchCertData?.response?.content[0]["certTemplates"][templateId];
-  try {
-    const url = `${urlConfig.URLS.CERTIFICATE.CUSTOM_CERTIFICATE_CREATE}`;
-    const requestBody = {
-      recipient: {
-        id: _userId, 
-        name: userData?.result?.response?.firstName + " " + userData?.result?.response?.lastName,
-        type: "user",
-      },
-      issuer: certificateDetails?.issuer,
-      training: {
-        id: detailData?.identifier,
-        name: detailData?.name,
-        type: "Event",
-        batchId: batchData?.batchId,
-      },
-      templateUrl:
-        certificateDetails?.url, 
-      status: "ACTIVE",
-      signatoryList:
-        certificateDetails?.signatoryList,
-      certificateLabel: "test",
-      issuedOn: new Date().toISOString(),
-    };
-    if(!isCertificateIssued){
-      const response = await axios.post(url, requestBody);
-      if(response.data.responseCode === "OK"){
-        setIsCertificateIssued(true)
-      }
-    }
-  } catch (error) {
-    console.error("Error creating certificate:", error);
-  }
-};
-
-
   const managePublicPrivateEvent = (button) => {
     if (eventVisibility && eventVisibility === "Public" && button === "reg") {
       handleOpenConsentModal();
@@ -947,10 +865,6 @@ const formatTimeWithTimezone = (date) => {
                     type="button"
                     onClick={() => {
                       managePublicPrivateEvent("join");
-                      // generateCertificate();
-                      if(detailData.issueCerificate === "Yes"){
-                        generateCertificate();
-                      }
                     }}
                     // onClick={attendWebinar}
                     style={{

diff --git a/packages/nulp_elite/src/pages/events/eventList.js b/packages/nulp_elite/src/pages/events/eventList.js
@@ -280,7 +280,7 @@ const EventList = (props) => {
     <div>
       <Header globalSearchQuery={globalSearchQuery} />
       {toasterMessage && <ToasterCommon response={toasterMessage} />}
-     <Box sx={{ height: 'calc(100vh - 210px)', overflowY:'auto' }}>
+     <Box>
       <Box>
         {domainList && domainList.length > 0 ? (
           <DomainCarousel