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

prod -deployment 17 Sept #619

Merged
merged 6 commits into from
Sep 17, 2024
+210 −474
Merged

prod -deployment 17 Sept #619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8fdf387
Merge branch 'main' of https://github.com/NIUANULP/nulp-elite-ui into…
sonaliTekdi Sep 13, 2024
9f03997
Merge branch 'main' of https://github.com/NIUANULP/nulp-elite-ui into…
sonaliTekdi Sep 16, 2024
fbf0564
Task #226403 - [FE] - While API loading Page loaders are missing
sonaliTekdi Sep 16, 2024
4df9acc
Merge pull request #616 from sonaliTekdi/webapp_changes
paritshivani Sep 17, 2024
deb3f11
TASK :#0000 [webapp] Showing blank page on clicking some of courses ,…
mahajanmahesh935 Sep 17, 2024
5d14dda
Merge pull request #618 from mahajanmahesh935/domainCard
paritshivani Sep 17, 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
43 changes: 7 additions & 36 deletions packages/common-lib/src/components/Loading.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,13 @@
import { Center, VStack, Text, Spinner, Heading } from 'native-base'
import { Center, HStack, Spinner, Heading } from 'native-base'
import React from 'react'
import { useWindowSize } from './helper'

export default function Loading({ message = 'Loading', ...prop }) {
const [width, height] = useWindowSize()

export default function Loading({ message = 'Loading...'}) {
return (
<Center
_text={{
color: 'white',
fontWeight: 'bold'
}}
height={prop?.height ? prop.height : height}
width={prop?.width ? prop.width : width}
{...prop?._center}
>
{prop?.customComponent ? (
prop?.customComponent
) : (
<VStack space={2} alignItems={'center'}>
<VStack space={10} alignItems='center'>
{prop?.icon ? (
prop.icon
) : (
<Spinner
color={'primary'}
accessibilityLabel='Loading posts'
size='lg'
/>
)}
<VStack alignItems='center' space={2}>
<Heading color='primary' fontSize='22px'>
{message}
</Heading>
</VStack>
</VStack>
</VStack>
)}
<Center>
<HStack space={2} alignItems="center">
<Spinner accessibilityLabel="Loading posts" color="#0e7a9c" />
<Heading size="md" color="#0e7a9c">{message}</Heading>
</HStack>
</Center>
)
}
3 changes: 2 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 @@ -301,5 +301,6 @@
"PUBLISHED_ON_NULP_BY":"NULP-এ প্রকাশিত",
"ACCEPT_THE_NULP_TERMS_OF_USE" : "আমার বয়স 18+ বছর এবং আমি NULP ব্যবহারের শর্তাবলী বুঝি এবং স্বীকার করি",
"As_A_PATENT_GUARDIAN_ACCEPT_THE_NULP_TERMS_OF_USE": "একজন পিতা-মাতা/অভিভাবক হিসাবে আমি NULP ব্যবহারের শর্তাবলী বুঝি এবং স্বীকার করি যে আমার সন্তান প্রদত্ত তথ্যের সাথে NULP-এ নিবন্ধন করতে সম্মত।",
"CONTENT_DERIVED_FROM": "এই বিষয়বস্তু থেকে সংগৃহীত"
"CONTENT_DERIVED_FROM": "এই বিষয়বস্তু থেকে সংগৃহীত",
"FILTERS":"ফিল্টার"
}
3 changes: 2 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 @@ -321,5 +321,6 @@
"PUBLISHED_ON_NULP_BY":"PUBLISHED ON NULP BY",
"ACCEPT_THE_NULP_TERMS_OF_USE" : "I am 18+ years old and understand and accept the NULP Terms of Use",
"As_A_PATENT_GUARDIAN_ACCEPT_THE_NULP_TERMS_OF_USE": "As a parent/guardian I understand & accept the NULP Terms of Use agree my child to register on NULP with the given information.",
"CONTENT_DERIVED_FROM": "This content is derived from"
"CONTENT_DERIVED_FROM": "This content is derived from",
"FILTERS":"Filters"
}
4 changes: 2 additions & 2 deletions 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 @@ -311,6 +311,6 @@
"PUBLISHED_ON_NULP_BY":"NULP દ્વારા પ્રકાશિત",
"ACCEPT_THE_NULP_TERMS_OF_USE" : "હું 18+ વર્ષનો છું અને NULP ઉપયોગની શરતો સમજું છું અને સ્વીકારું છું",
"As_A_PATENT_GUARDIAN_ACCEPT_THE_NULP_TERMS_OF_USE": "માતાપિતા/વાલી તરીકે હું NULP ઉપયોગની શરતોને સમજું છું અને સ્વીકારું છું અને સ્વીકારું છું કે મારા બાળકને આપેલ માહિતી સાથે NULP પર નોંધણી કરાવવા માટે સંમત થાઓ.",
"CONTENT_DERIVED_FROM": "આ સામગ્રીમાંથી ઉત્પન્ન છે"

