Skip to content

Commit 02dba49

Browse files
committed
replace NcCheckboxRadioSwitch with NcFormBoxSwitch in ManageDaemonConfigModal
Signed-off-by: Julien Veyssier <julien-nc@posteo.net>
1 parent fac4130 commit 02dba49

File tree

1 file changed

+33
-22
lines changed

1 file changed

+33
-22
lines changed

src/components/DaemonConfig/ManageDaemonConfigModal.vue

Lines changed: 33 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -82,22 +82,18 @@
8282
:placeholder="t('app_api', 'Nextcloud URL')"
8383
:aria-label="t('app_api', 'Nextcloud URL')" />
8484
</div>
85-
<div class="row">
86-
<NcCheckboxRadioSwitch v-if="!isEdit && acceptsDeployId === 'docker-install'"
87-
id="default-deploy-config"
85+
<NcFormBox class="formbox">
86+
<NcFormBoxSwitch v-if="!isEdit && acceptsDeployId === 'docker-install'"
8887
v-model="defaultDaemon"
89-
:aria-label="t('app_api', 'Set this daemon as the default one')">
88+
:title="t('app_api', 'Set this daemon as the default one')">
9089
{{ t('app_api', 'Set as the default daemon') }}
91-
</NcCheckboxRadioSwitch>
92-
<div v-if="isEdit" />
93-
<NcCheckboxRadioSwitch v-if="!isHarp"
94-
id="https-enabled"
90+
</NcFormBoxSwitch>
91+
<NcFormBoxSwitch v-if="!isHarp"
9592
v-model="httpsEnabled"
96-
:aria-label="t('app_api', 'Enable HTTPS')"
9793
@update:model-value="onProtocolChange">
9894
{{ t('app_api', 'Enable HTTPS') }}
99-
</NcCheckboxRadioSwitch>
100-
</div>
95+
</NcFormBoxSwitch>
96+
</NcFormBox>
10197
<NcButton :aria-label="t('app_api', 'Deploy options')" style="margin: 10px 0;" @click="deployConfigSettingsOpened = !deployConfigSettingsOpened">
10298
{{ !deployConfigSettingsOpened ? t('app_api', 'Show deploy options') : t('app_api', 'Hide deploy options') }}
10399
<template #icon>
@@ -106,12 +102,11 @@
106102
</template>
107103
</NcButton>
108104
<div v-show="deployConfigSettingsOpened" class="deploy-config" :aria-label="t('app_api', 'Deploy options')">
109-
<NcCheckboxRadioSwitch
105+
<NcFormBoxSwitch
110106
v-model="isHarp"
111-
:aria-label="t('app_api', 'Enable HaRP')"
112107
@update:model-value="toggleHarp">
113108
{{ t('app_api', 'Enable HaRP') }}
114-
</NcCheckboxRadioSwitch>
109+
</NcFormBoxSwitch>
115110
<div v-if="isHarp" class="harp-options">
116111
<div class="row" :aria-label="t('app_api', 'FRP server address')">
117112
<NcInputField
@@ -131,14 +126,13 @@
131126
:aria-label="t('app_api', 'Docker socket proxy port')" />
132127
<InfoTooltip :text="t('app_api', 'The port in HaRP which the Docker socket proxy connects to. This should be exposed but for the in-built one, it is not required to be exposed or changed.')" />
133128
</div>
134-
<div class="row" :aria-label="t('app_api', 'Disable FRP')">
135-
<NcCheckboxRadioSwitch
136-
id="disable-frp"
129+
<div class="row-switch" :aria-label="t('app_api', 'Disable FRP')">
130+
<NcFormBoxSwitch
137131
v-model="deployConfig.harp.exapp_direct"
138-
:disabled="isEdit"
139-
:aria-label="t('app_api', 'Disable FRP')">
132+
class="switch"
133+
:disabled="isEdit">
140134
{{ t('app_api', 'Disable FRP') }}
141-
</NcCheckboxRadioSwitch>
135+
</NcFormBoxSwitch>
142136
<InfoTooltip :text="t('app_api', 'Flag for advanced setups only. Disables the FRP tunnel between ExApps and HaRP.')" />
143137
</div>
144138
</div>
@@ -309,11 +303,12 @@ import { confirmPassword } from '@nextcloud/password-confirmation'
309303
import { generateUrl } from '@nextcloud/router'
310304
311305
import NcButton from '@nextcloud/vue/components/NcButton'
312-
import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
313306
import NcInputField from '@nextcloud/vue/components/NcInputField'
314307
import NcModal from '@nextcloud/vue/components/NcModal'
315308
import NcPasswordField from '@nextcloud/vue/components/NcPasswordField'
316309
import NcSelect from '@nextcloud/vue/components/NcSelect'
310+
import NcFormBoxSwitch from '@nextcloud/vue/components/NcFormBoxSwitch'
311+
import NcFormBox from '@nextcloud/vue/components/NcFormBox'
317312
318313
import NcLoadingIcon from '@nextcloud/vue/components/NcLoadingIcon'
319314
import Check from 'vue-material-design-icons/Check.vue'
@@ -335,9 +330,10 @@ export default {
335330
NcPasswordField,
336331
UnfoldLessHorizontal,
337332
UnfoldMoreHorizontal,
338-
NcCheckboxRadioSwitch,
339333
NcSelect,
340334
NcButton,
335+
NcFormBoxSwitch,
336+
NcFormBox,
341337
InfoTooltip,
342338
Check,
343339
Connection,
@@ -757,6 +753,21 @@ export default {
757753
gap: 4px;
758754
}
759755
756+
.row-switch {
757+
display: flex;
758+
justify-content: space-between;
759+
align-items: center;
760+
margin-top: 10px;
761+
gap: 4px;
762+
.switch {
763+
flex-grow: 1;
764+
}
765+
}
766+
767+
.formbox {
768+
margin-top: 12px;
769+
}
770+
760771
.ncselect {
761772
width: 100%;
762773
}

0 commit comments

Comments
 (0)