From 00ab5e971325de2ee09fa0848405cbf3aa87f43c Mon Sep 17 00:00:00 2001 From: Spythere Date: Sat, 15 Aug 2020 13:23:02 +0200 Subject: [PATCH] =?UTF-8?q?=C5=81atki=20bezpiecze=C5=84stwa,=20dodana=20no?= =?UTF-8?q?wa=20sceneria=20do=20danych?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .ENV | 1 + functions/package.json | 2 +- functions/src/index.ts | 28 ++-- package-lock.json | 238 ++++++++++++++------------- package.json | 11 +- src/data/stations.json | 25 ++- src/scripts/firebase/firebaseInit.ts | 4 +- src/views/TrainsView.vue | 8 +- ui-debug.log | 1 - 9 files changed, 180 insertions(+), 138 deletions(-) create mode 100644 .ENV delete mode 100644 ui-debug.log diff --git a/.ENV b/.ENV new file mode 100644 index 0000000..bc4d3de --- /dev/null +++ b/.ENV @@ -0,0 +1 @@ +API_KEY=AIzaSyBI36X2-p7vU1flxoJdCEc0noByyTe1mpw \ No newline at end of file diff --git a/functions/package.json b/functions/package.json index 62eafa5..970b753 100644 --- a/functions/package.json +++ b/functions/package.json @@ -14,11 +14,11 @@ }, "main": "lib/index.js", "dependencies": { + "axios": "^0.19.2", "firebase-admin": "^8.10.0", "firebase-functions": "^3.6.1" }, "devDependencies": { - "axios": "^0.19.2", "firebase-functions-test": "^0.2.0", "tslint": "^5.12.0", "typescript": "^3.8.0" diff --git a/functions/src/index.ts b/functions/src/index.ts index 75ab737..cc2e03d 100644 --- a/functions/src/index.ts +++ b/functions/src/index.ts @@ -7,14 +7,22 @@ const db = admin.firestore(); import axios from "axios"; exports.scheduledUpdate = functions.pubsub - .schedule("5 * * * *") + .schedule("*/5 * * * *") .onRun(async (context) => { - const stationData: { + let stationData: { stationName: string; dispatcherName: string; - }[] = await ( - await axios.get("https://api.td2.info.pl:9640/?method=getStationsOnline") - ).data.message; + }[]; + + try { + stationData = await ( + await axios.get( + "https://api.td2.info.pl:9640/?method=getStationsOnline" + ) + ).data.message; + } catch (error) { + return; + } const historyRef = db.collection("history"); @@ -28,11 +36,11 @@ exports.scheduledUpdate = functions.pubsub currentDispatcherName: station.dispatcherName, }); - docRef.collection("dispatcherHistory").add({ - dispatcherName: station.dispatcherName, - occupiedFrom: Date.now(), - occupiedTo: 0, - }); + // docRef.collection("dispatcherHistory").add({ + // dispatcherName: station.dispatcherName, + // occupiedFrom: Date.now(), + // occupiedTo: 0, + // }); return; } diff --git a/package-lock.json b/package-lock.json index ece07d8..f7f8aaa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1016,15 +1016,15 @@ } }, "@firebase/analytics": { - "version": "0.3.9", - "resolved": "https://registry.npmjs.org/@firebase/analytics/-/analytics-0.3.9.tgz", - "integrity": "sha512-l4dNskm8uQ+UqO6Lw+fuyO1enZBXUV6xNMxeVABEnVrp3wOP90KKb/ZwYgleAxF1It52lorcTtkA1YFpv3iEIQ==", + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/@firebase/analytics/-/analytics-0.4.2.tgz", + "integrity": "sha512-WCoeUAO3lP6ikHJ3/XYptV90fpTidzTS9VpAfiVQK8gl9w1zvvKSavY9U3+EVG3frOPCFdE5DBO4MYrUw4gaqw==", "requires": { "@firebase/analytics-types": "0.3.1", - "@firebase/component": "0.1.16", - "@firebase/installations": "0.4.14", + "@firebase/component": "0.1.18", + "@firebase/installations": "0.4.16", "@firebase/logger": "0.2.6", - "@firebase/util": "0.2.50", + "@firebase/util": "0.3.1", "tslib": "^1.11.1" } }, @@ -1034,14 +1034,14 @@ "integrity": "sha512-63vVJ5NIBh/JF8l9LuPrQYSzFimk7zYHySQB4Dk9rVdJ8kV/vGQoVTvRu1UW05sEc2Ug5PqtEChtTHU+9hvPcA==" }, "@firebase/app": { - "version": "0.6.8", - "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.6.8.tgz", - "integrity": "sha512-Tm7Pi6Dtpx4FFKcpm0jcrZ/qI9oREBxmP3pWlw1jgDW4syRJHmN9/5DYvfFk6FAhj3FrY8E/6F+ngWJfqONotQ==", + "version": "0.6.10", + "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.6.10.tgz", + "integrity": "sha512-USg/AbgqBERhY0LayrKmmp7pka08WPa7OlFI46kaNW1pA2mUNf/ifTaxhCr2hGg/eWI0zPhpbEvtGQhSJ/QqWg==", "requires": { "@firebase/app-types": "0.6.1", - "@firebase/component": "0.1.16", + "@firebase/component": "0.1.18", "@firebase/logger": "0.2.6", - "@firebase/util": "0.2.50", + "@firebase/util": "0.3.1", "dom-storage": "2.1.0", "tslib": "^1.11.1", "xmlhttprequest": "1.8.0" @@ -1071,24 +1071,24 @@ "integrity": "sha512-/+gBHb1O9x/YlG7inXfxff/6X3BPZt4zgBv4kql6HEmdzNQCodIRlEYnI+/da+lN+dha7PjaFH7C7ewMmfV7rw==" }, "@firebase/component": { - "version": "0.1.16", - "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.1.16.tgz", - "integrity": "sha512-FvffvFN0LWgv1H/FIyruTECOL69Dhy+JfwoTq+mV39V8Mz9lNpo41etonL5AOr7KmXxYJVbNwkx0L9Ei88i7JA==", + "version": "0.1.18", + "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.1.18.tgz", + "integrity": "sha512-c8gd1k/e0sbBTR0xkLIYUN8nVkA0zWxcXGIvdfYtGEsNw6n7kh5HkcxKXOPB8S7bcPpqZkGgBIfvd94IyG2gaQ==", "requires": { - "@firebase/util": "0.2.50", + "@firebase/util": "0.3.1", "tslib": "^1.11.1" } }, "@firebase/database": { - "version": "0.6.8", - "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.6.8.tgz", - "integrity": "sha512-Psibz/LD9WBvZRS7A/kkYd5i5l6tBw49adSFmCM2ZJlKE9fxZhxay02AerwfXHiq3gPKVeqXUjBIRuHOWdEXmw==", + "version": "0.6.11", + "resolved": "https://registry.npmjs.org/@firebase/database/-/database-0.6.11.tgz", + "integrity": "sha512-QOHhB7+CdjVhEXG9CyX0roA9ARJcEuwbozz0Bix+ULuZqjQ58KUFHMH1apW6EEiUP22d/mYD7dNXsUGshjL9PA==", "requires": { "@firebase/auth-interop-types": "0.1.5", - "@firebase/component": "0.1.16", - "@firebase/database-types": "0.5.1", + "@firebase/component": "0.1.18", + "@firebase/database-types": "0.5.2", "@firebase/logger": "0.2.6", - "@firebase/util": "0.2.50", + "@firebase/util": "0.3.1", "faye-websocket": "0.11.3", "tslib": "^1.11.1" }, @@ -1104,25 +1104,26 @@ } }, "@firebase/database-types": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.5.1.tgz", - "integrity": "sha512-onQxom1ZBYBJ648w/VNRzUewovEDAH7lvnrrpCd69ukkyrMk6rGEO/PQ9BcNEbhlNtukpsqRS0oNOFlHs0FaSA==", + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-0.5.2.tgz", + "integrity": "sha512-ap2WQOS3LKmGuVFKUghFft7RxXTyZTDr0Xd8y2aqmWsbJVjgozi0huL/EUMgTjGFrATAjcf2A7aNs8AKKZ2a8g==", "requires": { "@firebase/app-types": "0.6.1" } }, "@firebase/firestore": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-1.16.1.tgz", - "integrity": "sha512-TGtvNIGHMEFFEuOSsRswou576GPZY39vXIsenn0B1Dqz9ACpyDtvAT9YdbG38srlPq7ZKwsP5x04LB43zZ6eAg==", + "version": "1.16.4", + "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-1.16.4.tgz", + "integrity": "sha512-Ur+I8a8RkkbbJRsebkYAUwKFkbh9FemDxTFD/2Vp01pAPM8S3MoIcVegAfTvnPlG/ObBq5O7wI4CRA6b/G/Iyg==", "requires": { - "@firebase/component": "0.1.16", + "@firebase/component": "0.1.18", "@firebase/firestore-types": "1.12.0", "@firebase/logger": "0.2.6", - "@firebase/util": "0.2.50", - "@firebase/webchannel-wrapper": "0.2.41", + "@firebase/util": "0.3.1", + "@firebase/webchannel-wrapper": "0.3.0", "@grpc/grpc-js": "^1.0.0", "@grpc/proto-loader": "^0.5.0", + "node-fetch": "2.6.0", "tslib": "^1.11.1" } }, @@ -1132,13 +1133,13 @@ "integrity": "sha512-OqNxVb63wPZdUc7YnpacAW1WNIMSKERSewCRi+unCQ0YI0KNfrDSypyGCyel+S3GdOtKMk9KnvDknaGbnaFX4g==" }, "@firebase/functions": { - "version": "0.4.48", - "resolved": "https://registry.npmjs.org/@firebase/functions/-/functions-0.4.48.tgz", - "integrity": "sha512-BwI/JzO/f/nquKG1IS3VqmwMaKEhvM58/08vTnp46krHBsOYqsdD9T2amz+HXGT9fe2HhDsUhgFE8D00S0vqbg==", + "version": "0.4.50", + "resolved": "https://registry.npmjs.org/@firebase/functions/-/functions-0.4.50.tgz", + "integrity": "sha512-eBsNrUm/Jfc/xsQXmxQRSkEg6pwHlMd2hice8N90/EeqgwqS/SCvC+O9cJITLlXroAghb9jWDWRvAkDU/TOhpw==", "requires": { - "@firebase/component": "0.1.16", + "@firebase/component": "0.1.18", "@firebase/functions-types": "0.3.17", - "@firebase/messaging-types": "0.4.5", + "@firebase/messaging-types": "0.5.0", "isomorphic-fetch": "2.2.1", "tslib": "^1.11.1" } @@ -1149,13 +1150,13 @@ "integrity": "sha512-DGR4i3VI55KnYk4IxrIw7+VG7Q3gA65azHnZxo98Il8IvYLr2UTBlSh72dTLlDf25NW51HqvJgYJDKvSaAeyHQ==" }, "@firebase/installations": { - "version": "0.4.14", - "resolved": "https://registry.npmjs.org/@firebase/installations/-/installations-0.4.14.tgz", - "integrity": "sha512-hQPsaU7wdTq3CFMtFQwZy6LgdXZAkXoUToV4O+ekPbjM65QzaGVogJVU8O2H6ADXoq37SarcUXKe86pcUWdFLA==", + "version": "0.4.16", + "resolved": "https://registry.npmjs.org/@firebase/installations/-/installations-0.4.16.tgz", + "integrity": "sha512-gqv3IrBUmPWKpH8wLJ0fZcAH1NEXwQhqjqnK3cQXRcIkEARP430cmIAaj7CcPdgdemHX9HqwJG+So/yBHIYXPA==", "requires": { - "@firebase/component": "0.1.16", + "@firebase/component": "0.1.18", "@firebase/installations-types": "0.3.4", - "@firebase/util": "0.2.50", + "@firebase/util": "0.3.1", "idb": "3.0.2", "tslib": "^1.11.1" } @@ -1171,33 +1172,33 @@ "integrity": "sha512-KIxcUvW/cRGWlzK9Vd2KB864HlUnCfdTH0taHE0sXW5Xl7+W68suaeau1oKNEqmc3l45azkd4NzXTCWZRZdXrw==" }, "@firebase/messaging": { - "version": "0.6.20", - "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.6.20.tgz", - "integrity": "sha512-1MqyljXnbFBeHYhL6QInVM9aO5MW820yhNmOIVxk58wNXq4tOQLzqnKuvlgZ+ttgqlDzrIYiVf3EOHh5DptttQ==", + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.7.0.tgz", + "integrity": "sha512-PTD5pQw9QremOjiWWZYOkzcX6OKByMvlG+NQXdTnyL3kLbE01Bdp9iWhkH6ipNpHYMiwcK1RZD4TLkYVBviBsw==", "requires": { - "@firebase/component": "0.1.16", - "@firebase/installations": "0.4.14", - "@firebase/messaging-types": "0.4.5", - "@firebase/util": "0.2.50", + "@firebase/component": "0.1.18", + "@firebase/installations": "0.4.16", + "@firebase/messaging-types": "0.5.0", + "@firebase/util": "0.3.1", "idb": "3.0.2", "tslib": "^1.11.1" } }, "@firebase/messaging-types": { - "version": "0.4.5", - "resolved": "https://registry.npmjs.org/@firebase/messaging-types/-/messaging-types-0.4.5.tgz", - "integrity": "sha512-sux4fgqr/0KyIxqzHlatI04Ajs5rc3WM+WmtCpxrKP1E5Bke8xu/0M+2oy4lK/sQ7nov9z15n3iltAHCgTRU3Q==" + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@firebase/messaging-types/-/messaging-types-0.5.0.tgz", + "integrity": "sha512-QaaBswrU6umJYb/ZYvjR5JDSslCGOH6D9P136PhabFAHLTR4TWjsaACvbBXuvwrfCXu10DtcjMxqfhdNIB1Xfg==" }, "@firebase/performance": { - "version": "0.3.9", - "resolved": "https://registry.npmjs.org/@firebase/performance/-/performance-0.3.9.tgz", - "integrity": "sha512-Fj22DZXRhhKv1OSUzDxX7AqpJUcDld6tzXK1yxOC8e3v1DFPQMQdM9FoG1m1b/Vrqa6pCCqnqG6gh6VPnEcAzQ==", + "version": "0.3.11", + "resolved": "https://registry.npmjs.org/@firebase/performance/-/performance-0.3.11.tgz", + "integrity": "sha512-L00vBUa2zzoSSOq3StTN43fPxtJ+myF+t+2kP5bQGHN5WOmf22lIsuEjAy1FAscDjVjhL1k5rKMY332ZwEfblg==", "requires": { - "@firebase/component": "0.1.16", - "@firebase/installations": "0.4.14", + "@firebase/component": "0.1.18", + "@firebase/installations": "0.4.16", "@firebase/logger": "0.2.6", "@firebase/performance-types": "0.0.13", - "@firebase/util": "0.2.50", + "@firebase/util": "0.3.1", "tslib": "^1.11.1" } }, @@ -1224,15 +1225,15 @@ } }, "@firebase/remote-config": { - "version": "0.1.25", - "resolved": "https://registry.npmjs.org/@firebase/remote-config/-/remote-config-0.1.25.tgz", - "integrity": "sha512-8YWefBhy77HMbWXWdbenalx+IDY/XkS+iURQ9qRYvSIFYx6RL04DzlakZNOY9CQAcxTA+cTSt4NNlhjopBjf2Q==", + "version": "0.1.27", + "resolved": "https://registry.npmjs.org/@firebase/remote-config/-/remote-config-0.1.27.tgz", + "integrity": "sha512-BGjmQomRKNf+yGJ/3/5Kw6zNLM5jY9oTVjLmYsQXf6U+HMgz6J2H6EVGc1bZW7YSsvak8f6DomxegQtvfvwaMw==", "requires": { - "@firebase/component": "0.1.16", - "@firebase/installations": "0.4.14", + "@firebase/component": "0.1.18", + "@firebase/installations": "0.4.16", "@firebase/logger": "0.2.6", "@firebase/remote-config-types": "0.1.9", - "@firebase/util": "0.2.50", + "@firebase/util": "0.3.1", "tslib": "^1.11.1" } }, @@ -1242,13 +1243,13 @@ "integrity": "sha512-G96qnF3RYGbZsTRut7NBX0sxyczxt1uyCgXQuH/eAfUCngxjEGcZQnBdy6mvSdqdJh5mC31rWPO4v9/s7HwtzA==" }, "@firebase/storage": { - "version": "0.3.39", - "resolved": "https://registry.npmjs.org/@firebase/storage/-/storage-0.3.39.tgz", - "integrity": "sha512-uTE8kROU/NMas+0i2oK0U9LuAlDzt+Cis0ErmYPlbCvmFqpFdyu3TtlO5MYNoxGLaBjEyxb18NJZai9lNMXFlQ==", + "version": "0.3.42", + "resolved": "https://registry.npmjs.org/@firebase/storage/-/storage-0.3.42.tgz", + "integrity": "sha512-FqHDWZPhATQeOFBQUZPsQO7xhnGBxprYVDb9eIjCnh1yRl6WAv/OQGHOF+JU5+H+YkjsKTtr/5VjyDl3Y0UHxw==", "requires": { - "@firebase/component": "0.1.16", + "@firebase/component": "0.1.18", "@firebase/storage-types": "0.3.13", - "@firebase/util": "0.2.50", + "@firebase/util": "0.3.1", "tslib": "^1.11.1" } }, @@ -1258,22 +1259,22 @@ "integrity": "sha512-pL7b8d5kMNCCL0w9hF7pr16POyKkb3imOW7w0qYrhBnbyJTdVxMWZhb0HxCFyQWC0w3EiIFFmxoz8NTFZDEFog==" }, "@firebase/util": { - "version": "0.2.50", - "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.2.50.tgz", - "integrity": "sha512-vFE6+Jfc25u0ViSpFxxq0q5s+XmuJ/y7CL3ud79RQe+WLFFg+j0eH1t23k0yNSG9vZNM7h3uHRIXbV97sYLAyw==", + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@firebase/util/-/util-0.3.1.tgz", + "integrity": "sha512-zjVd9rfL08dRRdZILFn1RZTHb1euCcnD9N/9P56gdBcm2bvT5XsCC4G6t5toQBpE/H/jYe5h6MZMqfLu3EQLXw==", "requires": { "tslib": "^1.11.1" } }, "@firebase/webchannel-wrapper": { - "version": "0.2.41", - "resolved": "https://registry.npmjs.org/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.2.41.tgz", - "integrity": "sha512-XcdMT5PSZHiuf7LJIhzKIe+RyYa25S3LHRRvLnZc6iFjwXkrSDJ8J/HWO6VT8d2ZTbawp3VcLEjRF/VN8glCrA==" + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.3.0.tgz", + "integrity": "sha512-VniCGPIgSGNEgOkh5phb3iKmSGIzcwrccy3IomMFRWPCMiCk2y98UQNJEoDs1yIHtZMstVjYWKYxnunIGzC5UQ==" }, "@grpc/grpc-js": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.1.2.tgz", - "integrity": "sha512-k2u86Bkm/3xrjUaSWeIyzXScBt/cC8uE7BznR0cpueQi11R33W6qfJdMrkrsmSHirp5likR55JSXUrcWG6ybHA==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.1.3.tgz", + "integrity": "sha512-HtOsk2YUofBcm1GkPqGzb6pwHhv+74eC2CUO229USIDKRtg30ycbZmqC+HdNtY3nHqoc9IgcRlntFgopyQoYCA==", "requires": { "semver": "^6.2.0" }, @@ -5287,24 +5288,24 @@ } }, "firebase": { - "version": "7.16.1", - "resolved": "https://registry.npmjs.org/firebase/-/firebase-7.16.1.tgz", - "integrity": "sha512-mcvFh617lWPYnx6SmwgtwmliY8P3XBi8pm0LDY4a8WPD049goCMgmIEpKkX4R3gZ2noz2rVrxSUfodENPpttLg==", + "version": "7.18.0", + "resolved": "https://registry.npmjs.org/firebase/-/firebase-7.18.0.tgz", + "integrity": "sha512-RGq0rWX25EDsM21TjRe1FbnygJwHXL7yN4P0Zh2Z7dWrBcfJ8tQpDxgwMDtiJTuo9UYExK3py4wjgpGJBau6wg==", "requires": { - "@firebase/analytics": "0.3.9", - "@firebase/app": "0.6.8", + "@firebase/analytics": "0.4.2", + "@firebase/app": "0.6.10", "@firebase/app-types": "0.6.1", "@firebase/auth": "0.14.9", - "@firebase/database": "0.6.8", - "@firebase/firestore": "1.16.1", - "@firebase/functions": "0.4.48", - "@firebase/installations": "0.4.14", - "@firebase/messaging": "0.6.20", - "@firebase/performance": "0.3.9", + "@firebase/database": "0.6.11", + "@firebase/firestore": "1.16.4", + "@firebase/functions": "0.4.50", + "@firebase/installations": "0.4.16", + "@firebase/messaging": "0.7.0", + "@firebase/performance": "0.3.11", "@firebase/polyfill": "0.3.36", - "@firebase/remote-config": "0.1.25", - "@firebase/storage": "0.3.39", - "@firebase/util": "0.2.50" + "@firebase/remote-config": "0.1.27", + "@firebase/storage": "0.3.42", + "@firebase/util": "0.3.1" } }, "flush-write-stream": { @@ -6434,6 +6435,17 @@ "requires": { "node-fetch": "^1.0.1", "whatwg-fetch": ">=0.10.0" + }, + "dependencies": { + "node-fetch": { + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz", + "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==", + "requires": { + "encoding": "^0.1.11", + "is-stream": "^1.0.1" + } + } } }, "isstream": { @@ -7180,13 +7192,9 @@ } }, "node-fetch": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz", - "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==", - "requires": { - "encoding": "^0.1.11", - "is-stream": "^1.0.1" - } + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", + "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==" }, "node-forge": { "version": "0.9.0", @@ -8459,9 +8467,9 @@ }, "dependencies": { "@types/node": { - "version": "13.13.14", - "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.14.tgz", - "integrity": "sha512-Az3QsOt1U/K1pbCQ0TXGELTuTkPLOiFIQf3ILzbOyo0FqgV9SxRnxbxM5QlAveERZMHpZY+7u3Jz2tKyl+yg6g==" + "version": "13.13.15", + "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.15.tgz", + "integrity": "sha512-kwbcs0jySLxzLsa2nWUAGOd/s21WU1jebrEdtzhsj1D4Yps1EOuyI1Qcu+FD56dL7NRNIJtDDjcqIG22NwkgLw==" } } }, @@ -8995,9 +9003,9 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "sass": { - "version": "1.26.9", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.26.9.tgz", - "integrity": "sha512-t8AkRVi+xvba4yZiLWkJdgJHBFCB3Dh4johniQkPy9ywkgFHNasXFEFP+RG/F6LhQ+aoE4aX+IorIWQjS0esVw==", + "version": "1.26.10", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.26.10.tgz", + "integrity": "sha512-bzN0uvmzfsTvjz0qwccN1sPm2HxxpNI/Xa+7PlUEMS+nQvbyuEK7Y0qFqxlPHhiNHb1Ze8WQJtU31olMObkAMw==", "dev": true, "requires": { "chokidar": ">=2.0.0 <4.0.0" @@ -10226,9 +10234,9 @@ "dev": true }, "typescript": { - "version": "3.9.6", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.6.tgz", - "integrity": "sha512-Pspx3oKAPJtjNwE92YS05HQoY7z2SFyOpHo9MqJor3BXAGNaPUs83CuVp9VISFkSjyRfiTpmKuAYGJB7S7hOxw==", + "version": "3.9.7", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz", + "integrity": "sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==", "dev": true }, "uglify-js": { @@ -10553,9 +10561,9 @@ "integrity": "sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ==" }, "vue-class-component": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/vue-class-component/-/vue-class-component-7.2.3.tgz", - "integrity": "sha512-oEqYpXKaFN+TaXU+mRLEx8dX0ah85aAJEe61mpdoUrq0Bhe/6sWhyZX1JjMQLhVsHAkncyhedhmCdDVSasUtDw==" + "version": "7.2.5", + "resolved": "https://registry.npmjs.org/vue-class-component/-/vue-class-component-7.2.5.tgz", + "integrity": "sha512-0CSftHY0bDTD+4FbYkuFf6+iKDjZ4h2in2YYJDRMk5daZIjrgT9LjFHvP7Rzqy9/s1pij3zDtTSLRUjsPWMwqg==" }, "vue-hot-reload-api": { "version": "2.3.4", @@ -10593,9 +10601,9 @@ } }, "vue-router": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.3.4.tgz", - "integrity": "sha512-SdKRBeoXUjaZ9R/8AyxsdTqkOfMcI5tWxPZOUX5Ie1BTL5rPSZ0O++pbiZCeYeythiZIdLEfkDiQPKIaWk5hDg==" + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.4.3.tgz", + "integrity": "sha512-BADg1mjGWX18Dpmy6bOGzGNnk7B/ZA0RxuA6qedY/YJwirMfKXIDzcccmHbQI0A6k5PzMdMloc0ElHfyOoX35A==" }, "vue-style-loader": { "version": "4.1.2", @@ -11249,9 +11257,9 @@ "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==" }, "whatwg-fetch": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.2.0.tgz", - "integrity": "sha512-SdGPoQMMnzVYThUbSrEvqTlkvC1Ux27NehaJ/GUHBfNrh5Mjg+1/uRyFMwVnxO2MrikMWvWAqUGgQOfVU4hT7w==" + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.4.0.tgz", + "integrity": "sha512-rsum2ulz2iuZH08mJkT0Yi6JnKhwdw4oeyMjokgxd+mmqYSd9cPpOQf01TIWgjxG/U4+QR+AwKq6lSbXVxkyoQ==" }, "which": { "version": "1.3.1", diff --git a/package.json b/package.json index b645602..4c83e19 100644 --- a/package.json +++ b/package.json @@ -9,11 +9,11 @@ }, "dependencies": { "core-js": "^3.6.5", - "firebase": "^7.16.1", + "firebase": "^7.18.0", "vue": "^2.6.11", - "vue-class-component": "^7.2.3", + "vue-class-component": "^7.2.5", "vue-property-decorator": "^8.4.2", - "vue-router": "^3.2.0", + "vue-router": "^3.4.3", "vuex": "^3.4.0" }, "devDependencies": { @@ -23,9 +23,10 @@ "@vue/cli-plugin-vuex": "~4.4.0", "@vue/cli-service": "~4.4.0", "axios": "^0.19.2", - "sass": "^1.26.5", + "dotenv": "^8.2.0", + "sass": "^1.26.10", "sass-loader": "^8.0.2", - "typescript": "~3.9.3", + "typescript": "^3.9.7", "vue-template-compiler": "^2.6.11", "vuex-class": "^0.3.2", "vuex-module-decorators": "^0.17.0" diff --git a/src/data/stations.json b/src/data/stations.json index 552d45a..6e87f8c 100644 --- a/src/data/stations.json +++ b/src/data/stations.json @@ -1716,5 +1716,28 @@ }, "default": false, "nonPublic": false - } + }, + { + "stationName": "Sól", + "stationURL": "https://td2.info.pl/scenerie/sol/", + "stationLines": "139", + "reqLevel": "0", + "supportersOnly": "NIE", + "signalType": "współczesna", + "controlType": "SPK", + "SBL": "", + "twoWayBlock": "", + "routes": { + "oneWay": { + "catenary": 2, + "noCatenary": 0 + }, + "twoWay": { + "catenary": 0, + "noCatenary": 0 + } + }, + "default": false, + "nonPublic": false + } ] \ No newline at end of file diff --git a/src/scripts/firebase/firebaseInit.ts b/src/scripts/firebase/firebaseInit.ts index 40c4eb7..28429e8 100644 --- a/src/scripts/firebase/firebaseInit.ts +++ b/src/scripts/firebase/firebaseInit.ts @@ -1,8 +1,10 @@ import * as firebase from "firebase/app"; import "firebase/firestore"; +require("dotenv").config(); + firebase.initializeApp({ - apiKey: "AIzaSyBI36X2-p7vU1flxoJdCEc0noByyTe1mpw", + apiKey: process.env.API_KEY, authDomain: "stacjownik-td2.firebaseapp.com", databaseURL: "https://stacjownik-td2.firebaseio.com", projectId: "stacjownik-td2", diff --git a/src/views/TrainsView.vue b/src/views/TrainsView.vue index 7b57036..27fdabf 100644 --- a/src/views/TrainsView.vue +++ b/src/views/TrainsView.vue @@ -3,7 +3,7 @@
-
+
  • @@ -298,7 +298,7 @@ export default class TrainsView extends Vue { .body-wrapper { margin: 0 auto; - max-width: 1024px; + max-width: 1250px; } .list { @@ -313,7 +313,7 @@ export default class TrainsView extends Vue { display: grid; grid-template-columns: repeat(auto-fit, minmax(0, 1fr)); - font-size: calc(0.5rem + 0.5vw); + font-size: calc(0.4rem + 0.5vw); background-color: #444; padding: 1rem; diff --git a/ui-debug.log b/ui-debug.log deleted file mode 100644 index 2f9d04d..0000000 --- a/ui-debug.log +++ /dev/null @@ -1 +0,0 @@ -Web / API server started at http://localhost:4000