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

Dev deployment - Oct 8 #676

Merged
merged 13 commits into from
Oct 8, 2024
Merged

Dev deployment - Oct 8 #676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
cdffdab
disable join button for creator
paritshivani Oct 4, 2024
6945cd2
Merge pull request #670 from paritshivani/main
paritshivani Oct 4, 2024
46af897
Task #227193 -[FE] - Mobile responsive
sonaliTekdi Oct 4, 2024
a84be7f
Merge branch 'main' into responsive_changes
paritshivani Oct 4, 2024
3997963
Merge pull request #671 from sonaliTekdi/responsive_changes
paritshivani Oct 4, 2024
65b2c19
Update App.js
paritshivani Oct 7, 2024
85b10be
Update DomainList.js
paritshivani Oct 7, 2024
fcd8343
Task #228396 : [FE] Add the Ribbon on certificate card of course and …
mahajanmahesh935 Oct 7, 2024
9e86983
Bug #228391 : [Webapp- course detail page] when openening the course …
mahajanmahesh935 Oct 7, 2024
845bdcc
Merge pull request #674 from mahajanmahesh935/category
paritshivani Oct 7, 2024
82eaf3f
Merge pull request #675 from mahajanmahesh935/joincourseissue
paritshivani Oct 7, 2024
83c1281
Merge branch 'learnathon-2' into main
paritshivani Oct 8, 2024
241024f
Update App.js
paritshivani Oct 8, 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
2 changes: 1 addition & 1 deletion packages/nulp_elite/src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ function App() {
))}
</Routes>
</Router>
<LernModal />
<LernModal />
</React.Suspense>
{/* </ChakraProvider> */}
{/* </ChakraProvider> */}
Expand Down
19 changes: 12 additions & 7 deletions packages/nulp_elite/src/components/header.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,9 +216,9 @@ function Header({ globalSearchQuery }) {
boxShadow: searchQuery ? '0 2px 4px rgba(0, 0, 0, 0.2)' : 'none',
color: searchQuery ? '#fff' : "#000"
};
const handleLogout =() => {
sessionStorage.setItem('isModalShown', 'false');
}
const handleLogout = () => {
sessionStorage.setItem('isModalShown', 'false');
}
return (
<>
<Box
Expand Down Expand Up @@ -615,9 +615,9 @@ const handleLogout =() => {
</MenuItem>
</Link>
<Link href="/logoff" underline="none" textAlign="center"
onClick={handleLogout}>
onClick={handleLogout}>
<MenuItem>


{t("LOGOUT")}

Expand Down Expand Up @@ -738,6 +738,11 @@ const handleLogout =() => {
>
<MenuItem value="en">{t("ENGLISH")}</MenuItem>
<MenuItem value="hi">{t("HINDI")}</MenuItem>
<MenuItem value="ma">{t("MARATHI")}</MenuItem>
<MenuItem value="gg">{t("GUJARATI")}</MenuItem>
<MenuItem value="ta">{t("TAMIL")}</MenuItem>
<MenuItem value="be">{t("BENGALI")}</MenuItem>
<MenuItem value="mal">{t("MALAYALAM")}</MenuItem>
</Select>
</FormControl>
</Box>
Expand Down Expand Up @@ -873,9 +878,9 @@ const handleLogout =() => {
className="ml-10"
onClick={() => {
sessionStorage.setItem("urlPath", "learningreport");
window.open(routeConfig.ROUTES.LEARNING_REPORT, "_blank");
window.open(routeConfig.ROUTES.LEARNING_REPORT, "_blank");
}}
style={{color:'#1976d2'}}
style={{ color: '#1976d2' }}
>
{t("LEARNING_REPORT")}
</MenuItem>
Expand Down
9 changes: 6 additions & 3 deletions packages/nulp_elite/src/pages/content/Player.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,17 +261,20 @@ const updateContentStateForAssessment = async () => {
return (
<div>
<Header />
<Box sx={{ height: 'calc(100vh - 210px)', overflowY:'auto' }}>
<Box>
<Container maxWidth="xl" role="main" className="player mt-15">
<Grid container spacing={2} className="mt-10 mb-30">
<Grid item xs={12} md={12} lg={12}>
<Box
className="d-flex mr-20 my-20 px-10"
style={{ alignItems: "center",justifyContent:'space-between' }}
>
<Link onClick={handleBackNavigation} className="viewAll mr-17 mt-10">
<Button
onClick={handleBackNavigation}
className="custom-btn-primary mr-17 mt-15"
>
{t("BACK")}
</Link>
</Button>
</Box>
</Grid>
<Grid item xs={12} md={9} lg={9}>
Expand Down
Loading
Loading