YunoHost/yunohost-admin
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost-admin.git synced 2024-09-03 20:06:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #516 from YunoHost/vue-2.7

Browse source 
Update to Vue 2.7
This commit is contained in:
Alexandre Aubin 2023-04-04 13:05:58 +02:00 • committed by GitHub
commit 72e63da73a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
28 changed files with 5032 additions and 8538 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
app/.eslintrc.js Normal file
View file

@ -0,0 +1,40 @@
module.exports = {
root: true,
env: {
node: true
},
extends: [
'plugin:vue/strongly-recommended',
'eslint:recommended',
'standard'
],
parserOptions: {
parser: '@babel/eslint-parser'
},
rules: {
'vue/max-attributes-per-line': [
'error',
{
singleline: 3,
multiline: 3
}
],
'vue/multi-word-component-names': 'off', // FIXME this should be adressed at some point
'no-console': 'warn',
'template-curly-spacing': 'off',
camelcase: 'warn',
indent: 'off',
'no-irregular-whitespace': 'off',
'no-unused-vars': [
'warn',
{ varsIgnorePattern: '^_', destructuredArrayIgnorePattern: '^_' }
],
quotes: 'warn',
'no-multiple-empty-lines': [
'error',
{
max: 2
}
]
}
}

13149
app/package-lock.json generated
View file

File diff suppressed because it is too large Load diff

92
app/package.json
View file

@ -12,78 +12,38 @@
"i18n:en": "./node_modules/@vue/cli-service/bin/vue-cli-service.js i18n:report --src './src/**/*.?(js|vue)' --locales './src/i18n/locales/en.json'" "i18n:en": "./node_modules/@vue/cli-service/bin/vue-cli-service.js i18n:report --src './src/**/*.?(js|vue)' --locales './src/i18n/locales/en.json'"
}, },
"dependencies": { "dependencies": {
"bootstrap-vue": "^2.21.2", "@fontsource/fira-code": "^4.5.13",
"core-js": "^3.9.1", "@fontsource/firago": "^4.5.3",
"date-fns": "^2.19.0", "bootstrap-vue": "^2.22.0",
"firacode": "^5.2.0", "core-js": "^3.29.1",
"fontsource-firago": "^3.1.5", "date-fns": "^2.29.3",
"fork-awesome": "^1.1.7", "fork-awesome": "^1.2.0",
"simple-evaluate": "^1.4.3", "simple-evaluate": "^1.4.6",
"vue": "^2.6.12", "vue": "^2.7.14",
"vue-i18n": "^8.24.1", "vue-i18n": "^8.28.2",
"vue-router": "^3.5.1", "vue-router": "^3.6.5",
"vuelidate": "^0.7.6",
"vue-showdown": "^2.4.1", "vue-showdown": "^2.4.1",
"vuelidate": "^0.7.7",
"vuex": "^3.6.2" "vuex": "^3.6.2"
}, },
"devDependencies": { "devDependencies": {
"@vue/cli-plugin-babel": "~4.5.13", "@babel/eslint-parser": "^7.21.3",
"@vue/cli-plugin-eslint": "^4.5.13", "@vue/cli-plugin-babel": "^5.0.8",
"@vue/cli-plugin-router": "^4.5.13", "@vue/cli-plugin-eslint": "^5.0.8",
"@vue/cli-plugin-vuex": "^4.5.13", "@vue/cli-plugin-router": "^5.0.8",
"@vue/cli-service": "^4.5.13", "@vue/cli-plugin-vuex": "^5.0.8",
"babel-eslint": "^10.1.0", "@vue/cli-service": "^5.0.8",
"bootstrap": "^4.6.0", "bootstrap": "^4.6.0",
"eslint": "^6.7.2", "eslint": "^8.36.0",
"eslint-plugin-vue": "^6.2.2", "eslint-plugin-vue": "^9.10.0",
"popper.js": "^1.16.0", "popper.js": "^1.16.0",
"portal-vue": "^2.1.6", "portal-vue": "^2.1.7",
"sass": "^1.32.8", "sass": "^1.60.0",
"sass-loader": "^8.0.0", "sass-loader": "^13.2.1",
"sass-resources-loader": "^2.1.1", "sass-resources-loader": "^2.2.5",
"standard": "^14.3.4", "standard": "^17.0.0",
"vue-cli-plugin-bootstrap-vue": "~0.6.0", "vue-cli-plugin-bootstrap-vue": "^0.8.2",
"vue-cli-plugin-i18n": "~1.0.1", "vue-cli-plugin-i18n": "^2.3.1"
"vue-template-compiler": "^2.6.12"
},
"eslintConfig": {
"root": true,
"env": {
"node": true
},
"extends": [
"plugin:vue/strongly-recommended",
"eslint:recommended",
"standard"
],
"parserOptions": {
"parser": "babel-eslint"
},
"rules": {
"vue/max-attributes-per-line": [
"error",
{
"singleline": 3,
"multiline": {
"max": 3,
"allowFirstLine": true
}
}
],
"no-console": "warn",
"template-curly-spacing": "off",
"camelcase": "warn",
"indent": "off",
"no-irregular-whitespace": "off",
"no-unused-vars": "warn",
"quotes": "warn",
"no-multiple-empty-lines": [
"error",
{
"max": 2
}
]
}
}, },
"browserslist": [ "browserslist": [
"> 1%", "> 1%",

9
app/src/App.vue
View file

@ -8,10 +8,10 @@
exact exact-active-class="active" exact exact-active-class="active"
> >
<span v-if="theme"> <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>
<span v-else> <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> </span>
</b-navbar-brand> </b-navbar-brand>
@ -70,8 +70,9 @@
<b-nav-text <b-nav-text
v-if="yunohost" id="yunohost-version" class="ml-md-auto text-center" v-if="yunohost" id="yunohost-version" class="ml-md-auto text-center"
v-html="$t('footer_version', yunohost)" >
/> <span v-html="$t('footer_version', yunohost)" />
</b-nav-text>
</b-nav> </b-nav>
</nav> </nav>
</footer> </footer>

39
app/src/components/AdressInputSelect.vue
View file

@ -1,10 +1,13 @@
<template> <template>
<b-input-group v-bind="$attrs"> <b-input-group v-bind="$attrs">
<input-item <input-item
:id="id" :placeholder="placeholder" :id="id"
:state="state" :aria-describedby="id + 'local-part-desc'" :value="value.localPart"
v-model="value.localPart" :placeholder="placeholder"
v-on="listeners" :state="state"
:aria-describedby="id + 'local-part-desc'"
@input="onInput('localPart', $event)"
@blur="$parent.$emit('touch')"
/> />
<b-input-group-append> <b-input-group-append>
@ -13,9 +16,11 @@
<b-input-group-append> <b-input-group-append>
<select-item <select-item
v-model="value.domain" :value="value.domain"
:choices="choices" :choices="choices"
:aria-describedby="id + 'domain-desc'" :aria-describedby="id + 'domain-desc'"
@input="onInput('domain', $event)"
@blur="$parent.$emit('touch')"
/> />
</b-input-group-append> </b-input-group-append>
@ -40,24 +45,12 @@ export default {
type: { type: String, default: 'email' } type: { type: String, default: 'email' }
}, },
computed: { methods: {
listeners: function () { onInput (key, value) {
return Object.assign({}, this.$emit('input', {
// Forwards all parent events listeners ...this.value,
this.$listeners, [key]: value
// 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)
}
}
)
} }
} }
} }

3
app/src/components/ConfigPanel.vue
View file

@ -24,11 +24,14 @@
</b-card-title> </b-card-title>
<template v-for="(field, fname) in section.fields"> <template v-for="(field, fname) in section.fields">
<!-- FIXME rework the whole component chain to avoid direct mutation of the `forms` props -->
<!-- eslint-disable -->
<component <component
v-if="field.visible" :is="field.is" v-bind="field.props" v-if="field.visible" :is="field.is" v-bind="field.props"
v-model="forms[panel.id][fname]" :validation="validation[fname]" :key="fname" v-model="forms[panel.id][fname]" :validation="validation[fname]" :key="fname"
@action.stop="onAction(section.id, fname, section.fields)" @action.stop="onAction(section.id, fname, section.fields)"
/> />
<!-- eslint-enable -->
</template> </template>
</component> </component>
</template> </template>

12
app/src/components/ConfigPanels.vue
View file

@ -6,9 +6,15 @@
v-bind="{ panels, forms, v: $v, ...$attrs }" v-bind="{ panels, forms, v: $v, ...$attrs }"
v-on="$listeners" v-on="$listeners"
> >
<slot name="tab-top" slot="tab-top" /> <template #tab-top>
<slot name="tab-before" slot="tab-before" /> <slot name="tab-top" />
<slot name="tab-after" slot="tab-after" /> </template>
<template #tab-before>
<slot name="tab-before" />
</template>
<template #tab-after>
<slot name="tab-after" />
</template>
</routable-tabs> </routable-tabs>
<card v-else :title="routes_[0].text" :icon="routes_[0].icon"> <card v-else :title="routes_[0].text" :icon="routes_[0].icon">

12
app/src/components/RoutableTabs.vue
View file

@ -14,9 +14,15 @@
<!-- Bind extra props to the child view and forward child events to parent --> <!-- Bind extra props to the child view and forward child events to parent -->
<router-view v-bind="$attrs" v-on="$listeners"> <router-view v-bind="$attrs" v-on="$listeners">
<slot name="tab-top" slot="tab-top"></slot> <template #tab-top>
<slot name="tab-before" slot="tab-before"></slot> <slot name="tab-top" />
<slot name="tab-after" slot="tab-after"></slot> </template>
<template #tab-before>
<slot name="tab-before" />
</template>
<template #tab-after>
<slot name="tab-after" />
</template>
</router-view> </router-view>
</b-card> </b-card>
</template> </template>

5
app/src/components/globals/AbstractForm.vue
View file

@ -13,8 +13,9 @@
<b-alert <b-alert
v-if="errorFeedback" v-if="errorFeedback"
variant="danger" class="my-3" icon="ban" variant="danger" class="my-3" icon="ban"
v-html="errorFeedback" >
/> <div v-html="errorFeedback" />
</b-alert>
</slot> </slot>
</b-form> </b-form>
</b-card-body> </b-card-body>

8
app/src/components/globals/Card.vue
View file

@ -30,11 +30,13 @@
<slot name="default" /> <slot name="default" />
</b-card-body> </b-card-body>
</b-collapse> </b-collapse>
<slot v-else name="default" slot="default" /> <template v-else>
<slot name="default" />
</template>
<slot name="footer" slot="footer"> <template #footer v-if="'buttons' in $slots">
<slot name="buttons" /> <slot name="buttons" />
</slot> </template>
</b-card> </b-card>
</template> </template>

19
app/src/components/globals/CardForm.vue
View file

@ -12,22 +12,25 @@
<slot name="server-error"> <slot name="server-error">
<b-alert <b-alert
variant="danger" class="my-3" icon="ban" variant="danger" class="my-3" icon="ban"
:show="errorFeedback !== ''" v-html="errorFeedback" :show="errorFeedback !== ''"
/> >
<div v-html="errorFeedback" />
</b-alert>
</slot> </slot>
</b-form> </b-form>
</template> </template>
<slot v-if="!noFooter" name="buttons" slot="buttons"> <template v-if="!noFooter" #buttons>
<b-button type="submit" variant="success" :form="id"> <slot name="buttons">
{{ submitText ? submitText : $t('save') }} <b-button type="submit" variant="success" :form="id">
</b-button> {{ submitText ? submitText : $t('save') }}
</slot> </b-button>
</slot>
</template>
</card> </card>
</template> </template>
<script> <script>
export default { export default {
name: 'CardForm', name: 'CardForm',

6
app/src/components/globals/ReadOnlyField.vue
View file

@ -4,8 +4,10 @@
{{ label }} {{ label }}
</b-col> </b-col>
<!-- FIXME not sure about rendering html --> <b-col>
<b-col v-html="text" /> <!-- FIXME not sure about rendering html -->
<div v-html="text" />
</b-col>
</b-row> </b-row>
</template> </template>

8
app/src/components/globals/ViewBase.vue
View file

@ -1,8 +1,12 @@
<template> <template>
<div> <div>
<top-bar v-if="hasTopBar"> <top-bar v-if="hasTopBar">
<slot name="top-bar-group-left" slot="group-left" /> <template #group-left>
<slot name="top-bar-group-right" slot="group-right" /> <slot name="top-bar-group-left" />
</template>
<template #group-right>
<slot name="top-bar-group-right" />
</template>
</top-bar> </top-bar>
<slot v-else name="top-bar" /> <slot v-else name="top-bar" />

20
app/src/components/globals/ViewSearch.vue
View file

@ -1,6 +1,8 @@
<template> <template>
<view-base v-bind="$attrs" v-on="$listeners" :skeleton="skeleton"> <view-base v-bind="$attrs" v-on="$listeners" :skeleton="skeleton">
<slot v-if="hasCustomTopBar" name="top-bar" slot="top-bar" /> <template v-if="hasCustomTopBar" #top-bar>
<slot name="top-bar" />
</template>
<template v-if="!hasCustomTopBar" #top-bar-group-left> <template v-if="!hasCustomTopBar" #top-bar-group-left>
<b-input-group class="w-100"> <b-input-group class="w-100">
<b-input-group-prepend is-text> <b-input-group-prepend is-text>
@ -15,9 +17,13 @@
/> />
</b-input-group> </b-input-group>
</template> </template>
<slot v-if="!hasCustomTopBar" name="top-bar-buttons" slot="top-bar-group-right" /> <template v-if="!hasCustomTopBar" #top-bar-group-right>
<slot name="top-bar-buttons" />
</template>
<slot name="top" slot="top" /> <template #top>
<slot name="top" />
</template>
<template #default> <template #default>
<b-alert v-if="items === null || filteredItems === null" variant="warning"> <b-alert v-if="items === null || filteredItems === null" variant="warning">
@ -30,9 +36,13 @@
<slot v-else name="default" /> <slot v-else name="default" />
</template> </template>
<slot name="bot" slot="bot" /> <template #bot>
<slot name="bot" />
</template>
<slot name="skeleton" slot="skeleton" /> <template #skeleton>
<slot name="skeleton" />
</template>
</view-base> </view-base>
</template> </template>

2
app/src/components/globals/formItems/TagsSelectizeItem.vue
View file

@ -5,7 +5,7 @@
:value="value" :id="id" :value="value" :id="id"
size="lg" class="p-0 border-0" no-outer-focus size="lg" class="p-0 border-0" no-outer-focus
> >
<template v-slot="{ tags, disabled, addTag, removeTag }"> <template #default="{ tags, disabled, addTag, removeTag }">
<ul v-if="!noTags && tags.length > 0" class="list-inline d-inline-block mb-2"> <ul v-if="!noTags && tags.length > 0" class="list-inline d-inline-block mb-2">
<li v-for="tag in tags" :key="id + '-' + tag" class="list-inline-item"> <li v-for="tag in tags" :key="id + '-' + tag" class="list-inline-item">
<b-form-tag <b-form-tag

4
app/src/helpers/yunohostArguments.js
View file

@ -91,7 +91,7 @@ export function evaluateExpression (expression, forms) {
}, {}) }, {})
// Allow to use match(var,regexp) function // Allow to use match(var,regexp) function
const matchRe = new RegExp('match\\(\\s*(\\w+)\\s*,\\s*"([^"]+)"\\s*\\)', 'g') const matchRe = /match(\s*(\w+)\s*,\s*"([^"]+)"\s*)/g
for (const matched of expression.matchAll(matchRe)) { for (const matched of expression.matchAll(matchRe)) {
const [fullMatch, varMatch, regExpMatch] = matched const [fullMatch, varMatch, regExpMatch] = matched
const varName = varMatch + '__re' + matched.index const varName = varMatch + '__re' + matched.index
@ -171,7 +171,7 @@ export function formatYunoHostArgument (arg) {
if (!isNaN(parseInt(arg.max))) { if (!isNaN(parseInt(arg.max))) {
validation.maxValue = validators.maxValue(parseInt(arg.max)) validation.maxValue = validators.maxValue(parseInt(arg.max))
} }
validation.numValue = validators.helpers.regex('Please provide an integer', new RegExp('^-?[0-9]+$')) validation.numValue = validators.integer
} }
}, },
{ {

10
app/src/scss/_functions-override.scss
View file

@ -1,3 +1,5 @@
@use 'sass:math';
// Taken from https://gist.github.com/johanlef/518a511b2b2f6b96c4f429b3af2f169a // Taken from https://gist.github.com/johanlef/518a511b2b2f6b96c4f429b3af2f169a
// Those functions overrides built-in bootstrap's computation color functions (that // Those functions overrides built-in bootstrap's computation color functions (that
// generate flat variants and its darken/lighten alterations) to allow `var(--color)` CSS // generate flat variants and its darken/lighten alterations) to allow `var(--color)` CSS
@ -116,7 +118,9 @@
} }
@function render-hsla($h, $s, $l, $a: 1) { @function render-hsla($h, $s, $l, $a: 1) {
@return hsla($h, $s, $l, $a); // @return hsla($h, #{$s}, #{$l}, $a);
// Error when using sass `hsla` with css variables, fallback to browser native `hsla`
@return unquote('hsla(#{$h}, #{$s}, #{$l}, #{$a})');
} }
@function lighten($color, $amount) { @function lighten($color, $amount) {
@ -208,7 +212,7 @@
$c: to-hsl($color); $c: to-hsl($color);
$l: map-get($c, l); $l: map-get($c, l);
$th: $yiq-contrasted-threshold / 2.56; // convert hex to dec $th: calc($yiq-contrasted-threshold / 2.56); // convert hex to dec
$lightness: calc(-100 * calc(#{$l} - calc(#{$th} * 1%))); $lightness: calc(-100 * calc(#{$l} - calc(#{$th} * 1%)));
// ignoring hue and saturation, just a light or dark gray // ignoring hue and saturation, just a light or dark gray
@ -224,7 +228,7 @@
@return $color; @return $color;
} }
$amount: $theme-color-interval * abs($level) / 100%; $amount: math.div($theme-color-interval * abs($level) , 100%);
$c: to-hsl($color); $c: to-hsl($color);
$h: map-get($c, h); $h: map-get($c, h);
$s: map-get($c, s); $s: map-get($c, s);

36
app/src/scss/font.scss
View file

@ -11,8 +11,8 @@
font-family: 'FiraGO'; font-family: 'FiraGO';
src: src:
local('FiraGO ExtraLight Italic'), local('FiraGO ExtraLight Italic'),
url('~fontsource-firago/files/firago-all-200-italic.woff2') format('woff2'), url('~@fontsource/firago/files/firago-all-200-italic.woff2') format('woff2'),
url('~fontsource-firago/files/firago-all-200-italic.woff') format('woff'); url('~@fontsource/firago/files/firago-all-200-italic.woff') format('woff');
font-weight: 200; font-weight: 200;
font-style: italic; font-style: italic;
font-display: swap; font-display: swap;
@ -22,8 +22,8 @@
font-family: 'FiraGO'; font-family: 'FiraGO';
src: src:
local('FiraGO ExtraLight'), local('FiraGO ExtraLight'),
url('~fontsource-firago/files/firago-all-200-normal.woff2') format('woff2'), url('~@fontsource/firago/files/firago-all-200-normal.woff2') format('woff2'),
url('~fontsource-firago/files/firago-all-200-normal.woff') format('woff'); url('~@fontsource/firago/files/firago-all-200-normal.woff') format('woff');
font-weight: 200; font-weight: 200;
font-style: normal; font-style: normal;
font-display: swap; font-display: swap;
@ -33,8 +33,8 @@
font-family: 'FiraGO'; font-family: 'FiraGO';
src: src:
local('FiraGO Italic'), local('FiraGO Italic'),
url('~fontsource-firago/files/firago-all-400-italic.woff2') format('woff2'), url('~@fontsource/firago/files/firago-all-400-italic.woff2') format('woff2'),
url('~fontsource-firago/files/firago-all-400-italic.woff') format('woff'); url('~@fontsource/firago/files/firago-all-400-italic.woff') format('woff');
font-weight: 400; font-weight: 400;
font-style: italic; font-style: italic;
font-display: swap; font-display: swap;
@ -44,8 +44,8 @@
font-family: 'FiraGO'; font-family: 'FiraGO';
src: src:
local('FiraGO Regular'), local('FiraGO Regular'),
url('~fontsource-firago/files/firago-all-400-normal.woff2') format('woff2'), url('~@fontsource/firago/files/firago-all-400-normal.woff2') format('woff2'),
url('~fontsource-firago/files/firago-all-400-normal.woff') format('woff'); url('~@fontsource/firago/files/firago-all-400-normal.woff') format('woff');
font-weight: 400; font-weight: 400;
font-style: normal; font-style: normal;
font-display: swap; font-display: swap;
@ -55,8 +55,8 @@
font-family: 'FiraGO'; font-family: 'FiraGO';
src: src:
local('FiraGO Medium Italic'), local('FiraGO Medium Italic'),
url('~fontsource-firago/files/firago-all-500-italic.woff2') format('woff2'), url('~@fontsource/firago/files/firago-all-500-italic.woff2') format('woff2'),
url('~fontsource-firago/files/firago-all-500-italic.woff') format('woff'); url('~@fontsource/firago/files/firago-all-500-italic.woff') format('woff');
font-weight: 500; font-weight: 500;
font-style: italic; font-style: italic;
font-display: swap; font-display: swap;
@ -66,8 +66,8 @@
font-family: 'FiraGO'; font-family: 'FiraGO';
src: src:
local('FiraGO Medium'), local('FiraGO Medium'),
url('~fontsource-firago/files/firago-all-500-normal.woff2') format('woff2'), url('~@fontsource/firago/files/firago-all-500-normal.woff2') format('woff2'),
url('~fontsource-firago/files/firago-all-500-normal.woff') format('woff'); url('~@fontsource/firago/files/firago-all-500-normal.woff') format('woff');
font-weight: 500; font-weight: 500;
font-style: normal; font-style: normal;
font-display: swap; font-display: swap;
@ -77,8 +77,8 @@
font-family: 'FiraGO'; font-family: 'FiraGO';
src: src:
local('FiraGO Bold Italic'), local('FiraGO Bold Italic'),
url('~fontsource-firago/files/firago-all-700-italic.woff2') format('woff2'), url('~@fontsource/firago/files/firago-all-700-italic.woff2') format('woff2'),
url('~fontsource-firago/files/firago-all-700-italic.woff') format('woff'); url('~@fontsource/firago/files/firago-all-700-italic.woff') format('woff');
font-weight: 700; font-weight: 700;
font-style: italic; font-style: italic;
font-display: swap; font-display: swap;
@ -88,8 +88,8 @@
font-family: 'FiraGO'; font-family: 'FiraGO';
src: src:
local('FiraGO Bold'), local('FiraGO Bold'),
url('~fontsource-firago/files/firago-all-700-normal.woff2') format('woff2'), url('~@fontsource/firago/files/firago-all-700-normal.woff2') format('woff2'),
url('~fontsource-firago/files/firago-all-700-normal.woff') format('woff'); url('~@fontsource/firago/files/firago-all-700-normal.woff') format('woff');
font-weight: 700; font-weight: 700;
font-style: normal; font-style: normal;
font-display: swap; font-display: swap;
@ -107,8 +107,8 @@
font-family: 'Fira Code'; font-family: 'Fira Code';
src: src:
local('Fira Code Regular'), local('Fira Code Regular'),
url('~firacode/distr/woff2/FiraCode-Regular.woff2') format('woff2'), // url('~@fontsource/fira-code/files/fira-code-all-400-normal.woff2') format('woff2'),
url('~firacode/distr/woff/FiraCode-Regular.woff') format('woff'); url('~@fontsource/fira-code/files/fira-code-all-400-normal.woff') format('woff');
font-weight: 400; font-weight: 400;
font-style: normal; font-style: normal;
} }

2
app/src/store/settings.js
View file

@ -16,7 +16,7 @@ export default {
theme: localStorage.getItem('theme') === 'true', theme: localStorage.getItem('theme') === 'true',
experimental: localStorage.getItem('experimental') === 'true', experimental: localStorage.getItem('experimental') === 'true',
spinner: 'pacman', spinner: 'pacman',
supportedLocales: supportedLocales supportedLocales
}, },
mutations: { mutations: {

4
app/src/views/_partials/DomainForm.vue
View file

@ -4,7 +4,9 @@
:validation="$v" :server-error="serverError" :validation="$v" :server-error="serverError"
@submit.prevent="onSubmit" @submit.prevent="onSubmit"
> >
<slot name="disclaimer" slot="disclaimer" /> <template #disclaimer>
<slot name="disclaimer" />
</template>
<b-form-radio <b-form-radio
v-model="selected" name="domain-type" value="domain" v-model="selected" name="domain-type" value="domain"

4
app/src/views/_partials/ErrorDisplay.vue
View file

@ -21,7 +21,9 @@
<p> <p>
<strong v-t="'api_error.error_message'" /> <strong v-t="'api_error.error_message'" />
<b-alert class="mt-2" variant="danger" v-html="error.message" /> <b-alert class="mt-2" variant="danger">
<div v-html="error.message" />
</b-alert>
</p> </p>
<template v-if="error.traceback"> <template v-if="error.traceback">

2
app/src/views/_partials/ViewLockOverlay.vue
View file

@ -6,7 +6,7 @@
> >
<slot name="default" /> <slot name="default" />
<template v-slot:overlay> <template #overlay>
<b-card no-body class="card-overlay"> <b-card no-body class="card-overlay">
<b-card-header header-bg-variant="white"> <b-card-header header-bg-variant="white">
<query-header :request="error || currentRequest" status-size="lg" /> <query-header :request="error || currentRequest" status-size="lg" />

4
app/src/views/_partials/WarningDisplay.vue
View file

@ -1,7 +1,9 @@
<template> <template>
<!-- This card receives style from `ViewLockOverlay` if used inside it --> <!-- This card receives style from `ViewLockOverlay` if used inside it -->
<div> <div>
<b-card-body body-class="alert alert-warning" v-html="warning.text" /> <b-card-body body-class="alert alert-warning">
<div v-html="warning.text" />
</b-card-body>
<b-card-footer footer-bg-variant="warning"> <b-card-footer footer-bg-variant="warning">
<b-button <b-button

24
app/src/views/app/AppInfo.vue
View file

@ -396,13 +396,15 @@ export default {
? app.from_catalog.potential_alternative_to.join(this.$i18n.t('words.separator')) ? app.from_catalog.potential_alternative_to.join(this.$i18n.t('words.separator'))
: null, : null,
description: DESCRIPTION ? formatI18nField(DESCRIPTION) : app.description, description: DESCRIPTION ? formatI18nField(DESCRIPTION) : app.description,
integration: app.manifest.packaging_format >= 2 ? { integration: app.manifest.packaging_format >= 2
archs: Array.isArray(archs) ? archs.join(this.$i18n.t('words.separator')) : archs, ? {
ldap: ldap === 'not_relevant' ? null : ldap, archs: Array.isArray(archs) ? archs.join(this.$i18n.t('words.separator')) : archs,
sso: sso === 'not_relevant' ? null : sso, ldap: ldap === 'not_relevant' ? null : ldap,
multi_instance, sso: sso === 'not_relevant' ? null : sso,
resources: { ram: ram.runtime, disk } multi_instance,
} : null, resources: { ram: ram.runtime, disk }
}
: null,
links: [ links: [
['license', `https://spdx.org/licenses/${app.manifest.upstream.license}`], ['license', `https://spdx.org/licenses/${app.manifest.upstream.license}`],
...['website', 'admindoc', 'userdoc', 'code'].map((key) => ([key, app.manifest.upstream[key]])), ...['website', 'admindoc', 'userdoc', 'code'].map((key) => ([key, app.manifest.upstream[key]])),
@ -411,9 +413,11 @@ export default {
doc: { doc: {
notifications: { notifications: {
postInstall: notifs.POST_INSTALL && notifs.POST_INSTALL.main ? [['main', formatI18nField(notifs.POST_INSTALL.main)]] : [], 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]) => { postUpgrade: notifs.POST_UPGRADE
return [key, formatI18nField(content)] ? Object.entries(notifs.POST_UPGRADE).map(([key, content]) => {
}) : [] return [key, formatI18nField(content)]
})
: []
}, },
admin: [ admin: [
['admin', formatI18nField(ADMIN)], ['admin', formatI18nField(ADMIN)],

16
app/src/views/app/AppInstall.vue
View file

@ -254,13 +254,15 @@ export default {
demo: _app.upstream.demo, demo: _app.upstream.demo,
version, version,
license: _app.upstream.license, license: _app.upstream.license,
integration: _app.packaging_format >= 2 ? { integration: _app.packaging_format >= 2
archs: Array.isArray(archs) ? archs.join(this.$i18n.t('words.separator')) : archs, ? {
ldap: ldap === 'not_relevant' ? null : ldap, archs: Array.isArray(archs) ? archs.join(this.$i18n.t('words.separator')) : archs,
sso: sso === 'not_relevant' ? null : sso, ldap: ldap === 'not_relevant' ? null : ldap,
multi_instance, sso: sso === 'not_relevant' ? null : sso,
resources: { ram: ram.runtime, disk } multi_instance,
} : null, resources: { ram: ram.runtime, disk }
}
: null,
links: [ links: [
['license', `https://spdx.org/licenses/${_app.upstream.license}`], ['license', `https://spdx.org/licenses/${_app.upstream.license}`],
...['website', 'admindoc', 'userdoc', 'code'].map((key) => ([key, _app.upstream[key]])), ...['website', 'admindoc', 'userdoc', 'code'].map((key) => ([key, _app.upstream[key]])),

2
app/src/views/app/AppList.vue
View file

@ -16,7 +16,7 @@
<b-list-group> <b-list-group>
<b-list-group-item <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 }}" :to="{ name: 'app-info', params: { id }}"
class="d-flex justify-content-between align-items-center pr-0" class="d-flex justify-content-between align-items-center pr-0"
> >

2
app/src/views/user/UserImport.vue
View file

@ -84,7 +84,7 @@ export default {
if (!confirmed) return if (!confirmed) return
} }
var requestArgs = {} const requestArgs = {}
Object.assign(requestArgs, this.form) Object.assign(requestArgs, this.form)
if (!requestArgs.delete) delete requestArgs.delete if (!requestArgs.delete) delete requestArgs.delete
if (!requestArgs.update) delete requestArgs.update if (!requestArgs.update) delete requestArgs.update

36
app/vue.config.js
View file

@ -61,26 +61,30 @@ module.exports = {
css: { css: {
loaderOptions: { loaderOptions: {
sass: { sass: {
prependData: '@import "@/scss/_variables.scss";' additionalData: '@import "@/scss/_variables.scss";'
} }
} }
}, },
publicPath: '/yunohost/admin', publicPath: '/yunohost/admin',
devServer: process.env.NODE_ENV === 'development' ? { devServer: process.env.NODE_ENV === 'development'
public: fs.readFileSync('/etc/yunohost/current_host', 'utf8'), ? {
https: false, public: fs.readFileSync('/etc/yunohost/current_host', 'utf8'),
disableHostCheck: true, https: false,
proxy: { allowedHosts: 'all',
'^/yunohost': { proxy: {
target: `http://${process.env.VUE_APP_IP}`, '^/yunohost': {
ws: true, target: `http://${process.env.VUE_APP_IP}`,
logLevel: 'info' ws: true,
logLevel: 'info'
}
},
static: {
watch: {
ignored: /node_modules/,
aggregateTimeout: 300,
poll: 1000
}
} }
},
watchOptions: {
ignored: /node_modules/,
aggregateTimeout: 300,
poll: 1000
} }
} : {} : {}
} }