From 2b6a9f7c5a891e08c67dd2d86a22e101acf64911 Mon Sep 17 00:00:00 2001
From: aboba <aboba>
Date: Wed, 6 Nov 2024 15:17:53 +0300
Subject: [PATCH] from notebook

---
 src/routes/{admin => }/+layout.js             |  0
 src/routes/{admin => }/+layout.svelte         |  2 +-
 src/routes/{admin => }/+page.svelte           |  0
 .../{admin => }/currencies/+page.svelte       |  0
 src/routes/{admin => }/disputes/+page.svelte  |  0
 src/routes/{admin => }/login/+page.svelte     |  0
 src/routes/{admin => }/merchants/+page.svelte |  0
 src/routes/{admin => }/newuser/+page.svelte   |  0
 src/routes/{admin => }/orders/+page.svelte    | 13 ++++----
 src/routes/{admin => }/payouts/+page.svelte   |  0
 src/routes/{admin => }/sms/+page.svelte       |  0
 .../user/change/[userToken]/+page.js          |  0
 .../user/change/[userToken]/+page.svelte      |  0
 .../edit/req/[userToken]/[reqID]/+page.js     |  0
 .../edit/req/[userToken]/[reqID]/+page.svelte |  0
 .../user/neworder/[userToken]/+page.js        |  0
 .../user/neworder/[userToken]/+page.svelte    |  0
 .../user/profile/[userToken]/+page.js         |  0
 .../user/profile/[userToken]/+page.svelte     |  0
 src/routes/{admin => }/userslist/+page.svelte |  0
 .../{admin => }/withdrawals/+page.svelte      |  0
 svelte.config.js                              | 30 +++++++++----------
 22 files changed, 23 insertions(+), 22 deletions(-)
 rename src/routes/{admin => }/+layout.js (100%)
 rename src/routes/{admin => }/+layout.svelte (98%)
 rename src/routes/{admin => }/+page.svelte (100%)
 rename src/routes/{admin => }/currencies/+page.svelte (100%)
 rename src/routes/{admin => }/disputes/+page.svelte (100%)
 rename src/routes/{admin => }/login/+page.svelte (100%)
 rename src/routes/{admin => }/merchants/+page.svelte (100%)
 rename src/routes/{admin => }/newuser/+page.svelte (100%)
 rename src/routes/{admin => }/orders/+page.svelte (96%)
 rename src/routes/{admin => }/payouts/+page.svelte (100%)
 rename src/routes/{admin => }/sms/+page.svelte (100%)
 rename src/routes/{admin => }/user/change/[userToken]/+page.js (100%)
 rename src/routes/{admin => }/user/change/[userToken]/+page.svelte (100%)
 rename src/routes/{admin => }/user/edit/req/[userToken]/[reqID]/+page.js (100%)
 rename src/routes/{admin => }/user/edit/req/[userToken]/[reqID]/+page.svelte (100%)
 rename src/routes/{admin => }/user/neworder/[userToken]/+page.js (100%)
 rename src/routes/{admin => }/user/neworder/[userToken]/+page.svelte (100%)
 rename src/routes/{admin => }/user/profile/[userToken]/+page.js (100%)
 rename src/routes/{admin => }/user/profile/[userToken]/+page.svelte (100%)
 rename src/routes/{admin => }/userslist/+page.svelte (100%)
 rename src/routes/{admin => }/withdrawals/+page.svelte (100%)

diff --git a/src/routes/admin/+layout.js b/src/routes/+layout.js
similarity index 100%
rename from src/routes/admin/+layout.js
rename to src/routes/+layout.js
diff --git a/src/routes/admin/+layout.svelte b/src/routes/+layout.svelte
similarity index 98%
rename from src/routes/admin/+layout.svelte
rename to src/routes/+layout.svelte
index b18619d..cf5de8b 100644
--- a/src/routes/admin/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,7 +1,7 @@
 <script>
   import { SvelteToast } from "@zerodevx/svelte-toast";
   import { onMount } from "svelte";
