fixed login redirect to base only for adherents
This commit is contained in:
21095
web/themes/custom/materiotheme/assets/dist/main.css
vendored
21095
web/themes/custom/materiotheme/assets/dist/main.css
vendored
File diff suppressed because one or more lines are too long
20948
web/themes/custom/materiotheme/assets/dist/main.js
vendored
20948
web/themes/custom/materiotheme/assets/dist/main.js
vendored
File diff suppressed because one or more lines are too long
@@ -1,2 +1,73 @@
|
|||||||
body{font-size:16px;font-family:"Ubuntu",Arial,"MS Trebuchet",sans-serif;font-weight:500;font-style:normal;line-height:1.3}body{margin:0;padding:0}#printable-root-page{box-sizing:border-box;width:21cm;padding:1cm .5cm 2cm}#printable-root-page>header{display:flex;flex-flow:nowrap;align-items:baseline}#printable-root-page>header h1{margin:0;font-weight:600}#printable-root-page>article{padding-top:1em}#printable-root-page>article>h2{font-weight:600;margin:0}#printable-root-page>article .field--name-field-reference{margin:0 0 1em 0}#printable-root-page>article .field--name-body,#printable-root-page>article .field--name-field-samples{display:inline-block;vertical-align:top}#printable-root-page>article .field--name-body{width:75%}#printable-root-page>article .field--name-body p{margin:0}#printable-root-page>article .field__label{font-size:0.756em;font-weight:700}#printable-root-page>article .field--name-field-samples{width:23%;text-align:right}#printable-root-page>article .field--name-field-samples .field__item{font-size:0.756em}#printable-root-page>article .field--name-field-manufacturer,#printable-root-page>article .field--name-field-distributor{margin-top:1em;display:inline-block;vertical-align:top;width:49%}#printable-root-page>article .field--name-field-manufacturer .taxonomy-term,#printable-root-page>article .field--name-field-distributor .taxonomy-term{padding-bottom:0.5em}#printable-root-page>article .field--name-field-manufacturer .taxonomy-term>h2,#printable-root-page>article .field--name-field-distributor .taxonomy-term>h2{margin:0;font-weight:600;font-size:1em}#printable-root-page>article .field--name-field-manufacturer .taxonomy-term p,#printable-root-page>article .field--name-field-distributor .taxonomy-term p{margin:0}#printable-root-page>article .field--name-field-materiau-images{margin-top:1em;display:flex;flex-flow:row wrap;justify-content:space-between}#printable-root-page>article .field--name-field-materiau-images .field__item{flex:0 0 33%}#printable-root-page>article .field--name-field-materiau-images .field__item img{width:100%;height:auto}
|
body {
|
||||||
|
font-size: 16px;
|
||||||
|
font-family: "Ubuntu",Arial,"MS Trebuchet",sans-serif;
|
||||||
|
font-weight: 500;
|
||||||
|
font-style: normal;
|
||||||
|
line-height: 1.3; }
|
||||||
|
|
||||||
|
body {
|
||||||
|
margin: 0;
|
||||||
|
padding: 0; }
|
||||||
|
|
||||||
|
#printable-root-page {
|
||||||
|
box-sizing: border-box;
|
||||||
|
width: 21cm;
|
||||||
|
padding: 1cm .5cm 2cm; }
|
||||||
|
#printable-root-page > header {
|
||||||
|
display: flex;
|
||||||
|
flex-flow: nowrap;
|
||||||
|
align-items: baseline; }
|
||||||
|
#printable-root-page > header h1 {
|
||||||
|
margin: 0;
|
||||||
|
font-weight: 600; }
|
||||||
|
#printable-root-page > article {
|
||||||
|
padding-top: 1em; }
|
||||||
|
#printable-root-page > article > h2 {
|
||||||
|
font-weight: 600;
|
||||||
|
margin: 0; }
|
||||||
|
#printable-root-page > article .field--name-field-reference {
|
||||||
|
margin: 0 0 1em 0; }
|
||||||
|
#printable-root-page > article .field--name-body,
|
||||||
|
#printable-root-page > article .field--name-field-samples {
|
||||||
|
display: inline-block;
|
||||||
|
vertical-align: top; }
|
||||||
|
#printable-root-page > article .field--name-body {
|
||||||
|
width: 75%; }
|
||||||
|
#printable-root-page > article .field--name-body p {
|
||||||
|
margin: 0; }
|
||||||
|
#printable-root-page > article .field__label {
|
||||||
|
font-size: 0.756em;
|
||||||
|
font-weight: 700; }
|
||||||
|
#printable-root-page > article .field--name-field-samples {
|
||||||
|
width: 23%;
|
||||||
|
text-align: right; }
|
||||||
|
#printable-root-page > article .field--name-field-samples .field__item {
|
||||||
|
font-size: 0.756em; }
|
||||||
|
#printable-root-page > article .field--name-field-manufacturer,
|
||||||
|
#printable-root-page > article .field--name-field-distributor {
|
||||||
|
margin-top: 1em;
|
||||||
|
display: inline-block;
|
||||||
|
vertical-align: top;
|
||||||
|
width: 49%; }
|
||||||
|
#printable-root-page > article .field--name-field-manufacturer .taxonomy-term,
|
||||||
|
#printable-root-page > article .field--name-field-distributor .taxonomy-term {
|
||||||
|
padding-bottom: 0.5em; }
|
||||||
|
#printable-root-page > article .field--name-field-manufacturer .taxonomy-term > h2,
|
||||||
|
#printable-root-page > article .field--name-field-distributor .taxonomy-term > h2 {
|
||||||
|
margin: 0;
|
||||||
|
font-weight: 600;
|
||||||
|
font-size: 1em; }
|
||||||
|
#printable-root-page > article .field--name-field-manufacturer .taxonomy-term p,
|
||||||
|
#printable-root-page > article .field--name-field-distributor .taxonomy-term p {
|
||||||
|
margin: 0; }
|
||||||
|
#printable-root-page > article .field--name-field-materiau-images {
|
||||||
|
margin-top: 1em;
|
||||||
|
display: flex;
|
||||||
|
flex-flow: row wrap;
|
||||||
|
justify-content: space-between; }
|
||||||
|
#printable-root-page > article .field--name-field-materiau-images .field__item {
|
||||||
|
flex: 0 0 33%; }
|
||||||
|
#printable-root-page > article .field--name-field-materiau-images .field__item img {
|
||||||
|
width: 100%;
|
||||||
|
height: auto; }
|
||||||
|
|
||||||
|
|||||||
@@ -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
|
||||||
|
/******/ })()
|
||||||
|
;
|
||||||
@@ -18,6 +18,7 @@ export default {
|
|||||||
computed: {
|
computed: {
|
||||||
...mapState({
|
...mapState({
|
||||||
loginMessage: state => state.User.loginMessage,
|
loginMessage: state => state.User.loginMessage,
|
||||||
|
// roles: state => state.User.roles,
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
@@ -29,13 +30,15 @@ export default {
|
|||||||
this.userLogin({
|
this.userLogin({
|
||||||
mail: this.mail,
|
mail: this.mail,
|
||||||
pass: this.password
|
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() {
|
beforeMount() {
|
||||||
|
|||||||
@@ -182,6 +182,12 @@ export default {
|
|||||||
if (state.isAdmin) {
|
if (state.isAdmin) {
|
||||||
window.location.reload(true)
|
window.location.reload(true)
|
||||||
}
|
}
|
||||||
|
if(state.isAdherent){
|
||||||
|
this.$router.push({
|
||||||
|
name: 'base'
|
||||||
|
})
|
||||||
|
}
|
||||||
|
// this.openCloseHamMenu(false)
|
||||||
resolve()
|
resolve()
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Reference in New Issue
Block a user