@igea/oac_frontend 1.0.17 → 1.0.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@igea/oac_frontend",
-  "version": "1.0.17",
+  "version": "1.0.19",
   "description": "Frontend service for the OAC project",
   "main": "src/index.js",
   "scripts": {

package/src/controllers/captcha.js

@@ -0,0 +1,33 @@
+const express = require('express');
+const router = express.Router();
+const path = require('path');
+const fs = require('fs');
+
+// folder where your images are stored
+const IMAGES_DIR = path.join(__dirname, '..', 'public', 'images', 'captcha');
+
+router.get('/random-image', (req, res) => {
+  fs.readdir(IMAGES_DIR, (err, files) => {
+    if (err) {
+      console.error(err);
+      return res.status(500).send('Error reading images directory');
+    }
+
+    // filter only images (jpg, png, gif, etc.)
+    const imageFiles = files.filter(f =>
+      /\.(jpg|jpeg|png|gif|webp)$/i.test(f)
+    );
+
+    if (imageFiles.length === 0) {
+      return res.status(404).send('No images found');
+    }
+
+    // pick a random file
+    const randomFile = imageFiles[Math.floor(Math.random() * imageFiles.length)];
+
+    // send the image file
+    res.sendFile(path.join(IMAGES_DIR, randomFile));
+  });
+});
+
+module.exports = router;

package/src/index.js

@@ -12,7 +12,8 @@ const jwtLib = jwtLibFactory({
     secret: process.env.JWT_SECRET || config.jwt_secret,
     excludePaths: [
         `/${serviceName}/`,
-        `/${serviceName}/health`
+        `/${serviceName}/health`,
+        `/${serviceName}/captcha/random-image`
     ],
     signOptions: { expiresIn: '15m' },
     redirectTo: `/${serviceName}/`
@@ -74,6 +75,11 @@ getPort.default({
 
     const usersRouter = require('./controllers/users.js')(serviceName);
     app.use(`/${serviceName}/users`, usersRouter);
+
+    const captchaRouter = require('./controllers/captcha.js');
+    app.use(`/${serviceName}/captcha`, captchaRouter);
+    // ---------------------------------------------------------------------
+    // Application routes
     // ---------------------------------------------------------------------
     app.get(`/${serviceName}`, (req, res) => {
         res.render('login', { root: serviceName, title: 'Login' });

package/src/locales/en.json

@@ -45,5 +45,14 @@
             "editor": "Editor",
             "reader": "Reader"
         }
+    },
+    "search": {
+        "fast": {
+            "title": "Fast search"
+        },
+        "advanced": {
+            "title": "Advanced search"
+        }
+
     }
 }

package/src/locales/it.json

@@ -45,5 +45,14 @@
             "editor": "Editore",
             "reader": "Lettore"
         }   
+    },
+    "search": {
+        "fast": {
+            "title": "Ricerca veloce"
+        },
+        "advanced": {
+            "title": "Ricerca avanzata"
+        }
+
     }
 }

package/src/models/DataModel

@@ -6,12 +6,14 @@ class DataModel {
         this.options = options;
     }
 
-    toJson(){   
-        return { 
+    toJson(){  
+        let json = { 
             user: this.user, 
             cur_id: this.user.id || 0,
             ...this.options 
         };
+        console.log(json)
+        return json
     }
 
 }

package/src/public/js/app/vue-users-edit.js

@@ -10,6 +10,8 @@ document.addEventListener('DOMContentLoaded', () => {
         data() {
             return {
                 root: el.dataset.root,
+                cur_id: parseInt(el.dataset.cur_id),
+                cur_role: parseInt(el.dataset.cur_role),
                 labels: {
                     role_sudo: el.dataset.role_sudo,
                     role_admin: el.dataset.role_admin,
@@ -79,9 +81,10 @@ document.addEventListener('DOMContentLoaded', () => {
                     username: this.user.username,
                     email: this.user.email,
                     mobile: this.user.mobile,
-                    password: this.user.password,
                     role: this.user.role
                 };
+                if(this.user.password.length > 0)
+                    payload["password"] = this.user.password;
                 let request;
                 if(this.user.id == 0) {
                     delete payload["id"];

package/src/public/js/app/vue-users-manage.js

@@ -11,6 +11,7 @@ document.addEventListener('DOMContentLoaded', () => {
             return {
                 root: el.dataset.root,
                 cur_id: parseInt(el.dataset.cur_id) || 0,
+                cur_role: parseInt(el.dataset.cur_role),
                 labels: {
                     role_sudo: el.dataset.role_sudo,
                     role_admin: el.dataset.role_admin,
@@ -29,7 +30,7 @@ document.addEventListener('DOMContentLoaded', () => {
                 axios.get("/backend/users/").then(response => {
                     var data = response.data;
                     if(data.success) {
-                        this.users = data.data;
+                        this.users = data.data.filter(u => u.role != 0 || this.cur_role == 0);
                     } else {
                         console.error("Failed to fetch users:", data.message);
                     }

package/src/views/sidebar.twig

@@ -1,24 +1,36 @@
 {% block sidebar %}
-    
-    {% if user.id > 0 %}
-
-        <!-- abilitare solo per utenti ADMIN -->
-        {% if cur_role != "admin" %}
-            <div class="menu-item">    
-                <a href="/{{ root }}/users/manage">
-                    <i class="fa-solid fa-users-between-lines"></i>
-                    <span>{{ t('users.manage.title') }}</span>
-                </a>
-            </div>
-        {% endif %}
 
-        <div class="menu-item">
-            <a href="/{{ root }}/users/{{ cur_id }}">
-                <i class="fa-solid fa-id-badge"></i>
-                {{ t('users.profile.title') }}
+    <!-- abilitare solo per utenti ADMIN -->
+    {% if user.role == 0 or user.role == 1 %}
+        <div class="menu-item">    
+            <a href="/{{ root }}/users/manage">
+                <i class="fa-solid fa-users-between-lines"></i>
+                <span>{{ t('users.manage.title') }}</span>
             </a>
         </div>
+    {% endif %}
 
+    {% if user.id > 0 %}
+    <div class="menu-item">
+        <a href="/{{ root }}/users/{{ cur_id }}">
+            <i class="fa-solid fa-id-badge"></i>
+            {{ t('users.profile.title') }}
+        </a>
+    </div>
     {% endif %}
 
+    <div class="menu-item">
+        <a href="/{{ root }}/search/fast">
+            <i class="fa-solid fa-magnifying-glass"></i>
+            {{ t('search.fast.title') }}
+        </a>
+    </div>
+
+    <div class="menu-item">
+        <a href="/{{ root }}/search/advanced">
+            <i class="fa-solid fa-magnifying-glass-dollar"></i>
+            {{ t('search.advanced.title') }}
+        </a>
+    </div>
+
 {% endblock %}

package/src/views/users/edit.twig

@@ -15,6 +15,8 @@
         data-role_reader="{{ t('users.role.reader') }}"
         data-user_id = "{{ id }}"
         data-save_ok="{{ t('users.edit.save_ok') }}"
+        data-cur_id="{{ cur_id }}"
+        data-cur_role="{{ user.role }}"
     >
         <h2 style="display:flex; justify-content:space-between; align-items:center;">
             {% if id == 0 %}
@@ -90,7 +92,7 @@
                 <!-- Role -->
                 <div class="col-md-6">
                     <label for="role" class="form-label">{{ t('users.manage.role') }}:</label>
-                    <select v-model.number="user.role" id="role" class="form-select">
+                    <select v-model.number="user.role" id="role" class="form-select" :disabled="cur_id==user.id">
                         <option :value="0">{{ t('users.role.sudo') }}</option>
                         <option :value="1">{{ t('users.role.admin') }}</option>
                         <option :value="2">{{ t('users.role.editor') }}</option>

package/src/views/users/manage.twig

@@ -16,6 +16,7 @@
         data-role_reader="{{ t('users.role.reader') }}" 
         data-confirm_delete="{{ t('users.manage.confirm_delete') }}"
         data-cur_id="{{ cur_id }}"
+        data-cur_role="{{ user.role }}"
     >
         <h2 style="display:flex; justify-content:space-between; align-items:center;">
             <span>{{ t('users.manage.title') }}</span>