diff options
author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2022-01-22 09:54:34 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-22 09:54:34 +0100 |
commit | 3192b3e2f205cfcd478889c10e6b9fd6d4232df1 (patch) | |
tree | 17fe45a6ef93efb0be11faa2eefc6e6467e92a66 /apps/settings/src | |
parent | 9f489422b462b5d2c27981b36ec6b3509cc08d0d (diff) | |
parent | ddbe62ae405598581906f5de5ad622fab4a29f76 (diff) | |
download | nextcloud-server-3192b3e2f205cfcd478889c10e6b9fd6d4232df1.tar.gz nextcloud-server-3192b3e2f205cfcd478889c10e6b9fd6d4232df1.zip |
Merge pull request #30729 from nextcloud/dependabot/npm_and_yarn/nextcloud/eslint-config-7.0.1
Diffstat (limited to 'apps/settings/src')
29 files changed, 69 insertions, 138 deletions
diff --git a/apps/settings/src/components/AdminDelegation/GroupSelect.vue b/apps/settings/src/components/AdminDelegation/GroupSelect.vue index eb7fd3e0c34..f9db50b3cc6 100644 --- a/apps/settings/src/components/AdminDelegation/GroupSelect.vue +++ b/apps/settings/src/components/AdminDelegation/GroupSelect.vue @@ -1,6 +1,5 @@ <template> - <Multiselect - v-model="selected" + <Multiselect v-model="selected" class="group-multiselect" :placeholder="t('settings', 'None')" track-by="gid" diff --git a/apps/settings/src/components/PersonalInfo/BiographySection/Biography.vue b/apps/settings/src/components/PersonalInfo/BiographySection/Biography.vue index 64f9640d9f2..ffe0029db8d 100644 --- a/apps/settings/src/components/PersonalInfo/BiographySection/Biography.vue +++ b/apps/settings/src/components/PersonalInfo/BiographySection/Biography.vue @@ -22,8 +22,7 @@ <template> <div class="biography"> - <textarea - id="biography" + <textarea id="biography" :placeholder="t('settings', 'Your biography')" :value="biography" rows="8" diff --git a/apps/settings/src/components/PersonalInfo/BiographySection/BiographySection.vue b/apps/settings/src/components/PersonalInfo/BiographySection/BiographySection.vue index 637c24e2665..c8aacb03e9c 100644 --- a/apps/settings/src/components/PersonalInfo/BiographySection/BiographySection.vue +++ b/apps/settings/src/components/PersonalInfo/BiographySection/BiographySection.vue @@ -22,13 +22,11 @@ <template> <section> - <HeaderBar - :account-property="accountProperty" + <HeaderBar :account-property="accountProperty" label-for="biography" :scope.sync="primaryBiography.scope" /> - <Biography - :biography.sync="primaryBiography.value" + <Biography :biography.sync="primaryBiography.value" :scope.sync="primaryBiography.scope" /> </section> </template> diff --git a/apps/settings/src/components/PersonalInfo/DisplayNameSection/DisplayName.vue b/apps/settings/src/components/PersonalInfo/DisplayNameSection/DisplayName.vue index 584f8578337..0cfa630123e 100644 --- a/apps/settings/src/components/PersonalInfo/DisplayNameSection/DisplayName.vue +++ b/apps/settings/src/components/PersonalInfo/DisplayNameSection/DisplayName.vue @@ -22,8 +22,7 @@ <template> <div class="displayname"> - <input - id="displayname" + <input id="displayname" type="text" :placeholder="t('settings', 'Your full name')" :value="displayName" diff --git a/apps/settings/src/components/PersonalInfo/DisplayNameSection/DisplayNameSection.vue b/apps/settings/src/components/PersonalInfo/DisplayNameSection/DisplayNameSection.vue index 6f07d72d456..caee7e7c68e 100644 --- a/apps/settings/src/components/PersonalInfo/DisplayNameSection/DisplayNameSection.vue +++ b/apps/settings/src/components/PersonalInfo/DisplayNameSection/DisplayNameSection.vue @@ -22,16 +22,14 @@ <template> <section> - <HeaderBar - :account-property="accountProperty" + <HeaderBar :account-property="accountProperty" label-for="displayname" :is-editable="displayNameChangeSupported" :is-valid-section="isValidSection" :scope.sync="primaryDisplayName.scope" /> <template v-if="displayNameChangeSupported"> - <DisplayName - :display-name.sync="primaryDisplayName.value" + <DisplayName :display-name.sync="primaryDisplayName.value" :scope.sync="primaryDisplayName.scope" /> </template> diff --git a/apps/settings/src/components/PersonalInfo/EmailSection/Email.vue b/apps/settings/src/components/PersonalInfo/EmailSection/Email.vue index 383b8a608ff..6901ff5c19b 100644 --- a/apps/settings/src/components/PersonalInfo/EmailSection/Email.vue +++ b/apps/settings/src/components/PersonalInfo/EmailSection/Email.vue @@ -23,8 +23,7 @@ <template> <div> <div class="email"> - <input - :id="inputId" + <input :id="inputId" ref="email" type="email" :placeholder="inputPlaceholder" @@ -41,8 +40,7 @@ </transition> <template v-if="!primary"> - <FederationControl - :account-property="accountProperty" + <FederationControl :account-property="accountProperty" :additional="true" :additional-value="email" :disabled="federationDisabled" @@ -51,13 +49,11 @@ @update:scope="onScopeChange" /> </template> - <Actions - class="email__actions" + <Actions class="email__actions" :aria-label="t('settings', 'Email options')" :disabled="deleteDisabled" :force-menu="true"> - <ActionButton - :aria-label="deleteEmailLabel" + <ActionButton :aria-label="deleteEmailLabel" :close-after-click="true" :disabled="deleteDisabled" icon="icon-delete" diff --git a/apps/settings/src/components/PersonalInfo/EmailSection/EmailSection.vue b/apps/settings/src/components/PersonalInfo/EmailSection/EmailSection.vue index f25b281782f..07ec35861a9 100644 --- a/apps/settings/src/components/PersonalInfo/EmailSection/EmailSection.vue +++ b/apps/settings/src/components/PersonalInfo/EmailSection/EmailSection.vue @@ -22,8 +22,7 @@ <template> <section> - <HeaderBar - :account-property="accountProperty" + <HeaderBar :account-property="accountProperty" label-for="email" :handle-scope-change="savePrimaryEmailScope" :is-editable="true" @@ -33,8 +32,7 @@ @add-additional="onAddAdditionalEmail" /> <template v-if="displayNameChangeSupported"> - <Email - :primary="true" + <Email :primary="true" :scope.sync="primaryEmail.scope" :email.sync="primaryEmail.value" :active-notification-email.sync="notificationEmail" diff --git a/apps/settings/src/components/PersonalInfo/HeadlineSection/Headline.vue b/apps/settings/src/components/PersonalInfo/HeadlineSection/Headline.vue index 4818fa9c6ab..2b81169bb4b 100644 --- a/apps/settings/src/components/PersonalInfo/HeadlineSection/Headline.vue +++ b/apps/settings/src/components/PersonalInfo/HeadlineSection/Headline.vue @@ -22,8 +22,7 @@ <template> <div class="headline"> - <input - id="headline" + <input id="headline" type="text" :placeholder="t('settings', 'Your headline')" :value="headline" diff --git a/apps/settings/src/components/PersonalInfo/HeadlineSection/HeadlineSection.vue b/apps/settings/src/components/PersonalInfo/HeadlineSection/HeadlineSection.vue index 0eb83be535c..4f3714aa0ee 100644 --- a/apps/settings/src/components/PersonalInfo/HeadlineSection/HeadlineSection.vue +++ b/apps/settings/src/components/PersonalInfo/HeadlineSection/HeadlineSection.vue @@ -22,13 +22,11 @@ <template> <section> - <HeaderBar - :account-property="accountProperty" + <HeaderBar :account-property="accountProperty" label-for="headline" :scope.sync="primaryHeadline.scope" /> - <Headline - :headline.sync="primaryHeadline.value" + <Headline :headline.sync="primaryHeadline.value" :scope.sync="primaryHeadline.scope" /> </section> </template> diff --git a/apps/settings/src/components/PersonalInfo/LanguageSection/Language.vue b/apps/settings/src/components/PersonalInfo/LanguageSection/Language.vue index 14fe7360148..2f11f493207 100644 --- a/apps/settings/src/components/PersonalInfo/LanguageSection/Language.vue +++ b/apps/settings/src/components/PersonalInfo/LanguageSection/Language.vue @@ -22,8 +22,7 @@ <template> <div class="language"> - <select - id="language" + <select id="language" :placeholder="t('settings', 'Language')" @change="onLanguageChange"> <option v-for="commonLanguage in commonLanguages" @@ -43,8 +42,7 @@ </option> </select> - <a - href="https://www.transifex.com/nextcloud/nextcloud/" + <a href="https://www.transifex.com/nextcloud/nextcloud/" target="_blank" rel="noreferrer noopener"> <em>{{ t('settings', 'Help translate') }}</em> diff --git a/apps/settings/src/components/PersonalInfo/LanguageSection/LanguageSection.vue b/apps/settings/src/components/PersonalInfo/LanguageSection/LanguageSection.vue index 8c53081fb80..90882b23869 100644 --- a/apps/settings/src/components/PersonalInfo/LanguageSection/LanguageSection.vue +++ b/apps/settings/src/components/PersonalInfo/LanguageSection/LanguageSection.vue @@ -22,13 +22,11 @@ <template> <section> - <HeaderBar - :account-property="accountProperty" + <HeaderBar :account-property="accountProperty" label-for="language" /> <template v-if="isEditable"> - <Language - :common-languages="commonLanguages" + <Language :common-languages="commonLanguages" :other-languages="otherLanguages" :language.sync="language" /> </template> diff --git a/apps/settings/src/components/PersonalInfo/OrganisationSection/Organisation.vue b/apps/settings/src/components/PersonalInfo/OrganisationSection/Organisation.vue index 98e1143dbbb..106c5b6f6ff 100644 --- a/apps/settings/src/components/PersonalInfo/OrganisationSection/Organisation.vue +++ b/apps/settings/src/components/PersonalInfo/OrganisationSection/Organisation.vue @@ -22,8 +22,7 @@ <template> <div class="organisation"> - <input - id="organisation" + <input id="organisation" type="text" :placeholder="t('settings', 'Your organisation')" :value="organisation" diff --git a/apps/settings/src/components/PersonalInfo/OrganisationSection/OrganisationSection.vue b/apps/settings/src/components/PersonalInfo/OrganisationSection/OrganisationSection.vue index 420f79fc8d0..2a0b93d552f 100644 --- a/apps/settings/src/components/PersonalInfo/OrganisationSection/OrganisationSection.vue +++ b/apps/settings/src/components/PersonalInfo/OrganisationSection/OrganisationSection.vue @@ -22,13 +22,11 @@ <template> <section> - <HeaderBar - :account-property="accountProperty" + <HeaderBar :account-property="accountProperty" label-for="organisation" :scope.sync="primaryOrganisation.scope" /> - <Organisation - :organisation.sync="primaryOrganisation.value" + <Organisation :organisation.sync="primaryOrganisation.value" :scope.sync="primaryOrganisation.scope" /> </section> </template> diff --git a/apps/settings/src/components/PersonalInfo/ProfileSection/EditProfileAnchorLink.vue b/apps/settings/src/components/PersonalInfo/ProfileSection/EditProfileAnchorLink.vue index b1ff57130b1..1ee3bc0e149 100644 --- a/apps/settings/src/components/PersonalInfo/ProfileSection/EditProfileAnchorLink.vue +++ b/apps/settings/src/components/PersonalInfo/ProfileSection/EditProfileAnchorLink.vue @@ -21,12 +21,10 @@ --> <template> - <a - :class="{ disabled }" + <a :class="{ disabled }" href="#profile-visibility" v-on="$listeners"> - <ChevronDownIcon - class="anchor-icon" + <ChevronDownIcon class="anchor-icon" decorative title="" :size="22" /> diff --git a/apps/settings/src/components/PersonalInfo/ProfileSection/ProfileCheckbox.vue b/apps/settings/src/components/PersonalInfo/ProfileSection/ProfileCheckbox.vue index fba5a883ab4..d7e78915c5d 100644 --- a/apps/settings/src/components/PersonalInfo/ProfileSection/ProfileCheckbox.vue +++ b/apps/settings/src/components/PersonalInfo/ProfileSection/ProfileCheckbox.vue @@ -22,8 +22,7 @@ <template> <div class="checkbox-container"> - <input - id="enable-profile" + <input id="enable-profile" class="checkbox" type="checkbox" :checked="profileEnabled" diff --git a/apps/settings/src/components/PersonalInfo/ProfileSection/ProfilePreviewCard.vue b/apps/settings/src/components/PersonalInfo/ProfileSection/ProfilePreviewCard.vue index 01454311765..4cc0d50346a 100644 --- a/apps/settings/src/components/PersonalInfo/ProfileSection/ProfilePreviewCard.vue +++ b/apps/settings/src/components/PersonalInfo/ProfileSection/ProfilePreviewCard.vue @@ -21,12 +21,10 @@ --> <template> - <a - class="preview-card" + <a class="preview-card" :class="{ disabled }" :href="profilePageLink"> - <Avatar - class="preview-card__avatar" + <Avatar class="preview-card__avatar" :user="userId" :size="48" :show-user-status="true" diff --git a/apps/settings/src/components/PersonalInfo/ProfileSection/ProfileSection.vue b/apps/settings/src/components/PersonalInfo/ProfileSection/ProfileSection.vue index f33b332aadb..46048e96c0e 100644 --- a/apps/settings/src/components/PersonalInfo/ProfileSection/ProfileSection.vue +++ b/apps/settings/src/components/PersonalInfo/ProfileSection/ProfileSection.vue @@ -22,20 +22,16 @@ <template> <section> - <HeaderBar - :account-property="accountProperty" /> + <HeaderBar :account-property="accountProperty" /> - <ProfileCheckbox - :profile-enabled.sync="profileEnabled" /> + <ProfileCheckbox :profile-enabled.sync="profileEnabled" /> - <ProfilePreviewCard - :organisation="organisation" + <ProfilePreviewCard :organisation="organisation" :display-name="displayName" :profile-enabled="profileEnabled" :user-id="userId" /> - <EditProfileAnchorLink - :profile-enabled="profileEnabled" /> + <EditProfileAnchorLink :profile-enabled="profileEnabled" /> </section> </template> diff --git a/apps/settings/src/components/PersonalInfo/ProfileVisibilitySection/ProfileVisibilitySection.vue b/apps/settings/src/components/PersonalInfo/ProfileVisibilitySection/ProfileVisibilitySection.vue index a0ccec5e55c..16a46fee969 100644 --- a/apps/settings/src/components/PersonalInfo/ProfileVisibilitySection/ProfileVisibilitySection.vue +++ b/apps/settings/src/components/PersonalInfo/ProfileVisibilitySection/ProfileVisibilitySection.vue @@ -22,18 +22,15 @@ <template> <!-- TODO remove this inline margin placeholder once the settings layout is updated --> - <section - id="profile-visibility" + <section id="profile-visibility" :style="{ marginLeft }"> - <HeaderBar - :account-property="heading" /> + <HeaderBar :account-property="heading" /> <em :class="{ disabled }"> {{ t('settings', 'The more restrictive setting of either visibility or scope is respected on your Profile. For example, if visibility is set to "Show to everyone" and scope is set to "Private", "Private" is respected.') }} </em> - <div - class="visibility-dropdowns" + <div class="visibility-dropdowns" :style="{ gridTemplateRows: `repeat(${rows}, 44px)`, }"> diff --git a/apps/settings/src/components/PersonalInfo/ProfileVisibilitySection/VisibilityDropdown.vue b/apps/settings/src/components/PersonalInfo/ProfileVisibilitySection/VisibilityDropdown.vue index 15ead42ad91..e057d5f0a08 100644 --- a/apps/settings/src/components/PersonalInfo/ProfileVisibilitySection/VisibilityDropdown.vue +++ b/apps/settings/src/components/PersonalInfo/ProfileVisibilitySection/VisibilityDropdown.vue @@ -21,14 +21,12 @@ --> <template> - <div - class="visibility-container" + <div class="visibility-container" :class="{ disabled }"> <label :for="inputId"> {{ t('settings', '{displayId}', { displayId }) }} </label> - <Multiselect - :id="inputId" + <Multiselect :id="inputId" class="visibility-container__multiselect" :options="visibilityOptions" track-by="name" diff --git a/apps/settings/src/components/PersonalInfo/RoleSection/Role.vue b/apps/settings/src/components/PersonalInfo/RoleSection/Role.vue index c0e99038856..efbc06e61be 100644 --- a/apps/settings/src/components/PersonalInfo/RoleSection/Role.vue +++ b/apps/settings/src/components/PersonalInfo/RoleSection/Role.vue @@ -22,8 +22,7 @@ <template> <div class="role"> - <input - id="role" + <input id="role" type="text" :placeholder="t('settings', 'Your role')" :value="role" diff --git a/apps/settings/src/components/PersonalInfo/RoleSection/RoleSection.vue b/apps/settings/src/components/PersonalInfo/RoleSection/RoleSection.vue index 4bfaa6b0eb8..51026f4860c 100644 --- a/apps/settings/src/components/PersonalInfo/RoleSection/RoleSection.vue +++ b/apps/settings/src/components/PersonalInfo/RoleSection/RoleSection.vue @@ -22,13 +22,11 @@ <template> <section> - <HeaderBar - :account-property="accountProperty" + <HeaderBar :account-property="accountProperty" label-for="role" :scope.sync="primaryRole.scope" /> - <Role - :role.sync="primaryRole.value" + <Role :role.sync="primaryRole.value" :scope.sync="primaryRole.scope" /> </section> </template> diff --git a/apps/settings/src/components/PersonalInfo/shared/AddButton.vue b/apps/settings/src/components/PersonalInfo/shared/AddButton.vue index 56cbb2ba515..a03063044fb 100644 --- a/apps/settings/src/components/PersonalInfo/shared/AddButton.vue +++ b/apps/settings/src/components/PersonalInfo/shared/AddButton.vue @@ -21,8 +21,7 @@ --> <template> - <button - :disabled="disabled" + <button :disabled="disabled" v-on="$listeners"> <span class="icon icon-add" /> {{ t('settings', 'Add') }} diff --git a/apps/settings/src/components/PersonalInfo/shared/FederationControl.vue b/apps/settings/src/components/PersonalInfo/shared/FederationControl.vue index 6d5dc0f2529..b14bc5165b5 100644 --- a/apps/settings/src/components/PersonalInfo/shared/FederationControl.vue +++ b/apps/settings/src/components/PersonalInfo/shared/FederationControl.vue @@ -21,8 +21,7 @@ --> <template> - <Actions - :class="{ 'federation-actions': !additional, 'federation-actions--additional': additional }" + <Actions :class="{ 'federation-actions': !additional, 'federation-actions--additional': additional }" :aria-label="ariaLabel" :default-icon="scopeIcon" :disabled="disabled"> diff --git a/apps/settings/src/components/PersonalInfo/shared/FederationControlAction.vue b/apps/settings/src/components/PersonalInfo/shared/FederationControlAction.vue index cba189a844e..f98d9bc7535 100644 --- a/apps/settings/src/components/PersonalInfo/shared/FederationControlAction.vue +++ b/apps/settings/src/components/PersonalInfo/shared/FederationControlAction.vue @@ -21,8 +21,7 @@ --> <template> - <ActionButton - :aria-label="isSupportedScope ? tooltip : tooltipDisabled" + <ActionButton :aria-label="isSupportedScope ? tooltip : tooltipDisabled" class="federation-actions__btn" :class="{ 'federation-actions__btn--active': activeScope === name }" :close-after-click="true" diff --git a/apps/settings/src/components/PersonalInfo/shared/HeaderBar.vue b/apps/settings/src/components/PersonalInfo/shared/HeaderBar.vue index 1e6ab01dbbb..4aaff5981a8 100644 --- a/apps/settings/src/components/PersonalInfo/shared/HeaderBar.vue +++ b/apps/settings/src/components/PersonalInfo/shared/HeaderBar.vue @@ -21,24 +21,21 @@ --> <template> - <h3 - :class="{ 'setting-property': isSettingProperty, 'profile-property': isProfileProperty }"> + <h3 :class="{ 'setting-property': isSettingProperty, 'profile-property': isProfileProperty }"> <label :for="labelFor"> <!-- Already translated as required by prop validator --> {{ accountProperty }} </label> <template v-if="scope"> - <FederationControl - class="federation-control" + <FederationControl class="federation-control" :account-property="accountProperty" :scope.sync="localScope" @update:scope="onScopeChange" /> </template> <template v-if="isEditable && isMultiValueSupported"> - <AddButton - class="add-button" + <AddButton class="add-button" :disabled="!isValidSection" @click.stop.prevent="onAddAdditional" /> </template> diff --git a/apps/settings/src/components/UserList/UserRow.vue b/apps/settings/src/components/UserList/UserRow.vue index 7ea277c1402..2d1f13c6b21 100644 --- a/apps/settings/src/components/UserList/UserRow.vue +++ b/apps/settings/src/components/UserList/UserRow.vue @@ -43,8 +43,7 @@ </div> <!-- User full data --> - <UserRowSimple - v-else-if="!editing" + <UserRowSimple v-else-if="!editing" :editing.sync="editing" :feedback-message="feedbackMessage" :groups="groups" @@ -75,12 +74,10 @@ </div> <!-- dirty hack to ellipsis on two lines --> <div v-if="user.backendCapabilities.setDisplayName" class="displayName"> - <form - :class="{'icon-loading-small': loading.displayName}" + <form :class="{'icon-loading-small': loading.displayName}" class="displayName" @submit.prevent="updateDisplayName"> - <input - :id="'displayName'+user.id+rand" + <input :id="'displayName'+user.id+rand" ref="displayName" :disabled="loading.displayName||loading.all" :value="user.displayname" @@ -89,8 +86,7 @@ autocorrect="off" spellcheck="false" type="text"> - <input - class="icon-confirm" + <input class="icon-confirm" type="submit" value=""> </form> diff --git a/apps/settings/src/components/UserList/UserRowSimple.vue b/apps/settings/src/components/UserList/UserRowSimple.vue index 417b209fe2d..50ed78a0bc7 100644 --- a/apps/settings/src/components/UserList/UserRowSimple.vue +++ b/apps/settings/src/components/UserList/UserRowSimple.vue @@ -1,6 +1,5 @@ <template> - <div - class="row" + <div class="row" :class="{'disabled': loading.delete || loading.disable}" :data-id="user.id"> <div class="avatar" :class="{'icon-loading-small': loading.delete || loading.disable || loading.wipe}"> @@ -35,8 +34,7 @@ <div class="userQuota"> <div class="quota"> {{ userQuota }} ({{ usedSpace }}) - <progress - class="quota-user-progress" + <progress class="quota-user-progress" :class="{'warn': usedQuota > 80}" :value="usedQuota" max="100" /> @@ -65,8 +63,7 @@ </ActionButton> </Actions> <div class="userPopoverMenuWrapper"> - <button - v-click-outside="hideMenu" + <button v-click-outside="hideMenu" class="icon-more" :aria-label="t('settings', 'Toggle user actions menu')" @click.prevent="toggleMenu" /> diff --git a/apps/settings/src/views/Apps.vue b/apps/settings/src/views/Apps.vue index 9dc46510996..9f9b066b8c9 100644 --- a/apps/settings/src/views/Apps.vue +++ b/apps/settings/src/views/Apps.vue @@ -28,24 +28,20 @@ <!-- Categories & filters --> <AppNavigation> <template #list> - <AppNavigationItem - id="app-category-your-apps" + <AppNavigationItem id="app-category-your-apps" :to="{ name: 'apps' }" :exact="true" icon="icon-category-installed" :title="t('settings', 'Your apps')" /> - <AppNavigationItem - id="app-category-enabled" + <AppNavigationItem id="app-category-enabled" :to="{ name: 'apps-category', params: { category: 'enabled' } }" icon="icon-category-enabled" :title="t('settings', 'Active apps')" /> - <AppNavigationItem - id="app-category-disabled" + <AppNavigationItem id="app-category-disabled" :to="{ name: 'apps-category', params: { category: 'disabled' } }" icon="icon-category-disabled" :title="t('settings', 'Disabled apps')" /> - <AppNavigationItem - v-if="updateCount > 0" + <AppNavigationItem v-if="updateCount > 0" id="app-category-updates" :to="{ name: 'apps-category', params: { category: 'updates' } }" icon="icon-download" @@ -54,8 +50,7 @@ {{ updateCount }} </AppNavigationCounter> </AppNavigationItem> - <AppNavigationItem - id="app-category-your-bundles" + <AppNavigationItem id="app-category-your-bundles" :to="{ name: 'apps-category', params: { category: 'app-bundles' } }" icon="icon-category-app-bundles" :title="t('settings', 'App bundles')" /> @@ -64,14 +59,12 @@ <!-- App store categories --> <template v-if="settings.appstoreEnabled"> - <AppNavigationItem - id="app-category-featured" + <AppNavigationItem id="app-category-featured" :to="{ name: 'apps-category', params: { category: 'featured' } }" icon="icon-favorite" :title="t('settings', 'Featured apps')" /> - <AppNavigationItem - v-for="cat in categories" + <AppNavigationItem v-for="cat in categories" :key="'icon-category-' + cat.ident" :icon="'icon-category-' + cat.ident" :to="{ @@ -81,8 +74,7 @@ :title="cat.displayName" /> </template> - <AppNavigationItem - id="app-developer-docs" + <AppNavigationItem id="app-developer-docs" href="settings.developerDocumentation" :title="t('settings', 'Developer documentation') + ' ↗'" /> </template> @@ -94,8 +86,7 @@ </AppContent> <!-- Selected app details --> - <AppSidebar - v-if="id && app" + <AppSidebar v-if="id && app" v-bind="appSidebar" :class="{'app-sidebar--without-background': !appSidebar.background}" @close="hideAppDetails"> diff --git a/apps/settings/src/views/Users.vue b/apps/settings/src/views/Users.vue index bf191111853..02f55a0d3cb 100644 --- a/apps/settings/src/views/Users.vue +++ b/apps/settings/src/views/Users.vue @@ -30,8 +30,7 @@ @keyup.enter="showNewUserMenu" @keyup.space="showNewUserMenu" /> <template #list> - <AppNavigationItem - id="addgroup" + <AppNavigationItem id="addgroup" ref="addGroup" :edit-placeholder="t('settings', 'Enter group name')" :editable="true" @@ -40,8 +39,7 @@ icon="icon-add" @click="showAddGroupForm" @update:title="createGroup" /> - <AppNavigationItem - id="everyone" + <AppNavigationItem id="everyone" :exact="true" :title="t('settings', 'Active users')" :to="{ name: 'users' }" @@ -50,8 +48,7 @@ {{ userCount }} </AppNavigationCounter> </AppNavigationItem> - <AppNavigationItem - v-if="settings.isAdmin" + <AppNavigationItem v-if="settings.isAdmin" id="admin" :exact="true" :title="t('settings', 'Admins')" @@ -63,8 +60,7 @@ </AppNavigationItem> <!-- Hide the disabled if none, if we don't have the data (-1) show it --> - <AppNavigationItem - v-if="disabledGroupMenu.usercount > 0 || disabledGroupMenu.usercount === -1" + <AppNavigationItem v-if="disabledGroupMenu.usercount > 0 || disabledGroupMenu.usercount === -1" id="disabled" :exact="true" :title="t('settings', 'Disabled users')" @@ -76,8 +72,7 @@ </AppNavigationItem> <AppNavigationCaption v-if="groupList.length > 0" :title="t('settings', 'Groups')" /> - <AppNavigationItem - v-for="group in groupList" + <AppNavigationItem v-for="group in groupList" :key="group.id" :exact="true" :title="group.title" @@ -87,8 +82,7 @@ {{ group.count }} </AppNavigationCounter> <template slot="actions"> - <ActionButton - v-if="group.id !== 'admin' && group.id !== 'disabled' && settings.isAdmin" + <ActionButton v-if="group.id !== 'admin' && group.id !== 'disabled' && settings.isAdmin" icon="icon-delete" @click="removeGroup(group.id)"> {{ t('settings', 'Remove group') }} @@ -151,8 +145,7 @@ </template> </AppNavigation> <AppContent> - <UserList - :users="users" + <UserList :users="users" :show-config="showConfig" :selected-group="selectedGroupDecoded" :external-actions="externalActions" /> |