@reldens/cms 0.15.0 → 0.16.0

package/README.md

@@ -18,8 +18,9 @@ A powerful, flexible Content Management System built with Node.js, featuring an
 - **Entity-based URLs** (e.g., `/articles/123`)
 - **Template fallback system** (domain → default → base)
 - **Layout system** with body content layouts and page wrappers
-- **Reusable content blocks** with `{{ entity() }}` template functions
-- **Collection rendering** with filtering and loop support
+- **Reusable content blocks** with `<entity>` template functions
+- **Collection rendering** with filtering, sorting, pagination, and loop support
+- **Custom partial tags** with HTML-style syntax for complex partials
 - **Entity access control** for public/private content
 - **Static asset serving** with Express integration as default
 - **Template engine** with Mustache integration as default
@@ -41,7 +42,7 @@ A powerful, flexible Content Management System built with Node.js, featuring an
 - **Custom entity configuration** with validation rules
 - **Translation support** for entity labels and properties
 - **Content blocks management** via cms_blocks table
-- **Entity access control** via cms_entity_access table
+- **Entity access control** via entities_access table
 
 ### - Configuration & Architecture
 - **Environment-based configuration** (.env file)
@@ -66,7 +67,7 @@ const cms = new Manager({
     projectRoot: process.cwd(),
     entityAccess: {
         cmsPages: { public: true, operations: ['read'] },
-        products: { public: true, operations: ['read'] },
+        articles: { public: true, operations: ['read'] },
         users: { public: false }
     }
 });
