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.

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

Deployment - sept 13 #613

Merged
merged 25 commits into from
Sep 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
a309a36
Task #226646 - [FE]- Redesign Domain Bar
sonaliTekdi Sep 10, 2024
380992b
resolved code conflicts
sonaliTekdi Sep 10, 2024
25a5aeb
Merge pull request #602 from sonaliTekdi/webapp_changes
paritshivani Sep 10, 2024
7d18af5
Bug #226607 - [webapp] Language constatns are missing on create poll …
sonaliTekdi Sep 10, 2024
677f8e4
Merge pull request #603 from sonaliTekdi/webapp_changes
paritshivani Sep 10, 2024
4828fe1
TASK :#0000 event registration button validation changes
mahajanmahesh935 Sep 10, 2024
8151755
Merge pull request #604 from mahajanmahesh935/content
paritshivani Sep 10, 2024
ee8030c
Bug #226608 - [webapp] Click issues on profile dropdown
sonaliTekdi Sep 10, 2024
a8b2963
Bug #225512,Bug #225510 - Mobile - No Gap Between Back To Learning Bu…
sonaliTekdi Sep 10, 2024
9972f36
Merge pull request #605 from sonaliTekdi/webapp_changes
paritshivani Sep 11, 2024
f31901d
Bug #225513 - Mobile - Link in Other Details Section Appearing Outsid…
sonaliTekdi Sep 12, 2024
e0eaa29
Bug #225930 - Inconsistent Button Positions on Poll Cards for Polls W…
sonaliTekdi Sep 12, 2024
10d192a
Merge pull request #606 from sonaliTekdi/webapp_changes
paritshivani Sep 12, 2024
10763c6
Feedback #226744 - [webapp] When user on the search page just add som…
sonaliTekdi Sep 12, 2024
82faaf9
TASK : #0000 Credit Popup Showing more values check conditions
mahajanmahesh935 Sep 12, 2024
9940f8d
Merge pull request #607 from sonaliTekdi/webapp_changes
paritshivani Sep 12, 2024
0a90e17
TASK : #0000 Add Language constant for Credit popup
mahajanmahesh935 Sep 12, 2024
317c51a
TASK :#226030 Filled data at the time of regsiation such as Role, org…
mahajanmahesh935 Sep 13, 2024
0cc3fa7
Merge pull request #608 from mahajanmahesh935/content
paritshivani Sep 13, 2024
f7677ad
Merge branch 'main' of https://github.com/NIUANULP/nulp-elite-ui into…
mahajanmahesh935 Sep 13, 2024
876ce3d
TASK : #0000 Chnaged Language constants
mahajanmahesh935 Sep 13, 2024
cc3e157
Merge pull request #609 from mahajanmahesh935/profilepage
paritshivani Sep 13, 2024
88269ec
TASK :#0000 resolved event is live still showing ended message.please…
mahajanmahesh935 Sep 13, 2024
28a6de8
Merge branch 'main' of https://github.com/NIUANULP/nulp-elite-ui into…
mahajanmahesh935 Sep 13, 2024
5628b56
Merge pull request #612 from mahajanmahesh935/profilepage
paritshivani Sep 13, 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
4 changes: 3 additions & 1 deletion packages/nulp_elite/public/locales/be/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -296,5 +296,7 @@
"ADMIN":"অ্যাডমিন",
"LEARNING_REPORT":"লার্নিং রিপোর্ট",
"POPULAR_COURSES" : "জনপ্রিয় কোর্স",
"RECENTLY_ADDED":"সম্প্রতি যোগ করা হয়েছে"
"RECENTLY_ADDED":"সম্প্রতি যোগ করা হয়েছে",
"CONTENT_DERIVED_FROM": "এই বিষয়বস্তু থেকে সংগৃহীত",
"PUBLISHED_ON_NULP_BY": "NULP দ্বারা প্রকাশিত"
}
5 changes: 3 additions & 2 deletions packages/nulp_elite/public/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,7 @@
"ADMIN":"Admin",
"LEARNING_REPORT":"Learning Report",
"POPULAR_COURSES" : "Popular Courses",
"RECENTLY_ADDED":"Recently Added"

