Kopiowanie składu do schowka; możliwość losowania wagonów pasażerskich

src/assets/swap-icon.svg

@@ -0,0 +1,5 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.12308 1V3.58625V6.06907L13 3.58625L9.12308 1Z" fill="white"/>
+<path d="M5.24615 7.9309V10.4137V13L1 10.4137L5.24615 7.9309Z" fill="white"/>
+<path d="M1 3.58623C2.73032 3.58623 5.43077 3.58623 5.43077 3.58623L9.12308 3.58625M9.12308 3.58625V1L13 3.58625L9.12308 6.06907V3.58625ZM13 10.4137H6.16923H5.24615M5.24615 10.4137V7.9309L1 10.4137L5.24615 13V10.4137Z" stroke="white" stroke-width="0.714286"/>
+</svg>

src/components/InputsSection.vue

@@ -29,9 +29,13 @@
             </option>
           </select>
 
-          <button class="btn--add" @click="addVehicle">
+          <button class="btn--add" @click="addVehicle" title="Dodaj pojazd">
             <img :src="icons.add" alt="add vehicle" />
           </button>
+
+          <!-- <button class="btn--swap" @click="prepareSwapVehicles" title="Zamień pojazdy">
+            <img :src="icons.swap" alt="swap vehicle" />
+          </button> -->
         </div>
 
         <div class="input_checkbox">
@@ -42,6 +46,8 @@
       </div>
     </div>
 
+    <div class="spacer"></div>
+
     <div class="input inputs_car">
       <div class="input_container">
         <h2 class="input_header">RODZAJ WAGONU</h2>
@@ -71,9 +77,13 @@
             </option>
           </select>
 
-          <button class="btn--add" @click="addVehicle">
+          <button class="btn--add" @click="addVehicle" title="Dodaj pojazd">
             <img :src="icons.add" alt="add vehicle" />
           </button>
+
+          <!-- <button class="btn--swap" @click="prepareSwapVehicles" title="Zamień pojazdy">
+            <img :src="icons.swap" alt="swap vehicle" />
+          </button> -->
         </div>
 
         <div class="input_list cargo">
@@ -88,8 +98,8 @@
             v-model="store.chosenCargo"
           >
             <option :value="null" v-if="!store.chosenCar || !store.chosenCar.loadable">brak dostępnych ładunków</option>
-
             <option :value="null" v-else>próżny</option>
+
             <option v-for="cargo in store.chosenCar?.cargoList" :value="cargo" :key="cargo.id">
               {{ cargo.id }}
             </option>
@@ -104,10 +114,6 @@
 import { ICarWagon, ILocomotive, IStore } from '@/types';
 import { defineComponent, inject } from 'vue';
 
