Города
diff --git a/src/pages/DeliveryOrderDetails.jsx b/src/pages/DeliveryOrderDetails.jsx
index 418de0f..5aa56f6 100644
--- a/src/pages/DeliveryOrderDetails.jsx
+++ b/src/pages/DeliveryOrderDetails.jsx
@@ -54,6 +54,9 @@ const DeliveryOrderDetails = () => {
longitude: accessory.longitude,
};
} else {
+ if (error.response && error.response.status === 401) {
+ navigate("/login");
+ }
const coords = await getCoordinates(accessory.city_name);
return { city: accessory.city_name, ...coords };
}
diff --git a/src/pages/FederalDistricts.jsx b/src/pages/FederalDistricts.jsx
index 10ad377..10087d2 100644
--- a/src/pages/FederalDistricts.jsx
+++ b/src/pages/FederalDistricts.jsx
@@ -82,10 +82,6 @@ const FederalDistricts = () => {
setEditingDistrictId(null);
};
- if (getAuthToken() === null) {
- navigate("/login");
- }
-
return (
Федеральные округа
diff --git a/src/pages/Home.jsx b/src/pages/Home.jsx
index 106e201..c8a33e7 100644
--- a/src/pages/Home.jsx
+++ b/src/pages/Home.jsx
@@ -12,7 +12,7 @@ const Home = () => {
const [expandedOrderId, setExpandedOrderId] = useState(null);
const [loadingStatuses, setLoadingStatuses] = useState(true);
const [loadingOrders, setLoadingOrders] = useState(true);
- const [loadingCreateOrder, setLoadingCreateOrder] = useState(false);
+ const [loadingCreateOrder, setLoadingCreateOrder] = useState(false);
const [deliveryOrdersCount, setDeliveryOrdersCount] = useState(0);
const [deadline, setDeadline] = useState(new Date());
const navigate = useNavigate();
@@ -28,6 +28,9 @@ const Home = () => {
const data = await getStatuses();
setStatuses(data);
} catch (error) {
+ if (error.response && error.response.status === 401) {
+ navigate("/login");
+ }
console.error("Ошибка при загрузке статусов:", error);
} finally {
setLoadingStatuses(false);
@@ -39,6 +42,9 @@ const Home = () => {
const orders = await getTotalOrders();
setTotalOrders(orders);
} catch (error) {
+ if (error.response && error.response.status === 401) {
+ navigate("/login");
+ }
console.error("Ошибка при загрузке заказов:", error);
} finally {
setLoadingOrders(false);
@@ -46,7 +52,7 @@ const Home = () => {
};
const handleCreateOrder = async () => {
- setLoadingCreateOrder(true);
+ setLoadingCreateOrder(true);
try {
await calculateTotalOrder();
alert("Начался расчет маршрутов. Заказ скоро появится в списке заказов.");
@@ -54,7 +60,7 @@ const Home = () => {
} catch (error) {
console.error("Ошибка при расчете заказа:", error);
} finally {
- setLoadingCreateOrder(false);
+ setLoadingCreateOrder(false);
}
};
@@ -88,7 +94,7 @@ const Home = () => {