Skip to content

Commit

Permalink
Merge pull request #577 from NIUANULP/main
Browse files Browse the repository at this point in the history 
deplyment -5 sept
  • Loading branch information
@paritshivani
paritshivani authored Sep 5, 2024
2 parents 2c3fd6c + 8fb7172 commit c31e6b9
Show file tree
Hide file tree
Showing 20 changed files with 330 additions and 140 deletions.
18 changes: 17 additions & 1 deletion packages/nulp_elite/public/locales/be/translation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,5 +277,21 @@
"ALL_PLAYER":"সমস্ত খেলোয়াড়",
"LICENSEDETAILS":"লাইসেন্সের বিবরণ",
"ABOUTTHECONTENT":"বিষয়বস্তু সম্পর্কে",
"COPYRIGHT":"কপিরাইট"
"COPYRIGHT":"কপিরাইট",

"NO_POLL_AVAILABLE":"কোন পোল উপলব্ধ নেই",
"CLOSED_POLLS":"বন্ধ পোল",
"DRAFT_POLLS":"খসড়া পোল",
"ENDED_ON":"শেষ হয়েছে",
"YES_" : "হ্যাঁ",
"NO_":"না",
"CONFIRM_POLL_DELETE":"আপনি কি নিশ্চিত যে আপনি এই পোলটি বাতিল করতে চান?",
"TOTAL_VOTES":"মোট ভোট",
"NO_DATA_FOUND":"কোন ডেটা উপলব্ধ নেই",
"VIEW_RESULT":"ফলাফল দেখুন",
"DELETE_":"মুছুন",
"EDIT_":"সম্পাদনা করুন",
"VIEW_STATUS":"স্থিতি দেখুন",
"SEARCH_FOR_POLL":"একটি পোল অনুসন্ধান করুন",
"NO_POLL_AVAILABLE_NOW":" মনে হচ্ছে এই মুহূর্তে কোনো ভোট নেই৷"
}
18 changes: 17 additions & 1 deletion packages/nulp_elite/public/locales/en/translation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,5 +296,21 @@
"ALL_PLAYER":"All Player",
"LICENSEDETAILS":"license Details",
"ABOUTTHECONTENT":"About The Content",
"COPYRIGHT":"Copyright"
"COPYRIGHT":"Copyright",

"NO_POLL_AVAILABLE":"No polls available",
"CLOSED_POLLS":"Closed Polls",
"DRAFT_POLLS":"Draft Polls",
"ENDED_ON":"Ended on",
"YES":"Yes",
"NO":"No",
"CONFIRM_POLL_DELETE":"Are you sure you want to delere this poll?",
"TOTAL_VOTES":"Total Votes",
"NO_DATA_FOUND":"No data available ",
"VIEW_RESULT":"View Results",
"DELETE":"Delete",
"EDIT":"Edit",
"VIEW_STATUS":"View Status",
"SEARCH_FOR_POLL":"Search for a Poll",
"NO_POLL_AVAILABLE_NOW":" It looks like there are no polls at the moment."
}
17 changes: 16 additions & 1 deletion packages/nulp_elite/public/locales/gg/translation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -288,5 +288,20 @@
"COPYRIGHT":"പകർപ്പവകാശം",
"SELECT_CATEGORY_FIRST":"કૃપા કરીને પ્રથમ શ્રેણી પસંદ કરો",
"SELECT_PREF":"પસંદગીઓ પસંદ કરો",
"CHANGE_PREF_OLD_USER":"અમે ફ્રેમવર્કમાં કેટલાક ફેરફારો કર્યા છે કૃપા કરીને તમારી પસંદગી પસંદ કરો"
"CHANGE_PREF_OLD_USER":"અમે ફ્રેમવર્કમાં કેટલાક ફેરફારો કર્યા છે કૃપા કરીને તમારી પસંદગી પસંદ કરો",

