mirror of
https://github.com/nextcloud/server.git
synced 2026-04-21 06:08:46 -04:00
chore: adjust style imports of password confirmation library
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
This commit is contained in:
parent
f7de21d021
commit
fcc7b4d21b
16 changed files with 6 additions and 26 deletions
|
|
@ -73,8 +73,6 @@ import { confirmPassword } from '@nextcloud/password-confirmation'
|
|||
import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
|
||||
import NcSettingsSection from '@nextcloud/vue/components/NcSettingsSection'
|
||||
|
||||
import '@nextcloud/password-confirmation/dist/style.css'
|
||||
|
||||
export default {
|
||||
name: 'AdminSettings',
|
||||
|
||||
|
|
|
|||
|
|
@ -73,8 +73,6 @@ import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwit
|
|||
import NcSettingsSection from '@nextcloud/vue/components/NcSettingsSection'
|
||||
import NcNoteCard from '@nextcloud/vue/components/NcNoteCard'
|
||||
|
||||
import '@nextcloud/password-confirmation/dist/style.css'
|
||||
|
||||
const lastCron = loadState('settings', 'lastCron')
|
||||
const cronMaxAge = loadState('settings', 'cronMaxAge', '')
|
||||
const backgroundJobsMode = loadState('settings', 'backgroundJobsMode', 'cron')
|
||||
|
|
|
|||
|
|
@ -59,8 +59,6 @@ import {
|
|||
finishRegistration,
|
||||
} from '../../service/WebAuthnRegistrationSerice.ts'
|
||||
|
||||
import '@nextcloud/password-confirmation/dist/style.css'
|
||||
|
||||
const logAndPass = (text) => (data) => {
|
||||
logger.debug(text)
|
||||
return data
|
||||
|
|
|
|||
|
|
@ -45,8 +45,6 @@ import Device from './Device.vue'
|
|||
import logger from '../../logger.ts'
|
||||
import { removeRegistration } from '../../service/WebAuthnRegistrationSerice.js'
|
||||
|
||||
import '@nextcloud/password-confirmation/dist/style.css'
|
||||
|
||||
const sortByName = sortBy('name')
|
||||
|
||||
export default {
|
||||
|
|
|
|||
|
|
@ -10,8 +10,6 @@ import Vue from 'vue'
|
|||
|
||||
import AuthTokenSection from './components/AuthTokenSection.vue'
|
||||
|
||||
import '@nextcloud/password-confirmation/dist/style.css'
|
||||
|
||||
// eslint-disable-next-line camelcase
|
||||
__webpack_nonce__ = getCSPNonce()
|
||||
|
||||
|
|
|
|||
|
|
@ -10,8 +10,6 @@ import axios from '@nextcloud/axios'
|
|||
|
||||
import { ACCOUNT_PROPERTY_ENUM, SCOPE_SUFFIX } from '../../constants/AccountPropertyConstants.ts'
|
||||
|
||||
import '@nextcloud/password-confirmation/dist/style.css'
|
||||
|
||||
/**
|
||||
* Save the primary email of the user
|
||||
*
|
||||
|
|
|
|||
|
|
@ -10,8 +10,6 @@ import axios from '@nextcloud/axios'
|
|||
|
||||
import { SCOPE_SUFFIX } from '../../constants/AccountPropertyConstants.ts'
|
||||
|
||||
import '@nextcloud/password-confirmation/dist/style.css'
|
||||
|
||||
/**
|
||||
* Save the primary account property value for the user
|
||||
*
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ import axios from '@nextcloud/axios'
|
|||
import { getCurrentUser } from '@nextcloud/auth'
|
||||
import { generateOcsUrl } from '@nextcloud/router'
|
||||
import { confirmPassword } from '@nextcloud/password-confirmation'
|
||||
import '@nextcloud/password-confirmation/dist/style.css'
|
||||
|
||||
/**
|
||||
* Save the visibility of the profile parameter
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@
|
|||
|
||||
import axios from '@nextcloud/axios'
|
||||
import { confirmPassword } from '@nextcloud/password-confirmation'
|
||||
import '@nextcloud/password-confirmation/dist/style.css'
|
||||
|
||||
const sanitize = function(url) {
|
||||
return url.replace(/\/$/, '') // Remove last url slash
|
||||
|
|
|
|||
|
|
@ -12,8 +12,6 @@ import { defineStore } from 'pinia'
|
|||
import axios from '@nextcloud/axios'
|
||||
import logger from '../logger'
|
||||
|
||||
import '@nextcloud/password-confirmation/dist/style.css'
|
||||
|
||||
const BASE_URL = generateUrl('/settings/personal/authtokens')
|
||||
|
||||
const confirm = () => {
|
||||
|
|
|
|||
|
|
@ -29,8 +29,6 @@ import axios from '@nextcloud/axios'
|
|||
import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
|
||||
import NcSettingsSection from '@nextcloud/vue/components/NcSettingsSection'
|
||||
|
||||
import '@nextcloud/password-confirmation/dist/style.css'
|
||||
|
||||
export default {
|
||||
name: 'AdminSettings',
|
||||
components: {
|
||||
|
|
|
|||
|
|
@ -60,8 +60,6 @@ import { print } from '../service/PrintService.js'
|
|||
import NcButton from '@nextcloud/vue/components/NcButton'
|
||||
import NcLoadingIcon from '@nextcloud/vue/components/NcLoadingIcon'
|
||||
|
||||
import '@nextcloud/password-confirmation/dist/style.css'
|
||||
|
||||
export default {
|
||||
name: 'PersonalSettings',
|
||||
components: {
|
||||
|
|
|
|||
|
|
@ -10,8 +10,6 @@ import { confirmPassword } from '@nextcloud/password-confirmation'
|
|||
import { loadState } from '@nextcloud/initial-state'
|
||||
import { getApiUrl } from './helpers/api.js'
|
||||
|
||||
import '@nextcloud/password-confirmation/dist/style.css'
|
||||
|
||||
Vue.use(Vuex)
|
||||
|
||||
const store = new Store({
|
||||
|
|
|
|||
|
|
@ -201,8 +201,10 @@ class WebpackSPDXPlugin {
|
|||
const match = source.match(/asset\/inline\|data:image\/svg\+xml,(.+)/)
|
||||
if (match) {
|
||||
const content = decodeURI(match[1])
|
||||
// REUSE-IgnoreStart
|
||||
const [, license] = content.match(/SPDX-License-Identifier:\s*([^\s]+)/) ?? []
|
||||
const [, author] = content.match(/SPDX-FileCopyrightText:\s*([^-]+)/) ?? []
|
||||
// REUSE-IgnoreEnd
|
||||
if (author && license) {
|
||||
authors.add(author)
|
||||
licenses.add(license)
|
||||
|
|
@ -216,12 +218,14 @@ class WebpackSPDXPlugin {
|
|||
output = ''
|
||||
}
|
||||
|
||||
// REUSE-IgnoreStart
|
||||
for (const author of [...authors].sort()) {
|
||||
output = `SPDX-FileCopyrightText: ${author}\n${output}`
|
||||
}
|
||||
for (const license of [...licenses].sort()) {
|
||||
output = `SPDX-License-Identifier: ${license}\n${output}`
|
||||
}
|
||||
// REUSE-IgnoreEnd
|
||||
|
||||
compilation.emitAsset(
|
||||
asset.split('?', 2)[0] + '.license',
|
||||
|
|
|
|||
|
|
@ -12,5 +12,6 @@
|
|||
@use 'mobile';
|
||||
@use 'tooltip';
|
||||
// If you include .css, it will be imported as url
|
||||
@use '../../node_modules/@nextcloud/dialogs/dist/style';
|
||||
@use '../../node_modules/@nextcloud/dialogs/dist/style' as *;
|
||||
@use '../../node_modules/@nextcloud/password-confirmation/dist/style' as *;
|
||||
@use 'public';
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
*/
|
||||
|
||||
import { confirmPassword, isPasswordConfirmationRequired } from '@nextcloud/password-confirmation'
|
||||
import '@nextcloud/password-confirmation/dist/style.css'
|
||||
|
||||
/**
|
||||
* @namespace OC.PasswordConfirmation
|
||||
|
|
|
|||
Loading…
Reference in a new issue