Add case for un-mapped custom domain to login page
This commit is contained in:
@@ -13,7 +13,6 @@ import Fade from "~/components/Fade";
|
|||||||
import Flex from "~/components/Flex";
|
import Flex from "~/components/Flex";
|
||||||
import Heading from "~/components/Heading";
|
import Heading from "~/components/Heading";
|
||||||
import LoadingIndicator from "~/components/LoadingIndicator";
|
import LoadingIndicator from "~/components/LoadingIndicator";
|
||||||
import NoticeAlert from "~/components/NoticeAlert";
|
|
||||||
import OutlineLogo from "~/components/OutlineLogo";
|
import OutlineLogo from "~/components/OutlineLogo";
|
||||||
import PageTitle from "~/components/PageTitle";
|
import PageTitle from "~/components/PageTitle";
|
||||||
import TeamLogo from "~/components/TeamLogo";
|
import TeamLogo from "~/components/TeamLogo";
|
||||||
@@ -109,7 +108,8 @@ function Login({ children }: Props) {
|
|||||||
<Header />
|
<Header />
|
||||||
<Centered align="center" justify="center" column auto>
|
<Centered align="center" justify="center" column auto>
|
||||||
<PageTitle title={t("Login")} />
|
<PageTitle title={t("Login")} />
|
||||||
<NoticeAlert>
|
<Heading centered>{t("Error")}</Heading>
|
||||||
|
<Note>
|
||||||
{t("Failed to load configuration.")}
|
{t("Failed to load configuration.")}
|
||||||
{!isCloudHosted && (
|
{!isCloudHosted && (
|
||||||
<p>
|
<p>
|
||||||
@@ -118,7 +118,7 @@ function Login({ children }: Props) {
|
|||||||
)}
|
)}
|
||||||
</p>
|
</p>
|
||||||
)}
|
)}
|
||||||
</NoticeAlert>
|
</Note>
|
||||||
</Centered>
|
</Centered>
|
||||||
</Background>
|
</Background>
|
||||||
);
|
);
|
||||||
@@ -130,6 +130,26 @@ function Login({ children }: Props) {
|
|||||||
return <LoadingIndicator />;
|
return <LoadingIndicator />;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const isCustomDomain = parseDomain(window.location.origin).custom;
|
||||||
|
|
||||||
|
// Unmapped custom domain
|
||||||
|
if (isCloudHosted && isCustomDomain && !config.name) {
|
||||||
|
return (
|
||||||
|
<Background>
|
||||||
|
<Header config={config} />
|
||||||
|
<Centered align="center" justify="center" column auto>
|
||||||
|
<PageTitle title={t("Custom domain setup")} />
|
||||||
|
<Heading centered>{t("Almost there")}…</Heading>
|
||||||
|
<Note>
|
||||||
|
{t(
|
||||||
|
"Your custom domain is successfully pointing at Outline. To complete the setup process please contact support."
|
||||||
|
)}
|
||||||
|
</Note>
|
||||||
|
</Centered>
|
||||||
|
</Background>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
const hasMultipleProviders = config.providers.length > 1;
|
const hasMultipleProviders = config.providers.length > 1;
|
||||||
const defaultProvider = find(
|
const defaultProvider = find(
|
||||||
config.providers,
|
config.providers,
|
||||||
@@ -168,7 +188,7 @@ function Login({ children }: Props) {
|
|||||||
title={config.name ? `${config.name} – ${t("Login")}` : t("Login")}
|
title={config.name ? `${config.name} – ${t("Login")}` : t("Login")}
|
||||||
/>
|
/>
|
||||||
<Logo>
|
<Logo>
|
||||||
{config.logo ? (
|
{config.logo && !isCreate ? (
|
||||||
<TeamLogo size={48} src={config.logo} />
|
<TeamLogo size={48} src={config.logo} />
|
||||||
) : (
|
) : (
|
||||||
<OutlineLogo size={42} fill="currentColor" />
|
<OutlineLogo size={42} fill="currentColor" />
|
||||||
|
|||||||
@@ -577,8 +577,12 @@
|
|||||||
"Continue with {{ authProviderName }}": "Continue with {{ authProviderName }}",
|
"Continue with {{ authProviderName }}": "Continue with {{ authProviderName }}",
|
||||||
"Back to home": "Back to home",
|
"Back to home": "Back to home",
|
||||||
"Login": "Login",
|
"Login": "Login",
|
||||||
|
"Error": "Error",
|
||||||
"Failed to load configuration.": "Failed to load configuration.",
|
"Failed to load configuration.": "Failed to load configuration.",
|
||||||
"Check the network requests and server logs for full details of the error.": "Check the network requests and server logs for full details of the error.",
|
"Check the network requests and server logs for full details of the error.": "Check the network requests and server logs for full details of the error.",
|
||||||
|
"Custom domain setup": "Custom domain setup",
|
||||||
|
"Almost there": "Almost there",
|
||||||
|
"Your custom domain is successfully pointing at Outline. To complete the setup process please contact support.": "Your custom domain is successfully pointing at Outline. To complete the setup process please contact support.",
|
||||||
"Check your email": "Check your email",
|
"Check your email": "Check your email",
|
||||||
"A magic sign-in link has been sent to the email <em>{{ emailLinkSentTo }}</em> if an account exists.": "A magic sign-in link has been sent to the email <em>{{ emailLinkSentTo }}</em> if an account exists.",
|
"A magic sign-in link has been sent to the email <em>{{ emailLinkSentTo }}</em> if an account exists.": "A magic sign-in link has been sent to the email <em>{{ emailLinkSentTo }}</em> if an account exists.",
|
||||||
"Back to login": "Back to login",
|
"Back to login": "Back to login",
|
||||||
|
|||||||
Reference in New Issue
Block a user