"NO_POLL_AVAILABLE":"કોઈ મતદાન ઉપલબ્ધ નથી",
"CLOSED_POLLS":"બંધ મતદાન",
"DRAFT_POLLS":"ડ્રાફ્ટ મતદાન",
"ENDED_ON":"આના રોજ સમાપ્ત",
"YES_" : "હા",
"NO_":"ના",
"CONFIRM_POLL_DELETE":"શું તમે ખરેખર આ મતદાન રદ કરવા માંગો છો?",
"NO_DATA_FOUND":"કોઈ ડેટા ઉપલબ્ધ નથી",
"VIEW_RESULT":"પરિણામો જુઓ",
"DELETE_":"કાઢી નાખો",
"EDIT_":"સંપાદિત કરો",
"VIEW_STATUS":"સ્થિતિ જુઓ",
"SEARCH_FOR_POLL":"મતદાન માટે શોધો",
"NO_POLL_AVAILABLE_NOW":" એવું લાગે છે કે અત્યારે કોઈ મતદાન નથી."
}
17 changes: 16 additions & 1 deletion packages/nulp_elite/public/locales/hi/translation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,21 @@
"COPYRIGHT":"कॉपीराइट",
"SELECT_CATEGORY_FIRST":"कृपया पहले एक श्रेणी चुनें",
"SELECT_PREF":"प्राथमिकताएँ चुनें",
"CHANGE_PREF_OLD_USER":"हमने ढांचे में कुछ बदलाव किए हैं कृपया अपनी प्राथमिकता चुनें"
"CHANGE_PREF_OLD_USER":"हमने ढांचे में कुछ बदलाव किए हैं कृपया अपनी प्राथमिकता चुनें",

"NO_POLL_AVAILABLE": "कोई मतदान उपलब्ध नहीं",
"CLOSED_POLLS":"बंद किए गए मतदान",
"DRAFT_POLLS":"ड्राफ्ट पोल",
"ENDED_ON":"समाप्त",
"YES":"हां",
"NO" : "नहीं",
"CONFIRM_POLL_DELETE":"क्या आप वाकई इस पोल को हटाना चाहते हैं?",
"TOTAL_VOTES":"कुल वोट",
"NO_DATA_FOUND": "कोई डेटा उपलब्ध नहीं",
"VIEW_RESULT":"परिणाम देखें",
"DELETE": "हटाएं",
"EDIT":"संपादित करें",
"VIEW_STATUS":"स्थिति देखें",
"SEARCH_FOR_POLL":"पोल खोजें",
"NO_POLL_AVAILABLE_NOW":" ऐसा लगता है कि इस समय कोई मतदान नहीं है।"
}
18 changes: 17 additions & 1 deletion packages/nulp_elite/public/locales/ma/translation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,5 +279,21 @@
"COPYRIGHT":"कॉपीराइट",
"SELECT_CATEGORY_FIRST":"कृपया प्रथम श्रेणी निवडा",
"SELECT_PREF":"प्राधान्ये निवडा",
"CHANGE_PREF_OLD_USER":"आम्ही फ्रेमवर्कमध्ये काही बदल केले आहेत कृपया तुमचे प्राधान्य निवडा"
"CHANGE_PREF_OLD_USER":"आम्ही फ्रेमवर्कमध्ये काही बदल केले आहेत कृपया तुमचे प्राधान्य निवडा",

"NO_POLL_AVAILABLE":"कोणतेही मतदान उपलब्ध नाही",
"CLOSED_POLLS":"बंद मतदान",
"DRAFT_POLLS":"मसुदा मतदान",
"ENDED_ON":"रोजी समाप्त",
"YES" : "होय",
"NO":"नाही",
"CONFIRM_POLL_DELETE":"तुम्हाला खात्री आहे की तुम्ही हे मतदान हटवू इच्छिता?",
"TOTAL_VOTES":"एकूण मते",
"NO_DATA_FOUND":"कोणताही डेटा उपलब्ध नाही",
"VIEW_RESULT":"परिणाम पहा",
"DELETE":"हटवा",
"EDIT":"संपादित करा",
"VIEW_STATUS":"स्थिती पहा",
"SEARCH_FOR_POLL":"पोल शोधा",
"NO_POLL_AVAILABLE_NOW":" असे दिसते की याक्षणी कोणतेही मतदान नाहीत."
}
18 changes: 17 additions & 1 deletion packages/nulp_elite/public/locales/mal/translation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,5 +279,21 @@
"COPYRIGHT":"പകർപ്പവകാശം",
"SELECT_CATEGORY_FIRST":"ദയവായി ആദ്യം ഒരു വിഭാഗം തിരഞ്ഞെടുക്കുക",
"SELECT_PREF":"മുൻഗണനകൾ തിരഞ്ഞെടുക്കുക",
"CHANGE_PREF_OLD_USER":"ചട്ടക്കൂടിൽ ഞങ്ങൾ ചില മാറ്റങ്ങൾ വരുത്തിയിട്ടുണ്ട് ദയവായി നിങ്ങളുടെ മുൻഗണന തിരഞ്ഞെടുക്കുക"
"CHANGE_PREF_OLD_USER":"ചട്ടക്കൂടിൽ ഞങ്ങൾ ചില മാറ്റങ്ങൾ വരുത്തിയിട്ടുണ്ട് ദയവായി നിങ്ങളുടെ മുൻഗണന തിരഞ്ഞെടുക്കുക" ,

