Skip to content

Commit

Permalink
fix: remove useEventsConfig hook from all apps
Browse files Browse the repository at this point in the history
  • Loading branch information
@kristianjokela
kristianjokela committed Jan 18, 2023
1 parent ba81158 commit 68bd5a2
Show file tree
Hide file tree
Showing 6 changed files with 93 additions and 175 deletions.
23 changes: 0 additions & 23 deletions apps/events-helsinki/src/hooks/useEventsConfig.tsx
View file

This file was deleted.

67 changes: 31 additions & 36 deletions apps/events-helsinki/src/pages/_app.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,15 @@ import type { SSRConfig } from 'next-i18next';
import { appWithTranslation } from 'next-i18next';
import type { AppProps as NextAppProps } from 'next/app';
import Error from 'next/error';
import type { NextRouter } from 'next/router';
import { useRouter } from 'next/router';
import React from 'react';
import { ConfigProvider as RHHCConfigProvider } from 'react-helsinki-headless-cms';
import { ToastContainer } from 'react-toastify';

import '../styles/globals.scss';
import nextI18nextConfig from '../../next-i18next.config';
import EventsConfigProvider from '../common-events/configProvider/ConfigProvider';
import AppConfig from '../domain/app/AppConfig';
import { useApolloClient } from '../domain/clients/eventsFederationApolloClient';
import useEventsConfig from '../hooks/useEventsConfig';
import useRHHCConfig from '../hooks/useRHHCConfig';

