Fix settings window dependence

author: Stefan Malzner <stefan@adlk.io> 2019-06-28 14:52:24 +0200
committer: Stefan Malzner <stefan@adlk.io> 2019-06-28 14:52:24 +0200
commit: f2fd1b3068a43c057243159f9228c8ef3aaa4428 (patch)
tree: e16b3daf3cde58d4e71d40f1c157af93b76051f7 /src/components/layout
parent: Revert: fix spellchecker (diff)
download: ferdium-app-f2fd1b3068a43c057243159f9228c8ef3aaa4428.tar.gz
ferdium-app-f2fd1b3068a43c057243159f9228c8ef3aaa4428.tar.zst
ferdium-app-f2fd1b3068a43c057243159f9228c8ef3aaa4428.zip
1 files changed, 61 insertions, 65 deletions
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index 499bc097a..ebb9849ea 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -68,7 +68,6 @@ class AppLayout extends Component {
    areRequiredRequestsSuccessful: PropTypes.bool.isRequired,
    retryRequiredRequests: PropTypes.func.isRequired,
    areRequiredRequestsLoading: PropTypes.bool.isRequired,
-    darkMode: PropTypes.bool.isRequired,
    isDelayAppScreenVisible: PropTypes.bool.isRequired,
  };
@@ -101,7 +100,6 @@ class AppLayout extends Component {
      areRequiredRequestsSuccessful,
      retryRequiredRequests,
      areRequiredRequestsLoading,
-      darkMode,
      isDelayAppScreenVisible,
    } = this.props;
