From 1c1fb294c5415c8f7a4933e40aeb8ee83fe7fa67 Mon Sep 17 00:00:00 2001 From: Bachir Soussi Chiadmi Date: Wed, 25 Nov 2020 21:42:56 +0100 Subject: [PATCH] addepated code to last commit --- web/themes/custom/materiotheme/assets/styles/main.scss | 8 -------- .../custom/materiotheme/vuejs/components/Content/Card.vue | 1 + .../materiotheme/vuejs/components/Pages/Article.vue | 2 +- .../custom/materiotheme/vuejs/store/modules/blabla.js | 2 +- .../custom/materiotheme/vuejs/store/modules/common.js | 2 +- .../custom/materiotheme/vuejs/store/modules/pages.js | 2 +- .../custom/materiotheme/vuejs/store/modules/search.js | 2 +- .../custom/materiotheme/vuejs/store/modules/showrooms.js | 2 +- .../custom/materiotheme/vuejs/store/modules/user.js | 6 +++--- 9 files changed, 10 insertions(+), 17 deletions(-) diff --git a/web/themes/custom/materiotheme/assets/styles/main.scss b/web/themes/custom/materiotheme/assets/styles/main.scss index f4d5eac..f7a7e31 100644 --- a/web/themes/custom/materiotheme/assets/styles/main.scss +++ b/web/themes/custom/materiotheme/assets/styles/main.scss @@ -1,11 +1,3 @@ -// @Author: Bachir Soussi Chiadmi -// @Date: 18-12-2017 -// @Email: bachir@figureslibres.io -// @Filename: app.scss -// @Last modified by: bach -// @Last modified time: 20-12-2017 -// @License: GPL-V3 - @import './base/reset'; @import './base/variables'; @import './base/colors'; diff --git a/web/themes/custom/materiotheme/vuejs/components/Content/Card.vue b/web/themes/custom/materiotheme/vuejs/components/Content/Card.vue index 31bc6e3..3fe8b8f 100644 --- a/web/themes/custom/materiotheme/vuejs/components/Content/Card.vue +++ b/web/themes/custom/materiotheme/vuejs/components/Content/Card.vue @@ -138,6 +138,7 @@ export default { this.loadingFlag = false; }) }else{ + this.flag({uuid: this.item.uuid, collid: collid}) .then(data => { console.log("onFlagActionCard then", data); diff --git a/web/themes/custom/materiotheme/vuejs/components/Pages/Article.vue b/web/themes/custom/materiotheme/vuejs/components/Pages/Article.vue index 94c9121..3bec061 100644 --- a/web/themes/custom/materiotheme/vuejs/components/Pages/Article.vue +++ b/web/themes/custom/materiotheme/vuejs/components/Pages/Article.vue @@ -115,7 +115,7 @@ import router from 'vuejs/route' import store from 'vuejs/store' import { JSONAPI } from 'vuejs/api/json-axios' -import qs from 'querystring' +import qs from 'querystring-es3' import Card from 'vuejs/components/Content/Card' import { mapState, mapActions } from 'vuex' diff --git a/web/themes/custom/materiotheme/vuejs/store/modules/blabla.js b/web/themes/custom/materiotheme/vuejs/store/modules/blabla.js index 62a3f46..8827780 100644 --- a/web/themes/custom/materiotheme/vuejs/store/modules/blabla.js +++ b/web/themes/custom/materiotheme/vuejs/store/modules/blabla.js @@ -1,7 +1,7 @@ import { JSONAPI } from 'vuejs/api/json-axios' import { REST } from 'vuejs/api/rest-axios' import { MA } from 'vuejs/api/ma-axios' -import qs from 'querystring' +import qs from 'querystring-es3' export default { namespaced: true, diff --git a/web/themes/custom/materiotheme/vuejs/store/modules/common.js b/web/themes/custom/materiotheme/vuejs/store/modules/common.js index a0de11d..8b8afc8 100644 --- a/web/themes/custom/materiotheme/vuejs/store/modules/common.js +++ b/web/themes/custom/materiotheme/vuejs/store/modules/common.js @@ -1,6 +1,6 @@ import { REST } from 'vuejs/api/rest-axios' import { JSONAPI } from 'vuejs/api/json-axios' -import qs from 'querystring' +import qs from 'querystring-es3' export default { namespaced: true, diff --git a/web/themes/custom/materiotheme/vuejs/store/modules/pages.js b/web/themes/custom/materiotheme/vuejs/store/modules/pages.js index 27a1538..096c60e 100644 --- a/web/themes/custom/materiotheme/vuejs/store/modules/pages.js +++ b/web/themes/custom/materiotheme/vuejs/store/modules/pages.js @@ -1,7 +1,7 @@ import { JSONAPI } from 'vuejs/api/json-axios' import { REST } from 'vuejs/api/rest-axios' import { MA } from 'vuejs/api/ma-axios' -import qs from 'querystring' +import qs from 'querystring-es3' export default { namespaced: true, diff --git a/web/themes/custom/materiotheme/vuejs/store/modules/search.js b/web/themes/custom/materiotheme/vuejs/store/modules/search.js index d24561b..825e416 100644 --- a/web/themes/custom/materiotheme/vuejs/store/modules/search.js +++ b/web/themes/custom/materiotheme/vuejs/store/modules/search.js @@ -1,7 +1,7 @@ import { REST } from 'vuejs/api/rest-axios' import { JSONAPI } from 'vuejs/api/json-axios' import { MA } from 'vuejs/api/ma-axios' -import qs from 'querystring' +import qs from 'querystring-es3' export default { namespaced: true, diff --git a/web/themes/custom/materiotheme/vuejs/store/modules/showrooms.js b/web/themes/custom/materiotheme/vuejs/store/modules/showrooms.js index 2050be7..aba6082 100644 --- a/web/themes/custom/materiotheme/vuejs/store/modules/showrooms.js +++ b/web/themes/custom/materiotheme/vuejs/store/modules/showrooms.js @@ -1,7 +1,7 @@ import { JSONAPI } from 'vuejs/api/json-axios' import { REST } from 'vuejs/api/rest-axios' import { MA } from 'vuejs/api/ma-axios' -import qs from 'querystring' +import qs from 'querystring-es3' export default { namespaced: true, diff --git a/web/themes/custom/materiotheme/vuejs/store/modules/user.js b/web/themes/custom/materiotheme/vuejs/store/modules/user.js index 7e495a7..bbfc1a4 100644 --- a/web/themes/custom/materiotheme/vuejs/store/modules/user.js +++ b/web/themes/custom/materiotheme/vuejs/store/modules/user.js @@ -1,7 +1,7 @@ import { REST } from "vuejs/api/rest-axios"; // import { JSONAPI } from 'vuejs/api/json-axios'; import { MA } from "vuejs/api/ma-axios"; -import qs from "querystring"; +import qs from "querystring-es3"; export default { namespaced: true, @@ -90,7 +90,7 @@ export default { // actions actions: { userRegister({ dispatch, commit, state }, credentials) { - return new Promise((resolve, reject) => { + return new Promise((resolve) => { REST.get("/session/token").then(({ token }) => { commit("SetCsrftoken", token); REST.post("/user/register?_format=json", credentials, { @@ -109,7 +109,7 @@ export default { }); }); }, - userLogin({ dispatch, commit, state }, credentials) { + userLogin({ dispatch, state }, credentials) { return new Promise((resolve, reject) => { dispatch("getToken", credentials).then(() => { dispatch("getUser").then(userdata => {