"NO_POLL_AVAILABLE":"വോട്ടെടുപ്പുകളൊന്നും ലഭ്യമല്ല",
"CLOSED_POLLS":"അടച്ച വോട്ടെടുപ്പുകൾ",
"DRAFT_POLLS":"ഡ്രാഫ്റ്റ് പോൾസ്",
"ENDED_ON":"അവസാനിച്ചത്",
"YES" : "അതെ",
"NO":"ഇല്ല",
"CONFIRM_POLL_DELETE":"ഈ വോട്ടെടുപ്പ് ഇല്ലാതാക്കണമെന്ന് തീർച്ചയാണോ?",
"TOTAL_VOTES":"ആകെ വോട്ടുകൾ",
"NO_DATA_FOUND":"ഡാറ്റയൊന്നും ലഭ്യമല്ല",
"VIEW_RESULT":"ഫലങ്ങൾ കാണുക",
"DELETE":"ഇല്ലാതാക്കുക",
"EDIT":"എഡിറ്റ്",
"VIEW_STATUS":"നില കാണുക",
"SEARCH_FOR_POLL":"ഒരു വോട്ടെടുപ്പിനായി തിരയുക",
"NO_POLL_AVAILABLE_NOW":" ഇപ്പോൾ വോട്ടെടുപ്പുകളൊന്നും ഇല്ലെന്ന് തോന്നുന്നു."
}
18 changes: 17 additions & 1 deletion packages/nulp_elite/public/locales/ta/translation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,22 @@
"COPYRIGHT":"காப்புரிமை",
"SELECT_CATEGORY_FIRST":"முதலில் ஒரு வகையைத் தேர்ந்தெடுக்கவும்",
"SELECT_PREF":"Select Preferences",
"CHANGE_PREF_OLD_USER":"கட்டமைப்பில் சில மாற்றங்களைச் செய்துள்ளோம், உங்கள் விருப்பத்தைத் தேர்ந்தெடுக்கவும்"
"CHANGE_PREF_OLD_USER":"கட்டமைப்பில் சில மாற்றங்களைச் செய்துள்ளோம், உங்கள் விருப்பத்தைத் தேர்ந்தெடுக்கவும்",

"NO_POLL_AVAILABLE":"வாக்கெடுப்புகள் இல்லை",
"CLOSED_POLLS":"மூடப்பட்ட கருத்துக்கணிப்புகள்",
"DRAFT_POLLS":"வரைவு வாக்கெடுப்புகள்",
"ENDED_ON":"முடிந்தது",
"YES" : "ஆம்",
"NO":"இல்லை",
"CONFIRM_POLL_DELETE":"இந்த வாக்கெடுப்பை நிச்சயமாக நீக்க விரும்புகிறீர்களா?",
"TOTAL_VOTES":"மொத்த வாக்குகள்",
"NO_DATA_FOUND":"தரவு இல்லை",
"VIEW_RESULT":"முடிவுகளைக் காண்க",
"DELETE":"நீக்கு",
"EDIT":"திருத்து",
"VIEW_STATUS":"நிலையைக் காண்க",
"SEARCH_FOR_POLL":"வாக்கெடுப்பைத் தேடு",
"NO_POLL_AVAILABLE_NOW":" தற்போது வாக்கெடுப்பு எதுவும் இல்லை என்பது போல் தெரிகிறது."

}
18 changes: 17 additions & 1 deletion packages/nulp_elite/public/locales/te/translation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,5 +242,21 @@
"COPYRIGHT":"కాపీరైట్",
"SELECT_CATEGORY_FIRST":"దయచేసి ముందుగా ఒక వర్గాన్ని ఎంచుకోండి",
"SELECT_PREF":"ప్రాధాన్యతలను ఎంచుకోండి",
"CHANGE_PREF_OLD_USER":"మేము ఫ్రేమ్‌వర్క్‌లో కొన్ని మార్పులు చేసాము దయచేసి మీ ప్రాధాన్యతను ఎంచుకోండి"
"CHANGE_PREF_OLD_USER":"మేము ఫ్రేమ్‌వర్క్‌లో కొన్ని మార్పులు చేసాము దయచేసి మీ ప్రాధాన్యతను ఎంచుకోండి",

