Compare commits

..

7 Commits

Author SHA1 Message Date
Spythere c0d188424a chore: added information about new domain for the old website 2026-04-14 00:14:06 +02:00
Spythere f22cf93cb1 merge: development 2026-04-14 00:01:54 +02:00
Spythere dcfd3f7c4e Merge pull request #54 from Spythere/development
Updated GitHub workflow for deploying files to dedicated VPS
2025-12-04 00:38:58 +01:00
Spythere 0e2e267b71 Merge pull request #53 from Spythere/development
Added Lubań wagons usage
2025-11-18 13:44:35 +01:00
Spythere 4c6c3edcf5 Merge pull request #52 from Spythere/development
Added 409Va for sand cargo in stock generator
2025-11-13 22:33:37 +01:00
Spythere 9bb0bcb735 Merge pull request #51 from Spythere/development
v1.9.3
2025-11-05 14:51:56 +01:00
Spythere 85f91a59cd Merge pull request #50 from Spythere/development
Updated usage description for a new wagon in the simulator
2025-10-31 20:18:08 +01:00
6 changed files with 38 additions and 59 deletions
+31 -47
View File
@@ -1,21 +1,16 @@
<template>
<AppModals />
<ImageFullscreenPreview v-if="store.vehiclePreviewSrc" />
<transition name="slide-bottom-anim">
<MigrationInfo v-if="store.isMigrationInfoOpen" />
</transition>
<router-view></router-view>
<div class="migration-info">
<img src="/favicon.svg" alt="logo" width="120" />
<h1><span class="text--accent">Aplikacja</span> została przeniesiona na nową domenę!</h1>
<h1><span class="text--accent">This app</span> has been moved to a new domain!</h1>
<a href="http://pojazdownik-td2.spythere.eu/">http://pojazdownik-td2.spythere.eu/</a>
</div>
</template>
<script lang="ts" setup>
import { useStore } from './store';
import ImageFullscreenPreview from './components/utils/ImageFullscreenPreview.vue';
import AppModals from './components/app/AppModals.vue';
import { computed, onMounted, watchEffect } from 'vue';
import { computed, watchEffect } from 'vue';
import { registerSW } from 'virtual:pwa-register';
import MigrationInfo from './components/app/MigrationInfo.vue';
const store = useStore();
@@ -23,12 +18,6 @@ registerSW({
immediate: true,
});
onMounted(() => {
loadStockDataFromStorage();
handleMigrationInfo();
store.setupAPIData();
});
const currentStockString = computed(() => store.stockString);
watchEffect(() => {
@@ -36,35 +25,6 @@ watchEffect(() => {
store.chosenStorageStockName = '';
}
});
function handleMigrationInfo() {
// Show only on old domain
if (location.hostname !== 'pojazdownik-td2.web.app') return;
const showInfo = localStorage.getItem('showMigrationInfo');
// Do not show if already acknowledged
if (showInfo === 'false') return;
setTimeout(() => {
store.isMigrationInfoOpen = true;
}, 2000);
}
function loadStockDataFromStorage() {
const savedData = localStorage.getItem('savedStockData');
if (!savedData) {
localStorage.setItem('savedStockData', JSON.stringify({}));
return;
}
try {
store.storageStockData = JSON.parse(savedData);
} catch (error) {
console.error('Wystąpił błąd podczas przetwarzania danych o składach z localStorage!', error);
}
}
</script>
<style lang="scss">
@@ -83,4 +43,28 @@ function loadStockDataFromStorage() {
font-size: calc(0.7rem + 0.75vw);
}
}
.migration-info {
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
min-height: 100vh;
text-align: center;
padding: 1em;
img {
margin-bottom: 2em;
}
h1 {
margin: 0;
}
a {
font-size: 1.85em;
margin-top: 1em;
text-decoration: underline;
}
}
</style>
+2 -3
View File
@@ -23,7 +23,7 @@
"627Z:wt_20_empty"
],
"cold-storage": ["202Lc:all"],
"loose-cargo": ["426S:all", "208Kf:all", "401Ka_PKP_Gags:all", "401Ka_PKPC_Gags:all", "411V_PKPC_Facc:all", "411V_ALU_Faccpp:all", "411V_DOLWR_Facc:all", "411V_PKP_Facc:all", "411V_PNUIK_Facc:all"],
"loose-cargo": ["426S:all", "208Kf:all", "401Ka_PKP_Gags:all", "401Ka_PKPC_Gags:all"],
"coal": ["412W:coal_01", "413S:coal_413S", "429W:coal_01", "401Zb:coal_02"],
"ore": ["412W:ore_01", "401Zl:ore_35", "429W:ore_01"],
"sand": [
@@ -57,8 +57,7 @@
"wheat": ["206Sh_PKP_Ugpps:wheat_3", "206Sh_PKPC_Ugpps:wheat_3"],
"corn": ["206Sh_PKP_Ugpps:corn_3", "206Sh_PKPC_Ugpps:corn_3"],
"fodder": ["206Sh_PKP_Ugpps:forage_3", "206Sh_PKPC_Ugpps:forage_3"],
"military": ["426Z:tank_01", "426Z:truck_01", "426Z:vehicles_01"],
"vehicles_nysa": ["424Z:vehicles_nysa", "426Z:vehicles_02"],
"vehicles": ["426Z:tank_01", "426Z:truck_01", "426Z:vehicles_01"],
"carbide": ["421S:carbide_01"],
"sensitive": ["425S:all", "421S:carbide_01"],
"steel": ["401Ze:steel_01", "401Ze:steel_02"],
+1 -2
View File
@@ -251,8 +251,7 @@
"corn": "corn",
"fodder": "fodder",
"carbide": "carbide",
"vehicles_nysa": "vehicles (nysa)",
"military": "vehicles (military)",
"vehicles": "vehicles",
"sensitive": "sensitive",
"steel": "steel",
"gas": "gas",
+3 -4
View File
@@ -251,8 +251,7 @@
"corn": "kukurydza",
"fodder": "pasza",
"carbide": "karbid",
"vehicles_nysa": "pojazdy (nysa)",
"military": "pojazdy (wojsko)",
"vehicles": "pojazdy",
"sensitive": "wrażliwe",
"steel": "stal",
"gas": "gaz",
@@ -335,7 +334,7 @@
"Luban_XH_short": "krótki wagon mieszkalny",
"Luban_XH_long": "długi wagon mieszkalny",
"Luban_XH_workshop": "wagon warsztatowy",
"EDK80": "żuraw kolejowy"
"EDK80": "dźwig kolejowy"
},
"cargo-warnings": {
"title": "Skład z dodatkowymi uwagami przewozowymi:",
@@ -344,7 +343,7 @@
"warning_un1965_tn": "TN: gazy węglowodorowe skroplone - puste cysterny (UN 1965)",
"warning_un1202_tn": "TN: olej napędowy (UN 1202)",
"warning_military_pn": "PN: transport wojskowy",
"warning_edk80_pn": "PN: żuraw kolejowy EDK80"
"warning_edk80_pn": "PN: dźwig kolejowy EDK80"
},
"migrate-info": {
"line-1": "Pojazdownik zostaje przeniesiony na nową domenę - {0}! Możesz korzystać z obecnej strony, jednak nie będzie ona otrzymywać już aktualizacji i w przyszłości zostanie wyłączona!",
-2
View File
@@ -134,8 +134,6 @@ export const useStore = defineStore('store', {
...v,
group: response.vehicleGroups.find((g) => g.id == v.vehicleGroupsId)!,
}));
console.log(response);
} catch (error) {
console.error(error);
}
+1 -1
View File
@@ -177,7 +177,7 @@ export function getCargoWarnings(stockList: IStock[]) {
else if (stockVehicle.vehicleRef.type.startsWith('WB117')) warnings.add(stockVehicle.cargo ? 'warning_un1965_twr' : 'warning_un1965_tn');
else if (stockVehicle.vehicleRef.type.startsWith('445Rb')) warnings.add('warning_un1202_tn');
else if (stockVehicle.vehicleRef.type.startsWith('EDK80')) warnings.add('warning_edk80_pn');
else if (stockVehicle.cargo && /^(tank|vehicles_01|truck)/.test(stockVehicle.cargo.id)) warnings.add('warning_military_pn');
else if (stockVehicle.cargo && /^(tank|vehicles|truck)/.test(stockVehicle.cargo.id)) warnings.add('warning_military_pn');
});
return warnings;