Merge pull request #2 from Spythere/development

Update: nowy atrybut scenerii

.env

@@ -1,3 +1,3 @@
 VITE_API_URL="https://stacjownik.spythere.eu"
 VITE_API_URL_DEV="http://localhost:3001"
-VITE_API_DEV=0
+VITE_API_MODE="PROD"

package.json

@@ -1,7 +1,7 @@
 {
   "name": "station-manager-2.0",
   "private": true,
-  "version": "2.2.0",
+  "version": "2.3.0",
   "type": "module",
   "scripts": {
     "dev": "vite",

src/common/http.ts

@@ -1,7 +1,9 @@
 import axios from 'axios';
 
+const baseURL = import.meta.env['VITE_API_MODE'] == 'DEV' ? import.meta.env['VITE_API_URL_DEV'] : import.meta.env['VITE_API_URL'];
+
 const client = axios.create({
-  baseURL: import.meta.env['VITE_API_URL'],
+  baseURL: baseURL,
   withCredentials: true,
 });
 

src/components/TableActions.vue

@@ -100,6 +100,8 @@ export default defineComponent({
 
   computed: {
     changelog() {
+      console.log(this.store.changeList);
+
       return this.store.changeList
         .map((changeItem) => {
           let itemChanges = [];
@@ -109,7 +111,7 @@ export default defineComponent({
           for (let change in changeItem) {
             let propChange = change as ChangeProp;
 
-            if (/id|name/.test(propChange)) continue;
+            if (/^(id|name)$/.test(propChange)) continue;
 
             let value = typeof changeItem[propChange] === 'boolean' ? (changeItem[propChange] ? 'TAK' : 'NIE') : changeItem[propChange];
 
@@ -119,6 +121,8 @@ export default defineComponent({
             itemChanges.push(`<i style='color: white'>${(HeaderTypes as any)[propChange]}:</i> ${value ?? '-'}`);
           }
 
+          console.log(itemChanges);
+
           return `<b class='text--accent'>${changeItem.name} -></b> ` + itemChanges.join('; ');
         })
         .join(' <br /> ');
@@ -199,6 +203,7 @@ export default defineComponent({
         controlType: 'SCS',
         SUP: false,
         routes: 'Test_1EPB:0:0',
+        hidden: false,
         routesInfo: [
           {
             isElectric: true,

src/mixins/changeMixin.ts

@@ -29,29 +29,11 @@ export default defineComponent({
       const sceneryBackup = this.store.backupList.find((scenery) => scenery.id == sceneryId);
       if (!sceneryBackup) return;
 
-      if (sceneryBackup && sceneryBackup[changePropName] == changeItem[changePropName])
-        delete changeItem[changePropName];
+      if (sceneryBackup && sceneryBackup[changePropName] == changeItem[changePropName]) delete changeItem[changePropName];
 
       if (Object.keys(changeItem).length == 2 && changeItem.id)
         this.store.changeList = this.store.changeList.filter((item) => changeItem?.id != item.id);
 
-      // if (
-      //   changeItem[changePropName] !== undefined &&
-      //   backupChangeItem[changePropName] !== undefined &&
-      //   changeItem[changePropName] == backupChangeItem[changePropName]
-      // ) {
-      //   console.log('delete');
-
-      //   delete changeItem[changePropName];
-      //   delete backupChangeItem[changePropName];
-
-      //   if (Object.keys(changeItem).length == 1 && changeItem.id)
-      //     this.store.changeList = this.store.changeList.filter((item) => changeItem?.id != item.id);
-
-      //   if (Object.keys(backupChangeItem).length == 1 && backupChangeItem.id)
-      //     this.store.changeBackupList = this.store.changeList.filter((item) => backupChangeItem?.id != item.id);
-      // }
-
       this.store.unsavedChanges = this.store.changeList.length != 0;
     },
 

src/types/types.ts

@@ -13,7 +13,8 @@ export type ChangeProp =
   | 'routesInfo'
   | 'checkpoints'
   | 'authors'
-  | 'availability';
+  | 'availability'
+  | 'hidden';
 
 export enum HeaderTypes {
   name = 'Nazwa',
@@ -31,6 +32,7 @@ export enum HeaderTypes {
   routesInfo = 'Szlaki',
   checkpoints = 'Posterunki',
   availability = 'Dostępność',
+  hidden = 'Ukryty',
   toRemove = 'Usuń',
 }
 
@@ -65,6 +67,7 @@ export interface SceneryRowItem {
   signalType: string;
   controlType: string;
   SUP: boolean;
+  hidden: boolean;
   routes: string;
   routesInfo: SceneryRoutesInfo[];
   checkpoints: string;

src/views/ManagerView.vue

@@ -87,6 +87,7 @@ export default defineComponent({
       authors: 'Autorzy',
       routes: 'Szlaki',
       checkpoints: 'Posterunki',
+      hidden: 'Ukryty',
     } as {
       [key: string]: string;
     },