"NO_POLL_AVAILABLE":"పోల్‌లు ఏవీ అందుబాటులో లేవు",
"CLOSED_POLLS":"క్లోజ్డ్ పోల్స్",
"DRAFT_POLLS":"డ్రాఫ్ట్ పోల్స్",
"ENDED_ON":"ముగిసినది",
"YES" : "అవును",
"NO":"లేదు",
"CONFIRM_POLL_DELETE":"మీరు ఖచ్చితంగా ఈ పోల్‌ను తొలగించాలనుకుంటున్నారా?",
"TOTAL_VOTES":"మొత్తం ఓట్లు",
"NO_DATA_FOUND":"డేటా అందుబాటులో లేదు",
"VIEW_RESULT":"ఫలితాలను వీక్షించండి",
"DELETE":"తొలగించు",
"EDIT":"సవరించు",
"VIEW_STATUS":" స్థితిని వీక్షించండి",
"SEARCH_FOR_POLL":"పోల్ కోసం శోధించు",
"NO_POLL_AVAILABLE_NOW":" ప్రస్తుతం పోల్‌లు లేనట్లు కనిపిస్తోంది."
}
6 changes: 4 additions & 2 deletions packages/nulp_elite/src/components/domainCarousel.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,8 @@ export default function DomainCarousel({
)}

