addepated code to last commit
This commit is contained in:
		@@ -1,11 +1,3 @@
 | 
				
			|||||||
// @Author: Bachir Soussi Chiadmi <bach>
 | 
					 | 
				
			||||||
// @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/reset';
 | 
				
			||||||
@import './base/variables';
 | 
					@import './base/variables';
 | 
				
			||||||
@import './base/colors';
 | 
					@import './base/colors';
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -138,6 +138,7 @@ export default {
 | 
				
			|||||||
            this.loadingFlag = false;
 | 
					            this.loadingFlag = false;
 | 
				
			||||||
          })
 | 
					          })
 | 
				
			||||||
        }else{
 | 
					        }else{
 | 
				
			||||||
 | 
					          
 | 
				
			||||||
          this.flag({uuid: this.item.uuid, collid: collid})
 | 
					          this.flag({uuid: this.item.uuid, collid: collid})
 | 
				
			||||||
          .then(data => {
 | 
					          .then(data => {
 | 
				
			||||||
            console.log("onFlagActionCard then", data);
 | 
					            console.log("onFlagActionCard then", data);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -115,7 +115,7 @@
 | 
				
			|||||||
import router from 'vuejs/route'
 | 
					import router from 'vuejs/route'
 | 
				
			||||||
import store from 'vuejs/store'
 | 
					import store from 'vuejs/store'
 | 
				
			||||||
import { JSONAPI } from 'vuejs/api/json-axios'
 | 
					import { JSONAPI } from 'vuejs/api/json-axios'
 | 
				
			||||||
import qs from 'querystring'
 | 
					import qs from 'querystring-es3'
 | 
				
			||||||
import Card from 'vuejs/components/Content/Card'
 | 
					import Card from 'vuejs/components/Content/Card'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import { mapState, mapActions } from 'vuex'
 | 
					import { mapState, mapActions } from 'vuex'
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,7 +1,7 @@
 | 
				
			|||||||
import { JSONAPI } from 'vuejs/api/json-axios'
 | 
					import { JSONAPI } from 'vuejs/api/json-axios'
 | 
				
			||||||
import { REST } from 'vuejs/api/rest-axios'
 | 
					import { REST } from 'vuejs/api/rest-axios'
 | 
				
			||||||
import { MA } from 'vuejs/api/ma-axios'
 | 
					import { MA } from 'vuejs/api/ma-axios'
 | 
				
			||||||
import qs from 'querystring'
 | 
					import qs from 'querystring-es3'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
export default {
 | 
					export default {
 | 
				
			||||||
  namespaced: true,
 | 
					  namespaced: true,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,6 +1,6 @@
 | 
				
			|||||||
import { REST } from 'vuejs/api/rest-axios'
 | 
					import { REST } from 'vuejs/api/rest-axios'
 | 
				
			||||||
import { JSONAPI } from 'vuejs/api/json-axios'
 | 
					import { JSONAPI } from 'vuejs/api/json-axios'
 | 
				
			||||||
import qs from 'querystring'
 | 
					import qs from 'querystring-es3'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
export default {
 | 
					export default {
 | 
				
			||||||
  namespaced: true,
 | 
					  namespaced: true,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,7 +1,7 @@
 | 
				
			|||||||
import { JSONAPI } from 'vuejs/api/json-axios'
 | 
					import { JSONAPI } from 'vuejs/api/json-axios'
 | 
				
			||||||
import { REST } from 'vuejs/api/rest-axios'
 | 
					import { REST } from 'vuejs/api/rest-axios'
 | 
				
			||||||
import { MA } from 'vuejs/api/ma-axios'
 | 
					import { MA } from 'vuejs/api/ma-axios'
 | 
				
			||||||
import qs from 'querystring'
 | 
					import qs from 'querystring-es3'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
export default {
 | 
					export default {
 | 
				
			||||||
  namespaced: true,
 | 
					  namespaced: true,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,7 +1,7 @@
 | 
				
			|||||||
import { REST } from 'vuejs/api/rest-axios'
 | 
					import { REST } from 'vuejs/api/rest-axios'
 | 
				
			||||||
import { JSONAPI } from 'vuejs/api/json-axios'
 | 
					import { JSONAPI } from 'vuejs/api/json-axios'
 | 
				
			||||||
import { MA } from 'vuejs/api/ma-axios'
 | 
					import { MA } from 'vuejs/api/ma-axios'
 | 
				
			||||||
import qs from 'querystring'
 | 
					import qs from 'querystring-es3'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
export default {
 | 
					export default {
 | 
				
			||||||
  namespaced: true,
 | 
					  namespaced: true,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,7 +1,7 @@
 | 
				
			|||||||
import { JSONAPI } from 'vuejs/api/json-axios'
 | 
					import { JSONAPI } from 'vuejs/api/json-axios'
 | 
				
			||||||
import { REST } from 'vuejs/api/rest-axios'
 | 
					import { REST } from 'vuejs/api/rest-axios'
 | 
				
			||||||
import { MA } from 'vuejs/api/ma-axios'
 | 
					import { MA } from 'vuejs/api/ma-axios'
 | 
				
			||||||
import qs from 'querystring'
 | 
					import qs from 'querystring-es3'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
export default {
 | 
					export default {
 | 
				
			||||||
  namespaced: true,
 | 
					  namespaced: true,
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,7 +1,7 @@
 | 
				
			|||||||
import { REST } from "vuejs/api/rest-axios";
 | 
					import { REST } from "vuejs/api/rest-axios";
 | 
				
			||||||
// import { JSONAPI } from 'vuejs/api/json-axios';
 | 
					// import { JSONAPI } from 'vuejs/api/json-axios';
 | 
				
			||||||
import { MA } from "vuejs/api/ma-axios";
 | 
					import { MA } from "vuejs/api/ma-axios";
 | 
				
			||||||
import qs from "querystring";
 | 
					import qs from "querystring-es3";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
export default {
 | 
					export default {
 | 
				
			||||||
  namespaced: true,
 | 
					  namespaced: true,
 | 
				
			||||||
@@ -90,7 +90,7 @@ export default {
 | 
				
			|||||||
  // actions
 | 
					  // actions
 | 
				
			||||||
  actions: {
 | 
					  actions: {
 | 
				
			||||||
    userRegister({ dispatch, commit, state }, credentials) {
 | 
					    userRegister({ dispatch, commit, state }, credentials) {
 | 
				
			||||||
      return new Promise((resolve, reject) => {
 | 
					      return new Promise((resolve) => {
 | 
				
			||||||
        REST.get("/session/token").then(({ token }) => {
 | 
					        REST.get("/session/token").then(({ token }) => {
 | 
				
			||||||
          commit("SetCsrftoken", token);
 | 
					          commit("SetCsrftoken", token);
 | 
				
			||||||
          REST.post("/user/register?_format=json", credentials, {
 | 
					          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) => {
 | 
					      return new Promise((resolve, reject) => {
 | 
				
			||||||
        dispatch("getToken", credentials).then(() => {
 | 
					        dispatch("getToken", credentials).then(() => {
 | 
				
			||||||
          dispatch("getUser").then(userdata => {
 | 
					          dispatch("getUser").then(userdata => {
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user