Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[21 Aug] Merging main into prod-main #514

Merged
merged 17 commits into from
Aug 21, 2024
Merged

[21 Aug] Merging main into prod-main #514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
7b768e7
Merge branch 'main' of https://github.com/NIUANULP/nulp-elite-ui into…
mahajanmahesh935 Aug 20, 2024
2a07fb2
Task #225311 - [FE] - content player detail page changes
sonaliTekdi Aug 21, 2024
a92e692
Merge pull request #507 from sonaliTekdi/UI_changes
paritshivani Aug 21, 2024
4f712a4
Bug #224621 - Pie Chart Option Text Not Fully Visible
sonaliTekdi Aug 21, 2024
d3a8fb3
TASK : #0000 Enrollment list API integration Changes
mahajanmahesh935 Aug 21, 2024
f9af23b
Merge branch 'main' of https://github.com/NIUANULP/nulp-elite-ui into…
mahajanmahesh935 Aug 21, 2024
055eb8d
Merge pull request #509 from mahajanmahesh935/main
paritshivani Aug 21, 2024
a0ee658
Merge pull request #508 from sonaliTekdi/UI_changes
paritshivani Aug 21, 2024
5afa540
TASK : #0000 changed consumerId from user orgId to course orgId
mahajanmahesh935 Aug 21, 2024
cc7f904
Merge pull request #510 from mahajanmahesh935/main
paritshivani Aug 21, 2024
f0eb0f4
Bug #225319 - filter by and clear All button allignment are not prope…
sonaliTekdi Aug 21, 2024
f3cd69d
Merge pull request #511 from sonaliTekdi/UI_changes
paritshivani Aug 21, 2024
962a9f6
Bug #224623 -Calendar Icon and Voting Icon Not Properly Aligned on Po…
sonaliTekdi Aug 21, 2024
0039bf2
Merge pull request #512 from sonaliTekdi/UI_changes
ManojNathIC Aug 21, 2024
3c07169
Task #0000:Removed = from url of details page
Aug 21, 2024
090f626
Merge branch 'main' of https://github.com/NIUANULP/nulp-elite-ui into…
Aug 21, 2024
7a85142
Merge pull request #513 from ManojNathIC/polls
ManojNathIC Aug 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion packages/nulp_elite/public/locales/be/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,5 +262,9 @@
"BLOCKED_USERS": "ব্লক করা ব্যবহারকারীরা",
"What do you want to learn today? ": "আজ আপনি কী শিখতে চান?",
"REGISTRATION_FORM": "ইভেন্টের জন্য নিবন্ধন করুন",
"COURSE & CERTIFICATES":"কোর্স এবং সার্টিফিকেট"
"COURSE & CERTIFICATES":"কোর্স এবং সার্টিফিকেট",
"ALL_PLAYER":"সমস্ত খেলোয়াড়",
"LICENSEDETAILS":"লাইসেন্সের বিবরণ",
"ABOUTTHECONTENT":"বিষয়বস্তু সম্পর্কে",
"COPYRIGHT":"কপিরাইট"
}
6 changes: 5 additions & 1 deletion packages/nulp_elite/public/locales/en/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,5 +282,9 @@
"UPDATE_VOTE": "Update Vote",
"What do you want to learn today? ": "What do you want to learn today? ",
"REGISTRATION_FORM": "Register For Event",
"COURSE & CERTIFICATES":"Course & Certificates"
"COURSE & CERTIFICATES":"Course & Certificates",
"ALL_PLAYER":"All Player",
"LICENSEDETAILS":"license Details",
"ABOUTTHECONTENT":"About The Content",
"COPYRIGHT":"Copyright"
}
6 changes: 5 additions & 1 deletion packages/nulp_elite/public/locales/gg/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,5 +270,9 @@
"BLOCKED_USERS": "અબ્લોક કરેલા યૂઝર્સ",
"What do you want to learn today? ": "આજે તમે શું શીખવા માંગો છો?",
"REGISTRATION_FORM": "ઇવેન્ટ માટે નોંધણી કરો",
"COURSE & CERTIFICATES": "અભ્યાસક્રમ અને પ્રમાણપત્રો"
"COURSE & CERTIFICATES": "અભ્યાસક્રમ અને પ્રમાણપત્રો",
"ALL_PLAYER":"എല്ലാ കളിക്കാരും",
"LICENSEDETAILS":"ലൈസൻസ് വിശദാംശങ്ങൾ",
"ABOUTTHECONTENT":"ഉള്ളടക്കത്തെ കുറിച്ച്",
"COPYRIGHT":"പകർപ്പവകാശം"
}
6 changes: 5 additions & 1 deletion packages/nulp_elite/public/locales/hi/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,5 +261,9 @@
"BLOCKED_USERS": "ब्लॉक किए गए उपयोगकर्ता",
"What do you want to learn today? ": "आज आप क्या सीखना चाहते हैं?",
"REGISTRATION_FORM": "इवेंट के लिए पंजीकरण करें",
"COURSE & CERTIFICATES": "पाठ्यक्रम एवं प्रमाणपत्र"
"COURSE & CERTIFICATES": "पाठ्यक्रम एवं प्रमाणपत्र",
"ALL_PLAYER":"सभी प्लेयर",
"LICENSEDETAILS":"लाइसेंस विवरण",
"ABOUTTHECONTENT":"सामग्री के बारे में",
"COPYRIGHT":"कॉपीराइट"
}
6 changes: 5 additions & 1 deletion packages/nulp_elite/public/locales/ma/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,5 +262,9 @@
"BLOCKED_USERS": "ब्लॉक वापरकर्ते",
"What do you want to learn today? ": "आज तुम्हाला काय शिकायचे आहे?",
"REGISTRATION_FORM": "इव्हेंटसाठी नोंदणी करा",
"COURSE & CERTIFICATES": "अभ्यासक्रम आणि प्रमाणपत्रे"
"COURSE & CERTIFICATES": "अभ्यासक्रम आणि प्रमाणपत्रे",
"ALL_PLAYER":"सर्व प्लेयर",
"LICENSEDETAILS":"परवाना तपशील",
"ABOUTTHECONTENT":"सामग्री बद्दल",
"COPYRIGHT":"कॉपीराइट"
}
6 changes: 5 additions & 1 deletion packages/nulp_elite/public/locales/mal/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,5 +262,9 @@
"BLOCKED_USERS": "അടച്ച ഉപയോക്താക്കൾ",
"What do you want to learn today? ": "ഇന്ന് നിങ്ങൾ എന്താണ് പഠിക്കാൻ ആഗ്രഹിക്കുന്നത്?",
"REGISTRATION_FORM": "ഇവെന്റിനായി രജിസ്റ്റർ ചെയ്യുക",
"COURSE & CERTIFICATES": "കോഴ്സും സർട്ടിഫിക്കറ്റുകളും"
"COURSE & CERTIFICATES": "കോഴ്സും സർട്ടിഫിക്കറ്റുകളും",
"ALL_PLAYER":"എല്ലാ കളിക്കാരും",
"LICENSEDETAILS":"ലൈസൻസ് വിശദാംശങ്ങൾ",
"ABOUTTHECONTENT":"ഉള്ളടക്കത്തെ കുറിച്ച്",
"COPYRIGHT":"പകർപ്പവകാശം"
}
6 changes: 5 additions & 1 deletion packages/nulp_elite/public/locales/ta/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,5 +285,9 @@
"BLOCKED_USERS": "தடுக்கும் பயனர்கள்",
"What do you want to learn today? ": "இன்று நீங்கள் என்ன கற்க விரும்புகிறீர்கள்?",
"REGISTRATION_FORM": "நிகழ்வுக்கு பதிவு செய்யுங்கள்",
"COURSE & CERTIFICATES": "பாடநெறி & சான்றிதழ்கள்"
"COURSE & CERTIFICATES": "பாடநெறி & சான்றிதழ்கள்",
"ALL_PLAYER":"அனைத்து வீரர்",
"LICENSEDETAILS":"உரிம விவரங்கள்",
"ABOUTTHECONTENT":"உள்ளடக்கம் பற்றி",
"COPYRIGHT":"காப்புரிமை"
}
6 changes: 5 additions & 1 deletion packages/nulp_elite/public/locales/te/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,5 +223,9 @@
"EVENTS_DASHBOARD": "ఈవెంట్స్ డాష్‌బోర్డ్",
"TOTAl_EVENTS": "మొత్తం ఈవెంట్స్",
"EVENTS_THIS_MONTH": "ఈ నెలలో ఈవెంట్స్",
"COURSE & CERTIFICATES": "కోర్సు & సర్టిఫికెట్లు"
"COURSE & CERTIFICATES": "కోర్సు & సర్టిఫికెట్లు",
"ALL_PLAYER":"అన్ని ఆటగాడు",
"LICENSEDETAILS":"లైసెన్స్ వివరాలు",
"ABOUTTHECONTENT":"కంటెంట్ గురించి",
"COPYRIGHT":"కాపీరైట్"
}
23 changes: 10 additions & 13 deletions packages/nulp_elite/src/components/VotingDrawerFilter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ const VotingDrawerFilter = ({ onFilterChange }) => {
onClick={(event) => {
event.stopPropagation();
}}
// onKeyDown={toggleDrawer(anchor, false)}
// onKeyDown={toggleDrawer(anchor, false)}
>
<Box>
<Box className="filter-title">{t("FILTER_BY")} : </Box>
Expand Down Expand Up @@ -216,19 +216,16 @@ const VotingDrawerFilter = ({ onFilterChange }) => {
</Box>
) : (
<Box className="header-bg-blue p-15 filter-bx xs-hide">
<Box className="d-flex jc-bw" style={{ paddingTop: "10px" }}>
<Box className="d-flex jc-bw">
<Box className="filter-title">Filter By:</Box>
<Button
type="button"
className="viewAll mb-20"
onClick={handleClearAll}
>
Clear all
</Button>
</Box>
<Box style={{ display: 'flex', justifyContent: 'space-between', paddingTop: '10px' }}>
<Box className="filter-title">Filter By:</Box>
<Button
type="button"
className="viewAll mb-20"
onClick={handleClearAll}
>
Clear all
</Button>
</Box>

<FormControl>
<InputLabel htmlFor="outlined-adornment-search">
Search for a Poll
Expand Down
Loading
Loading