Преглед изворни кода

fixed login redirect to base only for adherents

bach пре 3 година
родитељ
комит
8ff1cfb3ad

Разлика између датотеке није приказан због своје велике величине
+ 40 - 2
web/themes/custom/materiotheme/assets/dist/main.css


Разлика између датотеке није приказан због своје велике величине
+ 0 - 1
web/themes/custom/materiotheme/assets/dist/main.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
web/themes/custom/materiotheme/assets/dist/print.css


+ 69 - 0
web/themes/custom/materiotheme/assets/dist/print.js

@@ -0,0 +1,69 @@
+/*
+ * ATTENTION: The "eval" devtool has been used (maybe by default in mode: "development").
+ * This devtool is not neither made for production nor for readable output files.
+ * It uses "eval()" calls to create a separate source file in the browser devtools.
+ * If you are trying to read the output file, select a different devtool (https://webpack.js.org/configuration/devtool/)
+ * or disable the default devtool with "devtool: false".
+ * If you are looking for production-ready output files, see mode: "production" (https://webpack.js.org/configuration/mode/).
+ */
+/******/ (() => { // webpackBootstrap
+/******/ 	"use strict";
+/******/ 	var __webpack_modules__ = ({
+
+/***/ "./web/themes/custom/materiotheme/assets/styles/print.scss":
+/*!*****************************************************************!*\
+  !*** ./web/themes/custom/materiotheme/assets/styles/print.scss ***!
+  \*****************************************************************/
+/*! namespace exports */
+/*! exports [not provided] [no usage info] */
+/*! runtime requirements: __webpack_require__.r, __webpack_exports__, __webpack_require__.* */
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+eval("__webpack_require__.r(__webpack_exports__);\n// extracted by mini-css-extract-plugin\n\n\n//# sourceURL=webpack://materio.com/./web/themes/custom/materiotheme/assets/styles/print.scss?");
+
+/***/ })
+
+/******/ 	});
+/************************************************************************/
+/******/ 	// The module cache
+/******/ 	var __webpack_module_cache__ = {};
+/******/ 	
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+/******/ 		// Check if module is in cache
+/******/ 		if(__webpack_module_cache__[moduleId]) {
+/******/ 			return __webpack_module_cache__[moduleId].exports;
+/******/ 		}
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = __webpack_module_cache__[moduleId] = {
+/******/ 			// no module.id needed
+/******/ 			// no module.loaded needed
+/******/ 			exports: {}
+/******/ 		};
+/******/ 	
+/******/ 		// Execute the module function
+/******/ 		__webpack_modules__[moduleId](module, module.exports, __webpack_require__);
+/******/ 	
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+/******/ 	
+/************************************************************************/
+/******/ 	/* webpack/runtime/make namespace object */
+/******/ 	(() => {
+/******/ 		// define __esModule on exports
+/******/ 		__webpack_require__.r = (exports) => {
+/******/ 			if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 				Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 			}
+/******/ 			Object.defineProperty(exports, '__esModule', { value: true });
+/******/ 		};
+/******/ 	})();
+/******/ 	
+/************************************************************************/
+/******/ 	// startup
+/******/ 	// Load entry module
+/******/ 	__webpack_require__("./web/themes/custom/materiotheme/assets/styles/print.scss");
+/******/ 	// This entry module used 'exports' so it can't be inlined
+/******/ })()
+;

+ 9 - 6
web/themes/custom/materiotheme/vuejs/components/Block/LoginBlock.vue

@@ -18,6 +18,7 @@ export default {
   computed: {
     ...mapState({
       loginMessage: state => state.User.loginMessage,
+      // roles: state => state.User.roles,
     })
   },
   methods: {
@@ -29,13 +30,15 @@ export default {
       this.userLogin({
         mail: this.mail,
         pass: this.password
-      }).then(() => {
-        console.log('LoginBlock user logged-in')
-        this.openCloseHamMenu(false)
-        this.$router.push({
-          name: 'base'
-        })
       })
+      // moved to user.js store
+      // .then(() => {
+      //   console.log('LoginBlock user logged-in')
+      //   this.openCloseHamMenu(false)
+      //   this.$router.push({
+      //     name: 'base'
+      //   })
+      // })
     }
   },
   beforeMount() {

+ 6 - 0
web/themes/custom/materiotheme/vuejs/store/modules/user.js

@@ -182,6 +182,12 @@ export default {
                 if (state.isAdmin) {
                   window.location.reload(true)
                 }
+                if(state.isAdherent){
+                  this.$router.push({
+                    name: 'base'
+                  })
+                }
+                // this.openCloseHamMenu(false)
                 resolve()
               })
             } else {

Неке датотеке нису приказане због велике количине промена