diff --git a/src/components/table/TableHead.tsx b/src/components/table/TableHead.tsx index 09f9f063bc..8f9b54bf25 100644 --- a/src/components/table/TableHead.tsx +++ b/src/components/table/TableHead.tsx @@ -42,7 +42,7 @@ const TableHead = (props: EnhancedTableProps) => { sortDirection={orderBy === headCell.id ? order : false} sx={{ backgroundColor: 'var(--accent-100)', - borderColor: 'var(--accent-200)', + borderColor: 'var(--accent-200);', ...headCell.sx, }} > diff --git a/src/features/app_start/vip/congregation_create/congregation_access_code/index.tsx b/src/features/app_start/vip/congregation_create/congregation_access_code/index.tsx index d78ba09110..25023fbb29 100644 --- a/src/features/app_start/vip/congregation_create/congregation_access_code/index.tsx +++ b/src/features/app_start/vip/congregation_create/congregation_access_code/index.tsx @@ -71,7 +71,7 @@ const CongregationAccessCode = () => { }} > - + {t('tr_congregationAccessCodeNotice')} diff --git a/src/features/app_start/vip/congregation_create/congregation_master_key/index.tsx b/src/features/app_start/vip/congregation_create/congregation_master_key/index.tsx index 248816d94c..23087e74d2 100644 --- a/src/features/app_start/vip/congregation_create/congregation_master_key/index.tsx +++ b/src/features/app_start/vip/congregation_create/congregation_master_key/index.tsx @@ -70,7 +70,7 @@ const CongregationMasterKey = () => { }} > - + {t('tr_encryptionCodeNotice')} diff --git a/src/features/congregation/settings/congregation_basic/index.tsx b/src/features/congregation/settings/congregation_basic/index.tsx index 80562e4ed8..a1f2bd26f1 100644 --- a/src/features/congregation/settings/congregation_basic/index.tsx +++ b/src/features/congregation/settings/congregation_basic/index.tsx @@ -33,7 +33,11 @@ const CongregationBasic = () => { } = useCongregationBasic(); return ( - + { const { isMidweekEditor, isWeekendEditor, isPublicTalkCoordinator } = useCurrentUser(); + const { laptopDown } = useBreakpoints(); + const { sourceAutoUpdate, handleSourceAutoUpdateToggle, @@ -30,7 +36,11 @@ const MeetingForms = () => { } = useMeetingForms(); return ( - + diff --git a/src/features/congregation/settings/shared_styles/index.tsx b/src/features/congregation/settings/shared_styles/index.tsx index f82533d500..1efd5c08eb 100644 --- a/src/features/congregation/settings/shared_styles/index.tsx +++ b/src/features/congregation/settings/shared_styles/index.tsx @@ -6,7 +6,6 @@ import Typography from '@components/typography'; import Divider from '@components/divider'; export const CardSection = styled(Box)({ - marginTop: '16px', backgroundColor: 'var(--white)', padding: '15px', border: '1px solid var(--accent-300)', diff --git a/src/features/meeting_materials/public_talks/index.tsx b/src/features/meeting_materials/public_talks/index.tsx index dfe6aba9f3..0219b6aae3 100644 --- a/src/features/meeting_materials/public_talks/index.tsx +++ b/src/features/meeting_materials/public_talks/index.tsx @@ -6,7 +6,7 @@ import TalksTableView from './tableView'; import Typography from '@components/typography'; import usePublicTalks from './usePublicTalks'; import { useAppTranslation, useBreakpoints } from '@hooks/index'; -import { IconCollapse, IconExpand, IconExport } from '@components/icons'; +import { IconCollapse, IconExpand } from '@components/icons'; import { PublicTalksType } from './index.types'; const PublicTalks = ({ view }: PublicTalksType) => { @@ -88,17 +88,6 @@ const PublicTalks = ({ view }: PublicTalksType) => { {isExpandAll ? t('tr_collapseAll') : t('tr_expandAll')} )} - - {view === 'table' && laptopUp && ( - - )} {view === 'list' && ( diff --git a/src/features/meeting_materials/public_talks/listView/index.tsx b/src/features/meeting_materials/public_talks/listView/index.tsx index 48c69427da..77128ac691 100644 --- a/src/features/meeting_materials/public_talks/listView/index.tsx +++ b/src/features/meeting_materials/public_talks/listView/index.tsx @@ -20,6 +20,7 @@ const TalksListView = ({ isExpandAll, talks }: TalksListViewType) => { '& .MuiTableCell-root': { padding: '8px', boxSizing: 'content-box', + borderColor: 'var(--accent-200)', }, }} > diff --git a/src/features/meetings/schedule_publish/month_item/index.tsx b/src/features/meetings/schedule_publish/month_item/index.tsx index 6ede9dd088..e07033624d 100644 --- a/src/features/meetings/schedule_publish/month_item/index.tsx +++ b/src/features/meetings/schedule_publish/month_item/index.tsx @@ -23,7 +23,13 @@ const MonthItem = ({ data, onChange }: MonthItemProps) => { /> {data.published && ( - + )} diff --git a/src/features/persons/speakers_catalog/my_congregation/header/index.tsx b/src/features/persons/speakers_catalog/my_congregation/header/index.tsx index d492f44bd8..2dc787c92e 100644 --- a/src/features/persons/speakers_catalog/my_congregation/header/index.tsx +++ b/src/features/persons/speakers_catalog/my_congregation/header/index.tsx @@ -25,6 +25,7 @@ const OutgoingSpeakersHeader = ({ const { congName, congNumber, + circuitNumber, handleCloseAccess, handleOpenAccess, openAccess, @@ -69,6 +70,17 @@ const OutgoingSpeakersHeader = ({ > {congNumber} + + {t('tr_circuit', { circuitNumber: circuitNumber })} + diff --git a/src/features/persons/speakers_catalog/my_congregation/header/useHeader.tsx b/src/features/persons/speakers_catalog/my_congregation/header/useHeader.tsx index b36bf1a461..ece7e126ae 100644 --- a/src/features/persons/speakers_catalog/my_congregation/header/useHeader.tsx +++ b/src/features/persons/speakers_catalog/my_congregation/header/useHeader.tsx @@ -1,12 +1,17 @@ import { useState } from 'react'; import { useRecoilValue } from 'recoil'; -import { congNameState, congNumberState } from '@states/settings'; +import { + circuitNumberState, + congNameState, + congNumberState, +} from '@states/settings'; import { congAccountConnectedState } from '@states/app'; const useHeader = () => { const congName = useRecoilValue(congNameState); const congNumber = useRecoilValue(congNumberState); const congAccountConnected = useRecoilValue(congAccountConnectedState); + const circuitNumber = useRecoilValue(circuitNumberState); const [openAccess, setOpenAccess] = useState(false); @@ -17,6 +22,7 @@ const useHeader = () => { return { congName, congNumber, + circuitNumber, handleOpenAccess, handleCloseAccess, openAccess, diff --git a/src/layouts/navbar/index.tsx b/src/layouts/navbar/index.tsx index daa059a784..be0f29ecde 100644 --- a/src/layouts/navbar/index.tsx +++ b/src/layouts/navbar/index.tsx @@ -154,7 +154,7 @@ const NavBar = ({ isSupported }: NavBarType) => { edge="start" disableRipple sx={{ - padding: '2px 8px', + padding: tabletDown ? 0 : '2px 8px', marginLeft: '0px', borderRadius: '8px', '&:hover': { diff --git a/src/locales/en/general.json b/src/locales/en/general.json index bcbbebfa4f..9f6a2d413e 100644 --- a/src/locales/en/general.json +++ b/src/locales/en/general.json @@ -133,5 +133,6 @@ "tr_noNotificationsDesc": "Important notifications will be displayed here.", "tr_userRoleChanged": "Access changed", "tr_userRoleChangedDesc": "Your access in Organized has been changed recently. Log in to your account again for the changes to take effect.", - "tr_appliesOnlyToBrothers": "Applies only to brothers" + "tr_appliesOnlyToBrothers": "Applies only to brothers", + "tr_circuit": "Circuit: {{ circuitNumber }}" } diff --git a/src/pages/meeting_materials/public_talks_list/index.tsx b/src/pages/meeting_materials/public_talks_list/index.tsx index cbbb37f3ed..66d88b6276 100644 --- a/src/pages/meeting_materials/public_talks_list/index.tsx +++ b/src/pages/meeting_materials/public_talks_list/index.tsx @@ -1,13 +1,14 @@ import { Box } from '@mui/material'; -import { IconListView, IconSpreadsheet } from '@components/icons'; +import { IconExport, IconListView, IconSpreadsheet } from '@components/icons'; import Button from '@components/button'; import PageTitle from '@components/page_title'; import usePublicTalksList from './usePublicTalksList'; -import { useAppTranslation } from '@hooks/index'; +import { useAppTranslation, useBreakpoints } from '@hooks/index'; import { PublicTalks } from '@features/index'; const PublicTalksList = () => { const { t } = useAppTranslation(); + const { laptopUp } = useBreakpoints(); const { currentView, handleToggleView } = usePublicTalksList(); @@ -16,27 +17,43 @@ const PublicTalksList = () => { - ) : ( - - ) - } - onClick={handleToggleView} - > - {currentView === 'list' ? t('tr_tableView') : t('tr_listView')} - + <> + + {currentView === 'table' && laptopUp && ( + + )} + } />