From eff12562659d781b36a8806d265d1bef755e5c44 Mon Sep 17 00:00:00 2001 From: Spythere Date: Thu, 25 May 2023 15:31:25 +0200 Subject: [PATCH 1/5] fix: kategorie generatora nr --- src/constants/numberGeneratorData.json | 5 +- yarn.lock | 258 ++++++++++++++++--------- 2 files changed, 171 insertions(+), 92 deletions(-) diff --git a/src/constants/numberGeneratorData.json b/src/constants/numberGeneratorData.json index 0e639a8..df3c640 100644 --- a/src/constants/numberGeneratorData.json +++ b/src/constants/numberGeneratorData.json @@ -27,9 +27,8 @@ }, "categories": { "ekspres krajowy (EI)": "2:00-99:2", - "międzywojewódzki pośpieszny (MP)": "2:050-169:3", - "wojewódzki pośpieszny (RP)": "2:050-169:3", - "wojewódzki osobowy (RO)": "2:200-999:3", + "(między)wojewódzki pośpieszny (MP/RP)": "2:050-169:3", + "wojewódzki osobowy (RO)": "2:200-999:3:", "próżny \"służbowy\" (PW)": "2:6;3:0-899:3", "towarowy do przewozów masowych (TM)": "2:4;3:0-899:3", "towarowy do obsługi stacji (TK)": "2:3;3:0-899:3", diff --git a/yarn.lock b/yarn.lock index 1a5c491..f8985e7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -31,7 +31,7 @@ resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.1.tgz" integrity sha512-EWZ4mE2diW3QALKvDMiXnbZpRvlj+nayZ112nK93SnhqOtpdsbVD4W+2tEoT3YNBAG9RBR0ISY758ZkOgsn6pQ== -"@babel/core@^7.0.0", "@babel/core@^7.0.0-0", "@babel/core@^7.11.1", "@babel/core@^7.12.0", "@babel/core@^7.13.0", "@babel/core@^7.4.0-0": +"@babel/core@^7.11.1": version "7.20.2" resolved "https://registry.npmjs.org/@babel/core/-/core-7.20.2.tgz" integrity sha512-w7DbG8DtMrJcFOi4VrLm+8QM4az8Mo+PuLBKLp2zrYRCow8W/f9xiXm5sN53C8HksCyDQwCKha9JiDoIyPjT2g== @@ -909,6 +909,111 @@ "@babel/helper-validator-identifier" "^7.19.1" to-fast-properties "^2.0.0" +"@esbuild/android-arm64@0.17.15": + version "0.17.15" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.17.15.tgz#893ad71f3920ccb919e1757c387756a9bca2ef42" + integrity sha512-0kOB6Y7Br3KDVgHeg8PRcvfLkq+AccreK///B4Z6fNZGr/tNHX0z2VywCc7PTeWp+bPvjA5WMvNXltHw5QjAIA== + +"@esbuild/android-arm@0.17.15": + version "0.17.15" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.17.15.tgz#143e0d4e4c08c786ea410b9a7739779a9a1315d8" + integrity sha512-sRSOVlLawAktpMvDyJIkdLI/c/kdRTOqo8t6ImVxg8yT7LQDUYV5Rp2FKeEosLr6ZCja9UjYAzyRSxGteSJPYg== + +"@esbuild/android-x64@0.17.15": + version "0.17.15" + resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.17.15.tgz#d2d12a7676b2589864281b2274355200916540bc" + integrity sha512-MzDqnNajQZ63YkaUWVl9uuhcWyEyh69HGpMIrf+acR4otMkfLJ4sUCxqwbCyPGicE9dVlrysI3lMcDBjGiBBcQ== + +"@esbuild/darwin-arm64@0.17.15": + version "0.17.15" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.17.15.tgz#2e88e79f1d327a2a7d9d06397e5232eb0a473d61" + integrity sha512-7siLjBc88Z4+6qkMDxPT2juf2e8SJxmsbNVKFY2ifWCDT72v5YJz9arlvBw5oB4W/e61H1+HDB/jnu8nNg0rLA== + +"@esbuild/darwin-x64@0.17.15": + version "0.17.15" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.17.15.tgz#9384e64c0be91388c57be6d3a5eaf1c32a99c91d" + integrity sha512-NbImBas2rXwYI52BOKTW342Tm3LTeVlaOQ4QPZ7XuWNKiO226DisFk/RyPk3T0CKZkKMuU69yOvlapJEmax7cg== + +"@esbuild/freebsd-arm64@0.17.15": + version "0.17.15" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.15.tgz#2ad5a35bc52ebd9ca6b845dbc59ba39647a93c1a" + integrity sha512-Xk9xMDjBVG6CfgoqlVczHAdJnCs0/oeFOspFap5NkYAmRCT2qTn1vJWA2f419iMtsHSLm+O8B6SLV/HlY5cYKg== + +"@esbuild/freebsd-x64@0.17.15": + version "0.17.15" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.17.15.tgz#b513a48446f96c75fda5bef470e64d342d4379cd" + integrity sha512-3TWAnnEOdclvb2pnfsTWtdwthPfOz7qAfcwDLcfZyGJwm1SRZIMOeB5FODVhnM93mFSPsHB9b/PmxNNbSnd0RQ== + +"@esbuild/linux-arm64@0.17.15": + version "0.17.15" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.17.15.tgz#9697b168175bfd41fa9cc4a72dd0d48f24715f31" + integrity sha512-T0MVnYw9KT6b83/SqyznTs/3Jg2ODWrZfNccg11XjDehIved2oQfrX/wVuev9N936BpMRaTR9I1J0tdGgUgpJA== + +"@esbuild/linux-arm@0.17.15": + version "0.17.15" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.17.15.tgz#5b22062c54f48cd92fab9ffd993732a52db70cd3" + integrity sha512-MLTgiXWEMAMr8nmS9Gigx43zPRmEfeBfGCwxFQEMgJ5MC53QKajaclW6XDPjwJvhbebv+RzK05TQjvH3/aM4Xw== + +"@esbuild/linux-ia32@0.17.15": + version "0.17.15" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.17.15.tgz#eb28a13f9b60b5189fcc9e98e1024f6b657ba54c" + integrity sha512-wp02sHs015T23zsQtU4Cj57WiteiuASHlD7rXjKUyAGYzlOKDAjqK6bk5dMi2QEl/KVOcsjwL36kD+WW7vJt8Q== + +"@esbuild/linux-loong64@0.17.15": + version "0.17.15" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.17.15.tgz#32454bdfe144cf74b77895a8ad21a15cb81cfbe5" + integrity sha512-k7FsUJjGGSxwnBmMh8d7IbObWu+sF/qbwc+xKZkBe/lTAF16RqxRCnNHA7QTd3oS2AfGBAnHlXL67shV5bBThQ== + +"@esbuild/linux-mips64el@0.17.15": + version "0.17.15" + resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.17.15.tgz#af12bde0d775a318fad90eb13a0455229a63987c" + integrity sha512-ZLWk6czDdog+Q9kE/Jfbilu24vEe/iW/Sj2d8EVsmiixQ1rM2RKH2n36qfxK4e8tVcaXkvuV3mU5zTZviE+NVQ== + +"@esbuild/linux-ppc64@0.17.15": + version "0.17.15" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.17.15.tgz#34c5ed145b2dfc493d3e652abac8bd3baa3865a5" + integrity sha512-mY6dPkIRAiFHRsGfOYZC8Q9rmr8vOBZBme0/j15zFUKM99d4ILY4WpOC7i/LqoY+RE7KaMaSfvY8CqjJtuO4xg== + +"@esbuild/linux-riscv64@0.17.15": + version "0.17.15" + resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.17.15.tgz#87bd515e837f2eb004b45f9e6a94dc5b93f22b92" + integrity sha512-EcyUtxffdDtWjjwIH8sKzpDRLcVtqANooMNASO59y+xmqqRYBBM7xVLQhqF7nksIbm2yHABptoioS9RAbVMWVA== + +"@esbuild/linux-s390x@0.17.15": + version "0.17.15" + resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.17.15.tgz#20bf7947197f199ddac2ec412029a414ceae3aa3" + integrity sha512-BuS6Jx/ezxFuHxgsfvz7T4g4YlVrmCmg7UAwboeyNNg0OzNzKsIZXpr3Sb/ZREDXWgt48RO4UQRDBxJN3B9Rbg== + +"@esbuild/linux-x64@0.17.15": + version "0.17.15" + resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.17.15.tgz#31b93f9c94c195e852c20cd3d1914a68aa619124" + integrity sha512-JsdS0EgEViwuKsw5tiJQo9UdQdUJYuB+Mf6HxtJSPN35vez1hlrNb1KajvKWF5Sa35j17+rW1ECEO9iNrIXbNg== + +"@esbuild/netbsd-x64@0.17.15": + version "0.17.15" + resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.17.15.tgz#8da299b3ac6875836ca8cdc1925826498069ac65" + integrity sha512-R6fKjtUysYGym6uXf6qyNephVUQAGtf3n2RCsOST/neIwPqRWcnc3ogcielOd6pT+J0RDR1RGcy0ZY7d3uHVLA== + +"@esbuild/openbsd-x64@0.17.15": + version "0.17.15" + resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.17.15.tgz#04a1ec3d4e919714dba68dcf09eeb1228ad0d20c" + integrity sha512-mVD4PGc26b8PI60QaPUltYKeSX0wxuy0AltC+WCTFwvKCq2+OgLP4+fFd+hZXzO2xW1HPKcytZBdjqL6FQFa7w== + +"@esbuild/sunos-x64@0.17.15": + version "0.17.15" + resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.17.15.tgz#6694ebe4e16e5cd7dab6505ff7c28f9c1c695ce5" + integrity sha512-U6tYPovOkw3459t2CBwGcFYfFRjivcJJc1WC8Q3funIwX8x4fP+R6xL/QuTPNGOblbq/EUDxj9GU+dWKX0oWlQ== + +"@esbuild/win32-arm64@0.17.15": + version "0.17.15" + resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.17.15.tgz#1f95b2564193c8d1fee8f8129a0609728171d500" + integrity sha512-W+Z5F++wgKAleDABemiyXVnzXgvRFs+GVKThSI+mGgleLWluv0D7Diz4oQpgdpNzh4i2nNDzQtWbjJiqutRp6Q== + +"@esbuild/win32-ia32@0.17.15": + version "0.17.15" + resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.17.15.tgz#c362b88b3df21916ed7bcf75c6d09c6bf3ae354a" + integrity sha512-Muz/+uGgheShKGqSVS1KsHtCyEzcdOn/W/Xbh6H91Etm+wiIfwZaBn1W58MeGtfI8WA961YMHFYTthBdQs4t+w== + "@esbuild/win32-x64@0.17.15": version "0.17.15" resolved "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.15.tgz" @@ -922,16 +1027,7 @@ "@jridgewell/set-array" "^1.0.0" "@jridgewell/sourcemap-codec" "^1.4.10" -"@jridgewell/gen-mapping@^0.3.0": - version "0.3.2" - resolved "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz" - integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A== - dependencies: - "@jridgewell/set-array" "^1.0.1" - "@jridgewell/sourcemap-codec" "^1.4.10" - "@jridgewell/trace-mapping" "^0.3.9" - -"@jridgewell/gen-mapping@^0.3.2": +"@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2": version "0.3.2" resolved "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz" integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A== @@ -958,7 +1054,7 @@ "@jridgewell/gen-mapping" "^0.3.0" "@jridgewell/trace-mapping" "^0.3.9" -"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.13", "@jridgewell/sourcemap-codec@1.4.14": +"@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.13": version "1.4.14" resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz" integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== @@ -979,7 +1075,7 @@ "@nodelib/fs.stat" "2.0.5" run-parallel "^1.1.9" -"@nodelib/fs.stat@^2.0.2", "@nodelib/fs.stat@2.0.5": +"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": version "2.0.5" resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz" integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== @@ -1056,17 +1152,17 @@ magic-string "^0.25.0" string.prototype.matchall "^4.0.6" -"@types/estree@^1.0.0": - version "1.0.0" - resolved "https://registry.npmjs.org/@types/estree/-/estree-1.0.0.tgz" - integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ== - "@types/estree@0.0.39": version "0.0.39" resolved "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz" integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw== -"@types/node@*", "@types/node@>= 14": +"@types/estree@^1.0.0": + version "1.0.0" + resolved "https://registry.npmjs.org/@types/estree/-/estree-1.0.0.tgz" + integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ== + +"@types/node@*": version "18.11.9" resolved "https://registry.npmjs.org/@types/node/-/node-18.11.9.tgz" integrity sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg== @@ -1152,14 +1248,6 @@ estree-walker "^2.0.2" source-map "^0.6.1" -"@vue/compiler-dom@^3.2.47", "@vue/compiler-dom@3.2.47": - version "3.2.47" - resolved "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.47.tgz" - integrity sha512-dBBnEHEPoftUiS03a4ggEig74J2YBZ2UIeyfpcRM2tavgMWo4bsEfgCGsu+uJIL/vax9S+JztH8NmQerUo7shQ== - dependencies: - "@vue/compiler-core" "3.2.47" - "@vue/shared" "3.2.47" - "@vue/compiler-dom@3.2.37": version "3.2.37" resolved "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.37.tgz" @@ -1168,21 +1256,13 @@ "@vue/compiler-core" "3.2.37" "@vue/shared" "3.2.37" -"@vue/compiler-sfc@^3.2.47": +"@vue/compiler-dom@3.2.47", "@vue/compiler-dom@^3.2.47": version "3.2.47" - resolved "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.47.tgz" - integrity sha512-rog05W+2IFfxjMcFw10tM9+f7i/+FFpZJJ5XHX72NP9eC2uRD+42M3pYcQqDXVYoj74kHMSEdQ/WmCjt8JFksQ== + resolved "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.47.tgz" + integrity sha512-dBBnEHEPoftUiS03a4ggEig74J2YBZ2UIeyfpcRM2tavgMWo4bsEfgCGsu+uJIL/vax9S+JztH8NmQerUo7shQ== dependencies: - "@babel/parser" "^7.16.4" "@vue/compiler-core" "3.2.47" - "@vue/compiler-dom" "3.2.47" - "@vue/compiler-ssr" "3.2.47" - "@vue/reactivity-transform" "3.2.47" "@vue/shared" "3.2.47" - estree-walker "^2.0.2" - magic-string "^0.25.7" - postcss "^8.1.10" - source-map "^0.6.1" "@vue/compiler-sfc@3.2.37": version "3.2.37" @@ -1200,6 +1280,22 @@ postcss "^8.1.10" source-map "^0.6.1" +"@vue/compiler-sfc@^3.2.47": + version "3.2.47" + resolved "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.47.tgz" + integrity sha512-rog05W+2IFfxjMcFw10tM9+f7i/+FFpZJJ5XHX72NP9eC2uRD+42M3pYcQqDXVYoj74kHMSEdQ/WmCjt8JFksQ== + dependencies: + "@babel/parser" "^7.16.4" + "@vue/compiler-core" "3.2.47" + "@vue/compiler-dom" "3.2.47" + "@vue/compiler-ssr" "3.2.47" + "@vue/reactivity-transform" "3.2.47" + "@vue/shared" "3.2.47" + estree-walker "^2.0.2" + magic-string "^0.25.7" + postcss "^8.1.10" + source-map "^0.6.1" + "@vue/compiler-ssr@3.2.37": version "3.2.37" resolved "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.37.tgz" @@ -1243,13 +1339,6 @@ estree-walker "^2.0.2" magic-string "^0.25.7" -"@vue/reactivity@^3.2.47": - version "3.2.47" - resolved "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.47.tgz" - integrity sha512-7khqQ/75oyyg+N/e+iwV6lpy1f5wq759NdlS1fpAhFXa8VeAIKGgk2E/C4VF59lx5b+Ezs5fpp/5WsRYXQiKxQ== - dependencies: - "@vue/shared" "3.2.47" - "@vue/reactivity@3.2.37": version "3.2.37" resolved "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.37.tgz" @@ -1257,6 +1346,13 @@ dependencies: "@vue/shared" "3.2.37" +"@vue/reactivity@^3.2.47": + version "3.2.47" + resolved "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.47.tgz" + integrity sha512-7khqQ/75oyyg+N/e+iwV6lpy1f5wq759NdlS1fpAhFXa8VeAIKGgk2E/C4VF59lx5b+Ezs5fpp/5WsRYXQiKxQ== + dependencies: + "@vue/shared" "3.2.47" + "@vue/runtime-core@3.2.37": version "3.2.37" resolved "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.37.tgz" @@ -1282,22 +1378,22 @@ "@vue/compiler-ssr" "3.2.37" "@vue/shared" "3.2.37" -"@vue/shared@^3.2.47", "@vue/shared@3.2.47": - version "3.2.47" - resolved "https://registry.npmjs.org/@vue/shared/-/shared-3.2.47.tgz" - integrity sha512-BHGyyGN3Q97EZx0taMQ+OLNuZcW3d37ZEVmEAyeoA9ERdGvm9Irc/0Fua8SNyOtV1w6BS4q25wbMzJujO9HIfQ== - "@vue/shared@3.2.37": version "3.2.37" resolved "https://registry.npmjs.org/@vue/shared/-/shared-3.2.37.tgz" integrity sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw== +"@vue/shared@3.2.47", "@vue/shared@^3.2.47": + version "3.2.47" + resolved "https://registry.npmjs.org/@vue/shared/-/shared-3.2.47.tgz" + integrity sha512-BHGyyGN3Q97EZx0taMQ+OLNuZcW3d37ZEVmEAyeoA9ERdGvm9Irc/0Fua8SNyOtV1w6BS4q25wbMzJujO9HIfQ== + acorn@^8.5.0: version "8.8.1" resolved "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz" integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA== -ajv@^8.6.0, ajv@>=8: +ajv@^8.6.0: version "8.11.0" resolved "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz" integrity sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg== @@ -1395,7 +1491,7 @@ braces@^3.0.2, braces@~3.0.2: dependencies: fill-range "^7.0.1" -browserslist@^4.21.3, browserslist@^4.21.4, "browserslist@>= 4.21.0": +browserslist@^4.21.3, browserslist@^4.21.4: version "4.21.4" resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz" integrity sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw== @@ -1474,16 +1570,16 @@ color-convert@^2.0.1: dependencies: color-name "~1.1.4" -color-name@~1.1.4: - version "1.1.4" - resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz" - integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== - color-name@1.1.3: version "1.1.3" resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz" integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== +color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + commander@^2.20.0: version "2.20.3" resolved "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz" @@ -1707,6 +1803,11 @@ fs.realpath@^1.0.0: resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== +fsevents@~2.3.2: + version "2.3.2" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" + integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== + function-bind@^1.1.1: version "1.1.1" resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz" @@ -2102,14 +2203,7 @@ micromatch@^4.0.4: braces "^3.0.2" picomatch "^2.3.1" -minimatch@^3.0.4: - version "3.1.2" - resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz" - integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== - dependencies: - brace-expansion "^1.1.7" - -minimatch@^3.1.1: +minimatch@^3.0.4, minimatch@^3.1.1: version "3.1.2" resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz" integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== @@ -2339,21 +2433,14 @@ rollup-plugin-terser@^7.0.0: serialize-javascript "^4.0.0" terser "^5.0.0" -"rollup@^1.20.0 || ^2.0.0", rollup@^1.20.0||^2.0.0, rollup@^1.20.0||^2.0.0||^3.0.0, rollup@^2.0.0, rollup@^2.43.1: +rollup@^2.43.1: version "2.79.1" resolved "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz" integrity sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw== optionalDependencies: fsevents "~2.3.2" -rollup@^3.18.0: - version "3.20.2" - resolved "https://registry.npmjs.org/rollup/-/rollup-3.20.2.tgz" - integrity sha512-3zwkBQl7Ai7MFYQE0y1MeQ15+9jsi7XxfrqwTb/9EK8D9C9+//EBR4M+CuA1KODRaNbFez/lWxA5vhEGZp4MUg== - optionalDependencies: - fsevents "~2.3.2" - -rollup@^3.7.2: +rollup@^3.18.0, rollup@^3.7.2: version "3.20.2" resolved "https://registry.npmjs.org/rollup/-/rollup-3.20.2.tgz" integrity sha512-3zwkBQl7Ai7MFYQE0y1MeQ15+9jsi7XxfrqwTb/9EK8D9C9+//EBR4M+CuA1KODRaNbFez/lWxA5vhEGZp4MUg== @@ -2381,7 +2468,7 @@ safe-regex-test@^1.0.0: get-intrinsic "^1.1.3" is-regex "^1.1.4" -sass@*, sass@^1.59.3: +sass@^1.59.3: version "1.61.0" resolved "https://registry.npmjs.org/sass/-/sass-1.61.0.tgz" integrity sha512-PDsN7BrVkNZK2+dj/dpKQAWZavbAQ87IXqVvw2+oEYI+GwlTWkvbQtL7F2cCNbMqJEYKPh1EcjSxsnqIb/kyaQ== @@ -2411,7 +2498,7 @@ side-channel@^1.0.4: get-intrinsic "^1.0.2" object-inspect "^1.9.0" -source-map-js@^1.0.2, "source-map-js@>=0.6.2 <2.0.0": +"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== @@ -2494,14 +2581,7 @@ supports-color@^5.3.0: dependencies: has-flag "^3.0.0" -supports-color@^7.0.0: - version "7.2.0" - resolved "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz" - integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== - dependencies: - has-flag "^4.0.0" - -supports-color@^7.1.0: +supports-color@^7.0.0, supports-color@^7.1.0: version "7.2.0" resolved "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz" integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== @@ -2528,7 +2608,7 @@ tempy@^0.6.0: type-fest "^0.16.0" unique-string "^2.0.0" -terser@^5.0.0, terser@^5.4.0: +terser@^5.0.0: version "5.15.1" resolved "https://registry.npmjs.org/terser/-/terser-5.15.1.tgz" integrity sha512-K1faMUvpm/FBxjBXud0LWVAGxmvoPbZbfTCYbSgaaYQaIXI3/TdI7a7ZGA73Zrou6Q8Zmz3oeUTsp/dj+ag2Xw== @@ -2562,7 +2642,7 @@ type-fest@^0.16.0: resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.16.0.tgz" integrity sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg== -typescript@*, typescript@^5.0.2, typescript@>=4.4.4: +typescript@^5.0.2: version "5.0.3" resolved "https://registry.npmjs.org/typescript/-/typescript-5.0.3.tgz" integrity sha512-xv8mOEDnigb/tN9PSMTwSEqAnUvkoXMQlicOb0IUVDBSQCgBSaAAROUZYy2IcUy5qU6XajK5jjjO7TMWqBTKZA== @@ -2645,7 +2725,7 @@ vite-plugin-pwa@^0.14.6: workbox-build "^6.5.4" workbox-window "^6.5.4" -"vite@^3.1.0 || ^4.0.0", vite@^4.0.0, vite@^4.2.1: +vite@^4.2.1: version "4.2.1" resolved "https://registry.npmjs.org/vite/-/vite-4.2.1.tgz" integrity sha512-7MKhqdy0ISo4wnvwtqZkjke6XN4taqQ2TBaTccLIpOKv7Vp2h4Y+NpmWCnGDeSvvn45KxvWgGyb0MkHvY1vgbg== @@ -2678,7 +2758,7 @@ vue-tsc@^1.2.0: "@volar/vue-language-core" "1.2.0" "@volar/vue-typescript" "1.2.0" -"vue@^2.6.14 || ^3.2.0", "vue@^3.0.0-0 || ^2.6.0", vue@^3.2.25, vue@^3.2.37, vue@3.2.37: +vue@^3.2.37: version "3.2.37" resolved "https://registry.npmjs.org/vue/-/vue-3.2.37.tgz" integrity sha512-bOKEZxrm8Eh+fveCqS1/NkG/n6aMidsI6hahas7pa0w/l7jkbssJVsRhVDs07IdDq7h9KHswZOgItnwJAgtVtQ== @@ -2864,7 +2944,7 @@ workbox-sw@6.5.4: resolved "https://registry.npmjs.org/workbox-sw/-/workbox-sw-6.5.4.tgz" integrity sha512-vo2RQo7DILVRoH5LjGqw3nphavEjK4Qk+FenXeUsknKn14eCNedHOXWbmnvP4ipKhlE35pvJ4yl4YYf6YsJArA== -workbox-window@^6.5.4, workbox-window@6.5.4: +workbox-window@6.5.4, workbox-window@^6.5.4: version "6.5.4" resolved "https://registry.npmjs.org/workbox-window/-/workbox-window-6.5.4.tgz" integrity sha512-HnLZJDwYBE+hpG25AQBO8RUWBJRaCsI9ksQJEp3aCOFCaG5kqaToAYXFRAHxzRluM2cQbGzdQF5rjKPWPA1fug== From fa610f6ee12c2232975558e7d4739bfe7e43be22 Mon Sep 17 00:00:00 2001 From: Spythere Date: Thu, 25 May 2023 19:06:42 +0200 Subject: [PATCH 2/5] =?UTF-8?q?feature:=20losowanie=20obszar=C3=B3w=20kons?= =?UTF-8?q?tr.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/tabs/NumberGeneratorTab.vue | 62 ++++++++++++++++------ src/constants/numberGeneratorData.json | 2 +- src/styles/global.scss | 2 + 3 files changed, 48 insertions(+), 18 deletions(-) diff --git a/src/components/tabs/NumberGeneratorTab.vue b/src/components/tabs/NumberGeneratorTab.vue index ffb4136..28dcaff 100644 --- a/src/components/tabs/NumberGeneratorTab.vue +++ b/src/components/tabs/NumberGeneratorTab.vue @@ -6,31 +6,40 @@
- - -
- Wygenerowany numer pociągu: {{ trainNumber }} - Wybierz obszary konstrukcyjne i kategorię! + + Wygenerowany numer pociągu: {{ trainNumber }} + + Wybierz kategorię oraz obszary konstrukcyjne (opcjonalnie)
-
- +
+ + > Szczegółowe zasady numeracji (wikipedia TD2) + +
+ +
+
- + +
@@ -49,22 +58,36 @@ const categoryRules = ref(null) as Ref; const trainNumber = ref(null) as Ref; -const randomizeTrainNumber = () => { - if (beginRegionName.value == null || endRegionName.value == null || categoryRules.value == null) return ''; +const randomizeTrainNumber = (randomizeRegions = false) => { + if (categoryRules.value == null) return; + + const regionKeys = Object.keys(genData.regionNumbers); + + if (beginRegionName.value == null || randomizeRegions) + beginRegionName.value = regionKeys[(regionKeys.length * Math.random()) << 0] as RegionName; + + if (endRegionName.value == null || randomizeRegions) + endRegionName.value = regionKeys[(regionKeys.length * Math.random()) << 0] as RegionName; let number = ''; if (beginRegionName.value == endRegionName.value) { - const sameRegionsNumbers = genData.sameRegions[beginRegionName.value]; + const sameRegionsNumbers = genData.sameRegions[beginRegionName.value!]; const randRegionNumber = sameRegionsNumbers[Math.floor(Math.random() * sameRegionsNumbers.length)]; number += randRegionNumber.toString(); } else { - const beginRegionNumber = genData.regionNumbers[beginRegionName.value]; - const endRegionNumber = genData.regionNumbers[endRegionName.value]; + const beginRegionNumber = genData.regionNumbers[beginRegionName.value!]; + const endRegionNumber = genData.regionNumbers[endRegionName.value!]; number += `${beginRegionNumber}${endRegionNumber}`; } + // Do not roll the rest of number again if only randomize regions + if (randomizeRegions) { + trainNumber.value = number + trainNumber.value?.substring(2); + return; + } + const rulesArray = categoryRules.value.split(';').map((r) => ({ index: r.split(':')[0], rule: r.split(':')[1], @@ -104,6 +127,9 @@ const randomizeTrainNumber = () => { .generated-number { font-size: 1.3em; font-weight: bold; + text-align: center; + + cursor: pointer; margin: 0.5em 0; padding: 0.5em; @@ -111,11 +137,13 @@ const randomizeTrainNumber = () => { } .tab_actions { - margin-top: 0.5em; + grid-template-columns: 1fr 1fr; + margin: 0.5em 0; +} - button { - grid-column: 3; - } +.tab_links { + display: flex; + justify-content: flex-end; } @media screen and (max-width: $breakpointMd) { diff --git a/src/constants/numberGeneratorData.json b/src/constants/numberGeneratorData.json index df3c640..ad6cd4c 100644 --- a/src/constants/numberGeneratorData.json +++ b/src/constants/numberGeneratorData.json @@ -28,7 +28,7 @@ "categories": { "ekspres krajowy (EI)": "2:00-99:2", "(między)wojewódzki pośpieszny (MP/RP)": "2:050-169:3", - "wojewódzki osobowy (RO)": "2:200-999:3:", + "wojewódzki osobowy (RO)": "2:200-999:3", "próżny \"służbowy\" (PW)": "2:6;3:0-899:3", "towarowy do przewozów masowych (TM)": "2:4;3:0-899:3", "towarowy do obsługi stacji (TK)": "2:3;3:0-899:3", diff --git a/src/styles/global.scss b/src/styles/global.scss index 0a389a3..1160b4e 100644 --- a/src/styles/global.scss +++ b/src/styles/global.scss @@ -48,6 +48,8 @@ a { color: white; text-decoration: none; + transition: color 250ms; + &:visited { color: white; } From 6eb73ba743144a7973cec0ad0cf5cdb6b35f4c90 Mon Sep 17 00:00:00 2001 From: Spythere Date: Thu, 25 May 2023 19:27:01 +0200 Subject: [PATCH 3/5] =?UTF-8?q?feature:=20routing=20pomi=C4=99dzy=20tabami?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 44 ++++++++++++------------- src/App.vue | 12 +++++++ src/components/sections/LogoSection.vue | 12 +++++-- 3 files changed, 44 insertions(+), 24 deletions(-) diff --git a/package.json b/package.json index 0642cd1..8a17cc3 100644 --- a/package.json +++ b/package.json @@ -1,22 +1,22 @@ -{ - "name": "pojazdownik", - "version": "1.4.0", - "private": true, - "scripts": { - "dev": "vite", - "build": "vue-tsc --noEmit && vite build", - "preview": "yarn build && vite preview --port 4174" - }, - "dependencies": { - "pinia": "^2.0.17", - "vue": "^3.2.37" - }, - "devDependencies": { - "@vitejs/plugin-vue": "^4.1.0", - "sass": "^1.59.3", - "typescript": "^5.0.2", - "vite": "^4.2.1", - "vite-plugin-pwa": "^0.14.6", - "vue-tsc": "^1.2.0" - } -} +{ + "name": "pojazdownik", + "version": "1.4.0", + "private": true, + "scripts": { + "dev": "vite", + "build": "vue-tsc --noEmit && vite build", + "preview": "yarn build && vite preview --port 4174" + }, + "dependencies": { + "pinia": "^2.0.17", + "vue": "^3.2.37" + }, + "devDependencies": { + "@vitejs/plugin-vue": "^4.1.0", + "sass": "^1.59.3", + "typescript": "^5.0.2", + "vite": "^4.2.1", + "vite-plugin-pwa": "^0.14.6", + "vue-tsc": "^1.2.0" + } +} diff --git a/src/App.vue b/src/App.vue index 81a5715..b42774d 100644 --- a/src/App.vue +++ b/src/App.vue @@ -77,6 +77,18 @@ export default defineComponent({ ).json(); this.store.stockData = stockData; + + // routing + switch (window.location.pathname) { + case '/numgnr': + this.store.stockSectionMode = 'number-generator'; + break; + case '/stockgnr': + this.store.stockSectionMode = 'stock-generator'; + break; + default: + break; + } }, }); diff --git a/src/components/sections/LogoSection.vue b/src/components/sections/LogoSection.vue index b3c308b..a78766d 100644 --- a/src/components/sections/LogoSection.vue +++ b/src/components/sections/LogoSection.vue @@ -1,5 +1,5 @@ @@ -9,6 +9,12 @@ export default { setup() { return {}; }, + + methods: { + navigate() { + window.location.pathname = ''; + }, + }, }; @@ -21,11 +27,13 @@ export default { display: flex; justify-content: center; align-items: center; + + cursor: pointer; } img { max-width: 25em; - width: 100%; + width: 100%; } From 885cb49f2f68537be88435f220103ebd2dac5806 Mon Sep 17 00:00:00 2001 From: Spythere Date: Thu, 25 May 2023 19:29:51 +0200 Subject: [PATCH 4/5] =?UTF-8?q?feature:=20kopiowanie=20nr=20poci=C4=85gu?= =?UTF-8?q?=20po=20klikni=C4=99ciu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/tabs/NumberGeneratorTab.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/components/tabs/NumberGeneratorTab.vue b/src/components/tabs/NumberGeneratorTab.vue index 28dcaff..142ca97 100644 --- a/src/components/tabs/NumberGeneratorTab.vue +++ b/src/components/tabs/NumberGeneratorTab.vue @@ -22,7 +22,7 @@ -
+
Wygenerowany numer pociągu: {{ trainNumber }} @@ -58,6 +58,13 @@ const categoryRules = ref(null) as Ref; const trainNumber = ref(null) as Ref; +const copyNumber = () => { + if (trainNumber.value) { + navigator.clipboard.writeText(trainNumber.value); + alert('Skopiowano numer do schowka!'); + } +}; + const randomizeTrainNumber = (randomizeRegions = false) => { if (categoryRules.value == null) return; From b9a8bacc7833f823b937f1e5b8363e3789fa0a5f Mon Sep 17 00:00:00 2001 From: Spythere Date: Thu, 25 May 2023 19:30:12 +0200 Subject: [PATCH 5/5] bump: wersja 1.4.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8a17cc3..8a3f3de 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pojazdownik", - "version": "1.4.0", + "version": "1.4.1", "private": true, "scripts": { "dev": "vite",