-  import "../../app.css";
+  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";
diff --git a/src/routes/admin/+page.svelte b/src/routes/+page.svelte
similarity index 100%
rename from src/routes/admin/+page.svelte
rename to src/routes/+page.svelte
diff --git a/src/routes/admin/currencies/+page.svelte b/src/routes/currencies/+page.svelte
similarity index 100%
rename from src/routes/admin/currencies/+page.svelte
rename to src/routes/currencies/+page.svelte
diff --git a/src/routes/admin/disputes/+page.svelte b/src/routes/disputes/+page.svelte
similarity index 100%
rename from src/routes/admin/disputes/+page.svelte
rename to src/routes/disputes/+page.svelte
diff --git a/src/routes/admin/login/+page.svelte b/src/routes/login/+page.svelte
similarity index 100%
rename from src/routes/admin/login/+page.svelte
rename to src/routes/login/+page.svelte
diff --git a/src/routes/admin/merchants/+page.svelte b/src/routes/merchants/+page.svelte
similarity index 100%
rename from src/routes/admin/merchants/+page.svelte
rename to src/routes/merchants/+page.svelte
diff --git a/src/routes/admin/newuser/+page.svelte b/src/routes/newuser/+page.svelte
similarity index 100%
rename from src/routes/admin/newuser/+page.svelte
rename to src/routes/newuser/+page.svelte
diff --git a/src/routes/admin/orders/+page.svelte b/src/routes/orders/+page.svelte
similarity index 96%
rename from src/routes/admin/orders/+page.svelte
rename to src/routes/orders/+page.svelte
index 66be253..cd9b532 100644
--- a/src/routes/admin/orders/+page.svelte
+++ b/src/routes/orders/+page.svelte
@@ -90,12 +90,12 @@
   // $: if (foundedDispute !== 0) newSum = Number(foundedDispute?.summa);
 
   let showLoadingChangeSum = false;
