Skip to content

feat(vue3): replace vue-tabs-component with NcTabs/NcTab #13411

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
GretaD wants to merge 1 commit into from
Closed

feat(vue3): replace vue-tabs-component with NcTabs/NcTab #13411

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
61 changes: 12 additions & 49 deletions src/components/AccountForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@
-->
<template>
<form id="account-form" @submit.prevent="onSubmit">
<Tabs
:options="{ useUrlFragment: false, defaultTabHash: settingsPage ? 'manual' : 'auto' }"
cache-lifetime="0"
@changed="onModeChanged">
<Tab id="auto" key="auto" :name="t('mail', 'Auto')">
<NcTabs v-model="mode" @update:modelValue="onModeChanged">
<NcTab id="auto" :name="t('mail', 'Auto')">
<NcInputField
id="auto-name"
v-model="accountName"
Expand Down Expand Up @@ -43,8 +40,8 @@
:disabled="loading">
{{ t('mail', 'Enable mark as important classification') }}
</NcCheckboxRadioSwitch>
</Tab>
<Tab id="manual" key="manual" :name="t('mail', 'Manual')">
</NcTab>
<NcTab id="manual" :name="t('mail', 'Manual')">
<NcInputField
id="man-name"
v-model="accountName"
Expand Down Expand Up @@ -147,7 +144,7 @@
<h4>{{ t('mail', 'SMTP Settings') }}</h4>
<NcInputField
id="man-smtp-host"
ref="smtpHost"

Check warning on line 147 in src/components/AccountForm.vue

View workflow job for this annotation

GitHub Actions / NPM lint 

'smtpHost' is defined as ref, but never used
v-model="manualConfig.smtpHost"
:label="t('mail', 'SMTP Host')"
type="text"
Expand Down Expand Up @@ -231,8 +228,8 @@
:disabled="loading">
{{ t('mail', 'Enable mark as important classification') }}
</NcCheckboxRadioSwitch>
</Tab>
</Tabs>
</NcTab>
</NcTabs>
<div v-if="isGoogleAccount && !googleOauthUrl" class="account-form__google-sso">
{{ t('mail', 'Google requires OAuth authentication. If your Nextcloud admin has not configured Google OAuth, you can use a Google App Password instead.') }}
</div>
Expand Down Expand Up @@ -278,9 +275,8 @@
<script>
import { loadState } from '@nextcloud/initial-state'
import { translate as t } from '@nextcloud/l10n'
import { NcButton as ButtonVue, NcLoadingIcon as IconLoading, NcCheckboxRadioSwitch, NcInputField, NcPasswordField } from '@nextcloud/vue'
import { NcButton as ButtonVue, NcLoadingIcon as IconLoading, NcCheckboxRadioSwitch, NcInputField, NcPasswordField, NcTab, NcTabs } from '@nextcloud/vue'
import { mapState, mapStores } from 'pinia'
import { Tab, Tabs } from 'vue-tabs-component'
import IconCheck from 'vue-material-design-icons/Check.vue'
import { CONSENT_ABORTED, getUserConsent } from '../integration/oauth.js'
import logger from '../logger.js'
Expand All @@ -298,8 +294,8 @@
NcPasswordField,
NcInputField,
NcCheckboxRadioSwitch,
Tab,
Tabs,
NcTab,
NcTabs,
ButtonVue,
IconLoading,
IconCheck,
Expand Down Expand Up @@ -335,7 +331,7 @@
return {
loading: false,
loadingMessage: undefined,
mode: 'auto',
mode: this.account !== undefined ? 'manual' : 'auto',
accountName: this.displayName,
emailAddress: this.email,
classificationEnabled: fromAccountOr('classificationEnabled', loadState('mail', 'importance_classification_default', true)),
Expand Down Expand Up @@ -442,10 +438,8 @@
},

methods: {
onModeChanged(e) {
this.mode = e.tab.id

if (this.mode === 'manual') {
onModeChanged(tabId) {
if (tabId === 'manual') {
// IMAP
if (this.manualConfig.imapUser === '') {
this.manualConfig.imapUser = this.emailAddress
Expand Down Expand Up @@ -739,40 +733,9 @@
</script>

<style lang="scss" scoped>
:deep(.tabs-component-tabs) {
display: flex;
}

:deep(.tabs-component-tab) {
flex-grow: 1;
text-align: center;
color: var(--color-text-lighter);
margin-bottom: calc(var(--default-grid-baseline) * 2 + var(--default-grid-baseline) / 2);
}

:deep(.tabs-component-tab.is-active) {
border-bottom: var(--border-width-input) solid black;
font-weight: bold;
}

:deep(.input-field) {
margin: calc(var(--default-grid-baseline) * 3) 0;
}

.tabs-component-panels {
padding-top: calc(var(--default-grid-baseline) * 5);
}

.tabs-component-panels label {
text-align: start;
width: 100%;
display: inline-block;
}

.tabs-component-panels input,
.tabs-component-panels select {
margin-bottom: calc(var(--default-grid-baseline) * 2);
}
</style>

<style scoped>
Expand Down
Loading