@@ -128,43 +129,157 @@ const cms = new Manager({
 ## Enhanced Templating System
 
 ### Template Functions
-Templates support dynamic content blocks, entity rendering, and collections:
+Templates support dynamic content blocks, entity rendering, and collections with advanced query options:
 
 **Single Entity Rendering:**
 ```html
 <!-- Render by any identifier field (like 'name' for content blocks) -->
-{{ entity('cmsBlocks', 'header-main', 'name') }}
-{{ entity('cmsBlocks', 'sidebar-left', 'name') }}
+<entity name="cmsBlocks" field="name" value="header-main"/>
+<entity name="cmsBlocks" field="name" value="sidebar-left"/>
 
 <!-- Render by ID (default identifier) -->
-{{ entity('products', '123') }}
-{{ entity('cmsPages', '1') }}
+<entity name="articles" id="123"/>
+<entity name="cmsPages" id="1"/>
 ```
 
 **Single Field Collections:**
 ```html
 <!-- Extract and concatenate a single field from multiple records -->
-{{ collection('cmsBlocks', {"status": "active", "category": "navigation"}, 'content') }}
-{{ collection('products', {"featured": true}, 'title') }}
+<collection name="cmsBlocks" filters="{status: 'active', category: 'navigation'}" field="content"/>
+<collection name="articles" filters="{featured: true}" field="title"/>
+
+<!-- With query options for sorting and limiting -->
+<collection name="articles" filters="{featured: true}" field="title" data="{limit: 5, sortBy: 'created_at', sortDirection: 'desc'}"/>
+<collection name="cmsBlocks" filters="{status: 'active'}" field="content" data="{limit: 3, offset: 10, sortBy: 'priority'}"/>
 ```
 
 **Loop Collections:**
 ```html
 <!-- Loop through records with full template rendering -->
-{{ #collection('cmsBlocks', {"status": "active"}) }}
+<collection name="cmsBlocks" filters="{status: 'active'}">
   <div class="block">
     <h3>{{row.title}}</h3>
     <div class="content">{{row.content}}</div>
   </div>
-{{ /collection('cmsBlocks') }}
+</collection>
+
+<collection name="articles" filters="{category: 'technology'}">
+  <div class="article">
+    <h4>{{row.title}}</h4>
+    <p>{{row.summary}}</p>
+    <img src="{{row.featured_image}}" alt="{{row.title}}">
+  </div>
+</collection>
 
-{{ #collection('products', {"category": "electronics"}) }}
-  <div class="product">
-    <h4>{{row.name}}</h4>
-    <p>Price: ${{row.price}}</p>
-    <img src="{{row.image}}" alt="{{row.name}}">
+<!-- With pagination and sorting -->
+<collection name="articles" filters="{featured: true}" data="{limit: 10, offset: 0, sortBy: 'created_at', sortDirection: 'asc'}">
+  <div class="article-card">
+    <h4>{{row.title}}</h4>
+    <p>{{row.summary}}</p>
   </div>
-{{ /collection('products') }}
+</collection>
+```
+
+**Custom Partials with Variables:**
+
+*New HTML-style partial tags:*
+```html
+<!-- Clean HTML-style syntax for complex partials -->
+<partial name="hero" 
+    sectionStyle=" bg-black"
+    bigTextHtml="A free open-source platform to create multiplayer games!"
+    mediumTextHtml="Build with Node.js, MySQL, Colyseus, and Phaser 3"
+    htmlContentWrapper='<div class="d-lg-flex"><a href="/documentation" target="_blank" class="btn-get-started">Get Started!</a><a href="https://demo.reldens.com/" target="_blank" class="btn-watch-video"> Demo </a></div>'
+    imageUrl="/assets/web/reldens-check.png"
+    imageAlt="Reldens - MMORPG Platform" />
+
+<!-- Self-closing and open/close syntax both supported -->
+<partial name="productCard" 
+    title="Premium Package"
+    price="$99"
+    highlighted="true">
+</partial>
+```
+
+*Traditional Mustache syntax is still supported:*
+```html
+<!-- Call a partial with an inline JSON object -->
+{{>hero -{
+    bigTextHtml: "A free open-source platform to create multiplayer games!",
+    mediumTextHtml: "Build with Node.js, MySQL, Colyseus, and Phaser 3",
+    imageUrl: "https://example.com/hero.jpg",
+    ctaText: "Get Started",
+    ctaLink: "/documentation"
+}-}}
+
+<!-- Call a partial within collections using row data -->
+<collection name="cmsPages" filters="{featured: true}" data="{limit: 3}">
+    {{>cardView -{row}-}}
+</collection>
+
+<!-- Call a partial with mixed data -->
+{{>productCard -{
+    title: "Premium Package",
+    price: "$99",
+    features: ["Advanced Analytics", "Priority Support", "Custom Themes"],
+    highlighted: true
+}-}}
+```
+
+**Example Partial Templates:**
+
+**partials/hero.mustache:**
+```html
+<section class="hero{{#sectionStyle}}{{sectionStyle}}{{/sectionStyle}}">
+    <div class="hero-content">
+        <h1>{{&bigTextHtml}}</h1>
+        <p>{{&mediumTextHtml}}</p>
+        {{#htmlContentWrapper}}
+        {{&htmlContentWrapper}}
+        {{/htmlContentWrapper}}
+        {{#imageUrl}}
+        <img src="{{imageUrl}}" alt="{{imageAlt}}" class="hero-image">
+        {{/imageUrl}}
+    </div>
+</section>
+```
+
+**partials/cardView.mustache:**
+```html
+<div class="card">
+    <h3>{{title}}</h3>
+    <p>{{json_data.excerpt}}</p>
+    {{#json_data.featured_image}}
+    <img src="{{json_data.featured_image}}" alt="{{title}}">
+    {{/json_data.featured_image}}
+    {{#json_data.cta_text}}
+    <a href="{{json_data.cta_link}}" class="btn">{{json_data.cta_text}}</a>
+    {{/json_data.cta_text}}
+</div>
+```
+
+### Collection Query Options
+Collections support advanced query parameters for pagination and sorting:
+
+- **limit** - Maximum number of records to return
+- **offset** - Number of records to skip (for pagination)
+- **sortBy** - Field name to sort by
+- **sortDirection** - Sort direction ('asc' or 'desc')
+
+**Examples:**
+```html
+<!-- Get the first 5 articles sorted by title -->
+<collection name="articles" filters="{}" field="title" data="{limit: 5, sortBy: 'title'}"/>
+
+<!-- Paginated results: skip first 20, get next 10 -->
+<collection name="articles" filters="{published: true}" data="{limit: 10, offset: 20, sortBy: 'created_at', sortDirection: 'desc'}">
+  <article>{{row.title}}</article>
+</collection>
+
+<!-- The latest 3 featured articles by creation date -->
+<collection name="articles" filters="{featured: true}" data="{limit: 3, sortBy: 'created_at', sortDirection: 'desc'}">
+  <div class="featured-article">{{row.title}}</div>
+</collection>
 ```
 
 ### Layout System
@@ -180,7 +295,7 @@ The CMS uses a two-tier layout system:
     <link href="/css/styles.css" rel="stylesheet"/>
 </head>
 <body class="{{siteHandle}}">
-    {{{content}}}
+    {{&content}}
     <script src="/js/scripts.js"></script>
 </body>
 </html>
@@ -188,22 +303,22 @@ The CMS uses a two-tier layout system:
 
 **layouts/default.html** - Body content only:
 ```html
-{{ entity('cmsBlocks', 'header-main', 'name') }}
+<entity name="cmsBlocks" field="name" value="header-main"/>
 
 <main id="main" class="main-container">
     <div class="container">
         <div class="row">
             <div class="col-md-3">
-                {{ entity('cmsBlocks', 'sidebar-left', 'name') }}
+                <entity name="cmsBlocks" field="name" value="sidebar-left"/>
             </div>
             <div class="col-md-9">
-                {{{content}}}
+                {{&content}}
             </div>
         </div>
     </div>
 </main>
 
-{{ entity('cmsBlocks', 'footer-main', 'name') }}
+<entity name="cmsBlocks" field="name" value="footer-main"/>
 ```
 
 Pages can use different layouts by setting the `layout` field in `cms_pages`:
@@ -212,12 +327,12 @@ Pages can use different layouts by setting the `layout` field in `cms_pages`:
 - `minimal` - Basic layout with minimal styling
 
 ### Content Blocks
-Create reusable content blocks in the `cms_blocks` table via admin panel:
+Create reusable content blocks in the `cms_blocks` table via the admin panel:
 ```sql
 INSERT INTO cms_blocks (name, title, content) VALUES 
 ('contact-info', 'Contact Information', '<p>Email: info@example.com</p>'),
-('product-sidebar', 'Product Categories', 
-'<div class="categories"><h3>Categories</h3><ul><li><a href="/products/electronics">Electronics</a></li></ul></div>');
+('article-sidebar', 'Article Categories', 
+'<div class="categories"><h3>Categories</h3><ul><li><a href="/articles/technology">Technology</a></li></ul></div>');
 ```
 
 ### Entity Access Control
@@ -225,7 +340,7 @@ Control which entities are publicly accessible:
 ```javascript
 const cms = new Manager({
     entityAccess: {
-        products: { public: true, operations: ['read'] },
+        articles: { public: true, operations: ['read'] },
         cmsPages: { public: true, operations: ['read'] },
         users: { public: false }
     }
@@ -310,7 +425,7 @@ cms.events.on('adminEntityExtraData', ({entitySerializedData, entity}) => {
 - `routes` - URL routing and SEO metadata
 - `cms_pages` - Page content with layout assignments
 - `cms_blocks` - Reusable content blocks
-- `cms_entity_access` - Entity access control rules
+- `entities_access` - Entity access control rules
 - `entities_meta` - Generic metadata storage
 - `cms_pages_meta` - Page-specific metadata
 
@@ -331,18 +446,19 @@ The installer provides checkboxes for:
 - `initializeServices()` - Initialize all services
 
 ### Frontend Class
-- `initialize()` - Setup frontend routes and templates
+- `initialize()` - Set up frontend routes and templates
 - `handleRequest(req, res)` - Main request handler
 - `findRouteByPath(path)` - Database route lookup
 - `findEntityByPath(path)` - Entity-based URL handling
 
 ### TemplateEngine Class
 - `render(template, data, partials)` - Main template rendering with enhanced functions
-- `processEntityFunctions(template)` - Process {{ entity() }} functions
-- `processSingleFieldCollections(template)` - Process single field collections
-- `processLoopCollections(template)` - Process loop collections
+- `processEntityFunctions(template)` - Process `<entity>` functions
+- `processSingleFieldCollections(template)` - Process single field collections with query options
+- `processLoopCollections(template)` - Process loop collections with query options
+- `processCustomPartials(template)` - Process `<partial>` tags with attribute parsing
 - `fetchEntityForTemplate(tableName, identifier, identifierField)` - Load single entity
-- `fetchCollectionForTemplate(tableName, filtersJson)` - Load entity collections
+- `fetchCollectionForTemplate(tableName, filtersJson, queryOptionsJson)` - Load entity collections with pagination and sorting
 
 ### AdminManager Class
 - `setupAdmin()` - Initialize admin panel

package/admin/reldens-admin-client.css

@@ -1,8 +1,7 @@
 /*
- * Reldens - CMS
+ * Reldens - CMS - Administration Panel
  */
 
-
 :root {
     --normalFont: Verdana, Geneva, sans-serif;
     --reldensFont: "Play", sans-serif;
@@ -163,7 +162,7 @@
         padding: 1rem;
         overflow: auto;
         cursor: pointer;
-        background-color: #fff;
+        background-color: var(--white);
         border-radius: 8px;
 
         & canvas {
@@ -241,7 +240,7 @@
             text-decoration: none;
             cursor: pointer;
             font-size: 14px;
-            font-weight: 400;
+            font-weight: var(--font-semi-bold);
             border-bottom: 1px solid var(--darkBlue);
 
             &:hover {
@@ -314,6 +313,9 @@
     }
 
     & textarea {
+        width: 98%;
+        margin: 0;
+        padding: 1%;
         resize: vertical;
         min-height: 300px;
     }
@@ -401,30 +403,30 @@
                 padding: 0 1rem;
                 color: var(--black);
             }
+        }
 
-            &-edit, &-delete {
-                & span {
-                    display: block;
-                    text-align: center;
-                    cursor: pointer;
-                }
+        & .field-edit, & .field-delete {
+            & span {
+                display: block;
+                text-align: center;
+                cursor: pointer;
             }
+        }
 
-            &-edit {
-                & span {
-                    & svg, path {
-                        width: 24px;
-                        color: var(--lightBlue);
-                    }
+        & .field-edit {
+            & span {
+                & svg, path {
+                    width: 24px;
+                    color: var(--lightBlue);
                 }
             }
+        }
 
-            &-delete {
-                & span {
-                    & svg, path {
-                        width: 24px;
-                        fill: var(--lightBlue);
-                    }
+        & .field-delete {
+            & span {
+                & svg, path {
+                    width: 24px;
+                    fill: var(--lightBlue);
                 }
             }
         }
@@ -438,6 +440,7 @@
         display: flex;
         flex-wrap: wrap;
         justify-content: flex-start;
+        margin-top: 1rem;
 
         &.hidden {
             display: none;
@@ -532,6 +535,8 @@
                 color: var(--darkGrey);
 
                 &.filters-toggle {
+                    margin-bottom: 0;
+
                     & img {
                         max-width: 30px;
                         margin-right: 1rem;
@@ -784,7 +789,7 @@
                         &:not([disabled]) {
                             margin: 0;
                             border: 1px solid #7f8c8d;
-                            background: #fff;
+                            background: var(--white);
 
                             &[type="checkbox"] {
                                 max-width: max-content;

package/admin/reldens-admin-client.js

@@ -59,6 +59,12 @@ window.addEventListener('DOMContentLoaded', () => {
         errorId: 'Missing entity ID on POST.'
     };
 
+    // copyright year:
+    let copyRightYear = document.querySelector('.copyright-year');
+    if(copyRightYear){
+        copyRightYear.innerHTML = String((new Date()).getFullYear());
+    }
+
     // activate expand/collapse elements
     let expandCollapseButtons = document.querySelectorAll('[data-expand-collapse]');
     if(expandCollapseButtons){
@@ -170,6 +176,7 @@ window.addEventListener('DOMContentLoaded', () => {
     let filtersToggleContent = document.querySelector('.filters-toggle-content');
     if(filtersToggle && filtersToggleContent){
         filtersToggle.addEventListener('click', () => {
+            filtersToggle.classList.toggle('active');
             filtersToggleContent.classList.toggle('hidden');
         });
         let allFilters = document.querySelectorAll('.filters-toggle-content .filter input');

package/admin/templates/edit.html

@@ -14,8 +14,10 @@
             <span class="field-value">{{&value}}</span>
         </div>
         {{/editFields}}
+        {{&extraFormContent}}
         <div class="actions">
-            <input class="button button-primary button-submit" type="submit" value="Save"/>
+            <button class="button button-primary button-submit" type="submit" name="saveAction" value="save">Save</button>
+            <button class="button button-primary button-submit" type="submit" name="saveAction" value="saveAndContinue">Save and continue...</button>
             <a class="button button-secondary button-back" href="{{&entityViewRoute}}">Cancel</a>
         </div>
     </form>

package/admin/templates/fields/view/textarea.html

@@ -0,0 +1 @@
+<textarea name="{{&fieldName}}" id="{{&fieldName}}" disabled="disabled">{{&fieldValue}}</textarea>

package/admin/templates/sections/editForm/cms-pages.html

@@ -0,0 +1,15 @@
+<fieldset class="cms-page-route">
+    <legend>Route data</legend>
+    <div class="edit-field">
+        <span class="field-name">Path</span>
+        <span class="field-value">
+            <input type="text" name="routePath" value="{{routePath}}"/>
+        </span>
+    </div>
+    <div class="edit-field">
+        <span class="field-name">Domain</span>
+        <span class="field-value">
+            <input type="text" name="routeDomain" value="{{routeDomain}}"/>
+        </span>
+    </div>
+</fieldset>

package/admin/templates/sections/viewForm/cms-pages.html

@@ -0,0 +1,15 @@
+<fieldset class="cms-page-route">
+    <legend>Route data</legend>
+    <div class="edit-field">
+        <span class="field-name">Path</span>
+        <span class="field-value">
+            <input type="text" name="route-path" value="{{routePath}}" disabled="disabled"/>
+        </span>
+    </div>
+    <div class="edit-field">
+        <span class="field-name">Domain</span>
+        <span class="field-value">
+            <input type="text" name="route-domain" value="{{routeDomain}}" disabled="disabled"/>
+        </span>
+    </div>
+</fieldset>

package/admin/templates/view.html

@@ -6,6 +6,7 @@
         <span class="field-value">{{&value}}</span>
     </div>
     {{/fields}}
+    {{&extraFormContent}}
     <div class="actions">
         <a class="button button-primary" href="{{&entityNewRoute}}">Create New</a>
         <a class="button button-primary" href="{{&entityEditRoute}}">Edit</a>

package/bin/reldens-cms-generate-entities.js

@@ -8,6 +8,7 @@
 
 const { Manager } = require('../index');
 const { Logger } = require('@reldens/utils');
+const { FileHandler } = require('@reldens/server-utils');
 const readline = require('readline');
 
 class CmsEntitiesGenerator
@@ -18,6 +19,17 @@ class CmsEntitiesGenerator
         this.args = process.argv.slice(2);
         this.projectRoot = process.cwd();
         this.isOverride = this.args.includes('--override');
+        this.prismaClientPath = this.extractArgument('--prisma-client');
+        this.driver = this.extractArgument('--driver') || process.env.RELDENS_STORAGE_DRIVER || 'prisma';
+    }
+
+    extractArgument(argumentName)
+    {
+        let argIndex = this.args.indexOf(argumentName);
+        if(-1 === argIndex || argIndex + 1 >= this.args.length){
+            return null;
+        }
+        return this.args[argIndex + 1];
     }
 
     async run()
@@ -29,14 +41,21 @@ class CmsEntitiesGenerator
                 return false;
             }
         }
-        let manager = new Manager({projectRoot: this.projectRoot});
+        let managerConfig = {projectRoot: this.projectRoot};
+        if('prisma' === this.driver){
+            let prismaClient = await this.loadPrismaClient();
+            if(prismaClient){
+                managerConfig.prismaClient = prismaClient;
+            }
+        }
+        let manager = new Manager(managerConfig);
         if(!manager.isInstalled()){
             Logger.error('CMS is not installed. Please run installation first.');
             return false;
         }
         Logger.debug('Reldens CMS Manager instance created for entities generation.');
         await manager.initializeDataServer();
-        let success = await manager.installer.generateEntities(manager.dataServer, this.isOverride);
+        let success = await manager.installer.generateEntities(manager.dataServer, this.isOverride, false);
         if(!success){
             Logger.error('Entities generation failed.');
             return false;
@@ -45,6 +64,32 @@ class CmsEntitiesGenerator
         return true;
     }
 
+    async loadPrismaClient()
+    {
+        let clientPath = this.prismaClientPath;
+        if(!clientPath){
+            clientPath = FileHandler.joinPaths(process.cwd(), 'generated-entities', 'prisma');
+        }
+        if(!FileHandler.exists(clientPath)){
+            Logger.error('Prisma client not found at: '+clientPath);
+            Logger.error('Please ensure the client exists or specify a custom path with --prisma-client');
+            return false;
+        }
+        try {
+            let PrismaClientModule = require(clientPath);
+            let PrismaClient = PrismaClientModule.PrismaClient || PrismaClientModule.default?.PrismaClient;
+            if(!PrismaClient){
+                Logger.error('PrismaClient not found in module: '+clientPath);
+                return false;
+            }
+            Logger.debug('Prisma client loaded from: '+clientPath);
+            return new PrismaClient();
+        } catch (error) {
+            Logger.error('Failed to load Prisma client from '+clientPath+': '+error.message);
+            return false;
+        }
+    }
+
     async confirmOverride()
     {
         let rl = readline.createInterface({
@@ -59,7 +104,6 @@ class CmsEntitiesGenerator
             });
         });
     }
-
 }
 
 let generator = new CmsEntitiesGenerator();

package/bin/reldens-cms.js

@@ -8,14 +8,37 @@
 
 const { Manager } = require('../index');
 const { Logger } = require('@reldens/utils');
+const { FileHandler } = require('@reldens/server-utils');
 
 let args = process.argv.slice(2);
 let projectRoot = args[0] || process.cwd();
+let indexPath = FileHandler.joinPaths(projectRoot, 'index.js');
 
-let manager = new Manager({projectRoot});
+if(FileHandler.exists(indexPath)){
+    require(indexPath);
+    return;
+}
+
+let managerConfig = {projectRoot};
+let entitiesPath = FileHandler.joinPaths(
+    projectRoot, 
+    'generated-entities', 
+    'models', 
+    'prisma', 
+    'registered-models-prisma.js'
+);
+
+if(FileHandler.exists(entitiesPath)){
+    let entitiesModule = require(entitiesPath);
+    managerConfig.rawRegisteredEntities = entitiesModule.rawRegisteredEntities;
+    managerConfig.entitiesConfig = entitiesModule.entitiesConfig;
+    managerConfig.entitiesTranslations = entitiesModule.entitiesTranslations;
+}
+
+let manager = new Manager(managerConfig);
 Logger.debug('Reldens CMS Manager instance created.', {configuration: manager.config});
 
-let started =  manager.start().then((result) => {
+manager.start().then((result) => {
     if(!result){
         Logger.info('Reldens CMS started by command failed.');
         return false;
@@ -25,9 +48,4 @@ let started =  manager.start().then((result) => {
 }).catch((error) => {
     Logger.critical('Failed to start CMS:', error);
     process.exit();
-});
-
-if(!started){
-    Logger.error('Reldens CMS start process failed.');
-    process.exit();
-}
+});

package/install/js/installer.js

@@ -29,4 +29,9 @@ document.addEventListener('DOMContentLoaded', function() {
             installButton.disabled = true;
         }
     });
+
+    let copyRightYear = document.querySelector('.copyright-year');
+    if(copyRightYear){
+        copyRightYear.innerHTML = String((new Date()).getFullYear());
+    }
 });

package/install/success.html

@@ -29,7 +29,7 @@
         </div>
         <div class="footer">
             <div class="copyright">
-                &copy;{{currentYear}} Reldens CMS
+                &copy;<span class="copyright-year">2025</span> Reldens CMS
             </div>
         </div>
     </div>