yuuza/outline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for SUBDOMAINS_ENABLED=false

Browse Source
This commit is contained in:
Tom Moor
2018-11-11 22:06:50 -08:00
parent 61138ff4fa
commit b3a8d34af3
6 changed files with 46 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/pages/components/Layout.js
View File

@@ -15,10 +15,11 @@ export const screenshotUrl = `${process.env.URL}/screenshot.png`;
type Props = {
children?: React.Node,
sessions?: Object,
sessions: Object,
loggedIn: boolean,
};
function Layout({ children, sessions }: Props) {
function Layout({ children, loggedIn, sessions }: Props) {
return (
<html lang="en">
<head>
@@ -66,7 +67,7 @@ function Layout({ children, sessions }: Props) {
{'{{CSS}}'}
</head>
<Body>
<TopNavigation sessions={sessions} />
<TopNavigation sessions={sessions} loggedIn={loggedIn} />
{children}
<BottomNavigation />
</Body>

47
server/pages/components/Navigation.js
View File

@@ -25,7 +25,12 @@ type Sessions = {
},
};
function TopNavigation({ sessions }: { sessions: ?Sessions }) {
type Props = {
sessions: ?Sessions,
loggedIn: boolean,
};
function TopNavigation({ sessions, loggedIn }: Props) {
const orderedSessions = sortBy(sessions, 'name');
return (
@@ -47,20 +52,32 @@ function TopNavigation({ sessions }: { sessions: ?Sessions }) {
<MenuItem>
<a href={developers()}>API</a>
</MenuItem>
{orderedSessions.length ? (
<MenuItem highlighted>
<a href={developers()}>Your Teams</a>
<ol>
{orderedSessions.map(session => (
<MenuItem key={session.url}>
<a href={`${session.url}/dashboard`}>
<TeamLogo src={session.logoUrl} width={20} height={20} />
{session.name}
</a>
</MenuItem>
))}
</ol>
</MenuItem>
{loggedIn ? (
<React.Fragment>
{process.env.SUBDOMAINS_ENABLED === 'true' ? (
<MenuItem highlighted>
<a>Your Teams</a>
<ol>
{orderedSessions.map(session => (
<MenuItem key={session.url}>
<a href={`${session.url}/dashboard`}>
<TeamLogo
src={session.logoUrl}
width={20}
height={20}
/>
{session.name}
</a>
</MenuItem>
))}
</ol>
</MenuItem>
) : (
<MenuItem highlighted>
<a href="/dashboard">Dashboard</a>
</MenuItem>
)}
</React.Fragment>
) : (
<MenuItem>
<a href="/#signin">Sign In</a>