sequelize-game-bank 1.0.3 → 1.2.0

package/database/models/Account.js

@@ -35,6 +35,11 @@ const Account = sequelize.define('account', {
     allowNull: false,
     defaultValue: false,
     field: '2FA-status'
+  },
+  cardNumber:{
+    type:DataTypes.STRING,
+    allowNull:true,
+    unique:true
   }
 });
 User.hasMany(Account, { foreignKey: 'user', sourceKey: 'name' });

package/database/services/account/cardTransfer.js

@@ -0,0 +1,91 @@
+const path = require("path");
+const bcrypt = require('bcrypt');
+const Account = require(path.join(__dirname, '..', '..', 'models', 'Account'));
+const User = require(path.join(__dirname, '..', '..', 'models', 'User'));
+const Transaction = require(path.join(__dirname, '..', '..', 'models', 'Transaction'));
+const sequelize = require(path.join(__dirname, '..', '..', 'config', 'init-db'));
+const { sendBotNotification } = require(path.join(__dirname, '..', 'bot', 'bot'));
+const logger = require("custom-color-logs").print;
+async function getIdByCard(card) {
+    const result = await Account.findOne({
+        where:{cardNumber:card.toString()},
+        attributes: ['id']
+    });
+    if (!result) return false
+    return result
+}
+module.exports = async function cardTransfer(card, toId, amount, pinCode) {
+  const t = await sequelize.transaction();
+  try {
+    const fromId = await getIdByCard(card);
+    const numericAmount = parseFloat(amount);
+    if (isNaN(numericAmount) || numericAmount <= 0) {
+      await t.rollback();
+      return { status: false, statusCode: -2, message: 'Некорректная сумма перевода' };
+    }
+    const fromAcc = await Account.findByPk(fromId, { 
+      transaction: t, 
+      lock: t.LOCK.UPDATE 
+    });
+    const toAcc = await Account.findByPk(toId, { 
+      transaction: t, 
+      lock: t.LOCK.UPDATE 
+    });
+    if (!fromAcc || !toAcc) {
+      await t.rollback();
+      return { status: false, statusCode: -2, message: 'Один из счетов не найден' };
+    }
+    if (!fromAcc.active || !toAcc.active) {
+      await t.rollback();
+      return { status: false, statusCode: -11, message: 'Один из счетов заблокирован' };
+    }
+    const isPinValid = await bcrypt.compare(pinCode, fromAcc.pin_code);
+    if (!isPinValid) {
+      await t.rollback();
+      return { status: false, statusCode: -23, message: 'Неверный пароль счета отправителя' };
+    }
+    if (fromAcc.user !== 'root' && parseFloat(fromAcc.manny) < numericAmount) {
+      await t.rollback();
+      return { status: false, statusCode: -11, message: 'Недостаточно средств на счете' };
+    }
+    if (fromAcc.two_fa_status) {
+      const owner = await User.findByPk(fromAcc.user, { transaction: t });
+      if (owner && owner.two_fa_status) {
+        const isTotpValid = await bcrypt.compare(totpCode, owner.two_fa_token);
+        if (!isTotpValid) {
+          await t.rollback();
+          return { status: false, statusCode: -2, message: 'Неверный токен подтверждения 2FA' };
+        }
+      }
+    }
+    await fromAcc.decrement('manny', { by: numericAmount, transaction: t });
+    await toAcc.increment('manny', { by: numericAmount, transaction: t });
+    await Transaction.create({ 
+      account_id: fromId, 
+      type: 'TRANSFER_OUT', 
+      sender_or_receiver: `На счет #${toId} (${toAcc.user})`, 
+      amount: numericAmount 
+    }, { transaction: t });
+    await Transaction.create({ 
+      account_id: toId, 
+      type: 'TRANSFER_IN', 
+      sender_or_receiver: `Со счета #${fromId} (${fromAcc.user})`, 
+      amount: numericAmount 
+    }, { transaction: t });
+    await t.commit();
+    await fromAcc.reload();
+    await toAcc.reload();
+    try {
+      await sendBotNotification('transfer-from-bot', { fromId, toId, amount: numericAmount, balance: fromAcc.manny });
+      await sendBotNotification('transfer-to-bot', { toId, fromId, amount: numericAmount, balance: toAcc.manny });
+    } catch (botErr) {
+      console.log(logger.DatabaseError('Ошибка отправки уведомления боту:', botErr.message))
+    }
+    return { status: true, statusCode: 1 };
+  } catch (err) {
+    if (!t.finished) {
+      await t.rollback();
+    }
+    return { status: false, statusCode: -10, message: err.message };
+  }
+};

