Cleanup, fix header links on subdomains

This commit is contained in:
Tom Moor
2018-11-12 20:22:01 -08:00
parent bad8718a6b
commit 2e3737c6f5
3 changed files with 11 additions and 15 deletions

View File

@@ -24,15 +24,6 @@ const Auth = observer(({ auth, children }: Props) => {
return <LoadingIndicator />;
}
// Check the current origin against the teams url, if they differ we need to
// redirect to the canonical subdomain for this team
// if (window.location.origin !== team.url) {
// const redirectTo = `${team.url}${window.location.pathname}`;
// console.warn(`Redirecting to ${redirectTo}…`);
// window.location.href = redirectTo;
// return <LoadingIndicator />;
// }
// Only initialize stores once. Kept in global scope because otherwise they
// will get overridden on route change
if (!authenticatedStores) {

View File

@@ -9,6 +9,7 @@ import { fadeAndScaleIn } from '../../../shared/styles/animations';
import {
developers,
changelog,
features,
about,
privacy,
githubUrl,
@@ -38,7 +39,7 @@ function TopNavigation({ sessions, loggedIn }: Props) {
<Brand href={process.env.URL}>Outline</Brand>
<Menu>
<MenuItemDesktop>
<a href="/#features">Features</a>
<a href={features()}>Features</a>
</MenuItemDesktop>
<MenuItemDesktop>
<a href={about()}>About</a>

View File

@@ -53,22 +53,26 @@ export function mailToUrl(): string {
return 'mailto:hello@getoutline.com';
}
export function features(): string {
return `${process.env.URL}/#features`;
}
export function developers(): string {
return '/developers';
return `${process.env.URL}/developers`;
}
export function changelog(): string {
return '/changelog';
return `${process.env.URL}/changelog`;
}
export function signin(service: string = 'slack'): string {
return `/auth/${service}`;
return `${process.env.URL}/auth/${service}`;
}
export function about(): string {
return '/about';
return `${process.env.URL}/about`;
}
export function privacy(): string {
return '/privacy';
return `${process.env.URL}/privacy`;
}