Update configs and removed unused dependencies

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
This commit is contained in:
John Molakvoæ (skjnldsv) 2019-09-03 11:58:51 +02:00
commit dc5a674dbc
No known key found for this signature in database
GPG key ID: 60C25B8C072916CF
21 changed files with 2849 additions and 1511 deletions

View file

@ -32,14 +32,14 @@ export default {
}
</script>
<style lang="scss">
<style lang="scss">
#app-forms {
width: 100%;
display: flex;
}
#app-content {
width: 100%;
display: flex;
width: 100%;
display: flex;
}
</style>

View file

@ -65,6 +65,7 @@
<script>
import { Multiselect } from 'nextcloud-vue'
import axios from 'nextcloud-axios'
export default {
components: {
@ -127,7 +128,7 @@ export default {
loadUsersAsync(query) {
this.isLoading = false
this.siteUsersListOptions.query = query
this.$http.post(OC.generateUrl('apps/forms/get/siteusers'), this.siteUsersListOptions)
axios.post(OC.generateUrl('apps/forms/get/siteusers'), this.siteUsersListOptions)
.then((response) => {
this.users = response.data.siteusers
this.isLoading = false

View file

@ -23,9 +23,7 @@
import Vue from 'vue'
import router from './router'
import axios from 'nextcloud-axios'
import App from './App.vue'
import vClickOutside from 'v-click-outside'
import VueClipboard from 'vue-clipboard2'
import { DatetimePicker, PopoverMenu, Tooltip } from 'nextcloud-vue'
@ -38,8 +36,6 @@ import SideBarClose from './components/sideBarClose'
import ShareDiv from './components/shareDiv'
import LoadingOverlay from './components/_base-LoadingOverlay'
Vue.config.debug = true
Vue.config.devTools = true
Vue.component('Controls', Controls)
Vue.component('PopoverMenu', PopoverMenu)
Vue.component('DatePicker', DatetimePicker)
@ -51,13 +47,11 @@ Vue.component('LoadingOverlay', LoadingOverlay)
Vue.directive('tooltip', Tooltip)
Vue.use(vClickOutside)
Vue.use(VueClipboard)
Vue.use(Modal)
Vue.prototype.t = t
Vue.prototype.n = n
Vue.prototype.$http = axios
Vue.prototype.OC = OC
Vue.prototype.OCA = OCA

View file

@ -187,6 +187,7 @@
<script>
import moment from 'moment'
import QuizFormItem from '../components/quizFormItem'
import axios from 'nextcloud-axios'
export default {
name: 'Create',
@ -469,7 +470,7 @@ export default {
this.titleEmpty = false
// this.form.event.expirationDate = moment(this.form.event.expirationDate).utc()
this.$http.post(OC.generateUrl('apps/forms/write/form'), this.form)
axios.post(OC.generateUrl('apps/forms/write/form'), this.form)
.then((response) => {
this.form.mode = 'edit'
this.form.event.hash = response.data.hash
@ -490,7 +491,7 @@ export default {
loadForm(hash) {
this.loadingForm = true
this.$http.get(OC.generateUrl('apps/forms/get/form/' + hash))
axios.get(OC.generateUrl('apps/forms/get/form/' + hash))
.then((response) => {
this.form = response.data
if (this.form.event.expirationDate !== null) {

View file

@ -90,7 +90,7 @@ export default {
methods: {
loadForms() {
this.loading = true
this.$http.get(OC.generateUrl('apps/forms/get/forms'))
axios.get(OC.generateUrl('apps/forms/get/forms'))
.then((response) => {
this.forms = response.data
this.loading = false

View file

@ -62,6 +62,7 @@
// import lodash from 'lodash'
import resultItem from '../components/resultItem'
import json2csvParser from 'json2csv'
import axios from 'nextcloud-axios'
export default {
name: 'Results',
@ -119,7 +120,7 @@ export default {
methods: {
loadForms() {
this.loading = true
this.$http.get(OC.generateUrl('apps/forms/get/votes/' + this.$route.params.hash))
axios.get(OC.generateUrl('apps/forms/get/votes/' + this.$route.params.hash))
.then((response) => {
if (response.data == null) {
this.votes = null
@ -145,7 +146,7 @@ export default {
download() {
this.loading = true
this.$http.get(OC.generateUrl('apps/forms/get/event/' + this.$route.params.hash))
axios.get(OC.generateUrl('apps/forms/get/event/' + this.$route.params.hash))
.then((response) => {
this.json2csvParser = ['userId', 'voteOptionId', 'voteOptionText', 'voteAnswer']
var element = document.createElement('a')

View file

@ -1,56 +0,0 @@
/** jshint esversion: 6 */
const path = require('path')
const { VueLoaderPlugin } = require('vue-loader')
module.exports = {
entry: {
'forms': path.join(__dirname, 'main.js')
},
output: {
path: path.resolve(__dirname, '../js'),
publicPath: '/js/',
filename: '[name].js'
},
module: {
rules: [
{
test: /\.css$/,
use: [
'vue-style-loader',
'css-loader'
]
},
{
test: /\.scss$/,
use: [
'vue-style-loader',
'css-loader',
'sass-loader'
]
},
{
test: /\.vue$/,
loader: 'vue-loader'
},
{
test: /\.js$/,
loader: 'babel-loader',
exclude: /node_modules/
},
{
test: /\.(png|jpg|gif|svg)$/,
loader: 'file-loader',
options: {
name: '[name].[ext]?[hash]'
}
}
]
},
plugins: [new VueLoaderPlugin()],
resolve: {
alias: {
vue$: 'vue/dist/vue.esm.js'
},
extensions: ['*', '.js', '.vue', '.json']
}
}

View file

@ -1,13 +0,0 @@
/** jshint esversion: 6 */
const merge = require('webpack-merge')
const common = require('./webpack.common.js')
module.exports = merge(common, {
mode: 'development',
devServer: {
historyApiFallback: true,
noInfo: true,
overlay: true
},
devtool: 'source-map'
})

View file

@ -1,7 +0,0 @@
/** jshint esversion: 6 */
const merge = require('webpack-merge')
const common = require('./webpack.common.js')
module.exports = merge(common, {
mode: 'production'
})