package/database/services/account/create.js

@@ -12,10 +12,19 @@ module.exports = async function createAccount(username, pinCode, enable2FA) {
       pin_code: hashedPin,
       manny: 0.00,
       active: true,
-      two_fa_status: enable2FA
+      two_fa_status: enable2FA,
+      cardNumber:null
     });
     return { status: true, statusCode: 1, accountId: newAccount.id };
   } catch (err) {
+    console.log(err)
+
+
+
+
+
+
+    
     return { status: false, statusCode: -10, message: err.message };
   }
 };

package/database/services/account/linkACard.js

@@ -0,0 +1,18 @@
+const path = require("path");
+const Account = require(path.join(__dirname, '..', '..', 'models', 'Account'));
+const logger = require("custom-color-logs").print;
+module.exports = async function linkACard(card, id, pin_code) {
+    try {
+        const account = await Account.findByPk(id);
+        if (!account) return { status: false, statusCode: -2, message: "?¿?" };
+        if(!account.active) return { status: false, statusCode: -11, message: 'Один из счетов заблокирован' };
+        if (account.pin_code !== pin_code) return { status: false, statusCode: -23, message: "Неправильны пароль!" };
+        if (account.cardNumber !== null) return { status: false, statusCode: -19, message: "Карты уже привязана" };
+        account.cardNumber = card;
+        await account.save();
+        return {status: true, statusCode: 1, message: 'Привязка карты удалась'};
+    } catch (err) {
+        console.log(logger.BankError(err));
+        return { status: false, statusCode: -10, message: err.message };
+    }
+}

package/database/services/accounts.js

@@ -9,5 +9,7 @@ module.exports = {
   findManny: require(path.join(__dirname, 'account', 'find-manny')),
   creatCredit: require(path.join(__dirname, 'account', 'create-credit')),
   getLogs: require(path.join(__dirname, 'account', 'logs')),
-  changeAccountStatus: require(path.join(__dirname, 'account', 'change-status')) 
+  changeAccountStatus: require(path.join(__dirname, 'account', 'change-status')),
+  linkACard: require(path.join(__dirname, 'account', 'linkACard')),
+  cardTransfer: require(path.join(__dirname, 'account', 'cardTransfer'))
 };

package/index.js

