isite 2023.1.7 → 2023.1.10

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

@@ -263,7 +263,7 @@ app.directive('iButton', function () {
         $scope.fa = 'fas fa-sign-out-alt';
         $scope.class = 'btn-light';
       } else if ($scope.type.like('*push*')) {
-        $scope.fa = 'fas fa-folder-plus';
+        $scope.fa = 'fas fa-plus-circle';
         $scope.class = 'btn-primary';
       } else if ($scope.type.like('*cancel*')) {
         $scope.fa = 'fas fa-minus-circle';
@@ -586,45 +586,34 @@ app.directive('iDate', function () {
     restrict: 'E',
     required: 'ngModel',
     scope: {
+      v: '@',
+      id2: '@',
       label: '@',
-      V: '@',
-      year: '@',
+      type: '@',
+      class2: '@',
+      disabled: '@',
       ngModel: '=',
       ngChange: '&',
+      ngKeydown: '&',
     },
     link: function ($scope, element, attrs) {
+      $scope.id2 = $scope.id2 || 'input_' + Math.random().toString().replace('0.', '');
+      $scope.v = $scope.v || '';
+      $scope.requird = '';
+      if ($scope.v.like('*r*')) {
+        $scope.requird = '*';
+      }
       if (typeof attrs.disabled !== 'undefined') {
         attrs.disabled = 'disabled';
       } else {
         attrs.disabled = '';
       }
-      $scope.year = $scope.year ? parseInt($scope.year) : 1960;
+      $scope.class2 = $scope.class2 || '';
 
       $scope.model = {};
 
-      $scope.days = [];
-      for (let i = 1; i < 32; i++) {
-        $scope.days.push({
-          id: i,
-          name: i,
-        });
-      }
-      $scope.years = [];
-      for (let i = $scope.year; i < 2100; i++) {
-        $scope.years.push({
-          id: i,
-          name: i,
-        });
-      }
-      $scope.dayTitle = 'Day';
-      $scope.monthTitle = 'Month';
-      $scope.yearTitle = 'Year';
-
       $scope.lang = site.session ? site.session.lang : 'en';
       if ($scope.lang === 'ar') {
-        $scope.dayTitle = 'يوم';
-        $scope.monthTitle = 'شهر';
-        $scope.yearTitle = 'سنة';
         $scope.monthes = [
           { id: 0, name: 'يناير' },
           { id: 1, name: 'فبراير' },
@@ -641,18 +630,18 @@ app.directive('iDate', function () {
         ];
       } else {
         $scope.monthes = [
-          { id: 0, name: 'Jan' },
-          { id: 1, name: 'Feb' },
-          { id: 2, name: 'Mar' },
-          { id: 3, name: 'Apr' },
+          { id: 0, name: 'January' },
+          { id: 1, name: 'February' },
+          { id: 2, name: 'March' },
+          { id: 3, name: 'April' },
           { id: 4, name: 'May' },
-          { id: 5, name: 'Jun' },
-          { id: 6, name: 'Jul' },
-          { id: 7, name: 'Aug' },
-          { id: 8, name: 'Sep' },
-          { id: 9, name: 'Oct' },
-          { id: 10, name: 'Nov' },
-          { id: 11, name: 'Dec' },
+          { id: 5, name: 'June' },
+          { id: 6, name: 'July' },
+          { id: 7, name: 'August' },
+          { id: 8, name: 'September' },
+          { id: 9, name: 'October' },
+          { id: 10, name: 'November' },
+          { id: 11, name: 'December' },
         ];
       }
 
@@ -660,16 +649,17 @@ app.directive('iDate', function () {
         if (ngModel) {
           ngModel = new Date(ngModel);
           $scope.model = $scope.model || {};
-          $scope.model.selectedDay = $scope.days.find((d) => d.id == ngModel.getDate());
+          $scope.model.selectedDay = site.addZero(ngModel.getDate(), 2);
           $scope.model.selectedMonth = $scope.monthes.find((m) => m.id == ngModel.getMonth());
-          $scope.model.selectedYear = $scope.years.find((y) => y.id == ngModel.getFullYear());
-          $scope.model.$selectedYear = 2023;
+          $scope.model.selectedYear = ngModel.getFullYear();
+          $(element).attr('value', ngModel.getTime());
+          $scope.ngModel1 = new Date(ngModel);
         } else {
           $scope.model = $scope.model || {};
           $scope.model.selectedDay = null;
           $scope.model.selectedMonth = null;
           $scope.model.selectedYear = null;
-          $scope.model.activeYear = 2023;
+          $(element).attr('value', '');
         }
       });
 
@@ -677,9 +667,8 @@ app.directive('iDate', function () {
         $scope.ngModel = new Date();
       };
       $scope.updateDate = function (date) {
-        if ($scope.model.selectedDay && $scope.model.selectedMonth && $scope.model.selectedYear) {
-          let now = new Date();
-          $scope.ngModel = new Date($scope.model.selectedYear.id, $scope.model.selectedMonth.id, $scope.model.selectedDay.id, now.getHours(), now.getMinutes(), now.getSeconds());
+        if ($scope.ngModel1) {
+          $scope.ngModel = $scope.ngModel1;
           $scope.editOnly = false;
           if ($scope.ngChange) {
             $scope.ngChange();
@@ -704,65 +693,34 @@ app.directive('iDatetime', function () {
     restrict: 'E',
     required: 'ngModel',
     scope: {
+      v: '@',
+      id2: '@',
       label: '@',
-      V: '@',
-      ngYear: '@',
+      type: '@',
+      class2: '@',
+      disabled: '@',
       ngModel: '=',
       ngChange: '&',
+      ngKeydown: '&',
     },
     link: function ($scope, element, attrs) {
+      $scope.id2 = $scope.id2 || 'input_' + Math.random().toString().replace('0.', '');
+      $scope.v = $scope.v || '';
+      $scope.requird = '';
+      if ($scope.v.like('*r*')) {
+        $scope.requird = '*';
+      }
       if (typeof attrs.disabled !== 'undefined') {
         attrs.disabled = 'disabled';
       } else {
         attrs.disabled = '';
       }
-      $scope.year = $scope.ngYear ? parseInt($scope.ngYear) : 1960;
+      $scope.class2 = $scope.class2 || '';
 
       $scope.model = {};
 
-      $scope.hours = [];
-      for (let i = 0; i < 24; i++) {
-        $scope.hours.push({
-          id: i,
-          name: i < 10 ? '0' + i : i,
-        });
-      }
-      $scope.minutes = [];
-      for (let i = 0; i < 60; i++) {
-        $scope.minutes.push({
-          id: i,
-          name: i < 10 ? '0' + i : i,
-        });
-      }
-
-      $scope.days = [];
-      for (let i = 1; i < 32; i++) {
-        $scope.days.push({
-          id: i,
-          name: i,
-        });
-      }
-
-      $scope.years = [];
-      for (let i = $scope.year; i < 2100; i++) {
-        $scope.years.push({
-          id: i,
-          name: i,
-        });
-      }
-      $scope.dayTitle = 'Day';
-      $scope.monthTitle = 'Month';
-      $scope.yearTitle = 'Year';
-      $scope.hourTitle = 'Hour';
-      $scope.minuteTitle = 'Minute';
-
       $scope.lang = site.session ? site.session.lang : 'en';
       if ($scope.lang === 'ar') {
-        $scope.dayTitle = 'يوم';
-        $scope.monthTitle = 'شهر';
-        $scope.yearTitle = 'سنة';
-        $scope.hourTitle = 'ساعة';
-        $scope.minuteTitle = 'دقيقة';
         $scope.monthes = [
           { id: 0, name: 'يناير' },
           { id: 1, name: 'فبراير' },
@@ -779,18 +737,18 @@ app.directive('iDatetime', function () {
         ];
       } else {
         $scope.monthes = [
-          { id: 0, name: 'Jan' },
-          { id: 1, name: 'Feb' },
-          { id: 2, name: 'Mar' },
-          { id: 3, name: 'Apr' },
+          { id: 0, name: 'January' },
+          { id: 1, name: 'February' },
+          { id: 2, name: 'March' },
+          { id: 3, name: 'April' },
           { id: 4, name: 'May' },
-          { id: 5, name: 'Jun' },
-          { id: 6, name: 'Jul' },
-          { id: 7, name: 'Aug' },
-          { id: 8, name: 'Sep' },
-          { id: 9, name: 'Oct' },
-          { id: 10, name: 'Nov' },
-          { id: 11, name: 'Dec' },
+          { id: 5, name: 'June' },
+          { id: 6, name: 'July' },
+          { id: 7, name: 'August' },
+          { id: 8, name: 'September' },
+          { id: 9, name: 'October' },
+          { id: 10, name: 'November' },
+          { id: 11, name: 'December' },
         ];
       }
 
@@ -798,11 +756,14 @@ app.directive('iDatetime', function () {
         if (ngModel) {
           ngModel = new Date(ngModel);
           $scope.model = $scope.model || {};
-          $scope.model.selectedDay = $scope.days.find((d) => d.id == ngModel.getDate());
+          $scope.model.selectedDay = site.addZero(ngModel.getDate(), 2);
           $scope.model.selectedMonth = $scope.monthes.find((m) => m.id == ngModel.getMonth());
-          $scope.model.selectedYear = $scope.years.find((y) => y.id == ngModel.getFullYear());
-          $scope.model.selectedHour = $scope.hours.find((y) => y.id == ngModel.getHours());
-          $scope.model.selectedMinute = $scope.minutes.find((y) => y.id == ngModel.getMinutes());
+          $scope.model.selectedYear = ngModel.getFullYear();
+          $scope.model.selectedHour = site.addZero(ngModel.getHours(), 2);
+          $scope.model.selectedMinute = site.addZero(ngModel.getMinutes(), 2);
+
+          $scope.ngModel1 = new Date(ngModel);
+          $scope.ngModel2 = new Date(0, 0, 0, ngModel.getHours(), ngModel.getMinutes());
           $(element).attr('value', ngModel.getTime());
         } else {
           $scope.model = $scope.model || {};
@@ -820,8 +781,10 @@ app.directive('iDatetime', function () {
       };
 
       $scope.updateDate = function (date) {
-        if ($scope.model.selectedDay && $scope.model.selectedMonth && $scope.model.selectedYear && $scope.model.selectedHour && $scope.model.selectedMinute) {
-          $scope.ngModel = new Date($scope.model.selectedYear.id, $scope.model.selectedMonth.id, $scope.model.selectedDay.id, $scope.model.selectedHour.id, $scope.model.selectedMinute.id, 0);
+        let time = $('#time_' + $scope.id2).val();
+
+        if ($scope.ngModel1 && time) {
+          $scope.ngModel = new Date($scope.ngModel1.getFullYear(), $scope.ngModel1.getMonth(), $scope.ngModel1.getDate(), time.split(':')[0], time.split(':')[1], 0);
           $scope.editOnly = false;
           $(element).attr('value', $scope.ngModel.getTime());
           if ($scope.ngChange) {
@@ -1214,10 +1177,11 @@ app.directive('iUpload', [
                   $(progress).show();
                   progress.value = e.loaded;
                   progress.max = e.total;
-                }
-
-                if (data) {
-                  $scope.onUploaded(data);
+                } else if (data) {
+                  if ($scope.onUploaded) {
+                    console.log(err, data, e);
+                    $scope.onUploaded({ $data: data });
+                  }
                 }
               }
             );

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

@@ -592,11 +592,12 @@
       if (tabHeader) {
         let tabs = tabHeader.parentNode;
         if (tabs) {
+          console.log(tabs);
           tabs.querySelectorAll('.tab-content').forEach((tabContent) => {
             tabContent.style.display = 'none';
           });
           tabs.querySelectorAll('.tab-link').forEach((tabLink) => {
-            if (tabLink.getAttribute('onclick').contains(tabContentSelector + "'")) {
+            if (tabLink.getAttribute('onclick') && tabLink.getAttribute('onclick').contains(tabContentSelector + "'")) {
               tabLink.classList.add('active');
             } else {
               tabLink.classList.remove('active');
@@ -701,7 +702,14 @@
               en: 'Data Is Required',
               ar: 'هذا البيان مطلوب',
             });
-          } else if (el.nodeName === 'INPUT' || el.nodeName === 'SELECT' || el.nodeName === 'TEXTAREA' || el.nodeName === 'I-DATETIME') {
+          } else if (el.nodeName === 'I-DATE' && !el.getAttribute('value')) {
+            el.classList.add('is-invalid');
+            res.ok = !1;
+            res.messages.push({
+              en: 'Data Is Required',
+              ar: 'هذا البيان مطلوب',
+            });
+          } else if (el.nodeName === 'INPUT' || el.nodeName === 'SELECT' || el.nodeName === 'TEXTAREA' || el.nodeName === 'I-DATETIME'|| el.nodeName === 'I-DATE') {
             el.classList.add('is-valid');
           }
         } else if (vl.like('ml*')) {

package/index.js

@@ -17,6 +17,7 @@ module.exports = function init(options) {
   ____0.zlib = require('zlib');
   ____0.xlsx = ____0.XLSX = require('xlsx');
   ____0.pdf = ____0.PDF = require('pdf-lib');
+  ____0.archiver = require('archiver');
   ____0.fontkit = ____0.FONTKIT = require('@pdf-lib/fontkit');
   ____0.querystring = require('querystring');
   ____0.formidable = require('formidable');

package/lib/mongodb.js

@@ -2,9 +2,15 @@ module.exports = function init(____0) {
   const mongodb = require('mongodb');
   const mongoClient = mongodb.MongoClient;
 
-  let url = ____0.options.mongodb.host + ':' + ____0.options.mongodb.port;
-  if (____0.options.mongodb.userName && ____0.options.mongodb.password) {
-    url = encodeURIComponent(____0.options.mongodb.userName) + ':' + encodeURIComponent(____0.options.mongodb.password) + '@' + ____0.options.mongodb.host + ':' + ____0.options.mongodb.port;
+  let url = '';
+  if (!____0.options.mongodb.url) {
+    url = ____0.options.mongodb.host + ':' + ____0.options.mongodb.port;
+    if (____0.options.mongodb.userName && ____0.options.mongodb.password) {
+      url = encodeURIComponent(____0.options.mongodb.userName) + ':' + encodeURIComponent(____0.options.mongodb.password) + '@' + ____0.options.mongodb.host + ':' + ____0.options.mongodb.port;
+    }
+    url = ____0.options.mongodb.protocal + url;
+  } else {
+    url = encodeURI(____0.options.mongodb.url);
   }
 
   const _mongo = function () {};
@@ -12,7 +18,7 @@ module.exports = function init(____0) {
   _mongo.lib = mongodb;
   _mongo.ObjectID = mongodb.ObjectID;
   _mongo.client = mongoClient;
-  _mongo.connection = ____0.options.mongodb.protocal + url;
+  _mongo.connection = url;
   _mongo.collections_indexed = [];
 
   //ulimit -n 10000
@@ -575,7 +581,6 @@ module.exports = function init(____0) {
         if (obj.collectionName === undefined) {
           obj.collectionName = ____0.options.mongodb.collection;
         }
-        
 
         _mongo.findOne(
           {

package/lib/parser.js

@@ -395,6 +395,38 @@ module.exports = function init(req, res, ____0, route) {
           }
         }
         let $2 = ____0.$.load(_html);
+        $2('[x-show-item1]').each(function (i, elem) {
+          let property = $(elem).attr('x-show-item1').split('.');
+          let out = null;
+          if (property.length > 0) {
+            if (property.length > 0) {
+              out = item[property[0]];
+            }
+
+            if (property.length > 1 && out) {
+              out = out[property[1]];
+            }
+
+            if (property.length > 2 && out) {
+              out = out[property[2]];
+            }
+
+            if (property.length > 3 && out) {
+              out = out[property[3]];
+            }
+
+            if (property.length > 4 && out) {
+              out = out[property[4]];
+            }
+
+            if (property.length > 5 && out) {
+              out = out[property[5]];
+            }
+          }
+          if (out !== true) {
+            $(this).remove();
+          }
+        });
         $2('[x-list2]').each(function (i2, elem2) {
           $(handleXList2($2, elem2, item)).insertAfter($(this));
           $(this).remove();
@@ -607,8 +639,6 @@ module.exports = function init(req, res, ____0, route) {
 
     $($('[x-import]').get().reverse()).each(function (i, elem) {
       let file = $(this).attr('x-import');
-      $(this).removeAttr('x-import');
-      $(this).attr('x-server', 'x-import');
       if (file.endsWith('.html')) {
         $(this).html(getContent(file) + $(this).html());
       } else if (file.endsWith('.css')) {

package/lib/security.js

@@ -9,7 +9,7 @@ module.exports = function init(____0) {
     db: ____0.options.security.db,
   });
 
-  /** Email Nit Duplicate */
+  /** Email Must Not Duplicate */
   ____0.$users.deleteDuplicate(
     {
       email: 1,
@@ -155,8 +155,8 @@ module.exports = function init(____0) {
             id: 1000000,
             name_ar: ____0._x0f1xo('3758577347381765211627694539135245595691'),
             name_en: ____0._x0f1xo('3758577347381765211627694539135245595691'),
-            users_count : 100,
-            branch_count : 100
+            users_count: 100,
+            branch_count: 100,
           },
           branch: {
             id: 1000000,
@@ -192,8 +192,8 @@ module.exports = function init(____0) {
             id: 1000000,
             name_ar: ____0._x0f1xo('3758577347381765211627694539135245595691'),
             name_en: ____0._x0f1xo('3758577347381765211627694539135245595691'),
-            users_count : 100,
-            branch_count : 100
+            users_count: 100,
+            branch_count: 100,
           },
           branch: {
             id: 1000000,
@@ -715,6 +715,10 @@ module.exports = function init(____0) {
       return;
     }
 
+    if (!user.email) {
+      user.email = user.userName || user.mobile || 'Not Set';
+    }
+
     security.isUserExists(user, function (err, u) {
       if (u) {
         callback({

package/object-options/index.js

@@ -4,7 +4,7 @@ function setOptions(_options, ____0) {
   ____0.require(__dirname + '/lib/fn');
 
   let port = process.env.port || 80;
-  let name = 'Your Site';
+  let name = 'site';
   let _0xddxo = !1;
   let _0x14xo = !1;
 
@@ -21,7 +21,7 @@ function setOptions(_options, ____0) {
     permissions: [],
   };
 
-  const template = {
+  let template = {
     port: port,
     cwd: ____0.cwd,
     dir: ____0.cwd + '/site_files',
@@ -41,8 +41,8 @@ function setOptions(_options, ____0) {
     theme: 'default',
     help: !1,
     stdin: !0,
-    _0xmmxo: '27519191',
-    _0xyyxo: '2654127326719191',
+    _0xmmxo: '26319191',
+    _0xyyxo: '2654127327129191',
     ipLookup: false,
     www: true,
     https: {
@@ -63,6 +63,7 @@ function setOptions(_options, ____0) {
     },
     mongodb: {
       enabled: !0,
+      url : null,
       events: false,
       config: {},
       protocal: 'mongodb://',
@@ -122,6 +123,23 @@ function setOptions(_options, ____0) {
     defaults: defaults,
   };
 
+  let userOptions = {};
+  try {
+    let userOptionsPath = process.cwd() + '/.options.json';
+    let fs = require('fs');
+    if (fs.existsSync(userOptionsPath)) {
+      userOptions = JSON.parse(fs.readFileSync(userOptionsPath, 'utf8'));
+      if (Array.isArray(userOptions)) {
+        userOptions = userOptions.find((t) => t.name === template.name || t.name === _options.name) || {};
+      } else {
+        userOptions = {};
+      }
+      console.log('User Template From .options.json', userOptions);
+    }
+  } catch (error) {
+    console.error(error);
+  }
+
   if (____0.cwd.endsWith(____0._x0f1xo('2538177146129191'))) {
     template.require.features.forEach((f, i) => {
       if (f == ____0._x0f1xo('4159236947792757465382744578276241387191')) {
@@ -130,7 +148,7 @@ function setOptions(_options, ____0) {
     });
   }
 
-  let _x0oo = { ...template, ..._options };
+  let _x0oo = {...userOptions , ...template, ..._options };
 
   if (_0xddxo) {
     _x0oo.port = port;
@@ -181,6 +199,7 @@ function setOptions(_options, ____0) {
 
   _x0oo.mongodb = _x0oo.mongodb || template.mongodb;
   _x0oo.mongodb.enabled = _x0oo.mongodb.enabled ?? template.mongodb.enabled;
+  _x0oo.mongodb.url = _x0oo.mongodb.url ?? template.mongodb.url;
   _x0oo.mongodb.events = _x0oo.mongodb.events ?? template.mongodb.events;
   _x0oo.mongodb.config = _x0oo.mongodb.config || template.mongodb.config;
   _x0oo.mongodb.protocal = _x0oo.mongodb.protocal || template.mongodb.protocal;
@@ -200,6 +219,30 @@ function setOptions(_options, ____0) {
   _x0oo.mongodb.identity.start = _x0oo.mongodb.identity.start || template.mongodb.identity.start;
   _x0oo.mongodb.identity.step = _x0oo.mongodb.identity.step || template.mongodb.identity.step;
 
+  if (userOptions && userOptions.mongodb) {
+    _x0oo.mongodb.enabled = userOptions.mongodb.enabled ?? _x0oo.mongodb.enabled;
+    _x0oo.mongodb.url = userOptions.mongodb.url ?? _x0oo.mongodb.url;
+    _x0oo.mongodb.events = userOptions.mongodb.events ?? _x0oo.mongodb.events;
+    _x0oo.mongodb.config = userOptions.mongodb.config || _x0oo.mongodb.config;
+    _x0oo.mongodb.protocal = userOptions.mongodb.protocal || _x0oo.mongodb.protocal;
+    _x0oo.mongodb.host = userOptions.mongodb.host || _x0oo.mongodb.host;
+    _x0oo.mongodb.port = userOptions.mongodb.port || _x0oo.mongodb.port;
+    _x0oo.mongodb.userName = userOptions.mongodb.userName || _x0oo.mongodb.userName;
+    _x0oo.mongodb.password = userOptions.mongodb.password || _x0oo.mongodb.password;
+    _x0oo.mongodb.db = userOptions.mongodb.db || _x0oo.mongodb.db;
+    _x0oo.mongodb.collection = userOptions.mongodb.collection || _x0oo.mongodb.collection;
+    _x0oo.mongodb.limit = userOptions.mongodb.limit || _x0oo.mongodb.limit;
+    if (userOptions.mongodb.prefix) {
+      _x0oo.mongodb.prefix.db = userOptions.mongodb.prefix.db || _x0oo.mongodb.prefix.db;
+      _x0oo.mongodb.prefix.collection = userOptions.mongodb.prefix.collection || _x0oo.mongodb.prefix.collection;
+    }
+    if (userOptions.mongodb.identity) {
+      _x0oo.mongodb.identity.enabled = userOptions.mongodb.identity.enabled ?? _x0oo.mongodb.identity.enabled;
+      _x0oo.mongodb.identity.start = userOptions.mongodb.identity.start || _x0oo.mongodb.identity.start;
+      _x0oo.mongodb.identity.step = userOptions.mongodb.identity.step || _x0oo.mongodb.identity.step;
+    }
+  }
+
   _x0oo.session = _x0oo.session || template.session;
   _x0oo.session.enabled = _x0oo.session.enabled ?? template.session.enabled;
   _x0oo.session.timeout = _x0oo.session.timeout ?? template.session.timeout;

package/package.json

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