Skip to content

Use new checkbox component #346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lukasdotcom wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Use new checkbox component #346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions src/components/AdminSettings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,13 @@
@input="onInput"
@focus="readonly = false">
</div>
<NcCheckboxRadioSwitch
v-model="state.use_popup"
@update:model-value="onUsePopupChanged">
{{ t('integration_google', 'Use a pop-up to authenticate') }}
</NcCheckboxRadioSwitch>
<div class="line">
<NcFormSwitch
v-model="state.use_popup"
@update:model-value="onUsePopupChanged">
{{ t('integration_google', 'Use a pop-up to authenticate') }}
</NcFormSwitch>
</div>
</div>
</div>
</template>
Expand All @@ -76,15 +78,15 @@ import { generateUrl } from '@nextcloud/router'
import axios from '@nextcloud/axios'
import { delay } from '../utils.js'
import { showSuccess, showError } from '@nextcloud/dialogs'
import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
import NcFormSwitch from '@nextcloud/vue/components/NcFormBoxSwitch'
import { confirmPassword } from '@nextcloud/password-confirmation'

export default {
name: 'AdminSettings',

components: {
GoogleIcon,
NcCheckboxRadioSwitch,
NcFormSwitch,
KeyOutlineIcon,
InformationOutlineIcon,
},
Expand Down
16 changes: 8 additions & 8 deletions src/components/PersonalSettings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@
id="google-contacts">
<h3>{{ t('integration_google', 'Contacts') }}</h3>
<div class="line">
<NcCheckboxRadioSwitch v-if="!importingContacts && state.user_scopes.can_access_other_contacts"
<NcFormSwitch v-if="!importingContacts && state.user_scopes.can_access_other_contacts"
:model-value="state.consider_other_contacts"
@update:model-value="onContactsConsiderOtherChange">
{{ t('integration_google', 'Include other contacts') }}
</NcCheckboxRadioSwitch>
</NcFormSwitch>
</div>
<div class="line">
<label>
Expand Down Expand Up @@ -84,11 +84,11 @@
</div>
<div v-if="calendars.length > 0">
<h3>{{ t('integration_google', 'Calendars') }}</h3>
<NcCheckboxRadioSwitch
<NcFormSwitch
:model-value="state.consider_all_events"
@update:model-value="onConsiderAllEventsChange">
{{ t('integration_google', 'Import all events including Birthdays') }}
</NcCheckboxRadioSwitch>
</NcFormSwitch>
<div v-for="cal in calendars" :key="cal.id" class="calendar-item">
<label>
<NcAppNavigationIconBullet :color="getCalendarColor(cal)" />
Expand All @@ -108,11 +108,11 @@
<div v-if="showDrive"
id="google-drive">
<h3>{{ t('integration_google', 'Drive') }}</h3>
<NcCheckboxRadioSwitch v-if="!importingDrive"
<NcFormSwitch v-if="!importingDrive"
:model-value="!state.consider_shared_files"
@update:model-value="onDriveConsiderSharedChange">
{{ t('integration_google', 'Ignore shared files') }}
</NcCheckboxRadioSwitch>
</NcFormSwitch>
<div v-if="!importingDrive" class="line">
<label for="document-format">
<FileDocumentOutlineIcon />
Expand Down Expand Up @@ -229,7 +229,7 @@ import axios from '@nextcloud/axios'
import moment from '@nextcloud/moment'
import { showSuccess, showError } from '@nextcloud/dialogs'
import NcAppNavigationIconBullet from '@nextcloud/vue/components/NcAppNavigationIconBullet'
import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
import NcFormSwitch from '@nextcloud/vue/components/NcFormBoxSwitch'
import NcButton from '@nextcloud/vue/components/NcButton'
import { humanFileSize } from '../utils.js'
import GoogleIconColor from './icons/GoogleIconColor.vue'
Expand All @@ -242,7 +242,7 @@ export default {
GoogleIcon,
NcAppNavigationIconBullet,
NcButton,
NcCheckboxRadioSwitch,
NcFormSwitch,
CloseIcon,
GoogleDriveIcon,
PencilOutlineIcon,
Expand Down