-  async function changeSum(id) {
+  async function changeSum(uuid) {
     showLoadingChangeSum = true;
     const res = await makePost(
       "admin/rollbackOrder",
       {
-        id: Number(id),
+        id: uuid,
         summa: newSum.toString(),
       },
       makeAuthHeaderForAxios(getAuthInfo()?.a)
@@ -169,9 +169,10 @@
       <p class="text-sm mt-3">Сумма</p>
       <p>
         {foundedDispute["summa"]}
-        {foundedDispute["currency_code"]} ({(
+        {foundedDispute["currency_code"]} 
+        <!-- ({(
           Number(foundedDispute["summa"]) / Number(foundedDispute["rate"])
-        ).toFixed(2)} USDT)
+        ).toFixed(2)} USDT) -->
       </p>
       <!-- <p class="text-sm mt-3">Курс</p>
       <p>{foundedDispute["rate"]} {foundedDispute["currency_code"]}</p> -->
@@ -225,14 +226,14 @@
       />
       <button
         on:click={() => {
-          changeSum(foundedDispute["id"]);
+          changeSum(foundedDispute["uuid"]);
         }}
         class="btn btn-outline btn-info"
       >
         {#if showLoadingChangeSum}
           <span class="loading loading-dots loading-xs"></span>
         {:else}
-          {"Изменить суму ручками"}
+          {"Изменить сумму ручками"}
         {/if}
       </button>
       <button
diff --git a/src/routes/admin/payouts/+page.svelte b/src/routes/payouts/+page.svelte
similarity index 100%
rename from src/routes/admin/payouts/+page.svelte
rename to src/routes/payouts/+page.svelte
diff --git a/src/routes/admin/sms/+page.svelte b/src/routes/sms/+page.svelte
similarity index 100%
rename from src/routes/admin/sms/+page.svelte
rename to src/routes/sms/+page.svelte
diff --git a/src/routes/admin/user/change/[userToken]/+page.js b/src/routes/user/change/[userToken]/+page.js
similarity index 100%
rename from src/routes/admin/user/change/[userToken]/+page.js
rename to src/routes/user/change/[userToken]/+page.js
diff --git a/src/routes/admin/user/change/[userToken]/+page.svelte b/src/routes/user/change/[userToken]/+page.svelte
similarity index 100%
rename from src/routes/admin/user/change/[userToken]/+page.svelte
rename to src/routes/user/change/[userToken]/+page.svelte
diff --git a/src/routes/admin/user/edit/req/[userToken]/[reqID]/+page.js b/src/routes/user/edit/req/[userToken]/[reqID]/+page.js
similarity index 100%
rename from src/routes/admin/user/edit/req/[userToken]/[reqID]/+page.js
rename to src/routes/user/edit/req/[userToken]/[reqID]/+page.js
diff --git a/src/routes/admin/user/edit/req/[userToken]/[reqID]/+page.svelte b/src/routes/user/edit/req/[userToken]/[reqID]/+page.svelte
similarity index 100%
rename from src/routes/admin/user/edit/req/[userToken]/[reqID]/+page.svelte
rename to src/routes/user/edit/req/[userToken]/[reqID]/+page.svelte
diff --git a/src/routes/admin/user/neworder/[userToken]/+page.js b/src/routes/user/neworder/[userToken]/+page.js
similarity index 100%
rename from src/routes/admin/user/neworder/[userToken]/+page.js
rename to src/routes/user/neworder/[userToken]/+page.js
diff --git a/src/routes/admin/user/neworder/[userToken]/+page.svelte b/src/routes/user/neworder/[userToken]/+page.svelte
similarity index 100%
rename from src/routes/admin/user/neworder/[userToken]/+page.svelte
rename to src/routes/user/neworder/[userToken]/+page.svelte
diff --git a/src/routes/admin/user/profile/[userToken]/+page.js b/src/routes/user/profile/[userToken]/+page.js
similarity index 100%
rename from src/routes/admin/user/profile/[userToken]/+page.js
rename to src/routes/user/profile/[userToken]/+page.js
diff --git a/src/routes/admin/user/profile/[userToken]/+page.svelte b/src/routes/user/profile/[userToken]/+page.svelte
similarity index 100%
rename from src/routes/admin/user/profile/[userToken]/+page.svelte
rename to src/routes/user/profile/[userToken]/+page.svelte
diff --git a/src/routes/admin/userslist/+page.svelte b/src/routes/userslist/+page.svelte
similarity index 100%
rename from src/routes/admin/userslist/+page.svelte
rename to src/routes/userslist/+page.svelte
diff --git a/src/routes/admin/withdrawals/+page.svelte b/src/routes/withdrawals/+page.svelte
similarity index 100%
rename from src/routes/admin/withdrawals/+page.svelte
rename to src/routes/withdrawals/+page.svelte
diff --git a/svelte.config.js b/svelte.config.js
index 32af538..39f3486 100644
--- a/svelte.config.js
+++ b/svelte.config.js
@@ -20,21 +20,21 @@ const config = {
     prerender: {
       // default: true,
       entries: [
-        "/admin/user/change/sampleToken",
-        "/admin/user/edit/req/sampleToken/sampleReqID",
-        "/admin/user/neworder/sampleToken",
-        "/admin/user/profile/sampleToken",
-        "/admin/",
-        "/admin/login",
-        "/admin/newuser",
-        "/admin/userslist",
-        "/admin/disputes",
-        "/admin/payouts",
-        "/admin/merchants",
-        "/admin/orders",
-        "/admin/currencies",
-        "/admin/sms",
-        "/admin/withdrawals"
+        "/user/change/sampleToken",
+        "/user/edit/req/sampleToken/sampleReqID",
+        "/user/neworder/sampleToken",
+        "/user/profile/sampleToken",
+        "/",
+        "/login",
+        "/newuser",
+        "/userslist",
+        "/disputes",
+        "/payouts",
+        "/merchants",
+        "/orders",
+        "/currencies",
+        "/sms",
+        "/withdrawals"
       ],
     },
   },