refactoring
This commit is contained in:
@@ -42,14 +42,14 @@ import { useSelector, useDispatch } from "react-redux";
|
|||||||
import { setSelectedPoi } from "../../redux/slices/selectedPoiSlice";
|
import { setSelectedPoi } from "../../redux/slices/selectedPoiSlice";
|
||||||
import { setDisabled } from "../../redux/slices/polylineEventsDisabledSlice";
|
import { setDisabled } from "../../redux/slices/polylineEventsDisabledSlice";
|
||||||
import { setMapId, setUserId } from "../../redux/slices/urlParameterSlice";
|
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 { selectMapLayersState } from "../../redux/slices/mapLayersSlice";
|
||||||
import { setCurrentPoi } from "../../redux/slices/currentPoiSlice.js";
|
import { setCurrentPoi } from "../../redux/slices/currentPoiSlice.js";
|
||||||
import { selectGisLines } from "../../redux/slices/database/polylines/gisLinesSlice";
|
import { selectGisLines } from "../../redux/slices/database/polylines/gisLinesSlice";
|
||||||
import { selectGisLinesStatus } from "../../redux/slices/webservice/gisLinesStatusSlice";
|
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 { 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 { selectGisLinesStatusFromWebservice } from "../../redux/slices/webservice/gisLinesStatusSlice";
|
||||||
import { selectGisUserRightsFromWebservice } from "../../redux/slices/webservice/userRightsSlice";
|
import { selectGisUserRightsFromWebservice } from "../../redux/slices/webservice/userRightsSlice";
|
||||||
import { updateCountdown, closePolylineContextMenu } from "../../redux/slices/polylineContextMenuSlice";
|
import { updateCountdown, closePolylineContextMenu } from "../../redux/slices/polylineContextMenuSlice";
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
import React, { useState, useEffect } from "react";
|
import React, { useState, useEffect } from "react";
|
||||||
import { useDispatch, useSelector } from "react-redux";
|
import { useDispatch, useSelector } from "react-redux";
|
||||||
import { selectGisStationsStaticDistrict } from "../../redux/slices/webservice/gisStationsStaticDistrictSlice";
|
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 { incrementTrigger } from "../../redux/slices/poiReadFromDbTriggerSlice";
|
||||||
import { addPoiThunk } from "../../redux/thunks/database/pois/addPoiThunk";
|
import { addPoiThunk } from "../../redux/thunks/database/pois/addPoiThunk";
|
||||||
import { fetchPoiIconsDataThunk } from "../../redux/thunks/database/pois/fetchPoiIconsDataThunk";
|
import { fetchPoiIconsDataThunk } from "../../redux/thunks/database/pois/fetchPoiIconsDataThunk";
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import { useSelector, useDispatch } from "react-redux";
|
|||||||
import { fetchLocationDevicesThunk } from "../../redux/thunks/database/fetchLocationDevicesThunk";
|
import { fetchLocationDevicesThunk } from "../../redux/thunks/database/fetchLocationDevicesThunk";
|
||||||
import { fetchPoiTypThunk } from "../../redux/thunks/database/pois/fetchPoiTypThunk";
|
import { fetchPoiTypThunk } from "../../redux/thunks/database/pois/fetchPoiTypThunk";
|
||||||
import { selectMapLayersState } from "../../redux/slices/mapLayersSlice";
|
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 { deletePoiThunk } from "../../redux/thunks/database/pois/deletePoiThunk";
|
||||||
import { updatePoiThunk } from "../../redux/thunks/database/pois/updatePoiThunk";
|
import { updatePoiThunk } from "../../redux/thunks/database/pois/updatePoiThunk";
|
||||||
|
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
// /config/appVersion
|
// /config/appVersion
|
||||||
export const APP_VERSION = "1.1.170";
|
export const APP_VERSION = "1.1.171";
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
// /redux/slices/database/poiIconsDataSlice.js
|
// /redux/slices/database/poiIconsDataSlice.js
|
||||||
import { createSlice } from "@reduxjs/toolkit";
|
import { createSlice } from "@reduxjs/toolkit";
|
||||||
import { fetchPoiIconsDataThunk } from "../../thunks/database/pois/fetchPoiIconsDataThunk";
|
import { fetchPoiIconsDataThunk } from "../../../thunks/database/pois/fetchPoiIconsDataThunk";
|
||||||
|
|
||||||
const initialState = {
|
const initialState = {
|
||||||
data: [],
|
data: [],
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
// /redux/slices/database/poiTypSlice.js
|
// /redux/slices/database/poiTypSlice.js
|
||||||
import { createSlice } from "@reduxjs/toolkit";
|
import { createSlice } from "@reduxjs/toolkit";
|
||||||
import { fetchPoiTypThunk } from "../../thunks/database/pois/fetchPoiTypThunk";
|
import { fetchPoiTypThunk } from "../../../thunks/database/pois/fetchPoiTypThunk";
|
||||||
|
|
||||||
const initialState = {
|
const initialState = {
|
||||||
data: [],
|
data: [],
|
||||||
@@ -17,11 +17,11 @@ import zoomTriggerReducer from "./slices/zoomTriggerSlice";
|
|||||||
import urlParameterReducer from "./slices/urlParameterSlice";
|
import urlParameterReducer from "./slices/urlParameterSlice";
|
||||||
//-----database------------
|
//-----database------------
|
||||||
import priorityConfigReducer from "./slices/database/priorityConfigSlice";
|
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 locationDevicesFromDBReducer from "./slices/database/locationDevicesFromDBSlice";
|
||||||
import gisLinesFromDatabaseReducer from "./slices/database/polylines/gisLinesSlice";
|
import gisLinesFromDatabaseReducer from "./slices/database/polylines/gisLinesSlice";
|
||||||
import poiTypReducer from "./slices/database/poiTypSlice";
|
import poiTypReducer from "./slices/database/pois/poiTypSlice";
|
||||||
import poiIconsDataReducer from "./slices/database/poiIconsDataSlice";
|
import poiIconsDataReducer from "./slices/database/pois/poiIconsDataSlice";
|
||||||
//----webservice------------
|
//----webservice------------
|
||||||
import gisStationsStaticDistrictReducer from "./slices/webservice/gisStationsStaticDistrictSlice";
|
import gisStationsStaticDistrictReducer from "./slices/webservice/gisStationsStaticDistrictSlice";
|
||||||
import gisStationsStatusDistrictReducer from "./slices/webservice/gisStationsStatusDistrictSlice";
|
import gisStationsStatusDistrictReducer from "./slices/webservice/gisStationsStatusDistrictSlice";
|
||||||
|
|||||||
Reference in New Issue
Block a user