isite 2023.1.6 → 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',
@@ -262,6 +261,82 @@ module.exports = function (site) {
     res.download(site.options.upload_dir + '/' + req.params.category + '/images/' + req.params.name);
   });
 
+  site.post({ name: '/x-api/upload/audio', public: true }, (req, res) => {
+    site.createDir(site.options.upload_dir + '/' + req.headers['folder'], () => {
+      site.createDir(site.options.upload_dir + '/' + req.headers['folder'] + '/audios', () => {
+        let response = {
+          audio: {},
+          done: !0,
+        };
+        let file = req.files.fileToUpload;
+        if (file) {
+          let newName = 'audio_' + new Date().getTime().toString() + Math.random().toString() + site.path.extname(file.originalFilename);
+          let newpath = site.path.resolve(site.options.upload_dir + '/' + req.headers['folder'] + '/audios/' + newName);
+          site.mv(file.filepath, newpath, function (err) {
+            if (err) {
+              response.error = err;
+              response.done = !1;
+            } else {
+              response.audio.name = file.originalFilename;
+              response.audio.path = newpath;
+              response.audio.url = '/x-api/audio/' + req.headers['folder'] + '/' + newName;
+              response.audio.size = file.size;
+            }
+            res.json(response);
+          });
+        } else {
+          response.error = 'no file';
+          response.done = !1;
+          res.json(response);
+        }
+      });
+    });
+  });
+
+  site.get({ name: '/x-api/audio/:category/:name', public: true }, (req, res) => {
+    res.set('Cache-Control', 'public, max-age=2592000');
+    res.download(site.options.upload_dir + '/' + req.params.category + '/audios/' + req.params.name);
+  });
+
+
+  site.post({ name: '/x-api/upload/video', public: true }, (req, res) => {
+    site.createDir(site.options.upload_dir + '/' + req.headers['folder'], () => {
+      site.createDir(site.options.upload_dir + '/' + req.headers['folder'] + '/videos', () => {
+        let response = {
+          video: {},
+          done: !0,
+        };
+        let file = req.files.fileToUpload;
+        if (file) {
+          let newName = 'video_' + new Date().getTime().toString() + Math.random().toString() + site.path.extname(file.originalFilename);
+          let newpath = site.path.resolve(site.options.upload_dir + '/' + req.headers['folder'] + '/videos/' + newName);
+          site.mv(file.filepath, newpath, function (err) {
+            if (err) {
+              response.error = err;
+              response.done = !1;
+            } else {
+              response.video.name = file.originalFilename;
+              response.video.path = newpath;
+              response.video.url = '/x-api/video/' + req.headers['folder'] + '/' + newName;
+              response.video.size = file.size;
+            }
+            res.json(response);
+          });
+        } else {
+          response.error = 'no file';
+          response.done = !1;
+          res.json(response);
+        }
+      });
+    });
+  });
+
+  site.get({ name: '/x-api/video/:category/:name', public: true }, (req, res) => {
+    res.set('Cache-Control', 'public, max-age=2592000');
+    res.download(site.options.upload_dir + '/' + req.params.category + '/videos/' + req.params.name);
+  });
+
+
   site.post({ name: '/x-api/upload/file', public: true }, (req, res) => {
     site.createDir(site.options.upload_dir + '/' + req.headers['folder'], () => {
       site.createDir(site.options.upload_dir + '/' + req.headers['folder'] + '/files', () => {

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

@@ -62,10 +62,13 @@ fieldset legend {
   font-weight: var(--legend-font-weight);
   background: var(--fieldset-background);
   border: var(--legend-border);
-  float: none;
+  float: left;
   width: auto;
   padding: 5px;
 }
+.ar fieldset legend{
+  float: right;
+}
 legend::after {
   content: ' : ';
 }
@@ -193,3 +196,25 @@ i-datetime.is-invalid .row {
 .v-tabs .nav-link.active::before {
   opacity: 1;
 }
+
+i-audio {
+  background: #fff;
+  border: 1px solid #ddd;
+  display: block;
+  padding: 5px;
+}
+i-audio audio {
+  vertical-align: bottom;
+}
+i-video {
+  border: 1px solid #4caf50;
+  padding: 5px;
+  display: block;
+}
+i-audio .btn {
+  vertical-align: top;
+}
+
+i-video video {
+  max-height: 50vh;
+}

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/images.css

@@ -1,29 +1,49 @@
+
 .image {
   width: 400px;
   height: 300px;
   border-radius: 10px;
 }
-.logo {
-  width: 48px !important;
-  height: 48px !important;
-  border-radius: 5px;
-}
 
 i-image {
   display: block;
   width: 90% !important;
   height: 90% !important;
   border: var(--i-image-border);
+  margin: 5px;
+  border-radius: 5px;
 }
+i-image div{
+  width: 100%;
+  height: 100%;
+}
+i-image button i{
+  width: 100%;
+}
+i-image.logo {
+  width: 48px !important;
+  height: 48px !important;
+  border-radius: 5px;
+}
+.logo img {
+  width: 44px !important;
+  height: 44px !important;
+}
+
+
 i-image img {
-  width: auto;
-  min-height: 32px;
+  width: 100%;
+  height: 100%;
   object-fit: fill;
   background-size: contain;
   background-position: center;
   background-repeat: no-repeat;
 }
 
+i-image i-button {
+  display: none;
+}
+
 i-image.full img {
   width: 100% !important;
   height: auto !important;
@@ -94,12 +114,14 @@ i-image.img256 {
   padding: 3px !important;
 }
 i-image.img256 img {
-  width: 245px !important;
-  height: 245px !important;
-  min-width: 245px !important;
-  min-height: 245px !important;
+  width: 200px !important;
+  height: 200px !important;
+  min-width: 200px !important;
+  min-height: 200px !important;
+}
+i-image.img256 i-button {
+  display: inline-block;
 }
-
 i-image.hover img:hover {
   transform: scale(1.1);
 }

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/html/directive/i-audio.html

@@ -0,0 +1,14 @@
+<div class="text-center pointer">
+  <input class="hidden" type="file" name="fileToUpload" accept="{{accept}}" />
+  <div class="center">
+    <audio controls>
+      Your browser does not support the audio element.
+    </audio>
+    <i-button type="upload" ng-click="upload()"></i-button>
+    <i-button type="delete" ng-click="delete()"></i-button>
+  </div>
+
+  <div class="progress row">
+    <div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" aria-valuenow="{{value}}" aria-valuemin="0" aria-valuemax="100"></div>
+  </div>
+</div>

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

@@ -1,5 +1,5 @@
 <div class="mb-3 {{class2}}">
-  <label for="{{id2}}" class="form-label">{{label}}</label>
+  <label for="{{id2}}" class="form-label"> <span class="red bold"> {{requird}} </span> {{label}}</label>
   <input id="{{id2}}" ng-disabled="disabled" autofocus v="{{v}}" type="{{type}}" ng-model="ngModel" ng-change="ngChange()" ngKeydown="ngKeydown()" class="form-control" placeholder="{{placeholder}}" aria-label="{{label}}" />
   <div class="invalid-feedback"></div>
 </div>

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

@@ -1,7 +1,12 @@
 <div class="text-center pointer">
   <input class="hidden" type="file" name="fileToUpload" accept="{{accept}}" />
-  <img class="rounded" ng-src="{{ngModel.url}}" ngClick="ngClick()" onerror="this.src='/images/no.jpg'" />
+  <div class="center">
+    <img ng-src="{{ngModel.url}}" ngClick="ngClick()" onerror="this.src='/images/no.jpg'" ng-click="upload()" />
+    <i-button type="upload" ng-click="upload()"></i-button>
+    <i-button type="delete" ng-click="delete()"></i-button>
+  </div>
+
   <div class="progress row">
-    <div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" aria-valuenow="{{value}}" aria-valuemin="0" aria-valuemax="100" style="width: {{value}}%"></div>
+    <div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" aria-valuenow="{{value}}" aria-valuemin="0" aria-valuemax="100"></div>
   </div>
 </div>

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

@@ -1,6 +1,6 @@
 <div class="dropdown i-list">
   <div class="mb-3 {{class2}}">
-    <label class="form-label"> {{label}} </label>
+    <label class="form-label"> <span class="red bold"> {{requird}} </span> {{label}} </label>
     <input ng-focus="focus()" class="full-width text dropdown-text form-control {{css}}" ng-disabled="disabled" v="{{v}}" readonly ng-model="ngModel.$display" />
   </div>
 

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

@@ -0,0 +1,15 @@
+<div class="text-center pointer">
+  <input class="hidden" type="file" name="fileToUpload" accept="{{accept}}" />
+  <div class="center">
+    <div class="row">
+      <video controls>Your browser does not support the video element.</video>
+    </div>
+    <i-button type="upload" ng-click="upload()"></i-button>
+    <i-button type="delete" ng-click="delete()"></i-button>
+  </div>
+  <div class="row padding">
+    <div class="progress row">
+      <div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" aria-valuenow="{{value}}" aria-valuemin="0" aria-valuemax="100"></div>
+    </div>
+  </div>
+</div>

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

@@ -16,7 +16,11 @@ app.directive('iControl', function () {
     link: function ($scope, element, attrs, ctrl) {
       attrs.type = attrs.type || 'text';
       $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 {
@@ -88,7 +92,13 @@ app.directive('iContent', function ($timeout, $interval) {
         .focus(() => {
           $('.popup').hide();
         });
-      $timeout(() => {
+      $scope.handelContentElement = function () {
+        if (!document.querySelector('#' + $scope.id2)) {
+          $timeout(() => {
+            $scope.handelContentElement();
+          }, 1000);
+          return false;
+        }
         window['content_' + attrs.id] = WebShareEditor.create($scope.id2, {
           toolbarItem: [
             ['undo', 'redo'],
@@ -106,17 +116,21 @@ app.directive('iContent', function ($timeout, $interval) {
           width: '100%',
           minHeight: '300px',
         });
-        if ($scope.ngModel) {
+        if ($scope.ngModel && window['content_' + attrs.id]) {
           window['content_' + attrs.id].setContents($scope.ngModel);
         }
         $interval(() => {
-          $scope.ngModel2 = window['content_' + attrs.id].getContents();
-          if ($scope.ngModel !== $scope.ngModel2) {
-            $scope.ngModel = $scope.ngModel2;
-            $scope.changed();
+          if (window['content_' + attrs.id]) {
+            $scope.ngModel2 = window['content_' + attrs.id].getContents();
+            if ($scope.ngModel !== $scope.ngModel2) {
+              $scope.ngModel = $scope.ngModel2;
+              $scope.changed();
+            }
           }
         }, 1000);
-      }, 500);
+      };
+
+      $scope.handelContentElement();
 
       $scope.changed = function () {
         $timeout(() => {
@@ -128,7 +142,7 @@ app.directive('iContent', function ($timeout, $interval) {
 
       $scope.$watch('ngModel', (ngModel) => {
         if (ngModel && window['content_' + attrs.id]) {
-          if ($scope.ngModel !== $scope.ngModel2) {
+          if ($scope.ngModel2 && $scope.ngModel !== $scope.ngModel2) {
             $scope.ngModel = $scope.ngModel2;
             window['content_' + attrs.id].setContents($scope.ngModel);
           }
@@ -249,11 +263,20 @@ 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-long-arrow-alt-down';
+        $scope.fa = 'fas fa-plus-circle';
         $scope.class = 'btn-primary';
       } else if ($scope.type.like('*cancel*')) {
         $scope.fa = 'fas fa-minus-circle';
         $scope.class = 'btn-danger';
+      } else if ($scope.type.like('*upload*')) {
+        $scope.fa = 'fas fa-upload';
+        $scope.class = 'btn-primary';
+      } else if ($scope.type.like('*up*')) {
+        $scope.fa = 'fas fa-long-arrow-alt-up';
+        $scope.class = 'btn-light';
+      } else if ($scope.type.like('*down*')) {
+        $scope.fa = 'fas fa-long-arrow-alt-down';
+        $scope.class = 'btn-light';
       }
       if ($scope.type.like('*default*')) {
         $scope.class = '';
@@ -304,7 +327,11 @@ app.directive('iList', [
         $scope.display2 = $scope.display2 || '';
         $scope.space = $scope.space || ' - ';
         attrs.ngValue = attrs.ngValue || '';
-
+        $scope.v = $scope.v || '';
+        $scope.requird = '';
+        if ($scope.v.like('*r*')) {
+          $scope.requird = '*';
+        }
         $scope.searchElement = $(element).find('.dropdown .search');
         $scope.popupElement = $(element).find('.dropdown .dropdown-content');
 
@@ -411,8 +438,6 @@ app.directive('iList', [
               }
             });
           }
-
-                
         });
 
         $scope.$watch('ngModel', (ngModel) => {
@@ -594,7 +619,6 @@ app.directive('iDate', function () {
       $scope.dayTitle = 'Day';
       $scope.monthTitle = 'Month';
       $scope.yearTitle = 'Year';
-     
 
       $scope.lang = site.session ? site.session.lang : 'en';
       if ($scope.lang === 'ar') {
@@ -654,7 +678,8 @@ app.directive('iDate', function () {
       };
       $scope.updateDate = function (date) {
         if ($scope.model.selectedDay && $scope.model.selectedMonth && $scope.model.selectedYear) {
-          $scope.ngModel = new Date($scope.model.selectedYear.id, $scope.model.selectedMonth.id, $scope.model.selectedDay.id, 0, 0, 0);
+          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());
           $scope.editOnly = false;
           if ($scope.ngChange) {
             $scope.ngChange();
@@ -927,11 +952,15 @@ app.directive('iImage', [
         let progress = $(element).find('.progress')[0];
         $(progress).hide();
 
-        if (!$scope.viewOnly) {
-          img.addEventListener('click', function () {
+        $scope.upload = function () {
+          if (!$scope.viewOnly) {
             input.click();
-          });
-        }
+          }
+        };
+        $scope.delete = function () {
+          img.src = null;
+          $scope.ngModel = null;
+        };
 
         input.addEventListener('change', function () {
           isite.uploadImage(
@@ -944,6 +973,7 @@ app.directive('iImage', [
                 $(progress).show();
                 $scope.value = (e.loaded / e.total) * 100;
                 $scope.max = e.total;
+                $(progress).css('width', $scope.value);
                 if ($scope.value === 100) {
                   $(progress).hide();
                 }
@@ -971,6 +1001,181 @@ app.directive('iImage', [
     };
   },
 ]);
+
+app.directive('iAudio', [
+  '$interval',
+  'isite',
+  '$timeout',
+  function ($interval, isite, $timeout) {
+    return {
+      restrict: 'E',
+      required: 'ngModel',
+      scope: {
+        folder: '@',
+        view: '@',
+        accept: '@',
+        ngModel: '=',
+        ngClick: '&',
+        ngChange: '&',
+      },
+      link: function ($scope, element, attrs, ctrl) {
+        $scope.folder = $scope.folder || 'default';
+        $scope.accept = $scope.accept ? $scope.accept : '.mp3';
+        $scope.viewOnly = $scope.view === undefined ? false : true;
+
+        let input = $(element).find('input')[0];
+        let audio = $(element).find('audio')[0];
+        let progress = $(element).find('.progress')[0];
+        $(progress).hide();
+
+        $scope.upload = function () {
+          if (!$scope.viewOnly) {
+            input.click();
+          }
+        };
+        $scope.delete = function () {
+          $scope.ngModel = null;
+          audio.setAttribute('src', null);
+        };
+
+        input.addEventListener('change', function () {
+          isite.uploadAudio(
+            this.files,
+            {
+              folder: $scope.folder,
+            },
+            (err, audio, e) => {
+              if (e) {
+                $(progress).show();
+                $scope.value = (e.loaded / e.total) * 100;
+                $scope.max = e.total;
+                $(progress).css('width', $scope.value);
+                if ($scope.value === 100) {
+                  $(progress).hide();
+                }
+              }
+
+              if (audio) {
+                $scope.ngModel = audio;
+                if ($scope.ngChange) {
+                  $timeout(() => {
+                    $scope.ngChange();
+                  }, 200);
+                }
+              }
+            }
+          );
+        });
+
+        $scope.$watch('ngModel', (ngModel) => {
+          if (ngModel) {
+            audio.setAttribute('src', ngModel.url);
+            audio.setAttribute('type', 'audio/mpeg');
+          }
+        });
+      },
+      template: `/*##client-side/directive/i-audio.html*/`,
+    };
+  },
+]);
+
+app.directive('iVideo', [
+  '$interval',
+  'isite',
+  '$timeout',
+  function ($interval, isite, $timeout) {
+    return {
+      restrict: 'E',
+      required: 'ngModel',
+      scope: {
+        folder: '@',
+        view: '@',
+        accept: '@',
+        ngModel: '=',
+        ngClick: '&',
+        ngChange: '&',
+      },
+      link: function ($scope, element, attrs, ctrl) {
+        $scope.folder = $scope.folder || 'default';
+        $scope.accept = $scope.accept ? $scope.accept : '.mp4';
+        $scope.viewOnly = $scope.view === undefined ? false : true;
+
+        let input = $(element).find('input')[0];
+        let video = $(element).find('video')[0];
+        let progress = $(element).find('.progress')[0];
+        $(progress).hide();
+
+        $scope.upload = function () {
+          if (!$scope.viewOnly) {
+            input.click();
+          }
+        };
+        $scope.delete = function () {
+          console.log('delete ...');
+          $scope.ngModel = null;
+          video.setAttribute('src', null);
+        };
+
+        input.addEventListener('change', function () {
+          isite.uploadVideo(
+            this.files,
+            {
+              folder: $scope.folder,
+            },
+            (err, video, e) => {
+              if (e) {
+                $(progress).show();
+                $scope.value = (e.loaded / e.total) * 100;
+                $scope.max = e.total;
+                $(progress).css('width', $scope.value);
+                if ($scope.value === 100) {
+                  $(progress).hide();
+                }
+              }
+
+              if (video) {
+                $scope.ngModel = video;
+                if ($scope.ngChange) {
+                  $timeout(() => {
+                    $scope.ngChange();
+                  }, 200);
+                }
+              }
+            }
+          );
+        });
+
+        $scope.capture = function () {
+          let canvas = document.createElement('canvas');
+          canvas.width = video.videoWidth / 4;
+          canvas.height = video.videoHeight / 4;
+          canvas.getContext('2d').drawImage(video, 0, 0, canvas.width, canvas.height);
+          $scope.ngModel.imageURL = canvas.toDataURL('image/jpeg');
+        };
+
+        video.addEventListener(
+          'canplay',
+          function (e) {
+            $timeout(() => {
+              $scope.capture();
+            }, 2000);
+          },
+          false
+        );
+
+        $scope.$watch('ngModel', (ngModel) => {
+          if (ngModel) {
+            video.setAttribute('src', ngModel.url);
+            video.setAttribute('type', 'video/mp4');
+            video.load();
+          }
+        });
+      },
+      template: `/*##client-side/directive/i-video.html*/`,
+    };
+  },
+]);
+
 app.directive('iUpload', [
   '$interval',
   'isite',
@@ -1009,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/directive-core.js

@@ -96,6 +96,80 @@ app.service('isite', [
         );
     };
 
+    this.uploadAudio = function (files, options, callback) {
+      options = Object.assign(
+        {
+          category: 'default',
+        },
+        options
+      );
+      callback = callback || function () {};
+
+      var fd = new FormData();
+      fd.append('fileToUpload', files[0]);
+      $http
+        .post('/x-api/upload/audio', fd, {
+          withCredentials: !0,
+          headers: {
+            'Content-Type': undefined,
+            folder: options.folder,
+          },
+          uploadEventHandlers: {
+            progress: function (e) {
+              callback(null, null, e);
+            },
+          },
+          transformRequest: angular.identity,
+        })
+        .then(
+          function (res) {
+            if (res.data && res.data.done) {
+              callback(null, res.data.audio);
+            }
+          },
+          function (error) {
+            callback(error, null, null);
+          }
+        );
+    };
+
+    this.uploadVideo = function (files, options, callback) {
+      options = Object.assign(
+        {
+          category: 'default',
+        },
+        options
+      );
+      callback = callback || function () {};
+
+      var fd = new FormData();
+      fd.append('fileToUpload', files[0]);
+      $http
+        .post('/x-api/upload/video', fd, {
+          withCredentials: !0,
+          headers: {
+            'Content-Type': undefined,
+            folder: options.folder,
+          },
+          uploadEventHandlers: {
+            progress: function (e) {
+              callback(null, null, e);
+            },
+          },
+          transformRequest: angular.identity,
+        })
+        .then(
+          function (res) {
+            if (res.data && res.data.done) {
+              callback(null, res.data.video);
+            }
+          },
+          function (error) {
+            callback(error, null, null);
+          }
+        );
+    };
+
     this.uploadFile = function (files, options, callback) {
       options = Object.assign(
         {

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

@@ -585,21 +585,30 @@
   };
 
   site.showTabContent = function (e, tabContentSelector) {
-    let parent = document.querySelector(tabContentSelector).parentNode.parentNode;
-
-    parent.querySelectorAll('.tab-content').forEach((tabContent) => {
-      tabContent.style.display = 'none';
-    });
-    parent.querySelectorAll('.tab-link').forEach((tabLink) => {
-      tabLink.className = tabLink.className.replace(' active', '');
-    });
-
-    document.querySelectorAll(tabContentSelector + '.tab-content').forEach((el) => {
-      el.style.display = 'block';
-    });
+    tabContentSelector = tabContentSelector || e;
+    let tabContent = document.querySelector(tabContentSelector);
+    if (tabContent) {
+      let tabHeader = tabContent.parentNode;
+      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') && tabLink.getAttribute('onclick').contains(tabContentSelector + "'")) {
+              tabLink.classList.add('active');
+            } else {
+              tabLink.classList.remove('active');
+            }
+          });
 
-    if (e) {
-      e.currentTarget.className += ' active';
+          tabs.querySelectorAll(tabContentSelector + '.tab-content').forEach((el) => {
+            el.style.display = 'block';
+          });
+        }
+      }
     }
   };
 

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();
@@ -458,6 +490,39 @@ module.exports = function init(req, res, ____0, route) {
       }
     });
 
+    $('[x-data]').each(function (i, elem) {
+      let property = $(elem).attr('x-data').split('.');
+      let out = null;
+      if (property.length > 0) {
+        if (property.length > 0) {
+          out = req.data[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();
+      }
+    });
+
     $('[x-permission]').each(function (i, elem) {
       if (!____0.security.isUserHasPermission(req, res, $(this).attr('x-permission'))) {
         $(this).remove();
@@ -574,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')) {
@@ -613,6 +676,10 @@ module.exports = function init(req, res, ____0, route) {
       $(handleXList1($, elem, req.data)).insertAfter($(this));
       $(this).remove();
     });
+    $('[x-list2]').each(function (i, elem) {
+      $(handleXList2($, elem, req.data)).insertAfter($(this));
+      $(this).remove();
+    });
     return $;
   }
 

package/lib/sessions.js

@@ -98,14 +98,13 @@ module.exports = function init(____0) {
     session.$exists = !1;
 
     if (session.accessToken) {
-      sessions.list.forEach((s, i) => {
-        if (s && s.accessToken && s.accessToken == session.accessToken) {
-          session.$exists = !0;
-          session.$index = i;
-          sessions.list[session.$index].requestesCount++;
-        }
-      });
-      if (!session.$exists) {
+      let index = sessions.list.findIndex(s=> s && s.accessToken && s.accessToken === session.accessToken);
+      if(index > -1){
+        sessions.list[index].requestesCount++;
+        session.$exists = !0;
+        session.$index = index;
+        callback(sessions.list[index]);
+      }else {
         if (____0.options.session.storage === 'mongodb') {
           sessions.$collection.find({ accessToken: session.accessToken }, (err, doc) => {
             if (!err && doc) {
@@ -140,8 +139,6 @@ module.exports = function init(____0) {
           sessions.list.push(session);
           callback(sessions.list[session.$index]);
         }
-      } else {
-        callback(sessions.list[session.$index]);
       }
     } else {
       session.$new = !0;

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.06",
+  "version": "2023.01.08",
   "description": "Create Secure Multi-Language Web Site [Fast and Easy] ",
   "main": "index.js",
   "repository": {