sws2apps · rhahao · Aug 7, 2024 · Aug 7, 2024 · Aug 7, 2024
diff --git a/src/App.tsx b/src/App.tsx
@@ -25,7 +25,7 @@ const ServiceYear = lazy(() => import('@pages/ministry/service_year'));
 const AuxiliaryPioneerApplication = lazy(
   () => import('@pages/ministry/auxiliary_pioneer')
 );
-const VisitingSpeakers = lazy(() => import('@pages/persons/visiting_speakers'));
+const SpeakersCatalog = lazy(() => import('@pages/persons/speakers_catalog'));
 const WeekendMeeting = lazy(() => import('@pages/meetings/weekend'));
 const ServiceGroups = lazy(() => import('@pages/congregation/service_groups'));
 const PublisherRecord = lazy(
@@ -84,7 +84,7 @@ const App = ({ updatePwa }: { updatePwa: VoidFunction }) => {
               path: '/auxiliary-pioneer-application',
               element: <AuxiliaryPioneerApplication />,
             },
-            { path: '/visiting-speakers', element: <VisitingSpeakers /> },
+            { path: '/speakers-catalog', element: <SpeakersCatalog /> },
             { path: '/midweek-meeting', element: <MidweekMeeting /> },
             { path: '/weekend-meeting', element: <WeekendMeeting /> },
             { path: '/service-groups', element: <ServiceGroups /> },

diff --git a/src/features/index.ts b/src/features/index.ts
@@ -72,9 +72,9 @@ export { default as PersonsSearch } from './persons/search';
 export { default as PersonTimeAway } from './persons/time_away';
 export { default as PersonAssignmentsHistory } from './persons/assignments_history';
 
-/* -------------------------------- Visiting Speakers -------------------------------- */
-export { default as IncomingSpeakers } from './persons/visiting_speakers/incoming';
-export { default as OutgoingSpeakers } from './persons/visiting_speakers/outgoing';
+/* -------------------------------- Speakers Catalog -------------------------------- */
+export { default as IncomingSpeakers } from './persons/speakers_catalog/incoming';
+export { default as OutgoingSpeakers } from './persons/speakers_catalog/outgoing';
 
 /* -------------------------------- Ministry -------------------------------- */
 export { default as ButtonSubmitApplication } from './ministry/button_submit';

diff --git a/...coming/congregation_add/details/index.tsx → ...coming/congregation_add/details/index.tsx b/...coming/congregation_add/details/index.tsx → ...coming/congregation_add/details/index.tsx
diff --git a/...g/congregation_add/details/index.types.ts → ...g/congregation_add/details/index.types.ts b/...g/congregation_add/details/index.types.ts → ...g/congregation_add/details/index.types.ts
diff --git a/...akers/incoming/congregation_add/index.tsx → ...talog/incoming/congregation_add/index.tsx b/...akers/incoming/congregation_add/index.tsx → ...talog/incoming/congregation_add/index.tsx
diff --git a/.../incoming/congregation_add/index.types.ts → .../incoming/congregation_add/index.types.ts b/.../incoming/congregation_add/index.types.ts → .../incoming/congregation_add/index.types.ts
diff --git a/...coming/congregation_add/offline/index.tsx → ...coming/congregation_add/offline/index.tsx b/...coming/congregation_add/offline/index.tsx → ...coming/congregation_add/offline/index.tsx
diff --git a/...g/congregation_add/offline/index.types.ts → ...g/congregation_add/offline/index.types.ts b/...g/congregation_add/offline/index.types.ts → ...g/congregation_add/offline/index.types.ts
diff --git a/...g/congregation_add/offline/useOffline.tsx → ...g/congregation_add/offline/useOffline.tsx b/...g/congregation_add/offline/useOffline.tsx → ...g/congregation_add/offline/useOffline.tsx
diff --git a/...ncoming/congregation_add/online/index.tsx → ...ncoming/congregation_add/online/index.tsx b/...ncoming/congregation_add/online/index.tsx → ...ncoming/congregation_add/online/index.tsx
diff --git a/...ng/congregation_add/online/index.types.ts → ...ng/congregation_add/online/index.types.ts b/...ng/congregation_add/online/index.types.ts → ...ng/congregation_add/online/index.types.ts
diff --git a/...ing/congregation_add/online/useOnline.tsx → ...ing/congregation_add/online/useOnline.tsx b/...ing/congregation_add/online/useOnline.tsx → ...ing/congregation_add/online/useOnline.tsx
diff --git a/...g/congregation_add/useCongregationAdd.tsx → ...g/congregation_add/useCongregationAdd.tsx b/...g/congregation_add/useCongregationAdd.tsx → ...g/congregation_add/useCongregationAdd.tsx
diff --git a/...incoming/congregation_info/edit/index.tsx → ...incoming/congregation_info/edit/index.tsx b/...incoming/congregation_info/edit/index.tsx → ...incoming/congregation_info/edit/index.tsx
diff --git a/...ing/congregation_info/edit/index.types.ts → ...ing/congregation_info/edit/index.types.ts b/...ing/congregation_info/edit/index.types.ts → ...ing/congregation_info/edit/index.types.ts
diff --git a/...coming/congregation_info/edit/useEdit.tsx → ...coming/congregation_info/edit/useEdit.tsx b/...coming/congregation_info/edit/useEdit.tsx → ...coming/congregation_info/edit/useEdit.tsx
diff --git a/...incoming/congregation_info/view/index.tsx → ...incoming/congregation_info/view/index.tsx b/...incoming/congregation_info/view/index.tsx → ...incoming/congregation_info/view/index.tsx
diff --git a/...ing/congregation_info/view/index.types.ts → ...ing/congregation_info/view/index.types.ts b/...ing/congregation_info/view/index.types.ts → ...ing/congregation_info/view/index.types.ts
diff --git a/...egation_info/view/useCongregationInfo.tsx → ...egation_info/view/useCongregationInfo.tsx b/...egation_info/view/useCongregationInfo.tsx → ...egation_info/view/useCongregationInfo.tsx
diff --git a/...kers/incoming/congregation_item/index.tsx → ...alog/incoming/congregation_item/index.tsx b/...kers/incoming/congregation_item/index.tsx → ...alog/incoming/congregation_item/index.tsx
diff --git a/...incoming/congregation_item/index.types.ts → ...incoming/congregation_item/index.types.ts b/...incoming/congregation_item/index.types.ts → ...incoming/congregation_item/index.types.ts
diff --git a/...rs/incoming/congregation_item/useList.tsx → ...og/incoming/congregation_item/useList.tsx b/...rs/incoming/congregation_item/useList.tsx → ...og/incoming/congregation_item/useList.tsx
diff --git a/...eakers/incoming/contact_details/index.tsx → ...atalog/incoming/contact_details/index.tsx b/...eakers/incoming/contact_details/index.tsx → ...atalog/incoming/contact_details/index.tsx
diff --git a/...s/incoming/contact_details/index.types.ts → ...g/incoming/contact_details/index.types.ts b/...s/incoming/contact_details/index.types.ts → ...g/incoming/contact_details/index.types.ts
diff --git a/...siting_speakers/incoming/header/index.tsx → ...peakers_catalog/incoming/header/index.tsx b/...siting_speakers/incoming/header/index.tsx → ...peakers_catalog/incoming/header/index.tsx
diff --git a/...g_speakers/incoming/header/index.types.ts → ...rs_catalog/incoming/header/index.types.ts b/...g_speakers/incoming/header/index.types.ts → ...rs_catalog/incoming/header/index.types.ts
diff --git a/...ng_speakers/incoming/header/useHeader.tsx → ...ers_catalog/incoming/header/useHeader.tsx b/...ng_speakers/incoming/header/useHeader.tsx → ...ers_catalog/incoming/header/useHeader.tsx
diff --git a/...sons/visiting_speakers/incoming/index.tsx → ...rsons/speakers_catalog/incoming/index.tsx b/...sons/visiting_speakers/incoming/index.tsx → ...rsons/speakers_catalog/incoming/index.tsx
diff --git a/..._speakers/incoming/meeting_time/index.tsx → ...s_catalog/incoming/meeting_time/index.tsx b/..._speakers/incoming/meeting_time/index.tsx → ...s_catalog/incoming/meeting_time/index.tsx
diff --git a/...kers/incoming/meeting_time/index.types.ts → ...alog/incoming/meeting_time/index.types.ts b/...kers/incoming/meeting_time/index.types.ts → ...alog/incoming/meeting_time/index.types.ts
diff --git a/.../incoming/meeting_time/useMeetingTime.tsx → .../incoming/meeting_time/useMeetingTime.tsx b/.../incoming/meeting_time/useMeetingTime.tsx → .../incoming/meeting_time/useMeetingTime.tsx
diff --git a/...akers/incoming/no_congregations/index.tsx → ...talog/incoming/no_congregations/index.tsx b/...akers/incoming/no_congregations/index.tsx → ...talog/incoming/no_congregations/index.tsx
diff --git a/...ers/incoming/speakers_list/edit/index.tsx → ...log/incoming/speakers_list/edit/index.tsx b/...ers/incoming/speakers_list/edit/index.tsx → ...log/incoming/speakers_list/edit/index.tsx
@@ -8,9 +8,9 @@ import useEdit from './useEdit';
 import AutocompleteMultiple from '@components/autocomplete_multiple';
 import Button from '@components/button';
 import MiniChip from '@components/mini_chip';
-import PopupSongAdd from '@features/persons/visiting_speakers/song_add_popup';
+import PopupSongAdd from '@features/persons/speakers_catalog/song_add_popup';
 import Radio from '@components/radio';
-import SpeakerDetails from '@features/persons/visiting_speakers/speaker_details';
+import SpeakerDetails from '@features/persons/speakers_catalog/speaker_details';
 import TextField from '@components/textfield';
 import Typography from '@components/typography';
 

diff --git a/...ncoming/speakers_list/edit/index.types.ts → ...ncoming/speakers_list/edit/index.types.ts b/...ncoming/speakers_list/edit/index.types.ts → ...ncoming/speakers_list/edit/index.types.ts
diff --git a/...s/incoming/speakers_list/edit/useEdit.tsx → ...g/incoming/speakers_list/edit/useEdit.tsx b/...s/incoming/speakers_list/edit/useEdit.tsx → ...g/incoming/speakers_list/edit/useEdit.tsx
diff --git a/...speakers/incoming/speakers_list/index.tsx → ..._catalog/incoming/speakers_list/index.tsx b/...speakers/incoming/speakers_list/index.tsx → ..._catalog/incoming/speakers_list/index.tsx
diff --git a/...ers/incoming/speakers_list/index.types.ts → ...log/incoming/speakers_list/index.types.ts b/...ers/incoming/speakers_list/index.types.ts → ...log/incoming/speakers_list/index.types.ts
diff --git a/...ncoming/speakers_list/useSpeakersList.tsx → ...ncoming/speakers_list/useSpeakersList.tsx b/...ncoming/speakers_list/useSpeakersList.tsx → ...ncoming/speakers_list/useSpeakersList.tsx
diff --git a/...isiting_speakers/incoming/useIncoming.tsx → ...speakers_catalog/incoming/useIncoming.tsx b/...isiting_speakers/incoming/useIncoming.tsx → ...speakers_catalog/incoming/useIncoming.tsx
diff --git a/...ing/congregations_access/active/index.tsx → ...ing/congregations_access/active/index.tsx b/...ing/congregations_access/active/index.tsx → ...ing/congregations_access/active/index.tsx
diff --git a/...ongregations_access/active/index.types.ts → ...ongregations_access/active/index.types.ts b/...ongregations_access/active/index.types.ts → ...ongregations_access/active/index.types.ts
diff --git a/...ations_access/congregation_item/index.tsx → ...ations_access/congregation_item/index.tsx b/...ations_access/congregation_item/index.tsx → ...ations_access/congregation_item/index.tsx
diff --git a/...s_access/congregation_item/index.types.ts → ...s_access/congregation_item/index.types.ts b/...s_access/congregation_item/index.types.ts → ...s_access/congregation_item/index.types.ts
diff --git a/...g/congregations_access/inactive/index.tsx → ...g/congregations_access/inactive/index.tsx b/...g/congregations_access/inactive/index.tsx → ...g/congregations_access/inactive/index.tsx
diff --git a/...s/outgoing/congregations_access/index.tsx → ...g/outgoing/congregations_access/index.tsx b/...s/outgoing/congregations_access/index.tsx → ...g/outgoing/congregations_access/index.tsx
diff --git a/...going/congregations_access/index.types.ts → ...going/congregations_access/index.types.ts b/...going/congregations_access/index.types.ts → ...going/congregations_access/index.types.ts
diff --git a/...gations_access/useCongregationsAccess.tsx → ...gations_access/useCongregationsAccess.tsx b/...gations_access/useCongregationsAccess.tsx → ...gations_access/useCongregationsAccess.tsx
diff --git a/...siting_speakers/outgoing/header/index.tsx → ...peakers_catalog/outgoing/header/index.tsx b/...siting_speakers/outgoing/header/index.tsx → ...peakers_catalog/outgoing/header/index.tsx
diff --git a/...g_speakers/outgoing/header/index.types.ts → ...rs_catalog/outgoing/header/index.types.ts b/...g_speakers/outgoing/header/index.types.ts → ...rs_catalog/outgoing/header/index.types.ts
diff --git a/...ng_speakers/outgoing/header/useHeader.tsx → ...ers_catalog/outgoing/header/useHeader.tsx b/...ng_speakers/outgoing/header/useHeader.tsx → ...ers_catalog/outgoing/header/useHeader.tsx
diff --git a/...sons/visiting_speakers/outgoing/index.tsx → ...rsons/speakers_catalog/outgoing/index.tsx b/...sons/visiting_speakers/outgoing/index.tsx → ...rsons/speakers_catalog/outgoing/index.tsx
diff --git a/...g_speakers/outgoing/no_speakers/index.tsx → ...rs_catalog/outgoing/no_speakers/index.tsx b/...g_speakers/outgoing/no_speakers/index.tsx → ...rs_catalog/outgoing/no_speakers/index.tsx
diff --git a/..._speakers/outgoing/speaker_edit/index.tsx → ...s_catalog/outgoing/speaker_edit/index.tsx b/..._speakers/outgoing/speaker_edit/index.tsx → ...s_catalog/outgoing/speaker_edit/index.tsx
@@ -8,9 +8,9 @@ import AutocompleteMultiple from '@components/autocomplete_multiple';
 import Button from '@components/button';
 import MenuItem from '@components/menuitem';
 import MiniChip from '@components/mini_chip';
-import PopupSongAdd from '@features/persons/visiting_speakers/song_add_popup';
+import PopupSongAdd from '@features/persons/speakers_catalog/song_add_popup';
 import Select from '@components/select';
-import SpeakerDetails from '@features/persons/visiting_speakers/speaker_details';
+import SpeakerDetails from '@features/persons/speakers_catalog/speaker_details';
 import Typography from '@components/typography';
 import { buildPersonFullname } from '@utils/common';
 

diff --git a/...kers/outgoing/speaker_edit/index.types.ts → ...alog/outgoing/speaker_edit/index.types.ts b/...kers/outgoing/speaker_edit/index.types.ts → ...alog/outgoing/speaker_edit/index.types.ts
diff --git a/...peakers/outgoing/speaker_edit/useEdit.tsx → ...catalog/outgoing/speaker_edit/useEdit.tsx b/...peakers/outgoing/speaker_edit/useEdit.tsx → ...catalog/outgoing/speaker_edit/useEdit.tsx
diff --git a/...isiting_speakers/outgoing/useOutgoing.tsx → ...speakers_catalog/outgoing/useOutgoing.tsx b/...isiting_speakers/outgoing/useOutgoing.tsx → ...speakers_catalog/outgoing/useOutgoing.tsx
diff --git a/...kers/outgoing/visibility_toggle/index.tsx → ...alog/outgoing/visibility_toggle/index.tsx b/...kers/outgoing/visibility_toggle/index.tsx → ...alog/outgoing/visibility_toggle/index.tsx
diff --git a/...visibility_toggle/useVisibilityToggle.tsx → ...visibility_toggle/useVisibilityToggle.tsx b/...visibility_toggle/useVisibilityToggle.tsx → ...visibility_toggle/useVisibilityToggle.tsx
diff --git a/...isibility_toggle/visibility_off/index.tsx → ...isibility_toggle/visibility_off/index.tsx b/...isibility_toggle/visibility_off/index.tsx → ...isibility_toggle/visibility_off/index.tsx
diff --git a/...lity_toggle/visibility_off/index.types.ts → ...lity_toggle/visibility_off/index.types.ts b/...lity_toggle/visibility_off/index.types.ts → ...lity_toggle/visibility_off/index.types.ts
diff --git a/...isiting_speakers/song_add_popup/index.tsx → ...speakers_catalog/song_add_popup/index.tsx b/...isiting_speakers/song_add_popup/index.tsx → ...speakers_catalog/song_add_popup/index.tsx
diff --git a/...ng_speakers/song_add_popup/index.types.ts → ...ers_catalog/song_add_popup/index.types.ts b/...ng_speakers/song_add_popup/index.types.ts → ...ers_catalog/song_add_popup/index.types.ts
diff --git a/...ns/visiting_speakers/songs_talk/index.tsx → ...ons/speakers_catalog/songs_talk/index.tsx b/...ns/visiting_speakers/songs_talk/index.tsx → ...ons/speakers_catalog/songs_talk/index.tsx
diff --git a/...siting_speakers/songs_talk/index.types.ts → ...peakers_catalog/songs_talk/index.types.ts b/...siting_speakers/songs_talk/index.types.ts → ...peakers_catalog/songs_talk/index.types.ts
diff --git a/...iting_speakers/songs_talk/useSongTalk.tsx → ...eakers_catalog/songs_talk/useSongTalk.tsx b/...iting_speakers/songs_talk/useSongTalk.tsx → ...eakers_catalog/songs_talk/useSongTalk.tsx
diff --git a/...rs/speaker_details/contact_info/index.tsx → ...og/speaker_details/contact_info/index.tsx b/...rs/speaker_details/contact_info/index.tsx → ...og/speaker_details/contact_info/index.tsx
diff --git a/...eaker_details/contact_info/index.types.ts → ...eaker_details/contact_info/index.types.ts b/...eaker_details/contact_info/index.types.ts → ...eaker_details/contact_info/index.types.ts
diff --git a/...siting_speakers/speaker_details/index.tsx → ...peakers_catalog/speaker_details/index.tsx b/...siting_speakers/speaker_details/index.tsx → ...peakers_catalog/speaker_details/index.tsx
diff --git a/...g_speakers/speaker_details/index.types.ts → ...rs_catalog/speaker_details/index.types.ts b/...g_speakers/speaker_details/index.types.ts → ...rs_catalog/speaker_details/index.types.ts
diff --git a/...ers/speaker_details/talks_songs/index.tsx → ...log/speaker_details/talks_songs/index.tsx b/...ers/speaker_details/talks_songs/index.tsx → ...log/speaker_details/talks_songs/index.tsx
diff --git a/...peaker_details/talks_songs/index.types.ts → ...peaker_details/talks_songs/index.types.ts b/...peaker_details/talks_songs/index.types.ts → ...peaker_details/talks_songs/index.types.ts
diff --git a/...ker_details/talks_songs/useTalksSongs.tsx → ...ker_details/talks_songs/useTalksSongs.tsx b/...ker_details/talks_songs/useTalksSongs.tsx → ...ker_details/talks_songs/useTalksSongs.tsx
diff --git a/...ers/speaker_details/useSpeakerDetails.tsx → ...log/speaker_details/useSpeakerDetails.tsx b/...ers/speaker_details/useSpeakerDetails.tsx → ...log/speaker_details/useSpeakerDetails.tsx
diff --git a/...iting_speakers/speaker_row_view/index.tsx → ...eakers_catalog/speaker_row_view/index.tsx b/...iting_speakers/speaker_row_view/index.tsx → ...eakers_catalog/speaker_row_view/index.tsx
@@ -5,7 +5,7 @@ import { buildPersonFullname } from '@utils/common';
 import { SpeakerReadOnlyViewType } from './index.types';
 import useSpeakerRowView from './useSpeakerRowView';
 import Button from '@components/button';
-import SpeakerDetails from '@features/persons/visiting_speakers/speaker_details';
+import SpeakerDetails from '@features/persons/speakers_catalog/speaker_details';
 import Typography from '@components/typography';
 
 const SpeakerRowView = ({ speaker }: SpeakerReadOnlyViewType) => {

diff --git a/..._speakers/speaker_row_view/index.types.ts → ...s_catalog/speaker_row_view/index.types.ts b/..._speakers/speaker_row_view/index.types.ts → ...s_catalog/speaker_row_view/index.types.ts
diff --git a/...rs/speaker_row_view/useSpeakerRowView.tsx → ...og/speaker_row_view/useSpeakerRowView.tsx b/...rs/speaker_row_view/useSpeakerRowView.tsx → ...og/speaker_row_view/useSpeakerRowView.tsx
diff --git a/src/pages/dashboard/persons/index.tsx b/src/pages/dashboard/persons/index.tsx
@@ -41,7 +41,7 @@ const PersonsCard = () => {
         <DashboardMenu
           icon={<IconVisitingSpeaker color="var(--black)" />}
           primaryText={t('tr_speakersCatalog')}
-          path="/visiting-speakers"
+          path="/speakers-catalog"
         />
       </ListItem>
     </DashboardCard>

diff --git a/...pages/persons/visiting_speakers/index.tsx → src/pages/persons/speakers_catalog/index.tsx b/...pages/persons/visiting_speakers/index.tsx → src/pages/persons/speakers_catalog/index.tsx
@@ -3,19 +3,19 @@ import { IconAdd } from '@components/icons';
 import { Button, PageTitle } from '@components/index';
 import { useAppTranslation, useBreakpoints } from '@hooks/index';
 import { IncomingSpeakers, OutgoingSpeakers } from '@features/index';
-import useVisitingSpeakers from './useVisitingSpeakers';
+import useSpeakersCatalog from './useSpeakersCatalog';
 
-const VisitingSpeakers = () => {
+const SpeakersCatalog = () => {
   const { t } = useAppTranslation();
 
   const { desktopUp } = useBreakpoints();
 
-  const { handleIsAddingOpen } = useVisitingSpeakers();
+  const { handleIsAddingOpen } = useSpeakersCatalog();
 
   return (
     <Box sx={{ display: 'flex', gap: '16px', flexDirection: 'column' }}>
       <PageTitle
-        title={t('tr_visitingSpeakers')}
+        title={t('tr_speakersCatalog')}
         buttons={
           <Button
             variant="main"
@@ -44,4 +44,4 @@ const VisitingSpeakers = () => {
   );
 };
 
-export default VisitingSpeakers;
+export default SpeakersCatalog;
diff --git a/...visiting_speakers/useVisitingSpeakers.tsx → ...s/speakers_catalog/useSpeakersCatalog.tsx b/...visiting_speakers/useVisitingSpeakers.tsx → ...s/speakers_catalog/useSpeakersCatalog.tsx
@@ -1,12 +1,12 @@
 import { useSetRecoilState } from 'recoil';
 import { isAddingCongregationState } from '@states/speakers_congregations';
 
-const useVisitingSpeakers = () => {
+const useSpeakersCatalog = () => {
   const setIsAdding = useSetRecoilState(isAddingCongregationState);
 
   const handleIsAddingOpen = () => setIsAdding(true);
 
   return { handleIsAddingOpen };
 };
 
-export default useVisitingSpeakers;
+export default useSpeakersCatalog;