const matomoInstance = createMatomoInstance(AppConfig.matomoConfiguration);
Expand Down Expand Up @@ -61,8 +59,7 @@ export type CustomPageProps = {
function MyApp({ Component, pageProps }: AppProps<CustomPageProps>) {
const { error, headerMenu, footerMenu, languages } = pageProps;
const apolloClient = useApolloClient();
const eventsConfig = useEventsConfig();
const router = eventsConfig.router as NextRouter;
const router = useRouter();
const rhhcConfig = useRHHCConfig();
const { t } = useCommonTranslation();

Expand All @@ -84,38 +81,36 @@ function MyApp({ Component, pageProps }: AppProps<CustomPageProps>) {

return (
<ApolloProvider client={apolloClient}>
<EventsConfigProvider config={eventsConfig}>
<RHHCConfigProvider config={rhhcConfig}>
<NavigationProvider
headerMenu={headerMenu}
footerMenu={footerMenu}
languages={languages}
>
<ResetFocus />
<MatomoProvider value={matomoInstance}>
{router.isFallback ? (
<Center>
<LoadingSpinner />
</Center>
) : error ? (
<Error
statusCode={error.networkError?.statusCode ?? 400}
title={error.title}
<RHHCConfigProvider config={rhhcConfig}>
<NavigationProvider
headerMenu={headerMenu}
footerMenu={footerMenu}
languages={languages}
>
<ResetFocus />
<MatomoProvider value={matomoInstance}>
{router.isFallback ? (
<Center>
<LoadingSpinner />
</Center>
) : error ? (
<Error
statusCode={error.networkError?.statusCode ?? 400}
title={error.title}
/>
) : (
<>
<Component {...pageProps} />
<EventsCookieConsent
allowLanguageSwitch={false}
appName={t('appEvents:appName')}
/>
) : (
<>
<Component {...pageProps} />
<EventsCookieConsent
allowLanguageSwitch={false}
appName={t('appEvents:appName')}
/>
</>
)}
</MatomoProvider>
<ToastContainer />
</NavigationProvider>
</RHHCConfigProvider>
</EventsConfigProvider>
</>
)}
</MatomoProvider>
<ToastContainer />
</NavigationProvider>
</RHHCConfigProvider>
</ApolloProvider>
);
}
Expand Down
22 changes: 0 additions & 22 deletions apps/hobbies-helsinki/src/hooks/useEventsConfig.tsx
View file

This file was deleted.

67 changes: 31 additions & 36 deletions apps/hobbies-helsinki/src/pages/_app.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,15 @@ import type { SSRConfig } from 'next-i18next';
import { appWithTranslation } from 'next-i18next';
import type { AppProps as NextAppProps } from 'next/app';
import Error from 'next/error';
import type { NextRouter } from 'next/router';
import { useRouter } from 'next/router';
import React from 'react';
import { ConfigProvider as RHHCConfigProvider } from 'react-helsinki-headless-cms';
import { ToastContainer } from 'react-toastify';

import '../styles/globals.scss';
import nextI18nextConfig from '../../next-i18next.config';
import EventsConfigProvider from '../common-events/configProvider/ConfigProvider';
import AppConfig from '../domain/app/AppConfig';
import { useApolloClient } from '../domain/clients/eventsFederationApolloClient';
import useEventsConfig from '../hooks/useEventsConfig';
import useRHHCConfig from '../hooks/useRHHCConfig';

const matomoInstance = createMatomoInstance(AppConfig.matomoConfiguration);
Expand Down Expand Up @@ -61,8 +59,7 @@ export type CustomPageProps = {
function MyApp({ Component, pageProps }: AppProps<CustomPageProps>) {
const { error, headerMenu, footerMenu, languages } = pageProps;
const apolloClient = useApolloClient();
const eventsConfig = useEventsConfig();
const router = eventsConfig.router as NextRouter;
const router = useRouter();
const rhhcConfig = useRHHCConfig();
const { t } = useCommonTranslation();

Expand All @@ -84,38 +81,36 @@ function MyApp({ Component, pageProps }: AppProps<CustomPageProps>) {

return (
<ApolloProvider client={apolloClient}>
<EventsConfigProvider config={eventsConfig}>
<RHHCConfigProvider config={rhhcConfig}>
<NavigationProvider
headerMenu={headerMenu}
footerMenu={footerMenu}
languages={languages}
>
<ResetFocus />
<MatomoProvider value={matomoInstance}>
{router.isFallback ? (
<Center>
<LoadingSpinner />
</Center>
) : error ? (
<Error
statusCode={error.networkError?.statusCode ?? 400}
title={error.title}
<RHHCConfigProvider config={rhhcConfig}>
<NavigationProvider
headerMenu={headerMenu}
footerMenu={footerMenu}
languages={languages}
>
<ResetFocus />
<MatomoProvider value={matomoInstance}>
{router.isFallback ? (
<Center>
<LoadingSpinner />
</Center>
) : error ? (
<Error
statusCode={error.networkError?.statusCode ?? 400}
title={error.title}
/>
) : (
<>
<Component {...pageProps} />
<EventsCookieConsent
allowLanguageSwitch={false}
appName={t('appHobbies:appName')}
/>
) : (
<>
<Component {...pageProps} />
<EventsCookieConsent
allowLanguageSwitch={false}
appName={t('appHobbies:appName')}
/>
</>
)}
</MatomoProvider>
<ToastContainer />
</NavigationProvider>
</RHHCConfigProvider>
</EventsConfigProvider>
</>
)}
</MatomoProvider>
<ToastContainer />
</NavigationProvider>
</RHHCConfigProvider>
</ApolloProvider>
);
}
Expand Down
22 changes: 0 additions & 22 deletions apps/sports-helsinki/src/hooks/useEventsConfig.tsx
View file

This file was deleted.

67 changes: 31 additions & 36 deletions apps/sports-helsinki/src/pages/_app.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,15 @@ import type { SSRConfig } from 'next-i18next';
import { appWithTranslation } from 'next-i18next';
import type { AppProps as NextAppProps } from 'next/app';
import Error from 'next/error';
import type { NextRouter } from 'next/router';
import { useRouter } from 'next/router';
import React from 'react';
import { ConfigProvider as RHHCConfigProvider } from 'react-helsinki-headless-cms';
import { ToastContainer } from 'react-toastify';

import '../styles/globals.scss';
import nextI18nextConfig from '../../next-i18next.config';
import EventsConfigProvider from '../common-events/configProvider/ConfigProvider';
import AppConfig from '../domain/app/AppConfig';
import { useApolloClient } from '../domain/clients/eventsFederationApolloClient';
import useEventsConfig from '../hooks/useEventsConfig';
import useRHHCConfig from '../hooks/useRHHCConfig';

const matomoInstance = createMatomoInstance(AppConfig.matomoConfiguration);
Expand Down Expand Up @@ -62,8 +60,7 @@ export type CustomPageProps = {
function MyApp({ Component, pageProps }: AppProps<CustomPageProps>) {
const { error, headerMenu, footerMenu, languages } = pageProps;
const apolloClient = useApolloClient();
const eventsConfig = useEventsConfig();
const router = eventsConfig.router as NextRouter;
const router = useRouter();
const rhhcConfig = useRHHCConfig();
const { t } = useCommonTranslation();

Expand All @@ -86,38 +83,36 @@ function MyApp({ Component, pageProps }: AppProps<CustomPageProps>) {
return (
<ApolloProvider client={apolloClient}>
<GeolocationProvider>
<EventsConfigProvider config={eventsConfig}>
<RHHCConfigProvider config={rhhcConfig}>
<NavigationProvider
headerMenu={headerMenu}
footerMenu={footerMenu}
languages={languages}
>
<ResetFocus />
<MatomoProvider value={matomoInstance}>
{router.isFallback ? (
<Center>
<LoadingSpinner />
</Center>
) : error ? (
<Error
statusCode={error.networkError?.statusCode ?? 400}
title={error.title}
<RHHCConfigProvider config={rhhcConfig}>
<NavigationProvider
headerMenu={headerMenu}
footerMenu={footerMenu}
languages={languages}
>
<ResetFocus />
<MatomoProvider value={matomoInstance}>
{router.isFallback ? (
<Center>
<LoadingSpinner />
</Center>
) : error ? (
<Error
statusCode={error.networkError?.statusCode ?? 400}
title={error.title}
/>
) : (
<>
<Component {...pageProps} />
<EventsCookieConsent
allowLanguageSwitch={false}
appName={t('appSports:appName')}
/>
) : (
<>
<Component {...pageProps} />
<EventsCookieConsent
allowLanguageSwitch={false}
appName={t('appSports:appName')}
/>
</>
)}
</MatomoProvider>
<ToastContainer />
</NavigationProvider>
</RHHCConfigProvider>
</EventsConfigProvider>
</>
)}
</MatomoProvider>
<ToastContainer />
</NavigationProvider>
</RHHCConfigProvider>
</GeolocationProvider>
</ApolloProvider>
);
Expand Down

0 comments on commit 68bd5a2

Please sign in to comment.