ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #2962 from nextcloud/dependabot/npm_and_yarn/master/nextcloud/router-2.0.0

Browse Source
This commit is contained in:
Julius Härtl
2021-04-16 14:39:18 -01:00
committed by GitHub
parent f4ea995182 6fb99df3e4
commit 2dcb79418f
10 changed files with 50 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
package-lock.json generated
View File

@@ -4791,17 +4791,17 @@
} }
}, },
"@nextcloud/router": { "@nextcloud/router": {
"version": "1.2.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/@nextcloud/router/-/router-1.2.0.tgz", "resolved": "https://registry.npmjs.org/@nextcloud/router/-/router-2.0.0.tgz",
"integrity": "sha512-kn9QsL9LuhkIMaSSgdiqRL3SZ6PatuAjXUiyq343BbSnI99Oc5eJH8kU6cT2AHije7wKy/tK8Xe3VQuVO32SZQ==", "integrity": "sha512-GyHYNYrYAZRBGD5VxRggcbahdJ/zCkXb8+ERVfuaosT+nHMjJSmenTD6Uyct41qGm0p3Az4xRCXGyZGJM0NEUQ==",
"requires": { "requires": {
"core-js": "^3.6.4" "core-js": "^3.6.4"
}, },
"dependencies": { "dependencies": {
"core-js": { "core-js": {
"version": "3.6.5", "version": "3.10.1",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz", "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.10.1.tgz",
"integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==" "integrity": "sha512-pwCxEXnj27XG47mu7SXAwhLP3L5CrlvCB91ANUkIz40P27kUcvNfSdvyZJ9CLHiVoKSp+TTChMQMSKQEH/IQxA=="
} }
} }
}, },
@@ -4847,6 +4847,14 @@
"vue2-datepicker": "^3.6.3" "vue2-datepicker": "^3.6.3"
}, },
"dependencies": { "dependencies": {
"@nextcloud/router": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/@nextcloud/router/-/router-1.2.0.tgz",
"integrity": "sha512-kn9QsL9LuhkIMaSSgdiqRL3SZ6PatuAjXUiyq343BbSnI99Oc5eJH8kU6cT2AHije7wKy/tK8Xe3VQuVO32SZQ==",
"requires": {
"core-js": "^3.6.4"
}
},
"@types/json-schema": { "@types/json-schema": {
"version": "7.0.7", "version": "7.0.7",
"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz",
@@ -4950,6 +4958,16 @@
"vue-multiselect": "^2.1.6", "vue-multiselect": "^2.1.6",
"vue-visible": "^1.0.2", "vue-visible": "^1.0.2",
"vue2-datepicker": "^3.6.2" "vue2-datepicker": "^3.6.2"
},
"dependencies": {
"@nextcloud/router": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/@nextcloud/router/-/router-1.2.0.tgz",
"integrity": "sha512-kn9QsL9LuhkIMaSSgdiqRL3SZ6PatuAjXUiyq343BbSnI99Oc5eJH8kU6cT2AHije7wKy/tK8Xe3VQuVO32SZQ==",
"requires": {
"core-js": "^3.6.4"
}
}
} }
}, },
"core-js": { "core-js": {
@@ -16743,6 +16761,19 @@
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/@nextcloud/browserslist-config/-/browserslist-config-1.0.0.tgz", "resolved": "https://registry.npmjs.org/@nextcloud/browserslist-config/-/browserslist-config-1.0.0.tgz",
"integrity": "sha512-f+sKpdLZXkODV+OY39K1M+Spmd4RgxmtEXmNn4Bviv4R7uBFHXuw+JX9ZdfDeOryfHjJ/TRQxQEp0GMpBwZFUw==" "integrity": "sha512-f+sKpdLZXkODV+OY39K1M+Spmd4RgxmtEXmNn4Bviv4R7uBFHXuw+JX9ZdfDeOryfHjJ/TRQxQEp0GMpBwZFUw=="
},
"@nextcloud/router": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/@nextcloud/router/-/router-1.2.0.tgz",
"integrity": "sha512-kn9QsL9LuhkIMaSSgdiqRL3SZ6PatuAjXUiyq343BbSnI99Oc5eJH8kU6cT2AHije7wKy/tK8Xe3VQuVO32SZQ==",
"requires": {
"core-js": "^3.6.4"
}
},
"core-js": {
"version": "3.10.1",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.10.1.tgz",
"integrity": "sha512-pwCxEXnj27XG47mu7SXAwhLP3L5CrlvCB91ANUkIz40P27kUcvNfSdvyZJ9CLHiVoKSp+TTChMQMSKQEH/IQxA=="
} }
} }
}, },