-function isLocomotive(vehicle: ILocomotive | ICarWagon): vehicle is ILocomotive {
-  return (vehicle as ILocomotive).power !== undefined;
-}
-
 export default defineComponent({
   setup() {
     const store = inject('Store') as IStore;
@@ -121,6 +127,7 @@ export default defineComponent({
       totalMass: inject('totalMass') as number,
       maxStockSpeed: inject('maxStockSpeed') as number,
       maxAllowedSpeed: inject('maxAllowedSpeed') as number,
+      isLocomotive: inject('isLocomotive') as (vehicle: ILocomotive | ICarWagon) => vehicle is ILocomotive,
     };
   },
 
@@ -158,6 +165,7 @@ export default defineComponent({
   data: () => ({
     icons: {
       add: require('@/assets/add-icon.svg'),
+      swap: require('@/assets/swap-icon.svg'),
     },
     locoLabels: [
       {
@@ -207,11 +215,13 @@ export default defineComponent({
   },
 
   methods: {
+    prepareSwapVehicles() {
+      this.store.swapVehicles = true;
+    },
+
     onShowSupporterChange() {
       this.store.showSupporter = !this.store.showSupporter;
 
-      console.log(this.store.showSupporter);
-
       if (this.store.showSupporter) {
         const chosenVehicle = this.store.chosenCar || this.store.chosenLoco;
 
@@ -229,6 +239,7 @@ export default defineComponent({
       this.store.imageLoading = false;
 
       this.store.chosenLocoPower = inputId;
+      this.store.chosenStockListIndex = -1;
 
       (this.$refs['loco-select'] as HTMLElement).focus();
     },
@@ -238,6 +249,7 @@ export default defineComponent({
       this.store.imageLoading = false;
 
       this.store.chosenCarUseType = inputId;
+      this.store.chosenStockListIndex = -1;
 
       if (inputId == 'car-passenger') this.store.chosenCargo = null;
     },
@@ -245,6 +257,7 @@ export default defineComponent({
     onCarTypeChange() {
       this.store.chosenCargo = null;
       this.store.chosenLoco = null;
+      this.store.chosenStockListIndex = -1;
 
       this.store.imageLoading = true;
     },
@@ -252,6 +265,7 @@ export default defineComponent({
     onLocoTypeChange() {
       this.store.chosenCargo = null;
       this.store.chosenCar = null;
+      this.store.chosenStockListIndex = -1;
 
       this.store.imageLoading = true;
     },
@@ -264,13 +278,13 @@ export default defineComponent({
       const previousStock =
         this.store.stockList.length > 0 ? this.store.stockList[this.store.stockList.length - 1] : null;
 
-      if (isLocomotive(vehicle) && previousStock && previousStock.type == vehicle.type) {
+      if (this.isLocomotive(vehicle) && previousStock && previousStock.type == vehicle.type) {
         this.store.stockList[this.store.stockList.length - 1].count++;
         return;
       }
 
       if (
-        !isLocomotive(vehicle) &&
+        !this.isLocomotive(vehicle) &&
         previousStock &&
         previousStock.type == vehicle.type &&
         previousStock.cargo?.id == this.store.chosenCargo?.id
@@ -285,16 +299,18 @@ export default defineComponent({
         length: vehicle.length,
         mass: vehicle.mass,
         maxSpeed: vehicle.maxSpeed,
-        isLoco: isLocomotive(vehicle),
+        isLoco: this.isLocomotive(vehicle),
         cargo:
-          !isLocomotive(vehicle) && vehicle.loadable && this.store.chosenCargo ? this.store.chosenCargo : undefined,
+          !this.isLocomotive(vehicle) && vehicle.loadable && this.store.chosenCargo
+            ? this.store.chosenCargo
+            : undefined,
         count: 1,
         imgSrc: vehicle.imageSrc,
-        useType: isLocomotive(vehicle) ? vehicle.power : vehicle.useType,
+        useType: this.isLocomotive(vehicle) ? vehicle.power : vehicle.useType,
         supportersOnly: vehicle.supportersOnly,
       };
 
-      if (isLocomotive(vehicle) && this.store.stockList.length > 0 && !this.store.stockList[0].isLoco)
+      if (this.isLocomotive(vehicle) && this.store.stockList.length > 0 && !this.store.stockList[0].isLoco)
         this.store.stockList.unshift(stockObj);
       else this.store.stockList.push(stockObj);
     },

src/components/ListSection.vue

@@ -46,12 +46,19 @@
         <button class="btn" @click="shuffleCars">TASUJ WAGONY</button>
         <button class="btn" @click="openRandomizerCard">LOSUJ SKŁAD</button>
       </div>
+
       <div class="stock-list_specs">
         Masa: <span class="text--accent">{{ totalMass }}t</span> | Długość:
         <span class="text--accent">{{ totalLength }}m</span>
         | Vmax pociągu: <span class="text--accent">{{ maxStockSpeed }} km/h</span>
       </div>
 
+      <div class="stock-list_string">
+        <button class="btn--text" v-if="store.stockList.length > 0" @click="copyToClipboard">
+          Skopiuj pociąg w formie tekstowej do schowka
+        </button>
+      </div>
+
       <div class="warnings">
         <div class="warning" v-if="warnings.locoNotSuitable.value">
           Lokomotywy EP07 i EP08 są przeznaczone jedynie do ruchu pasażerskiego!
@@ -64,7 +71,7 @@
         <div class="warning" v-if="warnings.tooManyLocos.value">Ten skład posiada za dużo pojazdów trakcyjnych!</div>
       </div>
 
-      <ul>
+      <ul ref="stock-list">
         <li v-if="store.stockList.length == 0" class="list-empty">
           <div class="item-content">Lista pojazdów jest pusta!</div>
         </li>
@@ -72,7 +79,7 @@
         <li
           v-for="(stock, i) in store.stockList"
           :key="stock.type + i"
-          :class="{ loco: stock.isLoco }"
+          :class="{ loco: stock.isLoco, selected: store.chosenStockListIndex == i }"
           :data-id="i"
           tabindex="0"
           @focus="onListItemFocus(i)"
@@ -127,6 +134,7 @@ import RandomizerCard from './RandomizerCard.vue';
 
 export default defineComponent({
   components: { RandomizerCard },
+
   setup() {
     const store = inject('Store') as IStore;
 
@@ -185,10 +193,33 @@ export default defineComponent({
     } as { [key: string]: string },
   }),
 
+  computed: {
+    stockString() {
+      return this.store.stockList
+        .map((stock) => {
+          let s = stock.isLoco || !stock.cargo ? stock.type : `${stock.type}:${stock.cargo.id}`;
+
+          let final = s;
+          for (let i = 0; i < stock.count - 1; i++) final += `;${s}`;
+
+          return final;
+        })
+        .join(';');
+    },
+  },
+
   methods: {
+    copyToClipboard() {
+      navigator.clipboard.writeText(this.stockString);
+
+      alert('Pociąg został skopiowany do schowka!');
+    },
+
     onListItemFocus(vehicleID: number) {
       const vehicle = this.store.stockList[vehicleID];
 
+      this.store.chosenStockListIndex = vehicleID;
+
       if ((this.store.chosenCar || this.store.chosenLoco)?.imageSrc != vehicle.imgSrc) this.store.imageLoading = true;
 
       if (this.store.showSupporter && !vehicle.supportersOnly) {
@@ -202,15 +233,17 @@ export default defineComponent({
 
         this.store.chosenCar = null;
         this.store.chosenCargo = null;
+      } else {
+        this.store.chosenCarUseType = vehicle.useType;
 
-        return;
+        this.store.chosenLoco = null;
+        this.store.chosenCar = this.carDataList.find((v) => v.type == vehicle.type) || null;
+        this.store.chosenCargo = vehicle.cargo || null;
       }
 
-      this.store.chosenCarUseType = vehicle.useType;
-
-      this.store.chosenLoco = null;
-      this.store.chosenCar = this.carDataList.find((v) => v.type == vehicle.type) || null;
-      this.store.chosenCargo = vehicle.cargo || null;
+      if (this.store.swapVehicles) {
+        this.store.swapVehicles = false;
+      }
     },
 
     getCarSpecFromType(typeStr: string) {
@@ -299,18 +332,7 @@ export default defineComponent({
 
       if (!fileName) return;
 
-      const stockString = this.store.stockList
-        .map((stock) => {
-          let s = stock.isLoco || !stock.cargo ? stock.type : `${stock.type}:${stock.cargo.id}`;
-
-          let final = s;
-          for (let i = 0; i < stock.count - 1; i++) final += `;${s}`;
-
-          return final;
-        })
-        .join(';');
-
-      const blob = new Blob([stockString]);
+      const blob = new Blob([this.stockString]);
       const file = fileName + '.con';
 
       var e = document.createEvent('MouseEvents'),
@@ -482,6 +504,11 @@ export default defineComponent({
 
   width: 100%;
 
+  &_string {
+    margin-top: 1em;
+    font-weight: bold;
+  }
+
   &_buttons {
     display: flex;
 
@@ -521,6 +548,10 @@ export default defineComponent({
       padding: 0 0.5em;
     }
 
+    &.selected .item-content {
+      color: $accentColor;
+    }
+
     &:focus .item-content {
       color: $accentColor;
     }

src/components/RandomizerCard.vue

@@ -3,12 +3,12 @@
     <!-- <button class="btn" @click="closeCard">X</button> -->
 
     <div class="wrapper">
-      <h1>LOSUJ SKŁAD TOWAROWY <img :src="icons.randomize" alt="losuj skład" /></h1>
+      <!-- <h1>LOSUJ SKŁAD <img :src="icons.randomize" alt="losuj skład" /></h1>
 
       <h3>
         Skład zostanie dołączony do dodanej na liście lokomotywy czołowej bądź wygenerowany z losową w przypadku jej
         braku
-      </h3>
+      </h3> -->
 
       <div class="car-preview">
         <div class="image-wrapper">
@@ -20,7 +20,7 @@
         </b>
         <b v-else>Podgląd typu wagonu</b>
 
-        <div v-if="focusedCar">{{ cargoUsage[focusedCar.type.split('_')[0]] }}</div>
+        <div v-if="focusedCar">{{ carUsage[focusedCar.type.split('_')[0]] }}</div>
         <div v-else>Najedź na rodzaj wagonu aby wyświetlić informacje</div>
       </div>
 
@@ -29,7 +29,20 @@
         <div>
           <button
             class="btn choice-btn"
-            v-for="carType in cargoTypeList"
+            v-for="carType in carTypeList.filter((_, i) => i < 15)"
+            :key="carType"
+            @click="toggleCarType(carType)"
+            @mouseenter="displayPreview(carType)"
+            :class="{ chosen: chosenCarTypes.includes(carType) }"
+          >
+            {{ carType }}
+          </button>
+        </div>
+
+        <div style="margin-top: 0.5em">
+          <button
+            class="btn choice-btn"
+            v-for="carType in carTypeList.filter((_, i) => i >= 15)"
             :key="carType"
             @click="toggleCarType(carType)"
             @mouseenter="displayPreview(carType)"
@@ -99,11 +112,11 @@ export default defineComponent({
       locoDataList: inject('locoDataList') as ILocomotive[],
       chosenLength: inject('chosenLength') as number,
       chosenMass: inject('chosenMass') as number,
-      cargoCarList: carDataList.value.filter((car) => car.useType == 'car-cargo'),
-      cargoTypeList: carDataList.value.reduce((list, car) => {
+      carDataList,
+      carTypeList: carDataList.value.reduce((list, car) => {
         const type = car.type.split('_')[0];
 
-        if (car.useType != 'car-cargo' || list.includes(type)) return list;
+        if (list.includes(type)) return list;
 
         list.push(type);
 
@@ -125,7 +138,22 @@ export default defineComponent({
     focusedCar: null as ICarWagon | null,
     isPreviewLoading: false,
 
-    cargoUsage: {
+    carUsage: {
+      Gor89: 'wagon pasażerski',
+      Gor77: 'wagon pasażerski',
+      Bau84: 'wagon pasażerski',
+      '612a': 'wagon pasażerski',
+      '504a': 'wagon pasażerski',
+      '304c': 'wagon pasażerski',
+      '159a': 'wagon pasażerski',
+      '158a': 'wagon pasażerski',
+      '154a': 'wagon pasażerski',
+      '120a': 'wagon pasażerski',
+      '113a': 'wagon pasażerski',
+      '112a': 'wagon pasażerski',
+      '111a': 'wagon pasażerski',
+      '110a': 'wagon pasażerski',
+      '101a': 'wagon pasażerski',
       '203V': 'kruszywo, kamień wapienny, odpady kopalniane',
       '208Kf': 'drobnica, ładunki sypkie',
       '209c': 'wagon techniczny',
@@ -150,7 +178,7 @@ export default defineComponent({
     },
 
     displayPreview(carType: string) {
-      const list = this.cargoCarList.filter((car) => car.type.includes(carType));
+      const list = this.carDataList.filter((car) => car.type.includes(carType));
       const randIndex = Math.floor(Math.random() * list.length);
 
       if (this.focusedCar?.type == list[randIndex].type) return;
@@ -196,7 +224,7 @@ export default defineComponent({
         this.store.stockList.length = 0;
 
         const locoSet = this.locoDataList
-          .filter((loco) => !loco.type.startsWith('EP') && (loco.power == 'loco-e' || loco.power == 'loco-s'))
+          .filter((loco) => loco.power == 'loco-e' || loco.power == 'loco-s')
           .filter((loco) => (!this.includeSupporterVehicles && loco.supportersOnly ? false : true));
 
         const randLoco = locoSet[Math.floor(Math.random() * locoSet.length)];
@@ -207,7 +235,7 @@ export default defineComponent({
       totalStockLength += this.store.stockList[0].length;
       totalStockMass += this.store.stockList[0].mass;
 
-      let availableCarsSet = this.cargoCarList.filter((cargoCar) => {
+      let availableCarsSet = this.carDataList.filter((cargoCar) => {
         if (!this.includeSupporterVehicles && cargoCar.supportersOnly) return false;
 
         if (this.chosenCarTypes.find((carType) => cargoCar.type.includes(carType))) return true;
@@ -365,6 +393,19 @@ input {
   font-size: 1.2em;
 }
 
+.car-choice div {
+  display: grid;
+
+  grid-template-columns: repeat(5, 1fr);
+  justify-content: center;
+
+  @media screen and (max-width: 800px) {
+    /* display: flex; */
+    /* flex-wrap: wrap; */
+    grid-template-columns: repeat(4, 1fr);
+  }
+}
+
 button.choice-btn {
   color: gray;
   border-color: gray;

src/main.ts

@@ -1,10 +1,25 @@
-import { createApp } from "vue";
+import { createApp, Directive } from "vue";
 import App from "./App.vue";
 
-import { Store, locoDataList, carDataList, totalLength, totalMass, maxAllowedSpeed, maxStockSpeed, isTrainPassenger, warnings } from "./store";
+import { Store, isLocomotive, locoDataList, carDataList, totalLength, totalMass, maxAllowedSpeed, maxStockSpeed, isTrainPassenger, warnings } from "./store";
+
+const clickOutsideDirective: Directive = {
+    beforeMount(el, binding) {
+
+        el.clickOutsideEvent = (event: Event) => {
+            if (!(el == event.target || el.contains(event.target))) {
+                binding.value();
+            }
+        };
+
+        document.addEventListener("click", el.clickOutsideEvent);
+    },
+}
+
 
 createApp(App)
     .provide('Store', Store)
+    .provide('isLocomotive', isLocomotive)
     .provide('locoDataList', locoDataList)
     .provide('carDataList', carDataList)
     .provide('totalMass', totalMass)
@@ -13,4 +28,5 @@ createApp(App)
     .provide('maxAllowedSpeed', maxAllowedSpeed)
     .provide('isTrainPassenger', isTrainPassenger)
     .provide('warnings', warnings)
+    .directive('click-outside', clickOutsideDirective)
     .mount("#app");

src/store.ts

@@ -20,12 +20,19 @@ export const Store: IStore = reactive({
 
     stockList: [] as IStock[],
     cargoOptions: [] as any[][],
+
+    swapVehicles: false,
+
+    chosenStockListIndex: -1,
     // locoOptions: [] as ILocomotive[],
     // carOptions: [] as ICarWagon[],
 
     vehiclePreviewSrc: ""
 })
 
+export function isLocomotive(vehicle: ILocomotive | ICarWagon): vehicle is ILocomotive {
+    return (vehicle as ILocomotive).power !== undefined;
+}
 
 export const locoDataList = computed(() => Object.keys(vehicleDataJSON).reduce(
     (acc, vehicleTypeKey) => {

src/styles/global.scss

@@ -75,15 +75,21 @@ button.btn {
     outline: none;
     background: none;
 
-
     transition: all 250ms;
 
     &:hover {
         color: $accentColor;
         border-color: $accentColor;
     }
+
+    &--text {
+        font-weight: bold;
+        transition: all 250ms;
+    }
 }
 
+
+
 button.btn-rect {
     width: 1.5em;
     height: 1.5em;
@@ -116,7 +122,7 @@ select {
     color: white;
     font-size: 1em;
 
-    width: 20em;
+    width: 18em;
 }
 
 option {

src/types.ts

@@ -12,9 +12,9 @@ export interface IStore {
   stockList: IStock[];
   cargoOptions: any[][];
 
-  // locoOptions: ILocomotive[];
-  // carOptions: ICarWagon[];
+  chosenStockListIndex: number;
 
+  swapVehicles: boolean;
   vehiclePreviewSrc: string;
 }
 

src/utils/statsUtils.ts

@@ -11,7 +11,6 @@ export const verifyTrainSpec = (stockList: IStock[], vehicleMass: number, vehicl
     const headLoco = stockList[0];
     const carList = stockList.filter(stock => !stock.isLoco);
 
-    console.log(carList, vehicleUseType);
 
 
     const isTrainPassenger = carList.length != 0
@@ -19,6 +18,5 @@ export const verifyTrainSpec = (stockList: IStock[], vehicleMass: number, vehicl
         && vehicleUseType == EVehicleUseType.CAR_PASSENGER
         : false;
 
-    console.log("Skład pasażerski: " + isTrainPassenger);
-    console.log("Skład towarowy: " + !isTrainPassenger);
+
 }