sequelize-game-bank 3.0.1 → 4.0.0

package/README.md

@@ -1,6 +1,6 @@
 > # sequelize-game-bank
 
-<img src="./src/logo/icon.png" alt="sequelize-game-bank logo" width="160" height="160" style="border-radius: 12%; margin-bottom: 20px;" />
+<img src="https://github.com/RPM-programmer/sequelize-game-bank/blob/main/src/logo/icon.png?raw=true" alt="sequelize-game-bank logo" width="160" height="160" style="border-radius: 12%; margin-bottom: 20px;" />
 
 ## npm модуль для создания полноценного банка на express, sequelize (sqlite).
 
@@ -15,50 +15,78 @@
 
 ## 🚀 Установка
 
-Установите пакет через ваш менеджер пакетов:
+Установите пакет через менеджер пакетов:
 
 ```bash
 npm install sequelize-game-bank
 # или
 yarn add sequelize-game-bank
 ```
-## Мажорный переход на v3.0.0 (Breaking Changes)
-### В v3.0.0 изменили инициализацию! Теперь не:
-```javascript
-const BANK = require('sequelize-game-bank');
-
-const app = (async function initBank(){
-    try {
-        return await BANK();
-    } catch {
-        console.log("Ошибка при инициализации банка!");
-    }
-})();
-//app.listen(3000);
+## Установка и настройка (Инициализация)
+
+Модуль `sequelize-game-bank` требует асинхронной инициализации базы данных и настройки роутов. 
+
+### 1. Настройка окружения (.env)
+После первого запуска откройте `.env` и настройте эти поля:
+
+```env
+SEQUELIZE_GAME_BANK_INITIALIZED              = true
+JWT_SECRET                                   = 0000
+ROOT_PASSWORD                                = bank-root
+GMAIL                                        =  
+GOOGLE_APP_PASSWORD                          = 
 ```
-### а:
+
+### 2. Подключение в проект
+
+Так как модуль является асинхронным, его необходимо подключать **ДО** финальных обработчиков несуществующих маршрутов (404) и ошибок сервера (500). Поместите вызов модуля внутрь асинхронного блока:
+
 ```javascript
