diff --git a/.env b/.env
index 1ea1c62..f845f3a 100644
--- a/.env
+++ b/.env
@@ -1,3 +1,3 @@
VITE_API_URL="https://stacjownik.spythere.eu"
VITE_API_URL_DEV="http://localhost:3001"
-VITE_API_DEV=0
\ No newline at end of file
+VITE_API_MODE="PROD"
\ No newline at end of file
diff --git a/package.json b/package.json
index 6dccd87..03b18eb 100644
--- a/package.json
+++ b/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",
diff --git a/src/common/http.ts b/src/common/http.ts
index 07b851b..c5f3f83 100644
--- a/src/common/http.ts
+++ b/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,
});
diff --git a/src/components/TableActions.vue b/src/components/TableActions.vue
index 17652ad..698ed36 100644
--- a/src/components/TableActions.vue
+++ b/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(`${(HeaderTypes as any)[propChange]}: ${value ?? '-'}`);
}
+ console.log(itemChanges);
+
return `${changeItem.name} -> ` + itemChanges.join('; ');
})
.join('
');
@@ -199,6 +203,7 @@ export default defineComponent({
controlType: 'SCS',
SUP: false,
routes: 'Test_1EPB:0:0',
+ hidden: false,
routesInfo: [
{
isElectric: true,
diff --git a/src/mixins/changeMixin.ts b/src/mixins/changeMixin.ts
index 14242fe..0045c9c 100644
--- a/src/mixins/changeMixin.ts
+++ b/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;
},
diff --git a/src/types/types.ts b/src/types/types.ts
index 869c2d3..b02e834 100644
--- a/src/types/types.ts
+++ b/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;
diff --git a/src/views/ManagerView.vue b/src/views/ManagerView.vue
index f6b92e5..21609d5 100644
--- a/src/views/ManagerView.vue
+++ b/src/views/ManagerView.vue
@@ -87,6 +87,7 @@ export default defineComponent({
authors: 'Autorzy',
routes: 'Szlaki',
checkpoints: 'Posterunki',
+ hidden: 'Ukryty',
} as {
[key: string]: string;
},