2
package.json
View File

@@ -39,7 +39,7 @@
"@nextcloud/initial-state": "^1.2.0", "@nextcloud/initial-state": "^1.2.0",
"@nextcloud/l10n": "^1.4.1", "@nextcloud/l10n": "^1.4.1",
"@nextcloud/moment": "^1.1.1", "@nextcloud/moment": "^1.1.1",
"@nextcloud/router": "^1.2.0", "@nextcloud/router": "^2.0.0",
"@nextcloud/vue": "^3.9.0", "@nextcloud/vue": "^3.9.0",
"@nextcloud/vue-dashboard": "^1.1.0", "@nextcloud/vue-dashboard": "^1.1.0",
"blueimp-md5": "^2.18.0", "blueimp-md5": "^2.18.0",

2
src/components/ActivityList.vue
View File

@@ -84,7 +84,7 @@ export default {
params.append('object_id', '' + this.objectId) params.append('object_id', '' + this.objectId)
params.append('limit', ACTIVITY_FETCH_LIMIT) params.append('limit', ACTIVITY_FETCH_LIMIT)
const response = await axios.get(generateOcsUrl('apps/activity/api/v2/activity') + this.filter + '?' + params) const response = await axios.get(generateOcsUrl(`apps/activity/api/v2/activity/${this.filter}`) + '?' + params)
let activities = response.data.ocs.data let activities = response.data.ocs.data
if (this.filter === 'deck') { if (this.filter === 'deck') {
// We need to manually filter activities here, since currently we use two different types and there is no way // We need to manually filter activities here, since currently we use two different types and there is no way

2
src/components/card/AttachmentList.vue
View File

@@ -210,7 +210,7 @@ export default {
throw new Error(t('files', 'Invalid path selected')) throw new Error(t('files', 'Invalid path selected'))
} }
axios.post(generateOcsUrl('apps/files_sharing/api/v1', 2) + 'shares', { axios.post(generateOcsUrl('apps/files_sharing/api/v1/shares'), {
path, path,
shareType: 12, shareType: 12,
shareWith: '' + this.cardId, shareWith: '' + this.cardId,

2
src/components/navigation/AppNavigation.vue
View File

@@ -163,7 +163,7 @@ export default {
if (this.isAdmin) { if (this.isAdmin) {
this.groupLimit = this.$store.getters.config('groupLimit') this.groupLimit = this.$store.getters.config('groupLimit')
this.groupLimitDisabled = false this.groupLimitDisabled = false
axios.get(generateOcsUrl('cloud', 2) + 'groups').then((response) => { axios.get(generateOcsUrl('cloud/groups')).then((response) => {
this.groups = response.data.ocs.data.groups.reduce((obj, item) => { this.groups = response.data.ocs.data.groups.reduce((obj, item) => {
obj.push({ obj.push({
id: item, id: item,

2
src/components/search/GlobalSearchResults.vue
View File

@@ -63,7 +63,7 @@ const createCancelToken = () => axios.CancelToken.source()
function search({ query, cursor }) { function search({ query, cursor }) {
const cancelToken = createCancelToken() const cancelToken = createCancelToken()
const request = async() => axios.get(generateOcsUrl('apps/deck/api/v1.0', 2) + '/search', { const request = async() => axios.get(generateOcsUrl('apps/deck/api/v1.0/search'), {
cancelToken: cancelToken.token, cancelToken: cancelToken.token,
params: { params: {
term: query, term: query,

8
src/services/CommentApi.js
View File

@@ -31,7 +31,7 @@ export class CommentApi {
} }
async loadComments({ cardId, limit, offset }) { async loadComments({ cardId, limit, offset }) {
const api = await axios.get(generateOcsUrl('apps/deck/api/v1.0/cards', 2) + `${cardId}/comments`, { const api = await axios.get(generateOcsUrl(`apps/deck/api/v1.0/cards${cardId}/comments`), {
params: { limit, offset }, params: { limit, offset },
headers: { 'OCS-APIRequest': 'true' }, headers: { 'OCS-APIRequest': 'true' },
}) })
@@ -39,7 +39,7 @@ export class CommentApi {
} }
async createComment({ cardId, comment, replyTo }) { async createComment({ cardId, comment, replyTo }) {
const api = await axios.post(generateOcsUrl('apps/deck/api/v1.0/cards', 2) + `${cardId}/comments`, { const api = await axios.post(generateOcsUrl(`apps/deck/api/v1.0/cards/${cardId}/comments`), {
message: `${comment}`, message: `${comment}`,
parentId: replyTo ? replyTo.id : null, parentId: replyTo ? replyTo.id : null,
}) })
@@ -47,14 +47,14 @@ export class CommentApi {
} }
async updateComment({ cardId, id, comment }) { async updateComment({ cardId, id, comment }) {
const api = await axios.put(generateOcsUrl('apps/deck/api/v1.0/cards', 2) + `${cardId}/comments/${id}`, { const api = await axios.put(generateOcsUrl(`apps/deck/api/v1.0/cards/${cardId}/comments/${id}`), {
message: `${comment}`, message: `${comment}`,
}) })
return api.data.ocs.data return api.data.ocs.data
} }
async deleteComment({ cardId, id }) { async deleteComment({ cardId, id }) {
const api = await axios.delete(generateOcsUrl('apps/deck/api/v1.0/cards', 2) + `${cardId}/comments/${id}`) const api = await axios.delete(generateOcsUrl(`apps/deck/api/v1.0/cards/${cardId}/comments/${id}`))
return api.data.ocs.data return api.data.ocs.data
} }

2
src/services/OverviewApi.js
View File

@@ -26,7 +26,7 @@ import { generateOcsUrl } from '@nextcloud/router'
export class OverviewApi { export class OverviewApi {
url(url) { url(url) {
return generateOcsUrl('apps/deck/api/v1.0') + url return generateOcsUrl(`apps/deck/api/v1.0/${url}`)
} }
get(filter) { get(filter) {

2
src/services/SharingApi.js
View File

@@ -22,7 +22,7 @@
import axios from '@nextcloud/axios' import axios from '@nextcloud/axios'
import { generateOcsUrl } from '@nextcloud/router' import { generateOcsUrl } from '@nextcloud/router'
const shareUrl = generateOcsUrl('apps/files_sharing/api/v1', 2) + 'shares' const shareUrl = generateOcsUrl('apps/files_sharing/api/v1/shares')
const createShare = async function({ path, permissions, shareType, shareWith, publicUpload, password, sendPasswordByTalk, expireDate, label }) { const createShare = async function({ path, permissions, shareType, shareWith, publicUpload, password, sendPasswordByTalk, expireDate, label }) {
try { try {

4
src/store/main.js
View File

@@ -317,7 +317,7 @@ export default new Vuex.Store({
async setConfig({ commit }, config) { async setConfig({ commit }, config) {
for (const key in config) { for (const key in config) {
try { try {
await axios.post(generateOcsUrl('apps/deck/api/v1.0/config') + key, { await axios.post(generateOcsUrl(`apps/deck/api/v1.0/config/${key}`), {
value: config[key], value: config[key],
}) })
commit('SET_CONFIG', { key, value: config[key] }) commit('SET_CONFIG', { key, value: config[key] })
@@ -421,7 +421,7 @@ export default new Vuex.Store({
params.append('perPage', 20) params.append('perPage', 20)
params.append('itemType', [0, 1, 4, 7]) params.append('itemType', [0, 1, 4, 7])
const response = await axios.get(generateOcsUrl('apps/files_sharing/api/v1') + 'sharees', { params }) const response = await axios.get(generateOcsUrl('apps/files_sharing/api/v1/sharees'), { params })
commit('setSharees', response.data.ocs.data) commit('setSharees', response.data.ocs.data)
}, },