isite 2023.12.15 → 2023.12.16

package/apps/client-side/app.js

@@ -243,7 +243,7 @@ module.exports = function (site) {
   });
 
   site.post({ name: '/x-api/upload/image', public: true }, (req, res) => {
-    let folder = req.headers['folder'] || new Date().getFullYear() + '_' + new Date().getMonth() + '_' + new Date().getDate();
+    let folder = req.headers['folder'] || new Date().getFullYear() + '_' + (new Date().getMonth() + 1) + '_' + new Date().getDate();
 
     site.createDir(site.options.upload_dir + '/' + folder, () => {
       site.createDir(site.options.upload_dir + '/' + folder + '/images', () => {
@@ -268,13 +268,12 @@ module.exports = function (site) {
               response.image.path = newpath;
               response.image.url = '/x-api/image/' + folder + '/' + newName;
               response.image.size = file.size;
-              if (!response.image.name.like('*.webp')) {
+              if (!response.image.name.like('*.webp|*.gif')) {
                 site.webp.cwebp(newpath, newpath2, '-q 80').then((output) => {
-                  console.log(output);
                   response.image.path = newpath2;
                   response.image.url = '/x-api/image/' + folder + '/' + newName2;
                   res.json(response);
-                  site.fs.unlink(newpath, () => {});
+                  site.deleteFileSync(newpath, () => {});
                 });
               } else {
                 res.json(response);

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

@@ -114,12 +114,15 @@ i-button.default button {
 i-file {
   display: block;
   padding: 10px !important;
-  border: 1px dashed var(--theme-color);
+  border: 3px dashed var(--theme-color);
   margin: 1% !important;
   height: fit-content;
   width: 98% !important;
 }
-i-file button {
+i-file label {
+  margin-top: 10px !important;
+}
+i-file i-button {
   max-width: 100px;
 }
 i-upload {
@@ -131,19 +134,17 @@ i-datetime .left-10 {
 }
 i-date .fas,
 i-datetime .fas {
-  font-size: 24px;
-  vertical-align: middle;
-  margin-top: 5px;
-  cursor: pointer;
-}
-i-date .fas:hover,
-i-datetime .fas:hover {
-  font-size: 26px;
+  color: green;
 }
 i-date p,
 i-datetime p {
   margin: 0 !important;
 }
+i-date button,
+i-datetime button {
+  background: transparent !important;
+  margin: 0 !important;
+}
 i-date input,
 i-datetime input {
   margin: 0 !important;

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

@@ -12,6 +12,7 @@ i-image {
   border: var(--i-image-border);
   margin: 5px;
   border-radius: 5px;
+  padding: 5px;
 }
 i-image div{
   width: 100%;

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

@@ -98,7 +98,7 @@
   --btn-box-shadow-color: #272727;
   --btn-border-radius: 5px;
 
-  --i-image-border: 2px dashed var(--modal-header-background-color);
+  --i-image-border: 3px dashed var(--modal-header-background-color);
   --i-image-view-border: 2px solid var(--modal-header-background-color);
 
   --fieldset-border: 2px solid #283e4a;

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

@@ -99,7 +99,7 @@
     --btn-box-shadow-color: #030303;
     --btn-border-radius: 0px;
 
-    --i-image-border: 2px dashed #030303;
+    --i-image-border: 3px dashed #030303;
     --i-image-view-border: 2px solid #030303;
 
     --fieldset-border: 1px solid #151515;

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

@@ -129,7 +129,7 @@
     --btn-sgin-color: #000000;
     --btn-sgin-background-color: #ffffff;
 
-    --i-image-border: 2px dashed var(--theme-color);
+    --i-image-border: 3px dashed var(--theme-color);
     --i-image-view-border: 2px solid var(--theme-color);
 
     --fieldset-border: 1px solid var(--theme-color);

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

@@ -1,5 +1,5 @@
 <button class="btn {{class}} {{class2}}" type="button" ng-click="click()" ng-disabled="busy">
-  <span ng-show="busy" class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
+  <span ng-show="busy || clickBusy" class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
   {{label}}
   <i class="{{fa}}"></i>
 </button>

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

@@ -2,7 +2,8 @@
   <label for="{{id2}}" class="form-label"> <span class="red bold"> {{requird}} </span> {{label}}</label>
   <div class="row" ng-hide="editOnly">
     <p ng-click="editOnly = true" class="blue bold border padding pointer">
-      <span class="bold">{{model.selectedDay || '__'}} </span> <span class="orange"> / </span> <span class="bold">{{model.selectedMonth.name || '______'}}</span> <span class="orange"> / </span> <span class="bold">{{model.selectedYear || '____'}}</span>
+      <span class="bold">{{model.selectedDay || '__'}} </span> <span class="orange"> / </span> <span class="bold">{{model.selectedMonth.name || '______'}}</span> <span class="orange"> / </span>
+      <span class="bold">{{model.selectedYear || '____'}}</span>
     </p>
   </div>
   <div class="row" ng-show="editOnly">
@@ -21,7 +22,7 @@
       />
     </div>
     <div class="col2">
-      <i class="fas fa-save" ng-click="updateDate()"></i>
+      <i-button type="save" ng-click="updateDate()"></i-button>
     </div>
     <div class="invalid-feedback"></div>
   </div>

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

@@ -1,12 +1,11 @@
 <div class="row">
   <label class="col"> {{label}} </label>
-  <button ng-hide="ngModel || viewOnly" class="btn btn-primary col">
-    <i class="fas fa-upload"></i>
-  </button>
+  <i-button type="upload" ng-hide="ngModel || viewOnly" class="col"></i-button>
+
   <div class="row">
     <input class="hidden" type="file" name="fileToUpload" accept="{{accept}}" />
     <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-image.html

@@ -1,7 +1,7 @@
-<div class="text-center pointer">
+<div class="text-center pointer" ng-click="upload()">
   <input class="hidden" type="file" name="fileToUpload" accept="{{accept}}" />
   <div class="center">
-    <img ng-src="{{ngModel.url}}" ngClick="ngClick()" onerror="this.src='/images/no.jpg'" ng-click="upload()" />
+    <img ng-src="{{ngModel.url}}" ngClick="ngClick()" onerror="this.src='/images/no.jpg'" />
     <i-button type="upload" ng-click="upload()"></i-button>
     <i-button type="delete" ng-click="delete()"></i-button>
   </div>

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(null)"> <i class="fa fa-trash"></i> Clear </a>
+      <i-button class="block center" type="clear" ng-click="updateModel(null)" label="Clear"></i-button>
     </div>
   </div>
 </div>

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

@@ -1,5 +1,5 @@
 <form class="mb-3">
-    <input  class="hidden" type="file" name="file" />
-    <i-button type="{{type}}" fa="fas fa-upload" ngClick="ngClick()" url="{{ngModel}}" label="{{label}}"> </i-button>
-    <progress class="row"></progress>
-</form>
+  <input class="hidden" type="file" name="file" />
+  <i-button type="{{type}}" fa="fas fa-upload" ngClick="ngClick()" url="{{ngModel}}" label="{{label}}"> </i-button>
+  <progress class="row"></progress>
+</form>

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

@@ -204,106 +204,125 @@ app.directive('iRadio', function () {
   };
 });
 
-app.directive('iButton', function () {
-  return {
-    restrict: 'E',
-    scope: {
-      label: '@',
-      type: '@',
-      class2: '@',
-      loading: '@',
-      click: '&',
-      fa: '@',
-    },
-    link: function ($scope, element, attrs, ctrl) {
-      $scope.type = $scope.type || '';
-      $scope.class = $scope.class = 'btn-dark';
-      $scope.fa = $scope.fa || $scope.label ? '' : 'fas fa-play';
-
-      if ($scope.type.like('*add*|*new*')) {
-        $scope.fa = 'fas fa-plus';
-        $scope.class = 'btn-primary';
-      } else if ($scope.type.like('*update*|*edit*')) {
-        $scope.fa = 'fas fa-edit';
-        $scope.class = 'btn-warning';
-      } else if ($scope.type.like('*save*')) {
-        $scope.fa = 'fas fa-save';
-        $scope.class = 'btn-success';
-      } else if ($scope.type.like('*list*')) {
-        $scope.fa = 'fas fa-list';
-        $scope.class = 'btn-info';
-      } else if ($scope.type.like('unapprove')) {
-        $scope.fa = 'fas fa-eject';
-        $scope.class = 'btn-danger';
-      } else if ($scope.type.like('approve')) {
-        $scope.fa = 'fas fa-check-double';
-        $scope.class = 'btn-primary';
-      } else if ($scope.type.like('*view*|*details*|*show*')) {
-        $scope.fa = 'fas fa-eye';
-        $scope.class = 'btn-info';
-      } else if ($scope.type.like('*delete*|*remove*|*clear*')) {
-        $scope.fa = 'fas fa-trash';
-        $scope.class = 'btn-danger';
-      } else if ($scope.type.like('*exit*|*close*')) {
-        $scope.fa = 'fas fa-times-circle';
-        $scope.class = 'btn-danger';
-      } else if ($scope.type.like('*print*')) {
-        $scope.fa = 'fas fa-print';
-        $scope.class = 'btn-secondary';
-      } else if ($scope.type.like('*export*|*excel*') ) {
-        $scope.fa = 'fas fa-file-export';
-        $scope.class = 'btn-secondary';
-      } else if ($scope.type.like('*search*|*find*')) {
-        $scope.fa = 'fas fa-search';
-        $scope.class = 'btn-light';
-      } else if ($scope.type.like('*login*|*signin*')) {
-        $scope.fa = 'fas fa-sign-in-alt';
-        $scope.class = 'btn-light';
-      } else if ($scope.type.like('*logout*|*signout*')) {
-        $scope.fa = 'fas fa-sign-out-alt';
-        $scope.class = 'btn-light';
-      } else if ($scope.type.like('*push*')) {
-        $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';
-      } else if ($scope.type.like('*reset*')) {
-        $scope.fa = 'fas fa-sync-alt';
-        $scope.class = 'btn-light';
-      }else if ($scope.type.like('*stop*')) {
-        $scope.fa = 'fas fa-stop';
-        $scope.class = 'btn-light';
-      }else if ($scope.type.like('*copy*')) {
-        $scope.fa = 'fas fa-copy';
-        $scope.class = 'btn-light';
-      }
-      if ($scope.type.like('*default*')) {
-        $scope.class = '';
-      }
-      if ($scope.class2) {
-        $scope.class = $scope.class2;
-      }
-      $scope.$watch('loading', (loading) => {
-        if (loading === 'true') {
-          $scope.busy = true;
-        } else {
-          $scope.busy = false;
+app.directive('iButton', [
+  '$interval',
+  '$timeout',
+  function ($interval, $timeout) {
+    return {
+      restrict: 'E',
+      scope: {
+        label: '@',
+        type: '@',
+        class2: '@',
+        loading: '@',
+        ngClick: '&',
+        fa: '@',
+      },
+      link: function ($scope, element, attrs, ctrl) {
+        $scope.type = $scope.type || '';
+        $scope.class = $scope.class = 'btn-light';
+        $scope.fa = $scope.fa || $scope.label ? '' : 'fas fa-mouse-pointer';
+
+        if ($scope.type.like('*add*|*new*')) {
+          $scope.fa = 'fas fa-plus';
+          $scope.class = 'btn-primary';
+        } else if ($scope.type.like('*update*|*edit*')) {
+          $scope.fa = 'fas fa-edit';
+          $scope.class = 'btn-warning';
+        } else if ($scope.type.like('*save*')) {
+          $scope.fa = 'fas fa-save';
+          $scope.class = 'btn-success';
+        } else if ($scope.type.like('*list*')) {
+          $scope.fa = 'fas fa-list';
+          $scope.class = 'btn-info';
+        } else if ($scope.type.like('unapprove')) {
+          $scope.fa = 'fas fa-eject';
+          $scope.class = 'btn-danger';
+        } else if ($scope.type.like('approve')) {
+          $scope.fa = 'fas fa-check-double';
+          $scope.class = 'btn-primary';
+        } else if ($scope.type.like('*view*|*details*|*show*')) {
+          $scope.fa = 'fas fa-eye';
+          $scope.class = 'btn-info';
+        } else if ($scope.type.like('*delete*|*remove*|*clear*')) {
+          $scope.fa = 'fas fa-trash';
+          $scope.class = 'btn-danger';
+        } else if ($scope.type.like('*exit*|*close*')) {
+          $scope.fa = 'fas fa-times-circle';
+          $scope.class = 'btn-danger';
+        } else if ($scope.type.like('*print*')) {
+          $scope.fa = 'fas fa-print';
+          $scope.class = 'btn-secondary';
+        } else if ($scope.type.like('*export*|*excel*')) {
+          $scope.fa = 'fas fa-file-export';
+          $scope.class = 'btn-secondary';
+        } else if ($scope.type.like('*import*')) {
+          $scope.fa = 'fas fa-file-upload';
+          $scope.class = 'btn-secondary';
+        } else if ($scope.type.like('*search*|*find*')) {
+          $scope.fa = 'fas fa-search';
+          $scope.class = 'btn-light';
+        } else if ($scope.type.like('*login*|*signin*')) {
+          $scope.fa = 'fas fa-sign-in-alt';
+          $scope.class = 'btn-light';
+        } else if ($scope.type.like('*logout*|*signout*')) {
+          $scope.fa = 'fas fa-sign-out-alt';
+          $scope.class = 'btn-light';
+        } else if ($scope.type.like('*push*')) {
+          $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';
+        } else if ($scope.type.like('*reset*')) {
+          $scope.fa = 'fas fa-sync-alt';
+          $scope.class = 'btn-light';
+        } else if ($scope.type.like('*stop*')) {
+          $scope.fa = 'fas fa-stop';
+          $scope.class = 'btn-light';
+        } else if ($scope.type.like('*play*')) {
+          $scope.fa = 'far fa-play-circle';
+          $scope.class = 'btn-light';
+        } else if ($scope.type.like('*copy*')) {
+          $scope.fa = 'fas fa-copy';
+          $scope.class = 'btn-light';
         }
-      });
-    },
-    template: `/*##client-side/directive/i-button.html*/`,
-  };
-});
+        if ($scope.type.like('*default*')) {
+          $scope.class = '';
+        }
+        if ($scope.class2) {
+          $scope.class = $scope.class2;
+        }
+        $scope.click = function () {
+          $scope.clickBusy = true;
+          if ($scope.ngClick) {
+            $scope.ngClick();
+          }
+          $timeout(() => {
+            $scope.clickBusy = false;
+          }, 250);
+        };
+        $scope.$watch('loading', (loading) => {
+          if (loading === 'true') {
+            $scope.busy = true;
+          } else {
+            $scope.busy = false;
+          }
+        });
+      },
+      template: `/*##client-side/directive/i-button.html*/`,
+    };
+  },
+]);
 app.directive('iList', [
   '$interval',
   '$timeout',
@@ -596,7 +615,7 @@ app.directive('iChecklist', [
   },
 ]);
 
-app.directive('iDate', function () {
+app.directive('iDate', function ($timeout) {
   return {
     restrict: 'E',
     required: 'ngModel',
@@ -685,6 +704,7 @@ app.directive('iDate', function () {
         if ($scope.ngModel1) {
           $scope.ngModel = $scope.ngModel1;
           $scope.editOnly = false;
+
           if ($scope.ngChange) {
             $scope.ngChange();
           }
@@ -845,9 +865,10 @@ app.directive('iFile', [
         $scope.viewOnly = $scope.view === undefined ? false : true;
 
         let input = $(element).find('input')[0];
-        let button = $(element).find('button')[0];
+        let button = $(element).find('i-button')[0];
 
         let progress = $(element).find('.progress')[0];
+        let progressBar = $(element).find('.progress-bar')[0];
         $(progress).hide();
 
         $scope.id = Math.random().toString().replace('.', '_');
@@ -868,6 +889,7 @@ app.directive('iFile', [
               if (e) {
                 $(progress).show();
                 $scope.value = (e.loaded / e.total) * 100;
+                progressBar.style.width = $scope.value + '%';
                 $scope.max = e.total;
                 if ($scope.value === 100) {
                   $(progress).hide();
@@ -1088,7 +1110,6 @@ app.directive('iVideo', [
           }
         };
         $scope.delete = function () {
-          console.log('delete ...');
           $scope.ngModel = null;
           video.setAttribute('src', null);
         };
@@ -1193,7 +1214,6 @@ app.directive('iUpload', [
                   progress.max = e.total;
                 } else if (data) {
                   if ($scope.onUploaded) {
-                    console.log(err, data, e);
                     $scope.onUploaded({ $data: data });
                   }
                 }

package/lib/fsm.js

@@ -100,7 +100,7 @@ module.exports = function init(____0) {
       };
 
     try {
-      let path2 = path + '_tmp';
+      let path2 = path + '.isite-backup';
       fsm.deleteFileSync(path2);
       fs.writeFileSync(path2, data, {
         encoding: encode || 'utf8',
@@ -108,7 +108,7 @@ module.exports = function init(____0) {
       fsm.deleteFileSync(path);
       fs.renameSync(path2, path);
       fsm.deleteFileSync(path2);
-      callback();
+      callback(null, path);
     } catch (err) {
       callback(err);
     }
@@ -206,6 +206,46 @@ module.exports = function init(____0) {
     });
   };
 
+  fsm.readFileNow = function (path, callback) {
+    fsm.readFileRaw(path, (data) => {
+      path = path.replace('.isite-backup', '');
+      if (data) {
+        let file = {
+          path: path,
+          content: data,
+          count: 1,
+          stat: fsm.statSync(path),
+          time: new Date().getTime(),
+        };
+
+        file.json = function (callback) {
+          try {
+            if (!file.isJson) {
+              file.content = JSON.parse(file.content);
+              file.isJson = true;
+            }
+          } catch (error) {
+            file.error = error;
+            console.log(error);
+          }
+          if (callback) {
+            callback(file);
+          } else {
+            return file;
+          }
+        };
+        fsm.list.push(file);
+        if (callback) {
+          callback(null, file);
+        }
+      } else {
+        callback({
+          message: path + '  :: Error Read File Not Exists',
+        });
+      }
+    });
+  };
+  
   fsm.readFile = function (path, callback) {
     path = fsm.getFilePath(path);
 
@@ -228,42 +268,9 @@ module.exports = function init(____0) {
     }
 
     if (fsm.isFileExistsSync(path)) {
-      fsm.readFileRaw(path, (data) => {
-        if (data) {
-          let file = {
-            path: path,
-            content: data,
-            count: 1,
-            stat: fsm.statSync(path),
-            time: new Date().getTime(),
-          };
-          
-          file.json = function (callback) {
-            try {
-              if (!file.isJson) {
-                file.content = JSON.parse(file.content);
-                file.isJson = true;
-              }
-            } catch (error) {
-              file.error = error;
-              console.log(error);
-            }
-            if (callback) {
-              callback(file);
-            } else {
-              return file;
-            }
-          };
-          fsm.list.push(file);
-          if (callback) {
-            callback(null, file);
-          }
-        } else {
-          callback({
-            message: path + '  :: Error Read File Not Exists',
-          });
-        }
-      });
+      fsm.readFileNow(path, callback);
+    } else if (fsm.isFileExistsSync(path + '.isite-backup')) {
+      fsm.readFileNow(path + '.isite-backup', callback);
     } else {
       if (callback) {
         callback({
@@ -300,6 +307,17 @@ module.exports = function init(____0) {
       };
       fsm.list.push(file);
 
+      return file.content;
+    } else if (fsm.isFileExistsSync(path + '.isite-backup')) {
+      let file = {
+        path: path,
+        content: fsm.readFileSyncRaw(path + '.isite-backup'),
+        count: 1,
+        stat: fsm.statSync(path + '.isite-backup'),
+        time: new Date().getTime(),
+      };
+      fsm.list.push(file);
+
       return file.content;
     }
     return '';

package/lib/parser.js

@@ -207,7 +207,7 @@ module.exports = function init(req, res, ____0, route) {
       return render_site('setting.' + v);
     }
   }
-  function render_req(v) {
+  function renderRequest(v) {
     if (!v) {
       return '';
     }
@@ -254,7 +254,7 @@ module.exports = function init(req, res, ____0, route) {
         out = ____0.toJson(out);
       }
     }
-    return out;
+    return typeof out !== 'undefined' ? out : '';
   }
 
   function renderSession(v) {
@@ -814,7 +814,7 @@ module.exports = function init(req, res, ____0, route) {
           txt = txt.replace(matches[i], render_site(v));
         } else if (v.startsWith('##req.')) {
           v = v.replace('##req.', '').replace('##', '');
-          txt = txt.replace(matches[i], render_req(v));
+          txt = txt.replace(matches[i], renderRequest(v));
         } else if (v.startsWith('##session.')) {
           v = v.replace('##session.', '').replace('##', '');
           txt = txt.replace(matches[i], renderSession(v));

package/package.json

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