From 8a7be273be46ffee5e4765560d884a93123b71bd Mon Sep 17 00:00:00 2001 From: you Date: Mon, 22 Jul 2024 14:04:47 +0300 Subject: [PATCH] - 0 - --- src/lib/tools/requests/Requests.js | 47 --- src/lib/ui-components/navbar.svelte | 2 + src/routes/admin/+layout.js | 2 - src/routes/admin/+layout.svelte | 67 --- src/routes/admin/+page.svelte | 12 - src/routes/admin/disputes/+page.svelte | 342 --------------- src/routes/admin/login/+page.svelte | 118 ------ src/routes/admin/newuser/+page.svelte | 214 ---------- .../admin/user/change/[userToken]/+page.js | 35 -- .../user/change/[userToken]/+page.svelte | 153 ------- .../edit/req/[userToken]/[reqID]/+page.js | 16 - .../edit/req/[userToken]/[reqID]/+page.svelte | 179 -------- .../admin/user/neworder/[userToken]/+page.js | 12 - .../user/neworder/[userToken]/+page.svelte | 49 --- .../admin/user/profile/[userToken]/+page.js | 31 -- .../user/profile/[userToken]/+page.svelte | 391 ------------------ src/routes/admin/userslist/+page.svelte | 73 ---- svelte.config.js | 19 +- 18 files changed, 12 insertions(+), 1750 deletions(-) delete mode 100644 src/lib/tools/requests/Requests.js delete mode 100644 src/routes/admin/+layout.js delete mode 100644 src/routes/admin/+layout.svelte delete mode 100644 src/routes/admin/+page.svelte delete mode 100644 src/routes/admin/disputes/+page.svelte delete mode 100644 src/routes/admin/login/+page.svelte delete mode 100644 src/routes/admin/newuser/+page.svelte delete mode 100644 src/routes/admin/user/change/[userToken]/+page.js delete mode 100644 src/routes/admin/user/change/[userToken]/+page.svelte delete mode 100644 src/routes/admin/user/edit/req/[userToken]/[reqID]/+page.js delete mode 100644 src/routes/admin/user/edit/req/[userToken]/[reqID]/+page.svelte delete mode 100644 src/routes/admin/user/neworder/[userToken]/+page.js delete mode 100644 src/routes/admin/user/neworder/[userToken]/+page.svelte delete mode 100644 src/routes/admin/user/profile/[userToken]/+page.js delete mode 100644 src/routes/admin/user/profile/[userToken]/+page.svelte delete mode 100644 src/routes/admin/userslist/+page.svelte diff --git a/src/lib/tools/requests/Requests.js b/src/lib/tools/requests/Requests.js deleted file mode 100644 index cecc3ea..0000000 --- a/src/lib/tools/requests/Requests.js +++ /dev/null @@ -1,47 +0,0 @@ -import axios from "axios"; -import { serializeError } from "serialize-error"; - - -function defaultResponseProcessor(response, dataProcessor) { - return {error: false, data: dataProcessor(response.data), status: response.status}; -} -function defaultErrorProcessor(error) { - return {error: true, data: serializeError(error), status: (error.code === "ERR_NETWORK" ? 502:serializeError(error).status)}; -} -function defaultDataResponseProcessor(data) { - return data; -} - - - -let BasicURLValue = "https://test.0x000f.ru/api/v1/"; - - - -async function makePost(url, data, options = undefined, - responseProcessor = defaultResponseProcessor, - dataResponseProcessor = defaultDataResponseProcessor, - errorProcessor = defaultErrorProcessor) -{ - try { - const res = await axios.post(BasicURLValue + url, data, options); - return responseProcessor(res, dataResponseProcessor); - } catch (error) { - return errorProcessor(error); - } -} - -async function makeGet(url, options = undefined, - responseProcessor = defaultResponseProcessor, - dataResponseProcessor = defaultDataResponseProcessor, - errorProcessor = defaultErrorProcessor) -{ - try { - const res = await axios.get(BasicURLValue + url, options); - return responseProcessor(res, dataResponseProcessor); - } catch (error) { - return errorProcessor(error); - } -} - -export {BasicURLValue, makePost, makeGet, defaultResponseProcessor, defaultDataResponseProcessor, defaultErrorProcessor}; \ No newline at end of file diff --git a/src/lib/ui-components/navbar.svelte b/src/lib/ui-components/navbar.svelte index c1f161d..faaf9b0 100644 --- a/src/lib/ui-components/navbar.svelte +++ b/src/lib/ui-components/navbar.svelte @@ -35,6 +35,7 @@ Добавить пользователя
  • Споры
    • +
  • Выплаты
    • HostaPay @@ -49,6 +50,7 @@ Добавить пользователя
  • Споры
    • +
  • Выплаты
    • diff --git a/src/routes/admin/+layout.js b/src/routes/admin/+layout.js deleted file mode 100644 index d2c0be2..0000000 --- a/src/routes/admin/+layout.js +++ /dev/null @@ -1,2 +0,0 @@ -export const prerender = true; -export const ssr = false; \ No newline at end of file diff --git a/src/routes/admin/+layout.svelte b/src/routes/admin/+layout.svelte deleted file mode 100644 index bdd394f..0000000 --- a/src/routes/admin/+layout.svelte +++ /dev/null @@ -1,67 +0,0 @@ - - -{#if loggedIn} -
    - -
    -{/if} - -
    -
    - -
    -
    - - - diff --git a/src/routes/admin/+page.svelte b/src/routes/admin/+page.svelte deleted file mode 100644 index bba4aea..0000000 --- a/src/routes/admin/+page.svelte +++ /dev/null @@ -1,12 +0,0 @@ - \ No newline at end of file diff --git a/src/routes/admin/disputes/+page.svelte b/src/routes/admin/disputes/+page.svelte deleted file mode 100644 index ad0e986..0000000 --- a/src/routes/admin/disputes/+page.svelte +++ /dev/null @@ -1,342 +0,0 @@ - - -
    -
    -
    -

    Споры

    -
    -
    -
    - -
    -
    - { - currentPageDisputes = n; - getDisputes(); - }} - disableButtons={disablePagesDisputes} - css={"btn-neutral"} - /> -

    - Всего страниц: {numOfPagesDisputes} -

    -
    -
    - {#if !disablePagesDisputes} - - - - - - - - - - - - - - - - - - {#each disputes as dispute} - - - - - - - - - - - - {/each} - -
    IDСтатусСБПКартаТелефонКурсСуммаВремя созданияОпции
    {dispute["order_id"]}{disputesStatusMap[dispute["order_status"]]}{dispute["is_sbp"] === "t" ? "да" : "нет"}{dispute["requisite_cardnumber"]}{dispute["requisite_phone"]}{dispute["order_rate"]}{dispute["amount"]}{dispute["order_creationtime"]} { - selectedDispute = dispute; - showFullInfo = true; - }} - class="flex gap-2" - > - -
    - {:else} - - {/if} -
    -
    -
    - -{#if showFullInfo} -
    -
    -

    ID: {selectedDispute.dispute_uuid}

    -

    - {disputesStatusMap[selectedDispute["order_status"]]} -

    -

    {selectedDispute.order_creationtime}

    -
    -

    {selectedDispute.name}

    -

    Карта: {selectedDispute.requisite_cardnumber}

    -

    Телефон: {selectedDispute.requisite_phone}

    -
    -
    -

    Курс

    -

    {selectedDispute.order_rate} {selectedDispute.out_code}

    -
    -
    -

    Сумма в споре

    -

    - {(Number(selectedDispute.new_amount) / Number(selectedDispute.order_rate)).toFixed(2)} {selectedDispute.out_code} ({Number(selectedDispute.new_amount)} USDT) -

    -
    -
    -

    Сумма в заявке

    -

    - {Number(selectedDispute.order_rate) * Number(selectedDispute.amount)} {selectedDispute.out_code} ({Number(selectedDispute.amount)} USDT) -

    -
    - {#if selectedDispute["order_status"] === "4" || selectedDispute["order_status"] === "8"} - - - {/if} - {#if selectedDispute["order_status"] !== "4"} - - {/if} - -
    -
    -{/if} diff --git a/src/routes/admin/login/+page.svelte b/src/routes/admin/login/+page.svelte deleted file mode 100644 index f1654bc..0000000 --- a/src/routes/admin/login/+page.svelte +++ /dev/null @@ -1,118 +0,0 @@ - - -
    -
    -

    Вход

    - - - - -
    -
    diff --git a/src/routes/admin/newuser/+page.svelte b/src/routes/admin/newuser/+page.svelte deleted file mode 100644 index 44eab12..0000000 --- a/src/routes/admin/newuser/+page.svelte +++ /dev/null @@ -1,214 +0,0 @@ - - -
    -
    -
    -

    Создание нового пользователя

    -
    -
    - - - - - - -
    -

    Торговля:

    - -
    - - {#if userToken !== ""} -
    -

    - Токен пользователя: {userToken} -

    -
    - {/if} -
    -
    diff --git a/src/routes/admin/user/change/[userToken]/+page.js b/src/routes/admin/user/change/[userToken]/+page.js deleted file mode 100644 index 361dcdc..0000000 --- a/src/routes/admin/user/change/[userToken]/+page.js +++ /dev/null @@ -1,35 +0,0 @@ -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; - const { userToken } = params; - let userResult = await makePost( - "getUser", - { - token: userToken, - }, - makeAuthHeaderForAxios(getAuthInfo()?.a) - ); - if (userResult.status === 401) { - sayError("Данные авторизации устарели"); - // window.location.href = "/"; - redirect("/admin/"); - return {}; - } - if (userResult.error) { - sayError("Не удалось настроить пользователя"); - return {}; - } - userResult["can_trade"] = userResult["can_trade"] === "t" ? true:false; - userResult["can_trade_global"] = userResult["can_trade_global"] === "t" ? true:false; - userResult["balance"] = Number(userResult["balance"]); - userResult["bid"] = Number(userResult["bid"]); - return { - token: userToken, - userData: userResult.data - }; -} \ No newline at end of file diff --git a/src/routes/admin/user/change/[userToken]/+page.svelte b/src/routes/admin/user/change/[userToken]/+page.svelte deleted file mode 100644 index fde8283..0000000 --- a/src/routes/admin/user/change/[userToken]/+page.svelte +++ /dev/null @@ -1,153 +0,0 @@ - - -
    -
    -
    -

    Изменение информации о пользователе

    -
    -
    -
    - - - - - -
    -

    Торговля:

    - -
    - - -
    -
    -
    diff --git a/src/routes/admin/user/edit/req/[userToken]/[reqID]/+page.js b/src/routes/admin/user/edit/req/[userToken]/[reqID]/+page.js deleted file mode 100644 index 3cede5d..0000000 --- a/src/routes/admin/user/edit/req/[userToken]/[reqID]/+page.js +++ /dev/null @@ -1,16 +0,0 @@ -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"; - -export async function load({ params }) { - if(!browser) return; - const { userToken } = params; - const { reqID } = params; - let spt = reqID.split("_"); - return { - token: userToken, - reqID: spt[0], - currency: spt[1] - }; -} \ No newline at end of file diff --git a/src/routes/admin/user/edit/req/[userToken]/[reqID]/+page.svelte b/src/routes/admin/user/edit/req/[userToken]/[reqID]/+page.svelte deleted file mode 100644 index 885ae18..0000000 --- a/src/routes/admin/user/edit/req/[userToken]/[reqID]/+page.svelte +++ /dev/null @@ -1,179 +0,0 @@ - - -
    -
    -
    -

    Изменение реквизита (ID: {reqID})

    -
    -
    - {#each reqInfo as req} - - - - -
    -

    Активный:

    - -
    - - - {/each} -
    -
    diff --git a/src/routes/admin/user/neworder/[userToken]/+page.js b/src/routes/admin/user/neworder/[userToken]/+page.js deleted file mode 100644 index 2b81760..0000000 --- a/src/routes/admin/user/neworder/[userToken]/+page.js +++ /dev/null @@ -1,12 +0,0 @@ -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"; - -export async function load({ params }) { - if(!browser) return; - const { userToken } = params; - return { - token: userToken, - }; -} \ No newline at end of file diff --git a/src/routes/admin/user/neworder/[userToken]/+page.svelte b/src/routes/admin/user/neworder/[userToken]/+page.svelte deleted file mode 100644 index 8d57ed0..0000000 --- a/src/routes/admin/user/neworder/[userToken]/+page.svelte +++ /dev/null @@ -1,49 +0,0 @@ - - -
    -
    -
    -

    Создание заявок

    -
    -
    - - {#each { length: numOfOrders } as _, index} -
    -

    Заявка #{index+1}

    - - -
    - {/each} -
    -
    diff --git a/src/routes/admin/user/profile/[userToken]/+page.js b/src/routes/admin/user/profile/[userToken]/+page.js deleted file mode 100644 index b5f86c8..0000000 --- a/src/routes/admin/user/profile/[userToken]/+page.js +++ /dev/null @@ -1,31 +0,0 @@ -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; - const { userToken } = params; - const userResult = await makePost( - "getUser", - { - token: userToken, - }, - makeAuthHeaderForAxios(getAuthInfo()?.a) - ); - if (userResult.status === 401) { - sayError("Данные авторизации устарели"); - // window.location.href = "/"; - redirect("/admin/"); - return {}; - } - if (userResult.error) { - sayError("Не удалось настроить пользователя"); - return {}; - } - return { - token: userToken, - userData: userResult.data - }; -} diff --git a/src/routes/admin/user/profile/[userToken]/+page.svelte b/src/routes/admin/user/profile/[userToken]/+page.svelte deleted file mode 100644 index 86cdbd7..0000000 --- a/src/routes/admin/user/profile/[userToken]/+page.svelte +++ /dev/null @@ -1,391 +0,0 @@ - - -
    -
    -
    -

    Информация о пользователе

    -
    -
    -
    -

    Токен:

    -

    {token}

    -
    -
    -

    Имя и фамилия:

    -

    {userData.name} {userData.surname}

    -
    -
    -

    Валюта:

    -

    {userData?.code}

    -
    -
    -

    Баланс:

    -

    {userData.balance} USDT

    -
    -
    -

    Заморожено:

    -

    {userData?.insurance} USDT

    -
    -
    -

    Ставка:

    -

    {userData.bid} %

    -
    -
    -

    Торговля:

    -

    - {userData["can_trade"] === "t" ? "Активна" : "Отключена"} -

    -
    -
    - - Изменить - -
    -
    - -
    -
    -

    Реквизиты пользователя

    - -
    -
    -
    - - - - - - - - - - - - - - - - - - - - {#each userRequisites as requisite} - - - - - - - - - - - - - - {/each} - -
    IDСтатусБанкСБПКартаТелефонИмяДевайсОбъем {userData.code}Лимит {userData.code}Опции
    {requisite["id"]}{requisite["status"] === "t" ? "активен" : "отключен"}{requisite["bank_name"]}{requisite["is_sbp"] === "t" ? "да" : "нет"}{requisite["cardnumber"]}{requisite["phone"]}{requisite["name"]}{requisite["device_id"]}{requisite["daily_volume"]}{requisite["daily_volume_limit"]} - Изменить - -
    -
    -
    - - - -
    -
    -

    Текущие заявки

    - -
    -
    -
    - { - currentPageUserOrders = n; - getUserOrders(); - }} - disableButtons={disablePagesUserOrders} - css={"btn-neutral"} - /> -

    Всего страниц: {numPagesUserOrders}

    -
    -
    - - - - - - - - - - - - - - - - - - {#each userOrders as order} - - - - - - - - - - - - {/each} - -
    IDСтатусСуммаКурсСБПМерчантВремя созданияВремя закрытия
    {order["id"]}{order["status"]}{order["summa"]} USDT{order["rate"]} RUB{order["is_sbp"] === "t" ? "да" : "нет"}{order["merchant_id"]}{order["creationtime"]}{order["closetime"]}
    -
    -
    - -
    -
    -

    Заявки на пополнение

    -
    -
    -
    - { - currentPageUserDeposits = n; - getUserDeposits(); - }} - disableButtons={disablePagesUserDeposits} - css={"btn-neutral"} - /> -

    - Всего страниц: {numOfPagesUserDeposits} -

    -
    -
    - - - - - - - - - - - - - {#each userDeposits as depo} - - - - - - - {/each} - -
    СтатусСуммаВремя создания
    {depoStatusMap[depo["pending"]]}{depo["amount"]} USDT{depo["creationtime"]}
    -
    -
    -
    diff --git a/src/routes/admin/userslist/+page.svelte b/src/routes/admin/userslist/+page.svelte deleted file mode 100644 index d3d6372..0000000 --- a/src/routes/admin/userslist/+page.svelte +++ /dev/null @@ -1,73 +0,0 @@ - - -
    -
    -
    -

    Все пользователи

    -
    -
    -
    - {#if usersReady} - - - - - - - - - - - - - {#each users as user} - - - - - - - {/each} - -
    ТокенИмяБаланс
    {user["token"]}{user["name"]} {user["surname"]}{user["balance"]} USDT - Профиль -
    - {:else} -
    - -
    - {/if} -
    -
    -
    diff --git a/svelte.config.js b/svelte.config.js index 91ef89e..d484258 100644 --- a/svelte.config.js +++ b/svelte.config.js @@ -20,15 +20,16 @@ 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" + "/user/change/sampleToken", + "/user/edit/req/sampleToken/sampleReqID", + "/user/neworder/sampleToken", + "/user/profile/sampleToken", + "/", + "/login", + "/newuser", + "/userslist", + "/disputes", + "/payouts" ], }, },