aboutsummaryrefslogtreecommitdiffstats
path: root/src/components
diff options
context:
space:
mode:
authorLibravatar Stefan Malzner <stefan@adlk.io>2018-12-09 22:08:27 +0100
committerLibravatar Stefan Malzner <stefan@adlk.io>2018-12-09 22:08:27 +0100
commit09bc9eecfe922b8fa1bf929517231ecdf181fef7 (patch)
treeededb7b0b7c317a9853c4ed87827b246dc313dd1 /src/components
parentFix linting issues (diff)
downloadferdium-app-09bc9eecfe922b8fa1bf929517231ecdf181fef7.tar.gz
ferdium-app-09bc9eecfe922b8fa1bf929517231ecdf181fef7.tar.zst
ferdium-app-09bc9eecfe922b8fa1bf929517231ecdf181fef7.zip
Add port option to service proxy config
Diffstat (limited to 'src/components')
-rw-r--r--src/components/settings/services/EditServiceForm.js9
-rw-r--r--src/components/ui/Select.js2
2 files changed, 7 insertions, 4 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({