"RECENTLY_ADDED":"Recently Added",
"CONTENT_DERIVED_FROM": "This content is derived from",
"PUBLISHED_ON_NULP_BY": "PUBLISHED ON NULP BY"
}
5 changes: 3 additions & 2 deletions packages/nulp_elite/public/locales/gg/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,8 @@
"ADMIN":"એડમિન",
"LEARNING_REPORT":"લર્નિંગ રિપોર્ટ",
"POPULAR_COURSES" : "લોકપ્રિય અભ્યાસક્રમો",
"RECENTLY_ADDED":"તાજેતરમાં ઉમેરાયેલ"

"RECENTLY_ADDED":"તાજેતરમાં ઉમેરાયેલ",
"CONTENT_DERIVED_FROM": "આ સામગ્રીમાંથી ઉત્પન્ન છે",
"PUBLISHED_ON_NULP_BY": "NULP દ્વારા પ્રકાશિત"

}
4 changes: 3 additions & 1 deletion packages/nulp_elite/public/locales/hi/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -298,5 +298,7 @@
"ADMIN":"व्यवस्थापक",
"LEARNING_REPORT":"सीखने की रिपोर्ट",
"POPULAR_COURSES" : "लोकप्रिय पाठ्यक्रम",
"RECENTLY_ADDED":"हाल ही में जोड़ा"
"RECENTLY_ADDED":"हाल ही में जोड़ा",
"CONTENT_DERIVED_FROM": "यह सामग्री से व्युत्पन्न है",
"PUBLISHED_ON_NULP_BY": "एनयूपीएलपी द्वारा प्रकाशित"
}
4 changes: 3 additions & 1 deletion packages/nulp_elite/public/locales/ma/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,8 @@
"ADMIN":"प्रशासक",
"LEARNING_REPORT":"शिकण्याचा अहवाल",
"POPULAR_COURSES" : "लोकप्रिय अभ्यासक्रम",
"RECENTLY_ADDED":"अलीकडे जोडले"
"RECENTLY_ADDED":"अलीकडे जोडले",
"CONTENT_DERIVED_FROM": "ही सामग्री यावरून घेतली आहे",
"PUBLISHED_ON_NULP_BY": "एनयूपीएलपीद्वारे प्रकाशित"

}
4 changes: 3 additions & 1 deletion packages/nulp_elite/public/locales/mal/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -298,5 +298,7 @@
"ADMIN":"അഡ്മിൻ",
"LEARNING_REPORT":"പഠന റിപ്പോർട്ട്",
"POPULAR_COURSES" : "ജനപ്രിയ കോഴ്സുകൾ",
"RECENTLY_ADDED":"അടുത്തിടെ ചേർത്തത് "
"RECENTLY_ADDED":"അടുത്തിടെ ചേർത്തത് ",
"CONTENT_DERIVED_FROM": "ഈ ഉള്ളടക്കം നിന്നു പ്രാപ്തമായതാണ്",
"PUBLISHED_ON_NULP_BY": "NULP വഴി പ്രസിദ്ധീകരിച്ചത്"
}
4 changes: 3 additions & 1 deletion packages/nulp_elite/public/locales/ta/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -323,5 +323,7 @@
"ADMIN":"நிர்வாகி",
"LEARNING_REPORT":"கற்றல் அறிக்கை",
"POPULAR_COURSES" : " జనాదరణ పొందిన కోర్సులు",
"RECENTLY_ADDED":"ఇటీవల జోడించబడింది"
"RECENTLY_ADDED":"ఇటీవల జోడించబడింది",
"CONTENT_DERIVED_FROM": "இந்த உள்ளடக்கம் இதிலிருந்து பெறப்பட்டுள்ளது",
"PUBLISHED_ON_NULP_BY": "NULP மூலம் வெளியிடப்பட்டது"
}
4 changes: 3 additions & 1 deletion packages/nulp_elite/public/locales/te/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -261,5 +261,7 @@
"ADMIN":"నిర్వాహకుడు",
"LEARNING_REPORT":"లెర్నింగ్ రిపోర్ట్",
"POPULAR_COURSES" : "జనాదరణ పొందిన కోర్సులు",
"RECENTLY_ADDED":"ఇటీవల జోడించబడింది"
"RECENTLY_ADDED":"ఇటీవల జోడించబడింది",
"CONTENT_DERIVED_FROM": "ఈ సాంఘికత నుండి పొందినది",
"PUBLISHED_ON_NULP_BY": "NULP ద్వారా ప్రచురించబడింది"
}
279 changes: 98 additions & 181 deletions packages/nulp_elite/src/components/domainCarousel.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,10 @@ import Typography from "@mui/joy/Typography";
import Carousel from "react-multi-carousel";
import "react-multi-carousel/lib/styles.css";
import domainWithImage from "../assets/domainImgForm.json";
import { Tooltip } from "@mui/material";
import { MarginOutlined } from "@mui/icons-material";
import Container from "@mui/material/Container";
import { useTranslation } from "react-i18next";
import SkeletonLoader from "components/skeletonLoader";
import KeyboardArrowUpIcon from "@mui/icons-material/KeyboardArrowUp";
// import { useNavigate } from "react-router-dom";
import KeyboardArrowDownIcon from "@mui/icons-material/KeyboardArrowDown";
import { Button } from "@mui/material";
const styles = {
Expand All @@ -22,25 +19,27 @@ const styles = {
},
};
const responsive = {
superLargeDesktop: {
// the naming can be any, depends on you.
// breakpoint: { max: 4000, min: 3000 },
breakpoint: { max: 1280, min: 1024 },

items: 8,
},
desktop: {
// breakpoint: { max: 3000, min: 1024 },
breakpoint: { max: 1024, min: 769 },
breakpoint: { max: 1920, min: 1240 },
items: 10,
arrows: false,
},
mediumDesktop: {
breakpoint: { max: 1240, min: 768 },
items: 8,
partialVisibilityGutter: 20,
arrows: true,
},
tablet: {
breakpoint: { max: 768, min: 464 },
breakpoint: { max: 768, min: 600 },
items: 4,
partialVisibilityGutter: 30,
arrows: true,
},
mobile: {
breakpoint: { max: 464, min: 0 },
breakpoint: { max: 600, min: 0 },
items: 3,
arrows: true,
},
};

