diff options
author | Vijay A <vraravam@users.noreply.github.com> | 2022-07-25 08:16:50 +0530 |
---|---|---|
committer | Vijay A <vraravam@users.noreply.github.com> | 2022-07-25 08:17:10 +0530 |
commit | cf282aa351cbc58691fb1b2fb4764830247cdbe8 (patch) | |
tree | 1a6ac4c9abd8b3de9d358016a5065da86cdd8510 /src/components/services/content | |
parent | 6.0.1-nightly.3 [skip ci] (diff) | |
download | ferdium-app-cf282aa351cbc58691fb1b2fb4764830247cdbe8.tar.gz ferdium-app-cf282aa351cbc58691fb1b2fb4764830247cdbe8.tar.zst ferdium-app-cf282aa351cbc58691fb1b2fb4764830247cdbe8.zip |
eslint needs to be executed at the top-level to actually workv6.0.1-nightly.3
Diffstat (limited to 'src/components/services/content')
-rw-r--r-- | src/components/services/content/ServiceView.js | 38 |
1 files changed, 29 insertions, 9 deletions
diff --git a/src/components/services/content/ServiceView.js b/src/components/services/content/ServiceView.js index 504325c3a..47d84fead 100644 --- a/src/components/services/content/ServiceView.js +++ b/src/components/services/content/ServiceView.js | |||
@@ -77,7 +77,8 @@ class ServiceView extends Component { | |||
77 | isSpellcheckerEnabled, | 77 | isSpellcheckerEnabled, |
78 | } = this.props; | 78 | } = this.props; |
79 | 79 | ||
80 | const { navigationBarBehaviour, navigationBarManualActive } = stores.settings.app; | 80 | const { navigationBarBehaviour, navigationBarManualActive } = |
81 | stores.settings.app; | ||
81 | 82 | ||
82 | const showNavBar = | 83 | const showNavBar = |
83 | navigationBarBehaviour === 'always' || | 84 | navigationBarBehaviour === 'always' || |
@@ -98,7 +99,11 @@ class ServiceView extends Component { | |||
98 | } | 99 | } |
99 | 100 | ||
100 | return ( | 101 | return ( |
101 | <div className={webviewClasses} data-name={service.name} style={{order: service.order}}> | 102 | <div |
103 | className={webviewClasses} | ||
104 | data-name={service.name} | ||
105 | style={{ order: service.order }} | ||
106 | > | ||
102 | {service.isActive && service.isEnabled && ( | 107 | {service.isActive && service.isEnabled && ( |
103 | <> | 108 | <> |
104 | {service.hasCrashed && ( | 109 | {service.hasCrashed && ( |
@@ -115,9 +120,9 @@ class ServiceView extends Component { | |||
115 | !service.isServiceAccessRestricted && ( | 120 | !service.isServiceAccessRestricted && ( |
116 | <WebviewLoader loaded={false} name={service.name} /> | 121 | <WebviewLoader loaded={false} name={service.name} /> |
117 | )} | 122 | )} |
118 | {service.isProgressbarEnabled && service.isLoadingPage && !service.isFirstLoad && ( | 123 | {service.isProgressbarEnabled && |
119 | <TopBarProgress /> | 124 | service.isLoadingPage && |
120 | )} | 125 | !service.isFirstLoad && <TopBarProgress />} |
121 | {service.isError && ( | 126 | {service.isError && ( |
122 | <WebviewErrorHandler | 127 | <WebviewErrorHandler |
123 | name={service.recipe.name} | 128 | name={service.recipe.name} |
@@ -151,11 +156,26 @@ class ServiceView extends Component { | |||
151 | /> | 156 | /> |
152 | </> | 157 | </> |
153 | ) : ( | 158 | ) : ( |
154 | <div style={{display: 'flex', flexDirection: 'column', justifyContent: 'center', alignItems: 'center', textAlign: 'center' }}> | 159 | <div |
155 | <span role="img" aria-label="Sleeping Emoji" style={{fontSize: 42}}> | 160 | style={{ |
161 | display: 'flex', | ||
162 | flexDirection: 'column', | ||
163 | justifyContent: 'center', | ||
164 | alignItems: 'center', | ||
165 | textAlign: 'center', | ||
166 | }} | ||
167 | > | ||
168 | <span | ||
169 | role="img" | ||
170 | aria-label="Sleeping Emoji" | ||
171 | style={{ fontSize: 42 }} | ||
172 | > | ||
156 | 😴 | 173 | 😴 |
157 | </span><br/><br/> | 174 | </span> |
158 | This service is currently hibernating.<br/> | 175 | <br /> |
176 | <br /> | ||
177 | This service is currently hibernating. | ||
178 | <br /> | ||
159 | Try switching services or reloading Ferdium. | 179 | Try switching services or reloading Ferdium. |
160 | </div> | 180 | </div> |
161 | )} | 181 | )} |