Compare commits

...

3 Commits

Author SHA1 Message Date
Spythere 68f6fc8a42 Wersja 1.20.2
Wersja 1.20.2
2024-01-24 20:37:35 +01:00
Spythere 6d3b32cd7d bump: 1.20.2 2024-01-24 20:35:49 +01:00
Spythere fadecc9d2c fix literówki w tłumaczeniu 2024-01-24 20:35:15 +01:00
3 changed files with 49 additions and 25 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "stacjownik", "name": "stacjownik",
"version": "1.20.1", "version": "1.20.2",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",
+47 -23
View File
@@ -3,13 +3,17 @@
<span class="name" v-html="stop.nameHtml"></span> <span class="name" v-html="stop.nameHtml"></span>
<span <span
class="date arrival"
v-if="stop.position != 'begin'" v-if="stop.position != 'begin'"
:class="{ class="date arrival"
delayed: stop.arrivalDelay > 0 && stop.status != 'unconfirmed', :data-status="
preponed: stop.arrivalDelay < 0 && stop.status != 'unconfirmed', stop.arrivalDelay > 0 && stop.status != 'unconfirmed'
'on-time': stop.arrivalDelay == 0 && stop.status == 'confirmed' ? 'delayed'
}" : stop.arrivalDelay < 0 && stop.status != 'unconfirmed'
? 'preponed'
: stop.arrivalDelay == 0 && stop.status == 'confirmed'
? 'on-time'
: ''
"
> >
<span v-if="stop.arrivalDelay != 0 && stop.status != 'unconfirmed'"> <span v-if="stop.arrivalDelay != 0 && stop.status != 'unconfirmed'">
<s>{{ timestampToString(stop.arrivalScheduled) }}</s> <s>{{ timestampToString(stop.arrivalScheduled) }}</s>
@@ -23,20 +27,36 @@
</span> </span>
<span <span
v-if="
stop.duration ||
(stop.status == 'stopped' && stop.position != 'begin') ||
stop.departureDelay != stop.arrivalDelay
"
class="date stop" class="date stop"
v-if="stop.duration || stop.status == 'stopped'" :data-stop-types="stop.type.replace(', ', '-')"
:class="stop.type.replace(', ', '-')" :data-stop-status="
stop.departureDelay - stop.arrivalDelay > 0 && !stop.duration ? 'delayed' : ''
"
> >
{{ stop.duration }} {{ stop.type == '' ? 'pt' : stop.type }} {{ stop.duration || stop.departureDelay - stop.arrivalDelay }}
{{ stop.type == '' ? 'pt' : stop.type }}
</span> </span>
<span <span
v-if="
stop.position != 'end' &&
(stop.duration != 0 || stop.status == 'stopped' || stop.departureDelay != stop.arrivalDelay)
"
class="date departure" class="date departure"
v-if="stop.position != 'end' && (stop.duration != 0 || stop.status == 'stopped')" :data-status="
:class="{ stop.departureDelay > 0 && stop.status == 'confirmed'
delayed: stop.departureDelay > 0 && stop.status == 'confirmed', ? 'delayed'
preponed: stop.departureDelay < 0 && stop.status == 'confirmed' : stop.departureDelay < 0 && stop.status == 'confirmed'
}" ? 'preponed'
: stop.departureDelay == 0 && stop.status == 'confirmed'
? 'on-time'
: ''
"
> >
<span v-if="stop.departureDelay != 0 && stop.status == 'confirmed'"> <span v-if="stop.departureDelay != 0 && stop.status == 'confirmed'">
<s>{{ timestampToString(stop.departureScheduled) }}</s> <s>{{ timestampToString(stop.departureScheduled) }}</s>
@@ -78,6 +98,10 @@ $stopDefaultClr: #252525;
$stopNameClr: #22a8d1; $stopNameClr: #22a8d1;
.stop-label { .stop-label {
display: flex;
flex-wrap: wrap;
align-items: center;
&[data-sbl='true'] { &[data-sbl='true'] {
.date { .date {
display: none; display: none;
@@ -90,10 +114,6 @@ $stopNameClr: #22a8d1;
} }
} }
display: flex;
flex-wrap: wrap;
align-items: center;
.name { .name {
background: $stopNameClr; background: $stopNameClr;
padding: 0.3em 0.5em; padding: 0.3em 0.5em;
@@ -112,18 +132,22 @@ $stopNameClr: #22a8d1;
} }
.stop { .stop {
&.ph, &[data-stop-types='ph'],
&.ph-pm, &[data-stop-types='ph-pm'],
&.pm { &[data-stop-types='pm'] {
background: $stopExchangeClr; background: $stopExchangeClr;
} }
background: $stopDefaultClr; background: $stopDefaultClr;
&[data-stop-status='delayed'] {
color: $delayedClr;
}
} }
.arrival, .arrival,
.departure { .departure {
&.delayed { &[data-status='delayed'] {
s { s {
color: #999; color: #999;
} }
@@ -133,7 +157,7 @@ $stopNameClr: #22a8d1;
} }
} }
&.preponed { &[data-status='preponed'] {
s { s {
color: #999; color: #999;
} }
+1 -1
View File
@@ -12,7 +12,7 @@
"p4": "Every person who decides to contribute at least {b1} (in case of PayPal it must be a payment including additional transaction fees) for the development of Stacjownik, will receive (upon a personal request) {img}{b2} of username in the app and on my Discord server (after verifying the payment author, preferably by providing the username directly with the payment).", "p4": "Every person who decides to contribute at least {b1} (in case of PayPal it must be a payment including additional transaction fees) for the development of Stacjownik, will receive (upon a personal request) {img}{b2} of username in the app and on my Discord server (after verifying the payment author, preferably by providing the username directly with the payment).",
"p4-b1": "5 PLN", "p4-b1": "5 PLN",
"p4-b2": "a symbolic highlight", "p4-b2": "a symbolic highlight",
"p5": "Thank you and enjoy the app!<br />~ Spythegre", "p5": "Thank you and enjoy the app!<br />~ Spythere",
"action-exit": "Maybe next time...", "action-exit": "Maybe next time...",
"action-paypal": "DONATE WITH PAYPAL", "action-paypal": "DONATE WITH PAYPAL",
"action-buycoffee": "BUY ME A COFFEE!", "action-buycoffee": "BUY ME A COFFEE!",