Compare commits
14 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 4e6eaae79f | |||
| 469072b5f1 | |||
| f0226a68ac | |||
| 3839f21b63 | |||
| 60d5a74ba9 | |||
| 6d43bb7434 | |||
| a38221d276 | |||
| 3ec3dd9dc2 | |||
| d2edb6cca0 | |||
| 313025c9db | |||
| e78ecfaf40 | |||
| afa00972b8 | |||
| c5b7be9bbf | |||
| 6113b7bb40 |
@@ -1,4 +1,16 @@
|
|||||||
{
|
{
|
||||||
"extends": "standard",
|
"extends": ["plugin:vue/recommended"],
|
||||||
"plugins": ["html"]
|
"rules": {
|
||||||
}
|
"no-new":0
|
||||||
|
},
|
||||||
|
"parserOptions": {
|
||||||
|
"parser": "babel-eslint",
|
||||||
|
"ecmaVersion": 2017,
|
||||||
|
"sourceType": "module"
|
||||||
|
},
|
||||||
|
"env": {
|
||||||
|
"node": true,
|
||||||
|
"es6": true
|
||||||
|
},
|
||||||
|
"plugins" : ["vue" ,"pug"]
|
||||||
|
}
|
||||||
+2
-2
File diff suppressed because one or more lines are too long
Vendored
+1
-1
@@ -1 +1 @@
|
|||||||
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><title>PC Puma</title><link href=/css/app.1e573269.css rel=preload as=style><link href=/css/chunk-vendors.3c3429cd.css rel=preload as=style><link href=/js/app.ec36c8d6.js rel=preload as=script><link href=/js/chunk-vendors.0df2aad7.js rel=preload as=script><link href=/css/chunk-vendors.3c3429cd.css rel=stylesheet><link href=/css/app.1e573269.css rel=stylesheet></head><body><noscript><strong>We're sorry but pcpuma-front doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.0df2aad7.js></script><script src=/js/app.ec36c8d6.js></script></body></html>
|
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><title>PC Puma</title><link href=/css/app.c3f538f1.css rel=preload as=style><link href=/css/chunk-vendors.3c3429cd.css rel=preload as=style><link href=/js/app.bd269eaf.js rel=preload as=script><link href=/js/chunk-vendors.e50360cf.js rel=preload as=script><link href=/css/chunk-vendors.3c3429cd.css rel=stylesheet><link href=/css/app.c3f538f1.css rel=stylesheet></head><body><noscript><strong>We're sorry but pcpuma-front doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.e50360cf.js></script><script src=/js/app.bd269eaf.js></script></body></html>
|
||||||
Vendored
+2
File diff suppressed because one or more lines are too long
Vendored
+1
File diff suppressed because one or more lines are too long
Vendored
-2
File diff suppressed because one or more lines are too long
Vendored
-1
File diff suppressed because one or more lines are too long
-1
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+1
File diff suppressed because one or more lines are too long
Generated
+345
-102
@@ -1704,6 +1704,12 @@
|
|||||||
"integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
|
"integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
|
"astral-regex": {
|
||||||
|
"version": "1.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
|
||||||
|
"integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
|
||||||
|
"dev": true
|
||||||
|
},
|
||||||
"async": {
|
"async": {
|
||||||
"version": "1.5.2",
|
"version": "1.5.2",
|
||||||
"resolved": "http://registry.npmjs.org/async/-/async-1.5.2.tgz",
|
"resolved": "http://registry.npmjs.org/async/-/async-1.5.2.tgz",
|
||||||
@@ -3740,12 +3746,6 @@
|
|||||||
"is-obj": "^1.0.0"
|
"is-obj": "^1.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"dotenv": {
|
|
||||||
"version": "7.0.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-7.0.0.tgz",
|
|
||||||
"integrity": "sha512-M3NhsLbV1i6HuGzBUH8vXrtxOk+tWmzWKDMbAVSUp3Zsjm7ywFeuwrUXhmhQyRK1q5B5GGy7hcXPbj3bnfZg2g==",
|
|
||||||
"dev": true
|
|
||||||
},
|
|
||||||
"duplexer": {
|
"duplexer": {
|
||||||
"version": "0.1.1",
|
"version": "0.1.1",
|
||||||
"resolved": "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
|
"resolved": "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
|
||||||
@@ -3813,6 +3813,12 @@
|
|||||||
"minimalistic-crypto-utils": "^1.0.0"
|
"minimalistic-crypto-utils": "^1.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"emoji-regex": {
|
||||||
|
"version": "7.0.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
|
||||||
|
"integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
|
||||||
|
"dev": true
|
||||||
|
},
|
||||||
"emojis-list": {
|
"emojis-list": {
|
||||||
"version": "2.1.0",
|
"version": "2.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
|
||||||
@@ -3920,67 +3926,65 @@
|
|||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"eslint": {
|
"eslint": {
|
||||||
"version": "5.8.0",
|
"version": "5.16.0",
|
||||||
"resolved": "https://registry.npmjs.org/eslint/-/eslint-5.8.0.tgz",
|
"resolved": "https://registry.npmjs.org/eslint/-/eslint-5.16.0.tgz",
|
||||||
"integrity": "sha512-Zok6Bru3y2JprqTNm14mgQ15YQu/SMDkWdnmHfFg770DIUlmMFd/gqqzCHekxzjHZJxXv3tmTpH0C1icaYJsRQ==",
|
"integrity": "sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"@babel/code-frame": "^7.0.0",
|
"@babel/code-frame": "^7.0.0",
|
||||||
"ajv": "^6.5.3",
|
"ajv": "^6.9.1",
|
||||||
"chalk": "^2.1.0",
|
"chalk": "^2.1.0",
|
||||||
"cross-spawn": "^6.0.5",
|
"cross-spawn": "^6.0.5",
|
||||||
"debug": "^4.0.1",
|
"debug": "^4.0.1",
|
||||||
"doctrine": "^2.1.0",
|
"doctrine": "^3.0.0",
|
||||||
"eslint-scope": "^4.0.0",
|
"eslint-scope": "^4.0.3",
|
||||||
"eslint-utils": "^1.3.1",
|
"eslint-utils": "^1.3.1",
|
||||||
"eslint-visitor-keys": "^1.0.0",
|
"eslint-visitor-keys": "^1.0.0",
|
||||||
"espree": "^4.0.0",
|
"espree": "^5.0.1",
|
||||||
"esquery": "^1.0.1",
|
"esquery": "^1.0.1",
|
||||||
"esutils": "^2.0.2",
|
"esutils": "^2.0.2",
|
||||||
"file-entry-cache": "^2.0.0",
|
"file-entry-cache": "^5.0.1",
|
||||||
"functional-red-black-tree": "^1.0.1",
|
"functional-red-black-tree": "^1.0.1",
|
||||||
"glob": "^7.1.2",
|
"glob": "^7.1.2",
|
||||||
"globals": "^11.7.0",
|
"globals": "^11.7.0",
|
||||||
"ignore": "^4.0.6",
|
"ignore": "^4.0.6",
|
||||||
|
"import-fresh": "^3.0.0",
|
||||||
"imurmurhash": "^0.1.4",
|
"imurmurhash": "^0.1.4",
|
||||||
"inquirer": "^6.1.0",
|
"inquirer": "^6.2.2",
|
||||||
"is-resolvable": "^1.1.0",
|
"js-yaml": "^3.13.0",
|
||||||
"js-yaml": "^3.12.0",
|
|
||||||
"json-stable-stringify-without-jsonify": "^1.0.1",
|
"json-stable-stringify-without-jsonify": "^1.0.1",
|
||||||
"levn": "^0.3.0",
|
"levn": "^0.3.0",
|
||||||
"lodash": "^4.17.5",
|
"lodash": "^4.17.11",
|
||||||
"minimatch": "^3.0.4",
|
"minimatch": "^3.0.4",
|
||||||
"mkdirp": "^0.5.1",
|
"mkdirp": "^0.5.1",
|
||||||
"natural-compare": "^1.4.0",
|
"natural-compare": "^1.4.0",
|
||||||
"optionator": "^0.8.2",
|
"optionator": "^0.8.2",
|
||||||
"path-is-inside": "^1.0.2",
|
"path-is-inside": "^1.0.2",
|
||||||
"pluralize": "^7.0.0",
|
|
||||||
"progress": "^2.0.0",
|
"progress": "^2.0.0",
|
||||||
"regexpp": "^2.0.1",
|
"regexpp": "^2.0.1",
|
||||||
"require-uncached": "^1.0.3",
|
|
||||||
"semver": "^5.5.1",
|
"semver": "^5.5.1",
|
||||||
"strip-ansi": "^4.0.0",
|
"strip-ansi": "^4.0.0",
|
||||||
"strip-json-comments": "^2.0.1",
|
"strip-json-comments": "^2.0.1",
|
||||||
"table": "^5.0.2",
|
"table": "^5.2.3",
|
||||||
"text-table": "^0.2.0"
|
"text-table": "^0.2.0"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"acorn": {
|
"acorn": {
|
||||||
"version": "6.0.2",
|
"version": "6.2.1",
|
||||||
"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.0.2.tgz",
|
"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.2.1.tgz",
|
||||||
"integrity": "sha512-GXmKIvbrN3TV7aVqAzVFaMW8F8wzVX7voEBRO3bDA64+EX37YSayggRJP5Xig6HYHBkWKpFg9W5gg6orklubhg==",
|
"integrity": "sha512-JD0xT5FCRDNyjDda3Lrg/IxFscp9q4tiYtxE1/nOzlKCk7hIRuYjhq1kCNkbPjMRMZuFq20HNQn1I9k8Oj0E+Q==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"acorn-jsx": {
|
"acorn-jsx": {
|
||||||
"version": "5.0.0",
|
"version": "5.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.1.tgz",
|
||||||
"integrity": "sha512-XkB50fn0MURDyww9+UYL3c1yLbOBz0ZFvrdYlGB8l+Ije1oSC75qAqrzSPjYQbdnQUzhlUGNKuesryAv0gxZOg==",
|
"integrity": "sha512-HJ7CfNHrfJLlNTzIEUTj43LNWGkqpRLxm3YjAlcD0ACydk9XynzYsCBHxut+iqt+1aBXkx9UP/w/ZqMr13XIzg==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"ajv": {
|
"ajv": {
|
||||||
"version": "6.5.4",
|
"version": "6.10.2",
|
||||||
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.4.tgz",
|
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
|
||||||
"integrity": "sha512-4Wyjt8+t6YszqaXnLDfMmG/8AlO5Zbcsy3ATHncCzjW/NoPzAId8AK6749Ybjmdt+kUY1gP60fCu46oDxPv/mg==",
|
"integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"fast-deep-equal": "^2.0.1",
|
"fast-deep-equal": "^2.0.1",
|
||||||
@@ -3989,6 +3993,18 @@
|
|||||||
"uri-js": "^4.2.2"
|
"uri-js": "^4.2.2"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"ansi-escapes": {
|
||||||
|
"version": "3.2.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
|
||||||
|
"integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
|
||||||
|
"dev": true
|
||||||
|
},
|
||||||
|
"ansi-regex": {
|
||||||
|
"version": "4.1.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
|
||||||
|
"integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
|
||||||
|
"dev": true
|
||||||
|
},
|
||||||
"chardet": {
|
"chardet": {
|
||||||
"version": "0.7.0",
|
"version": "0.7.0",
|
||||||
"resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
|
"resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
|
||||||
@@ -3996,18 +4012,27 @@
|
|||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"debug": {
|
"debug": {
|
||||||
"version": "4.1.0",
|
"version": "4.1.1",
|
||||||
"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
|
||||||
"integrity": "sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==",
|
"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"ms": "^2.1.1"
|
"ms": "^2.1.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"doctrine": {
|
||||||
|
"version": "3.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
|
||||||
|
"integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
|
||||||
|
"dev": true,
|
||||||
|
"requires": {
|
||||||
|
"esutils": "^2.0.2"
|
||||||
|
}
|
||||||
|
},
|
||||||
"eslint-scope": {
|
"eslint-scope": {
|
||||||
"version": "4.0.0",
|
"version": "4.0.3",
|
||||||
"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
|
||||||
"integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==",
|
"integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"esrecurse": "^4.1.0",
|
"esrecurse": "^4.1.0",
|
||||||
@@ -4015,20 +4040,20 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"espree": {
|
"espree": {
|
||||||
"version": "4.1.0",
|
"version": "5.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/espree/-/espree-4.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/espree/-/espree-5.0.1.tgz",
|
||||||
"integrity": "sha512-I5BycZW6FCVIub93TeVY1s7vjhP9CY6cXCznIRfiig7nRviKZYdRnj/sHEWC6A7WE9RDWOFq9+7OsWSYz8qv2w==",
|
"integrity": "sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"acorn": "^6.0.2",
|
"acorn": "^6.0.7",
|
||||||
"acorn-jsx": "^5.0.0",
|
"acorn-jsx": "^5.0.0",
|
||||||
"eslint-visitor-keys": "^1.0.0"
|
"eslint-visitor-keys": "^1.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"external-editor": {
|
"external-editor": {
|
||||||
"version": "3.0.3",
|
"version": "3.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.0.3.tgz",
|
"resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
|
||||||
"integrity": "sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==",
|
"integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"chardet": "^0.7.0",
|
"chardet": "^0.7.0",
|
||||||
@@ -4042,6 +4067,26 @@
|
|||||||
"integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
|
"integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
|
"file-entry-cache": {
|
||||||
|
"version": "5.0.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
|
||||||
|
"integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
|
||||||
|
"dev": true,
|
||||||
|
"requires": {
|
||||||
|
"flat-cache": "^2.0.1"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"flat-cache": {
|
||||||
|
"version": "2.0.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
|
||||||
|
"integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
|
||||||
|
"dev": true,
|
||||||
|
"requires": {
|
||||||
|
"flatted": "^2.0.0",
|
||||||
|
"rimraf": "2.6.3",
|
||||||
|
"write": "1.0.3"
|
||||||
|
}
|
||||||
|
},
|
||||||
"ignore": {
|
"ignore": {
|
||||||
"version": "4.0.6",
|
"version": "4.0.6",
|
||||||
"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
|
"resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
|
||||||
@@ -4049,24 +4094,62 @@
|
|||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"inquirer": {
|
"inquirer": {
|
||||||
"version": "6.2.0",
|
"version": "6.5.0",
|
||||||
"resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.2.0.tgz",
|
"resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.0.tgz",
|
||||||
"integrity": "sha512-QIEQG4YyQ2UYZGDC4srMZ7BjHOmNk1lR2JQj5UknBapklm6WHA+VVH7N+sUdX3A7NeCfGF8o4X1S3Ao7nAcIeg==",
|
"integrity": "sha512-scfHejeG/lVZSpvCXpsB4j/wQNPM5JC8kiElOI0OUTwmc1RTpXr4H32/HOlQHcZiYl2z2VElwuCVDRG8vFmbnA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"ansi-escapes": "^3.0.0",
|
"ansi-escapes": "^3.2.0",
|
||||||
"chalk": "^2.0.0",
|
"chalk": "^2.4.2",
|
||||||
"cli-cursor": "^2.1.0",
|
"cli-cursor": "^2.1.0",
|
||||||
"cli-width": "^2.0.0",
|
"cli-width": "^2.0.0",
|
||||||
"external-editor": "^3.0.0",
|
"external-editor": "^3.0.3",
|
||||||
"figures": "^2.0.0",
|
"figures": "^2.0.0",
|
||||||
"lodash": "^4.17.10",
|
"lodash": "^4.17.12",
|
||||||
"mute-stream": "0.0.7",
|
"mute-stream": "0.0.7",
|
||||||
"run-async": "^2.2.0",
|
"run-async": "^2.2.0",
|
||||||
"rxjs": "^6.1.0",
|
"rxjs": "^6.4.0",
|
||||||
"string-width": "^2.1.0",
|
"string-width": "^2.1.0",
|
||||||
"strip-ansi": "^4.0.0",
|
"strip-ansi": "^5.1.0",
|
||||||
"through": "^2.3.6"
|
"through": "^2.3.6"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"chalk": {
|
||||||
|
"version": "2.4.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
|
||||||
|
"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
|
||||||
|
"dev": true,
|
||||||
|
"requires": {
|
||||||
|
"ansi-styles": "^3.2.1",
|
||||||
|
"escape-string-regexp": "^1.0.5",
|
||||||
|
"supports-color": "^5.3.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"lodash": {
|
||||||
|
"version": "4.17.15",
|
||||||
|
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
|
||||||
|
"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
|
||||||
|
"dev": true
|
||||||
|
},
|
||||||
|
"strip-ansi": {
|
||||||
|
"version": "5.2.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
|
||||||
|
"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
|
||||||
|
"dev": true,
|
||||||
|
"requires": {
|
||||||
|
"ansi-regex": "^4.1.0"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"js-yaml": {
|
||||||
|
"version": "3.13.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
|
||||||
|
"integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
|
||||||
|
"dev": true,
|
||||||
|
"requires": {
|
||||||
|
"argparse": "^1.0.7",
|
||||||
|
"esprima": "^4.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"json-schema-traverse": {
|
"json-schema-traverse": {
|
||||||
@@ -4081,16 +4164,73 @@
|
|||||||
"integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==",
|
"integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"table": {
|
"rimraf": {
|
||||||
"version": "5.1.0",
|
"version": "2.6.3",
|
||||||
"resolved": "https://registry.npmjs.org/table/-/table-5.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
|
||||||
"integrity": "sha512-e542in22ZLhD/fOIuXs/8yDZ9W61ltF8daM88rkRNtgTIct+vI2fTnAyu/Db2TCfEcI8i7mjZz6meLq0nW7TYg==",
|
"integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"ajv": "^6.5.3",
|
"glob": "^7.1.3"
|
||||||
"lodash": "^4.17.10",
|
}
|
||||||
"slice-ansi": "1.0.0",
|
},
|
||||||
"string-width": "^2.1.1"
|
"slice-ansi": {
|
||||||
|
"version": "2.1.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
|
||||||
|
"integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
|
||||||
|
"dev": true,
|
||||||
|
"requires": {
|
||||||
|
"ansi-styles": "^3.2.0",
|
||||||
|
"astral-regex": "^1.0.0",
|
||||||
|
"is-fullwidth-code-point": "^2.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"table": {
|
||||||
|
"version": "5.4.4",
|
||||||
|
"resolved": "https://registry.npmjs.org/table/-/table-5.4.4.tgz",
|
||||||
|
"integrity": "sha512-IIfEAUx5QlODLblLrGTTLJA7Tk0iLSGBvgY8essPRVNGHAzThujww1YqHLs6h3HfTg55h++RzLHH5Xw/rfv+mg==",
|
||||||
|
"dev": true,
|
||||||
|
"requires": {
|
||||||
|
"ajv": "^6.10.2",
|
||||||
|
"lodash": "^4.17.14",
|
||||||
|
"slice-ansi": "^2.1.0",
|
||||||
|
"string-width": "^3.0.0"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"lodash": {
|
||||||
|
"version": "4.17.15",
|
||||||
|
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
|
||||||
|
"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
|
||||||
|
"dev": true
|
||||||
|
},
|
||||||
|
"string-width": {
|
||||||
|
"version": "3.1.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
|
||||||
|
"integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
|
||||||
|
"dev": true,
|
||||||
|
"requires": {
|
||||||
|
"emoji-regex": "^7.0.1",
|
||||||
|
"is-fullwidth-code-point": "^2.0.0",
|
||||||
|
"strip-ansi": "^5.1.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"strip-ansi": {
|
||||||
|
"version": "5.2.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
|
||||||
|
"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
|
||||||
|
"dev": true,
|
||||||
|
"requires": {
|
||||||
|
"ansi-regex": "^4.1.0"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"write": {
|
||||||
|
"version": "1.0.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
|
||||||
|
"integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
|
||||||
|
"dev": true,
|
||||||
|
"requires": {
|
||||||
|
"mkdirp": "^0.5.1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -4129,9 +4269,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"eslint-loader": {
|
"eslint-loader": {
|
||||||
"version": "2.1.1",
|
"version": "2.2.1",
|
||||||
"resolved": "https://registry.npmjs.org/eslint-loader/-/eslint-loader-2.1.1.tgz",
|
"resolved": "https://registry.npmjs.org/eslint-loader/-/eslint-loader-2.2.1.tgz",
|
||||||
"integrity": "sha512-1GrJFfSevQdYpoDzx8mEE2TDWsb/zmFuY09l6hURg1AeFIKQOvZ+vH0UPjzmd1CZIbfTV5HUkMeBmFiDBkgIsQ==",
|
"integrity": "sha512-RLgV9hoCVsMLvOxCuNjdqOrUqIj9oJg8hF44vzJaYqsAHuY9G2YAeN3joQ9nxP0p5Th9iFSIpKo+SD8KISxXRg==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"loader-fs-cache": "^1.0.0",
|
"loader-fs-cache": "^1.0.0",
|
||||||
@@ -4224,9 +4364,9 @@
|
|||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"domelementtype": {
|
"domelementtype": {
|
||||||
"version": "1.3.0",
|
"version": "1.3.1",
|
||||||
"resolved": "http://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
|
"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
|
||||||
"integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=",
|
"integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"domhandler": {
|
"domhandler": {
|
||||||
@@ -4239,23 +4379,23 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"htmlparser2": {
|
"htmlparser2": {
|
||||||
"version": "3.10.0",
|
"version": "3.10.1",
|
||||||
"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.0.tgz",
|
"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
|
||||||
"integrity": "sha512-J1nEUGv+MkXS0weHNWVKJJ+UrLfePxRWpN3C9bEi9fLxL2+ggW94DQvgYVXsaT30PGwYRIZKNZXuyMhp3Di4bQ==",
|
"integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"domelementtype": "^1.3.0",
|
"domelementtype": "^1.3.1",
|
||||||
"domhandler": "^2.3.0",
|
"domhandler": "^2.3.0",
|
||||||
"domutils": "^1.5.1",
|
"domutils": "^1.5.1",
|
||||||
"entities": "^1.1.1",
|
"entities": "^1.1.1",
|
||||||
"inherits": "^2.0.1",
|
"inherits": "^2.0.1",
|
||||||
"readable-stream": "^3.0.6"
|
"readable-stream": "^3.1.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"readable-stream": {
|
"readable-stream": {
|
||||||
"version": "3.0.6",
|
"version": "3.4.0",
|
||||||
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.0.6.tgz",
|
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz",
|
||||||
"integrity": "sha512-9E1oLoOWfhSXHGv6QlwXJim7uNzd9EVlWK+21tCU9Ju/kR0/p2AZYPz4qSchgO8PlLIH4FpZYfzwS+rEksZjIg==",
|
"integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"inherits": "^2.0.3",
|
"inherits": "^2.0.3",
|
||||||
@@ -4401,6 +4541,40 @@
|
|||||||
"integrity": "sha512-Si16O0+Hqz1gDHsys6RtFRrW7cCTB6P7p3OJmKp3Y3dxpQE2qwOA7d3xnV+0mBmrPoi0RBnxlCKvqu70te6wjg==",
|
"integrity": "sha512-Si16O0+Hqz1gDHsys6RtFRrW7cCTB6P7p3OJmKp3Y3dxpQE2qwOA7d3xnV+0mBmrPoi0RBnxlCKvqu70te6wjg==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
|
"eslint-plugin-pug": {
|
||||||
|
"version": "1.1.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/eslint-plugin-pug/-/eslint-plugin-pug-1.1.1.tgz",
|
||||||
|
"integrity": "sha512-ozlMzxaowx03CPUTpsNGbaLQPx20Pkmcdep9FvDMqGhXm310ryK5oHYrpQ9b4Vx5muuvPnXdWZdXFg0WCaK1sw==",
|
||||||
|
"dev": true,
|
||||||
|
"requires": {
|
||||||
|
"pug-lexer": "^3.1.0",
|
||||||
|
"pug-parser": "^4.0.0",
|
||||||
|
"pug-walk-extract-text": "^1.1.0"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"pug-lexer": {
|
||||||
|
"version": "3.1.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/pug-lexer/-/pug-lexer-3.1.0.tgz",
|
||||||
|
"integrity": "sha1-/QhzdtSmdbT1n4/vQiiDQ06VgaI=",
|
||||||
|
"dev": true,
|
||||||
|
"requires": {
|
||||||
|
"character-parser": "^2.1.1",
|
||||||
|
"is-expression": "^3.0.0",
|
||||||
|
"pug-error": "^1.3.2"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"pug-parser": {
|
||||||
|
"version": "4.0.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/pug-parser/-/pug-parser-4.0.2.tgz",
|
||||||
|
"integrity": "sha1-ey4zEbdYIUhnBkeUd6sdNPX4F98=",
|
||||||
|
"dev": true,
|
||||||
|
"requires": {
|
||||||
|
"pug-error": "^1.3.2",
|
||||||
|
"token-stream": "0.0.1"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"eslint-plugin-standard": {
|
"eslint-plugin-standard": {
|
||||||
"version": "4.0.0",
|
"version": "4.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-4.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-4.0.0.tgz",
|
||||||
@@ -4408,30 +4582,39 @@
|
|||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"eslint-plugin-vue": {
|
"eslint-plugin-vue": {
|
||||||
"version": "5.0.0-beta.3",
|
"version": "5.2.3",
|
||||||
"resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-5.0.0-beta.3.tgz",
|
"resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-5.2.3.tgz",
|
||||||
"integrity": "sha512-EOQo3ax4CIM6Itcl522p4cGlSBgR/KZBJo2Xc29PWknbYH/DRZorGutF8NATUpbZ4HYOG+Gcyd1nL08iyYF3Tg==",
|
"integrity": "sha512-mGwMqbbJf0+VvpGR5Lllq0PMxvTdrZ/ZPjmhkacrCHbubJeJOt+T6E3HUzAifa2Mxi7RSdJfC9HFpOeSYVMMIw==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"vue-eslint-parser": "^3.2.1"
|
"vue-eslint-parser": "^5.0.0"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"acorn": {
|
"acorn": {
|
||||||
"version": "6.0.2",
|
"version": "6.2.1",
|
||||||
"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.0.2.tgz",
|
"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.2.1.tgz",
|
||||||
"integrity": "sha512-GXmKIvbrN3TV7aVqAzVFaMW8F8wzVX7voEBRO3bDA64+EX37YSayggRJP5Xig6HYHBkWKpFg9W5gg6orklubhg==",
|
"integrity": "sha512-JD0xT5FCRDNyjDda3Lrg/IxFscp9q4tiYtxE1/nOzlKCk7hIRuYjhq1kCNkbPjMRMZuFq20HNQn1I9k8Oj0E+Q==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"acorn-jsx": {
|
"acorn-jsx": {
|
||||||
"version": "5.0.0",
|
"version": "5.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.1.tgz",
|
||||||
"integrity": "sha512-XkB50fn0MURDyww9+UYL3c1yLbOBz0ZFvrdYlGB8l+Ije1oSC75qAqrzSPjYQbdnQUzhlUGNKuesryAv0gxZOg==",
|
"integrity": "sha512-HJ7CfNHrfJLlNTzIEUTj43LNWGkqpRLxm3YjAlcD0ACydk9XynzYsCBHxut+iqt+1aBXkx9UP/w/ZqMr13XIzg==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
|
"debug": {
|
||||||
|
"version": "4.1.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
|
||||||
|
"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
|
||||||
|
"dev": true,
|
||||||
|
"requires": {
|
||||||
|
"ms": "^2.1.1"
|
||||||
|
}
|
||||||
|
},
|
||||||
"eslint-scope": {
|
"eslint-scope": {
|
||||||
"version": "4.0.0",
|
"version": "4.0.3",
|
||||||
"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
|
||||||
"integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==",
|
"integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"esrecurse": "^4.1.0",
|
"esrecurse": "^4.1.0",
|
||||||
@@ -4450,17 +4633,17 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"vue-eslint-parser": {
|
"vue-eslint-parser": {
|
||||||
"version": "3.2.2",
|
"version": "5.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-3.2.2.tgz",
|
"resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-5.0.0.tgz",
|
||||||
"integrity": "sha512-dprI6ggKCTwV22r+i8dtUGquiOCn063xyDmb7BV/BjG5Oc/m5EoMNrWevpvTcrlGuFZmYVPs5fgsu8UIxmMKzg==",
|
"integrity": "sha512-JlHVZwBBTNVvzmifwjpZYn0oPWH2SgWv5dojlZBsrhablDu95VFD+hriB1rQGwbD+bms6g+rAFhQHk6+NyiS6g==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"debug": "^3.1.0",
|
"debug": "^4.1.0",
|
||||||
"eslint-scope": "^4.0.0",
|
"eslint-scope": "^4.0.0",
|
||||||
"eslint-visitor-keys": "^1.0.0",
|
"eslint-visitor-keys": "^1.0.0",
|
||||||
"espree": "^4.0.0",
|
"espree": "^4.1.0",
|
||||||
"esquery": "^1.0.1",
|
"esquery": "^1.0.1",
|
||||||
"lodash": "^4.17.10"
|
"lodash": "^4.17.11"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -5023,6 +5206,12 @@
|
|||||||
"write": "^0.2.1"
|
"write": "^0.2.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"flatted": {
|
||||||
|
"version": "2.0.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz",
|
||||||
|
"integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==",
|
||||||
|
"dev": true
|
||||||
|
},
|
||||||
"flush-write-stream": {
|
"flush-write-stream": {
|
||||||
"version": "1.0.3",
|
"version": "1.0.3",
|
||||||
"resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz",
|
"resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz",
|
||||||
@@ -6391,6 +6580,24 @@
|
|||||||
"import-from": "^2.1.0"
|
"import-from": "^2.1.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"import-fresh": {
|
||||||
|
"version": "3.1.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.1.0.tgz",
|
||||||
|
"integrity": "sha512-PpuksHKGt8rXfWEr9m9EHIpgyyaltBy8+eF6GJM0QCAxMgxCfucMF3mjecK2QsJr0amJW7gTqh5/wht0z2UhEQ==",
|
||||||
|
"dev": true,
|
||||||
|
"requires": {
|
||||||
|
"parent-module": "^1.0.0",
|
||||||
|
"resolve-from": "^4.0.0"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"resolve-from": {
|
||||||
|
"version": "4.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
|
||||||
|
"integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
|
||||||
|
"dev": true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"import-from": {
|
"import-from": {
|
||||||
"version": "2.1.0",
|
"version": "2.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz",
|
||||||
@@ -7180,9 +7387,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"loader-fs-cache": {
|
"loader-fs-cache": {
|
||||||
"version": "1.0.1",
|
"version": "1.0.2",
|
||||||
"resolved": "https://registry.npmjs.org/loader-fs-cache/-/loader-fs-cache-1.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/loader-fs-cache/-/loader-fs-cache-1.0.2.tgz",
|
||||||
"integrity": "sha1-VuC/CL2XCLJqdltoUJhAyN7J/bw=",
|
"integrity": "sha512-70IzT/0/L+M20jUlEqZhZyArTU6VKLRTYRDAYN26g4jfzpJqjipLL3/hgYpySqI9PwsVRHHFja0LfEmsx9X2Cw==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"find-cache-dir": "^0.1.1",
|
"find-cache-dir": "^0.1.1",
|
||||||
@@ -7379,6 +7586,11 @@
|
|||||||
"yallist": "^2.1.2"
|
"yallist": "^2.1.2"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"luxon": {
|
||||||
|
"version": "1.17.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/luxon/-/luxon-1.17.2.tgz",
|
||||||
|
"integrity": "sha512-qELKtIj3HD41N+MvgoxArk8DZGUb4Gpiijs91oi+ZmKJzRlxY6CoyTwNoUwnogCVs4p8HuxVJDik9JbnYgrCng=="
|
||||||
|
},
|
||||||
"make-dir": {
|
"make-dir": {
|
||||||
"version": "1.3.0",
|
"version": "1.3.0",
|
||||||
"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
|
"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
|
||||||
@@ -10842,9 +11054,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"object-hash": {
|
"object-hash": {
|
||||||
"version": "1.3.0",
|
"version": "1.3.1",
|
||||||
"resolved": "https://registry.npmjs.org/object-hash/-/object-hash-1.3.0.tgz",
|
"resolved": "https://registry.npmjs.org/object-hash/-/object-hash-1.3.1.tgz",
|
||||||
"integrity": "sha512-05KzQ70lSeGSrZJQXE5wNDiTkBJDlUT/myi6RX9dVIvz7a7Qh4oH93BQdiPMn27nldYvVQCKMUaM83AfizZlsQ==",
|
"integrity": "sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"object-keys": {
|
"object-keys": {
|
||||||
@@ -11109,6 +11321,23 @@
|
|||||||
"no-case": "^2.2.0"
|
"no-case": "^2.2.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"parent-module": {
|
||||||
|
"version": "1.0.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
|
||||||
|
"integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
|
||||||
|
"dev": true,
|
||||||
|
"requires": {
|
||||||
|
"callsites": "^3.0.0"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"callsites": {
|
||||||
|
"version": "3.1.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
|
||||||
|
"integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
|
||||||
|
"dev": true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"parse-asn1": {
|
"parse-asn1": {
|
||||||
"version": "5.1.1",
|
"version": "5.1.1",
|
||||||
"resolved": "http://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz",
|
"resolved": "http://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz",
|
||||||
@@ -12145,6 +12374,15 @@
|
|||||||
"integrity": "sha1-wA1cUSi6xYBr7BXSt+fNq+QlMfM=",
|
"integrity": "sha1-wA1cUSi6xYBr7BXSt+fNq+QlMfM=",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
|
"pug-walk-extract-text": {
|
||||||
|
"version": "1.1.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/pug-walk-extract-text/-/pug-walk-extract-text-1.1.0.tgz",
|
||||||
|
"integrity": "sha1-2irPO16TQMfSax/aHLiFHUPymmw=",
|
||||||
|
"dev": true,
|
||||||
|
"requires": {
|
||||||
|
"pug-walk": "^1.1.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"pump": {
|
"pump": {
|
||||||
"version": "3.0.0",
|
"version": "3.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
|
||||||
@@ -12757,9 +12995,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"rxjs": {
|
"rxjs": {
|
||||||
"version": "6.3.3",
|
"version": "6.5.2",
|
||||||
"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
|
"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.2.tgz",
|
||||||
"integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
|
"integrity": "sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"tslib": "^1.9.0"
|
"tslib": "^1.9.0"
|
||||||
@@ -14803,6 +15041,11 @@
|
|||||||
"resolved": "https://registry.npmjs.org/vuejs-datepicker/-/vuejs-datepicker-1.5.4.tgz",
|
"resolved": "https://registry.npmjs.org/vuejs-datepicker/-/vuejs-datepicker-1.5.4.tgz",
|
||||||
"integrity": "sha512-AVzgu3pb/fF/Sj3qu8YPnp7KhtsXkm8TSnBEcyYsWb1bMJr5FdPCxuIzISgw5kq0It7HkVJUGXQ4CiCwq9hhww=="
|
"integrity": "sha512-AVzgu3pb/fF/Sj3qu8YPnp7KhtsXkm8TSnBEcyYsWb1bMJr5FdPCxuIzISgw5kq0It7HkVJUGXQ4CiCwq9hhww=="
|
||||||
},
|
},
|
||||||
|
"vuex": {
|
||||||
|
"version": "3.1.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/vuex/-/vuex-3.1.1.tgz",
|
||||||
|
"integrity": "sha512-ER5moSbLZuNSMBFnEBVGhQ1uCBNJslH9W/Dw2W7GZN23UQA69uapP5GTT9Vm8Trc0PzBSVt6LzF3hGjmv41xcg=="
|
||||||
|
},
|
||||||
"watchpack": {
|
"watchpack": {
|
||||||
"version": "1.6.0",
|
"version": "1.6.0",
|
||||||
"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
|
"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
|
||||||
|
|||||||
+7
-3
@@ -18,26 +18,30 @@
|
|||||||
"bulma": "^0.7.2",
|
"bulma": "^0.7.2",
|
||||||
"bulma-extensions": "^4.0.1",
|
"bulma-extensions": "^4.0.1",
|
||||||
"i": "^0.3.6",
|
"i": "^0.3.6",
|
||||||
|
"luxon": "^1.17.2",
|
||||||
"npm": "^6.4.1",
|
"npm": "^6.4.1",
|
||||||
"sweetalert": "^2.1.2",
|
"sweetalert": "^2.1.2",
|
||||||
"vue": "^2.5.17",
|
"vue": "^2.5.17",
|
||||||
"vue-router": "^3.0.1",
|
"vue-router": "^3.0.1",
|
||||||
"vue2-animate": "^2.1.0",
|
"vue2-animate": "^2.1.0",
|
||||||
"vuejs-datepicker": "^1.5.4"
|
"vuejs-datepicker": "^1.5.4",
|
||||||
|
"vuex": "^3.1.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@vue/cli-plugin-babel": "^3.1.1",
|
"@vue/cli-plugin-babel": "^3.1.1",
|
||||||
"@vue/cli-plugin-eslint": "^3.1.1",
|
"@vue/cli-plugin-eslint": "^3.1.1",
|
||||||
"@vue/cli-service": "^3.1.1",
|
"@vue/cli-service": "^3.1.1",
|
||||||
"babel-eslint": "^10.0.1",
|
"babel-eslint": "^10.0.1",
|
||||||
"eslint": "^5.8.0",
|
"eslint": "^5.16.0",
|
||||||
"eslint-config-standard": "^12.0.0",
|
"eslint-config-standard": "^12.0.0",
|
||||||
|
"eslint-loader": "^2.2.1",
|
||||||
"eslint-plugin-html": "^4.0.6",
|
"eslint-plugin-html": "^4.0.6",
|
||||||
"eslint-plugin-import": "^2.14.0",
|
"eslint-plugin-import": "^2.14.0",
|
||||||
"eslint-plugin-node": "^8.0.0",
|
"eslint-plugin-node": "^8.0.0",
|
||||||
"eslint-plugin-promise": "^4.0.1",
|
"eslint-plugin-promise": "^4.0.1",
|
||||||
|
"eslint-plugin-pug": "^1.1.1",
|
||||||
"eslint-plugin-standard": "^4.0.0",
|
"eslint-plugin-standard": "^4.0.0",
|
||||||
"eslint-plugin-vue": "^5.0.0-0",
|
"eslint-plugin-vue": "^5.2.3",
|
||||||
"node-sass": "^4.9.4",
|
"node-sass": "^4.9.4",
|
||||||
"pug": "^2.0.3",
|
"pug": "^2.0.3",
|
||||||
"pug-plain-loader": "^1.0.0",
|
"pug-plain-loader": "^1.0.0",
|
||||||
|
|||||||
+2
-1
@@ -16,5 +16,6 @@ export default {
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
@import './scss/main.scss'
|
@import './scss/main.scss';
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
+3
-3
@@ -10,14 +10,14 @@ if (process.env.NODE_ENV === 'development') {
|
|||||||
api.url = config.PROD
|
api.url = config.PROD
|
||||||
}
|
}
|
||||||
api.isAuth = function () {
|
api.isAuth = function () {
|
||||||
if (window.localStorage.pcpumaT && window.localStorage.pcpumaU) {
|
if (window.sessionStorage.pcpumaT && window.sessionStorage.pcpumaU) {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
api.exit = function () {
|
api.exit = function () {
|
||||||
window.localStorage.token = null
|
window.sessionStorage.token = null
|
||||||
window.localStorage.usuario = null
|
window.sessionStorage.usuario = null
|
||||||
}
|
}
|
||||||
|
|
||||||
export default api
|
export default api
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 6.7 KiB After Width: | Height: | Size: 6.7 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 137 KiB |
@@ -10,24 +10,30 @@
|
|||||||
table.table
|
table.table
|
||||||
thead
|
thead
|
||||||
tr
|
tr
|
||||||
th(width="10%")
|
th(width="10%")
|
||||||
th(width="20%") No Semanas
|
th(width="20%") No Semanas
|
||||||
th(width="70%") Descripción
|
th(width="70%") Descripción
|
||||||
tbody
|
tbody
|
||||||
tr(v-for="m in multa")
|
tr(v-for="m in multa")
|
||||||
td
|
td
|
||||||
.control
|
.control
|
||||||
label.radio
|
label.radio
|
||||||
input(type='radio' name="multa" v-bind:value="m.id" v-model="multar.idMulta")
|
input(type='radio' name="multa" v-bind:value="m.semanas" v-model="multar.multa")
|
||||||
td {{m.semanas}}
|
td {{m.semanas}}
|
||||||
td {{m.nombre}}
|
td {{m.nombre}}
|
||||||
|
|
||||||
footer.modal-card-foot
|
footer.modal-card-foot
|
||||||
button.button.is-success(v-on:click="SaveMultar()") Guardar
|
button.button.is-success(v-on:click="SaveMultar()") Guardar
|
||||||
button.button(v-on:click="toggleModal()") Cancelar
|
button.button(v-on:click="toggleModal()") Cancelar
|
||||||
p.has-text-centered
|
p.has-text-centered
|
||||||
span.is-size-6.space(v-for="s in status") {{` ${s.equipo.toUpperCase()} : ${s.prestadas} / ${s.total}`}}
|
span.is-size-6.space(v-for="s in status") {{` ${s.equipo.toUpperCase()} : ${s.prestadas} / ${s.total}`}}
|
||||||
br
|
br
|
||||||
|
.columns
|
||||||
|
.column.is-3
|
||||||
|
.field
|
||||||
|
.control.has-icons-left
|
||||||
|
input.input(v-model="search" placeholder="Buscar")
|
||||||
|
span.icon.is-small.is-left
|
||||||
|
font-awesome-icon(icon="search")
|
||||||
table.table.is-fullwidth.is-hoverable.is-narrow
|
table.table.is-fullwidth.is-hoverable.is-narrow
|
||||||
thead
|
thead
|
||||||
tr
|
tr
|
||||||
@@ -41,20 +47,20 @@
|
|||||||
th Multar
|
th Multar
|
||||||
th Regresar
|
th Regresar
|
||||||
tbody
|
tbody
|
||||||
tr(v-bind:class="{'warn-time':timeWarn(p.fh_in)}" v-for="p in prestamo")
|
tr(v-bind:class="{'warn-time':timeWarn(p.fechaInicio)}" v-for="p in filteredEquipo")
|
||||||
td {{p.detalles[0].equipo.carrito.nombre}}
|
td {{p.Equipo.Carrito.alias}}
|
||||||
td {{p.detalles[0].equipo.equipo_carrito}}
|
td {{p.Equipo.equipo_carrito}}
|
||||||
td {{p.equipo}}
|
td {{p.Equipo.Tipo.nombre}}
|
||||||
td {{p.detalles[0].equipo.no_inventario}}
|
td {{p.Equipo.no_inventario}}
|
||||||
td {{p.idUsuario}}
|
td {{p.idUsuario}}
|
||||||
td {{fecha(p.fh_in)}}
|
td {{fecha(p.fechaInicio)}}
|
||||||
td {{maxFecha(p.fh_in)}}
|
td {{maxFecha(p.fechaInicio)}}
|
||||||
td
|
td
|
||||||
a.button.is-danger.is-outlined(v-on:click="upMultar(p.idUsuario,p.detalles[0].equipo.id)")
|
a.button.is-danger.is-outlined(v-on:click="upMultar(p.idUsuario)")
|
||||||
span.icon.is-small
|
span.icon.is-small
|
||||||
font-awesome-icon(icon="flag")
|
font-awesome-icon(icon="flag")
|
||||||
td
|
td
|
||||||
a.button.is-u-blue.is-outlined(v-on:click="regresar(p.idUsuario,p.id)")
|
a.button.is-u-blue.is-outlined(v-on:click="regresar(p.idPrestamo, p.idUsuario)")
|
||||||
span.icon.is-small
|
span.icon.is-small
|
||||||
font-awesome-icon(icon="undo")
|
font-awesome-icon(icon="undo")
|
||||||
</template>
|
</template>
|
||||||
@@ -69,12 +75,51 @@ export default {
|
|||||||
prestamo: [],
|
prestamo: [],
|
||||||
status: [],
|
status: [],
|
||||||
multa: [],
|
multa: [],
|
||||||
multar: {
|
multar: {},
|
||||||
idUsuario: '',
|
time: true,
|
||||||
idEquipo: '',
|
search: ''
|
||||||
idMulta: ''
|
}
|
||||||
},
|
},
|
||||||
time: true
|
mounted () {
|
||||||
|
console.log(this.$store.getters.kiosko)
|
||||||
|
axios.get(api.url + '/prestamo?kiosko=' + this.$store.getters.kiosko, {
|
||||||
|
headers: {
|
||||||
|
'token': this.$store.getters.token
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.then(response => {
|
||||||
|
console.log(response.data)
|
||||||
|
this.prestamo = response.data
|
||||||
|
this.status = response.data.data.status
|
||||||
|
})
|
||||||
|
.catch(error => {
|
||||||
|
swal('Error', error.response.data.err, 'error')
|
||||||
|
})
|
||||||
|
axios.get(api.url + '/multa', {
|
||||||
|
headers: {
|
||||||
|
'token': this.$store.getters.token
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.then(response => {
|
||||||
|
console.log(response.data.data)
|
||||||
|
this.multa = response.data
|
||||||
|
})
|
||||||
|
.catch(error => {
|
||||||
|
swal('Error', error.response.data.err, 'error')
|
||||||
|
})
|
||||||
|
},
|
||||||
|
computed: {
|
||||||
|
filteredEquipo: function () {
|
||||||
|
return this.prestamo.filter(dat => {
|
||||||
|
console.log(this.search)
|
||||||
|
if (this.search == '') {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
if (parseInt(this.search) == dat.Equipo.equipo_carrito) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
})
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
@@ -88,17 +133,18 @@ export default {
|
|||||||
},
|
},
|
||||||
SaveMultar: function () {
|
SaveMultar: function () {
|
||||||
axios({
|
axios({
|
||||||
method: 'post',
|
method: 'put',
|
||||||
url: api.url + '/multar',
|
url: api.url + '/multar',
|
||||||
data: this.multar,
|
data: this.multar,
|
||||||
headers: {
|
headers: {
|
||||||
'token': window.localStorage.pcpumaT
|
'token': this.$store.getters.token
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.then(response => {
|
.then(response => {
|
||||||
swal('Exito', 'Multa completa ', 'success')
|
swal('Exito', 'Multa completa ', 'success')
|
||||||
})
|
})
|
||||||
.catch(error => {
|
.catch(error => {
|
||||||
|
console.log(error)
|
||||||
swal('Error', error.response.data.err, 'error')
|
swal('Error', error.response.data.err, 'error')
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
@@ -114,44 +160,46 @@ export default {
|
|||||||
upMultar: function (usr, eq) {
|
upMultar: function (usr, eq) {
|
||||||
this.toggleModal()
|
this.toggleModal()
|
||||||
this.multar.idUsuario = usr
|
this.multar.idUsuario = usr
|
||||||
this.multar.idEquipo = eq
|
|
||||||
},
|
},
|
||||||
fecha: function (date) {
|
fecha: function (date) {
|
||||||
let dt = new Date(date)
|
let dt = new Date(date)
|
||||||
// console.log(dt)
|
var options = { year:'numeric', month: 'numeric',day:'numeric' ,hour: 'numeric', minute: '2-digit' }
|
||||||
return `${dt.getMonth() + 1}-${dt.getDate()} ${dt.getHours()}:${dt.getMinutes()}`
|
return dt.toLocaleString('en-US',options)
|
||||||
},
|
},
|
||||||
maxFecha: function (date) {
|
maxFecha: function (date) {
|
||||||
let dt = new Date(date)
|
let dt = new Date(date)
|
||||||
dt.setMinutes(dt.getMinutes() + 15)
|
var options = { year:'numeric', month: 'numeric',day:'numeric' ,hour: 'numeric', minute: '2-digit' }
|
||||||
dt.setHours(dt.getHours() + 2)
|
dt.setHours(dt.getHours() + 2)
|
||||||
// console.log(dt)
|
dt.setMinutes(dt.getMinutes() + 15)
|
||||||
if (dt.getHours >= 6) {
|
let cierre = new Date()
|
||||||
return `${dt.getMonth() + 1}-${dt.getDate()} 7:45`
|
cierre.setHours(19, 45, 0)
|
||||||
|
if (dt > cierre) {
|
||||||
|
return cierre.toLocaleString('en-US',options)
|
||||||
}
|
}
|
||||||
return `${dt.getMonth() + 1}-${dt.getDate()} ${dt.getHours()}:${dt.getMinutes()}`
|
return dt.toLocaleString('en-US',options)
|
||||||
},
|
},
|
||||||
regresar: function (usr, pre) {
|
regresar: function (idPrestamo,idUsuario) {
|
||||||
axios({
|
axios({
|
||||||
method: 'put',
|
method: 'put',
|
||||||
url: api.url + '/devolucion',
|
url: api.url + '/devolucion',
|
||||||
data: {
|
data: {
|
||||||
idUsuario: usr,
|
idPrestamo,
|
||||||
id: pre
|
idUsuario,
|
||||||
|
idOperador: this.$store.getters.operador
|
||||||
},
|
},
|
||||||
headers: {
|
headers: {
|
||||||
'token': window.localStorage.pcpumaT
|
'token': this.$store.getters.token
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.then(res => {
|
.then(res => {
|
||||||
swal('Exito', 'Peticion exitosa ', 'success')
|
swal('Exito', 'Peticion exitosa ', 'success')
|
||||||
axios.get(api.url + '/prestamo', {
|
axios.get(api.url + '/prestamo', {
|
||||||
headers: {
|
headers: {
|
||||||
'token': window.localStorage.pcpumaT
|
'token': this.$store.getters.token
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.then(response => {
|
.then(response => {
|
||||||
this.prestamo = response.data.data.equipos
|
this.prestamo = response.data
|
||||||
this.status = response.data.data.status
|
this.status = response.data.data.status
|
||||||
})
|
})
|
||||||
.catch(error => {
|
.catch(error => {
|
||||||
@@ -162,33 +210,6 @@ export default {
|
|||||||
swal('Error', err.response.data.err, 'error')
|
swal('Error', err.response.data.err, 'error')
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
},
|
|
||||||
mounted () {
|
|
||||||
axios.get(api.url + '/prestamo', {
|
|
||||||
headers: {
|
|
||||||
'token': window.localStorage.pcpumaT
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.then(response => {
|
|
||||||
console.log(response.data.data)
|
|
||||||
this.prestamo = response.data.data.equipos
|
|
||||||
this.status = response.data.data.status
|
|
||||||
})
|
|
||||||
.catch(error => {
|
|
||||||
swal('Error', error.response.data.err, 'error')
|
|
||||||
})
|
|
||||||
axios.get(api.url + '/multa', {
|
|
||||||
headers: {
|
|
||||||
'token': window.localStorage.pcpumaT
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.then(response => {
|
|
||||||
// console.log(response.data.data)
|
|
||||||
this.multa = response.data.data
|
|
||||||
})
|
|
||||||
.catch(error => {
|
|
||||||
swal('Error', error.response.data.err, 'error')
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ export default {
|
|||||||
mounted () {
|
mounted () {
|
||||||
axios.get(api.url + '/prestamo/' + this.usuario, {
|
axios.get(api.url + '/prestamo/' + this.usuario, {
|
||||||
headers: {
|
headers: {
|
||||||
'token': window.localStorage.pcpumaT
|
'token': window.sessionStorage.pcpumaT
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.then(response => {
|
.then(response => {
|
||||||
@@ -76,7 +76,7 @@ export default {
|
|||||||
dateBan: this.dateBan
|
dateBan: this.dateBan
|
||||||
},
|
},
|
||||||
headers: {
|
headers: {
|
||||||
'token': window.localStorage.pcpumaT
|
'token': window.sessionStorage.pcpumaT
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.then(res => {
|
.then(res => {
|
||||||
|
|||||||
@@ -8,9 +8,7 @@
|
|||||||
.control
|
.control
|
||||||
.select
|
.select
|
||||||
select(v-model="tipo")
|
select(v-model="tipo")
|
||||||
option(value="laptop") Laptop
|
option(v-for="t in tipos" v-bind:value="t.idTipo") {{t.nombre}}
|
||||||
option(value="chromebook") Choromebook
|
|
||||||
option(value="ipad") Tablet
|
|
||||||
.control
|
.control
|
||||||
a.button.is-link(v-on:click="prestamo()") Aceptar
|
a.button.is-link(v-on:click="prestamo()") Aceptar
|
||||||
|
|
||||||
@@ -22,15 +20,13 @@
|
|||||||
th Carrito
|
th Carrito
|
||||||
th Equipo
|
th Equipo
|
||||||
th No inventario
|
th No inventario
|
||||||
th Préstamo
|
|
||||||
th Entrega
|
th Entrega
|
||||||
tbody
|
tbody
|
||||||
tr
|
tr
|
||||||
td {{prestamoData.carrito}}
|
td {{prestamoData.alias_carrito}}
|
||||||
td {{prestamoData.id}}
|
td {{prestamoData.alias_equipo}}
|
||||||
td {{prestamoData.no_inventario}}
|
td {{prestamoData.no_inventario}}
|
||||||
td {{prestamoData.prestamo}}
|
td {{prestamoData.fechaFin}}
|
||||||
td {{prestamoData.entrega}}
|
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
@@ -42,7 +38,8 @@ export default {
|
|||||||
data () {
|
data () {
|
||||||
return {
|
return {
|
||||||
tipo: '',
|
tipo: '',
|
||||||
prestamoData: []
|
prestamoData: [],
|
||||||
|
tipos: {}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
@@ -50,22 +47,39 @@ export default {
|
|||||||
this.prestamoData = []
|
this.prestamoData = []
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
mounted() {
|
||||||
|
axios({
|
||||||
|
method: 'get',
|
||||||
|
url: api.url + '/tipo',
|
||||||
|
headers: {
|
||||||
|
token: this.$store.getters.token
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.then(data => {
|
||||||
|
console.log(data)
|
||||||
|
this.tipos = data.data
|
||||||
|
})
|
||||||
|
.catch(err => {
|
||||||
|
console.log(err.message)
|
||||||
|
})
|
||||||
|
},
|
||||||
methods: {
|
methods: {
|
||||||
prestamo: function () {
|
prestamo: function () {
|
||||||
axios({
|
axios({
|
||||||
method: 'post',
|
method: 'post',
|
||||||
url: api.url + '/prestamo',
|
url: api.url + '/prestamo',
|
||||||
data: {
|
data: {
|
||||||
equipo: this.tipo,
|
|
||||||
idUsuario: this.usuario,
|
idUsuario: this.usuario,
|
||||||
idKiosko: window.localStorage.pcpumaK
|
idTipo: this.tipo,
|
||||||
|
idOperadorPrestamo: this.$store.getters.operador,
|
||||||
|
kiosko: this.$store.getters.kiosko
|
||||||
},
|
},
|
||||||
headers: {
|
headers: {
|
||||||
token: window.localStorage.pcpumaT
|
token: this.$store.getters.token
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.then(response => {
|
.then(response => {
|
||||||
this.prestamoData = response.data.data.equipo
|
this.prestamoData = response.data
|
||||||
console.log(this.prestamoData)
|
console.log(this.prestamoData)
|
||||||
swal('Exito', 'Peticion exitosa ', 'success')
|
swal('Exito', 'Peticion exitosa ', 'success')
|
||||||
})
|
})
|
||||||
@@ -82,7 +96,7 @@ export default {
|
|||||||
idUsuario: this.usuario
|
idUsuario: this.usuario
|
||||||
},
|
},
|
||||||
headers: {
|
headers: {
|
||||||
token: window.localStorage.pcpumaT
|
token: window.sessionStorage.pcpumaT
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.then(response => {
|
.then(response => {
|
||||||
|
|||||||
+18
-28
@@ -39,12 +39,12 @@
|
|||||||
th Editar
|
th Editar
|
||||||
tbody
|
tbody
|
||||||
tr(v-for="dt in data")
|
tr(v-for="dt in data")
|
||||||
td {{dt["nombre"]}}
|
td {{dt.alias}}
|
||||||
td {{dt["equipo"]}}
|
td {{dt.tipo}}
|
||||||
td
|
td
|
||||||
span.tag.is-success(v-if="dt['baja'] == '0'")
|
span.tag.is-success(v-if="dt.baja == '0'")
|
||||||
b Activo
|
b Activo
|
||||||
span.tag.is-warning(v-else)
|
span.tag.is-warning(v-else)
|
||||||
b Inactivo
|
b Inactivo
|
||||||
td
|
td
|
||||||
a.button.is-link.is-outlined(v-on:click="setUpdate(dt)")
|
a.button.is-link.is-outlined(v-on:click="setUpdate(dt)")
|
||||||
@@ -64,26 +64,21 @@ export default {
|
|||||||
UmFooter,
|
UmFooter,
|
||||||
UmHeader
|
UmHeader
|
||||||
},
|
},
|
||||||
name: 'equipo',
|
|
||||||
data () {
|
data () {
|
||||||
return {
|
return {
|
||||||
data: [],
|
data: [],
|
||||||
carrito: {
|
carrito: {}
|
||||||
nota: '',
|
|
||||||
baja: '',
|
|
||||||
id: ''
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted () {
|
mounted () {
|
||||||
axios.get(api.url + '/carritos/' + window.localStorage.pcpumaK, {
|
axios.get(api.url + '/carrito?kiosko=1', {
|
||||||
headers: {
|
headers: {
|
||||||
'token': window.localStorage.pcpumaT
|
'token': this.$store.getters.token
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.then(response => {
|
.then(response => {
|
||||||
console.log(response)
|
console.log(response)
|
||||||
this.data = response.data.data
|
this.data = response.data
|
||||||
})
|
})
|
||||||
.catch(error => {
|
.catch(error => {
|
||||||
console.log(error)
|
console.log(error)
|
||||||
@@ -91,40 +86,35 @@ export default {
|
|||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
update: function () {
|
update: function () {
|
||||||
|
console.log(this.carrito)
|
||||||
this.toggleModal()
|
this.toggleModal()
|
||||||
axios({
|
axios({
|
||||||
method: 'put',
|
method: 'put',
|
||||||
url: api.url + '/carrito',
|
url: api.url + '/carrito',
|
||||||
data: this.carrito,
|
data: this.carrito,
|
||||||
headers: {
|
headers: {
|
||||||
'token': window.localStorage.pcpumaT
|
'token': this.$store.getters.token
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.then(response => {
|
.then(response => {
|
||||||
swal('Exito', 'Se actualizo', 'success')
|
swal('Exito', 'Se actualizo', 'success')
|
||||||
axios.get(api.url + '/carritos/' + window.localStorage.pcpumaK, {
|
return axios.get(api.url + '/carrito?kiosko=' + this.$store.getters.kiosko, {
|
||||||
headers: {
|
headers: {
|
||||||
'token': window.localStorage.pcpumaT
|
'token': this.$store.getters.token
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.then(response => {
|
|
||||||
// console.log(response)
|
|
||||||
this.data = response.data.data
|
|
||||||
swal('Exito', 'Se cargarón los datos', 'success')
|
|
||||||
})
|
|
||||||
.catch(error => {
|
|
||||||
swal('Error', error.response.data.err, 'error')
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
.then(response => {
|
||||||
|
this.data = response.data
|
||||||
|
swal('Exito', 'Se cargarón los datos', 'success')
|
||||||
|
})
|
||||||
.catch(error => {
|
.catch(error => {
|
||||||
swal('Error', error.response.data.err, 'error')
|
swal('Error', error.response.data.err, 'error')
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
setUpdate: function (dt) {
|
setUpdate: function (dt) {
|
||||||
this.toggleModal()
|
this.toggleModal()
|
||||||
this.carrito.nota = dt.nota
|
this.carrito=dt
|
||||||
this.carrito.id = dt.id
|
|
||||||
this.carrito.baja = dt.baja
|
|
||||||
},
|
},
|
||||||
toggleModal: function () {
|
toggleModal: function () {
|
||||||
let modal = document.getElementById('modal')
|
let modal = document.getElementById('modal')
|
||||||
|
|||||||
+38
-115
@@ -100,20 +100,20 @@
|
|||||||
th Editar
|
th Editar
|
||||||
tbody
|
tbody
|
||||||
tr(v-for="dt in filteredEquipo")
|
tr(v-for="dt in filteredEquipo")
|
||||||
td {{dt["carritos.nombre"]}}
|
td {{dt.Carrito.alias}}
|
||||||
td {{dt["carritos.equipos.equipo_carrito"]}}
|
td {{dt.equipo_carrito}}
|
||||||
td {{dt["carritos.equipos.no_serie"]}}
|
td {{dt.no_serie}}
|
||||||
td {{dt["carritos.equipos.no_inventario"]}}
|
td {{dt.no_inventario}}
|
||||||
td {{dt["carritos.equipos.equipo"]}}
|
td {{dt.Tipo.nombre}}
|
||||||
td
|
td
|
||||||
span.tag.is-success(v-if="dt['carritos.equipos.bateria'] == '0'")
|
span.tag.is-success(v-if="dt.bateria == '0'")
|
||||||
b Cargada
|
b Cargada
|
||||||
span.tag.is-warning(v-else)
|
span.tag.is-warning(v-else)
|
||||||
b Descargada
|
b Descargada
|
||||||
td
|
td
|
||||||
span.tag.is-success(v-if="dt['carritos.equipos.baja'] == '0'")
|
span.tag.is-success(v-if="dt.baja == '0'")
|
||||||
b Activo
|
b Activo
|
||||||
span.tag.is-warning(v-else)
|
span.tag.is-warning(v-else)
|
||||||
b Inactivo
|
b Inactivo
|
||||||
td
|
td
|
||||||
a.button.is-u-blue.is-outlined(v-on:click="setUpdate(dt)")
|
a.button.is-u-blue.is-outlined(v-on:click="setUpdate(dt)")
|
||||||
@@ -133,7 +133,6 @@ export default {
|
|||||||
UmFooter,
|
UmFooter,
|
||||||
UmHeader
|
UmHeader
|
||||||
},
|
},
|
||||||
name: 'equipo',
|
|
||||||
data () {
|
data () {
|
||||||
return {
|
return {
|
||||||
search: '',
|
search: '',
|
||||||
@@ -142,26 +141,34 @@ export default {
|
|||||||
carrito: [],
|
carrito: [],
|
||||||
tipo: '',
|
tipo: '',
|
||||||
car: '',
|
car: '',
|
||||||
file: '',
|
equipo: {}
|
||||||
equipo: {
|
}
|
||||||
no_serie: '',
|
},
|
||||||
no_inventario: '',
|
computed: {
|
||||||
baja: '',
|
filteredEquipo: function () {
|
||||||
id: '',
|
return this.data.filter(dat => {
|
||||||
bateria: '',
|
if (this.car !== '') {
|
||||||
nota: ''
|
if (parseInt(this.car) !== dat.carrito) {
|
||||||
}
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let reg = new RegExp(this.search)
|
||||||
|
if (reg.test(dat.no_serie) || reg.test(dat.no_inventario) || reg.test(dat.id)) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
})
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted () {
|
mounted () {
|
||||||
axios.get(api.url + '/equipo/?kiosko=' + window.localStorage.pcpumaK, {
|
axios.get(api.url + '/equipo?kiosko=' + this.$store.getters.kiosko, {
|
||||||
headers: {
|
headers: {
|
||||||
'token': window.localStorage.pcpumaT
|
'token': this.$store.getters.token
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.then(response => {
|
.then(response => {
|
||||||
console.log(response)
|
console.log(response.data)
|
||||||
this.data = response.data.data
|
this.data = response.data
|
||||||
})
|
})
|
||||||
.catch(error => {
|
.catch(error => {
|
||||||
console.log(error)
|
console.log(error)
|
||||||
@@ -175,20 +182,20 @@ export default {
|
|||||||
url: api.url + '/equipo',
|
url: api.url + '/equipo',
|
||||||
data: this.equipo,
|
data: this.equipo,
|
||||||
headers: {
|
headers: {
|
||||||
'token': window.localStorage.pcpumaT
|
'token': this.$store.getters.token
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.then(response => {
|
.then(response => {
|
||||||
swal('Exito', 'Se actualizo', 'success')
|
swal('Exito', 'Se actualizo', 'success')
|
||||||
axios.get(api.url + '/equipo/?kiosko=' + window.localStorage.pcpumaK, {
|
axios.get(api.url + '/equipo', {
|
||||||
headers: {
|
headers: {
|
||||||
'token': window.localStorage.pcpumaT
|
'token': this.$store.getters.token
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.then(response => {
|
.then(response => {
|
||||||
// console.log(response)
|
// console.log(response)
|
||||||
this.data = response.data.data
|
this.data = response.data.data
|
||||||
swal('Exito', 'Se cargarón los datos', 'success')
|
swal('Exito', 'Se actualizarón los datos', 'success')
|
||||||
})
|
})
|
||||||
.catch(error => {
|
.catch(error => {
|
||||||
swal('Error', error.response.data.err, 'error')
|
swal('Error', error.response.data.err, 'error')
|
||||||
@@ -201,12 +208,7 @@ export default {
|
|||||||
setUpdate: function (dt) {
|
setUpdate: function (dt) {
|
||||||
console.log(dt)
|
console.log(dt)
|
||||||
this.toggleModal()
|
this.toggleModal()
|
||||||
this.equipo.no_serie = dt['carritos.equipos.no_serie']
|
this.equipo = dt
|
||||||
this.equipo.no_inventario = dt['carritos.equipos.no_inventario']
|
|
||||||
this.equipo.baja = dt['carritos.equipos.baja']
|
|
||||||
this.equipo.bateria = dt['carritos.equipos.bateria']
|
|
||||||
this.equipo.nota = dt['carritos.equipos.nota']
|
|
||||||
this.equipo.id = dt['carritos.equipos.id']
|
|
||||||
},
|
},
|
||||||
toggleModal: function () {
|
toggleModal: function () {
|
||||||
let modal = document.getElementById('modal')
|
let modal = document.getElementById('modal')
|
||||||
@@ -218,88 +220,9 @@ export default {
|
|||||||
},
|
},
|
||||||
count: function (arr) {
|
count: function (arr) {
|
||||||
return `${arr.length}`
|
return `${arr.length}`
|
||||||
},
|
|
||||||
changeFile: function () {
|
|
||||||
this.file = event.target.files[0]
|
|
||||||
console.log(this.file)
|
|
||||||
},
|
|
||||||
upload: function () {
|
|
||||||
// Add a request interceptor
|
|
||||||
const fue = axios.interceptors.request.use(function (config) {
|
|
||||||
// Do something before request is sent
|
|
||||||
document.getElementById('pageloader').classList.add('is-active')
|
|
||||||
console.log('sefue')
|
|
||||||
return config
|
|
||||||
}, function (error) {
|
|
||||||
// Do something with request error
|
|
||||||
return Promise.reject(error)
|
|
||||||
})
|
|
||||||
// Add a response interceptor
|
|
||||||
const regreso = axios.interceptors.response.use(function (response) {
|
|
||||||
// Do something with response data
|
|
||||||
document.getElementById('pageloader').classList.remove('is-active')
|
|
||||||
console.log('regreso')
|
|
||||||
return response
|
|
||||||
}, function (error) {
|
|
||||||
// Do something with response error
|
|
||||||
return Promise.reject(error)
|
|
||||||
})
|
|
||||||
let data = new FormData()
|
|
||||||
data.append('archivo', this.file)
|
|
||||||
axios({
|
|
||||||
method: 'post',
|
|
||||||
url: api.url + '/carrito-upload',
|
|
||||||
data,
|
|
||||||
headers: {
|
|
||||||
admin: '123',
|
|
||||||
'Content-Type': 'multipart/form-data',
|
|
||||||
'token': window.localStorage.pcpumaT
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.then(response => {
|
|
||||||
console.log(response.data)
|
|
||||||
axios.interceptors.request.eject(fue)
|
|
||||||
axios.interceptors.request.eject(regreso)
|
|
||||||
axios.get(api.url + '/equipo/?kiosko=' + window.localStorage.pcpumaK, {
|
|
||||||
headers: {
|
|
||||||
'token': window.localStorage.pcpumaT
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.then(response => {
|
|
||||||
// console.log(response)
|
|
||||||
this.data = response.data.data
|
|
||||||
swal('Exito', 'Se cargarón los datos', 'success')
|
|
||||||
})
|
|
||||||
.catch(error => {
|
|
||||||
swal('Error', error.response.data.err, 'error')
|
|
||||||
})
|
|
||||||
})
|
|
||||||
.catch(error => {
|
|
||||||
console.log(error.response.data)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
},
|
|
||||||
computed: {
|
|
||||||
filteredEquipo: function () {
|
|
||||||
return this.data.filter(dat => {
|
|
||||||
if (this.tipo !== '') {
|
|
||||||
if (this.tipo !== dat['carritos.equipos.equipo']) {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (this.car !== '') {
|
|
||||||
if (parseInt(this.car) !== dat.carrito) {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
let reg = new RegExp(this.search)
|
|
||||||
if (reg.test(dat['carritos.equipos.no_serie']) || reg.test(dat['carritos.equipos.no_inventario']) || reg.test(dat.id)) {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
return false
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|||||||
@@ -26,15 +26,13 @@ export default {
|
|||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
salir: function () {
|
salir: function () {
|
||||||
window.localStorage.removeItem('pcpumaT')
|
this.$store.commit('close')
|
||||||
window.localStorage.removeItem('pcpumaU')
|
|
||||||
window.localStorage.removeItem('pcpumaK')
|
|
||||||
this.$router.push('login')
|
this.$router.push('login')
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
login: function () {
|
login: function () {
|
||||||
if (window.localStorage.pcpumaT) {
|
if (window.sessionStorage.pcpumaT) {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
return false
|
return false
|
||||||
@@ -44,7 +42,11 @@ export default {
|
|||||||
</script>
|
</script>
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.navbar{
|
.navbar{
|
||||||
|
width: 100%;
|
||||||
border-bottom: #B08100 solid 5px;
|
border-bottom: #B08100 solid 5px;
|
||||||
// box-shadow: 0px 13px 21px 2px rgba(0,0,0,0.21);
|
box-shadow: 0px 13px 21px 2px rgba(0,0,0,0.21);
|
||||||
|
position:fixed;
|
||||||
|
top:0;
|
||||||
|
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
+28
-12
@@ -2,7 +2,8 @@
|
|||||||
main
|
main
|
||||||
nav.navbar.is-u-blue
|
nav.navbar.is-u-blue
|
||||||
div.navbar-brand
|
div.navbar-brand
|
||||||
a.navbar-item PC PUMA
|
a.navbar-item
|
||||||
|
b PC PUMA
|
||||||
.container
|
.container
|
||||||
.columns
|
.columns
|
||||||
.column.is-4.is-offset-4.has-text-centered
|
.column.is-4.is-offset-4.has-text-centered
|
||||||
@@ -12,6 +13,12 @@
|
|||||||
un-notification(v-if='this.status' v-bind:msj='this.err' status=true)
|
un-notification(v-if='this.status' v-bind:msj='this.err' status=true)
|
||||||
br
|
br
|
||||||
form
|
form
|
||||||
|
.field
|
||||||
|
.select
|
||||||
|
select(v-model="kiosko" require)
|
||||||
|
option(disabled) selecciona el kiosko
|
||||||
|
option(selected) 1
|
||||||
|
option 2
|
||||||
.field
|
.field
|
||||||
p.control.has-icons-left
|
p.control.has-icons-left
|
||||||
input.input.is-link(placeholder="Usuario" v-model="user")
|
input.input.is-link(placeholder="Usuario" v-model="user")
|
||||||
@@ -25,7 +32,7 @@
|
|||||||
i
|
i
|
||||||
font-awesome-icon(icon="lock")
|
font-awesome-icon(icon="lock")
|
||||||
.field.has-text-centered
|
.field.has-text-centered
|
||||||
input.button.is-u-blue(type="submit" v-on:click="Login()" value="Iniciar sesión")
|
input.button.is-u-blue(type="submit" v-on:click="Login($event)" value="Iniciar sesión")
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
@@ -41,20 +48,25 @@ export default {
|
|||||||
user: '',
|
user: '',
|
||||||
pass: '',
|
pass: '',
|
||||||
err: '',
|
err: '',
|
||||||
status: false
|
status: false,
|
||||||
|
kiosko: ''
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
Login: function () {
|
Login: function (event) {
|
||||||
axios.post(api.url + '/login', {
|
if (event) event.preventDefault()
|
||||||
nombre: this.user,
|
axios({
|
||||||
pass: this.pass
|
method: 'post',
|
||||||
|
url: api.url + '/login',
|
||||||
|
data: {
|
||||||
|
usuario: this.user,
|
||||||
|
pass: this.pass
|
||||||
|
}
|
||||||
})
|
})
|
||||||
.then(response => {
|
.then(response => {
|
||||||
console.log(response.data.data)
|
console.log(response.data)
|
||||||
window.localStorage.pcpumaT = response.data.data.token
|
this.$store.commit('login', response.data)
|
||||||
window.localStorage.pcpumaU = response.data.data.usuario
|
this.$store.commit('kiosko', this.kiosko)
|
||||||
window.localStorage.pcpumaK = response.data.data.id
|
|
||||||
this.$router.push('/')
|
this.$router.push('/')
|
||||||
})
|
})
|
||||||
.catch(error => {
|
.catch(error => {
|
||||||
@@ -66,5 +78,9 @@ export default {
|
|||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="css">
|
<style lang="css" scoped>
|
||||||
|
.navbar{
|
||||||
|
border-bottom: #B08100 solid 5px;
|
||||||
|
box-shadow: 0px 13px 21px 2px rgba(0,0,0,0.21);
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
+15
-22
@@ -43,14 +43,12 @@
|
|||||||
.column.is-12
|
.column.is-12
|
||||||
table.table.is-fullwidth
|
table.table.is-fullwidth
|
||||||
thead
|
thead
|
||||||
th Id
|
|
||||||
th Descripcion
|
th Descripcion
|
||||||
th Semanas
|
th Semanas
|
||||||
th Editar
|
th Editar
|
||||||
th Borrar
|
th Borrar
|
||||||
tbody
|
tbody
|
||||||
tr(v-for="dt in data")
|
tr(v-for="dt in data")
|
||||||
td {{dt.id}}
|
|
||||||
td {{dt.nombre}}
|
td {{dt.nombre}}
|
||||||
td {{dt.semanas}}
|
td {{dt.semanas}}
|
||||||
td
|
td
|
||||||
@@ -58,10 +56,9 @@
|
|||||||
span.icon.is-small
|
span.icon.is-small
|
||||||
font-awesome-icon(icon="pen")
|
font-awesome-icon(icon="pen")
|
||||||
td
|
td
|
||||||
a.button.is-danger.is-outlined(v-on:click="del(dt.id)")
|
a.button.is-danger.is-outlined(v-on:click="del(dt.idMulta)")
|
||||||
span.icon.is-small
|
span.icon.is-small
|
||||||
font-awesome-icon(icon="trash")
|
font-awesome-icon(icon="trash")
|
||||||
|
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
@@ -82,12 +79,12 @@ export default {
|
|||||||
mounted () {
|
mounted () {
|
||||||
axios.get(api.url + '/multa', {
|
axios.get(api.url + '/multa', {
|
||||||
headers: {
|
headers: {
|
||||||
'token': window.localStorage.pcpumaT
|
'token': this.$store.getters.token
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.then(response => {
|
.then(response => {
|
||||||
console.log(response.data)
|
console.log(response.data)
|
||||||
this.data = response.data.data
|
this.data = response.data
|
||||||
})
|
})
|
||||||
.catch(error => {
|
.catch(error => {
|
||||||
console.log(error)
|
console.log(error)
|
||||||
@@ -116,20 +113,18 @@ export default {
|
|||||||
semanas: this.sem
|
semanas: this.sem
|
||||||
},
|
},
|
||||||
headers: {
|
headers: {
|
||||||
'token': window.localStorage.pcpumaT
|
'token': this.$store.getters.token
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.then(response => {
|
.then(response => {
|
||||||
// console.log(this.data)
|
|
||||||
swal('Exito', 'Peticion exitosa ', 'success')
|
swal('Exito', 'Peticion exitosa ', 'success')
|
||||||
axios.get(api.url + '/multa', {
|
axios.get(api.url + '/multa', {
|
||||||
headers: {
|
headers: {
|
||||||
'token': window.localStorage.pcpumaT
|
'token': this.$store.getters.token
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.then(response => {
|
.then(response => {
|
||||||
// console.log(response.data)
|
this.data = response.data
|
||||||
this.data = response.data.data
|
|
||||||
})
|
})
|
||||||
.catch(error => {
|
.catch(error => {
|
||||||
console.log(error)
|
console.log(error)
|
||||||
@@ -140,27 +135,26 @@ export default {
|
|||||||
swal('Error', error.response.data.err, 'error')
|
swal('Error', error.response.data.err, 'error')
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
del: function (id) {
|
del: function (idMulta) {
|
||||||
axios({
|
axios({
|
||||||
method: 'delete',
|
method: 'delete',
|
||||||
url: api.url + '/multa',
|
url: api.url + '/multa',
|
||||||
data: {
|
data: {
|
||||||
id
|
idMulta
|
||||||
},
|
},
|
||||||
headers: {
|
headers: {
|
||||||
'token': window.localStorage.pcpumaT
|
'token': this.$store.getters.token
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.then(response => {
|
.then(response => {
|
||||||
swal('Exito', 'Se elimino el Registro ', 'success')
|
swal('Exito', 'Se elimino el Registro ', 'success')
|
||||||
axios.get(api.url + '/multa', {
|
axios.get(api.url + '/multa', {
|
||||||
headers: {
|
headers: {
|
||||||
'token': window.localStorage.pcpumaT
|
'token': this.$store.getters.token
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.then(response => {
|
.then(response => {
|
||||||
// console.log(response.data)
|
this.data = response.data
|
||||||
this.data = response.data.data
|
|
||||||
})
|
})
|
||||||
.catch(error => {
|
.catch(error => {
|
||||||
console.log(error)
|
console.log(error)
|
||||||
@@ -176,24 +170,23 @@ export default {
|
|||||||
method: 'put',
|
method: 'put',
|
||||||
url: api.url + '/multa',
|
url: api.url + '/multa',
|
||||||
data: {
|
data: {
|
||||||
id: this.multa.id,
|
idMulta: this.multa.idMulta,
|
||||||
nombre: this.multa.nombre,
|
nombre: this.multa.nombre,
|
||||||
semanas: this.multa.semanas
|
semanas: this.multa.semanas
|
||||||
},
|
},
|
||||||
headers: {
|
headers: {
|
||||||
'token': window.localStorage.pcpumaT
|
'token': this.$store.getters.token
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.then(response => {
|
.then(response => {
|
||||||
swal('Exito', 'Se actualizo el Registro ', 'success')
|
swal('Exito', 'Se actualizo el Registro ', 'success')
|
||||||
axios.get(api.url + '/multa', {
|
axios.get(api.url + '/multa', {
|
||||||
headers: {
|
headers: {
|
||||||
'token': window.localStorage.pcpumaT
|
'token': this.$store.getters.token
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.then(response => {
|
.then(response => {
|
||||||
// console.log(response.data)
|
this.data = response.data
|
||||||
this.data = response.data.data
|
|
||||||
})
|
})
|
||||||
.catch(error => {
|
.catch(error => {
|
||||||
console.log(error)
|
console.log(error)
|
||||||
|
|||||||
+23
-24
@@ -18,11 +18,11 @@
|
|||||||
font-awesome-icon(icon="user")
|
font-awesome-icon(icon="user")
|
||||||
.field
|
.field
|
||||||
.control.has-text-centered
|
.control.has-text-centered
|
||||||
input.button.is-link(v-on:click="usuario()" type="submit" value="Buscar")
|
input.button.is-link(v-on:click="usuario($event)" type="submit" value="Buscar")
|
||||||
br
|
br
|
||||||
.columns(v-if="data.id")
|
.columns(v-if="data.idUsuario")
|
||||||
.column.is-3.is-offset-1
|
.column.is-3.is-offset-1
|
||||||
p.is-size-3 Usuario : {{data.id}}
|
p.is-size-3 Usuario : {{data.idUsuario}}
|
||||||
p.is-size-4 Multa : {{multa(data.multa)}}
|
p.is-size-4 Multa : {{multa(data.multa)}}
|
||||||
br
|
br
|
||||||
.field
|
.field
|
||||||
@@ -54,24 +54,25 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
usuario: function () {
|
usuario: function (event) {
|
||||||
|
if (event) event.preventDefault()
|
||||||
axios.get(api.url + '/usuario/?id=' + this.buscar, {
|
axios.get(api.url + '/usuario/?id=' + this.buscar, {
|
||||||
headers: {
|
headers: {
|
||||||
'token': window.localStorage.pcpumaT
|
'token': this.$store.getters.token
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.then(response => {
|
.then(res1 => {
|
||||||
console.log(response)
|
// console.log(response)
|
||||||
axios.get(api.url + '/prestamo/' + this.buscar, {
|
this.data = res1.data
|
||||||
|
return axios.get(api.url + '/prestamo/' + this.buscar, {
|
||||||
headers: {
|
headers: {
|
||||||
'token': window.localStorage.pcpumaT
|
'token': this.$store.getters.token
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.then(data => {
|
})
|
||||||
this.prest = data.data.data
|
.then(res2 => {
|
||||||
console.log(this.prest)
|
// console.log(this.prest)
|
||||||
})
|
this.prest = res2.data
|
||||||
this.data = response.data.data
|
|
||||||
})
|
})
|
||||||
.catch(error => {
|
.catch(error => {
|
||||||
swal('Error', error.response.data.err, 'error')
|
swal('Error', error.response.data.err, 'error')
|
||||||
@@ -87,23 +88,21 @@ export default {
|
|||||||
ban: function () {
|
ban: function () {
|
||||||
axios({
|
axios({
|
||||||
method: 'put',
|
method: 'put',
|
||||||
url: api.url + '/ban',
|
url: api.url + '/usuario/' + this.data.idUsuario,
|
||||||
data: {
|
data: {
|
||||||
id: this.data.id
|
ban: !this.data.ban
|
||||||
},
|
},
|
||||||
headers: {
|
headers: {
|
||||||
'token': window.localStorage.pcpumaT,
|
'token': this.$store.getters.token
|
||||||
'admin': '123'
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.then(response => {
|
.then(res => {
|
||||||
// console.log(response)
|
console.log(res)
|
||||||
this.data = response.data.data
|
this.data = res.data
|
||||||
swal('Exito', 'Se cambio de estado con Exito', 'success')
|
swal('Exito', !this.data.ban ? 'Usuario Desbloqueado' : 'Usuario Bloqueado' , 'success')
|
||||||
})
|
})
|
||||||
.catch(error => {
|
.catch(error => {
|
||||||
// console.log(error)
|
console.log(error)
|
||||||
swal('Error', error.response.data.err, 'error')
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-4
@@ -5,6 +5,7 @@ import { faLaptop, faFlag, faUpload, faTrash, faTabletAlt, faUser, faLock, faSea
|
|||||||
import { faChrome } from '@fortawesome/free-brands-svg-icons'
|
import { faChrome } from '@fortawesome/free-brands-svg-icons'
|
||||||
import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
|
import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
|
||||||
import router from './routes.js'
|
import router from './routes.js'
|
||||||
|
import store from './store'
|
||||||
|
|
||||||
library.add(faChrome, faSearch, faShoppingCart, faCheckCircle, faPen, faEye)
|
library.add(faChrome, faSearch, faShoppingCart, faCheckCircle, faPen, faEye)
|
||||||
library.add(faUndo)
|
library.add(faUndo)
|
||||||
@@ -17,12 +18,10 @@ library.add(faTabletAlt)
|
|||||||
library.add(faTrash)
|
library.add(faTrash)
|
||||||
Vue.component('font-awesome-icon', FontAwesomeIcon)
|
Vue.component('font-awesome-icon', FontAwesomeIcon)
|
||||||
|
|
||||||
console.log(process.env)
|
|
||||||
// import Child from './components/Child.vue'
|
|
||||||
Vue.config.productionTip = false
|
Vue.config.productionTip = false
|
||||||
// Vue.component('child', Child)
|
|
||||||
|
|
||||||
new Vue({
|
new Vue({
|
||||||
render: h => h(App),
|
render: h => h(App),
|
||||||
router
|
router,
|
||||||
|
store
|
||||||
}).$mount('#app')
|
}).$mount('#app')
|
||||||
|
|||||||
+11
-11
@@ -1,4 +1,5 @@
|
|||||||
import Vue from 'vue'
|
import Vue from 'vue'
|
||||||
|
import store from './store.js'
|
||||||
import VueRouter from 'vue-router'
|
import VueRouter from 'vue-router'
|
||||||
import Carrito from './layout/Carrito.vue'
|
import Carrito from './layout/Carrito.vue'
|
||||||
import Inicio from './layout/Inicio.vue'
|
import Inicio from './layout/Inicio.vue'
|
||||||
@@ -9,31 +10,30 @@ import Multa from './layout/Multa.vue'
|
|||||||
|
|
||||||
const routes = [
|
const routes = [
|
||||||
{ path: '/', component: Inicio, name: 'inicio' },
|
{ path: '/', component: Inicio, name: 'inicio' },
|
||||||
|
{ path: '/login', component: Login, name: 'login', meta: { isPublic: true } },
|
||||||
{ path: '/carrito', component: Carrito, name: 'carrito' },
|
{ path: '/carrito', component: Carrito, name: 'carrito' },
|
||||||
{ path: '/login', component: Login, name: 'login' },
|
|
||||||
{ path: '/usuario', component: Usuario, name: 'usuario' },
|
{ path: '/usuario', component: Usuario, name: 'usuario' },
|
||||||
{ path: '/equipo/', component: Equipo, name: 'equipo' },
|
{ path: '/equipo/', component: Equipo, name: 'equipo' },
|
||||||
{ path: '/multa', component: Multa, name: 'multa' }
|
{ path: '/multa', component: Multa, name: 'multa' }
|
||||||
]
|
]
|
||||||
Vue.use(VueRouter)
|
Vue.use(VueRouter)
|
||||||
|
|
||||||
const router = new VueRouter({ routes })
|
const router = new VueRouter({ mode: 'history', routes })
|
||||||
|
|
||||||
const isAuthenticated = function () {
|
const isAuthenticated = function () {
|
||||||
if (window.localStorage.pcpumaT) {
|
return store.getters.isLoggedIn
|
||||||
return true
|
|
||||||
}
|
|
||||||
return false
|
|
||||||
}
|
}
|
||||||
|
|
||||||
router.beforeEach((to, from, next) => {
|
router.beforeEach((to, from, next) => {
|
||||||
if (!isAuthenticated() && to.path !== '/login') {
|
if (!to.meta.isPublic && !isAuthenticated()) {
|
||||||
return next('/login')
|
return next({ name: 'login' })
|
||||||
}
|
}
|
||||||
if (isAuthenticated() && to.path === '/login') {
|
|
||||||
return next('/')
|
if (to.name === 'login' && isAuthenticated()) {
|
||||||
|
return next({ name: 'home' })
|
||||||
}
|
}
|
||||||
next()
|
|
||||||
|
return next()
|
||||||
})
|
})
|
||||||
|
|
||||||
export default router
|
export default router
|
||||||
|
|||||||
@@ -0,0 +1,30 @@
|
|||||||
|
import Vue from 'vue'
|
||||||
|
import Vuex from 'vuex'
|
||||||
|
|
||||||
|
Vue.use(Vuex)
|
||||||
|
|
||||||
|
const store = new Vuex.Store({
|
||||||
|
state: {
|
||||||
|
session: {},
|
||||||
|
kiosko: ''
|
||||||
|
},
|
||||||
|
getters: {
|
||||||
|
isLoggedIn: state => !!state.session.token,
|
||||||
|
token: state => state.session.token,
|
||||||
|
kiosko: state => state.kiosko,
|
||||||
|
operador : state => state.session.idOperador
|
||||||
|
},
|
||||||
|
mutations: {
|
||||||
|
login (state, payload = {}) {
|
||||||
|
state.session = payload
|
||||||
|
},
|
||||||
|
close (state) {
|
||||||
|
state.session = {}
|
||||||
|
},
|
||||||
|
kiosko (state, payload = {}) {
|
||||||
|
state.kiosko = payload
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
export default store
|
||||||
Reference in New Issue
Block a user