diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/components/settings/services/EditServiceForm.js | 9 | ||||
-rw-r--r-- | src/components/ui/Select.js | 2 | ||||
-rw-r--r-- | src/containers/settings/EditServiceScreen.js | 9 | ||||
-rw-r--r-- | src/containers/settings/EditUserScreen.js | 1 | ||||
-rw-r--r-- | src/features/serviceProxy/index.js | 2 | ||||
-rw-r--r-- | src/i18n/locales/en-US.json | 3 | ||||
-rw-r--r-- | src/styles/settings.scss | 4 |
7 files changed, 23 insertions, 7 deletions
diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js index fac25c160..31ada4b22 100644 --- a/src/components/settings/services/EditServiceForm.js +++ b/src/components/settings/services/EditServiceForm.js | |||
@@ -97,7 +97,7 @@ const messages = defineMessages({ | |||
97 | }, | 97 | }, |
98 | headlineProxy: { | 98 | headlineProxy: { |
99 | id: 'settings.service.form.proxy.headline', | 99 | id: 'settings.service.form.proxy.headline', |
100 | defaultMessage: '!!!Proxy Settings', | 100 | defaultMessage: '!!!HTTP/HTTPS Proxy Settings', |
101 | }, | 101 | }, |
102 | proxyInfo: { | 102 | proxyInfo: { |
103 | id: 'settings.service.form.proxy.info', | 103 | id: 'settings.service.form.proxy.info', |
@@ -351,7 +351,12 @@ export default @observer class EditServiceForm extends Component { | |||
351 | <Toggle field={form.$('proxy.isEnabled')} /> | 351 | <Toggle field={form.$('proxy.isEnabled')} /> |
352 | {form.$('proxy.isEnabled').value && ( | 352 | {form.$('proxy.isEnabled').value && ( |
353 | <Fragment> | 353 | <Fragment> |
354 | <Input field={form.$('proxy.host')} /> | 354 | <div className="grid"> |
355 | <div className="grid__row"> | ||
356 | <Input field={form.$('proxy.host')} className="proxyHost" /> | ||
357 | <Input field={form.$('proxy.port')} /> | ||
358 | </div> | ||
359 | </div> | ||
355 | <Input field={form.$('proxy.user')} /> | 360 | <Input field={form.$('proxy.user')} /> |
356 | <Input | 361 | <Input |
357 | field={form.$('proxy.password')} | 362 | field={form.$('proxy.password')} |
diff --git a/src/components/ui/Select.js b/src/components/ui/Select.js index 6e91300e3..da52243ca 100644 --- a/src/components/ui/Select.js +++ b/src/components/ui/Select.js | |||
@@ -26,8 +26,6 @@ export default @observer class Select extends Component { | |||
26 | disabled, | 26 | disabled, |
27 | } = this.props; | 27 | } = this.props; |
28 | 28 | ||
29 | console.log('disabled', disabled); | ||
30 | |||
31 | return ( | 29 | return ( |
32 | <div | 30 | <div |
33 | className={classnames({ | 31 | className={classnames({ |
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js index f0b7268d6..b46908344 100644 --- a/src/containers/settings/EditServiceScreen.js +++ b/src/containers/settings/EditServiceScreen.js | |||
@@ -71,6 +71,10 @@ const messages = defineMessages({ | |||
71 | id: 'settings.service.form.proxy.host', | 71 | id: 'settings.service.form.proxy.host', |
72 | defaultMessage: '!!!Proxy Host/IP', | 72 | defaultMessage: '!!!Proxy Host/IP', |
73 | }, | 73 | }, |
74 | proxyPort: { | ||
75 | id: 'settings.service.form.proxy.port', | ||
76 | defaultMessage: '!!!Port', | ||
77 | }, | ||
74 | proxyUser: { | 78 | proxyUser: { |
75 | id: 'settings.service.form.proxy.user', | 79 | id: 'settings.service.form.proxy.user', |
76 | defaultMessage: '!!!User', | 80 | defaultMessage: '!!!User', |
@@ -233,6 +237,11 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex | |||
233 | value: serviceProxyConfig.host, | 237 | value: serviceProxyConfig.host, |
234 | default: '', | 238 | default: '', |
235 | }, | 239 | }, |
240 | port: { | ||
241 | label: intl.formatMessage(messages.proxyPort), | ||
242 | value: serviceProxyConfig.port, | ||
243 | default: '', | ||
244 | }, | ||
236 | user: { | 245 | user: { |
237 | label: intl.formatMessage(messages.proxyUser), | 246 | label: intl.formatMessage(messages.proxyUser), |
238 | value: serviceProxyConfig.user, | 247 | value: serviceProxyConfig.user, |
diff --git a/src/containers/settings/EditUserScreen.js b/src/containers/settings/EditUserScreen.js index adad8a9bd..3d35effc5 100644 --- a/src/containers/settings/EditUserScreen.js +++ b/src/containers/settings/EditUserScreen.js | |||
@@ -147,7 +147,6 @@ export default @inject('stores', 'actions') @observer class EditUserScreen exten | |||
147 | // user={user.data} | 147 | // user={user.data} |
148 | status={user.actionStatus} | 148 | status={user.actionStatus} |
149 | form={form} | 149 | form={form} |
150 | isEnterprise={user.data.isEnterprise} | ||
151 | isSaving={user.updateUserInfoRequest.isExecuting} | 150 | isSaving={user.updateUserInfoRequest.isExecuting} |
152 | onSubmit={d => this.onSubmit(d)} | 151 | onSubmit={d => this.onSubmit(d)} |
153 | /> | 152 | /> |
diff --git a/src/features/serviceProxy/index.js b/src/features/serviceProxy/index.js index d46f9e6f1..4bea327ad 100644 --- a/src/features/serviceProxy/index.js +++ b/src/features/serviceProxy/index.js | |||
@@ -34,7 +34,7 @@ export default function init(stores) { | |||
34 | const serviceProxyConfig = proxySettings[service.id]; | 34 | const serviceProxyConfig = proxySettings[service.id]; |
35 | 35 | ||
36 | if (serviceProxyConfig && serviceProxyConfig.isEnabled && serviceProxyConfig.host) { | 36 | if (serviceProxyConfig && serviceProxyConfig.isEnabled && serviceProxyConfig.host) { |
37 | const proxyHost = serviceProxyConfig.host; | 37 | const proxyHost = `${serviceProxyConfig.host}${serviceProxyConfig.port ? `:${serviceProxyConfig.port}` : ''}`; |
38 | debug(`Setting proxy config from service settings for "${service.name}" (${service.id}) to`, proxyHost); | 38 | debug(`Setting proxy config from service settings for "${service.name}" (${service.id}) to`, proxyHost); |
39 | 39 | ||
40 | s.setProxy({ proxyRules: proxyHost }, () => { | 40 | s.setProxy({ proxyRules: proxyHost }, () => { |
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index 356eaae66..67885661c 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json | |||
@@ -133,9 +133,10 @@ | |||
133 | "settings.service.form.iconDelete": "Delete", | 133 | "settings.service.form.iconDelete": "Delete", |
134 | "settings.service.form.iconUpload": "Drop your image, or click here", | 134 | "settings.service.form.iconUpload": "Drop your image, or click here", |
135 | "settings.service.form.enableDarkMode": "Enable Dark Mode", | 135 | "settings.service.form.enableDarkMode": "Enable Dark Mode", |
136 | "settings.service.form.proxy.headline": "Proxy Settings", | 136 | "settings.service.form.proxy.headline": "HTTP/HTTPS Proxy Settings", |
137 | "settings.service.form.proxy.isEnabled": "Use Proxy", | 137 | "settings.service.form.proxy.isEnabled": "Use Proxy", |
138 | "settings.service.form.proxy.host": "Proxy Host/IP", | 138 | "settings.service.form.proxy.host": "Proxy Host/IP", |
139 | "settings.service.form.proxy.port": "Port", | ||
139 | "settings.service.form.proxy.user": "User (optional)", | 140 | "settings.service.form.proxy.user": "User (optional)", |
140 | "settings.service.form.proxy.password": "Password (optional)", | 141 | "settings.service.form.proxy.password": "Password (optional)", |
141 | "settings.service.form.proxy.info": "Proxy settings will not synced with the Franz servers.", | 142 | "settings.service.form.proxy.info": "Proxy settings will not synced with the Franz servers.", |
diff --git a/src/styles/settings.scss b/src/styles/settings.scss index f94ca114d..750b6bedd 100644 --- a/src/styles/settings.scss +++ b/src/styles/settings.scss | |||
@@ -216,6 +216,10 @@ | |||
216 | letter-spacing: -0.1px; | 216 | letter-spacing: -0.1px; |
217 | } | 217 | } |
218 | } | 218 | } |
219 | |||
220 | .proxyHost { | ||
221 | flex-basis: 70%; | ||
222 | } | ||
219 | } | 223 | } |
220 | 224 | ||
221 | .settings__close { | 225 | .settings__close { |