From 01e7d78670008c1cfcb1a6de4a17006804645367 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20De=20Boey?= Date: Mon, 7 Oct 2019 01:40:50 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A8=20Switch=20Header=20to=20use=20use?= =?UTF-8?q?Overmind?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/Sandbox/Editor/Header/Header.tsx | 24 ++++++++++++------- .../app/pages/Sandbox/Editor/Header/types.ts | 3 --- 2 files changed, 16 insertions(+), 11 deletions(-) delete mode 100644 packages/app/src/app/pages/Sandbox/Editor/Header/types.ts diff --git a/packages/app/src/app/pages/Sandbox/Editor/Header/Header.tsx b/packages/app/src/app/pages/Sandbox/Editor/Header/Header.tsx index beb3113f86b..c15b67081d5 100644 --- a/packages/app/src/app/pages/Sandbox/Editor/Header/Header.tsx +++ b/packages/app/src/app/pages/Sandbox/Editor/Header/Header.tsx @@ -1,7 +1,7 @@ import { dashboardUrl } from '@codesandbox/common/lib/utils/url-generator'; -import { useOvermind } from 'app/overmind'; -import React from 'react'; +import React, { ComponentProps, FunctionComponent } from 'react'; +import { useOvermind } from 'app/overmind'; import { UserMenu } from 'app/pages/common/UserMenu'; import { @@ -29,18 +29,18 @@ import { import { Logo } from './Logo'; import { MenuBar } from './MenuBar'; import { SandboxName } from './SandboxName'; -import { IHeaderProps } from './types'; -export const Header: React.FC = ({ zenMode }) => { +type Props = Pick, 'zenMode'>; +export const Header: FunctionComponent = ({ zenMode }) => { const { state: { + hasLogIn, + isLoggedIn, + isPatron, preferences: { settings: { experimentVSCode: vscode }, }, - isPatron, updateStatus, - hasLogIn, - isLoggedIn, user, }, } = useOvermind(); @@ -65,13 +65,21 @@ export const Header: React.FC = ({ zenMode }) => { {updateStatus === 'available' && } - {!isLoggedIn || (!isPatron && )} + + {!(isLoggedIn && isPatron) && } + {!isLoggedIn && } + + {isLoggedIn && } + {user && user.curatorAt && } + + + {isLoggedIn ? ( diff --git a/packages/app/src/app/pages/Sandbox/Editor/Header/types.ts b/packages/app/src/app/pages/Sandbox/Editor/Header/types.ts deleted file mode 100644 index eef59015dca..00000000000 --- a/packages/app/src/app/pages/Sandbox/Editor/Header/types.ts +++ /dev/null @@ -1,3 +0,0 @@ -export interface IHeaderProps { - zenMode: boolean; -}