@@ -109,69 +107,67 @@ class AppLayout extends Component {
    return (
      <ErrorBoundary>
-        <div className={(darkMode ? 'theme__dark' : '')}>
+        <div className="app">
-          <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}`}>
-            <div className={`app__content ${classes.appContent}`}>
+            {workspacesDrawer}
-              {workspacesDrawer}
+            {sidebar}
-              {sidebar}
+            <div className="app__service">
-              <div className="app__service">
+              <WorkspaceSwitchingIndicator />
-                <WorkspaceSwitchingIndicator />
+              {news.length > 0 && news.map(item => (
-                {news.length > 0 && news.map(item => (
+                <InfoBar
-                  <InfoBar
+                  key={item.id}
-                    key={item.id}
+                  position="top"
-                    position="top"
+                  type={item.type}
-                    type={item.type}
+                  sticky={item.sticky}
-                    sticky={item.sticky}
+                  onHide={() => removeNewsItem({ newsId: item.id })}
-                    onHide={() => removeNewsItem({ newsId: item.id })}
+                >
-                  >
+                  <span dangerouslySetInnerHTML={createMarkup(item.message)} />
-                    <span dangerouslySetInnerHTML={createMarkup(item.message)} />
+                </InfoBar>
-                  </InfoBar>
+              ))}
-                ))}
+              {/* {!isOnline && (
-                {/* {!isOnline && (
+                <InfoBar
-                  <InfoBar
+                  type="danger"
-                    type="danger"
+                  sticky
-                    sticky
+                >
-                  >
+                  <span className="mdi mdi-flash" />
-                    <span className="mdi mdi-flash" />
+                  {intl.formatMessage(globalMessages.notConnectedToTheInternet)}
-                    {intl.formatMessage(globalMessages.notConnectedToTheInternet)}
+                </InfoBar>
-                  </InfoBar>
+              )} */}
-                )} */}
+              {!areRequiredRequestsSuccessful && showRequiredRequestsError && (
-                {!areRequiredRequestsSuccessful && showRequiredRequestsError && (
+                <InfoBar
-                  <InfoBar
+                  type="danger"
-                    type="danger"
+                  ctaLabel="Try again"
-                    ctaLabel="Try again"
+                  ctaLoading={areRequiredRequestsLoading}
-                    ctaLoading={areRequiredRequestsLoading}
+                  sticky
-                    sticky
+                  onClick={retryRequiredRequests}
-                    onClick={retryRequiredRequests}
+                >
-                  >
+                  <span className="mdi mdi-flash" />
-                    <span className="mdi mdi-flash" />
+                  {intl.formatMessage(messages.requiredRequestsFailed)}
-                    {intl.formatMessage(messages.requiredRequestsFailed)}
+                </InfoBar>
-                  </InfoBar>
+              )}
-                )}
+              {showServicesUpdatedInfoBar && (
-                {showServicesUpdatedInfoBar && (
+                <InfoBar
-                  <InfoBar
+                  type="primary"
-                    type="primary"
+                  ctaLabel={intl.formatMessage(messages.buttonReloadServices)}
-                    ctaLabel={intl.formatMessage(messages.buttonReloadServices)}
+                  onClick={reloadServicesAfterUpdate}
-                    onClick={reloadServicesAfterUpdate}
+                  sticky
-                    sticky
+                >
-                  >
+                  <span className="mdi mdi-power-plug" />
-                    <span className="mdi mdi-power-plug" />
+                  {intl.formatMessage(messages.servicesUpdated)}
-                    {intl.formatMessage(messages.servicesUpdated)}
+                </InfoBar>
-                  </InfoBar>
+              )}
-                )}
+              {appUpdateIsDownloaded && (
-                {appUpdateIsDownloaded && (
+                <AppUpdateInfoBar
-                  <AppUpdateInfoBar
+                  nextAppReleaseVersion={nextAppReleaseVersion}
-                    nextAppReleaseVersion={nextAppReleaseVersion}
+                  onInstallUpdate={installAppUpdate}
-                    onInstallUpdate={installAppUpdate}
+                />
-                  />
+              )}
-                )}
+              {isDelayAppScreenVisible && (<DelayApp />)}
-                {isDelayAppScreenVisible && (<DelayApp />)}
+              <BasicAuth />
-                <BasicAuth />
+              <ShareFranz />
-                <ShareFranz />
+              {services}
-                {services}
+              {children}
-                {children}
-              </div>
            </div>
          </div>
        </div>
author	Stefan Malzner <stefan@adlk.io>	2019-06-28 14:52:24 +0200
committer	Stefan Malzner <stefan@adlk.io>	2019-06-28 14:52:24 +0200
commit	f2fd1b3068a43c057243159f9228c8ef3aaa4428 (patch)
tree	e16b3daf3cde58d4e71d40f1c157af93b76051f7 /src/components/layout
parent	Revert: fix spellchecker (diff)
download	ferdium-app-f2fd1b3068a43c057243159f9228c8ef3aaa4428.tar.gz ferdium-app-f2fd1b3068a43c057243159f9228c8ef3aaa4428.tar.zst ferdium-app-f2fd1b3068a43c057243159f9228c8ef3aaa4428.zip

diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js index 499bc097a..ebb9849ea 100644 --- a/src/components/layout/AppLayout.js +++ b/src/components/layout/AppLayout.js
@@ -68,7 +68,6 @@ class AppLayout extends Component {
68	areRequiredRequestsSuccessful: PropTypes.bool.isRequired,	68	areRequiredRequestsSuccessful: PropTypes.bool.isRequired,
69	retryRequiredRequests: PropTypes.func.isRequired,	69	retryRequiredRequests: PropTypes.func.isRequired,
70	areRequiredRequestsLoading: PropTypes.bool.isRequired,	70	areRequiredRequestsLoading: PropTypes.bool.isRequired,
71	darkMode: PropTypes.bool.isRequired,
72	isDelayAppScreenVisible: PropTypes.bool.isRequired,	71	isDelayAppScreenVisible: PropTypes.bool.isRequired,
73	};	72	};
74		73
@@ -101,7 +100,6 @@ class AppLayout extends Component {
101	areRequiredRequestsSuccessful,	100	areRequiredRequestsSuccessful,
102	retryRequiredRequests,	101	retryRequiredRequests,
103	areRequiredRequestsLoading,	102	areRequiredRequestsLoading,
104	darkMode,
105	isDelayAppScreenVisible,	103	isDelayAppScreenVisible,
106	} = this.props;	104	} = this.props;
107		105
@@ -109,69 +107,67 @@ class AppLayout extends Component {
109		107
110	return (	108	return (
111	<ErrorBoundary>	109	<ErrorBoundary>
112	<div className={(darkMode ? 'theme__dark' : '')}>	110	<div className="app">
113	<div className="app">	111	{isWindows && !isFullScreen && <TitleBar menu={window.franz.menu.template} icon="assets/images/logo.svg" />}
114	{isWindows && !isFullScreen && <TitleBar menu={window.franz.menu.template} icon="assets/images/logo.svg" />}	112	<div className={`app__content ${classes.appContent}`}>
115	<div className={`app__content ${classes.appContent}`}>	113	{workspacesDrawer}
116	{workspacesDrawer}	114	{sidebar}
117	{sidebar}	115	<div className="app__service">
118	<div className="app__service">	116	<WorkspaceSwitchingIndicator />
119	<WorkspaceSwitchingIndicator />	117	{news.length > 0 && news.map(item => (
120	{news.length > 0 && news.map(item => (	118	<InfoBar
121	<InfoBar	119	key={item.id}
122	key={item.id}	120	position="top"
123	position="top"	121	type={item.type}
124	type={item.type}	122	sticky={item.sticky}
125	sticky={item.sticky}	123	onHide={() => removeNewsItem({ newsId: item.id })}
126	onHide={() => removeNewsItem({ newsId: item.id })}	124	>
127	>	125	<span dangerouslySetInnerHTML={createMarkup(item.message)} />
128	<span dangerouslySetInnerHTML={createMarkup(item.message)} />	126	</InfoBar>
129	</InfoBar>	127	))}
130	))}	128	{/* {!isOnline && (
131	{/* {!isOnline && (	129	<InfoBar
132	<InfoBar	130	type="danger"
133	type="danger"	131	sticky
134	sticky	132	>
135	>	133	<span className="mdi mdi-flash" />
136	<span className="mdi mdi-flash" />	134	{intl.formatMessage(globalMessages.notConnectedToTheInternet)}
137	{intl.formatMessage(globalMessages.notConnectedToTheInternet)}	135	</InfoBar>
138	</InfoBar>	136	)} */}
139	)} */}	137	{!areRequiredRequestsSuccessful && showRequiredRequestsError && (
140	{!areRequiredRequestsSuccessful && showRequiredRequestsError && (	138	<InfoBar
141	<InfoBar	139	type="danger"
142	type="danger"	140	ctaLabel="Try again"
143	ctaLabel="Try again"	141	ctaLoading={areRequiredRequestsLoading}
144	ctaLoading={areRequiredRequestsLoading}	142	sticky
145	sticky	143	onClick={retryRequiredRequests}
146	onClick={retryRequiredRequests}	144	>
147	>	145	<span className="mdi mdi-flash" />
148	<span className="mdi mdi-flash" />	146	{intl.formatMessage(messages.requiredRequestsFailed)}
149	{intl.formatMessage(messages.requiredRequestsFailed)}	147	</InfoBar>
150	</InfoBar>	148	)}
151	)}	149	{showServicesUpdatedInfoBar && (
152	{showServicesUpdatedInfoBar && (	150	<InfoBar
153	<InfoBar	151	type="primary"
154	type="primary"	152	ctaLabel={intl.formatMessage(messages.buttonReloadServices)}
155	ctaLabel={intl.formatMessage(messages.buttonReloadServices)}	153	onClick={reloadServicesAfterUpdate}
156	onClick={reloadServicesAfterUpdate}	154	sticky
157	sticky	155	>
158	>	156	<span className="mdi mdi-power-plug" />
159	<span className="mdi mdi-power-plug" />	157	{intl.formatMessage(messages.servicesUpdated)}
160	{intl.formatMessage(messages.servicesUpdated)}	158	</InfoBar>
161	</InfoBar>	159	)}
162	)}	160	{appUpdateIsDownloaded && (
163	{appUpdateIsDownloaded && (	161	<AppUpdateInfoBar
164	<AppUpdateInfoBar	162	nextAppReleaseVersion={nextAppReleaseVersion}
165	nextAppReleaseVersion={nextAppReleaseVersion}	163	onInstallUpdate={installAppUpdate}
166	onInstallUpdate={installAppUpdate}	164	/>
167	/>	165	)}
168	)}	166	{isDelayAppScreenVisible && (<DelayApp />)}
169	{isDelayAppScreenVisible && (<DelayApp />)}	167	<BasicAuth />
170	<BasicAuth />	168	<ShareFranz />
171	<ShareFranz />	169	{services}
172	{services}	170	{children}
173	{children}
174	</div>
175	</div>	171	</div>
176	</div>	172	</div>
177	</div>	173	</div>