diff --git a/Step/wwwroot/assets/styles/base/header.less b/Step/wwwroot/assets/styles/base/header.less index 065bbaca..6a3a042c 100644 --- a/Step/wwwroot/assets/styles/base/header.less +++ b/Step/wwwroot/assets/styles/base/header.less @@ -39,6 +39,11 @@ color: white; } + button.dark-blue{ + background-color: @color-darkish-blue; + color: white; + } + .user-info{ display: flex; position: absolute; diff --git a/Step/wwwroot/assets/styles/style.css b/Step/wwwroot/assets/styles/style.css index 80951243..4b55694a 100644 --- a/Step/wwwroot/assets/styles/style.css +++ b/Step/wwwroot/assets/styles/style.css @@ -246,6 +246,10 @@ button.btn.btn-success:active { background-color: #1791ff; color: white; } +#app > header button.dark-blue { + background-color: #002680; + color: white; +} #app > header .user-info { display: flex; position: absolute; diff --git a/Step/wwwroot/dist/build.js b/Step/wwwroot/dist/build.js index e32daf1d..90ff574f 100644 --- a/Step/wwwroot/dist/build.js +++ b/Step/wwwroot/dist/build.js @@ -2642,7 +2642,7 @@ eval("/**\n * Translates the list format produced by css-loader into something\n /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; -eval("/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_vue__ = __webpack_require__(30);\n/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_vue_class_component__ = __webpack_require__(50);\n/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_vue_class_component___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_1_vue_class_component__);\n/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__base_components__ = __webpack_require__(98);\n/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__base_components___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_2__base_components__);\n/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__base_factoryService__ = __webpack_require__(97);\n/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__base_factoryService___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_3__base_factoryService__);\n/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__app_modules__ = __webpack_require__(69);\n/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__app_modules___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_4__app_modules__);\nvar __extends = (this && this.__extends) || (function () {\r\n var extendStatics = Object.setPrototypeOf ||\r\n ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||\r\n function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };\r\n return function (d, b) {\r\n extendStatics(d, b);\r\n function __() { this.constructor = d; }\r\n d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());\r\n };\r\n})();\r\nvar __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {\r\n var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;\r\n if (typeof Reflect === \"object\" && typeof Reflect.decorate === \"function\") r = Reflect.decorate(decorators, target, key, desc);\r\n else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;\r\n return c > 3 && r && Object.defineProperty(target, key, r), r;\r\n};\r\nvar __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {\r\n return new (P || (P = Promise))(function (resolve, reject) {\r\n function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }\r\n function rejected(value) { try { step(generator[\"throw\"](value)); } catch (e) { reject(e); } }\r\n function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }\r\n step((generator = generator.apply(thisArg, _arguments || [])).next());\r\n });\r\n};\r\nvar __generator = (this && this.__generator) || function (thisArg, body) {\r\n var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;\r\n return g = { next: verb(0), \"throw\": verb(1), \"return\": verb(2) }, typeof Symbol === \"function\" && (g[Symbol.iterator] = function() { return this; }), g;\r\n function verb(n) { return function (v) { return step([n, v]); }; }\r\n function step(op) {\r\n if (f) throw new TypeError(\"Generator is already executing.\");\r\n while (_) try {\r\n if (f = 1, y && (t = y[op[0] & 2 ? \"return\" : op[0] ? \"throw\" : \"next\"]) && !(t = t.call(y, op[1])).done) return t;\r\n if (y = 0, t) op = [0, t.value];\r\n switch (op[0]) {\r\n case 0: case 1: t = op; break;\r\n case 4: _.label++; return { value: op[1], done: false };\r\n case 5: _.label++; y = op[1]; op = [0]; continue;\r\n case 7: op = _.ops.pop(); _.trys.pop(); continue;\r\n default:\r\n if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }\r\n if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }\r\n if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }\r\n if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }\r\n if (t[2]) _.ops.pop();\r\n _.trys.pop(); continue;\r\n }\r\n op = body.call(thisArg, _);\r\n } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }\r\n if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };\r\n }\r\n};\r\n\r\n\r\n\r\n\r\n\r\nvar Login = /** @class */ (function (_super) {\r\n __extends(Login, _super);\r\n function Login() {\r\n var _this = _super !== null && _super.apply(this, arguments) || this;\r\n _this.user = { password: null, username: null };\r\n _this.hasError = false;\r\n _this.isVisible = true;\r\n return _this;\r\n }\r\n Login.prototype.doLogin = function () {\r\n return __awaiter(this, void 0, void 0, function () {\r\n var service;\r\n return __generator(this, function (_a) {\r\n switch (_a.label) {\r\n case 0:\r\n service = __WEBPACK_IMPORTED_MODULE_3__base_factoryService___default.a.Get(__WEBPACK_IMPORTED_MODULE_4__app_modules__[\"LoginService\"]);\r\n return [4 /*yield*/, service.doLogin(this.user)];\r\n case 1:\r\n _a.sent();\r\n this.hasError = !service.isAuthenticated;\r\n this.isVisible = !service.isAuthenticated;\r\n return [2 /*return*/];\r\n }\r\n });\r\n });\r\n };\r\n Login = __decorate([\r\n __WEBPACK_IMPORTED_MODULE_1_vue_class_component___default()({ name: \"login\", components: { modal: __WEBPACK_IMPORTED_MODULE_2__base_components__[\"Modal\"] } })\r\n ], Login);\r\n return Login;\r\n}(__WEBPACK_IMPORTED_MODULE_0_vue__[\"default\"]));\r\n/* harmony default export */ __webpack_exports__[\"a\"] = (Login);\r\n//# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMzkxLmpzIiwic291cmNlcyI6WyJ3ZWJwYWNrOi8vLy4vc3JjL21vZHVsZXMvbG9naW4udHM/M2EwMCJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgVnVlIGZyb20gXCJ2dWVcIjtcbmltcG9ydCBDb21wb25lbnQgZnJvbSBcInZ1ZS1jbGFzcy1jb21wb25lbnRcIjtcbmltcG9ydCB7IE1vZGFsIH0gZnJvbSBcIi4vYmFzZS1jb21wb25lbnRzXCJcblxuaW1wb3J0IEZhY3RvcnkgZnJvbSBcIi4uL19iYXNlL2ZhY3RvcnlTZXJ2aWNlXCI7XG5pbXBvcnQgeyBMb2dpblNlcnZpY2UgfSBmcm9tIFwiLi4vYXBwLm1vZHVsZXNcIjtcblxuXG5AQ29tcG9uZW50KHsgbmFtZTogXCJsb2dpblwiLCBjb21wb25lbnRzOiB7IG1vZGFsOiBNb2RhbCB9IH0pXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBMb2dpbiBleHRlbmRzIFZ1ZSB7XG5cbiAgcHVibGljIHVzZXI6IHNlcnZlci5sb2dpblZpZXdNb2RlbCA9IHsgcGFzc3dvcmQ6IG51bGwsIHVzZXJuYW1lOiBudWxsfTtcbiAgcHVibGljIGhhc0Vycm9yOiBib29sZWFuID0gZmFsc2U7XG4gIHB1YmxpYyBpc1Zpc2libGU6IGJvb2xlYW4gPSB0cnVlO1xuXG4gIGFzeW5jIGRvTG9naW4oKSB7XG4gICAgdmFyIHNlcnZpY2UgPSBGYWN0b3J5LkdldChMb2dpblNlcnZpY2UpO1xuICAgIGF3YWl0IHNlcnZpY2UuZG9Mb2dpbih0aGlzLnVzZXIpO1xuXG4gICAgdGhpcy5oYXNFcnJvciA9ICFzZXJ2aWNlLmlzQXV0aGVudGljYXRlZDtcbiAgICB0aGlzLmlzVmlzaWJsZSA9ICFzZXJ2aWNlLmlzQXV0aGVudGljYXRlZDtcblxuICB9XG59XG5cblxuXG4vLyBXRUJQQUNLIEZPT1RFUiAvL1xuLy8gLi9zcmMvbW9kdWxlcy9sb2dpbi50cyJdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUE7QUFDQTtBQUNBO0FBRUE7QUFDQTtBQUlBO0FBQUE7QUFEQTtBQUFBO0FBR0E7QUFDQTtBQUNBOztBQVVBO0FBUkE7Ozs7OztBQUNBO0FBQ0E7O0FBQUE7QUFFQTtBQUNBOzs7OztBQUVBO0FBYkE7QUFEQTtBQUNBO0FBY0E7QUFBQTtBQWRBOyIsInNvdXJjZVJvb3QiOiIifQ==\n//# sourceURL=webpack-internal:///391\n"); +eval("/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_vue__ = __webpack_require__(30);\n/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_vue_class_component__ = __webpack_require__(50);\n/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_vue_class_component___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_1_vue_class_component__);\n/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__base_components__ = __webpack_require__(98);\n/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__base_components___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_2__base_components__);\nvar __extends = (this && this.__extends) || (function () {\r\n var extendStatics = Object.setPrototypeOf ||\r\n ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||\r\n function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };\r\n return function (d, b) {\r\n extendStatics(d, b);\r\n function __() { this.constructor = d; }\r\n d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());\r\n };\r\n})();\r\nvar __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {\r\n var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;\r\n if (typeof Reflect === \"object\" && typeof Reflect.decorate === \"function\") r = Reflect.decorate(decorators, target, key, desc);\r\n else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;\r\n return c > 3 && r && Object.defineProperty(target, key, r), r;\r\n};\r\nvar __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {\r\n return new (P || (P = Promise))(function (resolve, reject) {\r\n function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }\r\n function rejected(value) { try { step(generator[\"throw\"](value)); } catch (e) { reject(e); } }\r\n function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }\r\n step((generator = generator.apply(thisArg, _arguments || [])).next());\r\n });\r\n};\r\nvar __generator = (this && this.__generator) || function (thisArg, body) {\r\n var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;\r\n return g = { next: verb(0), \"throw\": verb(1), \"return\": verb(2) }, typeof Symbol === \"function\" && (g[Symbol.iterator] = function() { return this; }), g;\r\n function verb(n) { return function (v) { return step([n, v]); }; }\r\n function step(op) {\r\n if (f) throw new TypeError(\"Generator is already executing.\");\r\n while (_) try {\r\n if (f = 1, y && (t = y[op[0] & 2 ? \"return\" : op[0] ? \"throw\" : \"next\"]) && !(t = t.call(y, op[1])).done) return t;\r\n if (y = 0, t) op = [0, t.value];\r\n switch (op[0]) {\r\n case 0: case 1: t = op; break;\r\n case 4: _.label++; return { value: op[1], done: false };\r\n case 5: _.label++; y = op[1]; op = [0]; continue;\r\n case 7: op = _.ops.pop(); _.trys.pop(); continue;\r\n default:\r\n if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }\r\n if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }\r\n if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }\r\n if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }\r\n if (t[2]) _.ops.pop();\r\n _.trys.pop(); continue;\r\n }\r\n op = body.call(thisArg, _);\r\n } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }\r\n if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };\r\n }\r\n};\r\n\r\n\r\n\r\nvar Login = /** @class */ (function (_super) {\r\n __extends(Login, _super);\r\n function Login() {\r\n var _this = _super !== null && _super.apply(this, arguments) || this;\r\n _this.user = { password: null, username: null };\r\n _this.hasError = false;\r\n _this.isVisible = true;\r\n return _this;\r\n }\r\n Login.prototype.doLogin = function () {\r\n return __awaiter(this, void 0, void 0, function () {\r\n return __generator(this, function (_a) {\r\n this.isVisible = false;\r\n return [2 /*return*/];\r\n });\r\n });\r\n };\r\n Login = __decorate([\r\n __WEBPACK_IMPORTED_MODULE_1_vue_class_component___default()({ name: \"login\", components: { modal: __WEBPACK_IMPORTED_MODULE_2__base_components__[\"Modal\"] } })\r\n ], Login);\r\n return Login;\r\n}(__WEBPACK_IMPORTED_MODULE_0_vue__[\"default\"]));\r\n/* harmony default export */ __webpack_exports__[\"a\"] = (Login);\r\n//# sourceURL=[module]\n//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMzkxLmpzIiwic291cmNlcyI6WyJ3ZWJwYWNrOi8vLy4vc3JjL21vZHVsZXMvbG9naW4udHM/M2EwMCJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgVnVlIGZyb20gXCJ2dWVcIjtcbmltcG9ydCBDb21wb25lbnQgZnJvbSBcInZ1ZS1jbGFzcy1jb21wb25lbnRcIjtcbmltcG9ydCB7IE1vZGFsIH0gZnJvbSBcIi4vYmFzZS1jb21wb25lbnRzXCJcblxuaW1wb3J0IEZhY3RvcnkgZnJvbSBcIi4uL19iYXNlL2ZhY3RvcnlTZXJ2aWNlXCI7XG5pbXBvcnQgeyBMb2dpblNlcnZpY2UgfSBmcm9tIFwiLi4vYXBwLm1vZHVsZXNcIjtcblxuXG5AQ29tcG9uZW50KHsgbmFtZTogXCJsb2dpblwiLCBjb21wb25lbnRzOiB7IG1vZGFsOiBNb2RhbCB9IH0pXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBMb2dpbiBleHRlbmRzIFZ1ZSB7XG5cbiAgcHVibGljIHVzZXI6IHNlcnZlci5sb2dpblZpZXdNb2RlbCA9IHsgcGFzc3dvcmQ6IG51bGwsIHVzZXJuYW1lOiBudWxsfTtcbiAgcHVibGljIGhhc0Vycm9yOiBib29sZWFuID0gZmFsc2U7XG4gIHB1YmxpYyBpc1Zpc2libGU6IGJvb2xlYW4gPSB0cnVlO1xuXG4gIGFzeW5jIGRvTG9naW4oKSB7XG5cbiAgICB0aGlzLmlzVmlzaWJsZSA9IGZhbHNlO1xuXG4gICAgLy8gdmFyIHNlcnZpY2UgPSBGYWN0b3J5LkdldChMb2dpblNlcnZpY2UpO1xuICAgIC8vIGF3YWl0IHNlcnZpY2UuZG9Mb2dpbih0aGlzLnVzZXIpO1xuXG4gICAgLy8gdGhpcy5oYXNFcnJvciA9ICFzZXJ2aWNlLmlzQXV0aGVudGljYXRlZDtcbiAgICAvLyB0aGlzLmlzVmlzaWJsZSA9ICFzZXJ2aWNlLmlzQXV0aGVudGljYXRlZDtcblxuICB9XG59XG5cblxuXG4vLyBXRUJQQUNLIEZPT1RFUiAvL1xuLy8gLi9zcmMvbW9kdWxlcy9sb2dpbi50cyJdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQTtBQUNBO0FBQ0E7QUFPQTtBQUFBO0FBREE7QUFBQTtBQUdBO0FBQ0E7QUFDQTs7QUFhQTtBQVhBOzs7QUFFQTs7OztBQVFBO0FBaEJBO0FBREE7QUFDQTtBQWlCQTtBQUFBO0FBakJBOyIsInNvdXJjZVJvb3QiOiIifQ==\n//# sourceURL=webpack-internal:///391\n"); /***/ }), /* 392 */ diff --git a/Step/wwwroot/src/modules/base-components/user-info.vue b/Step/wwwroot/src/modules/base-components/user-info.vue index c743709c..28c729f6 100644 --- a/Step/wwwroot/src/modules/base-components/user-info.vue +++ b/Step/wwwroot/src/modules/base-components/user-info.vue @@ -1,5 +1,6 @@