Expand Down Expand Up @@ -164,179 +163,97 @@ export default function DomainCarousel({

return (
<>
{isMobile ? (
<Box style={{ position: "relative" }} className="bg-darkblue">
<Carousel
swipeable={true}
draggable={true}
showDots={["mobile"]}
responsive={responsive}
ssr={true}
infinite={true}
autoPlaySpeed={1000}
keyBoardControl={true}
customTransition="all .5"
transitionDuration={500}
containerClass="carousel-container carousel-bx"
dotListClass="custom-dot-list-style-none"
itemClass="carousel-item-padding-40-px"
>
{itemsArray &&
itemsArray?.slice(0, 10).map((domain, index) => (
<Box
className={`my-class ${
activeStates === index
? "carousel-active-ui"
: userDomain === domain.code
? "carousel-active-ui"
: ""
}`}
onClick={(e) =>
handleDomainClick(domain.code, index, domain.name)
}
key={index}
orientation="horizontal"
size="sm"
variant="outlined"
>
<Box
// className="imgBorder cursor-pointer"
className="cursor-pointer"
// style={{
// background: "#fff",
// padding: "4px",
// borderRadius: "10px",
// height: "48px",
// width: "48px",
// }}
>
{/* {(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} />} */}
<img
src={require(`../assets/domainImgs${domain.image}`)}
alt={domain.name}
className="domainHover"

// style={{ transform: "translate(5px, 4px)" }}
/>
{/* <img src={require("../assets/swm.png")} style={{width:'40px',objectFit:'contain'}} alt={domain.name} /> */}
</Box>
<Box sx={{ alignSelf: "center" }} className="cursor-pointer">
<Typography
level="title-md"
style={{ fontSize: "12px", textAlign: "center" }}
className="domainText"
>
{domain.name}
</Typography>
</Box>
</Box>
))}
</Carousel>
</Box>
) : (
{isLoading && (
<>
{isLoading && (
<>
<Box>
<SkeletonLoader />
</Box>
</>
)}

{!isLoading && !isBoxVisible && (
<Box className="domain-box">
<button onClick={handleClick} className="domain-btn">
{t("SELECT_YOUR_PREFERRED_DOMAIN")}
<KeyboardArrowDownIcon
style={{
color: "#484848",
fontSize: "24px",
verticalAlign: "middle",
}}
/>
</button>
</Box>
)}
<Box>
<SkeletonLoader />
</Box>
</>
)}

{isBoxVisible && (
<>
<Box className="bg-darkblue1">
<Box className="carousel-bx pt-12">
<Container
role="main"
maxWidth="xl"
className="carousel"
style={{ paddingTop: "0" }}
>
<Box>
<Box
sx={{
display: "flex",
justifyContent: "space-evenly",
width: "100%",
}}
>
{itemsArray &&
itemsArray?.slice(0, 10).map((domain, index) => (
<Box
className={`my-class ${
activeStates === index
? "carousel-active-ui"
: userDomain === domain.code
? "carousel-active-ui"
: ""
}`}
onClick={(e) =>
handleDomainClick(domain.code, index, domain.name)
}
key={index}
orientation="horizontal"
size="sm"
variant="outlined"
style={{ display: "flex", margin: "0 4px" }}
onMouseEnter={(event) => handleMouseEnter(index)}
onMouseLeave={handleMouseLeave}
>
<Box className="cursor-pointer">
<Box className="cursor-pointer">
<img
className="domainHover"
src={require(`../assets/domainImgs${domain.image}`)}
alt={domain.name}
/>
</Box>
<span className="cursor-pointer domainText">
{domain.name}
</span>
{/* )} */}
</Box>
</Box>
))}
</Box>
</Box>
{!isLoading && !isBoxVisible && (
<Box className="domain-box">
<button onClick={handleClick} className="domain-btn">
{t("SELECT_YOUR_PREFERRED_DOMAIN")}
<KeyboardArrowDownIcon
style={{
color: "#484848",
fontSize: "24px",
verticalAlign: "middle",
}}
/>
</button>
</Box>
)}
{isBoxVisible && (
<><Box className="bg-darkblue">
<Container
role="main"
maxWidth="xl"
className="carousel"
style={{ paddingTop: "0" }}
>
<Carousel
swipeable={true}
draggable={true}
showDots={false}
responsive={responsive}
ssr={true}
infinite={true}
autoPlaySpeed={1000}
keyBoardControl={true}
customTransition="all .5"
transitionDuration={500}
containerClass="carousel-container carousel-bx"
dotListClass="custom-dot-list-style-none"
itemClass="carousel-item-padding-40-px"
>
{itemsArray &&
itemsArray.slice(0, 10).map((domain, index) => (
<Box
style={{
textAlign: "center",
margin: "0 auto",
}}
className={`my-class ${activeStates === index || userDomain === domain.code
? "carousel-active-ui"
: ""}`}
onClick={() => handleDomainClick(domain.code, index, domain.name)}
key={index}
orientation="horizontal"
size="sm"
variant="outlined"
>
<Button
onClick={handleClick}
style={{ paddingTop: "0", marginTop: "20px" }}
>
<KeyboardArrowUpIcon
style={{ color: "#fff", fontSize: "33px" }}
/>
</Button>
<Box className="cursor-pointer">
<img
src={require(`../assets/domainImgs${domain.image}`)}
alt={domain.name}
className="domainHover" />
</Box>
<Box sx={{ alignSelf: "center" }} className="cursor-pointer">
<Typography
level="title-md"
style={{ fontSize: "12px", textAlign: "center" }}
className="domainText"
>
{domain.name}
</Typography>
</Box>
</Box>
</Container>
</Box>
))}
</Carousel>
<Box
style={{
textAlign: "center",
margin: "0 auto",
}}
>
<Button
onClick={handleClick}
style={{ paddingTop: "0"}}
>
<KeyboardArrowUpIcon
style={{ color: "#fff", fontSize: "33px" }} />
</Button>
</Box>
<Box className="height-200"></Box>
</>
)}
</>
</Container>
</Box><Box className="height-200"></Box></>
)}
</>
);
Expand Down
Loading
Loading