{isBoxVisible && (
<Box style={{ position: "relative" }} className="bg-darkblue">
<>
<Box className="bg-darkblue1">
<Box className="carousel-bx pt-12">
<Container
role="main"
Expand Down Expand Up @@ -318,7 +319,6 @@ export default function DomainCarousel({
style={{
textAlign: "center",
margin: "0 auto",
marginTop: "-21px",
}}
>
<Button
Expand All @@ -333,6 +333,8 @@ export default function DomainCarousel({
</Container>
</Box>
</Box>
<Box className="height-200"></Box>
</>
)}
</>
)}
Expand Down
69 changes: 45 additions & 24 deletions packages/nulp_elite/src/pages/FAQPage.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const FAQPage = () => {
const [faqData, setFaqData] = useState([]);
const [selectedCategory, setSelectedCategory] = useState("Login");
const [error, setError] = useState(null);
const setLanguage = localStorage.getItem('lang')|| 'en';
const setLanguage = localStorage.getItem('lang') || 'en';
let url;
if (setLanguage === 'en') {
url = "https://nulpstorage1.blob.core.windows.net/public/portal-faq/resources/res/faq-en.json";
Expand All @@ -35,12 +35,12 @@ const FAQPage = () => {
url = "https://nulpstorage1.blob.core.windows.net/public/portal-faq/resources/res/faq-ta.json";
} else if (setLanguage === 'be') {
url = "https://nulpstorage1.blob.core.windows.net/public/portal-faq/resources/res/faq-be.json";
}else if (setLanguage==='ma'){
} else if (setLanguage === 'ma') {
url = "https://nulpstorage1.blob.core.windows.net/public/portal-faq/resources/res/faq-mr.json";
}else if(setLanguage==='mal'){
url="https://nulpstorage1.blob.core.windows.net/public/portal-faq/resources/res/faq-ml.json";
} else if (setLanguage === 'mal') {
url = "https://nulpstorage1.blob.core.windows.net/public/portal-faq/resources/res/faq-ml.json";
}


useEffect(() => {
setError(null);
Expand All @@ -58,12 +58,12 @@ const FAQPage = () => {
console.error("Error fetching FAQ data:", error);
setError(error.message);
});
}, [url,setLanguage]);
}, [url, setLanguage]);

return (
<div>
<Header />
{setLanguage && url && <Container maxWidth="xl" role="main" className="min-472 pb-30">
{setLanguage && url && <Container maxWidth="xl" role="main" className="min-472 pb-30">
{error && (
<Alert severity="error" className="my-10">
{error}
Expand All @@ -74,26 +74,47 @@ const FAQPage = () => {
</Box>
<Grid container spacing={2}>
<Grid item xs={12} lg={3}>
<ul className="bg-white h6-title" style={{ borderRadius: "5px" }}>
<Box
sx={{ fontSize: "18px", color: "#484848", paddingLeft: "18px" }}
<Accordion

style={{
background: "#f9fafc",
borderRadius: "10px",
marginTop: "10px",
maxHeight: "calc(100vh - 20px)",
overflow: "auto",
}}
>
<AccordionSummary
expandIcon={<ExpandMoreIcon />}
style={{
background: "#F9FAFC",
borderRadius: "10px",
position: "sticky",
top: "0",
zIndex: "1",
}}
className="h5-title"
>
{t("SELECT_CATEGORY")}
</Box>
{faqData.map((category, index) => (
<li
key={index}
onClick={() => setSelectedCategory(category.name)}
className={
selectedCategory === category.name ? classes.active : ""
} // Apply active class
style={{ cursor: "pointer" }}
>
{t(category.name.toUpperCase())}
</li>
))}
</ul>
</AccordionSummary>
<AccordionDetails
style={{ background: "#fff" }}
className="h6-title"
>
{faqData.map((category, index) => (
<li
key={index}
onClick={() => setSelectedCategory(category.name)}
className={
selectedCategory === category.name ? classes.active : ""
}
style={{ cursor: "pointer", marginBottom: "10px" }}
>
{t(category.name.toUpperCase())}
</li>
))}
</AccordionDetails>
</Accordion>
</Grid>
<Grid item xs={12} lg={9}>
{faqData
Expand Down
23 changes: 16 additions & 7 deletions packages/nulp_elite/src/pages/connections/chat.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ const moment = require("moment");
const timezone = require("moment-timezone");
import Picker from "emoji-picker-react";
const routeConfig = require("../../configs/routeConfig.json");
import CloseIcon from "@mui/icons-material/Close";
const useStyles = makeStyles((theme) => ({
chatContainer: {
display: "flex",
Expand Down Expand Up @@ -101,6 +102,7 @@ const Chat = ({
senderUserId: propSenderUserId,
receiverUserId: propReceiverUserId,
onChatSent,
onClose
}) => {
const classes = useStyles();
const [message, setMessage] = useState("");
Expand Down Expand Up @@ -540,7 +542,7 @@ const Chat = ({
<ArrowBackIcon />
</IconButton>
)}
{receiverData && receiverData?.length > 0 && (
{receiverData && receiverData?.length > 0 && (
<Box
sx={{
fontSize: "20px",
Expand All @@ -550,15 +552,22 @@ const Chat = ({
textAlign: "left",
}}
>
<div>
<Typography className="h2-title chat-hed">
<Box display="flex" justifyContent="space-between" alignItems="center">
<Box>
<Typography className="h2-title chat-hed">
{receiverData[0].firstName}{" "}
{receiverData[0].lastName && receiverData[0].lastName}
</Typography>
<Box className="h5-title">{receiverData[0].designation}</Box>
</div>
</Typography>
<Box className="h5-title">{receiverData[0].designation}</Box>
</Box>
<Box>
<IconButton onClick={onClose}>
<CloseIcon />
</IconButton>
</Box>
</Box>
</Box>
)}
)}
</Box>

{receiverData && receiverData?.length > 0 && messages.length > 0 && (
Expand Down
1 change: 1 addition & 0 deletions packages/nulp_elite/src/pages/content/joinCourse.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1989,6 +1989,7 @@ className="lg-hide accordionBoxShadow"
senderUserId={_userId}
receiverUserId={creatorId}
onChatSent={handleClose}
onClose={handleClose}
/>{" "}
</div>
</Modal>
Expand Down
Loading

0 comments on commit c31e6b9

Please sign in to comment.