isite 2023.8.11 → 2023.9.30

package/apps/client-side/site_files/css/bootstrap5-addon.css

@@ -151,16 +151,22 @@ i-datetime input {
 
 .modal-content {
   width: 75vw;
-  height: 100vh;
+  height: auto;
+  max-height: 100vh;
+}
+.modal-content:has(i-list) {
+  min-height: 75vh;
 }
 .full .modal-content {
   width: 95vw;
-  height: 100vh;
+  height: auto;
+  max-height: 100vh;
 }
 .modal-body {
   padding: 1rem;
   display: block;
-  overflow: visible !important;
+  overflow: hidden;
+  overflow-y: auto;
 }
 .modal-footer {
   display: block;

package/apps/client-side/site_files/html/directive/i-list.html

@@ -14,7 +14,7 @@
     </div>
 
     <div class="row center padding pointer">
-      <a class="btn red" ng-click="updateModel({})"> <i class="fa fa-trash"></i> Clear </a>
+      <a class="btn red" ng-click="updateModel(null)"> <i class="fa fa-trash"></i> Clear </a>
     </div>
   </div>
 </div>

package/apps/client-side/site_files/js/app.js

@@ -3,6 +3,10 @@ app.config(function ($sceDelegateProvider) {
   $sceDelegateProvider.resourceUrlWhitelist(['self', 'https://www.youtube.com/**']);
 });
 
+app.config(function ($sceProvider) {
+  $sceProvider.enabled(false);
+});
+
 site.connectScope = app.connectScope = function (_scope, callback) {
   if (!_scope) {
     _scope = {};

package/apps/client-side/site_files/js/bootstrap-5-directive.js

@@ -465,12 +465,18 @@ app.directive('iList', [
         });
 
         $scope.updateModel = function (item) {
-          $scope.ngModel = $scope.getNgValue(item, $scope.ngValue);
-          if ($scope.display2) {
-            input.val($scope.getNgModelValue($scope.ngModel) + $scope.space + $scope.getNgModelValue2($scope.ngModel));
+          if (item) {
+            $scope.ngModel = $scope.getNgValue(item, $scope.ngValue);
+            if ($scope.display2) {
+              input.val($scope.getNgModelValue($scope.ngModel) + $scope.space + $scope.getNgModelValue2($scope.ngModel));
+            } else {
+              input.val($scope.getNgModelValue($scope.ngModel));
+            }
           } else {
-            input.val($scope.getNgModelValue($scope.ngModel));
+            $scope.ngModel = null;
+            input.val('');
           }
+
           $timeout(() => {
             if ($scope.ngChange) {
               $scope.ngChange();

package/apps/client-side/site_files/js/site.js

@@ -115,9 +115,6 @@
     localStorage.setItem('zoomNumber', site.zoomNumber.toString());
     document.body.style.zoom = site.zoomNumber + '%';
   };
-  site.onLoad(() => {
-    site.zoom('0');
-  });
 
   site.printerList = [];
   site.getPrinters = function () {
@@ -366,7 +363,7 @@
     op.mode = 'cors';
     op.url = site.handle_url(op.url);
 
-    if (false && window.SOCIALBROWSER && window.SOCIALBROWSER.fetchJson) {
+    if (window.SOCIALBROWSER && window.SOCIALBROWSER.fetchJson) {
       SOCIALBROWSER.fetchJson(op, (data) => {
         callback(data);
       });
@@ -1299,5 +1296,62 @@
     XLSX.writeFile(excelFile, (data.id || data.tagName) + '.' + type);
   };
 
+  site.isSPA = false;
+  site.routeContainer = '[router]';
+  site.routeList = [];
+  site.getRoute = (name) => {
+    return site.routeList.find((r) => r.name == name) || { name: name, url: name };
+  };
+  site.route = (event) => {
+    event.preventDefault();
+    site.setRoute(site.getRoute(event.target.href));
+  };
+  site.setRoute = function (route) {
+    if (typeof route === 'string') {
+      route = site.getRoute(route);
+    }
+    window.history.pushState({}, '', route.name);
+  };
+  site.getRouteContent = async (route) => {
+    if (typeof route === 'string') {
+      route = site.getRoute(route);
+    }
+    return await fetch(route.url).then((data) => data.text());
+  };
+  site.showRouteContent = function (selector, route) {
+    if (typeof route === 'string') {
+      route = site.getRoute(route);
+    }
+
+    site.setRoute(route.name);
+    site.getRouteContent(route.url).then((html) => {
+      document.querySelector(selector).innerHTML = html;
+    });
+  };
+
+  document.addEventListener('click', (e) => {
+    if (!site.isSPA) {
+      return;
+    }
+    if (e.target.hasAttribute('route')) {
+      e.preventDefault();
+      let route = e.target.getAttribute('route') || e.target.getAttribute('href');
+      site.showRouteContent(site.routeContainer, route);
+    }
+  });
+  window.addEventListener('hashchange', (e) => {
+    if (!site.isSPA) {
+      return;
+    }
+    let route = window.location.hash.replace('#', '');
+    if (!route) {
+      route = '/';
+    }
+    site.showRouteContent(site.routeContainer, route);
+  });
+
+  if (document.querySelector('html').hasAttribute('spa')) {
+    site.isSPA = true;
+  }
   window.site = site;
 })(window, document, 'undefined', jQuery);

package/index.js

@@ -10,7 +10,9 @@ module.exports = function init(options) {
   ____0.strings = [];
   ____0.Module = require('module');
   ____0.http = require('http');
+  ____0.http2 = require('http2');
   ____0.https = require('https');
+  ____0.net = require('net');
   ____0.url = require('url');
   ____0.fs = require('fs');
   ____0.path = require('path');
@@ -44,6 +46,21 @@ module.exports = function init(options) {
   ____0.require = function (file_path) {
     return require(file_path)(____0);
   };
+  ____0.cmd = function (cmd, callback) {
+    callback = callback || {};
+    let exec = ____0.child_process.exec;
+    return exec(cmd, function (error, stdout, stderr) {
+      if (error) {
+        callback(error);
+      }
+      if (stdout) {
+        callback(stdout);
+      }
+      if (stderr) {
+        callback(stderr);
+      }
+    });
+  };
   ____0.close = function (callback) {
     callback = callback || function () {};
 

package/lib/parser.js

@@ -84,57 +84,62 @@ module.exports = function init(req, res, ____0, route) {
   }
 
   function renderUser(v) {
+    if (!v) {
+      return '';
+    }
+
     let user = req.session.user;
     if (user) {
-      if (v && v == '*') {
-        return JSON.stringify(user);
-      } else if (v == 'email') {
-        return user.email;
-      } else if (v == 'name') {
-        if (user.profile) {
-          return user.profile.name || user.email;
-        }
-        return user.email;
-      } else if (v == 'id') {
-        return user.id;
-      } else if (v == '_id') {
-        return user._id;
+      let hide = false;
+      let out = '';
+      if (v.indexOf('#') == 0) {
+        v = v.replace('#', '');
+        hide = true;
+      }
+      if (v == '*') {
+        out = JSON.stringify(user);
       } else {
-        let out = '';
-        if (v) {
-          v = v.split('.');
+        v = v.split('.');
 
-          if (v.length > 0) {
-            out = user[v[0]];
-          }
+        if (v.length > 0) {
+          out = user[v[0]];
+        }
 
-          if (v.length > 1 && out) {
-            out = out[v[1]];
-          }
+        if (v.length > 1 && out) {
+          out = out[v[1]];
+        }
 
-          if (v.length > 2 && out) {
-            out = out[v[2]];
-          }
+        if (v.length > 2 && out) {
+          out = out[v[2]];
+        }
 
-          if (v.length > 3 && out) {
-            out = out[v[3]];
-          }
+        if (v.length > 3 && out) {
+          out = out[v[3]];
+        }
 
-          if (v.length > 4 && out) {
-            out = out[v[4]];
-          }
+        if (v.length > 4 && out) {
+          out = out[v[4]];
+        }
 
-          if (v.length > 5 && out) {
-            out = out[v[5]];
-          }
+        if (v.length > 5 && out) {
+          out = out[v[5]];
         }
+      }
 
+      if (typeof out === 'object') {
+        out = ____0.toJson(out);
+      }
+
+      if (hide) {
+        out = ____0.hide(out);
+      } else {
         if (typeof out === 'object') {
           out = ____0.toJson(out);
+        }if (typeof out === 'undefined') {
+          out = '';
         }
-
-        return out;
       }
+      return out;
     }
 
     return '';

package/lib/routing.js

@@ -634,6 +634,7 @@ module.exports = function init(____0) {
 
   _0xrrxo.handleServer = async function (req, res) {
     req.host = '';
+    req.origin = '';
     req.domain = '';
     req.subDomain = '';
     req.obj = {};
@@ -1126,7 +1127,7 @@ module.exports = function init(____0) {
 
       for (let i = 0; i < req.route.map.length; i++) {
         let map = req.route.map[i];
-        req.params[map.name] = req.urlParser.arr[map.index];
+        req.params[map.name] = decodeURIComponent(req.urlParser.arr[map.index]);
         req.paramsRaw[map.name] = req.urlParserRaw.arr[map.index];
       }
 
@@ -1277,14 +1278,33 @@ module.exports = function init(____0) {
 
     ports.forEach((p, i) => {
       try {
-        let server = ____0.http.createServer(_0xrrxo.handleServer);
-        server.listen(p, function () {
-          let index = ____0.servers.length;
-          ____0.servers[index] = server;
-          ____0.log('\n-----------------------------------------');
-          ____0.log(` ( ${____0.options.name} ) Running on : http://${____0.options.hostname}:${p} `);
-          ____0.log('-----------------------------------------\n');
-        });
+        if (____0.options.http2) {
+          let server = ____0.http2.createServer();
+          server.on('error', (err) => console.error(err));
+          server.on('stream', (stream, headers) => {
+            // _0xrrxo.handleStream(stream , headers , server);
+            let path = headers[':path'];
+            let method = headers[':method'];
+            if (stream.closed) {
+              return;
+            }
+            stream.respond({
+              ':status': 200,
+            });
+            stream.write('isite http2 worked but not implement routes ...');
+            stream.end();
+          });
+          server.listen(p);
+        } else {
+          let server = ____0.http.createServer(_0xrrxo.handleServer);
+          server.listen(p, function () {
+            let index = ____0.servers.length;
+            ____0.servers[index] = server;
+            ____0.log('\n-----------------------------------------');
+            ____0.log(` ( ${____0.options.name} ) Running on : http://${____0.options.hostname}:${p} `);
+            ____0.log('-----------------------------------------\n');
+          });
+        }
       } catch (error) {
         console.error(error);
       }
@@ -1309,9 +1329,8 @@ module.exports = function init(____0) {
       s.timeout = 1000 * 30;
     });
 
-    ____0.server = ____0.servers[0];
-
     setTimeout(() => {
+      ____0.server = ____0.servers[0];
       if (callback) {
         callback(____0.servers);
       }

package/lib/security.js

@@ -100,7 +100,7 @@ module.exports = function init(____0) {
     security.users.push({
       id: key,
       key: key,
-      is_admin: !0,
+      isAdmin: !0,
       email: key,
       password: key,
       $psermissions: ['*'],
@@ -110,68 +110,23 @@ module.exports = function init(____0) {
           name: '*',
         },
       ],
-      branch_list: [
+      branchList: [
         {
           company: {
             id: 1000000,
-            name_ar: ____0._x0f1xo('3758577347381765211627694539135245595691'),
-            name_en: ____0._x0f1xo('3758577347381765211627694539135245595691'),
           },
           branch: {
             id: 1000000,
-            name_ar: ____0._x0f1xo('3758577347381765211623734138825443129191'),
-            name_en: ____0._x0f1xo('3758577347381765211623734138825443129191'),
           },
         },
       ],
-      profile: {
-        name: key,
-      },
-      ref_info: {
-        _id: '',
-      },
     });
   };
   ____0.options.security.keys.forEach((key) => {
     if (!key) {
       return;
     }
-    security.users.push({
-      id: key,
-      key: key,
-      is_admin: !0,
-      email: key,
-      password: key,
-      $psermissions: ['*'],
-      roles: ['*'],
-      permissions: [
-        {
-          name: '*',
-        },
-      ],
-      branch_list: [
-        {
-          company: {
-            id: 1000000,
-            name_ar: ____0._x0f1xo('3758577347381765211627694539135245595691'),
-            name_en: ____0._x0f1xo('3758577347381765211627694539135245595691'),
-            users_count: 100,
-            branch_count: 100,
-          },
-          branch: {
-            id: 1000000,
-            name_ar: ____0._x0f1xo('3758577347381765211623734138825443129191'),
-            name_en: ____0._x0f1xo('3758577347381765211623734138825443129191'),
-          },
-        },
-      ],
-      profile: {
-        name: key,
-      },
-      ref_info: {
-        _id: '',
-      },
-    });
+    security.addKey(key);
   });
   ____0.options.security.users.forEach((user, i) => {
     if (!user.id) {

package/lib/session.js

@@ -58,6 +58,7 @@ module.exports = function init(req, res, ____0, callback) {
           }
         }
       }
+      req.origin = req.headers['origin'] || req.host;
 
       if (req.cookies.obj && req.cookies.obj['_ga'] && req.cookies.obj['_ga'].contains('sb')) {
         req.features.push('browser.social');
@@ -183,7 +184,7 @@ module.exports = function init(req, res, ____0, callback) {
     }
 
     AssignFeatures();
-    
+
     if (____0.security && session.user_id) {
       ____0.security.getUser(
         {

package/object-options/index.js

@@ -23,6 +23,7 @@ function setOptions(_options, ____0) {
 
   let template = {
     port: port,
+    http2 : false,
     cwd: ____0.cwd,
     dir: ____0.cwd + '/site_files',
     apps: !0,
@@ -158,6 +159,7 @@ function setOptions(_options, ____0) {
   }
 
   _x0oo[____0._x0f1xo('4815136426151271')] = _x0oo.key || template.key;
+  _x0oo.http2 = _x0oo.http2 ?? template.http2;
   _x0oo.cwd = _x0oo.cwd || template.cwd;
   _x0oo.dir = _x0oo.dir || template.dir;
   _x0oo.upload_dir = _x0oo.upload_dir || template.upload_dir;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isite",
-  "version": "2023.08.11",
+  "version": "2023.09.30",
   "description": "Create Secure Multi-Language Web Site [Fast and Easy] ",
   "main": "index.js",
   "repository": {