opensourcemirror
/
nextcloud-contacts
mirror of https://github.com/nextcloud/contacts.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove nextcloud-server (#1149) 

Remove nextcloud-server
This commit is contained in:
John Molakvoæ 2019-06-25 22:32:22 +02:00 committed by GitHub
parent 2260ed3324 97501ef635
commit 0397ab4fdc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 69 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
package-lock.json generated
View File

@ -1217,11 +1217,6 @@
"to-fast-properties": "^2.0.0"
}
},
"@types/jquery": {
"version": "2.0.53",
"resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-2.0.53.tgz",
"integrity": "sha512-MZKPWUhp5TKkoJ/58NSq6io+CSUCOHm2b3Z6U4+r9v70kktB0JM+eRjdp6YmDHtw0kK2XB7L2K7/FMIoziHjUA=="
},
"@vue/component-compiler-utils": {
"version": "2.6.0",
"resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-2.6.0.tgz",
@ -2358,8 +2353,8 @@
"dev": true
},
"cdav-library": {
"version": "github:nextcloud/cdav-library#4b623f07adf9234902fc8fa45cf67413922540c7",
"from": "github:nextcloud/cdav-library#4b623f07adf9234902fc8fa45cf67413922540c7",
"version": "github:nextcloud/cdav-library#ce9ceb4a8d96f0173dcd8430b4d64d3a890ff2c6",
"from": "github:nextcloud/cdav-library",
"requires": {
"@babel/polyfill": "^7.4.4"
}
@ -2549,7 +2544,7 @@
},
"strip-ansi": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
"resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
"dev": true,
"requires": {
@ -3244,7 +3239,7 @@
"dependencies": {
"domelementtype": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
"resolved": "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
"integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=",
"dev": true
}
@ -3650,7 +3645,7 @@
},
"strip-ansi": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
"resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
"dev": true,
"requires": {
@ -3828,7 +3823,7 @@
},
"doctrine": {
"version": "1.5.0",
"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
"resolved": "http://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
"integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
"dev": true,
"requires": {
@ -4260,7 +4255,7 @@
},
"fecha": {
"version": "2.3.3",
"resolved": "https://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz",
"resolved": "http://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz",
"integrity": "sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg=="
},
"figgy-pudding": {
@ -5523,7 +5518,7 @@
"dependencies": {
"readable-stream": {
"version": "3.0.6",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.0.6.tgz",
"resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-3.0.6.tgz",
"integrity": "sha512-9E1oLoOWfhSXHGv6QlwXJim7uNzd9EVlWK+21tCU9Ju/kR0/p2AZYPz4qSchgO8PlLIH4FpZYfzwS+rEksZjIg==",
"dev": true,
"requires": {
@ -6998,7 +6993,7 @@
},
"strip-ansi": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
"resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
"dev": true,
"requires": {
@ -7075,6 +7070,14 @@
"integrity": "sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==",
"dev": true
},
"nextcloud-auth": {
"version": "0.0.2",
"resolved": "https://registry.npmjs.org/nextcloud-auth/-/nextcloud-auth-0.0.2.tgz",
"integrity": "sha512-Crsj3f+/VrZwgCUGFqDtg5NnxMFqU2TWc70ke0tF30tX8t2mdZo97abYosBiHmAsL4gYOpzNIwwGUAzOd9VsHg==",
"requires": {
"core-js": "^3.1.4"
}
},
"nextcloud-axios": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/nextcloud-axios/-/nextcloud-axios-0.2.0.tgz",
@ -7083,12 +7086,28 @@
"axios": "^0.19.0"
}
},
"nextcloud-server": {
"version": "0.15.10",
"resolved": "https://registry.npmjs.org/nextcloud-server/-/nextcloud-server-0.15.10.tgz",
"integrity": "sha512-pCROf5Rz8TaIZDZMED4mJ/iUa/u03+h5r0OKBXG8Aw1Hn2GHX6SX82RD12+QMtL+5LPLxmoVNLAA8ngIUasHZQ==",
"nextcloud-dialogs": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/nextcloud-dialogs/-/nextcloud-dialogs-0.0.1.tgz",
"integrity": "sha512-s1tlwWfydb4UI81xZziE3KE7lZI4UNjIb5jUI2nKrbRexclKODcSkfY/5OTmW6WAqnySniVDmHZUJSIRRzHlow==",
"requires": {
"@types/jquery": "^2.0.50"
"core-js": "^3.1.4"
}
},
"nextcloud-l10n": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/nextcloud-l10n/-/nextcloud-l10n-0.0.1.tgz",
"integrity": "sha512-yRyym3inJi5D3Z//Qd1a+WIymVjDJ/5JGJ3wY1tdu9KFhSq16ft8RohABmdRnLkxaNYUqe/ZmeHxp3Z+AxkxtQ==",
"requires": {
"core-js": "^3.1.4"
}
},
"nextcloud-router": {
"version": "0.0.6",
"resolved": "https://registry.npmjs.org/nextcloud-router/-/nextcloud-router-0.0.6.tgz",
"integrity": "sha512-dpSqy9Ot7zfP3pF0cWRk2aTOXiAD1xryW3HvGeR+EMARothEf04FiK83CwCWin1OqLee9KLrVmvMVT+QfIDsfg==",
"requires": {
"core-js": "^3.1.4"
}
},
"nextcloud-vue": {
@ -7710,7 +7729,7 @@
},
"path-browserify": {
"version": "0.0.0",
"resolved": "http://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
"resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
"integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=",
"dev": true
},
@ -8517,7 +8536,7 @@
},
"readable-stream": {
"version": "2.3.6",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
"resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
"dev": true,
"requires": {
@ -9110,7 +9129,7 @@
},
"yargs": {
"version": "7.1.0",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
"resolved": "http://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
"integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
"dev": true,
"requires": {
@ -9637,7 +9656,7 @@
},
"stream-browserify": {
"version": "2.0.1",
"resolved": "http://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
"resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
"integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
"dev": true,
"requires": {
@ -9692,7 +9711,7 @@
},
"strip-ansi": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
"resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
"dev": true,
"requires": {
@ -9703,7 +9722,7 @@
},
"string_decoder": {
"version": "1.1.1",
"resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
"dev": true,
"requires": {
@ -10431,7 +10450,7 @@
},
"tty-browserify": {
"version": "0.0.0",
"resolved": "http://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
"resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
"integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
"dev": true
},
@ -10820,7 +10839,7 @@
},
"vm-browserify": {
"version": "0.0.4",
"resolved": "http://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
"resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
"integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
"dev": true,
"requires": {
@ -11531,7 +11550,7 @@
},
"yargs": {
"version": "11.1.0",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz",
"resolved": "http://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz",
"integrity": "sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==",
"dev": true,
"requires": {

5
package.json
View File

@ -42,7 +42,10 @@
"downloadjs": "^1.4.7",
"ical.js": "^1.3.0",
"moment": "^2.24.0",
"nextcloud-server": "^0.15.10",
"nextcloud-auth": "0.0.2",
"nextcloud-dialogs": "0.0.1",
"nextcloud-l10n": "0.0.1",
"nextcloud-router": "0.0.6",
"nextcloud-vue": "^0.11.4",
"p-limit": "^2.2.0",
"p-queue": "^6.0.2",

16
src/components/ContactDetails/ContactDetailsAvatar.vue
View File

@ -76,8 +76,8 @@
import debounce from 'debounce'
import { ActionLink, ActionButton } from 'nextcloud-vue'
import { pickFileOrDirectory } from 'nextcloud-server/dist/files'
import { generateRemoteUrl } from 'nextcloud-server/dist/router'
import { getFilePickerBuilder } from 'nextcloud-dialogs'
import { generateRemoteUrl } from 'nextcloud-router'
const axios = () => import('axios')
@ -200,18 +200,18 @@ export default {
},
async selectFilePicker() {
if (!this.loading) {
const file = await pickFileOrDirectory(
t('contacts', 'Pick an avatar'),
false,
[
const picker = getFilePickerBuilder(t('contacts', 'Pick an avatar'))
.setMimeTypeFilter([
'image/png',
'image/jpeg',
'image/gif',
'image/x-xbitmap',
'image/bmp',
'image/svg+xml'
]
)
])
.build()
const file = await picker.pick()
if (file) {
this.loading = true
try {

3
src/components/Properties/PropertyDateTime.vue
View File

@ -59,6 +59,7 @@
import debounce from 'debounce'
import moment from 'moment'
import { DatetimePicker } from 'nextcloud-vue'
import { getLocale } from 'nextcloud-l10n'
import { VCardTime } from 'ical.js'
import PropertyMixin from 'Mixins/PropertyMixin'
@ -132,7 +133,7 @@ export default {
mounted() {
// Load the locale
// convert format like en_GB to en-gb for `moment.js`
let locale = OC.getLocale().replace('_', '-').toLowerCase()
let locale = getLocale().replace('_', '-').toLowerCase()
// default load e.g. fr-fr
import('moment/locale/' + this.locale)

5
src/main.js
View File

@ -28,7 +28,8 @@ import App from './App'
import router from './router'
import store from './store'
import { sync } from 'vuex-router-sync'
import { generateFilePath } from 'nextcloud-server/dist/router'
import { generateFilePath } from 'nextcloud-router'
import { getRequestToken } from 'nextcloud-auth'
/** GLOBAL COMPONENTS AND DIRECTIVE */
import { Actions, DatetimePicker, Multiselect, PopoverMenu, Modal } from 'nextcloud-vue'
@ -38,7 +39,7 @@ import VueClipboard from 'vue-clipboard2'
// CSP config for webpack dynamic chunk loading
// eslint-disable-next-line
__webpack_nonce__ = btoa(OC.requestToken)
__webpack_nonce__ = btoa(getRequestToken())
// Correct the root of the app for chunk loading
// OC.linkTo matches the apps folders

2
src/router/index.js
View File

@ -22,7 +22,7 @@
import Vue from 'vue'
import Router from 'vue-router'
import { generateUrl } from 'nextcloud-server/dist/router'
import { generateUrl } from 'nextcloud-router'
import Contacts from 'Views/Contacts'
Vue.use(Router)

6
src/services/cdav.js
View File

@ -21,11 +21,13 @@
*/
import DavClient from 'cdav-library'
import { generateRemoteUrl } from 'nextcloud-router'
import { getRequestToken } from 'nextcloud-auth'
function xhrProvider() {
var headers = {
'X-Requested-With': 'XMLHttpRequest',
'requesttoken': OC.requestToken
'requesttoken': getRequestToken()
}
var xhr = new XMLHttpRequest()
var oldOpen = xhr.open
@ -43,5 +45,5 @@ function xhrProvider() {
}
export default new DavClient({
rootUrl: OC.linkToRemote('dav')
rootUrl: generateRemoteUrl('dav')
}, xhrProvider)