diff --git a/public/locales/en/common.json b/public/locales/en/common.json index 5cef004c..f991489a 100644 --- a/public/locales/en/common.json +++ b/public/locales/en/common.json @@ -238,15 +238,10 @@ "BLOCKS": { "TEACHING_BLOCKS": "Teaching Blocks", "SEARCH" : "Search..", - "FILTERS": "Filters", "CREATE_NEW": "Create New", "NEW_BLOCK": "New Block", "BLOCK_NAME": "Block Name", "CREATE": "Create", - "NAMES": "Names", - "A_TO_Z": "A to Z", - "Z_TO_A": "Z to A", - "SEARCH_BLOCKS": "Search Blocks", - "APPLY": "Apply" + "SEARCH_BLOCKS": "Search Blocks" } } diff --git a/public/locales/hi/common.json b/public/locales/hi/common.json index b7a0e102..4fcd774a 100644 --- a/public/locales/hi/common.json +++ b/public/locales/hi/common.json @@ -237,16 +237,11 @@ "BLOCKS": { "TEACHING_BLOCKS": "शिक्षण ब्लॉक्स", "SEARCH" : "खोजें..", - "FILTERS":"फिल्टर्स", "CREATE_NEW": "नया निर्माण", "NEW_BLOCK": "नया ब्लॉक", "BLOCK_NAME": "ब्लॉक का नाम", "CREATE": "बनाएँ", - "NAMES": "नाम", - "A_TO_Z": " ए से जेड तक", - "Z_TO_A": "जेड से ए तक", - "SEARCH_BLOCKS": "ब्लॉक खोजें", - "APPLY": "लागू करें" + "SEARCH_BLOCKS": "ब्लॉक खोजें" } } diff --git a/public/locales/mr/common.json b/public/locales/mr/common.json index c71bfc53..225fa531 100644 --- a/public/locales/mr/common.json +++ b/public/locales/mr/common.json @@ -237,15 +237,13 @@ "BLOCKS": { "TEACHING_BLOCKS": "शिक्षण ब्लॉक्स", "SEARCH" : "शोधा..", - "FILTERS": "फिल्टर्स", + "CREATE_NEW": "नवीन तयार करा", "NEW_BLOCK": "नवीन ब्लॉक", "BLOCK_NAME": "ब्लॉकचं नाव", "CREATE": "तयार करा", - "NAMES": "नावे", - "A_TO_Z": "ए ते झेड", - "Z_TO_A": "झेड ते ए", - "SEARCH_BLOCKS": "ब्लॉक शोधा", - "APPLY": "लागू करा" + + "SEARCH_BLOCKS": "ब्लॉक शोधा" + } } diff --git a/public/locales/or/common.json b/public/locales/or/common.json index 4da3a933..c6790937 100644 --- a/public/locales/or/common.json +++ b/public/locales/or/common.json @@ -189,15 +189,11 @@ "BLOCKS": { "TEACHING_BLOCKS": "ଶିକ୍ଷା ବ୍ଲକ୍ସ", "SEARCH" : "ସନ୍ଧାନ କରନ୍ତୁ..", - "FILTERS": "ଫିଲ୍ଟର୍ସ", "CREATE_NEW": "ନୂତନ ସୃଷ୍ଟି କରନ୍ତୁ", "NEW_BLOCK": "ନୂଆ ବ୍ଲକ୍", "BLOCK_NAME": "ବ୍ଲକ୍ ନାମ", "CREATE": "ତିଆରି କରନ୍ତୁ", - "NAMES": "ନାମ", - "A_TO_Z": "ଏ ସେ ଜେଡ଼", - "Z_TO_A": "ଜେଡ଼ ସେ ଏ", - "SEARCH_BLOCKS": "ବ୍ଲକ୍‌ ଖୋଜନ୍ତୁ", - "APPLY": "ପ୍ରୟୋଗ କରନ୍ତୁ" + + "SEARCH_BLOCKS": "ବ୍ଲକ୍‌ ଖୋଜନ୍ତୁ" } } diff --git a/src/pages/blocks/components/CreateBlockModal.tsx b/src/pages/blocks/components/CreateBlockModal.tsx index a4d7b3d3..8feaf26c 100644 --- a/src/pages/blocks/components/CreateBlockModal.tsx +++ b/src/pages/blocks/components/CreateBlockModal.tsx @@ -98,7 +98,7 @@ const CreateBlockModal: React.FC = ({ sx={{ width: '100%', border: 'none', - backgroundColor: '#FDBE16', + backgroundColor: theme?.palette?.primary?.main, mb: 2, }} > diff --git a/src/pages/blocks/components/FilterModal.tsx b/src/pages/blocks/components/FilterModal.tsx index 5c42c3ec..8b85f896 100644 --- a/src/pages/blocks/components/FilterModal.tsx +++ b/src/pages/blocks/components/FilterModal.tsx @@ -89,7 +89,7 @@ const FilterModal: React.FC = ({ variant="h3" mt={2} > - {t('BLOCKS.FILTERS')} + {t('COMMON.FILTERS')} @@ -97,7 +97,7 @@ const FilterModal: React.FC = ({ - {t('BLOCKS.NAMES')} + {t('COMMON.NAMES')} = ({ } className="modal_label" labelPlacement="start" - label={t('BLOCKS.A_TO_Z')} + label={t('COMMON.A_TO_Z')} /> = ({ } className="modal_label" labelPlacement="start" - label={t('BLOCKS.Z_TO_A')} + label={t('COMMON.Z_TO_A')} /> diff --git a/src/pages/blocks/[district].tsx b/src/pages/blocks/index.tsx similarity index 96% rename from src/pages/blocks/[district].tsx rename to src/pages/blocks/index.tsx index bc63c11a..88f2c4eb 100644 --- a/src/pages/blocks/[district].tsx +++ b/src/pages/blocks/index.tsx @@ -14,7 +14,7 @@ import Search from '@mui/icons-material/Search'; import { ArrowDropDown, KeyboardArrowRight } from '@mui/icons-material'; import AddIcon from '@mui/icons-material/Add'; import { useRouter } from 'next/router'; -import { GetStaticPaths } from 'next'; + import CreateBlockModal from './components/CreateBlockModal'; import FilterModal from './components/FilterModal'; @@ -26,7 +26,7 @@ const Blocks: React.FC = () => { const { t } = useTranslation(); const theme = useTheme(); const router = useRouter(); - const { district } = router.query; + const district = 'Nagpur'; const [anchorEl, setAnchorEl] = React.useState(null); const [openModal, setOpenModal] = useState(false); // State for modal @@ -158,7 +158,7 @@ const Blocks: React.FC = () => { fontWeight: '500', }} > - {t('BLOCKS.FILTERS')} + {t('COMMON.FILTERS')}