From c650dbb220e021e70148e3ee2a046d5daea8d298 Mon Sep 17 00:00:00 2001
From: you <you@example.com>
Date: Sat, 6 Jul 2024 12:09:47 +0300
Subject: [PATCH] fixes

---
 src/lib/ui-components/navbar.svelte                |  2 +-
 src/routes/+layout.svelte                          |  3 ++-
 src/routes/disputes/+page.svelte                   |  6 +++---
 src/routes/login/+page.svelte                      |  3 ++-
 src/routes/newuser/+page.svelte                    |  6 ++++--
 src/routes/user/change/[userToken]/+page.js        |  4 +++-
 src/routes/user/change/[userToken]/+page.svelte    |  4 +++-
 .../user/edit/req/[userToken]/[reqID]/+page.svelte |  7 +++++--
 src/routes/user/profile/[userToken]/+page.js       |  4 +++-
 src/routes/user/profile/[userToken]/+page.svelte   | 14 ++++++++------
 src/routes/userslist/+page.svelte                  |  4 +++-
 svelte.config.js                                   |  1 +
 12 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/src/lib/ui-components/navbar.svelte b/src/lib/ui-components/navbar.svelte
index 0c844cd..64bedb8 100644
--- a/src/lib/ui-components/navbar.svelte
+++ b/src/lib/ui-components/navbar.svelte
@@ -54,7 +54,7 @@
   <div class="navbar-end">
     <button on:click={()=>{
       saveAuthInfo("");
-      redirect("/");
+      redirect("/admin/");
     }} class="btn btn-error btn-outline">Выход</button>
   </div>
 </div>
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index c306817..1a6eed9 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -4,6 +4,7 @@
   import "../app.css";
   import Navbar from "../lib/ui-components/navbar.svelte";
   import { checkAuth, checkAuthSync } from "../lib/auth/Auth";
+  import { redirect } from "$lib/tools/url/URLTools";
 
   let loggedIn = false;
   let authCheckInProgress = false;
