miklo
/
soapbox
sforkowany z mirror/soapbox
1
0
Forkuj 0
Kod Zgłoszenia Oczekujące zmiany Packages Projekty Wydania Wiki Aktywność

SoapboxMount: refactor render to be DRY

ci-review-rules
Alex Gleason 2022-05-20 12:51:57 -05:00
rodzic f72ee6aad0
commit 8354447047
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 7211D1F99744FBB7
1 zmienionych plików z 92 dodań i 87 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

81
app/soapbox/containers/soapbox.tsx
Wyświetl plik

@ -127,18 +127,6 @@ const SoapboxMount = () => {
localeLoading, localeLoading,
].some(Boolean); ].some(Boolean);
if (showLoading) {
return (
<>
<Helmet>
{themeCss && <style id='theme' type='text/css'>{`:root{${themeCss}}`}</style>}
</Helmet>
<LoadingScreen />
</>
);
}
const bodyClass = classNames('bg-white dark:bg-slate-900 text-base h-full', { const bodyClass = classNames('bg-white dark:bg-slate-900 text-base h-full', {
'no-reduce-motion': !settings.get('reduceMotion'), 'no-reduce-motion': !settings.get('reduceMotion'),
'underline-links': settings.get('underlineLinks'), 'underline-links': settings.get('underlineLinks'),
@ -146,39 +134,33 @@ const SoapboxMount = () => {
'demetricator': settings.get('demetricator'), 'demetricator': settings.get('demetricator'),
}); });
if (showOnboarding) { const helmet = (
return (
<IntlProvider locale={locale} messages={messages}>
<Helmet>
<html lang={locale} className={classNames({ dark: darkMode })} />
<body className={bodyClass} />
{themeCss && <style id='theme' type='text/css'>{`:root{${themeCss}}`}</style>}
<meta name='theme-color' content={soapboxConfig.brandColor} />
</Helmet>
<ErrorBoundary>
<BrowserRouter basename={BuildConfig.FE_SUBDIRECTORY}>
<OnboardingWizard />
<NotificationsContainer />
</BrowserRouter>
</ErrorBoundary>
</IntlProvider>
);
}
return (
<IntlProvider locale={locale} messages={messages}>
<Helmet> <Helmet>
<html lang={locale} className={classNames('h-full', { dark: darkMode })} /> <html lang={locale} className={classNames('h-full', { dark: darkMode })} />
<body className={bodyClass} /> <body className={bodyClass} />
{themeCss && <style id='theme' type='text/css'>{`:root{${themeCss}}`}</style>} {themeCss && <style id='theme' type='text/css'>{`:root{${themeCss}}`}</style>}
<meta name='theme-color' content={soapboxConfig.brandColor} /> <meta name='theme-color' content={soapboxConfig.brandColor} />
</Helmet> </Helmet>
);
<ErrorBoundary> /** Render loading screen. */
<BrowserRouter basename={BuildConfig.FE_SUBDIRECTORY}> const renderLoading = () => (
<> <>
<ScrollContext shouldUpdateScroll={shouldUpdateScroll}> {helmet}
<LoadingScreen />
</>
);
/** Render the onboarding flow. */
const renderOnboarding = () => (
<>
<OnboardingWizard />
<NotificationsContainer />
</>
);
/** Render the auth layout or UI. */
const renderSwitch = () => (
<Switch> <Switch>
<Redirect from='/v1/verify_email/:token' to='/verify/email/:token' /> <Redirect from='/v1/verify_email/:token' to='/verify/email/:token' />
@ -226,8 +208,31 @@ const SoapboxMount = () => {
<Route path='/' component={UI} /> <Route path='/' component={UI} />
</Switch> </Switch>
);
/** Render the onboarding flow or UI. */
const renderBody = () => {
if (showOnboarding) {
return renderOnboarding();
} else {
return renderSwitch();
}
};
// intl is part of loading.
// It's important nothing in here depends on intl.
if (showLoading) {
return renderLoading();
}
return (
<IntlProvider locale={locale} messages={messages}>
{helmet}
<ErrorBoundary>
<BrowserRouter basename={BuildConfig.FE_SUBDIRECTORY}>
<ScrollContext shouldUpdateScroll={shouldUpdateScroll}>
{renderBody()}
</ScrollContext> </ScrollContext>
</>
</BrowserRouter> </BrowserRouter>
</ErrorBoundary> </ErrorBoundary>
</IntlProvider> </IntlProvider>