-const BANK = require('sequelize-game-bank');
-const express = require("express");
-let cleanApp = express();
-const app = (async function init()=>{
-    return await BANK(cleanApp); 
-});
-
-//app.listen(3000)
+const express = require('express');
+const sequelize_game_bank = require('sequelize-game-bank');
+
+const app = express();
+
+
+(async () => {
+  try {
+    await sequelize_game_bank(app);
+
+    app.use((req, res) => {
+      res.status(404).send("<h1>404 - Страница не найдена</h1>");
+    });
+
+    app.use((err, req, res, next) => {
+      res.status(500).send("<h1>500 - Внутренняя ошибка сервера</h1>");
+    });
+
+  } catch (error) {
+  }
+})();
+
+module.exports = { app };
 ```
+## 🌐 Маршрутизация и точки входа (v4.0.0)
 
-## 💻 Быстрый старт
+В версии 4.0.0 вся логика путей полностью изолирована внутри модуля и работает в автоматическом режиме. Разработчику или пользователю доступны всего **3 основные веб-страницы** для ручного перехода из браузера:
 
-Просто подключите модуль в ваше существующее Express-приложение:
+* **`GET`** `/bank/home.html` — Главная приветственная страница банка.
+* **`GET`** `/bank/login.html` — Страница авторизации пользователей.
+* **`GET`** `/bank/register.html` — Страница регистрации новых аккаунтов.
 
-```javascript
-const BANK = require('sequelize-game-bank');
-const express = require("express");
-let cleanApp = express();
-const app = (async function init()=>{
-    return await BANK(cleanApp); 
-});
-
-//app.listen(3000)
-```
+---
+
+### ⚙️ Как это работает изнутри (Автоматика модуля)
+
+Вам больше не нужно вручную настраивать эндпоинты в основном проекте `CITY`. После подключения модуля в `server.js` автоматически разворачиваются два изолированных роутера:
+
+1. **Интерфейс банка (Префикс `/bank`)**  
+   Автоматически управляет отображением всех внутренних страниц личного кабинета (панели управления, счета, переводы, кредиты, админка) и раздачей статических файлов (CSS, JS, загруженные аватарки).
+   
+2. **Серверное API (Префикс `/api/bank`)**  
+   Полностью берет на себя фоновый обмен JSON-данными между вашим фронтендом и базой данных Sequelize. На этот префикс автоматически завязаны все типы сетевых операций:
+   * Получение данных (`GET` запросы профилей, счетов, баланса и истории логов).
+   * Изменение состояния (`POST` запросы авторизации, переводов, кредитов и настройки 2FA).
+   * Удаление сущностей (`DELETE` запросы на закрытие игровых счетов).
+
+## Лицензия [ISC](LICENSE)

package/config/setup-env.js

@@ -0,0 +1,34 @@
+const fs = require('fs');
+const path = require('path');
+const process = require('process');
+const envPath = path.resolve(process.cwd(), '.env');
+const logger = require("custom-color-logs").print;
+const defaultEnvContent = `
+# ==============================================================================
+# sequelize-game-bank v4.0.0
+# ==============================================================================
+SEQUELIZE_GAME_BANK_INITIALIZED              = true
+JWT_SECRET                                   = 0000
+ROOT_PASSWORD                                = bank-root
+GMAIL                                        = example@gmail.com
+GOOGLE_APP_PASSWORD                          = abcd efgh ijkl mnop
+`;
+function initializeEnvironment() {
+    try {
+        if (!fs.existsSync(envPath)) {
+            fs.writeFileSync(envPath, defaultEnvContent, 'utf8');
+        } else {
+            const currentEnv = fs.readFileSync(envPath, 'utf8');
+            if (currentEnv.includes('SEQUELIZE_GAME_BANK_INITIALIZED')) {
+                require("dotenv").config({ path: envPath });
+                return;
+            }
+            fs.appendFileSync(envPath, `\n\n${defaultEnvContent}`, 'utf8');
+        }
+    } catch (err) {
+        console.log(logger.ServerError('Не удалось проверить или обновить .env:', err.message));
+    }
+    require("dotenv").config({ path: envPath });
+}
+initializeEnvironment();
+module.exports = { envPath };

package/database/config/init-db.js

@@ -0,0 +1,35 @@
+const { Sequelize } = require('sequelize');
+const path = require('path');
+const fs = require('fs');
+const dbDir = path.resolve(__dirname, '..');
+const dbPath = path.join(dbDir, 'citybank.db');
+const logger = require("custom-color-logs").print;
+if (!fs.existsSync(dbDir)) {
+  fs.mkdirSync(dbDir, { recursive: true });
+}
+try {
+  if (fs.existsSync(dbPath)) {
+    const stats = fs.statSync(dbPath);
+    if (stats.size === 0) {
+      console.log(logger.DatabaseWarn("База данных пуста или повреждена!"))
+    }
+  }
+} catch (e) {
+  console.log(logger.DatabaseError("Файл бд не найден или повреждён."))
+  process.exit(1);
+}
+const sequelize = new Sequelize({
+  dialect: 'sqlite',
+  storage: dbPath,
+  logging: false,
+  define: {
+    timestamps: true
+  },
+  /*dialectOptions:{
+    mode: 2,
+  },*/
+  retry:{
+    max: 5,
+  }
+});
+module.exports = sequelize;

package/database/services/account/transfer.js

@@ -35,7 +35,7 @@ module.exports = async function transferManny(fromId, toId, amount, pinCode, tot
       await t.rollback();
       return { status: false, statusCode: -23, message: 'Неверный пароль счета отправителя' };
     }
-    if (fromAcc.user !== 'root' && parseFloat(fromAcc.manny) < numericAmount) {
+    if (parseFloat(fromAcc.manny) < numericAmount) {
       await t.rollback();
       return { status: false, statusCode: -11, message: 'Недостаточно средств на счете' };
     }

package/index.js

@@ -1,11 +1,11 @@
 const logger = require("custom-color-logs").print;
 console.log(logger.ServerBankInfo("Модуль банка запущен!"))
-require('dotenv').config();
 const path = require("path")
+const setupEnv = require(path.join(__dirname, "config", "setup-env.js"));
 const express = require('express');
 const cookieParser = require('cookie-parser');
 const bcrypt = require('bcrypt');
-const sequelize = require(path.join(__dirname, 'database', 'config', 'init-db.js'));
+const sequelize =  require(path.join(__dirname, 'database', 'config', 'init-db.js'));
 const User = require(path.join(__dirname, 'database', 'models', 'User.js'));
 const { writeTemplatesIfNotExist } = require(path.join(__dirname, 'database', 'services', 'bot', 'write.js'));
 const registerRoutes = require(path.join(__dirname, 'server', 'server.js'));
@@ -35,25 +35,33 @@ async function Bank(app) {
       }
     });
     console.log(logger.ServerBankInfo(`Супер пользвотель создан`))
-    const configuredApp = registerRoutes(app);
-    app.use('/css', express.static(path.join(__dirname, 'public', 'css')));
-    app.use('/js', express.static(path.join(__dirname, 'public', 'js')));
-    app.use('/uploads', express.static(path.join(__dirname, 'public', 'uploads')));
+    const gp = registerRoutes();
+    const get = gp.GET;
+    const post = gp.POST;
+    post.use('/css', express.static(path.join(__dirname, 'public', 'css')));
+    post.use('/js', express.static(path.join(__dirname, 'public', 'js')));
+    post.use('/uploads', express.static(path.join(__dirname, 'public', 'uploads')));
     const { verifyPageSession } = require(path.join(__dirname, 'server', 'middleware', 'auth'));
     const pages = ['general.html', 'profile.html', 'accounts.html', 'transfer.html', 'history.html', 'credit.html', 'admin.html'];
     pages.forEach(page => {
-      app.get(`/${page}`, verifyPageSession, (req, res) => {
+      get.get(`/${page}`, verifyPageSession, (req, res) => {
         res.sendFile(path.join(__dirname, 'public', page));
       });
     });
-    app.get('/login.html', (req, res) => res.sendFile(path.join(__dirname, 'public', 'login.html')));
-    app.get('/register.html', (req, res) => res.sendFile(path.join(__dirname, 'public', 'register.html')));
-    app.get('/home.html', (req, res) => res.sendFile(path.join(__dirname, 'public', 'home.html')));
+    get.get('/login.html', (req, res) => res.sendFile(path.join(__dirname, 'public', 'login.html')));
+    get.get('/register.html', (req, res) => res.sendFile(path.join(__dirname, 'public', 'register.html')));
+    get.get('/home.html', (req, res) => res.sendFile(path.join(__dirname, 'public', 'home.html')));
     app.get('/favicon.ico', (req, res) => res.sendFile(path.join(__dirname, 'public', 'icon', 'icon.png')));
-    app.get('/', (req, res) => res.redirect('/home.html'));
+    get.get('/', (req, res) => res.redirect('/home.html'));
+
+
+
+
+    app.use("/bank", get);
+    app.use("/api/bank", post)
 
     require(path.join(__dirname, 'database', 'services', 'bot', 'cron-schedule'));
-    return configuredApp;
+    return app;
   } catch (err) {
     console.log(logger.ServerBankError("Критическая ошибка инициализации модулей", err));
     throw err;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sequelize-game-bank",
-  "version": "3.0.1",
+  "version": "4.0.0",
   "description": "A Sequelize-based gaming economy and banking system featuring user profiles, credits, admin management, and detailed transaction history.",
   "main": "index.js",
   "type": "commonjs",

package/public/accounts.html

@@ -3,25 +3,25 @@
 <head>
   <meta charset="UTF-8">
   <title>City-Bank | Мои Счета</title>
-  <link rel="stylesheet" href="/css/style.css">
+  <link rel="stylesheet" href="/api/bank/css/style.css">
   <link rel="stylesheet" href="https://unpkg.com/tippy.js@6/animations/scale.css"/>
 </head>
 <body>
   <div class="main-container">
       <div class="sidebar">
       <div style="text-align: center; margin-bottom: 15px;">
-        <img id="user-avatar" src="/uploads/avatars/default.png" style="width: 80px; height: 80px; border-radius: 50%; object-fit: cover; border: 3px solid #1abc9c;">
+        <img id="user-avatar" src="/api/bank/uploads/avatars/default.png" style="width: 80px; height: 80px; border-radius: 50%; object-fit: cover; border: 3px solid #1abc9c;">
       </div>
       <h2 id="user-display">Загрузка...</h2>
       <p style="text-align: center; color: #bbb;">Всего средств: <span id="total-manny" style="font-weight: bold; color: #1abc9c;">0.00</span> руб.</p>
       <hr style="border-color: #34495e;">
-      <a href="/general.html" class="nav-item"><button class="menu-btn" id="general">Главная</button></a>
+      <a href="/bank/general.html" class="nav-item"><button class="menu-btn" id="general">Главная</button></a>
       <a class="nav-item"><button class="menu-btn active" id="acccount">Мои Счета</button></a>
-      <a href="/transfer.html" class="nav-item"><button class="menu-btn" id="transfer">Перевод средств</button></a>
-      <a href="/history.html" class="nav-item"><button class="menu-btn" id="history">История транзакций</button></a>
-      <a href="/credit.html" class="nav-item"><button class="menu-btn" id="credit">Оформить Кредит</button></a>
-      <a href="/profile.html" class="nav-item"><button class="menu-btn" id="profile">Управление профилем</button></a>
-  <button class="menu-btn" onclick="location.href='/admin.html'" id="admin-nav" style="display: none; color: #ffc107;">Админ-панель</button>
+      <a href="/bank/transfer.html" class="nav-item"><button class="menu-btn" id="transfer">Перевод средств</button></a>
+      <a href="/bank/history.html" class="nav-item"><button class="menu-btn" id="history">История транзакций</button></a>
+      <a href="/bank/credit.html" class="nav-item"><button class="menu-btn" id="credit">Оформить Кредит</button></a>
+      <a href="/bank/profile.html" class="nav-item"><button class="menu-btn" id="profile">Управление профилем</button></a>
+  <button class="menu-btn" onclick="location.href='/bank/admin.html'" id="admin-nav" style="display: none; color: #ffc107;">Админ-панель</button>
       <br><br>
       <button class="menu-btn btn-danger" id="logoutBtn" style="text-align: center;">Выйти из системы</button>
     </div>
@@ -39,9 +39,9 @@
     </div>
   </div>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/zxcvbn/4.4.2/zxcvbn.js"></script>
-<script src="/js/sweetalert2.js"></script>
+<script src="/api/bank/js/sweetalert2.js"></script>
 <script src="https://unpkg.com/@popperjs/core@2/dist/umd/popper.min.js"></script>
 <script src="https://unpkg.com/tippy.js@6/dist/tippy-bundle.umd.js"></script>
-<script src="/js/js.js"></script>
+<script src="/api/bank/js/js.js"></script>
 </body>
-</html>
+</html>

package/public/admin.html

@@ -39,8 +39,8 @@
 <body>
 
 <div class="container">
-  <h2>👑 ЦЕНТРАЛЬНЫЙ ПУЛЬТ АДМИНИСТРАТОРА (ROOT)</h2>
-  <button class="btn" onclick="location.href='/general.html'" style="background:#6c757d;"><- В личный кабинет</button>
+  <h2>ЦЕНТРАЛЬНЫЙ ПУЛЬТ АДМИНИСТРАТОРА (ROOT)</h2>
+  <button class="btn" onclick="location.href='/bank/general.html'" style="background:#6c757d;"><- В личный кабинет</button>
 
   <!-- Интерактивная таблица всех счетов -->
   <table id="all-accounts-table">
@@ -90,7 +90,7 @@
   // Загрузка таблицы при старте страницы
   async function loadAdminDashboard() {
     try {
-      const response = await fetch('/api/admin/accounts/all');
+      const response = await fetch('/api/bank/admin/accounts/all');
       const result = await response.json();
 
       if (!response.ok || !result.status) {
@@ -128,7 +128,7 @@
   // Переключение статуса бана/разбана
   async function toggleAccountStatus(accountId, makeActive) {
     try {
-      const response = await fetch(`/api/admin/accounts/${accountId}/status`, {
+      const response = await fetch(`/api/bank/admin/accounts/${accountId}/status`, {
         method: 'POST',
         headers: {'Content-Type': 'application/json'},
         body: JSON.stringify({ active: makeActive })
@@ -169,7 +169,7 @@
 
     try {
       // Роут /modify работает через add-manny.js и remove-manny.js, которые НЕ шлют письма по ТЗ
-      const response = await fetch(`/api/admin/accounts/${accountId}/modify`, {
+      const response = await fetch(`/api/bank/admin/accounts/${accountId}/modify`, {
         method: 'POST',
         headers: {'Content-Type': 'application/json'},
         body: JSON.stringify({ amount, type })

package/public/credit.html

@@ -3,25 +3,25 @@
 <head>
   <meta charset="UTF-8">
   <title>City-Bank | Кредитование</title>
-  <link rel="stylesheet" href="/css/style.css">
+  <link rel="stylesheet" href="/api/bank/css/style.css">
   <link rel="stylesheet" href="https://unpkg.com/tippy.js@6/animations/scale.css"/>
 </head>
 <body>
   <div class="main-container">
       <div class="sidebar">
       <div style="text-align: center; margin-bottom: 15px;">
-        <img id="user-avatar" src="/uploads/avatars/default.png" style="width: 80px; height: 80px; border-radius: 50%; object-fit: cover; border: 3px solid #1abc9c;">
+        <img id="user-avatar" src="/api/bank/uploads/avatars/default.png" style="width: 80px; height: 80px; border-radius: 50%; object-fit: cover; border: 3px solid #1abc9c;">
       </div>
       <h2 id="user-display">Загрузка...</h2>
       <p style="text-align: center; color: #bbb;">Всего средств: <span id="total-manny" style="font-weight: bold; color: #1abc9c;">0.00</span> руб.</p>
       <hr style="border-color: #34495e;">
-      <a href="/general.html" class="nav-item"><button class="menu-btn" id="general">Главная</button></a>
-      <a href="/accounts.html" class="nav-item"><button class="menu-btn" id="acccount">Мои Счета</button></a>
-      <a href="/transfer.html" class="nav-item"><button class="menu-btn" id="transfer">Перевод средств</button></a>
-      <a href="/history.html" class="nav-item"><button class="menu-btn" id="history">История транзакций</button></a>
+      <a href="/bank/general.html" class="nav-item"><button class="menu-btn" id="general">Главная</button></a>
+      <a href="/bank/accounts.html" class="nav-item"><button class="menu-btn" id="acccount">Мои Счета</button></a>
+      <a href="/bank/transfer.html" class="nav-item"><button class="menu-btn" id="transfer">Перевод средств</button></a>
+      <a href="/bank/history.html" class="nav-item"><button class="menu-btn" id="history">История транзакций</button></a>
       <a class="nav-item"><button class="menu-btn active" id="credit">Оформить Кредит</button></a>
-      <a href="/profile.html" class="nav-item"><button class="menu-btn" id="profile">Управление профилем</button></a>
-  <button class="menu-btn" onclick="location.href='/admin.html'" id="admin-nav" style="display: none; color: #ffc107;">Админ-панель</button>
+      <a href="/bank/profile.html" class="nav-item"><button class="menu-btn" id="profile">Управление профилем</button></a>
+  <button class="menu-btn" onclick="location.href='/bank/admin.html'" id="admin-nav" style="display: none; color: #ffc107;">Админ-панель</button>
       <br><br>
       <button class="menu-btn btn-danger" id="logoutBtn" style="text-align: center;">Выйти из системы</button>
     </div>
@@ -82,9 +82,9 @@
     </div>
   </div>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/zxcvbn/4.4.2/zxcvbn.js"></script>
-<script src="/js/sweetalert2.js"></script>
+<script src="/api/bank/js/sweetalert2.js"></script>
 <script src="https://unpkg.com/@popperjs/core@2/dist/umd/popper.min.js"></script>
 <script src="https://unpkg.com/tippy.js@6/dist/tippy-bundle.umd.js"></script>
-<script src="/js/js.js"></script>
+<script src="/api/bank/js/js.js"></script>
 </body>
 </html>

package/public/css/style.css

@@ -58,4 +58,6 @@
    .tippy-box[data-theme~='user-info']{
     background-color: rgba(240, 248, 255, 0.747);
     border: 1px solid rgb(0, 0, 255);
-   }
+   }
+
+   :disabled{cursor:not-allowed;}

package/public/general.html

@@ -4,7 +4,7 @@
   <meta charset="UTF-8">
   <title>City-Bank | Главная</title>
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="stylesheet" href="/css/style.css">
+  <link rel="stylesheet" href="/api/bank/css/style.css">
   <link rel="stylesheet" href="https://unpkg.com/tippy.js@6/animations/scale.css"/>
   <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/toastify-js/src/toastify.min.css">
 <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/toastify-js"></script>
@@ -19,12 +19,12 @@
       <p style="text-align: center; color: #bbb;">Всего средств: <span id="total-manny" style="font-weight: bold; color: #1abc9c;">0.00</span> руб.</p>
       <hr style="border-color: #34495e;">
       <a class="nav-item"><button class="menu-btn active" id="general">Главная</button></a>
-      <a href="/accounts.html" class="nav-item"><button class="menu-btn" id="acccount">Мои Счета</button></a>
-      <a href="/transfer.html" class="nav-item"><button class="menu-btn" id="transfer">Перевод средств</button></a>
-      <a href="/history.html" class="nav-item"><button class="menu-btn" id="history">История транзакций</button></a>
-      <a href="/credit.html" class="nav-item"><button class="menu-btn" id="credit">Оформить Кредит</button></a>
-      <a href="/profile.html" class="nav-item"><button class="menu-btn" id="profile">Управление профилем</button></a>
-  <button class="menu-btn" onclick="location.href='/admin.html'" id="admin-nav" style="display: none; color: #ffc107;">Админ-панель</button>
+      <a href="/bank/accounts.html" class="nav-item"><button class="menu-btn" id="acccount">Мои Счета</button></a>
+      <a href="/bank/transfer.html" class="nav-item"><button class="menu-btn" id="transfer">Перевод средств</button></a>
+      <a href="/bank/history.html" class="nav-item"><button class="menu-btn" id="history">История транзакций</button></a>
+      <a href="/bank/credit.html" class="nav-item"><button class="menu-btn" id="credit">Оформить Кредит</button></a>
+      <a href="/bank/profile.html" class="nav-item"><button class="menu-btn" id="profile">Управление профилем</button></a>
+  <button class="menu-btn" onclick="location.href='/bank/admin.html'" id="admin-nav" style="display: none; color: #ffc107;">Админ-панель</button>
       <br><br>
       <button class="menu-btn btn-danger" id="logoutBtn" style="text-align: center;">Выйти из системы</button>
     </div>
@@ -32,14 +32,14 @@
     <div class="container">
       <div class="container-center">
         <div style="text-align: center; margin-bottom: 15px;" onclick="uploadAvatar()">
-          <img id="user-avatar2" src="/uploads/avatars/default.png" style="width: 250px; height: 250px; border-radius: 50%; object-fit: cover; border: 3px solid #1abc9c;">
+          <img id="user-avatar2" src="/api/bank/uploads/avatars/default.png" style="width: 250px; height: 250px; border-radius: 50%; object-fit: cover; border: 3px solid #1abc9c;">
         </div>
         <h1 id="user-display-page">Загрузка...</h1>
         <!--и так далее-->
         <p>Подать запрос в поддержку</p>
         <form action="/help-message" method="post" class="help_msg-form">
           <input type="text" name="hm" placeholder="Здраствуйте. Я .. хочу попросить помощи. У меня не работает ... . Спасибо">
-          <input type="submit" value="Отправить">
+          <input disabled type="submit" value="Отправить">
         </form>
         <footer>
           <p style="color: lightslategray;">Банк ©2026</p>
@@ -48,9 +48,9 @@
     </div>
   </div>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/zxcvbn/4.4.2/zxcvbn.js"></script>
-<script src="/js/sweetalert2.js"></script>
+<script src="/api/bank/js/sweetalert2.js"></script>
 <script src="https://unpkg.com/@popperjs/core@2/dist/umd/popper.min.js"></script>
 <script src="https://unpkg.com/tippy.js@6/dist/tippy-bundle.umd.js"></script>
-<script src="/js/js.js"></script>
+<script src="/api/bank/js/js.js"></script>
 </body>
 </html>

package/public/history.html

@@ -3,32 +3,32 @@
 <head>
   <meta charset="UTF-8">
   <title>City-Bank | История</title>
-  <link rel="stylesheet" href="/css/style.css">
+  <link rel="stylesheet" href="/api/bank/css/style.css">
   <link rel="stylesheet" href="https://unpkg.com/tippy.js@6/animations/scale.css"/>
 </head>
 <body>
   <div class="main-container">
     <div class="sidebar">
       <div style="text-align: center; margin-bottom: 15px;">
-        <img id="user-avatar" src="/uploads/avatars/default.png" style="width: 80px; height: 80px; border-radius: 50%; object-fit: cover; border: 3px solid #1abc9c;">
+        <img id="user-avatar" src="/api/bank/uploads/avatars/default.png" style="width: 80px; height: 80px; border-radius: 50%; object-fit: cover; border: 3px solid #1abc9c;">
       </div>
       <h2 id="user-display">Загрузка...</h2>
       <p style="text-align: center; color: #bbb;">Всего средств: <span id="total-manny" style="font-weight: bold; color: #1abc9c;">0.00</span> руб.</p>
       <hr style="border-color: #34495e;">
-      <a href="/general.html" class="nav-item"><button class="menu-btn" id="general">Главная</button></a>
-      <a href="/accounts.html" class="nav-item"><button class="menu-btn" id="acccount">Мои Счета</button></a>
-      <a href="/transfer.html" class="nav-item"><button class="menu-btn" id="transfer">Перевод средств</button></a>
+      <a href="/bank/general.html" class="nav-item"><button class="menu-btn" id="general">Главная</button></a>
+      <a href="/bank/accounts.html" class="nav-item"><button class="menu-btn" id="acccount">Мои Счета</button></a>
+      <a href="/bank/transfer.html" class="nav-item"><button class="menu-btn" id="transfer">Перевод средств</button></a>
       <a class="nav-item"><button class="menu-btn active" id="history">История транзакций</button></a>
-      <a href="/credit.html" class="nav-item"><button class="menu-btn" id="credit">Оформить Кредит</button></a>
-      <a href="/profile.html" class="nav-item"><button class="menu-btn" id="profile">Управление профилем</button></a>
-  <button class="menu-btn" onclick="location.href='/admin.html'" id="admin-nav" style="display: none; color: #ffc107;">Админ-панель</button>
+      <a href="/bank/credit.html" class="nav-item"><button class="menu-btn" id="credit">Оформить Кредит</button></a>
+      <a href="/bank/profile.html" class="nav-item"><button class="menu-btn" id="profile">Управление профилем</button></a>
+  <button class="menu-btn" onclick="location.href='/bank/admin.html'" id="admin-nav" style="display: none; color: #ffc107;">Админ-панель</button>
       <br><br>
       <button class="menu-btn btn-danger" id="logoutBtn" style="text-align: center;">Выйти из системы</button>
     </div>
     <div class="container">
       <div class="container-center">
         <div style="text-align: center; margin-bottom: 15px;">
-          <img id="user-avatar2" src="/uploads/avatars/default.png" style="width: 250px; height: 250px; border-radius: 50%; object-fit: cover; border: 3px solid #1abc9c;">
+          <img id="user-avatar2" src="/api/bank/uploads/avatars/default.png" style="width: 250px; height: 250px; border-radius: 50%; object-fit: cover; border: 3px solid #1abc9c;">
         </div>
         <h3>История финансовых операций</h3>
         <div class="card">
@@ -57,9 +57,9 @@
   <h1>hello</h1>
 </dialog>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/zxcvbn/4.4.2/zxcvbn.js"></script>
-<script src="/js/sweetalert2.js"></script>
+<script src="/api/bank/js/sweetalert2.js"></script>
 <script src="https://unpkg.com/@popperjs/core@2/dist/umd/popper.min.js"></script>
 <script src="https://unpkg.com/tippy.js@6/dist/tippy-bundle.umd.js"></script>
-<script src="/js/js.js"></script>
+<script src="/api/bank/js/js.js"></script>
 </body>
 </html>

package/public/home.html

@@ -297,8 +297,8 @@
     <header class="bank-navbar">
         <div class="logo">GAME-<span>BANK</span></div>
         <div class="auth-buttons">
-            <a href="/login.html"><button class="btn-auth btn-login">Войти</button></a>
-            <a href="/register.html"><button class="btn-auth btn-register">Регистрация</button></a>
+            <a href="/bank/login.html"><button class="btn-auth btn-login">Войти</button></a>
+            <a href="/bank/register.html"><button class="btn-auth btn-register">Регистрация</button></a>
         </div>
     </header>
     <main class="main-content">

package/public/js/js.js

@@ -1,20 +1,13 @@
-//import Toastifyt from 'https://cdn.jsdelivr.net/npm/toastify-js';
 const toastifyScript = document.createElement('script');
 toastifyScript.src = 'https://cdn.jsdelivr.net/npm/toastify-js';
 document.head.append(toastifyScript);
 let currentUsername = "";
-
   function showTab(tabId) {
     document.querySelectorAll('.section').forEach(s => s.classList.remove('active'));
     document.querySelectorAll('.menu-btn').forEach(b => b.classList.remove('active'));
     document.getElementById(tabId).classList.add('active');
     event.target.classList.add('active');
   }
-
-
-
-
-
   window.tippy('#general', {
     content: "Главная",
     placement:'top-end',
@@ -57,22 +50,9 @@ let currentUsername = "";
     animation:'scale-extreme',
     theme:"light"
   });
-
-
-
-
-
-
-
-
-
-
-
-
-
   async function loadData() {
     try {
-      let response = await fetch('/api/accounts/my');
+      let response = await fetch('/api/bank/accounts/my');
       if (response.status === 401 || response.status === 403) {
         window.Swal.fire({
           title: 'Внимание!',
@@ -83,11 +63,11 @@ let currentUsername = "";
           confirmButtonColor: '#3085d6',
           background:'#d6cb3089'
         });
-        window.location.href = '/login.html';
+        window.location.href = '/bank/login.html';
         return;
       }
       let result = await response.json();
-      let mannyRes = await fetch('/api/users/my-total-manny');
+      let mannyRes = await fetch('/api/bank/users/my-total-manny');
       let mannyData = await mannyRes.json();
       currentUsername = mannyData.username;
       const userDisplay = document.getElementById('user-display');
@@ -152,7 +132,7 @@ let currentUsername = "";
           }
         });
       }
-      let profileRes = await fetch('/api/users/profile');
+      let profileRes = await fetch('/api/bank/users/profile');
       let profileData = await profileRes.json();
       const userAvatar = document.getElementById('user-avatar');
       window.tippy("#user-avatar", {
@@ -185,38 +165,11 @@ let currentUsername = "";
       });
     }
   }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
   async function openCreateAccountModal() {
     const pin = await window.Swal.fire({title: 'Создание щёта', text: 'Введите надёжный пин-код!', icon: 'question', iconColor:"blue", input:"number", inputAttributes: { autocapitalize: "off" }, preConfirm:async(pincode)=>{return pincode}, confirmButtonText: 'ОК', confirmButtonColor: '#3085d6', background:'#ffffffaf'})
     if (!pin.value) return;
     const fa = await Swal.fire({title: 'Создание щёта', text: 'Включить индивидуальную 2FA-защиту транзакций для этого счета?', icon: 'question', iconColor:"blue", showCancelButton: true, confirmButtonColor: '#3085d6', cancelButtonColor: '#3085d6', confirmButtonText: 'Да, включить', cancelButtonText: 'Нет, не включать'}).then((result) => {return result;});
-    const res = await fetch('/api/accounts', {
+    const res = await fetch('/api/bank/accounts', {
       method: 'POST',
       headers: {'Content-Type': 'application/json'},
       body: JSON.stringify({ pinCode: pin.value, enableAccount2FA: fa.isConfirmed })
@@ -253,7 +206,7 @@ let currentUsername = "";
     const fa = await Swal.fire({title: 'Перевод', text: 'Вы подтверждаете перевод?', icon: 'question', iconColor:"blue", showCancelButton: true, confirmButtonColor: '#3085d6', cancelButtonColor: '#3085d6', confirmButtonText: 'Да, перевести', cancelButtonText: 'Нет, не переводить'}).then((result) => {return result;});
     if(!fa.isConfirmed) return
 
-    const res = await fetch('/api/accounts/transfer', {
+    const res = await fetch('/api/bank/accounts/transfer', {
       method: 'POST',
       headers: {'Content-Type': 'application/json'},
       body: JSON.stringify({ fromId, toId, amount, pinCode })
@@ -275,20 +228,13 @@ let currentUsername = "";
       console.error("Ошибка ["+data.statusCode+"]: " + data.message); 
     }
   }
-
-
-
-
-
-
-
 async function applyForCredit() {
     const targetAccountId = document.getElementById('credit-target').value;
     const amount = document.getElementById('credit-amount').value;
     const paymentsCount = document.getElementById('credit-payments').value;
     const autoWithdrawal = document.getElementById('credit-auto').checked;
     const pinCode = document.getElementById('credit-pin').value;
-    const res = await fetch('/api/accounts/credit', {
+    const res = await fetch('/api/bank/accounts/credit', {
       method: 'POST',
       headers: {'Content-Type': 'application/json'},
       body: JSON.stringify({ 
@@ -347,48 +293,26 @@ document.getElementById("logoutBtn").addEventListener("click", async () => {
   await Toastify({ text: `Выход из аккаунта`, duration: 3000, style: { background: "rgb(245, 128, 11)" }}).showToast();
   
   try {
-    await fetch('/api/users/logout', { method: 'POST' });
+    await fetch('/api/bank/users/logout', { method: 'POST' });
   } catch (e) {
     console.error('Ошибка сети при логауте:', e.message);
   }
-  window.location.href = '/home.html';
+  window.location.href = '/bank/home.html';
 });
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     window.onload = loadData;
     let user2FaActive = false;
-
   async function syncProfileSectionData() {
     try {
-      const response = await fetch('/api/users/profile');
-      
-      // 🔑 ЗАЩИТА: Если бэкенд вернул ошибку (не 200 OK), не пытаемся парсить JSON
+      const response = await fetch('/api/bank/users/profile/settings');
       if (!response.ok) {
         console.warn("⚠️ [City-bank] Не удалось загрузить данные профиля, сервер вернул статус:", response.status);
         return;
       }
-      
       const result = await response.json();
       if (result.status && result.user) {
         if (result.user.avatar) {
           document.getElementById('user-avatar').src = result.user.avatar;
-        }
-        
+        } 
         user2FaActive = result.user.two_fa_status;
         const statusText = document.getElementById('2fa-current-status');
         const toggleBtn = document.getElementById('btn-toggle-2fa');
@@ -418,7 +342,7 @@ document.getElementById("logoutBtn").addEventListener("click", async () => {
     formData.append('avatar', fileInput.files[0]);
 
     try {
-      const res = await fetch('/api/users/avatar', {
+      const res = await fetch('/api/bank/users/avatar', {
         method: 'POST',
         body: formData
       });
@@ -454,7 +378,7 @@ document.getElementById("logoutBtn").addEventListener("click", async () => {
       if (!totpCode) return;
     }
     try {
-      const res = await fetch('/api/users/change-password', {
+      const res = await fetch('/api/bank/users/change-password', {
         method: 'POST',
         headers: {'Content-Type': 'application/json'},
         body: JSON.stringify({ oldPassword, newPassword, totpCode })
@@ -485,7 +409,7 @@ document.getElementById("logoutBtn").addEventListener("click", async () => {
     }
 
     try {
-      const res = await fetch('/api/users/change-gmail', {
+      const res = await fetch('/api/bank/users/change-gmail', {
         method: 'POST',
         headers: {'Content-Type': 'application/json'},
         body: JSON.stringify({ newGmail })
@@ -510,7 +434,7 @@ document.getElementById("logoutBtn").addEventListener("click", async () => {
     }
   }
   async function toggleSystem2FA() {
-    const url = user2FaActive ? '/api/users/disable-2fa' : '/api/users/enable-2fa';
+    const url = user2FaActive ? '/api/bank/users/disable-2fa' : '/api/bank/users/enable-2fa';
     try {
       const res = await fetch(url, { method: 'POST' });
       const data = await res.json();
@@ -547,7 +471,7 @@ document.getElementById("logoutBtn").addEventListener("click", async () => {
     const deleteAccountStatus = await Swal.fire({title: 'Удаление щёта', text: 'Вы действительно хотите удалить щёт?', icon: 'warning', iconColor:"orange", showCancelButton: true, confirmButtonColor: '#d63030', cancelButtonColor: '#46d630', confirmButtonText: 'Да, удалить', cancelButtonText: 'Отмена'}).then((result) => {return result;});    
     if (!deleteAccountStatus.isConfirmed) return;
     try {
-      const response = await fetch(`/api/accounts/${accountId}`, {
+      const response = await fetch(`/api/bank/accounts/${accountId}`, {
         method: 'DELETE'
       });
       if (!response.ok) {
@@ -583,7 +507,7 @@ document.getElementById("logoutBtn").addEventListener("click", async () => {
   }
   async function loadTransactionLogs() {
     try {
-      const response = await fetch('/api/accounts/my-logs');
+      const response = await fetch('/api/bank/accounts/my-logs');
       if (!response.ok) return;
       const result = await response.json();
       const tbody = document.querySelector('#table-logs tbody');
@@ -658,7 +582,7 @@ document.getElementById("logoutBtn").addEventListener("click", async () => {
     }
 
     // 3. Отправляем fetch-запрос на бэкенд-роут игрового банка
-    const response = await fetch('/api/account/create-credit', {
+    const response = await fetch('/api/bank/accounts/credit', {
       method: 'POST',
       headers: { 
         'Content-Type': 'application/json'
@@ -683,7 +607,7 @@ document.getElementById("logoutBtn").addEventListener("click", async () => {
     if (result.success) {
       Swal.fire('Успех!', result.message || 'Кредит успешно оформлен', 'success').then(() => {
         // Перенаправляем пользователя на страницу счетов, чтобы увидеть обновленный баланс
-        location.href = '/accounts'; 
+        location.href = '/bank/accounts.html'; 
       });
     } else {
       Swal.fire('Ошибка оформления', result.error || 'Не удалось выдать кредит', 'error');

package/public/login.html

@@ -34,7 +34,7 @@
 
   <div id="login-error" class="error"></div>
   <button class="btn" onclick="submitLogin()">Войти в кабинет</button>
-  <p style="text-align: center; font-size: 14px; margin-top: 15px;"><a href="/register.html">Создать аккаунт</a></p>
+  <p style="text-align: center; font-size: 14px; margin-top: 15px;"><a href="/bank/register.html">Создать аккаунт</a></p>
 </div>
 
 <script>
@@ -46,7 +46,7 @@
     errBlock.style.display = 'none';
 
     try {
-      const response = await fetch('/api/users/login', {
+      const response = await fetch('/api/bank/users/login', {
         method: 'POST',
         headers: {'Content-Type': 'application/json'},
         body: JSON.stringify({ name, password: pass, totpCode: totp || null })
@@ -54,7 +54,7 @@
       const result = await response.json();
 
       if (response.ok && result.status === true) {
-        window.location.href = 'general.html';
+        window.location.href = '/bank/general.html';
       } else if (result.require2FA) {
         document.getElementById('totp-block').style.display = 'block';
         errBlock.innerText = result.message;

package/public/profile.html

@@ -3,25 +3,25 @@
 <head>
   <meta charset="UTF-8">
   <title>City-Bank | Профиль</title>
-  <link rel="stylesheet" href="/css/style.css">
+  <link rel="stylesheet" href="/api/bank/css/style.css">
   <link rel="stylesheet" href="https://unpkg.com/tippy.js@6/animations/scale.css"/>
 </head>
 <body>
   <div class="main-container">
       <div class="sidebar">
       <div style="text-align: center; margin-bottom: 15px;">
-        <img id="user-avatar" src="/uploads/avatars/default.png" style="width: 80px; height: 80px; border-radius: 50%; object-fit: cover; border: 3px solid #1abc9c;">
+        <img id="user-avatar" src="/api/bank/uploads/avatars/default.png" style="width: 80px; height: 80px; border-radius: 50%; object-fit: cover; border: 3px solid #1abc9c;">
       </div>
       <h2 id="user-display">Загрузка...</h2>
       <p style="text-align: center; color: #bbb;">Всего средств: <span id="total-manny" style="font-weight: bold; color: #1abc9c;">0.00</span> руб.</p>
       <hr style="border-color: #34495e;">
-      <a href="/general.html" class="nav-item"><button class="menu-btn" id="general">Главная</button></a>
-      <a href="/accounts.html" class="nav-item"><button class="menu-btn" id="acccount">Мои Счета</button></a>
-      <a href="/transfer.html" class="nav-item"><button class="menu-btn" id="transfer">Перевод средств</button></a>
-      <a href="/history.html" class="nav-item"><button class="menu-btn" id="history">История транзакций</button></a>
-      <a href="/credit.html" class="nav-item"><button class="menu-btn" id="credit">Оформить Кредит</button></a>
+      <a href="/bank/general.html" class="nav-item"><button class="menu-btn" id="general">Главная</button></a>
+      <a href="/bank/accounts.html" class="nav-item"><button class="menu-btn" id="acccount">Мои Счета</button></a>
+      <a href="/bank/transfer.html" class="nav-item"><button class="menu-btn" id="transfer">Перевод средств</button></a>
+      <a href="/bank/history.html" class="nav-item"><button class="menu-btn" id="history">История транзакций</button></a>
+      <a href="/bank/credit.html" class="nav-item"><button class="menu-btn" id="credit">Оформить Кредит</button></a>
       <a class="nav-item"><button class="menu-btn active" id="profile">Управление профилем</button></a>
-  <button class="menu-btn" onclick="location.href='/admin.html'" id="admin-nav" style="display: none; color: #ffc107;">Админ-панель</button>
+  <button class="menu-btn" onclick="location.href='/bank/admin.html'" id="admin-nav" style="display: none; color: #ffc107;">Админ-панель</button>
       <br><br>
       <button class="menu-btn btn-danger" id="logoutBtn" style="text-align: center;">Выйти из системы</button>
     </div>
@@ -73,9 +73,9 @@
       </div>
   </div>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/zxcvbn/4.4.2/zxcvbn.js"></script>
-<script src="/js/sweetalert2.js"></script>
+<script src="/api/bank/js/sweetalert2.js"></script>
 <script src="https://unpkg.com/@popperjs/core@2/dist/umd/popper.min.js"></script>
 <script src="https://unpkg.com/tippy.js@6/dist/tippy-bundle.umd.js"></script>
-<script src="/js/js.js"></script>
+<script src="/api/bank/js/js.js"></script>
 </body>
 </html>

package/public/register.html

@@ -239,7 +239,7 @@
     }
 
     try {
-      const response = await fetch(`/api/users/check-nik?name=${encodeURIComponent(nikInput)}`);
+      const response = await fetch(`/api/bank/users/check-nik?name=${encodeURIComponent(nikInput)}`);
       const result = await response.json();
 
       if (result.status === true && result.statusCode === 1) {
@@ -267,7 +267,7 @@
     }
 
     try {
-      const response = await fetch(`/api/users/check-gmail?gmail=${encodeURIComponent(gmailInput)}`);
+      const response = await fetch(`/api/bank/users/check-gmail?gmail=${encodeURIComponent(gmailInput)}`);
       const result = await response.json();
 
       if (result.status === true && result.statusCode === 1) {
@@ -317,7 +317,7 @@
       nextBtn.innerText = "Проверить токен 2FA";
       
       try {
-        const response = await fetch('/api/users/generate-temporary-2fa', {
+        const response = await fetch('/api/bank/users/generate-temporary-2fa', {
           method: 'POST',
           headers: {'Content-Type': 'application/json'},
           body: JSON.stringify({ name: registrationPayload.name || document.getElementById('reg-nik').value.trim() })
@@ -376,7 +376,7 @@
     }
 
     try {
-      const response = await fetch('/api/users/verify-temporary-2fa', {
+      const response = await fetch('/api/bank/users/verify-temporary-2fa', {
         method: 'POST',
         headers: {'Content-Type': 'application/json'},
         body: JSON.stringify({ 
@@ -418,7 +418,7 @@
     registrationPayload.userSurname = surname;
 
     try {
-      const response = await fetch('/api/users/register', {
+      const response = await fetch('/api/bank/users/register', {
         method: 'POST',
         headers: {'Content-Type': 'application/json'},
         body: JSON.stringify(registrationPayload)
@@ -426,8 +426,8 @@
       const result = await response.json();
 
       if (result.status === true && result.statusCode === 1) {
-        alert("🎉 Регистрация успешно завершена! Проверьте вашу почту для получения паролей и токенов.");
-        window.location.href = '/login.html';
+        alert("Регистрация успешно завершена! Проверьте вашу почту для получения паролей и токенов.");
+        window.location.href = '/bank/login.html';
       } else {
         errBlock.innerText = result.message || "Внутренняя ошибка сервера";
         errBlock.style.display = 'block';

package/public/transfer.html

@@ -3,25 +3,25 @@
 <head>
   <meta charset="UTF-8">
   <title>City-Bank | Переводы</title>
-  <link rel="stylesheet" href="/css/style.css">
+  <link rel="stylesheet" href="/api/bank/css/style.css">
   <link rel="stylesheet" href="https://unpkg.com/tippy.js@6/animations/scale.css"/>
 </head>
 <body>
   <div class="main-container">
     <div class="sidebar">
       <div style="text-align: center; margin-bottom: 15px;">
-        <img id="user-avatar" src="/uploads/avatars/default.png" style="width: 80px; height: 80px; border-radius: 50%; object-fit: cover; border: 3px solid #1abc9c;">
+        <img id="user-avatar" src="/api/bank/uploads/avatars/default.png" style="width: 80px; height: 80px; border-radius: 50%; object-fit: cover; border: 3px solid #1abc9c;">
       </div>
       <h2 id="user-display">Загрузка...</h2>
       <p style="text-align: center; color: #bbb;">Всего средств: <span id="total-manny" style="font-weight: bold; color: #1abc9c;">0.00</span> руб.</p>
       <hr style="border-color: #34495e;">
-      <a href="/general.html" class="nav-item"><button class="menu-btn" id="general">Главная</button></a>
-      <a href="/accounts.html" class="nav-item"><button class="menu-btn" id="acccount">Мои Счета</button></a>
+      <a href="/bank/general.html" class="nav-item"><button class="menu-btn" id="general">Главная</button></a>
+      <a href="/bank/accounts.html" class="nav-item"><button class="menu-btn" id="acccount">Мои Счета</button></a>
       <a class="nav-item"><button class="menu-btn active" id="transfer">Перевод средств</button></a>
-      <a href="/history.html" class="nav-item"><button class="menu-btn" id="history">История транзакций</button></a>
-      <a href="/credit.html" class="nav-item"><button class="menu-btn" id="credit">Оформить Кредит</button></a>
-      <a href="/profile.html" class="nav-item"><button class="menu-btn" id="profile">Управление профилем</button></a>
-  <button class="menu-btn" onclick="location.href='/admin.html'" id="admin-nav" style="display: none; color: #ffc107;">Админ-панель</button>
+      <a href="/bank/history.html" class="nav-item"><button class="menu-btn" id="history">История транзакций</button></a>
+      <a href="/bank/credit.html" class="nav-item"><button class="menu-btn" id="credit">Оформить Кредит</button></a>
+      <a href="/bank/profile.html" class="nav-item"><button class="menu-btn" id="profile">Управление профилем</button></a>
+  <button class="menu-btn" onclick="location.href='/bank/admin.html'" id="admin-nav" style="display: none; color: #ffc107;">Админ-панель</button>
       <br><br>
       <button class="menu-btn btn-danger" id="logoutBtn" style="text-align: center;">Выйти из системы</button>
     </div>
@@ -54,9 +54,9 @@
       </div>
     </div>
   </div>
-<script src="/js/sweetalert2.js"></script>
+<script src="/api/bank/js/sweetalert2.js"></script>
 <script src="https://unpkg.com/@popperjs/core@2/dist/umd/popper.min.js"></script>
 <script src="https://unpkg.com/tippy.js@6/dist/tippy-bundle.umd.js"></script>
-<script src="/js/js.js"></script>
+<script src="/api/bank/js/js.js"></script>
 </body>
 </html>

package/server/server.js

@@ -5,6 +5,7 @@ const User = require(path.join(__dirname, '..', 'database', 'models', 'User.js')
 const Account = require(path.join(__dirname, '..', 'database', 'models', 'Account.js'));
 const multer = require('multer');
 const fs = require('fs');
+const express = require("express");
 const logger = require("custom-color-logs").print;
 const storage = multer.diskStorage({
   destination: function (req, file, cb) {
@@ -43,8 +44,10 @@ function verifySession(req, res, next) {
     return res.status(403).json({ status: false, statusCode: -2, message: 'Сессия устарела. Войдите снова.' });
   }
 }
-module.exports = function registerRoutes(app) {
-  app.post('/api/users/generate-temporary-2fa', async (req, res) => {
+module.exports = function registerRoutes() {
+  const get = express.Router();
+  const post = express.Router();
+  post.post('/users/generate-temporary-2fa', async (req, res) => {
     try {
       const otplib = require('otplib');
       const { name } = req.body;
@@ -55,7 +58,7 @@ module.exports = function registerRoutes(app) {
       return res.status(500).json({ status: false, message: err.message });
     }
   })
-  app.post('/api/users/verify-temporary-2fa', async (req, res) => {
+  post.post('/users/verify-temporary-2fa', async (req, res) => {
     try {
       const otplib = require('otplib');
       const { secret, code } = req.body;
@@ -72,39 +75,39 @@ module.exports = function registerRoutes(app) {
       return res.status(500).json({ status: false, message: err.message });
     }
   });
-  app.post('/api/users/avatar', verifySession, upload.single('avatar'), async (req, res) => {
+  post.post('/users/avatar', verifySession, upload.single('avatar'), async (req, res) => {
     if (!req.file) {
       return res.status(400).json({ status: false, statusCode: -2, message: 'Файл не загружен' });
     }
-    const avatarUrl = `/uploads/avatars/${req.file.filename}`;
+    const avatarUrl = `/api/bank/uploads/avatars/${req.file.filename}`;
     const result = await usersHub.changeAvatar(req.user.name, avatarUrl);
     return res.json(result);
   });
-  app.get('/api/users/profile', verifySession, async (req, res) => {
+  post.get('/users/profile', verifySession, async (req, res) => {
     const user = await User.findByPk(req.user.name, { attributes: ['name', 'user_gmail', 'avatar'] });
     if (!user) return res.status(404).json({ status: false });
     return res.json({ status: true, user });
   });
-  app.get('/api/users/check-nik', async (req, res) => {
+  post.get('/users/check-nik', async (req, res) => {
     const user = await User.findByPk(req.query.name);
     if (user) {
       return res.json({ status: false, statusCode: -20, message: 'Никнейм уже занят!' });
     }
     return res.json({ status: true, statusCode: 1 });
   });
-  app.get('/api/users/check-gmail', async (req, res) => {
+  post.get('/users/check-gmail', async (req, res) => {
     const user = await User.findOne({ where: { user_gmail: req.query.gmail } });
     if (user) {
       return res.json({ status: false, statusCode: -21, message: 'Данный email уже используется!' });
     }
     return res.json({ status: true, statusCode: 1 });
   });
-  app.post('/api/users/register', async (req, res) => {
+  post.post('/users/register', async (req, res) => {
     const result = await usersHub.registerUser(req.body);
     if (!result.status) return res.status(400).json(result);
     return res.status(201).json(result);
   });
-  app.post('/api/users/login', async (req, res) => {
+  post.post('/users/login', async (req, res) => {
     const { name, password, totpCode } = req.body;
     const result = await usersHub.login(name, password, totpCode);
     if (!result.status) {
@@ -117,20 +120,20 @@ module.exports = function registerRoutes(app) {
     res.cookie('token', sessionToken, { httpOnly: true, maxAge: 2 * 60 * 60 * 1000 });
     return res.json(result);
   });
-  app.post('/api/users/logout', (req, res) => {
+  post.post('/users/logout', (req, res) => {
     res.clearCookie('token');
     return res.json({ status: true, statusCode: 1 });
   });
-  app.get('/api/users/my-total-manny', verifySession, async (req, res) => {
+  post.get('/users/my-total-manny', verifySession, async (req, res) => {
     const result = await usersHub.mathManny(req.user.name);
     return res.json({ status: result.status, statusCode: result.statusCode, totalManny: result.totalManny, username: req.user.name });
   });
-  app.post('/api/accounts', verifySession, async (req, res) => {
+  post.post('/accounts', verifySession, async (req, res) => {
     const { pinCode, enableAccount2FA } = req.body;
     const result = await accountsHub.create(req.user.name, pinCode, enableAccount2FA);
     return res.json(result);
   });
-  app.get('/api/accounts/my', verifySession, async (req, res) => {
+  post.get('/accounts/my', verifySession, async (req, res) => {
     try {
       const myAccounts = await Account.findAll({ where: { user: req.user.name } });
       return res.json({ status: true, statusCode: 1, accounts: myAccounts });
@@ -138,7 +141,7 @@ module.exports = function registerRoutes(app) {
       return res.status(500).json({ status: false, statusCode: -10 });
     }
   });
-  app.delete('/api/accounts/:id', verifySession, async (req, res) => {
+  post.delete('/accounts/:id', verifySession, async (req, res) => {
     try {
       const result = await accountsHub.delete(req.params.id, req.user.name);
       if (!result.status) {
@@ -154,22 +157,22 @@ module.exports = function registerRoutes(app) {
       return res.status(500).json({ status: false, statusCode: -10, message: "Внутренняя ошибка сервера" });
     }
   });
-  app.post('/api/accounts/transfer', verifySession, async (req, res) => {
+  post.post('/accounts/transfer', verifySession, async (req, res) => {
     const { fromId, toId, amount, pinCode, totpCode } = req.body;
     const result = await accountsHub.transfer(fromId, toId, amount, pinCode, totpCode);
     return res.json(result);
   });
-  app.post('/api/accounts/credit', verifySession, async (req, res) => {
+  post.post('/accounts/credit', verifySession, async (req, res) => {
     const { targetAccountId, amount, paymentsCount, autoWithdrawal, pinCode } = req.body;
     const result = await accountsHub.creatCredit(req.user.name, targetAccountId, amount, pinCode, paymentsCount, autoWithdrawal);
     return res.json(result);
   });
-  app.post('/api/admin/accounts/:id/status', verifySession, async (req, res) => {
+  post.post('/admin/accounts/:id/status', verifySession, async (req, res) => {
     if (req.user.name !== 'root') return res.status(403).json({ status: false, statusCode: -2, message: 'Отказано в доступе' });
     const result = await accountsHub.changeAccountStatus(req.params.id, req.body.active);
     return res.json(result);
   });
-  app.post('/api/admin/accounts/:id/modify', verifySession, async (req, res) => {
+  post.post('/admin/accounts/:id/modify', verifySession, async (req, res) => {
     if (req.user.name !== 'root') return res.status(403).json({ status: false, statusCode: -2, message: 'Отказано в доступе' });
     const { amount, type } = req.body;
     let result;
@@ -180,7 +183,7 @@ module.exports = function registerRoutes(app) {
     }
     return res.json(result);
   });
-  app.get('/api/admin/accounts/all', verifySession, async (req, res) => {
+  post.get('/admin/accounts/all', verifySession, async (req, res) => {
     if (req.user.name !== 'root') return res.status(403).json({ status: false, statusCode: -2, message: 'Отказано в доступе' });
     try {
       const allAccounts = await Account.findAll({ order: [['id', 'ASC']] });
@@ -189,7 +192,7 @@ module.exports = function registerRoutes(app) {
       return res.status(500).json({ status: false, statusCode: -10 });
     }
   });
-  app.get('/api/users/profile', verifySession, async (req, res) => {
+  post.get('/users/profile/settings', verifySession, async (req, res) => {
     try {
       const user = await User.findByPk(req.user.name, { attributes: ['name', 'user_gmail', 'two_fa_status', 'avatar'] });
       if (!user) return res.status(404).json({ status: false, message: 'Юзер не найден' });
@@ -198,19 +201,19 @@ module.exports = function registerRoutes(app) {
       return res.status(500).json({ status: false, message: 'Внутренняя ошибка бэка' });
     }
   });
-  app.post('/api/users/enable-2fa', verifySession, async (req, res) => {
+  post.post('/users/enable-2fa', verifySession, async (req, res) => {
     const result = await usersHub.enable2FA(req.user.name);
     return res.json(result);
   });
-  app.post('/api/users/disable-2fa', verifySession, async (req, res) => {
+  post.post('/users/disable-2fa', verifySession, async (req, res) => {
     const result = await usersHub.disable2FA(req.user.name);
     return res.json(result);
   });
-  app.get('/api/accounts/my-logs', verifySession, async (req, res) => {
+  post.get('/accounts/my-logs', verifySession, async (req, res) => {
     const result = await accountsHub.getLogs(req.user.name);
     return res.json(result);
   });
-  app.post('/api/terminal/register', async(req, res)=>{
+  post.post('/terminal/register', async(req, res)=>{
     if(!req.body) return res.sendStatus(400)
     const id = req.body.id;
     const pincode = req.body.pincode;
@@ -219,13 +222,13 @@ module.exports = function registerRoutes(app) {
     if(!result.status) return res.sendStatus(422)
     return res.sendStatus(200);
   });
-  app.post('/api/terminal/transfer', async(req, res)=>{
+  post.post('/terminal/transfer', async(req, res)=>{
     const card = req.body.card;
     const to = req.body.to;
     const pincode = req.body.pincode;
-    const manny = req.body.pinCode;
+    const manny = req.body.manny;
     const result = await accountsHub.cardTransfer(card, to, manny, pincode)
   });
-  return app;
+  return {GET:get, POST:post};
 };
 module.exports.verifySession = verifySession;