Merge pull request #614 from outline/jori/billing-suspended

Suspended accounts and settings changes

app/components/Auth.js

@@ -2,7 +2,8 @@
 import React from 'react';
 import { Provider } from 'mobx-react';
 import stores from 'stores';
-import SettingsStore from 'stores/SettingsStore';
+import ApiKeysStore from 'stores/ApiKeysStore';
+import UsersStore from 'stores/UsersStore';
 import DocumentsStore from 'stores/DocumentsStore';
 import CollectionsStore from 'stores/CollectionsStore';
 import CacheStore from 'stores/CacheStore';
@@ -22,7 +23,8 @@ const Auth = ({ children }: Props) => {
       const { user, team } = stores.auth;
       const cache = new CacheStore(user.id);
       authenticatedStores = {
-        settings: new SettingsStore(),
+        apiKeys: new ApiKeysStore(),
+        users: new UsersStore(),
         documents: new DocumentsStore({
           ui: stores.ui,
           cache,

app/components/Layout/Layout.js

@@ -17,6 +17,7 @@ import Sidebar from 'components/Sidebar';
 import SettingsSidebar from 'components/Sidebar/Settings';
 import Modals from 'components/Modals';
 import Toasts from 'components/Toasts';
+import ErrorSuspended from 'scenes/ErrorSuspended';
 
 import AuthStore from 'stores/AuthStore';
 import UiStore from 'stores/UiStore';
@@ -71,6 +72,8 @@ class Layout extends React.Component {
     const { user, team } = auth;
     const showSidebar = auth.authenticated && user && team;
 
+    if (auth.isSuspended) return <ErrorSuspended />;
+
     return (
       <Container column auto>
         <Helmet>

app/components/Sidebar/Settings.js

@@ -53,8 +53,8 @@ class SettingsSidebar extends Component {
             </Section>
             <Section>
               <Header>Team</Header>
-              <SidebarLink to="/settings/members" icon={<UserIcon />}>
-                Members
+              <SidebarLink to="/settings/users" icon={<UserIcon />}>
+                Users
               </SidebarLink>
               <SidebarLink
                 to="/settings/integrations/slack"