"CONTENT_DERIVED_FROM": "આ સામગ્રીમાંથી ઉત્પન્ન છે",
"FILTERS":"ફિલ્ટર્સ"
}
3 changes: 2 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 @@ -302,5 +302,6 @@
"THIS_CONTENT_IS_DERIVED_FROM":"यह सामग्री इससे ली गई है",
"PUBLISHED_ON_NULP_BY":"NULP BY पर प्रकाशित",
"ACCEPT_THE_NULP_TERMS_OF_USE" : "मैं 18+ वर्ष का हूं और NULP उपयोग की शर्तों को समझता हूं और स्वीकार करता हूं",
"As_A_PATENT_GUARDIAN_ACCEPT_THE_NULP_TERMS_OF_USE": "एक माता-पिता/अभिभावक के रूप में मैं NULP उपयोग की शर्तों को समझता हूं और स्वीकार करता हूं और अपने बच्चे को दी गई जानकारी के साथ NULP पर पंजीकरण करने के लिए सहमत करता हूं।"
"As_A_PATENT_GUARDIAN_ACCEPT_THE_NULP_TERMS_OF_USE": "एक माता-पिता/अभिभावक के रूप में मैं NULP उपयोग की शर्तों को समझता हूं और स्वीकार करता हूं और अपने बच्चे को दी गई जानकारी के साथ NULP पर पंजीकरण करने के लिए सहमत करता हूं।",
"FILTERS":"फिल्टर"
}
3 changes: 2 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 @@ -303,6 +303,7 @@
"PUBLISHED_ON_NULP_BY":"NULP द्वारे प्रकाशित",
"ACCEPT_THE_NULP_TERMS_OF_USE" : "मी 18+ वर्षांचा आहे आणि NULP वापरण्याच्या अटी समजतो आणि स्वीकारतो",
"As_A_PATENT_GUARDIAN_ACCEPT_THE_NULP_TERMS_OF_USE": "पालक/पालक म्हणून मी NULP वापराच्या अटी समजतो आणि स्वीकारतो आणि माझ्या मुलाने दिलेल्या माहितीसह NULP वर नोंदणी करण्यास सहमती देतो.",
"CONTENT_DERIVED_FROM": "ही सामग्री यावरून घेतली आहे"
"CONTENT_DERIVED_FROM": "ही सामग्री यावरून घेतली आहे",
"FILTERS":"फिल्टर"
}

