aboutsummaryrefslogtreecommitdiffstats
path: root/src/components
diff options
context:
space:
mode:
Diffstat (limited to 'src/components')
-rw-r--r--src/components/layout/Sidebar.js4
-rw-r--r--src/components/services/content/ErrorHandlers/styles.ts2
-rw-r--r--src/components/services/content/ServiceView.js2
-rw-r--r--src/components/services/content/ServiceWebview.js36
-rw-r--r--src/components/services/tabs/TabBarSortableList.js10
-rw-r--r--src/components/settings/settings/EditSettingsForm.js16
-rw-r--r--src/components/ui/Modal/styles.ts2
-rw-r--r--src/components/ui/ServiceIcon.js18
-rw-r--r--src/components/ui/WebviewLoader/styles.ts2
-rw-r--r--src/components/util/ErrorBoundary/styles.js2
10 files changed, 49 insertions, 45 deletions
diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index 76edcf2e1..fc33a3c58 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -177,7 +177,7 @@ class Sidebar extends Component {
177 > 177 >
178 <i className="mdi mdi-check-all" /> 178 <i className="mdi mdi-check-all" />
179 </button> 179 </button>
180 ) : null} 180 ) : null}
181 {workspaceStore.isFeatureEnabled ? ( 181 {workspaceStore.isFeatureEnabled ? (
182 <button 182 <button
183 type="button" 183 type="button"
@@ -243,7 +243,7 @@ class Sidebar extends Component {
243 this.props.stores.app.updateStatusTypes.AVAILABLE || 243 this.props.stores.app.updateStatusTypes.AVAILABLE ||
244 this.props.stores.app.updateStatus === 244 this.props.stores.app.updateStatus ===
245 this.props.stores.app.updateStatusTypes.DOWNLOADED) && ( 245 this.props.stores.app.updateStatusTypes.DOWNLOADED) && (
246 <span className="update-available">•</span> 246 <span className="update-available">•</span>
247 )} 247 )}
248 </button> 248 </button>
249 {this.state.tooltipEnabled && ( 249 {this.state.tooltipEnabled && (
diff --git a/src/components/services/content/ErrorHandlers/styles.ts b/src/components/services/content/ErrorHandlers/styles.ts
index 72d62f5e3..9e2509ee5 100644
--- a/src/components/services/content/ErrorHandlers/styles.ts
+++ b/src/components/services/content/ErrorHandlers/styles.ts
@@ -1,4 +1,4 @@
1export default (theme) => ({ 1export default theme => ({
2 component: { 2 component: {
3 left: 0, 3 left: 0,
4 position: 'absolute', 4 position: 'absolute',
diff --git a/src/components/services/content/ServiceView.js b/src/components/services/content/ServiceView.js
index 8e44efc5f..1bc1fbf5f 100644
--- a/src/components/services/content/ServiceView.js
+++ b/src/components/services/content/ServiceView.js
@@ -123,7 +123,7 @@ class ServiceView extends Component {
123 service.isFirstLoad && 123 service.isFirstLoad &&
124 !service.isServiceAccessRestricted && ( 124 !service.isServiceAccessRestricted && (
125 <WebviewLoader loaded={false} name={service.name} /> 125 <WebviewLoader loaded={false} name={service.name} />
126 )} 126 )}
127 {service.isError && ( 127 {service.isError && (
128 <WebviewErrorHandler 128 <WebviewErrorHandler
129 name={service.recipe.name} 129 name={service.recipe.name}
diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js
index b60ed3267..185d41175 100644
--- a/src/components/services/content/ServiceWebview.js
+++ b/src/components/services/content/ServiceWebview.js
@@ -24,12 +24,10 @@ class ServiceWebview extends Component {
24 super(props); 24 super(props);
25 25
26 reaction( 26 reaction(
27 () => ( 27 () => this.webview,
28 this.webview
29 ),
30 () => { 28 () => {
31 if (this.webview && this.webview.view) { 29 if (this.webview && this.webview.view) {
32 this.webview.view.addEventListener('console-message', (e) => { 30 this.webview.view.addEventListener('console-message', e => {
33 debug('Service logged a message:', e.message); 31 debug('Service logged a message:', e.message);
34 }); 32 });
35 } 33 }
@@ -55,20 +53,26 @@ class ServiceWebview extends Component {
55 }; 53 };
56 54
57 render() { 55 render() {
58 const { 56 const { service, setWebviewReference, isSpellcheckerEnabled } = this.props;
59 service,
60 setWebviewReference,
61 isSpellcheckerEnabled,
62 } = this.props;
63 57
64 const preloadScript = join(__dirname, '..', '..', '..', 'webview', 'recipe.js'); 58 const preloadScript = join(
59 __dirname,
60 '..',
61 '..',
62 '..',
63 'webview',
64 'recipe.js',
65 );
65 66
66 return ( 67 return (
67 <ElectronWebView 68 <ElectronWebView
68 ref={(webview) => { 69 ref={webview => {
69 this.webview = webview; 70 this.webview = webview;
70 if (webview && webview.view) { 71 if (webview && webview.view) {
71 webview.view.addEventListener('did-stop-loading', this.refocusWebview); 72 webview.view.addEventListener(
73 'did-stop-loading',
74 this.refocusWebview,
75 );
72 } 76 }
73 }} 77 }}
74 autosize 78 autosize
@@ -83,10 +87,14 @@ class ServiceWebview extends Component {
83 }} 87 }}
84 onUpdateTargetUrl={this.updateTargetUrl} 88 onUpdateTargetUrl={this.updateTargetUrl}
85 useragent={service.userAgent} 89 useragent={service.userAgent}
86 disablewebsecurity={service.recipe.disablewebsecurity ? true : undefined} 90 disablewebsecurity={
91 service.recipe.disablewebsecurity ? true : undefined
92 }
87 allowpopups 93 allowpopups
88 nodeintegration 94 nodeintegration
89 webpreferences={`spellcheck=${isSpellcheckerEnabled ? 1 : 0}, contextIsolation=1, enableRemoteModule=1`} 95 webpreferences={`spellcheck=${
96 isSpellcheckerEnabled ? 1 : 0
97 }, contextIsolation=1, enableRemoteModule=1`}
90 /> 98 />
91 ); 99 );
92 } 100 }
diff --git a/src/components/services/tabs/TabBarSortableList.js b/src/components/services/tabs/TabBarSortableList.js
index 146cd93eb..69a12e982 100644
--- a/src/components/services/tabs/TabBarSortableList.js
+++ b/src/components/services/tabs/TabBarSortableList.js
@@ -22,7 +22,7 @@ class TabBarSortableList extends Component {
22 wakeUpService: PropTypes.func.isRequired, 22 wakeUpService: PropTypes.func.isRequired,
23 showMessageBadgeWhenMutedSetting: PropTypes.bool.isRequired, 23 showMessageBadgeWhenMutedSetting: PropTypes.bool.isRequired,
24 showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired, 24 showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired,
25 } 25 };
26 26
27 render() { 27 render() {
28 const { 28 const {
@@ -43,9 +43,7 @@ class TabBarSortableList extends Component {
43 } = this.props; 43 } = this.props;
44 44
45 return ( 45 return (
46 <ul 46 <ul className="tabs">
47 className="tabs"
48 >
49 {services.map((service, index) => ( 47 {services.map((service, index) => (
50 <TabItem 48 <TabItem
51 key={service.id} 49 key={service.id}
@@ -54,7 +52,9 @@ class TabBarSortableList extends Component {
54 index={index} 52 index={index}
55 shortcutIndex={index + 1} 53 shortcutIndex={index + 1}
56 reload={() => reload({ serviceId: service.id })} 54 reload={() => reload({ serviceId: service.id })}
57 toggleNotifications={() => toggleNotifications({ serviceId: service.id })} 55 toggleNotifications={() =>
56 toggleNotifications({ serviceId: service.id })
57 }
58 toggleAudio={() => toggleAudio({ serviceId: service.id })} 58 toggleAudio={() => toggleAudio({ serviceId: service.id })}
59 toggleDarkMode={() => toggleDarkMode({ serviceId: service.id })} 59 toggleDarkMode={() => toggleDarkMode({ serviceId: service.id })}
60 deleteService={() => deleteService({ serviceId: service.id })} 60 deleteService={() => deleteService({ serviceId: service.id })}
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 40242858a..948e9ccd5 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -12,13 +12,17 @@ import ToggleRaw from '../../ui/ToggleRaw';
12import Select from '../../ui/Select'; 12import Select from '../../ui/Select';
13import Input from '../../ui/Input'; 13import Input from '../../ui/Input';
14 14
15import { DEFAULT_APP_SETTINGS, FRANZ_TRANSLATION, GITHUB_FRANZ_URL } from '../../../config';
16import { 15import {
17 isMac, 16 DEFAULT_APP_SETTINGS,
18 isWindows, 17 FRANZ_TRANSLATION,
19 lockFerdiShortcutKey, 18 GITHUB_FRANZ_URL,
20} from '../../../environment'; 19} from '../../../config';
21import { ferdiVersion, userDataPath, userDataRecipesPath } from '../../../environment-remote'; 20import { isMac, isWindows, lockFerdiShortcutKey } from '../../../environment';
21import {
22 ferdiVersion,
23 userDataPath,
24 userDataRecipesPath,
25} from '../../../environment-remote';
22import { openPath } from '../../../helpers/url-helpers'; 26import { openPath } from '../../../helpers/url-helpers';
23import globalMessages from '../../../i18n/globalMessages'; 27import globalMessages from '../../../i18n/globalMessages';
24 28
diff --git a/src/components/ui/Modal/styles.ts b/src/components/ui/Modal/styles.ts
index f32c075ce..c2bebf9bb 100644
--- a/src/components/ui/Modal/styles.ts
+++ b/src/components/ui/Modal/styles.ts
@@ -1,4 +1,4 @@
1export default (theme) => ({ 1export default theme => ({
2 component: { 2 component: {
3 zIndex: 500, 3 zIndex: 500,
4 position: 'absolute', 4 position: 'absolute',
diff --git a/src/components/ui/ServiceIcon.js b/src/components/ui/ServiceIcon.js
index 2e9312d27..f067f8955 100644
--- a/src/components/ui/ServiceIcon.js
+++ b/src/components/ui/ServiceIcon.js
@@ -6,7 +6,7 @@ import classnames from 'classnames';
6 6
7import ServiceModel from '../../models/Service'; 7import ServiceModel from '../../models/Service';
8 8
9const styles = (theme) => ({ 9const styles = theme => ({
10 root: { 10 root: {
11 height: 'auto', 11 height: 'auto',
12 }, 12 },
@@ -24,7 +24,8 @@ const styles = (theme) => ({
24 }, 24 },
25}); 25});
26 26
27@injectSheet(styles) @observer 27@injectSheet(styles)
28@observer
28class ServiceIcon extends Component { 29class ServiceIcon extends Component {
29 static propTypes = { 30 static propTypes = {
30 classes: PropTypes.object.isRequired, 31 classes: PropTypes.object.isRequired,
@@ -37,19 +38,10 @@ class ServiceIcon extends Component {
37 }; 38 };
38 39
39 render() { 40 render() {
40 const { 41 const { classes, className, service } = this.props;
41 classes,
42 className,
43 service,
44 } = this.props;
45 42
46 return ( 43 return (
47 <div 44 <div className={classnames([classes.root, className])}>
48 className={classnames([
49 classes.root,
50 className,
51 ])}
52 >
53 <img 45 <img
54 src={service.icon} 46 src={service.icon}
55 className={classnames([ 47 className={classnames([
diff --git a/src/components/ui/WebviewLoader/styles.ts b/src/components/ui/WebviewLoader/styles.ts
index 5d58011fe..dbd75db8a 100644
--- a/src/components/ui/WebviewLoader/styles.ts
+++ b/src/components/ui/WebviewLoader/styles.ts
@@ -1,4 +1,4 @@
1export default (theme) => ({ 1export default theme => ({
2 component: { 2 component: {
3 background: theme.colorWebviewLoaderBackground, 3 background: theme.colorWebviewLoaderBackground,
4 padding: 20, 4 padding: 20,
diff --git a/src/components/util/ErrorBoundary/styles.js b/src/components/util/ErrorBoundary/styles.js
index 51b36fdf3..0960546ff 100644
--- a/src/components/util/ErrorBoundary/styles.js
+++ b/src/components/util/ErrorBoundary/styles.js
@@ -1,4 +1,4 @@
1export default (theme) => ({ 1export default theme => ({
2 component: { 2 component: {
3 display: 'flex', 3 display: 'flex',
4 width: '100%', 4 width: '100%',