From 69e3dc7c7e6e9d91fa55b547ded9545b0b7120f0 Mon Sep 17 00:00:00 2001
From: paritshivani <shivani_p@techjoomla.com>
Date: Thu, 3 Oct 2024 14:26:34 +0530
Subject: [PATCH 1/3] learnathon content form

---
 .../src/pages/learnathon/lernCreatorForm.js   | 414 ++++++++++--------
 1 file changed, 243 insertions(+), 171 deletions(-)

diff --git a/packages/nulp_elite/src/pages/learnathon/lernCreatorForm.js b/packages/nulp_elite/src/pages/learnathon/lernCreatorForm.js
index d4e0e581..ebc17224 100644
--- a/packages/nulp_elite/src/pages/learnathon/lernCreatorForm.js
+++ b/packages/nulp_elite/src/pages/learnathon/lernCreatorForm.js
@@ -1,4 +1,4 @@
-import React, { useState } from "react";
+import React, { useState, useEffect } from "react";
 import {
   TextField,
   Button,
@@ -9,8 +9,16 @@ import {
   IconButton,
   Typography,
   Box,
+  Grid,
+  Paper,
+  Divider,
 } from "@mui/material";
 import HelpOutlineIcon from "@mui/icons-material/HelpOutline";
+import Footer from "components/Footer";
+import Header from "components/header";
+// const [globalSearchQuery, setGlobalSearchQuery] = useState();
+// // location.state?.globalSearchQuery || undefined
+// const [searchQuery, setSearchQuery] = useState(globalSearchQuery || "");
 
 const categories = [
   "State / UT / SPVs / ULBs / Any Other",
@@ -37,11 +45,11 @@ const LernCreatorForm = () => {
     userName: "",
     email: "",
     mobileNumber: "",
+    submissionIcon: "",
     category: "",
     organisation: "",
     department: "",
     theme: "",
-    otherTheme: "",
     title: "",
     description: "",
     file: null,
@@ -64,6 +72,12 @@ const LernCreatorForm = () => {
       file: e.target.files[0],
     });
   };
+  const handleIconChange = (e) => {
+    setFormData({
+      ...formData,
+      submissionIcon: e.target.files[0],
+    });
+  };
 
   const handleCheckboxChange = (e) => {
     setFormData({
@@ -104,192 +118,250 @@ const LernCreatorForm = () => {
   };
 
   return (
-    <Box p={3} maxWidth={800} mx="auto">
-      <Typography variant="h4" gutterBottom>
-        Lern Creator Form
-      </Typography>
+    <>
+      <Header />
+      <Paper elevation={3} sx={{ padding: "20px", backgroundColor: "#f9f4eb" }}>
+        <Box p={3} maxWidth={800} mx="auto">
+          <Typography variant="h5" gutterBottom>
+            Upload Learnathon Submission
+          </Typography>
 
-      <form>
-        <TextField
-          fullWidth
-          margin="normal"
-          label="User Name*"
-          name="userName"
-          value={formData.userName}
-          onChange={handleChange}
-          required
-        />
+          <Box my={2}>
+            <Button
+              variant="contained"
+              onClick={() => (window.location.href = "/helpdesk")}
+              style={{ float: "right" }}
+            >
+              Need Help
+            </Button>
+          </Box>
 
-        <TextField
-          fullWidth
-          margin="normal"
-          label="Email*"
-          type="email"
-          name="email"
-          value={formData.email}
-          onChange={handleChange}
-          required
-        />
+          <Typography variant="h6" gutterBottom>
+            Participant Details
+          </Typography>
+          <Divider sx={{ marginBottom: "20px" }} />
 
-        <TextField
-          fullWidth
-          margin="normal"
-          label="Mobile Number*"
-          name="mobileNumber"
-          value={formData.mobileNumber}
-          onChange={handleChange}
-          required
-        />
+          <Grid container spacing={2}>
+            <Grid item xs={12} sm={6}>
+              <TextField
+                fullWidth
+                margin="normal"
+                label="User Name*"
+                name="userName"
+                value={formData.userName}
+                onChange={handleChange}
+                required
+              />
+            </Grid>
 
-        <TextField
-          select
-          fullWidth
-          margin="normal"
-          label="Category of Participation*"
-          name="category"
-          value={formData.category}
-          onChange={handleCategoryChange}
-          required
-        >
-          {categories.map((option) => (
-            <MenuItem key={option} value={option}>
-              {option}
-            </MenuItem>
-          ))}
-        </TextField>
+            <Grid item xs={12} sm={6}>
+              <TextField
+                fullWidth
+                margin="normal"
+                label="Email*"
+                type="email"
+                name="email"
+                value={formData.email}
+                onChange={handleChange}
+                required
+              />
+            </Grid>
 
-        {guidelineLink && (
-          <a href={guidelineLink} target="_blank" rel="noopener noreferrer">
-            Link to Guidelines
-          </a>
-        )}
+            <Grid item xs={12} sm={6}>
+              <TextField
+                fullWidth
+                margin="normal"
+                label="Mobile Number*"
+                name="mobileNumber"
+                value={formData.mobileNumber}
+                onChange={handleChange}
+                required
+              />
+            </Grid>
+          </Grid>
 
-        <TextField
-          fullWidth
-          margin="normal"
-          label="Name of Organisation*"
-          name="organisation"
-          value={formData.organisation}
-          onChange={handleChange}
-          required
-        />
+          <Typography variant="h6" gutterBottom style={{ marginTop: "30px" }}>
+            Submission Details
+          </Typography>
+          <Divider sx={{ marginBottom: "20px" }} />
+          <Grid item xs={12}>
+            <div>
+              <Tooltip title="Supported formats: MP4, PDF, HTML5, YouTube links">
+                <IconButton>
+                  <HelpOutlineIcon />
+                </IconButton>
+              </Tooltip>
+              <TextField
+                type="file"
+                fullWidth
+                onChange={handleIconChange}
+                inputProps={{
+                  accept: "jpg,png",
+                }}
+              />
+            </div>
+          </Grid>
 
-        <TextField
-          fullWidth
-          margin="normal"
-          label="Name of Department/Group"
-          name="department"
-          value={formData.department}
-          onChange={handleChange}
-        />
+          <Grid container spacing={2}>
+            <Grid item xs={12} sm={6}>
+              <TextField
+                select
+                fullWidth
+                margin="normal"
+                label="Category of Participation*"
+                name="category"
+                value={formData.category}
+                onChange={handleCategoryChange}
+                required
+              >
+                {categories.map((option) => (
+                  <MenuItem key={option} value={option}>
+                    {option}
+                  </MenuItem>
+                ))}
+              </TextField>
+              {guidelineLink && (
+                <a
+                  href={guidelineLink}
+                  target="_blank"
+                  rel="noopener noreferrer"
+                >
+                  View and Download Guidelines
+                </a>
+              )}
+            </Grid>
 
-        <TextField
-          select
-          fullWidth
-          margin="normal"
-          label="Indicative Theme*"
-          name="theme"
-          value={formData.theme}
-          onChange={handleChange}
-          required
-        >
-          {themes.map((theme) => (
-            <MenuItem key={theme} value={theme}>
-              {theme}
-            </MenuItem>
-          ))}
-        </TextField>
+            <Grid item xs={12} sm={6}>
+              <TextField
+                fullWidth
+                margin="normal"
+                label="Name of Organisation*"
+                name="organisation"
+                value={formData.organisation}
+                onChange={handleChange}
+                required
+              />
+            </Grid>
 
-        {formData.theme === "Others" && (
-          <TextField
-            fullWidth
-            margin="normal"
-            label="Other Theme"
-            name="otherTheme"
-            value={formData.otherTheme}
-            onChange={handleChange}
-          />
-        )}
+            <Grid item xs={12}>
+              <TextField
+                fullWidth
+                margin="normal"
+                label="Name of Department/Group"
+                name="department"
+                value={formData.department}
+                onChange={handleChange}
+              />
+            </Grid>
 
-        <TextField
-          fullWidth
-          margin="normal"
-          label="Title of Submission*"
-          name="title"
-          value={formData.title}
-          onChange={handleChange}
-          inputProps={{ maxLength: 20 }}
-          required
-        />
+            <Grid item xs={12}>
+              <TextField
+                select
+                fullWidth
+                margin="normal"
+                label="Indicative Theme*"
+                name="theme"
+                value={formData.theme}
+                onChange={handleChange}
+                required
+              >
+                {themes.map((theme) => (
+                  <MenuItem key={theme} value={theme}>
+                    {theme}
+                  </MenuItem>
+                ))}
+              </TextField>
+            </Grid>
 
-        <TextField
-          fullWidth
-          margin="normal"
-          label="Description*"
-          name="description"
-          value={formData.description}
-          onChange={handleChange}
-          multiline
-          rows={3}
-          inputProps={{ maxLength: 100 }}
-          required
-        />
+            <Grid item xs={12}>
+              <TextField
+                fullWidth
+                margin="normal"
+                label="Title of Submission*"
+                name="title"
+                value={formData.title}
+                onChange={handleChange}
+                inputProps={{ maxLength: 20 }}
+                required
+              />
+            </Grid>
 
-        <div>
-          <Tooltip title="Supported formats: MP4, PDF, HTML5, YouTube links">
-            <IconButton>
-              <HelpOutlineIcon />
-            </IconButton>
-          </Tooltip>
-          <TextField
-            type="file"
-            onChange={handleFileChange}
-            inputProps={{
-              accept: "video/mp4,application/pdf,text/html,video/youtube",
-            }}
-          />
-        </div>
+            <Grid item xs={12}>
+              <TextField
+                fullWidth
+                margin="normal"
+                label="Description*"
+                name="description"
+                value={formData.description}
+                onChange={handleChange}
+                multiline
+                rows={3}
+                inputProps={{ maxLength: 100 }}
+                required
+              />
+            </Grid>
 
-        <FormControlLabel
-          control={
-            <Checkbox
-              checked={formData.consent}
-              onChange={handleCheckboxChange}
-              name="consent"
-            />
-          }
-          label="I accept the terms and conditions"
-        />
+            <Grid item xs={12}>
+              <div>
+                <Tooltip title="Supported formats: MP4, PDF, HTML5, YouTube links">
+                  <IconButton>
+                    <HelpOutlineIcon />
+                  </IconButton>
+                </Tooltip>
+                <TextField
+                  type="file"
+                  fullWidth
+                  onChange={handleFileChange}
+                  inputProps={{
+                    accept: "video/mp4,application/pdf,text/html,video/youtube",
+                  }}
+                />
+              </div>
+            </Grid>
+          </Grid>
 
-        <Box mt={2}>
-          <Button
-            variant="contained"
-            color="primary"
-            onClick={() => handleSubmit("draft")}
-            style={{ marginRight: 10 }}
-          >
-            Save as Draft
-          </Button>
+          <FormControlLabel
+            control={
+              <Checkbox
+                checked={formData.consent}
+                onChange={handleCheckboxChange}
+                name="consent"
+              />
+            }
+            label="I accept the terms and conditions"
+          />
 
-          <Button
-            variant="contained"
-            color="secondary"
-            onClick={() => handleSubmit("review")}
+          <Typography
+            variant="body2"
+            color="textSecondary"
+            gutterBottom
+            style={{ marginTop: "20px" }}
           >
-            Send for Review
-          </Button>
-        </Box>
-      </form>
+            Your submission will be used for NULP purposes only and your
+            personal details will not be disclosed to any entity.
+          </Typography>
 
-      <Box mt={4}>
-        <Button
-          variant="outlined"
-          onClick={() => (window.location.href = "/helpdesk")}
-        >
-          Need Help
-        </Button>
-      </Box>
-    </Box>
+          <Box mt={3} display="flex" justifyContent="space-between">
+            <Button
+              variant="contained"
+              color="primary"
+              onClick={() => handleSubmit("draft")}
+            >
+              Save as Draft
+            </Button>
+
+            <Button
+              variant="contained"
+              color="secondary"
+              onClick={() => handleSubmit("review")}
+            >
+              Submit
+            </Button>
+          </Box>
+        </Box>
+      </Paper>
+      <Footer />
+    </>
   );
 };
 

From 4d6ca9d2e31ae5ffac10841539496f014e5ce6d8 Mon Sep 17 00:00:00 2001
From: sonaligarud <sonali.garud@tekditechnologies.com>
Date: Fri, 4 Oct 2024 13:30:04 +0530
Subject: [PATCH 2/3] Task #228134 - Registration side changes for learnathon
 (webapp)-changed channel spelling

---
 packages/nulp_elite/src/components/learnathon/LernModal.js | 4 ++--
 packages/nulp_elite/src/pages/search/DomainList.js         | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/nulp_elite/src/components/learnathon/LernModal.js b/packages/nulp_elite/src/components/learnathon/LernModal.js
index b21c6651..c893be20 100644
--- a/packages/nulp_elite/src/components/learnathon/LernModal.js
+++ b/packages/nulp_elite/src/components/learnathon/LernModal.js
@@ -53,7 +53,7 @@ const LernModal = () => {
     p: 4,
     overflow: "auto",
   };
-
+  console.log(lernUser,'lernUser form modal');
   return (
     <div>
       <Modal
@@ -84,7 +84,7 @@ const LernModal = () => {
             </Typography>
           </Box>
           <Box className='lg-mt-30'>
-            {lernUser === 'nulp-lern' ? (
+            {lernUser === 'nulp-learn' ? (
               <a class="viewAll">{t("CREATE_CONTENT")}</a>
             ) : (
               <a class="viewAll">{t("REQUEST_TO_CREATE")}</a>
diff --git a/packages/nulp_elite/src/pages/search/DomainList.js b/packages/nulp_elite/src/pages/search/DomainList.js
index bef02eee..d7040959 100644
--- a/packages/nulp_elite/src/pages/search/DomainList.js
+++ b/packages/nulp_elite/src/pages/search/DomainList.js
@@ -402,6 +402,8 @@ const DomainList = ({ globalSearchQuery }) => {
       onMobileSearch();
     }
   };
+  console.log(lernUser,'lernUser from dashboard');
+  
 
   return (
     <div>
@@ -519,7 +521,7 @@ const DomainList = ({ globalSearchQuery }) => {
                 </Grid>
                 <Grid item xs={12} md={2} lg={2}>
                   <Box className='mt-20'>
-                    {lernUser === 'nulp-lern' ? (
+                    {lernUser === 'nulp-learn' ? (
                       <a class="viewAll">{t("CREATE_CONTENT")}</a>
                     ) : (
                       <a class="viewAll">{t("REQUEST_TO_CREATE")}</a>

From 930625a1536913801316d05663f229599aa68f33 Mon Sep 17 00:00:00 2001
From: sonaligarud <sonali.garud@tekditechnologies.com>
Date: Fri, 4 Oct 2024 13:36:55 +0530
Subject: [PATCH 3/3] Task #228134 - [FE] - Registration side changes for
 learnathon (webapp)-updated channel name

---
 packages/nulp_elite/src/components/learnathon/LernModal.js | 1 -
 packages/nulp_elite/src/pages/search/DomainList.js         | 7 +++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/nulp_elite/src/components/learnathon/LernModal.js b/packages/nulp_elite/src/components/learnathon/LernModal.js
index c893be20..19b3248a 100644
--- a/packages/nulp_elite/src/components/learnathon/LernModal.js
+++ b/packages/nulp_elite/src/components/learnathon/LernModal.js
@@ -16,7 +16,6 @@ const LernModal = () => {
 
   const [lernUser, setLernUser] = useState([]);
   const _userId = util.userId();
-
   const handleClose = () => {
     setIsModalOpen(false);
     sessionStorage.setItem('isModalShown', 'true'); // Set flag to not show modal again
diff --git a/packages/nulp_elite/src/pages/search/DomainList.js b/packages/nulp_elite/src/pages/search/DomainList.js
index d7040959..d38a0483 100644
--- a/packages/nulp_elite/src/pages/search/DomainList.js
+++ b/packages/nulp_elite/src/pages/search/DomainList.js
@@ -402,8 +402,8 @@ const DomainList = ({ globalSearchQuery }) => {
       onMobileSearch();
     }
   };
-  console.log(lernUser,'lernUser from dashboard');
-  
+  console.log(lernUser, 'lernUser from dashboard');
+
 
   return (
     <div>
@@ -505,8 +505,7 @@ const DomainList = ({ globalSearchQuery }) => {
 
           {error && <Alert severity="error">{error}</Alert>}
           <Box
-            className="lern-box"
-          >
+            className="lern-box">
             <Box>
               <Grid container>
                 <Grid item xs={12} md={12} lg={12}>