From fad0b6d6308ff161a0067ef8424567712bb620fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D0=9C=D0=B0?=
 =?UTF-8?q?=D0=BC=D0=B5=D0=B4=D0=BE=D0=B2?= <lendry>
Date: Wed, 10 Jun 2026 18:44:06 +0300
Subject: [PATCH] fix: replace express-ejs-layouts with EJS partial includes
 (header/footer)

---
 package-lock.json         |  6 ------
 package.json              |  1 -
 src/main.ts               |  3 ---
 views/admin/clients.ejs   |  2 ++
 views/admin/users.ejs     |  2 ++
 views/auth/login.ejs      |  2 ++
 views/auth/register.ejs   |  2 ++
 views/partials/footer.ejs | 11 +++++++++++
 views/partials/header.ejs | 30 ++++++++++++++++++++++++++++++
 views/profile/index.ejs   |  2 ++
 10 files changed, 51 insertions(+), 10 deletions(-)
 create mode 100644 views/partials/footer.ejs
 create mode 100644 views/partials/header.ejs

diff --git a/package-lock.json b/package-lock.json
index 7bea344..d5cabb5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -30,7 +30,6 @@
         "class-validator": "^0.14.1",
         "cookie-parser": "^1.4.7",
         "ejs": "^6.0.1",
-        "express-ejs-layouts": "^2.5.1",
         "helmet": "^8.0.0",
         "ioredis": "^5.5.0",
         "nestjs-pino": "^4.1.0",
@@ -6473,11 +6472,6 @@
         "url": "https://opencollective.com/express"
       }
     },
-    "node_modules/express-ejs-layouts": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/express-ejs-layouts/-/express-ejs-layouts-2.5.1.tgz",
-      "integrity": "sha512-IXROv9n3xKga7FowT06n1Qn927JR8ZWDn5Dc9CJQoiiaaDqbhW5PDmWShzbpAa2wjWT1vJqaIM1S6vJwwX11gA=="
-    },
     "node_modules/express/node_modules/cookie-signature": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.2.tgz",
diff --git a/package.json b/package.json
index 0f890d4..e5f98ce 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,6 @@
     "class-validator": "^0.14.1",
     "cookie-parser": "^1.4.7",
     "ejs": "^6.0.1",
-    "express-ejs-layouts": "^2.5.1",
     "helmet": "^8.0.0",
     "ioredis": "^5.5.0",
     "nestjs-pino": "^4.1.0",
diff --git a/src/main.ts b/src/main.ts
index 5822c44..c14edb4 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -4,7 +4,6 @@ import { Logger } from 'nestjs-pino';
 import { NestExpressApplication } from '@nestjs/platform-express';
 import * as helmet from 'helmet';
 import cookieParser from 'cookie-parser';
-import expressLayouts from 'express-ejs-layouts';
 import { join } from 'node:path';
 import { existsSync } from 'node:fs';
 import { AppModule } from './app.module';
@@ -42,8 +41,6 @@ async function bootstrap(): Promise<void> {
   if (existsSync(viewsPath)) {
     app.setBaseViewsDir(viewsPath);
     app.setViewEngine('ejs');
-    app.use(expressLayouts);
-    app.set('layout', 'layouts/main');
   }
 
   const publicPath = join(process.cwd(), 'public');
diff --git a/views/admin/clients.ejs b/views/admin/clients.ejs
index 3b31b2a..1a68c50 100644
--- a/views/admin/clients.ejs
+++ b/views/admin/clients.ejs
@@ -1,3 +1,4 @@
+<%- include('../partials/header') %>
 <div class="row">
   <div class="col-12">
     <ul class="nav nav-tabs mb-3">
@@ -117,3 +118,4 @@
     else alert('Failed to delete client');
   }
 </script>
+<%- include('../partials/footer') %>
diff --git a/views/admin/users.ejs b/views/admin/users.ejs
index 8504090..7e6b191 100644
--- a/views/admin/users.ejs
+++ b/views/admin/users.ejs
@@ -1,3 +1,4 @@
+<%- include('../partials/header') %>
 <div class="row">
   <div class="col-12">
     <div class="row mb-4">
@@ -137,3 +138,4 @@
     else alert('Failed to delete user');
   }
 </script>
+<%- include('../partials/footer') %>
diff --git a/views/auth/login.ejs b/views/auth/login.ejs
index 9048690..4817773 100644
--- a/views/auth/login.ejs
+++ b/views/auth/login.ejs
@@ -1,3 +1,4 @@
+<%- include('../partials/header') %>
 <div class="row justify-content-center">
   <div class="col-md-5">
     <div class="card shadow">
@@ -164,3 +165,4 @@
     el.classList.remove('d-none');
   }
 </script>
+<%- include('../partials/footer') %>
diff --git a/views/auth/register.ejs b/views/auth/register.ejs
index 2a70078..11198c1 100644
--- a/views/auth/register.ejs
+++ b/views/auth/register.ejs
@@ -1,3 +1,4 @@
+<%- include('../partials/header') %>
 <div class="row justify-content-center">
   <div class="col-md-5">
     <div class="card shadow">
@@ -56,3 +57,4 @@
     }
   });
 </script>
+<%- include('../partials/footer') %>
diff --git a/views/partials/footer.ejs b/views/partials/footer.ejs
new file mode 100644
index 0000000..b34bf5a
--- /dev/null
+++ b/views/partials/footer.ejs
@@ -0,0 +1,11 @@
+  </div>
+  <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js"></script>
+  <script>
+    function logout() {
+      localStorage.removeItem('access_token');
+      localStorage.removeItem('refresh_token');
+      window.location.href = '/login';
+    }
+  </script>
+</body>
+</html>
diff --git a/views/partials/header.ejs b/views/partials/header.ejs
new file mode 100644
index 0000000..523b66d
--- /dev/null
+++ b/views/partials/header.ejs
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html lang="ru">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>SSO - <%= title || 'Auth Panel' %></title>
+  <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet">
+  <link rel="stylesheet" href="/css/style.css">
+</head>
+<body class="bg-light">
+  <nav class="navbar navbar-expand-lg navbar-dark bg-dark mb-4">
+    <div class="container">
+      <a class="navbar-brand" href="/">SSO Service</a>
+      <div class="collapse navbar-collapse">
+        <ul class="navbar-nav ms-auto">
+          <% if (locals.user) { %>
+            <li class="nav-item"><a class="nav-link" href="/profile">Profile</a></li>
+            <% if (user.role === 'ADMIN') { %>
+              <li class="nav-item"><a class="nav-link" href="/admin">Admin</a></li>
+            <% } %>
+            <li class="nav-item"><a class="nav-link" href="#" onclick="logout()">Logout</a></li>
+          <% } else { %>
+            <li class="nav-item"><a class="nav-link" href="/login">Login</a></li>
+            <li class="nav-item"><a class="nav-link" href="/register">Register</a></li>
+          <% } %>
+        </ul>
+      </div>
+    </div>
+  </nav>
+  <div class="container">
diff --git a/views/profile/index.ejs b/views/profile/index.ejs
index cc8eb68..b664e53 100644
--- a/views/profile/index.ejs
+++ b/views/profile/index.ejs
@@ -1,3 +1,4 @@
+<%- include('../partials/header') %>
 <div class="row justify-content-center">
   <div class="col-md-6">
     <div class="card shadow">
@@ -68,3 +69,4 @@
     }
   }
 </script>
+<%- include('../partials/footer') %>