@igea/oac_frontend 1.0.88 → 1.0.90

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@igea/oac_frontend",
-  "version": "1.0.88",
+  "version": "1.0.90",
   "description": "Frontend service for the OAC project",
   "main": "src/index.js",
   "bin": {
@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/chpigea/oac_frontend#readme",
   "dependencies": {
-    "@igea/oac_jwt_helpers": "1.0.10",
+    "@igea/oac_jwt_helpers": "1.0.13",
     "axios": "1.10.0",
     "cookie-parser": "1.4.7",
     "express": "5.1.0",

package/src/controllers/search_v2.js

@@ -0,0 +1,35 @@
+const express = require('express');
+const router = express.Router();
+const DataModel = require('../models/DataModel');
+
+module.exports = function(serviceName) {
+
+    router.get('/fast/:what', (req, res) => {
+        let data = new DataModel(req, {  
+            root: serviceName, 
+            title: 'Fast Search',
+            activeMenu: 'search',
+            activeSidebar: 'search',
+            activeSidebarItem: 'fast',
+            fastType: req.params.what,
+            currentPath:  req.baseUrl +req.path,
+            schema: 'fast_' + req.params.what
+        });    
+        res.render('v2/search/advanced.twig', data.toJson()); 
+    });
+
+    router.get('/advanced', (req, res) => {
+        let data = new DataModel(req, {  
+            root: serviceName, 
+            title: 'Advanced Search',
+            activeMenu: 'search',
+            activeSidebar: 'search',
+            activeSidebarItem: 'advanced',
+            currentPath:  req.baseUrl +req.path,
+            schema: 'advanced'
+        });    
+        res.render('v2/search/advanced.twig', data.toJson()); 
+    });
+
+    return router
+}

package/src/controllers/users_v2.js

@@ -0,0 +1,71 @@
+const express = require('express');
+const router = express.Router();
+const DataModel = require('../models/DataModel');
+
+module.exports = function(serviceName) {
+    /**
+     * @route   GET /users/manage: redirect to the users page with list of users
+     */
+    router.get('/manage', (req, res) => {
+        let data = new DataModel(req, {  
+            root: serviceName, 
+            title: 'User Management',
+            activeMenu: 'admin',
+            activeSidebar: 'admin',
+            activeSidebarItem: 'users',
+            currentPath:  req.baseUrl +req.path,
+        });    
+        res.render('v2/users/manage.twig', data.toJson()); 
+    });
+
+    /**
+     * @route   GET /users/:id: redirect to the user page with user details
+     */
+    router.get('/:id', (req, res) => {
+        let data = new DataModel(req, {  
+            root: serviceName, 
+            title: 'User Edit',
+            id: req.params.id,
+            activeMenu: 'admin',
+            activeSidebar: 'admin',
+            activeSidebarItem: 'users',
+            currentPath:  req.baseUrl +req.path,
+        });    
+        res.render('v2/users/edit.twig', data.toJson());    
+    });
+
+    /**
+     * @route   POST /users/:id: update or create an user
+     */
+    router.post('/:id', (req, res) => {
+
+    });
+
+    /**
+     * @route   DELETE /users/:id: delete an user
+     */
+    router.delete('/:id', (req, res) => {
+
+    });
+
+    router.get('/reset_password/:id/:token', (req, res) => {
+        let data = new DataModel(req, {  
+            root: serviceName, 
+            title: 'Reset password',
+            activeMenu: 'admin',
+            activeSidebar: 'admin',
+            activeSidebarItem: 'users',
+            user: {
+                id: req.params.id,
+                token: req.params.token
+            }
+        });    
+        res.render('v2/users/reset_password.twig', data.toJson()); 
+    });
+
+    return router
+}
+
+
+
+

package/src/controllers/vocabolaries_v2.js

@@ -0,0 +1,26 @@
+const express = require('express');
+const router = express.Router();
+const DataModel = require('../models/DataModel');
+
+module.exports = function(serviceName) {
+    /**
+     * @route   GET /users/manage: redirect to the users page with list of users
+     */
+    router.get('/manage', (req, res) => {
+        let data = new DataModel(req, {  
+            root: serviceName, 
+            title: 'Vocabolaries Management',
+            activeMenu: 'admin',
+            activeSidebar: 'admin',
+            activeSidebarItem: 'vocabolaries',
+            currentPath:  req.baseUrl +req.path,
+        });    
+        res.render('v2/vocabolaries/edit.twig', data.toJson()); 
+    });
+
+    return router
+}
+
+
+
+

package/src/index.js

@@ -6,7 +6,7 @@ const getPort = require('get-port');
 const cookieParser = require('cookie-parser');
 const path = require("path");
 const i18n = require('i18n');
-const jwtLibFactory = require('@igea/oac_jwt_helpers')
+const jwtLibFactory = require('@igea/oac_jwt_helpers');
 const serviceName = "frontend"
 const DataModel = require('./models/DataModel');
 const jwtLib = jwtLibFactory({
@@ -38,8 +38,11 @@ i18n.configure({
 const app = express();
 let newPort = null
 
+app.set('trust proxy', true);
+
 app.use(i18n.init);
 app.use(`/${serviceName}`, express.static(path.join(__dirname, 'public')));
+
 app.use(cookieParser());
 app.use(express.json());
 app.use(jwtLib.middleware); 
@@ -52,6 +55,15 @@ app.use((req, res, next) => {
   next();
 });
 
+app.use((req, res, next) => {
+  const proto = req.headers['x-forwarded-proto'] || req.protocol;
+  const host  = req.headers['x-forwarded-host']  || req.get('host');
+
+  res.locals.baseUrl = `${proto}://${host}/`;
+  next();
+});
+
+
 const register = async function(){
     try {
         console.log(`Registering ${serviceName}...`);
@@ -76,26 +88,41 @@ getPort.default({
     const healthRouter = require('./controllers/health.js');
     app.use(`/${serviceName}/health`, healthRouter);
 
+
     const usersRouter = require('./controllers/users.js')(serviceName);
     app.use(`/${serviceName}/users`, usersRouter);
+    const usersRouterV2 = require('./controllers/users_v2.js')(serviceName);
+    app.use(`/frontend/v2/users`, usersRouterV2);
+
 
     const vocabolariesRouter = require('./controllers/vocabolaries.js')(serviceName);
     app.use(`/${serviceName}/vocabolaries`, vocabolariesRouter);
+    const vocabolariesRouterV2 = require('./controllers/vocabolaries_v2.js')(serviceName);
+    app.use(`/frontend/v2/vocabolaries`, vocabolariesRouterV2);
+
 
     const searchRouter = require('./controllers/search.js')(serviceName);
     app.use(`/${serviceName}/search`, searchRouter);
+    const searchRouterV2 = require('./controllers/search_v2.js')(serviceName);
+    app.use(`/frontend/v2/search`, searchRouterV2);
+
 
     const introductionRouter = require('./controllers/introduction.js')(serviceName);
     app.use(`/${serviceName}/introduction`, introductionRouter);
+  
 
     const investigationRouter = require('./controllers/investigation.js')(serviceName);
     app.use(`/${serviceName}/investigation`, investigationRouter);
 
+
     const rdfRouter = require('./controllers/rdf.js')(serviceName);
     app.use(`/${serviceName}/rdf`, rdfRouter);
 
+
     const captchaRouter = require('./controllers/captcha.js');
     app.use(`/${serviceName}/captcha`, captchaRouter);
+
+
     // ---------------------------------------------------------------------
     // Application routes
     // ---------------------------------------------------------------------
@@ -112,6 +139,107 @@ getPort.default({
         });  
         res.render('home', data.toJson());
     });
+
+
+    app.get(`/${serviceName}/v2/home`, (req, res) => {
+    let data = new DataModel(req, {
+        root: `/${serviceName}/v2`,
+        title: 'HD-LSD',
+    });
+    res.render('v2/presentazione/sistema', data.toJson());
+    });
+
+    app.get('/frontend/v2/introduction', (req, res) => {
+    let data = new DataModel(req, {
+        root: 'frontend/v2',
+        title: 'Introduzione',
+        activeMenu: 'introduction',
+        activeSidebar: 'presentazione',
+        activeSidebarItem: 'sistema'
+    });
+    res.render('v2/presentazione/sistema', data.toJson());
+    });
+
+    app.get('/frontend/v2/finalita', (req, res) => {
+        let data = new DataModel(req, {
+        root: 'frontend/v2',
+        title: 'Finalità',
+
+        activeMenu: 'introduction',
+        activeSidebar: 'presentazione',
+        activeSidebarItem: 'finalita'
+    });
+        res.render('v2/presentazione/finalita', data.toJson());
+    });
+
+    app.get('/frontend/v2/partecipanti', (req, res) => {
+        let data = new DataModel(req, {
+        root: 'frontend/v2',
+        title: 'Partecipanti',
+
+        activeMenu: 'introduction',
+        activeSidebar: 'presentazione',
+        activeSidebarItem: 'partecipanti'
+    });
+        res.render('v2/presentazione/partecipanti', data.toJson());
+    });
+
+    app.get('/frontend/v2/sistema', (req, res) => {
+        let data = new DataModel(req, {
+            root: 'frontend/v2',
+            title: 'Il sistema',
+
+            activeMenu: 'introduction',
+            activeSidebar: 'presentazione',
+            activeSidebarItem: 'sistema'
+        });
+        res.render('v2/presentazione/sistema', data.toJson());
+    });
+
+app.get('/frontend/v2/investigation/form', async (req, res) => {
+  let data = new DataModel(req, {
+    root: 'frontend/v2',
+    title: 'Indagine',
+    activeMenu: 'investigation',
+activeSidebar: 'investigation',
+    showForm: true
+  });
+
+  res.render('v2/investigation/form', data.toJson());
+});
+
+  app.get('/frontend/v2/search', (req, res) => {
+  let data = new DataModel(req, {
+    root: 'frontend/v2',
+    title: 'Ricerca',
+    activeMenu: 'search',
+    activeSidebar: 'search',
+    activeSidebarItem: 'fast',
+    fastType: 1,
+    schema: 'fast_' + 1
+  });
+
+  res.render('v2/search/advanced', data.toJson());
+});
+
+
+app.get('/frontend/v2/admin', (req, res) => {
+  let data = new DataModel(req, {
+    root: 'frontend/v2',
+    title: 'Amministrazione',
+    activeMenu: 'admin',
+    activeSidebar: 'admin',
+    activeSidebarItem: 'dashboard'
+  });
+
+  res.render('v2/users/index', data.toJson());
+});
+
+
+
+
+
+
     // ---------------------------------------------------------------------
     // Start listing on the specified port
     app.listen(port, async () => {

package/src/public/js/app/vue-investigation.js

@@ -125,6 +125,12 @@ document.addEventListener('DOMContentLoaded', () => {
 
     const el = document.getElementById(appId);
 
+    if (!el) {
+        console.warn('[vue-investigation] #investigation-app not found, skipping mount');
+        return;
+    }
+    const showForm = (el.dataset.showForm === 'true');
+
     const app = createApp({
         delimiters: ['{@', '@}'],
         data() {
@@ -160,6 +166,10 @@ document.addEventListener('DOMContentLoaded', () => {
             }    
         },
         mounted() {
+            if (showForm) {
+                this.resetShaclForm(null, true);
+            }
+
             this.initShaclForm();
             setInterval(this.autoSave.bind(this), 30*1000);
             // Ascolta eventi dall'autocomplete
@@ -319,10 +329,10 @@ document.addEventListener('DOMContentLoaded', () => {
 
                 // Resetta il riferimento e reinizializza
                 this.form = null;
-                this.initShaclForm();
+                this.initShaclForm(uuid);
                 
             },
-            initShaclForm() {
+            initShaclForm(uuid) {
                 var _this = this;
                 setTimeout(async ()=>{
                     _this.form = document.querySelector("shacl-form");
@@ -358,8 +368,15 @@ document.addEventListener('DOMContentLoaded', () => {
                                 else
                                     _this.makeAttachmentClickable();
                                 _this.validForm = true;
-                                _this.serializedForm = _this.form.serialize();
-                                
+                                if(_this.inEditing)
+                                    _this.serializedForm = _this.form.serialize();
+                                else{
+                                    setTimeout(async function(){
+                                        var rnd = (new Date()).getTime();
+                                        const response = await fetch("/backend/ontology/form/" + uuid + "?rnd=" + rnd)    
+                                        _this.serializedForm = await response.text();
+                                    });        
+                                }
                                 if(!_this.enabled)
                                     _this.disableInteractions(_this.form);
                                                         

package/src/public/js/login/login.js

@@ -7,7 +7,7 @@ onSubmit = function(type){
         password: (type == "login") ? 
             document.getElementById("password").value : "",
     }).then(response => {
-        window.location = "/frontend/introduction/content";
+        window.location = "/frontend/v2/introduction";
     }).catch(error => {
         console.log(error);
     });