mirror of
https://github.com/YunoHost/yunohost-admin.git
synced 2024-09-03 20:06:15 +02:00
misc fix
This commit is contained in:
axolotle
parent
dceae397b4
commit
91074f4e31
9 changed files with 49 additions and 47 deletions
|
|
@ -25,7 +25,10 @@ module.exports = {
|
|||
camelcase: 'warn',
|
||||
indent: 'off',
|
||||
'no-irregular-whitespace': 'off',
|
||||
'no-unused-vars': 'warn',
|
||||
'no-unused-vars': [
|
||||
'warn',
|
||||
{ varsIgnorePattern: '^_', destructuredArrayIgnorePattern: '^_' }
|
||||
],
|
||||
quotes: 'warn',
|
||||
'no-multiple-empty-lines': [
|
||||
'error',
|
||||
|
|
|
|||
|
|
@ -8,10 +8,10 @@
|
|||
exact exact-active-class="active"
|
||||
>
|
||||
<span v-if="theme">
|
||||
<img alt="YunoHost logo" src="./assets/logo_light.png" width="40">
|
||||
<img alt="YunoHost logo" src="./assets/logo_light.png" width="40">
|
||||
</span>
|
||||
<span v-else>
|
||||
<img alt="YunoHost logo" src="./assets/logo_dark.png" width="40">
|
||||
<img alt="YunoHost logo" src="./assets/logo_dark.png" width="40">
|
||||
</span>
|
||||
</b-navbar-brand>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,13 @@
|
|||
<template>
|
||||
<b-input-group v-bind="$attrs">
|
||||
<input-item
|
||||
:id="id" :placeholder="placeholder"
|
||||
:state="state" :aria-describedby="id + 'local-part-desc'"
|
||||
v-model="value.localPart"
|
||||
v-on="listeners"
|
||||
:id="id"
|
||||
:value="value.localPart"
|
||||
:placeholder="placeholder"
|
||||
:state="state"
|
||||
:aria-describedby="id + 'local-part-desc'"
|
||||
@input="onInput('localPart', $event)"
|
||||
@blur="$parent.$emit('touch')"
|
||||
/>
|
||||
|
||||
<b-input-group-append>
|
||||
|
|
@ -13,9 +16,11 @@
|
|||
|
||||
<b-input-group-append>
|
||||
<select-item
|
||||
v-model="value.domain"
|
||||
:value="value.domain"
|
||||
:choices="choices"
|
||||
:aria-describedby="id + 'domain-desc'"
|
||||
@input="onInput('domain', $event)"
|
||||
@blur="$parent.$emit('touch')"
|
||||
/>
|
||||
</b-input-group-append>
|
||||
|
||||
|
|
@ -40,24 +45,12 @@ export default {
|
|||
type: { type: String, default: 'email' }
|
||||
},
|
||||
|
||||
computed: {
|
||||
listeners: function () {
|
||||
return Object.assign({},
|
||||
// Forwards all parent events listeners
|
||||
this.$listeners,
|
||||
// Overwrite input behavior so this component can work with v-model
|
||||
{
|
||||
input: (event) => {
|
||||
this.$parent.$emit('touch')
|
||||
this.$emit('input', this.value)
|
||||
},
|
||||
|
||||
blur: event => {
|
||||
this.$parent.$emit('touch')
|
||||
this.$emit('blur', this.value)
|
||||
}
|
||||
}
|
||||
)
|
||||
methods: {
|
||||
onInput (key, value) {
|
||||
this.$emit('input', {
|
||||
...this.value,
|
||||
[key]: value
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ export default {
|
|||
theme: localStorage.getItem('theme') === 'true',
|
||||
experimental: localStorage.getItem('experimental') === 'true',
|
||||
spinner: 'pacman',
|
||||
supportedLocales: supportedLocales
|
||||
supportedLocales
|
||||
},
|
||||
|
||||
mutations: {
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
>
|
||||
<slot name="default" />
|
||||
|
||||
<template v-slot:overlay>
|
||||
<template #overlay>
|
||||
<b-card no-body class="card-overlay">
|
||||
<b-card-header header-bg-variant="white">
|
||||
<query-header :request="error || currentRequest" status-size="lg" />
|
||||
|
|
|
|||
|
|
@ -396,13 +396,15 @@ export default {
|
|||
? app.from_catalog.potential_alternative_to.join(this.$i18n.t('words.separator'))
|
||||
: null,
|
||||
description: DESCRIPTION ? formatI18nField(DESCRIPTION) : app.description,
|
||||
integration: app.manifest.packaging_format >= 2 ? {
|
||||
archs: Array.isArray(archs) ? archs.join(this.$i18n.t('words.separator')) : archs,
|
||||
ldap: ldap === 'not_relevant' ? null : ldap,
|
||||
sso: sso === 'not_relevant' ? null : sso,
|
||||
multi_instance,
|
||||
resources: { ram: ram.runtime, disk }
|
||||
} : null,
|
||||
integration: app.manifest.packaging_format >= 2
|
||||
? {
|
||||
archs: Array.isArray(archs) ? archs.join(this.$i18n.t('words.separator')) : archs,
|
||||
ldap: ldap === 'not_relevant' ? null : ldap,
|
||||
sso: sso === 'not_relevant' ? null : sso,
|
||||
multi_instance,
|
||||
resources: { ram: ram.runtime, disk }
|
||||
}
|
||||
: null,
|
||||
links: [
|
||||
['license', `https://spdx.org/licenses/${app.manifest.upstream.license}`],
|
||||
...['website', 'admindoc', 'userdoc', 'code'].map((key) => ([key, app.manifest.upstream[key]])),
|
||||
|
|
@ -411,9 +413,11 @@ export default {
|
|||
doc: {
|
||||
notifications: {
|
||||
postInstall: notifs.POST_INSTALL && notifs.POST_INSTALL.main ? [['main', formatI18nField(notifs.POST_INSTALL.main)]] : [],
|
||||
postUpgrade: notifs.POST_UPGRADE ? Object.entries(notifs.POST_UPGRADE).map(([key, content]) => {
|
||||
return [key, formatI18nField(content)]
|
||||
}) : []
|
||||
postUpgrade: notifs.POST_UPGRADE
|
||||
? Object.entries(notifs.POST_UPGRADE).map(([key, content]) => {
|
||||
return [key, formatI18nField(content)]
|
||||
})
|
||||
: []
|
||||
},
|
||||
admin: [
|
||||
['admin', formatI18nField(ADMIN)],
|
||||
|
|
|
|||
|
|
@ -254,13 +254,15 @@ export default {
|
|||
demo: _app.upstream.demo,
|
||||
version,
|
||||
license: _app.upstream.license,
|
||||
integration: _app.packaging_format >= 2 ? {
|
||||
archs: Array.isArray(archs) ? archs.join(this.$i18n.t('words.separator')) : archs,
|
||||
ldap: ldap === 'not_relevant' ? null : ldap,
|
||||
sso: sso === 'not_relevant' ? null : sso,
|
||||
multi_instance,
|
||||
resources: { ram: ram.runtime, disk }
|
||||
} : null,
|
||||
integration: _app.packaging_format >= 2
|
||||
? {
|
||||
archs: Array.isArray(archs) ? archs.join(this.$i18n.t('words.separator')) : archs,
|
||||
ldap: ldap === 'not_relevant' ? null : ldap,
|
||||
sso: sso === 'not_relevant' ? null : sso,
|
||||
multi_instance,
|
||||
resources: { ram: ram.runtime, disk }
|
||||
}
|
||||
: null,
|
||||
links: [
|
||||
['license', `https://spdx.org/licenses/${_app.upstream.license}`],
|
||||
...['website', 'admindoc', 'userdoc', 'code'].map((key) => ([key, _app.upstream[key]])),
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
<b-list-group>
|
||||
<b-list-group-item
|
||||
v-for="{ id, name, description, label } in filteredApps" :key="id"
|
||||
v-for="{ id, description, label } in filteredApps" :key="id"
|
||||
:to="{ name: 'app-info', params: { id }}"
|
||||
class="d-flex justify-content-between align-items-center pr-0"
|
||||
>
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ export default {
|
|||
if (!confirmed) return
|
||||
}
|
||||
|
||||
var requestArgs = {}
|
||||
const requestArgs = {}
|
||||
Object.assign(requestArgs, this.form)
|
||||
if (!requestArgs.delete) delete requestArgs.delete
|
||||
if (!requestArgs.update) delete requestArgs.update
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue