Skip to content

Commit e70ed83

Browse files
SergeyMosinSergeyMosin
committedNov 13, 2022
Update "@nextcloud/vue" to v7.0.1 - #366
·
v2.4.11.14.3
1 parent f32f382 commit e70ed83

20 files changed

+2875
-2902
lines changed
 

‎css/form.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎css/style.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎js/script.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎js/script.js.LICENSE.txt

+16-29
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
/*!
9-
* Vue.js v2.7.13
9+
* Vue.js v2.7.14
1010
* (c) 2014-2022 Evan You
1111
* Released under the MIT License.
1212
*/
@@ -20,23 +20,35 @@
2020
*/
2121

2222
/*!
23-
* focus-trap 6.9.4
23+
* focus-trap 7.0.0
2424
* @license MIT, https://github.com/focus-trap/focus-trap/blob/master/LICENSE
2525
*/
2626

2727
/*!
28-
* tabbable 5.3.3
28+
* tabbable 6.0.1
2929
* @license MIT, https://github.com/focus-trap/tabbable/blob/master/LICENSE
3030
*/
3131

32-
/*! For license information please see ncvuecomponents.js.LICENSE.txt */
32+
/*! For license information please see NcActionButton.js.LICENSE.txt */
33+
34+
/*! For license information please see NcActions.js.LICENSE.txt */
35+
36+
/*! For license information please see NcAppContent.js.LICENSE.txt */
37+
38+
/*! For license information please see NcAppNavigation.js.LICENSE.txt */
39+
40+
/*! For license information please see NcAppNavigationItem.js.LICENSE.txt */
41+
42+
/*! For license information please see NcAppSettingsDialog.js.LICENSE.txt */
3343

3444
/*! Hammer.JS - v2.0.7 - 2016-04-22
3545
* http://hammerjs.github.io/
3646
*
3747
* Copyright (c) 2016 Jorik Tangelder;
3848
* Licensed under the MIT license */
3949

50+
/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
51+
4052
/**
4153
* vue-class-component v7.0.1
4254
* (c) 2015-present Evan You
@@ -110,28 +122,3 @@
110122
* along with this program. If not, see <http://www.gnu.org/licenses/>.
111123
*
112124
*/
113-
114-
/**!
115-
* @fileOverview Kickass library to create and place poppers near their reference elements.
116-
* @version 1.16.1
117-
* @license
118-
* Copyright (c) 2016 Federico Zivolo and contributors
119-
*
120-
* Permission is hereby granted, free of charge, to any person obtaining a copy
121-
* of this software and associated documentation files (the "Software"), to deal
122-
* in the Software without restriction, including without limitation the rights
123-
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
124-
* copies of the Software, and to permit persons to whom the Software is
125-
* furnished to do so, subject to the following conditions:
126-
*
127-
* The above copyright notice and this permission notice shall be included in all
128-
* copies or substantial portions of the Software.
129-
*
130-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
131-
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
132-
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
133-
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
134-
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
135-
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
136-
* SOFTWARE.
137-
*/

‎package.json

+18-20
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@
88
"watch": "webpack --progress --watch --config webpack.dev.js",
99
"build": "webpack --progress --config webpack.prod.js",
1010
"datepicker-css": "sass --style=compressed --no-source-map scss/datepicker/index.scss css/datepicker.css",
11-
"convert-icons": "node nc25icons.js"
11+
"convert-icons": "node nc25icons.js",
12+
"profile": "webpack --config webpack.prod.js --profile --json > stats.json"
1213
},
1314
"dependencies": {
1415
"@nextcloud/axios": "^2.1.0",
15-
"@nextcloud/dialogs": "^3.1.2",
16+
"@nextcloud/dialogs": "^3.2.0",
1617
"@nextcloud/l10n": "^1.6.0",
17-
"@nextcloud/logger": "^2.1.0",
18+
"@nextcloud/logger": "^2.4.0",
1819
"@nextcloud/router": "^2.0.0",
19-
"@nextcloud/vue": "^5.4.0",
20-
"vue": "^2.7.13",
21-
"vue-material-design-icons": "^5.1.2",
22-
"vue-slider-component": "v3.1.0",
20+
"@nextcloud/vue": "^7.0.1",
21+
"vue": "^2.7.14",
22+
"vue-slider-component": "3.1.0",
2323
"vue2-datepicker": "^3.10.4"
2424
},
2525
"engines": {
@@ -29,36 +29,34 @@
2929
"@babel/core": "^7.17.5",
3030
"@babel/plugin-proposal-class-properties": "^7.16.7",
3131
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
32-
"@babel/plugin-transform-modules-commonjs": "^7.13.8",
33-
"@babel/plugin-transform-shorthand-properties": "^7.12.13",
32+
"@babel/plugin-transform-modules-commonjs": "^7.14.5",
33+
"@babel/plugin-transform-shorthand-properties": "^7.14.5",
3434
"@babel/preset-env": "^7.16.11",
3535
"@nextcloud/babel-config": "^1.0.0",
36-
"@nextcloud/browserslist-config": "^2.2.0",
36+
"@nextcloud/browserslist-config": "^2.3.0",
3737
"@vue/compiler-sfc": "^3.2.31",
38-
"@vue/test-utils": "^1.1.2",
38+
"@vue/test-utils": "^1.2.0",
3939
"babel-core": "^6.26.3",
40-
"babel-eslint": "^10.0.3",
40+
"babel-eslint": "^10.1.0",
4141
"babel-jest": "^27.5.1",
4242
"babel-loader": "^8.2.3",
4343
"copy-webpack-plugin": "^10.2.4",
4444
"css-loader": "^5.2.6",
45-
"eslint": ">= 4.12.1",
45+
"eslint": "^8.9.0",
4646
"file-loader": "^6.2.0",
47-
"ical.js": "^1.4.0",
48-
"linkifyjs": "^3.0.5",
47+
"linkifyjs": "^4.0.2",
4948
"node-sass": "^7.0.1",
50-
"pnpm": "^7.1.7",
5149
"regenerator-runtime": "^0.13.9",
5250
"sass": "^1.55.0",
5351
"sass-loader": "^12.4.0",
5452
"terser-webpack-plugin": "^5.3.1",
5553
"uuid": "^8.3.2",
5654
"vue-jest": "^3.0.7",
57-
"vue-loader": "^15.9.8",
55+
"vue-loader": "^15.10.0",
5856
"vue-style-loader": "^4.1.3",
59-
"vue-template-compiler": ">=2.0.0 <3.0.0",
60-
"webpack": "^5.69.1",
61-
"webpack-cli": "^4.9.2",
57+
"vue-template-compiler": "^2.6.14",
58+
"webpack": "^5.74.0",
59+
"webpack-cli": "^4.10.0",
6260
"webpack-merge": "^5.8.0"
6361
},
6462
"peerDependencies": {

‎pnpm-lock.yaml

+1,652-1,782
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎scss/_icons.css

+2-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎scss/form.scss

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ body {
1212
}
1313

1414
#body-public.layout-base #content{
15-
margin-top: 0;
1615
min-height: 100%;
16+
padding-top: 50px;
17+
margin-top: 0;
1718
}
1819

1920
#content {

‎scss/style.scss

+815-710
Large diffs are not rendered by default.

‎src/App.vue

+307-296
Large diffs are not rendered by default.

‎src/components/ActionInputExt.vue

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<script>
2-
import {ActionInput} from '@nextcloud/vue'
2+
import {NcActionInput} from '@nextcloud/vue'
33
export default {
4-
components: {ActionInput},
5-
extends: ActionInput,
4+
components: {NcActionInput},
5+
extends: NcActionInput,
66
name: "ActionInput",
77
methods: {
88
onSubmit(event) {
9-
ActionInput.methods.onSubmit.call(this,event)
9+
NcActionInput.methods.onSubmit.call(this,event)
1010
if (!this.disabled && this.$parent && this.$parent.closeMenu) {
1111
this.$parent.closeMenu()
1212
}

‎src/components/ActionsOpenUp.vue

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<script>
2-
import {Actions} from '@nextcloud/vue'
2+
import {NcActions} from '@nextcloud/vue'
33
export default {
4-
components: {Actions},
4+
components: {NcActions},
55
name: "ActionsOpenUp",
6-
extends: Actions,
6+
extends: NcActions,
77
methods: {
88
onOpen() {
99
this.offsetX = 0

‎src/components/ModalExt.vue

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<script>
2+
// because of https://github.com/nextcloud/nextcloud-focus-trap/issues/2
3+
import {NcActionInput, NcModal} from "@nextcloud/vue"
4+
5+
export default {
6+
components: {NcModal},
7+
extends: NcModal,
8+
name: "ModalExt",
9+
methods: {
10+
useFocusTrap() {
11+
}
12+
}
13+
}
14+
</script>

‎src/components/NavAccountItem.vue

+8-8
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
:style="curCal.rIcon"
77
:icon-scale="false"
88
:loading="curCal.isCalLoading">
9-
<Actions menuAlign="right" @open="getCalendars" forceMenu slot="actions">
10-
<ActionButton
9+
<NcActions menuAlign="right" @open="getCalendars" forceMenu slot="actions">
10+
<NcActionButton
1111
v-for="(cal,index) in calendars"
1212
@click="setCalendarFromIndex(index)"
1313
:key="cal.name"
@@ -16,16 +16,16 @@
1616
:disabled="cal.url === ''"
1717
class="srgdev_com_circle"
1818
closeAfterClick>
19-
</ActionButton>
20-
</Actions>
19+
</NcActionButton>
20+
</NcActions>
2121
</ApptIconButton>
2222
</template>
2323

2424
<script>
2525
// noinspection ES6CheckImport
2626
import{
27-
ActionButton,
28-
Actions,
27+
NcActionButton,
28+
NcActions,
2929
} from '@nextcloud/vue'
3030
import axios from '@nextcloud/axios'
3131
import {detectColor} from "../utils.js";
@@ -45,8 +45,8 @@
4545
},
4646
components: {
4747
ApptIconButton,
48-
ActionButton,
49-
Actions,
48+
NcActionButton,
49+
NcActions,
5050
},
5151
methods: {
5252
getCalendars: async function () {

‎src/components/SlideBar.vue

+1-4
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@
102102
@use "sass:math";
103103
@import '../../scss/_variables';
104104
105-
$header-height: 50px;
106105
$slidebar-min-width: 360px;
107106
$sidebar-max-width: 500px;
108107
@@ -116,17 +115,15 @@
116115
117116
.app-slidebar {
118117
z-index: 1500;
119-
/** height: calc(100vh - #{$header-height}); */
120118
height: 100%;
121119
width: 27vw;
122120
min-width: $slidebar-min-width;
123121
max-width: $sidebar-max-width;
124122
top: 0;
125123
126-
left: 0;
124+
left: auto;
127125
right: auto;
128126
129-
130127
display: flex;
131128
flex-shrink: 0;
132129
flex-direction: column;

‎src/components/settings/DirectoryPageSettings.vue

+11-12
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,20 @@
1212
style="padding-left: 0"
1313
class="srgdev-appt-sb-main-cont">
1414
<div v-for="(pl,index) in dirInfo" class="srgdev-appt-dir-pl">
15-
<Actions
15+
<NcActions
1616
v-show="editNumber===-1"
1717
menuAlign="right"
1818
style="position: absolute"
1919
class="srgdev-appt-dir-pl_actions">
20-
<ActionButton
20+
<NcActionButton
2121
:closeAfterClick="true"
2222
@click="editPageLink(index)"
23-
icon="icon-edit">{{t('appointments','Edit')}}</ActionButton>
24-
<ActionButton
23+
icon="icon-edit">{{t('appointments','Edit')}}</NcActionButton>
24+
<NcActionButton
2525
:closeAfterClick="true"
2626
@click="deletePageLink(index)"
27-
icon="icon-delete">{{t('appointments','Delete')}}</ActionButton>
28-
</Actions>
27+
icon="icon-delete">{{t('appointments','Delete')}}</NcActionButton>
28+
</NcActions>
2929
<div v-show="editNumber!==index">
3030
<div class="srgdev-appt-dir-pl_title">{{pl.title}}</div>
3131
<div class="srgdev-appt-dir-pl_sub">{{pl.subTitle}}</div>
@@ -61,14 +61,14 @@
6161
menuAlign="right"
6262
style="position: absolute"
6363
class="srgdev-appt-dir-pl_actions srgdev-appt-dir-pl_actions_cmb">
64-
<ActionButton
64+
<NcActionButton
6565
v-for="l in pageLabels" :key="l.id"
6666
:data-pid="l.id"
6767
@click="urlSelected(l.id)"
6868
:closeAfterClick="true"
6969
:icon="urlLoadingId===l.id+index?'icon-loading-small':'icon-public'">
7070
{{l.label}}
71-
</ActionButton>
71+
</NcActionButton>
7272
</ActionsOpenUp>
7373
</div>
7474
<button @click="savePageLink()" class="primary"
@@ -85,17 +85,16 @@
8585

8686
<script>
8787
import SlideBar from "../SlideBar.vue"
88-
import {ActionButton, Actions, Multiselect} from "@nextcloud/vue"
88+
import {NcActionButton, NcActions} from "@nextcloud/vue"
8989
import ActionsOpenUp from "../ActionsOpenUp.vue";
9090
9191
export default {
9292
name: "DirectoryPageSettings",
9393
components: {
94-
Multiselect,
9594
SlideBar,
96-
Actions,
95+
NcActions,
9796
ActionsOpenUp,
98-
ActionButton
97+
NcActionButton
9998
},
10099
props:{
101100
title:'',

‎src/components/settings/SettingsSlideBar.vue

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
<template>
22
<SlideBar :title="t('appointments','Additional Settings')" :subtitle="t('appointments','Customize and configure the app')" @close="close">
33
<template slot="main-area">
4-
<AppNavigationItem
4+
<NcAppNavigationItem
55
:title="t('appointments','Customize Public Page')"
66
@click="$emit('gotoPPS')"
77
icon="icon-category-customization"/>
8-
<AppNavigationItem
8+
<NcAppNavigationItem
99
:title="t('appointments','Email Settings')"
1010
@click="$emit('gotoEML')"
1111
icon="icon-mail"/>
12-
<AppNavigationItem
12+
<NcAppNavigationItem
1313
:title="t('appointments','Talk Integration')"
1414
@click="$emit('gotoTALK')"
1515
icon="icon-talk"/>
16-
<AppNavigationItem
16+
<NcAppNavigationItem
1717
v-show="showDirPage===true"
1818
:title="t('appointments','Directory Page')"
1919
@click="$emit('gotoDIR')"
2020
icon="icon-projects"/>
21-
<AppNavigationItem
21+
<NcAppNavigationItem
2222
:title="t('appointments','Reminders')"
2323
@click="$emit('gotoREM')"
2424
icon="icon-appt-reminder"/>
25-
<AppNavigationItem
25+
<NcAppNavigationItem
2626
:title="t('appointments','Advanced Settings')"
2727
@click="$emit('gotoADV')"
2828
icon="icon-settings-dark"/>
2929
<div v-show="hasKey===false">
30-
<AppNavigationItem
30+
<NcAppNavigationItem
3131
v-show="showKeyInput===false"
3232
:title="t('appointments','Contributor Key')"
3333
@click="openKeyInput()"
@@ -49,14 +49,14 @@
4949
import SlideBar from "../SlideBar.vue"
5050
import ActionInput from "../ActionInputExt.vue";
5151
import {
52-
AppNavigationItem,
52+
NcAppNavigationItem,
5353
} from '@nextcloud/vue'
5454
import {showError} from "@nextcloud/dialogs"
5555
export default {
5656
name: "SettingsSlideBar",
5757
components: {
5858
SlideBar,
59-
AppNavigationItem,
59+
NcAppNavigationItem,
6060
ActionInput
6161
},
6262
props:{

‎src/components/settings/TimeslotSettings/CalendarAndMode.vue

-7
Original file line numberDiff line numberDiff line change
@@ -218,11 +218,6 @@ import ApptAccordion from "../../ApptAccordion.vue";
218218
import {showError, showWarning} from "@nextcloud/dialogs"
219219
import {getTimezone} from "../../../utils";
220220
221-
import {
222-
ActionButton,
223-
Actions,
224-
} from '@nextcloud/vue'
225-
226221
import VueSlider from 'vue-slider-component'
227222
import 'vue-slider-component/theme/default.css'
228223
@@ -237,8 +232,6 @@ export default {
237232
SlideBar,
238233
ApptIconButton,
239234
VueSlider,
240-
Actions,
241-
ActionButton,
242235
ApptAccordion
243236
},
244237
props: {

‎webpack.common.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ module.exports = {
1616
path: path.resolve(__dirname, './js'),
1717
publicPath: '/js/',
1818
filename: '[name].js',
19-
chunkFilename: 'chunks/appt.[name].[contenthash].js'
19+
chunkFilename: 'chunks/appt.[name].[contenthash].js',
20+
clean: true,
2021
},
2122
module: {
2223
rules: [

‎webpack.prod.js

+8-12
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,21 @@ module.exports = merge(common, {
66
mode: 'production',
77
// devtool: '#source-map',
88
optimization: {
9-
minimizer: [new TerserPlugin({
10-
terserOptions: {
11-
output: {
12-
comments: false,
13-
}
14-
},
15-
// sourceMap: false,
16-
})],
17-
// splitChunks: {
18-
// chunks: 'all',
19-
// },
209
// splitChunks: {
2110
// cacheGroups: {
22-
// vendor: {
11+
// commons: {
2312
// test: /[\\/]node_modules[\\/]/,
2413
// name: 'vendors',
2514
// chunks: 'all',
2615
// },
2716
// },
2817
// },
18+
minimizer: [new TerserPlugin({
19+
terserOptions: {
20+
output: {
21+
comments: false,
22+
}
23+
},
24+
})],
2925
}
3026
})

0 commit comments

Comments
 (0)
Please sign in to comment.