isite 2023.1.7 → 2023.1.8

package/apps/client-side/app.js

@@ -179,7 +179,6 @@ module.exports = function (site) {
       __dirname + '/site_files/css/fonts.css',
       __dirname + '/site_files/css/font-droid.css',
       __dirname + '/site_files/css/effect.css',
-      __dirname + '/site_files/css/scrollbar.css',
       __dirname + '/site_files/css/table.css',
       __dirname + '/site_files/css/treeview.css',
       __dirname + '/site_files/css/tabs.css',

package/apps/client-side/site_files/css/dropdown.css

@@ -85,6 +85,3 @@
 .ar .dropdown-item small{
     text-align: right;
 }
-.dropdown-content::-webkit-scrollbar {
-    width: 5px;
-}

package/apps/client-side/site_files/css/effect.css

@@ -1,4 +1,9 @@
 @media all {
+  .loaded,
+  .hide {
+    visibility: collapse;
+  }
+
   .flex,
   .display-flex {
     display: flex !important;

package/apps/client-side/site_files/css/layout.css

@@ -49,18 +49,14 @@ h2 {
 h3 {
   font-size: clamp(14px, 1vw, 2vw);
 }
-.loaded {
-  visibility: collapse;
-}
+
 
 .hidden,
 .hidden:is([class^='col']) {
   display: none !important;
 }
 
-.hide {
-  visibility: collapse;
-}
+
 
 .mobile {
   display: none !important;

package/apps/client-side/site_files/js/angular.min.js

@@ -349,4 +349,3 @@ var m=je(l,c,b);d.$observe("pattern",function(a){var d=m;m=je(a,c,b);(d&&d.toStr
 b?0:a.length-b-1}a.value("$locale",{DATETIME_FORMATS:{AMPMS:["AM","PM"],DAY:"Sunday Monday Tuesday Wednesday Thursday Friday Saturday".split(" "),ERANAMES:["Before Christ","Anno Domini"],ERAS:["BC","AD"],FIRSTDAYOFWEEK:6,MONTH:"January February March April May June July August September October November December".split(" "),SHORTDAY:"Sun Mon Tue Wed Thu Fri Sat".split(" "),SHORTMONTH:"Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec".split(" "),STANDALONEMONTH:"January February March April May June July August September October November December".split(" "),
 WEEKENDRANGE:[5,6],fullDate:"EEEE, MMMM d, y",longDate:"MMMM d, y",medium:"MMM d, y h:mm:ss a",mediumDate:"MMM d, y",mediumTime:"h:mm:ss a","short":"M/d/yy h:mm a",shortDate:"M/d/yy",shortTime:"h:mm a"},NUMBER_FORMATS:{CURRENCY_SYM:"$",DECIMAL_SEP:".",GROUP_SEP:",",PATTERNS:[{gSize:3,lgSize:3,maxFrac:3,minFrac:0,minInt:1,negPre:"-",negSuf:"",posPre:"",posSuf:""},{gSize:3,lgSize:3,maxFrac:2,minFrac:2,minInt:1,negPre:"-\u00a4",negSuf:"",posPre:"\u00a4",posSuf:""}]},id:"en-us",localeID:"en_US",pluralCat:function(a,
 c){var e=a|0,f=c;void 0===f&&(f=Math.min(b(a),3));Math.pow(10,f);return 1==e&&0==f?"one":"other"}})}]),x(function(){Ee(z.document,Wc)}))})(window);!window.angular.$$csp().noInlineStyle&&window.angular.element(document.head).prepend(window.angular.element("<style>").text('@charset "UTF-8";[ng\\:cloak],[ng-cloak],[data-ng-cloak],[x-ng-cloak],.ng-cloak,.x-ng-cloak,.ng-hide:not(.ng-hide-animate){display:none !important;}ng\\:form{display:block;}.ng-animate-shim{visibility:hidden;}.ng-anchor{position:absolute;}'));
-//# sourceMappingURL=angular.min.js.map

package/apps/client-side/site_files/js/base64.min.js

@@ -0,0 +1 @@
+(function(t,n){var r,e;"object"==typeof exports&&"undefined"!=typeof module?module.exports=n():"function"==typeof define&&define.amd?define(n):(r=t.Base64,e=n(),e.noConflict=function(){return t.Base64=r,e},t.Meteor&&(Base64=e),t.Base64=e)})("undefined"!=typeof self?self:"undefined"!=typeof window?window:"undefined"!=typeof global?global:this,function(){"use strict";var t,n,r="3.7.2",e=r,o="function"==typeof atob,u="function"==typeof btoa,i="function"==typeof Buffer,f="function"==typeof TextDecoder?new TextDecoder:void 0,c="function"==typeof TextEncoder?new TextEncoder:void 0,a="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",d=Array.prototype.slice.call(a),s=(t=d,n={},t.forEach(function(t,r){return n[t]=r}),n),l=/^(?:[A-Za-z\d+\/]{4})*?(?:[A-Za-z\d+\/]{2}(?:==)?|[A-Za-z\d+\/]{3}=?)?$/,h=String.fromCharCode.bind(String),p="function"==typeof Uint8Array.from?Uint8Array.from.bind(Uint8Array):function(t,n){return void 0===n&&(n=function(t){return t}),new Uint8Array(Array.prototype.slice.call(t,0).map(n))},y=function(t){return t.replace(/=/g,"").replace(/[+\/]/g,function(t){return"+"==t?"-":"_"})},A=function(t){return t.replace(/[^A-Za-z0-9\+\/]/g,"")},b=function(t){for(var n,r,e,o,u="",i=t.length%3,f=0;f<t.length;){if((r=t.charCodeAt(f++))>255||(e=t.charCodeAt(f++))>255||(o=t.charCodeAt(f++))>255)throw new TypeError("invalid character found");n=r<<16|e<<8|o,u+=d[n>>18&63]+d[n>>12&63]+d[n>>6&63]+d[63&n]}return i?u.slice(0,i-3)+"===".substring(i):u},g=u?function(t){return btoa(t)}:i?function(t){return Buffer.from(t,"binary").toString("base64")}:b,B=i?function(t){return Buffer.from(t).toString("base64")}:function(t){for(var n=4096,r=[],e=0,o=t.length;e<o;e+=n)r.push(h.apply(null,t.subarray(e,e+n)));return g(r.join(""))},x=function(t,n){return void 0===n&&(n=!1),n?y(B(t)):B(t)},C=function(t){if(t.length<2){var n=t.charCodeAt(0);return n<128?t:n<2048?h(192|n>>>6)+h(128|63&n):h(224|n>>>12&15)+h(128|n>>>6&63)+h(128|63&n)}n=65536+1024*(t.charCodeAt(0)-55296)+(t.charCodeAt(1)-56320);return h(240|n>>>18&7)+h(128|n>>>12&63)+h(128|n>>>6&63)+h(128|63&n)},m=/[\uD800-\uDBFF][\uDC00-\uDFFFF]|[^\x00-\x7F]/g,v=function(t){return t.replace(m,C)},U=i?function(t){return Buffer.from(t,"utf8").toString("base64")}:c?function(t){return B(c.encode(t))}:function(t){return g(v(t))},F=function(t,n){return void 0===n&&(n=!1),n?y(U(t)):U(t)},w=function(t){return F(t,!0)},S=/[\xC0-\xDF][\x80-\xBF]|[\xE0-\xEF][\x80-\xBF]{2}|[\xF0-\xF7][\x80-\xBF]{3}/g,E=function(t){switch(t.length){case 4:var n=(7&t.charCodeAt(0))<<18|(63&t.charCodeAt(1))<<12|(63&t.charCodeAt(2))<<6|63&t.charCodeAt(3),r=n-65536;return h(55296+(r>>>10))+h(56320+(1023&r));case 3:return h((15&t.charCodeAt(0))<<12|(63&t.charCodeAt(1))<<6|63&t.charCodeAt(2));default:return h((31&t.charCodeAt(0))<<6|63&t.charCodeAt(1))}},D=function(t){return t.replace(S,E)},R=function(t){if(t=t.replace(/\s+/g,""),!l.test(t))throw new TypeError("malformed base64.");t+="==".slice(2-(3&t.length));for(var n,r,e,o="",u=0;u<t.length;)n=s[t.charAt(u++)]<<18|s[t.charAt(u++)]<<12|(r=s[t.charAt(u++)])<<6|(e=s[t.charAt(u++)]),o+=64===r?h(n>>16&255):64===e?h(n>>16&255,n>>8&255):h(n>>16&255,n>>8&255,255&n);return o},z=o?function(t){return atob(A(t))}:i?function(t){return Buffer.from(t,"base64").toString("binary")}:R,T=i?function(t){return p(Buffer.from(t,"base64"))}:function(t){return p(z(t),function(t){return t.charCodeAt(0)})},Z=function(t){return T(I(t))},j=i?function(t){return Buffer.from(t,"base64").toString("utf8")}:f?function(t){return f.decode(T(t))}:function(t){return D(z(t))},I=function(t){return A(t.replace(/[-_]/g,function(t){return"-"==t?"+":"/"}))},O=function(t){return j(I(t))},P=function(t){if("string"!=typeof t)return!1;var n=t.replace(/\s+/g,"").replace(/={0,2}$/,"");return!/[^\s0-9a-zA-Z\+/]/.test(n)||!/[^\s0-9a-zA-Z\-_]/.test(n)},L=function(t){return{value:t,enumerable:!1,writable:!0,configurable:!0}},V=function(){var t=function(t,n){return Object.defineProperty(String.prototype,t,L(n))};t("fromBase64",function(){return O(this)}),t("toBase64",function(t){return F(this,t)}),t("toBase64URI",function(){return F(this,!0)}),t("toBase64URL",function(){return F(this,!0)}),t("toUint8Array",function(){return Z(this)})},_=function(){var t=function(t,n){return Object.defineProperty(Uint8Array.prototype,t,L(n))};t("toBase64",function(t){return x(this,t)}),t("toBase64URI",function(){return x(this,!0)}),t("toBase64URL",function(){return x(this,!0)})},k=function(){V(),_()},M={version:r,VERSION:e,atob:z,atobPolyfill:R,btoa:g,btoaPolyfill:b,fromBase64:O,toBase64:F,encode:F,encodeURI:w,encodeURL:w,utob:v,btou:D,decode:O,isValid:P,fromUint8Array:x,toUint8Array:Z,extendString:V,extendUint8Array:_,extendBuiltins:k,Base64:{}};return Object.keys(M).forEach(function(t){return M.Base64[t]=M[t]}),M});

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';
@@ -1214,10 +1214,9 @@ app.directive('iUpload', [
                   $(progress).show();
                   progress.value = e.loaded;
                   progress.max = e.total;
-                }
-
-                if (data) {
-                  $scope.onUploaded(data);
+                  if (e.loaded == e.total && $scope.onUploaded) {
+                    $scope.onUploaded();
+                  }
                 }
               }
             );

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');

package/lib/mongodb.js

@@ -2,9 +2,14 @@ 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.protocal + ____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;
+    }
+  } else {
+    url = encodeURI(____0.options.mongodb.url);
   }
 
   const _mongo = function () {};
@@ -12,7 +17,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 +580,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/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',
@@ -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')) {
@@ -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.08",
   "description": "Create Secure Multi-Language Web Site [Fast and Easy] ",
   "main": "index.js",
   "repository": {