Drobne poprawki

This commit is contained in:
2022-08-15 00:05:11 +02:00
parent d266cb8126
commit 4d997d79e1
7 changed files with 40 additions and 37 deletions
+23 -24
View File
@@ -72,25 +72,24 @@
</button> </button>
</div> </div>
<div class="stock_clipboard-text"> <div class="stock_clipboard-text" v-if="store.stockList.length > 0">
<button class="btn" v-if="store.stockList.length > 0" @click="copyToClipboard"> <button class="btn" @click="copyToClipboard">Skopiuj tekst składu do schowka</button>
Skopiuj pociąg w formie tekstowej do schowka
</button>
</div> </div>
<div class="stock_specs"> <div class="stock_specs">
<b class="real-stock-info" v-if="store.chosenRealStock"> <b class="real-stock-info" v-if="store.chosenRealStock">
<span class="text--accent"> <span class="text--accent">
<img :src="getIconURL(store.chosenRealStock.type)" :alt="store.chosenRealStock.type" /> <img :src="getIconURL(store.chosenRealStock.type)" :alt="store.chosenRealStock.type" />
{{ store.chosenRealStock.number }} {{ store.chosenRealStock.name }}</span {{ store.chosenRealStock.number }} {{ store.chosenRealStock.name }}
> </span>
|
</b> </b>
<div> <span>
Masa: <span class="text--accent">{{ store.totalMass }}t</span> | Długość: Masa: <span class="text--accent">{{ store.totalMass }}t</span> - Długość:
<span class="text--accent">{{ store.totalLength }}m</span> <span class="text--accent">{{ store.totalLength }}m</span>
| Vmax pociągu: <span class="text--accent">{{ store.maxStockSpeed }} km/h</span> - Vmax pociągu: <span class="text--accent">{{ store.maxStockSpeed }} km/h</span>
</div> </span>
</div> </div>
<div class="stock_warnings"> <div class="stock_warnings">
@@ -348,12 +347,12 @@ export default defineComponent({
}, },
downloadStock() { downloadStock() {
if (this.stockHasWarnings()) { if (this.store.stockList.length == 0) return alert('Lista pojazdów jest pusta!');
alert('Jazda tym pociągiem jest niezgodna z regulaminem symulatora! Zmień parametry zestawienia!');
return;
}
const fileName = prompt('Nazwij plik:', 'pociag'); if (this.stockHasWarnings())
return alert('Jazda tym pociągiem jest niezgodna z regulaminem symulatora! Zmień parametry zestawienia!');
const fileName = prompt('Nazwij plik:', `${this.store.chosenRealStockName || this.store.stockList[0].type}`);
if (!fileName) return; if (!fileName) return;
@@ -398,13 +397,12 @@ export default defineComponent({
<style lang="scss" scoped> <style lang="scss" scoped>
@import '../styles/global'; @import '../styles/global';
.warnings { .stock_warnings {
margin-top: 0.5em; margin-top: 1em;
} }
.warning { .warning {
padding: 0.25em; padding: 0.25em;
margin-top: 0.5em;
background: $accentColor; background: $accentColor;
color: black; color: black;
@@ -487,15 +485,16 @@ export default defineComponent({
} }
.stock_clipboard-text { .stock_clipboard-text {
margin: 0.5em 0;
font-weight: bold; font-weight: bold;
& > .btn {
margin: 0 0.5em 0.5em 0;
}
} }
.real-stock-info { .real-stock-info {
font-size: 1.15em;
img { img {
height: 1.5ch; height: 1.3ch;
} }
} }
@@ -524,7 +523,7 @@ ul > li {
} }
&.list-empty { &.list-empty {
border: 1px solid white; background-color: $secondaryColor;
padding: 0.5em; padding: 0.5em;
} }
} }
@@ -550,7 +549,7 @@ li > .stock-info {
.stock-info { .stock-info {
&__no, &__no,
&__type { &__type {
background-color: #222; background-color: $secondaryColor;
} }
&__count { &__count {
+4 -6
View File
@@ -119,7 +119,7 @@
v-model="stockWagon.stockString" v-model="stockWagon.stockString"
@input="onCarWagonTypeInput(stockWagon)" @input="onCarWagonTypeInput(stockWagon)"
@focus="onCarWagonTypeFocus(stockWagon)" @focus="onCarWagonTypeFocus(stockWagon)"
placeholder="Kliknij, aby dodać wagon..." placeholder="Wybierz wagon..."
/> />
<datalist id="types-datalist"> <datalist id="types-datalist">
<option value="">Wybierz wagon</option> <option value="">Wybierz wagon</option>
@@ -157,7 +157,7 @@
</ul> </ul>
</div> </div>
<button class="btn btn--outline" @click="addToRandomStockList">+ NOWY WAGON</button> <button class="btn btn--outline" style="margin-top: 0.5em;" @click="addToRandomStockList">+ NOWY WAGON</button>
</div> </div>
</div> </div>
@@ -432,8 +432,6 @@ h3 {
margin: 0 0 0.5em 0; margin: 0 0 0.5em 0;
} }
.card_content { .card_content {
overflow-y: hidden; overflow-y: hidden;
border: 2px solid white; border: 2px solid white;
@@ -510,7 +508,6 @@ h3 {
position: relative; position: relative;
width: 300px; width: 300px;
height: 180px; height: 180px;
margin: 0 auto;
border: 1px solid white; border: 1px solid white;
@@ -623,10 +620,11 @@ h3 {
} }
} }
@media screen and (max-width: 600px) { @media screen and (max-width: 650px) {
.car-preview { .car-preview {
width: 20em; width: 20em;
height: 13em; height: 13em;
margin: 0 auto;
} }
h3 { h3 {
+3 -4
View File
@@ -4,7 +4,7 @@
<div class="card_content"> <div class="card_content">
<div class="top-sticky"> <div class="top-sticky">
<button class="btn btn--text exit" @click="store.isRealStockListCardOpen = false">&lt; POWRÓT</button> <button class="btn btn--text exit-btn" @click="store.isRealStockListCardOpen = false">&lt; POWRÓT</button>
<div class="header"> <div class="header">
<h1> <h1>
@@ -97,8 +97,6 @@ export default defineComponent({
this.store.swapVehicles = false; this.store.swapVehicles = false;
this.store.chosenRealStockName = `${type} ${number} ${name}`;
stockArray.forEach((type, i) => { stockArray.forEach((type, i) => {
let vehicle: Vehicle | null = null; let vehicle: Vehicle | null = null;
if (i == 0) vehicle = this.store.locoDataList.find((loco) => loco.type == stockArray[0]) || null; if (i == 0) vehicle = this.store.locoDataList.find((loco) => loco.type == stockArray[0]) || null;
@@ -176,8 +174,9 @@ export default defineComponent({
<style lang="scss" scoped> <style lang="scss" scoped>
@import '../../styles/global.scss'; @import '../../styles/global.scss';
.exit { .exit-btn {
font-size: 1.2em; font-size: 1.2em;
margin: 0.5em 0;
} }
input { input {
+1 -1
View File
@@ -26,7 +26,7 @@ export const useStore = defineStore({
swapVehicles: false, swapVehicles: false,
chosenStockListIndex: -1, chosenStockListIndex: -1,
chosenRealStockName: null, chosenRealStockName: undefined,
vehiclePreviewSrc: '', vehiclePreviewSrc: '',
+2
View File
@@ -5,6 +5,7 @@ $breakpointSm: 550px;
$bgColor: #2c3149; $bgColor: #2c3149;
$textColor: #fff; $textColor: #fff;
$secondaryColor: #222;
$accentColor: #ffd600; $accentColor: #ffd600;
::-webkit-scrollbar { ::-webkit-scrollbar {
@@ -112,6 +113,7 @@ button.btn {
font-weight: bold; font-weight: bold;
transition: all 250ms; transition: all 250ms;
background: none; background: none;
padding: 0;
&:focus-visible { &:focus-visible {
outline: 1px solid white; outline: 1px solid white;
+1 -1
View File
@@ -18,7 +18,7 @@ export interface IStore {
cargoOptions: any[][]; cargoOptions: any[][];
chosenStockListIndex: number; chosenStockListIndex: number;
chosenRealStockName: string | null; chosenRealStockName?: string;
swapVehicles: boolean; swapVehicles: boolean;
vehiclePreviewSrc: string; vehiclePreviewSrc: string;
+6 -1
View File
@@ -157,7 +157,12 @@ export function chosenRealStock(state: IStore) {
}, [] as string[]) }, [] as string[])
.join(';'); .join(';');
return Object.values(state.readyStockList).find((readyStock) => readyStock.stockString == currentStockString);
const realStockObj = Object.values(state.readyStockList).find((readyStock) => readyStock.stockString == currentStockString);
state.chosenRealStockName = realStockObj ? `${realStockObj.type} ${realStockObj.number} ${realStockObj.name}` : undefined;
return realStockObj;
} }
// export function maxAllowedSpeed(state: IStore) { // export function maxAllowedSpeed(state: IStore) {