3 changes: 2 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 @@ -303,5 +303,6 @@
"PUBLISHED_ON_NULP_BY":"NULP-ൽ പ്രസിദ്ധീകരിച്ചത്",
"ACCEPT_THE_NULP_TERMS_OF_USE" : "എനിക്ക് 18+ വയസ്സുണ്ട്, NULP ഉപയോഗ നിബന്ധനകൾ മനസ്സിലാക്കുകയും അംഗീകരിക്കുകയും ചെയ്യുന്നു",
"As_A_PATENT_GUARDIAN_ACCEPT_THE_NULP_TERMS_OF_USE": "ഒരു രക്ഷിതാവ്/രക്ഷകൻ എന്ന നിലയിൽ, NULP ഉപയോഗ നിബന്ധനകൾ ഞാൻ മനസ്സിലാക്കുകയും അംഗീകരിക്കുകയും ചെയ്യുന്നു, തന്നിരിക്കുന്ന വിവരങ്ങൾക്കൊപ്പം NULP-ൽ രജിസ്റ്റർ ചെയ്യാൻ എൻ്റെ കുട്ടി സമ്മതിക്കുന്നു.",
"CONTENT_DERIVED_FROM": "ഈ ഉള്ളടക്കം നിന്നു പ്രാപ്തമായതാണ്"
"CONTENT_DERIVED_FROM": "ഈ ഉള്ളടക്കം നിന്നു പ്രാപ്തമായതാണ്",
"FILTERS":"ഫിൽട്ടറുകൾ"
}
3 changes: 2 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 @@ -328,5 +328,6 @@
"PUBLISHED_ON_NULP_BY":"NULP ஆல் வெளியிடப்பட்டது",
"ACCEPT_THE_NULP_TERMS_OF_USE" : "எனக்கு 18+ வயது மற்றும் NULP பயன்பாட்டு விதிமுறைகளைப் புரிந்து ஏற்றுக்கொள்கிறேன்",
"As_A_PATENT_GUARDIAN_ACCEPT_THE_NULP_TERMS_OF_USE": "ஒரு பெற்றோர்/பாதுகாவலராக நான் NULP பயன்பாட்டு விதிமுறைகளைப் புரிந்துகொண்டு ஏற்றுக்கொள்கிறேன், கொடுக்கப்பட்ட தகவலுடன் NULP இல் பதிவுசெய்ய என் குழந்தை ஒப்புக்கொள்கிறேன்.",
"CONTENT_DERIVED_FROM": "இந்த உள்ளடக்கம் இதிலிருந்து பெறப்பட்டுள்ளது"
"CONTENT_DERIVED_FROM": "இந்த உள்ளடக்கம் இதிலிருந்து பெறப்பட்டுள்ளது",
"FILTERS":"வடிப்பான்கள்"
}
3 changes: 2 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 @@ -266,5 +266,6 @@
"PUBLISHED_ON_NULP_BY":"NULP ద్వారా ప్రచురించబడింది",
"ACCEPT_THE_NULP_TERMS_OF_USE" : "నాకు 18+ సంవత్సరాలు మరియు NULP ఉపయోగ నిబంధనలను అర్థం చేసుకుని, అంగీకరిస్తున్నాను",
"As_A_PATENT_GUARDIAN_ACCEPT_THE_NULP_TERMS_OF_USE": "తల్లిదండ్రులుగా/సంరక్షకుడిగా నేను NULP ఉపయోగ నిబంధనలను అర్థం చేసుకున్నాను & అంగీకరిస్తున్నాను, అందించిన సమాచారంతో NULPలో నమోదు చేసుకోవడానికి నా బిడ్డ అంగీకరిస్తున్నాను.",
"CONTENT_DERIVED_FROM": "ఈ సాంఘికత నుండి పొందినది"
"CONTENT_DERIVED_FROM": "ఈ సాంఘికత నుండి పొందినది",
"FILTERS":"ఫిల్టర్లు"
}
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 @@ -272,7 +272,7 @@ function App() {
);
if (data.result.response.framework.id) {
// setCheckPref(true);
if (data.result.response.framework.id[0] === "nulp") {
if (data.result.response.framework.id[0] !== "nulp-domain") {
setCheckPref(false);
} else {
setCheckPref(true);
Expand Down
44 changes: 0 additions & 44 deletions packages/nulp_elite/src/components/EventCard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,56 +189,12 @@ export default function EventCard({ items, index, onClick }) {
alt="App Icon"
/>
</Box>

{/* {items.organisation && items.organisation.length > 0 && (
<Typography
variant="body2"
color="#5B5B5B"
style={{ fontSize: "11px", padding: "10px 0", textAlign: "left" }}
>
<Box>
{items.organisation.length === 1
? items.organisation[0]
: `${items.organisation[0]} + ${items.organisation.length - 1}`}
</Box>
</Typography>
)} */}
</CardContent>
<Box>
<Button type="button" className="custom-btn-default ml-20 lg-mt-20">
{t("VIEW DETAILS")} <ArrowForwardIosOutlinedIcon className="fs-12" />
</Button>
</Box>
{/* {(items.board ||
items.gradeLevel ||
items.se_boards ||
items.se_gradeLevels) && (
<>
<Box className="textLeft mb-15 d-flex">
{(items.board || items.se_boards) && (
<Tooltip
title={items.board || items.se_boards}
placement="top"
className="labelOne cardLabelEllips"
>
<Button> {items.board || items.se_boards}</Button>
</Tooltip>
// <Button type="button" size="small">
// {items.board || items.se_boards}
// </Button>
)}
{(items.gradeLevel || items.se_gradeLevels) && (
<Tooltip
title={items.gradeLevel || items.se_gradeLevels}
placement="top"
className="labeltwo cardLabelEllips"
>
<Button> {items.gradeLevel || items.se_gradeLevels}</Button>
</Tooltip>
)}
</Box>
</>
)} */}
</Card>
);
}
2 changes: 1 addition & 1 deletion packages/nulp_elite/src/components/drawerFilter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ const uniqueFilteredSubCategories = [...new Set(filteredSubCategories.map(item =
onClick={toggleDrawer(anchor, true)}
className="h6-title "
>
Filters
{t("FILTERS")}
<ArrowForwardIosIcon
sx={{ mr: 1, fontSize: "13px", paddingLeft: "10px" }}
/>
Expand Down
Loading
Loading