diff --git a/components/mainComponent/MapComponent.js b/components/mainComponent/MapComponent.js index a6bf18282..ae6d64860 100644 --- a/components/mainComponent/MapComponent.js +++ b/components/mainComponent/MapComponent.js @@ -42,14 +42,14 @@ import { useSelector, useDispatch } from "react-redux"; import { setSelectedPoi } from "../../redux/slices/selectedPoiSlice"; import { setDisabled } from "../../redux/slices/polylineEventsDisabledSlice"; import { setMapId, setUserId } from "../../redux/slices/urlParameterSlice"; -import { fetchPoiTypes } from "../../redux/slices/database/poiTypesSlice"; +import { fetchPoiTypes } from "../../redux/slices/database/pois/poiTypesSlice.js"; import { selectMapLayersState } from "../../redux/slices/mapLayersSlice"; import { setCurrentPoi } from "../../redux/slices/currentPoiSlice.js"; import { selectGisLines } from "../../redux/slices/database/polylines/gisLinesSlice"; import { selectGisLinesStatus } from "../../redux/slices/webservice/gisLinesStatusSlice"; -import { selectPoiTypData, selectPoiTypStatus } from "../../redux/slices/database/poiTypSlice"; +import { selectPoiTypData, selectPoiTypStatus } from "../../redux/slices/database/pois/poiTypSlice"; import { selectPriorityConfig } from "../../redux/slices/database/priorityConfigSlice"; -import { selectPoiIconsData, selectPoiIconsStatus } from "../../redux/slices/database/poiIconsDataSlice"; +import { selectPoiIconsData, selectPoiIconsStatus } from "../../redux/slices/database/pois/poiIconsDataSlice"; import { selectGisLinesStatusFromWebservice } from "../../redux/slices/webservice/gisLinesStatusSlice"; import { selectGisUserRightsFromWebservice } from "../../redux/slices/webservice/userRightsSlice"; import { updateCountdown, closePolylineContextMenu } from "../../redux/slices/polylineContextMenuSlice"; diff --git a/components/pois/AddPOIModal.js b/components/pois/AddPOIModal.js index 66cbf01bb..b974cb7d8 100644 --- a/components/pois/AddPOIModal.js +++ b/components/pois/AddPOIModal.js @@ -2,7 +2,7 @@ import React, { useState, useEffect } from "react"; import { useDispatch, useSelector } from "react-redux"; import { selectGisStationsStaticDistrict } from "../../redux/slices/webservice/gisStationsStaticDistrictSlice"; -import { fetchPoiTypes } from "../../redux/slices/database/poiTypesSlice"; +import { fetchPoiTypes } from "../../redux/slices/database/pois/poiTypesSlice"; import { incrementTrigger } from "../../redux/slices/poiReadFromDbTriggerSlice"; import { addPoiThunk } from "../../redux/thunks/database/pois/addPoiThunk"; import { fetchPoiIconsDataThunk } from "../../redux/thunks/database/pois/fetchPoiIconsDataThunk"; diff --git a/components/pois/PoiUpdateModal.js b/components/pois/PoiUpdateModal.js index 0ee50d805..5d4957ae8 100644 --- a/components/pois/PoiUpdateModal.js +++ b/components/pois/PoiUpdateModal.js @@ -5,7 +5,7 @@ import { useSelector, useDispatch } from "react-redux"; import { fetchLocationDevicesThunk } from "../../redux/thunks/database/fetchLocationDevicesThunk"; import { fetchPoiTypThunk } from "../../redux/thunks/database/pois/fetchPoiTypThunk"; import { selectMapLayersState } from "../../redux/slices/mapLayersSlice"; -import { selectPoiTypData, selectPoiTypStatus } from "../../redux/slices/database/poiTypSlice"; +import { selectPoiTypData, selectPoiTypStatus } from "../../redux/slices/database/pois/poiTypSlice"; import { deletePoiThunk } from "../../redux/thunks/database/pois/deletePoiThunk"; import { updatePoiThunk } from "../../redux/thunks/database/pois/updatePoiThunk"; diff --git a/config/appVersion.js b/config/appVersion.js index 2f2ba383a..03caadfbe 100644 --- a/config/appVersion.js +++ b/config/appVersion.js @@ -1,2 +1,2 @@ // /config/appVersion -export const APP_VERSION = "1.1.170"; +export const APP_VERSION = "1.1.171"; diff --git a/redux/slices/database/poiIconsDataSlice.js b/redux/slices/database/pois/poiIconsDataSlice.js similarity index 90% rename from redux/slices/database/poiIconsDataSlice.js rename to redux/slices/database/pois/poiIconsDataSlice.js index 8b8f28d85..32ca04e7c 100644 --- a/redux/slices/database/poiIconsDataSlice.js +++ b/redux/slices/database/pois/poiIconsDataSlice.js @@ -1,6 +1,6 @@ // /redux/slices/database/poiIconsDataSlice.js import { createSlice } from "@reduxjs/toolkit"; -import { fetchPoiIconsDataThunk } from "../../thunks/database/pois/fetchPoiIconsDataThunk"; +import { fetchPoiIconsDataThunk } from "../../../thunks/database/pois/fetchPoiIconsDataThunk"; const initialState = { data: [], diff --git a/redux/slices/database/poiTypSlice.js b/redux/slices/database/pois/poiTypSlice.js similarity index 91% rename from redux/slices/database/poiTypSlice.js rename to redux/slices/database/pois/poiTypSlice.js index d02b7b716..fd1076da5 100644 --- a/redux/slices/database/poiTypSlice.js +++ b/redux/slices/database/pois/poiTypSlice.js @@ -1,6 +1,6 @@ // /redux/slices/database/poiTypSlice.js import { createSlice } from "@reduxjs/toolkit"; -import { fetchPoiTypThunk } from "../../thunks/database/pois/fetchPoiTypThunk"; +import { fetchPoiTypThunk } from "../../../thunks/database/pois/fetchPoiTypThunk"; const initialState = { data: [], diff --git a/redux/slices/database/poiTypesSlice.js b/redux/slices/database/pois/poiTypesSlice.js similarity index 100% rename from redux/slices/database/poiTypesSlice.js rename to redux/slices/database/pois/poiTypesSlice.js diff --git a/redux/store.js b/redux/store.js index b76ab85b9..43772807f 100644 --- a/redux/store.js +++ b/redux/store.js @@ -17,11 +17,11 @@ import zoomTriggerReducer from "./slices/zoomTriggerSlice"; import urlParameterReducer from "./slices/urlParameterSlice"; //-----database------------ import priorityConfigReducer from "./slices/database/priorityConfigSlice"; -import poiTypesReducer from "./slices/database/poiTypesSlice"; +import poiTypesReducer from "./slices/database/pois/poiTypesSlice"; import locationDevicesFromDBReducer from "./slices/database/locationDevicesFromDBSlice"; import gisLinesFromDatabaseReducer from "./slices/database/polylines/gisLinesSlice"; -import poiTypReducer from "./slices/database/poiTypSlice"; -import poiIconsDataReducer from "./slices/database/poiIconsDataSlice"; +import poiTypReducer from "./slices/database/pois/poiTypSlice"; +import poiIconsDataReducer from "./slices/database/pois/poiIconsDataSlice"; //----webservice------------ import gisStationsStaticDistrictReducer from "./slices/webservice/gisStationsStaticDistrictSlice"; import gisStationsStatusDistrictReducer from "./slices/webservice/gisStationsStatusDistrictSlice";