@@ -12,7 +13,7 @@
   onMount(() => {
 
     if (!checkAuthSync() && window.location.pathname !== "/login") {
-      window.location.href = "/login";
+      redirect("/admin/login");
     }
     else if (checkAuthSync())
     {
diff --git a/src/routes/disputes/+page.svelte b/src/routes/disputes/+page.svelte
index 7111a30..e08af03 100644
--- a/src/routes/disputes/+page.svelte
+++ b/src/routes/disputes/+page.svelte
@@ -38,7 +38,7 @@
     console.log(result);
     if (result.status === 401) {
       sayError("Данные авторизации устарели");
-      redirect("/");
+      redirect("/admin/");
       disablePagesDisputes = false;
       //   disablePagesUserDeposits = false;
       return;
@@ -83,7 +83,7 @@
     console.log(result);
     if (result.status === 401) {
       sayError("Данные авторизации устарели");
-      redirect("/");
+      redirect("/admin/");
       //   disablePagesUserDeposits = false;
       return;
     }
@@ -109,7 +109,7 @@
     console.log(result);
     if (result.status === 401) {
       sayError("Данные авторизации устарели");
-      redirect("/");
+      redirect("/admin/");
       //   disablePagesUserDeposits = false;
       return;
     }
diff --git a/src/routes/login/+page.svelte b/src/routes/login/+page.svelte
index 6eb1bec..63f5662 100644
--- a/src/routes/login/+page.svelte
+++ b/src/routes/login/+page.svelte
@@ -3,6 +3,7 @@
   import { sayError, sayInfo, sayWarning } from "$lib/tools/toaster/Toaster";
   import { onMount } from "svelte";
   import {checkAuth, saveAuthInfo} from "../../lib/auth/Auth";
+  import { redirect } from "$lib/tools/url/URLTools";
 
   //6da8a96a-7253-45e2-a3c1-e00d5ecdc65d - valid
   let tokenValid = true;
@@ -36,7 +37,7 @@
       else
       {
         saveAuthInfo(result.data.token);
-        window.location.href = "/";
+        redirect("/admin/");
         showLoadingSpinner = false;
         return;
       }
diff --git a/src/routes/newuser/+page.svelte b/src/routes/newuser/+page.svelte
index 07bcf44..ff1ef8e 100644
--- a/src/routes/newuser/+page.svelte
+++ b/src/routes/newuser/+page.svelte
@@ -8,6 +8,7 @@
   } from "$lib/auth/Auth";
   import { onMount } from "svelte";
   import { sayError } from "$lib/tools/toaster/Toaster";
+  import { redirect } from "$lib/tools/url/URLTools";
 
   let value_name = "";
   let value_surname = "";
@@ -62,7 +63,7 @@
     );
     if (result.status === 401) {
       sayError("Данные авторизации устарели");
-      window.location.href = "/";
+      redirect("/admin/");
       return;
     }
     if (result.error) {
@@ -93,7 +94,8 @@
     if(result.status === 401)
     {
       sayError("Данные авторизации устарели");
-      window.location.href = "/";
+      // window.location.href = "/";
+      redirect("/admin/");
       return;
     }
     if(result.error)
diff --git a/src/routes/user/change/[userToken]/+page.js b/src/routes/user/change/[userToken]/+page.js
index 3adcde1..361dcdc 100644
--- a/src/routes/user/change/[userToken]/+page.js
+++ b/src/routes/user/change/[userToken]/+page.js
@@ -2,6 +2,7 @@ import { browser } from "$app/environment";
 import { getAuthInfo, makeAuthHeaderForAxios } from "$lib/auth/Auth";
 import { makePost } from "$lib/tools/requests/requests";
 import { sayError } from "$lib/tools/toaster/Toaster";
+import { redirect } from "$lib/tools/url/URLTools";
 
 export async function load({ params }) {
     if(!browser) return;
@@ -15,7 +16,8 @@ export async function load({ params }) {
   );
   if (userResult.status === 401) {
     sayError("Данные авторизации устарели");
-    window.location.href = "/";
+    // window.location.href = "/";
+    redirect("/admin/");
     return {};
   }
   if (userResult.error) {
diff --git a/src/routes/user/change/[userToken]/+page.svelte b/src/routes/user/change/[userToken]/+page.svelte
index a265701..fde8283 100644
--- a/src/routes/user/change/[userToken]/+page.svelte
+++ b/src/routes/user/change/[userToken]/+page.svelte
@@ -3,6 +3,7 @@
   import { makePost } from "$lib/tools/requests/requests.js";
   import { isStringEmptyOrSpaces } from "$lib/tools/strings/Strings";
   import { sayError } from "$lib/tools/toaster/Toaster.js";
+  import { redirect } from "$lib/tools/url/URLTools.js";
   import { jwtDecode } from "jwt-decode";
 
   export let data;
@@ -66,7 +67,8 @@
     );
     if (userResult.status === 401) {
       sayError("Данные авторизации устарели");
-      window.location.href = "/";
+      // window.location.href = "/";
+      redirect("/admin/");
       changingUser = false;
       return;
     }
diff --git a/src/routes/user/edit/req/[userToken]/[reqID]/+page.svelte b/src/routes/user/edit/req/[userToken]/[reqID]/+page.svelte
index cfd715c..5eae75b 100644
--- a/src/routes/user/edit/req/[userToken]/[reqID]/+page.svelte
+++ b/src/routes/user/edit/req/[userToken]/[reqID]/+page.svelte
@@ -5,6 +5,7 @@
   import { getAuthInfo, makeAuthHeaderForAxios } from "$lib/auth/Auth.js";
   import { makePost } from "$lib/tools/requests/requests.js";
   import { sayError } from "$lib/tools/toaster/Toaster.js";
+  import { redirect } from "$lib/tools/url/URLTools.js";
 
   export let data;
   let { reqID } = data;
@@ -55,7 +56,8 @@
     );
     if (result.status === 401) {
       sayError("Данные авторизации устарели");
-      window.location.href = "/";
+      // window.location.href = "/";
+      redirect("/admin/");
       return;
     }
     if (result.error) {
@@ -82,7 +84,8 @@
     );
     if (result.status === 401) {
       sayError("Данные авторизации устарели");
-      window.location.href = "/";
+      // window.location.href = "/";
+      redirect("/admin/");
     //   canChange = true;
       return;
     }
diff --git a/src/routes/user/profile/[userToken]/+page.js b/src/routes/user/profile/[userToken]/+page.js
index f4c44f6..b5f86c8 100644
--- a/src/routes/user/profile/[userToken]/+page.js
+++ b/src/routes/user/profile/[userToken]/+page.js
@@ -2,6 +2,7 @@ import { browser } from "$app/environment";
 import { getAuthInfo, makeAuthHeaderForAxios } from "$lib/auth/Auth";
 import { makePost } from "$lib/tools/requests/requests";
 import { sayError } from "$lib/tools/toaster/Toaster";
+import { redirect } from "$lib/tools/url/URLTools";
 
 export async function load({ params }) {
   if(!browser) return;
@@ -15,7 +16,8 @@ export async function load({ params }) {
   );
   if (userResult.status === 401) {
     sayError("Данные авторизации устарели");
-    window.location.href = "/";
+    // window.location.href = "/";
+    redirect("/admin/");
     return {};
   }
   if (userResult.error) {
diff --git a/src/routes/user/profile/[userToken]/+page.svelte b/src/routes/user/profile/[userToken]/+page.svelte
index 2937d55..67e619d 100644
--- a/src/routes/user/profile/[userToken]/+page.svelte
+++ b/src/routes/user/profile/[userToken]/+page.svelte
@@ -22,14 +22,15 @@
     );
     if (result.status === 401) {
       sayError("Данные авторизации устарели");
-      window.location.href = "/";
+      // window.location.href = "/";
+      redirect("/admin/");
       return;
     }
     if (result.error) {
       sayError("Не удалось удалить пользователя");
       return;
     }
-    redirect("/userslist");
+    redirect("/admin/userslist");
   }
 
   async function reloadUserInfo() {
@@ -44,7 +45,7 @@
     if (userResult.status === 401) {
       userInfoReloading = false;
       sayError("Данные авторизации устарели");
-      redirect("/");
+      redirect("/admin/");
       return;
     }
     if (userResult.error) {
@@ -74,7 +75,8 @@
     );
     if (result.status === 401) {
       sayError("Данные авторизации устарели");
-      window.location.href = "/";
+      // window.location.href = "/";
+      redirect("/admin/");
       disablePagesUserOrders = false;
       return;
     }
@@ -102,7 +104,7 @@
     );
     if (result.status === 401) {
       sayError("Данные авторизации устарели");
-      redirect("/");
+      redirect("/admin/");
       return;
     }
     if (result.error) {
@@ -136,7 +138,7 @@
     );
     if (result.status === 401) {
       sayError("Данные авторизации устарели");
-      redirect("/");
+      redirect("/admin/");
       disablePagesUserDeposits = false;
       return;
     }
diff --git a/src/routes/userslist/+page.svelte b/src/routes/userslist/+page.svelte
index bc9835e..2820e67 100644
--- a/src/routes/userslist/+page.svelte
+++ b/src/routes/userslist/+page.svelte
@@ -3,6 +3,7 @@
   import { checkAuthSync, getAuthInfo, makeAuthHeaderForAxios } from "$lib/auth/Auth";
   import { makeGet } from "$lib/tools/requests/requests";
   import { sayError } from "$lib/tools/toaster/Toaster";
+  import { redirect } from "$lib/tools/url/URLTools";
 
   let users = [];
   let usersReady = false;
@@ -18,7 +19,8 @@
     else
     {
       sayError("Данные авторизации устарели");
-      window.location.href = "/";
+      // window.location.href = "/";
+      redirect("/admin/");
       return;
     }
   }
diff --git a/svelte.config.js b/svelte.config.js
index b8ef852..dba8af7 100644
--- a/svelte.config.js
+++ b/svelte.config.js
@@ -28,6 +28,7 @@ const config = {
         "/login",
         "/newuser",
         "/userslist",
+        "/disputes"
       ],
     },
   },