@@ -11,11 +11,9 @@ const { writeTemplatesIfNotExist } = require(path.join(__dirname, 'database', 's
 const registerRoutes = require(path.join(__dirname, 'server', 'server'));
 const Transaction = require(path.join(__dirname, 'database', 'models', 'Transaction')); 
 const app = express();
-
 const { verifySession } = require(path.join(__dirname, 'server', 'server'));
 app.use(express.json());
 app.use(cookieParser());
-require(path.join(__dirname, 'database', 'services', 'bot', 'cron-schedule'));
 async function Bank() {
   try {
     await sequelize.sync();
@@ -53,6 +51,8 @@ async function Bank() {
     app.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'));
+
+    require(path.join(__dirname, 'database', 'services', 'bot', 'cron-schedule'));
     return configuredApp;
   } catch (err) {
     console.log(logger.ServerBankError("Критическая ошибка инициализации модулей", err));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sequelize-game-bank",
-  "version": "1.0.3",
+  "version": "1.2.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

@@ -4,6 +4,7 @@
   <meta charset="UTF-8">
   <title>City-Bank | Мои Счета</title>
   <link rel="stylesheet" href="/css/style.css">
+  <link rel="stylesheet" href="https://unpkg.com/tippy.js@6/animations/scale.css"/>
 </head>
 <body>
   <div class="main-container">
@@ -14,12 +15,12 @@
       <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">Главная</button></a>
-      <a href="/accounts.html" class="nav-item"><button class="menu-btn active">Мои Счета</button></a>
-      <a href="/transfer.html" class="nav-item"><button class="menu-btn">Перевод средств</button></a>
-      <a href="/history.html" class="nav-item"><button class="menu-btn">История транзакций</button></a>
-      <a href="/credit.html" class="nav-item"><button class="menu-btn">Оформить Кредит</button></a>
-      <a href="/profile.html" class="nav-item"><button class="menu-btn">Управление профилем</button></a>
+      <a href="/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>
       <br><br>
       <button class="menu-btn btn-danger" id="logoutBtn" style="text-align: center;">Выйти из системы</button>
@@ -39,6 +40,8 @@
   </div>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/zxcvbn/4.4.2/zxcvbn.js"></script>
 <script src="/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>
 </body>
 </html>

package/public/credit.html

@@ -4,26 +4,27 @@
   <meta charset="UTF-8">
   <title>City-Bank | Кредитование</title>
   <link rel="stylesheet" href="/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;">
-  </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 active">Главная</button></a>
-  <a href="/accounts.html" class="nav-item"><button class="menu-btn">Мои Счета</button></a>
-  <a href="/transfer.html" class="nav-item"><button class="menu-btn">Перевод средств</button></a>
-  <a href="/history.html" class="nav-item"><button class="menu-btn">История транзакций</button></a>
-  <a href="/credit.html" class="nav-item"><button class="menu-btn">Оформить Кредит</button></a>
-  <a href="/profile.html" class="nav-item"><button class="menu-btn">Управление профилем</button></a>
+      <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;">
+      </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 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>
-  <br><br>
-  <button class="menu-btn btn-danger" id="logoutBtn" style="text-align: center;">Выйти из системы</button>
-</div>
+      <br><br>
+      <button class="menu-btn btn-danger" id="logoutBtn" style="text-align: center;">Выйти из системы</button>
+    </div>
 
     <div class="container">
       <div class="container-center">
@@ -82,6 +83,8 @@
   </div>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/zxcvbn/4.4.2/zxcvbn.js"></script>
 <script src="/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>
 </body>
 </html>

package/public/css/style.css

@@ -55,4 +55,7 @@
         border: 1px solid green;
         border-radius: 10px;
     }
-   
+   .tippy-box[data-theme~='user-info']{
+    background-color: rgba(240, 248, 255, 0.747);
+    border: 1px solid rgb(0, 0, 255);
+   }

package/public/general.html

@@ -5,28 +5,29 @@
   <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="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>
 </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;">
-  </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 active">Главная</button></a>
-  <a href="/accounts.html" class="nav-item"><button class="menu-btn">Мои Счета</button></a>
-  <a href="/transfer.html" class="nav-item"><button class="menu-btn">Перевод средств</button></a>
-  <a href="/history.html" class="nav-item"><button class="menu-btn">История транзакций</button></a>
-  <a href="/credit.html" class="nav-item"><button class="menu-btn">Оформить Кредит</button></a>
-  <a href="/profile.html" class="nav-item"><button class="menu-btn">Управление профилем</button></a>
+      <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;">
+      </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 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>
-  <br><br>
-  <button class="menu-btn btn-danger" id="logoutBtn" style="text-align: center;">Выйти из системы</button>
-</div>
+      <br><br>
+      <button class="menu-btn btn-danger" id="logoutBtn" style="text-align: center;">Выйти из системы</button>
+    </div>
 
     <div class="container">
       <div class="container-center">
@@ -48,6 +49,8 @@
   </div>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/zxcvbn/4.4.2/zxcvbn.js"></script>
 <script src="/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>
 </body>
 </html>

package/public/history.html

@@ -4,6 +4,7 @@
   <meta charset="UTF-8">
   <title>City-Bank | История</title>
   <link rel="stylesheet" href="/css/style.css">
+  <link rel="stylesheet" href="https://unpkg.com/tippy.js@6/animations/scale.css"/>
 </head>
 <body>
   <div class="main-container">
@@ -14,12 +15,12 @@
       <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 active">Главная</button></a>
-      <a href="/accounts.html" class="nav-item"><button class="menu-btn">Мои Счета</button></a>
-      <a href="/transfer.html" class="nav-item"><button class="menu-btn">Перевод средств</button></a>
-      <a href="/history.html" class="nav-item"><button class="menu-btn">История транзакций</button></a>
-      <a href="/credit.html" class="nav-item"><button class="menu-btn">Оформить Кредит</button></a>
-      <a href="/profile.html" class="nav-item"><button class="menu-btn">Управление профилем</button></a>
+      <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 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>
       <br><br>
       <button class="menu-btn btn-danger" id="logoutBtn" style="text-align: center;">Выйти из системы</button>
@@ -57,6 +58,8 @@
 </dialog>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/zxcvbn/4.4.2/zxcvbn.js"></script>
 <script src="/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>
 </body>
 </html>

package/public/js/js.js

@@ -2,8 +2,6 @@
 const toastifyScript = document.createElement('script');
 toastifyScript.src = 'https://cdn.jsdelivr.net/npm/toastify-js';
 document.head.append(toastifyScript);
-
-
 let currentUsername = "";
 
   function showTab(tabId) {
@@ -12,6 +10,66 @@ let currentUsername = "";
     document.getElementById(tabId).classList.add('active');
     event.target.classList.add('active');
   }
+
+
+
+
+
+  window.tippy('#general', {
+    content: "Главная",
+    placement:'top-end',
+    arrow: false,
+    animation:'scale-extreme',
+    theme:"light"
+  });
+  window.tippy('#acccount', {
+    content: "Щета",
+    placement:'top-end',
+    arrow: false,
+    animation:'scale-extreme',
+    theme:"light"
+  });
+  window.tippy('#transfer', {
+    content: "Перевод",
+    placement:'top-end',
+    arrow: false,
+    animation:'scale-extreme',
+    theme:"light"
+  });
+  window.tippy('#history', {
+    content: "История",
+    placement:'top-end',
+    arrow: false,
+    animation:'scale-extreme',
+    theme:"light"
+  });
+  window.tippy('#credit', {
+    content: "Кредит",
+    placement:'top-end',
+    arrow: false,
+    animation:'scale-extreme',
+    theme:"light"
+  });
+  window.tippy('#profile', {
+    content: "Редактировать профиль",
+    placement:'top-end',
+    arrow: false,
+    animation:'scale-extreme',
+    theme:"light"
+  });
+
+
+
+
+
+
+
+
+
+
+
+
+
   async function loadData() {
     try {
       let response = await fetch('/api/accounts/my');
@@ -97,6 +155,13 @@ let currentUsername = "";
       let profileRes = await fetch('/api/users/profile');
       let profileData = await profileRes.json();
       const userAvatar = document.getElementById('user-avatar');
+      window.tippy("#user-avatar", {
+        content:`<span style='color:blue'>${currentUsername.toLocaleUpperCase()}</span> — <span style='color:lightgreen;'>${mannyData.totalManny.toFixed(2)}</span>`,
+        placement:"right",
+        allowHTML:true,
+        theme:'user-info',
+        arrow:false
+      })
       const userAvatar2 = document.getElementById('user-avatar2');
       if (profileData.status && profileData.user && profileData.user.avatar && userAvatar) {
         userAvatar.src = profileData.user.avatar;
@@ -120,6 +185,33 @@ 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;
@@ -191,33 +283,25 @@ let currentUsername = "";
 
 
 async function applyForCredit() {
-    // 1. Извлекаем значения из ваших оригинальных ID элементов HTML
     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;
-
-    // 2. Отправляем fetch-запрос на ваш бэкенд-роут
     const res = await fetch('/api/accounts/credit', {
       method: 'POST',
       headers: {'Content-Type': 'application/json'},
-      // Маппим ваши оригинальные фронтенд-переменные в ключи, которые ожидает бэкенд-сервис
       body: JSON.stringify({ 
-        accountId: targetAccountId, // targetAccountId конвертируется в accountId для бэкенда
-        amount: parseFloat(amount),  // явно приводим к числу
-        termMonths: parseInt(paymentsCount, 10), // paymentsCount конвертируется в termMonths
-        autoRepay: autoWithdrawal,   // autoWithdrawal конвертируется в autoRepay
-        pinCode: pinCode,            // передаем пин-код для верификации, если он нужен в сервисе
-        rate: 0.1                    // дефолтная ставка (10%), если на фронтенде нет такого поля
+        accountId: targetAccountId,
+        amount: parseFloat(amount),
+        termMonths: parseInt(paymentsCount, 10),
+        autoRepay: autoWithdrawal,
+        pinCode: pinCode,
+        rate: 0.1
       })
     });
-    
     const data = await res.json();
-    
-    // 3. Обработка ответа от сервера
-    if(data.success || data.status) { // Проверяем оба флага для надежности
-        // ИСПРАВЛЕНО: 'sucess' изменено на валидное 'success' (теперь окно сработает и не упадет в ошибку)
+    if(data.success || data.status) {
         await Swal.fire({
           title: 'Кредит', 
           text: "Кредит одобрен! Деньги зачислены на счет #" + (data.creditId || data.creditAccountId), 
@@ -232,7 +316,7 @@ async function applyForCredit() {
           style: { background: "rgb(58, 245, 11)" }
         }).showToast();
          
-        if (typeof loadData === 'function') loadData(); // Безопасный вызов обновления данных
+        if (typeof loadData === 'function') loadData();
     } else { 
         await Swal.fire({
           title: 'Кредит', 
@@ -245,8 +329,6 @@ async function applyForCredit() {
         console.error("Ошибка: " + (data.error || data.message)); 
     }
 }
-
-// Обработчик кнопки выхода из системы
 document.getElementById("logoutBtn").addEventListener("click", async () => {
   const logOut = await Swal.fire({
     title: 'Выход', 
@@ -269,8 +351,6 @@ document.getElementById("logoutBtn").addEventListener("click", async () => {
   } catch (e) {
     console.error('Ошибка сети при логауте:', e.message);
   }
-  
-  // ИСПРАВЛЕНО: перенаправление на чистый роут без расширения .html
   window.location.href = '/home.html';
 });
 

package/public/profile.html

@@ -4,26 +4,27 @@
   <meta charset="UTF-8">
   <title>City-Bank | Профиль</title>
   <link rel="stylesheet" href="/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;">
-  </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 active">Главная</button></a>
-  <a href="/accounts.html" class="nav-item"><button class="menu-btn">Мои Счета</button></a>
-  <a href="/transfer.html" class="nav-item"><button class="menu-btn">Перевод средств</button></a>
-  <a href="/history.html" class="nav-item"><button class="menu-btn">История транзакций</button></a>
-  <a href="/credit.html" class="nav-item"><button class="menu-btn">Оформить Кредит</button></a>
-  <a href="/profile.html" class="nav-item"><button class="menu-btn">Управление профилем</button></a>
+      <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;">
+      </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 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>
-  <br><br>
-  <button class="menu-btn btn-danger" id="logoutBtn" style="text-align: center;">Выйти из системы</button>
-</div>
+      <br><br>
+      <button class="menu-btn btn-danger" id="logoutBtn" style="text-align: center;">Выйти из системы</button>
+    </div>
 
     <div class="container">
       <div class="container-center">
@@ -73,6 +74,8 @@
   </div>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/zxcvbn/4.4.2/zxcvbn.js"></script>
 <script src="/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>
 </body>
 </html>

package/public/transfer.html

@@ -4,6 +4,7 @@
   <meta charset="UTF-8">
   <title>City-Bank | Переводы</title>
   <link rel="stylesheet" href="/css/style.css">
+  <link rel="stylesheet" href="https://unpkg.com/tippy.js@6/animations/scale.css"/>
 </head>
 <body>
   <div class="main-container">
@@ -14,13 +15,13 @@
       <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">Главная</button></a>
-      <a href="/accounts.html" class="nav-item"><button class="menu-btn">Мои Счета</button></a>
-      <a href="/transfer.html" class="nav-item"><button class="menu-btn active">Перевод средств</button></a>
-      <a href="/history.html" class="nav-item"><button class="menu-btn">История транзакций</button></a>
-      <a href="/credit.html" class="nav-item"><button class="menu-btn">Оформить Кредит</button></a>
-      <a href="/profile.html" class="nav-item"><button class="menu-btn">Управление профилем</button></a>
-      <button class="menu-btn" onclick="location.href='/admin'" id="admin-nav" style="display: none; color: #ffc107;">Админ-панель</button>
+      <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 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>
       <br><br>
       <button class="menu-btn btn-danger" id="logoutBtn" style="text-align: center;">Выйти из системы</button>
     </div>
@@ -54,6 +55,8 @@
     </div>
   </div>
 <script src="/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>
 </body>
 </html>

package/server/server.js

@@ -210,9 +210,22 @@ module.exports = function registerRoutes(app) {
     const result = await accountsHub.getLogs(req.user.name);
     return res.json(result);
   });
-
-
-
+  app.post('/api/terminal/login', async(req, res)=>{
+    if(!req.body) return res.sendStatus(400)
+    const id = req.body.id;
+    const pincode = req.body.pincode;
+    const card = req.body.card;
+    const result = await accountsHub.linkACard(card, id, pincode)
+    if(!result.status) return res.sendStatus(422)
+    return res.sendStatus(200);
+  });
+  app.post('/api/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 result = await accountsHub.cardTransfer(card, to, manny, pincode)
+  });
   return app;
 };
 module.exports.verifySession = verifySession;