diff options
author | vantezzen <properly@protonmail.com> | 2019-08-22 21:40:07 +0200 |
---|---|---|
committer | vantezzen <properly@protonmail.com> | 2019-08-22 21:40:07 +0200 |
commit | 30a891a83ce4bbbbaa6f6f3a13d2031b0a58188f (patch) | |
tree | 41dde64402f6a5ff93796ff5c541bf4dcf766542 /src/components | |
parent | Re-adding package-lock (diff) | |
download | ferdium-app-30a891a83ce4bbbbaa6f6f3a13d2031b0a58188f.tar.gz ferdium-app-30a891a83ce4bbbbaa6f6f3a13d2031b0a58188f.tar.zst ferdium-app-30a891a83ce4bbbbaa6f6f3a13d2031b0a58188f.zip |
Fix eslint errors
Diffstat (limited to 'src/components')
-rw-r--r-- | src/components/auth/Welcome.js | 8 | ||||
-rw-r--r-- | src/components/layout/Sidebar.js | 17 | ||||
-rw-r--r-- | src/components/services/content/Services.js | 4 | ||||
-rw-r--r-- | src/components/settings/navigation/SettingsNavigation.js | 2 | ||||
-rw-r--r-- | src/components/settings/services/EditServiceForm.js | 2 | ||||
-rw-r--r-- | src/components/ui/Input.js | 2 | ||||
-rw-r--r-- | src/components/ui/PremiumFeatureContainer/index.js | 1 |
7 files changed, 19 insertions, 17 deletions
diff --git a/src/components/auth/Welcome.js b/src/components/auth/Welcome.js index 2b689db3b..ef917e336 100644 --- a/src/components/auth/Welcome.js +++ b/src/components/auth/Welcome.js | |||
@@ -51,14 +51,16 @@ export default @observer class Login extends Component { | |||
51 | <Link to={loginRoute} className="button"> | 51 | <Link to={loginRoute} className="button"> |
52 | {intl.formatMessage(messages.loginButton)} | 52 | {intl.formatMessage(messages.loginButton)} |
53 | </Link> | 53 | </Link> |
54 | <br /><br /> | 54 | <br /> |
55 | <br /> | ||
55 | 56 | ||
56 | <Link to="settings/app"> | 57 | <Link to="settings/app"> |
57 | <span style={{ | 58 | <span style={{ |
58 | textAlign: 'center', | 59 | textAlign: 'center', |
59 | width: '100%', | 60 | width: '100%', |
60 | cursor: 'pointer' | 61 | cursor: 'pointer', |
61 | }}> | 62 | }} |
63 | > | ||
62 | Change server | 64 | Change server |
63 | </span> | 65 | </span> |
64 | </Link> | 66 | </Link> |
diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js index 3d8bcddb0..1bf2554b5 100644 --- a/src/components/layout/Sidebar.js +++ b/src/components/layout/Sidebar.js | |||
@@ -7,7 +7,7 @@ import { Link } from 'react-router'; | |||
7 | 7 | ||
8 | import Tabbar from '../services/tabs/Tabbar'; | 8 | import Tabbar from '../services/tabs/Tabbar'; |
9 | import { ctrlKey } from '../../environment'; | 9 | import { ctrlKey } from '../../environment'; |
10 | import { GA_CATEGORY_WORKSPACES, workspaceStore } from '../../features/workspaces'; | 10 | import { workspaceStore } from '../../features/workspaces'; |
11 | 11 | ||
12 | const messages = defineMessages({ | 12 | const messages = defineMessages({ |
13 | settings: { | 13 | settings: { |
@@ -107,8 +107,8 @@ export default @observer class Sidebar extends Component { | |||
107 | <i className="mdi mdi-view-grid" /> | 107 | <i className="mdi mdi-view-grid" /> |
108 | </button> | 108 | </button> |
109 | ) : null} | 109 | ) : null} |
110 | 110 | ||
111 | <button | 111 | <button |
112 | type="button" | 112 | type="button" |
113 | onClick={() => { | 113 | onClick={() => { |
114 | toggleMuteApp(); | 114 | toggleMuteApp(); |
@@ -129,15 +129,16 @@ export default @observer class Sidebar extends Component { | |||
129 | </button> | 129 | </button> |
130 | </> | 130 | </> |
131 | ) : ( | 131 | ) : ( |
132 | <Link | 132 | <Link |
133 | to="/auth/welcome" | 133 | to="/auth/welcome" |
134 | className="sidebar__button sidebar__button--new-service" | 134 | className="sidebar__button sidebar__button--new-service" |
135 | data-tip="Login"> | 135 | data-tip="Login" |
136 | <i className="mdi mdi-login-variant" /> | 136 | > |
137 | <i className="mdi mdi-login-variant" /> | ||
137 | </Link> | 138 | </Link> |
138 | ) | 139 | ) |
139 | } | 140 | } |
140 | 141 | ||
141 | <button | 142 | <button |
142 | type="button" | 143 | type="button" |
143 | onClick={() => openSettings({ path: 'app' })} | 144 | onClick={() => openSettings({ path: 'app' })} |
diff --git a/src/components/services/content/Services.js b/src/components/services/content/Services.js index 5d21262af..4c5976f8d 100644 --- a/src/components/services/content/Services.js +++ b/src/components/services/content/Services.js | |||
@@ -63,13 +63,13 @@ export default @observer class Services extends Component { | |||
63 | <img src="./assets/images/logo.svg" alt="Logo" style={{ maxHeight: '50vh' }} /> | 63 | <img src="./assets/images/logo.svg" alt="Logo" style={{ maxHeight: '50vh' }} /> |
64 | <h1>{intl.formatMessage(messages.welcome)}</h1> | 64 | <h1>{intl.formatMessage(messages.welcome)}</h1> |
65 | { !isLoggedIn && ( | 65 | { !isLoggedIn && ( |
66 | <p>Please open settings, choose a Ferdi server and click "Login" in the bottom left corner.</p> | 66 | <p>Please open settings, choose a Ferdi server and click "Login" in the bottom left corner.</p> |
67 | ) } | 67 | ) } |
68 | <Appear | 68 | <Appear |
69 | timeout={300} | 69 | timeout={300} |
70 | transitionName="slideUp" | 70 | transitionName="slideUp" |
71 | > | 71 | > |
72 | <Link to={ isLoggedIn ? '/settings/services' : '/settings/app' } className="button"> | 72 | <Link to={isLoggedIn ? '/settings/services' : '/settings/app'} className="button"> |
73 | { isLoggedIn ? intl.formatMessage(messages.getStarted) : 'Open settings' } | 73 | { isLoggedIn ? intl.formatMessage(messages.getStarted) : 'Open settings' } |
74 | </Link> | 74 | </Link> |
75 | </Appear> | 75 | </Appear> |
diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js index e1c5cabc3..6aa9bda03 100644 --- a/src/components/settings/navigation/SettingsNavigation.js +++ b/src/components/settings/navigation/SettingsNavigation.js | |||
@@ -131,7 +131,7 @@ export default @inject('stores') @observer class SettingsNavigation extends Comp | |||
131 | </Link> | 131 | </Link> |
132 | <span className="settings-navigation__expander" /> | 132 | <span className="settings-navigation__expander" /> |
133 | <Link | 133 | <Link |
134 | to={ isLoggedIn ? "/auth/logout" : '/auth/welcome'} | 134 | to={isLoggedIn ? '/auth/logout' : '/auth/welcome'} |
135 | className="settings-navigation__link" | 135 | className="settings-navigation__link" |
136 | > | 136 | > |
137 | { isLoggedIn ? intl.formatMessage(messages.logout) : 'Login'} | 137 | { isLoggedIn ? intl.formatMessage(messages.logout) : 'Login'} |
diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js index 2ad62088b..711b571e2 100644 --- a/src/components/settings/services/EditServiceForm.js +++ b/src/components/settings/services/EditServiceForm.js | |||
@@ -153,7 +153,7 @@ export default @observer class EditServiceForm extends Component { | |||
153 | const values = form.values(); | 153 | const values = form.values(); |
154 | let isValid = true; | 154 | let isValid = true; |
155 | 155 | ||
156 | const files = form.$('customIcon').files; | 156 | const { files } = form.$('customIcon'); |
157 | if (files) { | 157 | if (files) { |
158 | values.iconFile = files[0]; | 158 | values.iconFile = files[0]; |
159 | } | 159 | } |
diff --git a/src/components/ui/Input.js b/src/components/ui/Input.js index 9b070c4df..4e3eb4ab8 100644 --- a/src/components/ui/Input.js +++ b/src/components/ui/Input.js | |||
@@ -68,7 +68,7 @@ export default @observer class Input extends Component { | |||
68 | 68 | ||
69 | const { passwordScore } = this.state; | 69 | const { passwordScore } = this.state; |
70 | 70 | ||
71 | let type = field.type; | 71 | let { type } = field; |
72 | if (type === 'password' && this.state.showPassword) { | 72 | if (type === 'password' && this.state.showPassword) { |
73 | type = 'text'; | 73 | type = 'text'; |
74 | } | 74 | } |
diff --git a/src/components/ui/PremiumFeatureContainer/index.js b/src/components/ui/PremiumFeatureContainer/index.js index 08553b32a..b890b09ab 100644 --- a/src/components/ui/PremiumFeatureContainer/index.js +++ b/src/components/ui/PremiumFeatureContainer/index.js | |||
@@ -45,7 +45,6 @@ class PremiumFeatureContainer extends Component { | |||
45 | actions, | 45 | actions, |
46 | condition, | 46 | condition, |
47 | stores, | 47 | stores, |
48 | gaEventInfo, | ||
49 | } = this.props; | 48 | } = this.props; |
50 | 49 | ||
51 | const { intl } = this.context; | 50 | const { intl } = this.context; |