Merge branch 'master' of github.com:kytwb/ferdi

1 files changed, 42 insertions, 53 deletions

diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index 5edf96523..2d7ac42f2 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -1,21 +1,21 @@
-import React, { Component } from "react";
-import PropTypes from "prop-types";
-import { observer, PropTypes as MobxPropTypes } from "mobx-react";
-import { defineMessages, intlShape } from "react-intl";
-import { TitleBar } from "electron-react-titlebar";
-import injectSheet from "react-jss";
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
+import { defineMessages, intlShape } from 'react-intl';
+import { TitleBar } from 'electron-react-titlebar';
+import injectSheet from 'react-jss';
 
-import InfoBar from "../ui/InfoBar";
-import { Component as BasicAuth } from "../../features/basicAuth";
-import { Component as ShareFranz } from "../../features/shareFranz";
-import ErrorBoundary from "../util/ErrorBoundary";
+import InfoBar from '../ui/InfoBar';
+import { Component as BasicAuth } from '../../features/basicAuth';
+import { Component as ShareFranz } from '../../features/shareFranz';
+import ErrorBoundary from '../util/ErrorBoundary';
 
 // import globalMessages from '../../i18n/globalMessages';
 
-import { isWindows } from "../../environment";
-import WorkspaceSwitchingIndicator from "../../features/workspaces/components/WorkspaceSwitchingIndicator";
-import { workspaceStore } from "../../features/workspaces";
-import AppUpdateInfoBar from "../AppUpdateInfoBar";
+import { isWindows } from '../../environment';
+import WorkspaceSwitchingIndicator from '../../features/workspaces/components/WorkspaceSwitchingIndicator';
+import { workspaceStore } from '../../features/workspaces';
+import AppUpdateInfoBar from '../AppUpdateInfoBar';
 
 function createMarkup(HTMLString) {
   return { __html: HTMLString };
@@ -23,33 +23,30 @@ function createMarkup(HTMLString) {
 
 const messages = defineMessages({
   servicesUpdated: {
-    id: "infobar.servicesUpdated",
-    defaultMessage: "!!!Your services have been updated."
+    id: 'infobar.servicesUpdated',
+    defaultMessage: '!!!Your services have been updated.',
   },
   buttonReloadServices: {
-    id: "infobar.buttonReloadServices",
-    defaultMessage: "!!!Reload services"
+    id: 'infobar.buttonReloadServices',
+    defaultMessage: '!!!Reload services',
   },
   requiredRequestsFailed: {
-    id: "infobar.requiredRequestsFailed",
-    defaultMessage: "!!!Could not load services and user information"
-  }
+    id: 'infobar.requiredRequestsFailed',
+    defaultMessage: '!!!Could not load services and user information',
+  },
 });
 
 const styles = theme => ({
   appContent: {
     width: `calc(100% + ${theme.workspaces.drawer.width}px)`,
-    transition: "transform 0.5s ease",
+    transition: 'transform 0.5s ease',
     transform() {
-      return workspaceStore.isWorkspaceDrawerOpen
-        ? "translateX(0)"
-        : `translateX(-${theme.workspaces.drawer.width}px)`;
-    }
-  }
+      return workspaceStore.isWorkspaceDrawerOpen ? 'translateX(0)' : `translateX(-${theme.workspaces.drawer.width}px)`;
+    },
+  },
 });
 
-@injectSheet(styles)
-@observer
+@injectSheet(styles) @observer
 class AppLayout extends Component {
   static propTypes = {
     classes: PropTypes.object.isRequired,
@@ -69,16 +66,16 @@ class AppLayout extends Component {
     showRequiredRequestsError: PropTypes.bool.isRequired,
     areRequiredRequestsSuccessful: PropTypes.bool.isRequired,
     retryRequiredRequests: PropTypes.func.isRequired,
-    areRequiredRequestsLoading: PropTypes.bool.isRequired
+    areRequiredRequestsLoading: PropTypes.bool.isRequired,
   };
 
   static defaultProps = {
     children: [],
-    nextAppReleaseVersion: null
+    nextAppReleaseVersion: null,
   };
 
   static contextTypes = {
-    intl: intlShape
+    intl: intlShape,
   };
 
   render() {
@@ -100,7 +97,7 @@ class AppLayout extends Component {
       showRequiredRequestsError,
       areRequiredRequestsSuccessful,
       retryRequiredRequests,
-      areRequiredRequestsLoading
+      areRequiredRequestsLoading,
     } = this.props;
 
     const { intl } = this.context;
@@ -108,31 +105,23 @@ class AppLayout extends Component {
     return (
       <ErrorBoundary>
         <div className="app">
-          {isWindows && !isFullScreen && (
-            <TitleBar
-              menu={window.franz.menu.template}
-              icon="assets/images/logo.svg"
-            />
-          )}
+          {isWindows && !isFullScreen && <TitleBar menu={window.franz.menu.template} icon="assets/images/logo.svg" />}
           <div className={`app__content ${classes.appContent}`}>
             {workspacesDrawer}
             {sidebar}
             <div className="app__service">
               <WorkspaceSwitchingIndicator />
-              {news.length > 0 &&
-                news.map(item => (
-                  <InfoBar
-                    key={item.id}
-                    position="top"
-                    type={item.type}
-                    sticky={item.sticky}
-                    onHide={() => removeNewsItem({ newsId: item.id })}
-                  >
-                    <span
-                      dangerouslySetInnerHTML={createMarkup(item.message)}
-                    />
-                  </InfoBar>
-                ))}
+              {news.length > 0 && news.map(item => (
+                <InfoBar
+                  key={item.id}
+                  position="top"
+                  type={item.type}
+                  sticky={item.sticky}
+                  onHide={() => removeNewsItem({ newsId: item.id })}
+                >
+                  <span dangerouslySetInnerHTML={createMarkup(item.message)} />
+                </InfoBar>
+              ))}
               {/* {!isOnline && (
                 <InfoBar
                   type="danger"