Add shared LocaleAndTranslations type

gita · Aug 27, 2023 · eef090a · eef090a
1 parent 1cd2fb3
commit eef090a
Show file tree

Hide file tree

Showing 15 changed files with 29 additions and 77 deletions.
diff --git a/src/app/chapter/[chapterNumber]/(chapter)/[[...locale]]/ChapterPage.tsx b/src/app/chapter/[chapterNumber]/(chapter)/[[...locale]]/ChapterPage.tsx
@@ -15,15 +15,13 @@ import useMyStyles from "hooks/useMyStyles";
 import { getTranslate } from "shared/translate";
 import classNames from "utils/classNames";
 
-interface Props {
+type Props = {
   chapterData: GitaChapterData;
   versesData: Pick<
     GitaVerse,
     "id" | "verse_number" | "gita_translations" | "chapter_number"
   >[];
-  locale: Locale;
-  translations: Record<string, string>;
-}
+} & LocaleAndTranslations;
 
 export default function ChapterPage({
   chapterData: {

diff --git a/src/app/chapter/[chapterNumber]/verse/[verseNumber]/[[...locale]]/VersePage.tsx b/src/app/chapter/[chapterNumber]/verse/[verseNumber]/[[...locale]]/VersePage.tsx
@@ -5,9 +5,7 @@ import classNames from "utils/classNames";
 
 type Props = {
   verseData: GitaVerse;
-  translations: Record<string, string>;
-  locale: Locale;
-};
+} & LocaleAndTranslations;
 
 export default function VersePage({ verseData, translations, locale }: Props) {
   return (

diff --git a/src/app/search/search-page.tsx b/src/app/search/search-page.tsx
@@ -20,10 +20,7 @@ interface SearchQueryVerse {
 export default function SearchPage({
   translations,
   locale,
-}: {
-  locale: Locale;
-  translations: Record<string, string>;
-}) {
+}: LocaleAndTranslations) {
   const searchParams = useSearchParams();
   const query = searchParams?.get("query");
   const [data, setData] = useState<SearchQueryVerse[]>();

diff --git a/src/app/verse-of-the-day/VerseOfTheDay.tsx b/src/app/verse-of-the-day/VerseOfTheDay.tsx
@@ -4,17 +4,11 @@ import Verse from "components/Verse";
 import useMyStyles from "hooks/useMyStyles";
 import classNames from "utils/classNames";
 
-interface VerseOfTheDayProps {
+type Props = {
   dailyVerse: GitaVerse;
-  translations: Record<string, string>;
-  locale: Locale;
-}
+} & LocaleAndTranslations;
 
-const VerseOfTheDay = ({
-  dailyVerse,
-  translations,
-  locale,
-}: VerseOfTheDayProps) => {
+const VerseOfTheDay = ({ dailyVerse, translations, locale }: Props) => {
   const styles = useMyStyles();
 
   return (

diff --git a/src/components/AboutBanner.tsx b/src/components/AboutBanner.tsx
@@ -4,12 +4,7 @@ import { getTranslate } from "shared/translate";
 
 import AboutGitaBanner from "../../public/quotes-bg.png";
 
-type Props = {
-  locale: Locale;
-  translations: Record<string, string>;
-};
-
-export default function AboutBanner(props: Props) {
+export default function AboutBanner(props: LocaleAndTranslations) {
   const { locale, translations } = props;
   const translate = getTranslate(translations, locale);
 

diff --git a/src/components/Home/Banner.tsx b/src/components/Home/Banner.tsx
@@ -3,12 +3,7 @@ import Image from "next/image";
 import LinkWithLocale from "components/LinkWithLocale";
 import { getTranslate } from "shared/translate";
 
-type Props = {
-  locale: Locale;
-  translations: Record<string, string>;
-};
-
-const Banner = (props: Props) => {
+const Banner = (props: LocaleAndTranslations) => {
   const { translations, locale } = props;
 
   const translate = getTranslate(translations, locale);

diff --git a/src/components/Home/Newsletter.tsx b/src/components/Home/Newsletter.tsx
@@ -14,15 +14,13 @@ import Modal from "./Modal";
 
 type SubscribeMessage = { isSuccess: boolean; message: string };
 
-interface Props {
+type Props = {
   notification: {
     name: string;
     message: string;
     status: string;
   };
-  locale: Locale;
-  translations: Record<string, string>;
-}
+} & LocaleAndTranslations;
 
 const Newsletter = ({ notification, locale, translations }: Props) => {
   const [modalVisible, setModalVisible] = useState<boolean>(false);

diff --git a/src/components/Home/VerseOfDay.tsx b/src/components/Home/VerseOfDay.tsx
@@ -6,12 +6,7 @@ import { getTranslate } from "shared/translate";
 import { getDailyVerse } from "../../lib/getDailyVerse";
 import { Skeleton } from "../Skeleton";
 
-type Props = {
-  locale: Locale;
-  translations: Record<string, string>;
-};
-
-const VerseOfDay = async (props: Props) => {
+const VerseOfDay = async (props: LocaleAndTranslations) => {
   const { translations, locale } = props;
 
   const dailyVerse = await getDailyVerse(locale);

diff --git a/src/components/Verse/Commentary.tsx b/src/components/Verse/Commentary.tsx
@@ -5,11 +5,9 @@ import classNames from "../../utils/classNames";
 import splitIntoParagraphs from "../../utils/splitIntoParagraphs";
 import { Skeleton } from "../Skeleton";
 
-interface Props {
+type Props = {
   commentaryData: GitaLanguage[] | undefined;
-  translations: Record<string, string>;
-  locale: Locale;
-}
+} & LocaleAndTranslations;
 
 export default function Commentary({
   commentaryData,

diff --git a/src/components/Verse/Translation.tsx b/src/components/Verse/Translation.tsx
@@ -2,11 +2,9 @@ import useMyStyles from "hooks/useMyStyles";
 import { getTranslate } from "shared/translate";
 import classNames from "utils/classNames";
 
-interface Props {
+type Props = {
   translationData: GitaLanguage[] | undefined;
-  translations: Record<string, string>;
-  locale: Locale;
-}
+} & LocaleAndTranslations;
 
 export default function Translation({
   translationData,

diff --git a/src/components/Verse/index.tsx b/src/components/Verse/index.tsx
@@ -15,11 +15,9 @@ import { SvgFloralDivider } from "../svgs";
 import Commentary from "./Commentary";
 import Translation from "./Translation";
 
-interface VerseProps {
+type Props = {
   verse: GitaVerse;
-  translations: Record<string, string>;
-  locale: Locale;
-}
+} & LocaleAndTranslations;
 
 const Verse = ({
   verse: {
@@ -34,7 +32,7 @@ const Verse = ({
   },
   translations,
   locale,
-}: VerseProps) => {
+}: Props) => {
   const styles = useMyStyles();
 
   const { advancedSettings, updateAdvancedSettings } = useAdvancedSettings();

diff --git a/src/layouts/ChapterLayout.tsx b/src/layouts/ChapterLayout.tsx
@@ -5,16 +5,11 @@ import { getTranslate } from "shared/translate";
 import Footer from "../components/Footers/Footer";
 import ChapterHeader from "../components/Headers/ChapterHeader";
 
-type Props = {
-  locale: Locale;
-  translations: Record<string, string>;
-};
-
 const ChapterLayout = ({
   children,
   translations,
   locale,
-}: React.PropsWithChildren<Props>) => {
+}: React.PropsWithChildren<LocaleAndTranslations>) => {
   const translate = getTranslate(translations, locale);
 
   return (

diff --git a/src/layouts/HomeLayout.tsx b/src/layouts/HomeLayout.tsx
@@ -5,16 +5,11 @@ import { getTranslate } from "shared/translate";
 import Footer from "../components/Footers/Footer";
 import IndexHeader from "../components/Headers/IndexHeader";
 
-type Props = {
-  locale: Locale;
-  translations: Record<string, string>;
-};
-
 const HomeLayout = ({
   children,
   locale,
   translations,
-}: React.PropsWithChildren<Props>) => {
+}: React.PropsWithChildren<LocaleAndTranslations>) => {
   const translate = getTranslate(translations, locale);
 
   return (

diff --git a/src/layouts/PagesLayout.tsx b/src/layouts/PagesLayout.tsx
@@ -4,16 +4,11 @@ import { getTranslate } from "shared/translate";
 
 import Footer from "../components/Footers/Footer";
 
-type Props = {
-  locale: Locale;
-  translations: Record<string, string>;
-};
-
 const PagesLayout = ({
   children,
   locale,
   translations,
-}: React.PropsWithChildren<Props>) => {
+}: React.PropsWithChildren<LocaleAndTranslations>) => {
   const translate = getTranslate(translations, locale);
 
   return (

diff --git a/src/types.d.ts b/src/types.d.ts
@@ -6,11 +6,9 @@ interface TChapter {
   verses_count: number;
 }
 
-interface ChaptersProps {
+type ChaptersProps = {
   chapters: TChapter[];
-  locale: Locale;
-  translations: Record<string, string>;
-}
+} & LocaleAndTranslations;
 
 interface NewsletterFormData {
   name: string;
@@ -93,3 +91,8 @@ interface SvgProps {
 }
 
 type Translate = (literal: string, options?: {}) => string;
+
+type LocaleAndTranslations = {
+  locale: Locale;
+  translations: Record<string, string>;
+};