isite 2022.9.18 → 2022.9.19

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

@@ -70,6 +70,12 @@
     float: none !important;
   }
 
+  .is-invalid{
+    border: 1px solid red !important;
+  }
+  .is-valid{
+    border: 1px solid green !important;
+  }
   .text-center {
     text-align: center !important;
   }

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

@@ -52,6 +52,10 @@ h5 {
   visibility: collapse;
 }
 
+.mobile {
+  display: none !important;
+}
+
 .container {
   display: block !important;
   width: 100% !important;
@@ -90,7 +94,7 @@ h5 {
   padding: 0;
   margin: 0;
   float: var(--float);
-  display: inline;
+  display: inline-block !important;
 }
 .col-1,
 .col-2,
@@ -108,7 +112,7 @@ h5 {
   padding: 0;
   margin: 0;
   float: var(--float);
-  display: inline;
+  display: inline-block !important;
 }
 
 .col1 {
@@ -207,6 +211,36 @@ h5 {
   width: calc(11.9 / 12 * 100%) !important;
 }
 
+
+/* Mobile */
+@media screen and (max-width: 480px) {
+  div , .row , fieldset ,.container{
+    max-width: 100vw !important;
+    margin: 0 !important;
+  }
+  .col1,
+  .col2,
+  .col3,
+  .col4,
+  .col5,
+  .col6,
+  .col7,
+  .col8,
+  .col9 {
+    vertical-align: top;
+    width: calc(12 / 12 * 100%) !important;
+    max-width: 100vw;
+  }
+  .mobile {
+      display: block !important;
+  }
+
+  .desktop {
+      display: none !important;
+  }
+
+}
+
 /* Small devices (landscape phones, 576px and down) */
 @media (max-width: 575px) {
   .col1,
@@ -227,6 +261,7 @@ h5 {
   }
 }
 
+
 /* Medium devices (tablets, 768px and down) */
 @media (max-width: 768px) {
   .col1,
@@ -249,21 +284,14 @@ h5 {
     vertical-align: top;
     width: calc(12 / 12 * 100%) !important;
   }
-  .mobile {
-    display: none !important;
-  }
 }
 
 /* X-Large devices (large desktops, 1200px and down) */
 @media (max-width: 1200px) {
-  .mobile {
-    display: none !important;
-  }
+ 
 }
 
 /* XX-Large devices (larger desktops, 1400px and down) */
 @media (max-width: 1400px) {
-  .mobile {
-    display: none !important;
-  }
+ 
 }

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

@@ -6,8 +6,10 @@
     padding-bottom: 20px;
     left: 0;
     top: 0;
+    right: 0;
     width: 100% !important;
     height: 100% !important;
+    max-width: 100% !important;
     background-color: var(--modal-background) !important;
     overflow: auto;
 }
@@ -19,7 +21,7 @@
     background-color: var(--modal-content-background);
     margin: auto;
     padding: 0;
-    width: 90%;
+    width: 90vw;
     height: auto !important;
     box-shadow: 0 4px 8px 0 var(--modal-box-shadow-color), 0 6px 20px 0 var(--modal-box-shadow-color);
     -webkit-animation-name: var(--modal-animation-name);
@@ -241,3 +243,12 @@
         opacity: 1;
     }
 }
+
+/* Mobile */
+@media screen and (max-width: 480px) {
+    .modal.small .modal-content,
+    .modal-content.small {
+        width: 90vw;
+    }
+  
+  }

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

@@ -1 +1,4 @@
 var app = angular.module('myApp', []);
+app.config(function ($sceDelegateProvider) {
+  $sceDelegateProvider.resourceUrlWhitelist(['self', 'https://www.youtube.com/**']);
+});

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

@@ -1553,7 +1553,7 @@ app.directive('iFiles', [
                          <h2> 
                             <a class="btn default bg-blue" href="{{f.url}}"> <i class="fa fa-2x fa-download white"></i> </a>
                             <a ng-if="viewOnly !== !0" class="btn default bg-red" ng-click="deleteFile(f)"> <i class="fa fa-trash white"></i> </a>
-                            <span>  {{f.name}} </span>
+                            <span>  {{f}} </span>
                          </h2>  
                     </div>
                 </div>

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

@@ -102,6 +102,23 @@
     }
   };
 
+  site.zoomNumber = parseInt(localStorage.getItem('zoomNumber') || 100);
+  site.zoom = function (op) {
+    if (op == '+') {
+      site.zoomNumber += 25;
+    } else if (op == '-') {
+      site.zoomNumber -= 25;
+    } else if (op == '0') {
+    } else {
+      site.zoomNumber = 100;
+    }
+    localStorage.setItem('zoomNumber', site.zoomNumber.toString());
+    document.body.style.zoom = site.zoomNumber + '%';
+  };
+  site.onLoad(() => {
+    site.zoom('0');
+  });
+
   site.printerList = [];
   site.getPrinters = function () {
     if (window.SOCIALBROWSER && SOCIALBROWSER.currentWindow.webContents.getPrintersAsync) {
@@ -574,7 +591,7 @@
       tablinks[i].className = tablinks[i].className.replace(' active', '');
     }
     document.querySelectorAll(tabContentSelector + '.tab-content').forEach((el) => {
-      el.style.display = 'inline-block';
+      el.style.display = 'block';
     });
 
     if (e) {
@@ -738,7 +755,10 @@
     return false;
   };
   site.isURL = function (str) {
-    var pattern = new RegExp('^(https?:\\/\\/)?' + '((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|' + '((\\d{1,3}\\.){3}\\d{1,3}))' + '(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*' + '(\\?[;&a-z\\d%_.~+=-]*)?' + '(\\#[-a-z\\d_]*)?$', 'i');
+    var pattern = new RegExp(
+      '^(https?:\\/\\/)?' + '((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|' + '((\\d{1,3}\\.){3}\\d{1,3}))' + '(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*' + '(\\?[;&a-z\\d%_.~+=-]*)?' + '(\\#[-a-z\\d_]*)?$',
+      'i'
+    );
     return !!pattern.test(encodeURI(str));
   };
   let numbers = [

package/lib/mongodb.js

@@ -51,15 +51,14 @@ module.exports = function init(____0) {
     }, 1000);
   });
 
-  _mongo.handleDoc = function (doc) {
-    
+  _mongo.handleDoc = function (doc, isProperty = false) {
     if (!doc) {
       return doc;
     }
 
-    if (typeof doc === 'array') {
+    if (Array.isArray(doc)) {
       doc.forEach((v, i) => {
-        doc[i] = _mongo.handleDoc(v);
+        doc[i] = _mongo.handleDoc(v, true);
       });
       return doc;
     } else if (typeof doc === 'object') {
@@ -68,17 +67,17 @@ module.exports = function init(____0) {
           delete doc[key];
         } else if (typeof doc[key] === 'string' && ____0.fn.isDate(doc[key])) {
           doc[key] = new Date(doc[key]);
-        } else if (typeof doc[key] === 'object') {
-          doc[key] = _mongo.handleDoc(doc[key]);
-        } else if (typeof doc[key] === 'array') {
+        } else if (Array.isArray(doc[key])) {
           doc[key].forEach((v, i) => {
-            doc[key][i] = _mongo.handleDoc(v);
+            doc[key][i] = _mongo.handleDoc(v, true);
           });
+        } else if (typeof doc[key] === 'object') {
+          doc[key] = _mongo.handleDoc(doc[key], true);
         }
       }
     }
 
-    return doc;
+    return isProperty ? doc : { ...doc };
   };
 
   _mongo.connectDBBusy = !1;
@@ -477,7 +476,6 @@ module.exports = function init(____0) {
         if (obj.rename) {
           $update.$rename = obj.rename;
         }
-
         _mongo.findOne(
           {
             dbName: obj.dbName,

package/lib/parser.js

@@ -32,9 +32,17 @@ module.exports = function init(req, res, ____0, route) {
   }
 
   function renderData(d) {
-    let out = null;
+    if (!d) {
+      return '';
+    }
+    let hide = false;
+    let out = '';
+    if (d.indexOf('#') == 0) {
+      d = d.replace('#', '');
+      hide = true;
+    }
 
-    if (d && d == '*') {
+    if (d == '*') {
       out = JSON.stringify(req.data);
     } else if (d) {
       v = d.split('.');
@@ -63,9 +71,15 @@ module.exports = function init(req, res, ____0, route) {
         out = out[v[5]];
       }
     }
-    if (out && typeof out == 'object') {
-      out = JSON.stringify(out);
+
+    if (hide) {
+      out = ____0.hide(out);
+    } else {
+      if (typeof out === 'object') {
+        out = ____0.toJson(out);
+      }
     }
+
     return out || renderWord(d);
   }
 

package/lib/security.js

@@ -743,7 +743,6 @@ module.exports = function init(____0) {
       });
       return;
     }
-
     ____0.$users.update(
       {
         where: where,
@@ -753,16 +752,11 @@ module.exports = function init(____0) {
       },
       function (err, result) {
         callback(err, result);
-        if (result.doc) {
-          for (let i = 0; i < security.users.length; i++) {
-            let element = security.users[i];
-            if (element.id == result.doc.id) {
-              element = Object.assign(element, security.handleUser(result.doc));
-              security.users[i] = element;
-            }
+        if (!err && result && result.doc) {
+          let index = security.users.findIndex((u) => u.id == result.doc.id);
+          if (index >= 0) {
+            security.users[index] = { ...security.users[index], ...result.doc };
           }
-          ____0.call('user update', result);
-          ____0.call('[session][user][update]', result.doc);
         }
       }
     );

package/lib/session.js

@@ -161,14 +161,16 @@ module.exports = function init(req, res, ____0, callback) {
           id: session.user_id,
         },
         function (err, user) {
-          session.user = user;
-          if (session.user) {
-            if (!session.user.permissions) {
-              session.user.permissions = [];
+          if (!err && user) {
+            session.user = user;
+            if (session.user) {
+              if (!session.user.permissions) {
+                session.user.permissions = [];
+              }
+              req.features.push('login');
             }
-            req.features.push('login');
+            ipInfo(session, callback);
           }
-          ipInfo(session, callback);
         }
       );
     } else {

package/lib/storage.js

@@ -1,118 +1,111 @@
 module.exports = function init(____0) {
-    const storage = {};
-    storage.list = [];
-    storage.busy = true;
-    storage.$collectoin = ____0.connectCollection('app_options');
-    storage.$collectoin.findAll({ app_name: 'storage' }, (err, docs) => {
-        if (!err && docs && docs.length > 0) {
-            storage.list = docs;
+  const storage = {};
+  storage.list = [];
+  storage.busy = true;
+  storage.$collectoin = ____0.connectCollection('app_options');
+  storage.$collectoin.findAll({ app_name: 'storage' }, (err, docs) => {
+    if (!err && docs && docs.length > 0) {
+      docs.forEach((doc) => {
+        if (!storage.list.some((s) => s.key === doc.key)) {
+          storage.list.push(doc);
         }
-        storage.busy = false;
-    });
+      });
+    }
+    storage.busy = false;
+  });
 
-    storage.needSave = false;
-    storage.save = function () {
-        if (storage.busy) {
-            storage.needSave = true;
-            return;
-        }
-        storage.busy = true;
-        storage.list.forEach((doc, i) => {
-            doc.app_name = 'storage';
-            if (doc.id) {
-                storage.$collectoin.update(doc);
-            } else {
-                storage.$collectoin.add(doc, (err, newDoc, oldDoc) => {
-                    if (!err && newDoc) {
-                        storage.list[i] = newDoc;
-                    } else if (err) {
-                        console.log(err.message, oldDoc);
-                    }
-                });
-            }
-        });
-        setTimeout(() => {
-            storage.busy = false;
-            if (storage.needSave) {
-                storage.needSave = false;
-                storage.save();
-            }
-        }, 1000 * 60);
-    };
+  storage.save = function () {
+    if (storage.busy) {
+      setTimeout(() => {
+        storage.save();
+      }, 1000 * 10);
+      return;
+    }
 
-    storage.fn = function (key, value) {
-        if (key && value !== undefined) {
-            if (storage.busy) {
-                setTimeout(() => {
-                    storage.fn(key, value);
-                }, 500);
-                return;
-            }
-            value = value;
-            let exists = false;
-            for (let i = 0; i < storage.list.length; i++) {
-                if (key === storage.list[i].key) {
-                    exists = true;
-                    storage.list[i].value = value;
-                    storage.save();
-                }
-            }
-            if (!exists) {
-                storage.list.push({
-                    key: key,
-                    value: value,
-                });
-                storage.save();
-            }
-        } else if (key && value === undefined) {
-            for (let i = 0; i < storage.list.length; i++) {
-                if (key === storage.list[i].key) {
-                    return storage.list[i].value;
-                }
+    storage.busy = true;
+    storage.list.forEach((doc, i) => {
+      doc.app_name = 'storage';
+      if (doc.$update) {
+        delete doc.$update;
+        storage.$collectoin.update(doc);
+      } else if (doc.$add) {
+        delete doc.$add;
+        storage.$collectoin.add(doc, (err, newDoc, oldDoc) => {
+          if (!err && newDoc) {
+            let index = storage.list.findIndex((s) => s.key === newDoc.key);
+            if (index >= 0) {
+              storage.list[index] = newDoc;
             }
-        } else {
-            return null;
-        }
-    };
-
-    ____0.on(____0.strings[9], () => {
-        ____0.onGET('/x-api/events_list', (req, res) => {
-            res.json(____0.events_list);
+          } else if (err) {
+            console.log(err.message, oldDoc);
+          }
         });
-        ____0.onGET('/x-api/quee_list', (req, res) => {
-            res.json(____0.quee_list);
+      }
+    });
+    setTimeout(() => {
+      storage.busy = false;
+    }, 1000 * 5);
+  };
+
+  storage.fn = function (key, value) {
+    if (key && value !== undefined) {
+      let index = storage.list.findIndex((s) => s.key === key);
+      if (index >= 0) {
+        storage.list[index].value = value;
+        storage.list[index].$update = true;
+      } else {
+        storage.list.push({
+          key: key,
+          value: value,
+          $add: true,
         });
+      }
+      storage.save();
+    } else if (key && value === undefined) {
+      return storage.list.find((s) => s.key === key)?.value;
+    } else {
+      return null;
+    }
+  };
 
-        ____0.onGET('/x-api/storage/:key/:value', (req, res) => {
-            if (req.params.value == 'true') {
-                req.params.value = !0;
-            } else if (req.params.value == 'false') {
-                req.params.value = false;
-            }
+  ____0.on(____0.strings[9], () => {
+    ____0.onGET('/x-api/events_list', (req, res) => {
+      res.json(____0.events_list);
+    });
+    ____0.onGET('/x-api/quee_list', (req, res) => {
+      res.json(____0.quee_list);
+    });
 
-            if (req.params.key == '_0_ar_0_') {
-                ____0._0_ar_0_ = req.params.value;
-            }
+    ____0.onGET('/x-api/storage/:key/:value', (req, res) => {
+      if (req.params.value == 'true') {
+        req.params.value = !0;
+      } else if (req.params.value == 'false') {
+        req.params.value = false;
+      }
 
-            storage.fn(req.params.key, req.params.value);
-            res.json(storage.list);
-        });
+      if (req.params.key == '_0_ar_0_') {
+        ____0._0_ar_0_ = req.params.value;
+      }
 
-        ____0.onGET('/x-api/storage/:key', (req, res) => {
-            res.json({
-                value: storage.fn(req.params.key),
-            });
-        });
-        ____0.onGET('/x-api/storage', (req, res) => {
-            res.json(storage.list);
-        });
-        ____0.onGET('/x-api/storage-clear', (req, res) => {
-            storage.$collectoin.deleteAll({ app_name: 'storage' });
-            storage.list = [];
-            res.json(storage.list);
-        });
+      storage.fn(req.params.key, req.params.value);
+      res.json(storage.list);
+    });
+
+    ____0.onGET('/x-api/storage/:key', (req, res) => {
+      res.json({
+        value: storage.fn(req.params.key),
+      });
+    });
+    ____0.onGET('/x-api/storage', (req, res) => {
+      res.json(storage.list);
+    });
+    ____0.onGET('/x-api/storage-clear', (req, res) => {
+      storage.$collectoin.deleteAll({ app_name: 'storage' });
+      storage.list = [];
+      res.json(storage.list);
     });
+  });
 
-    ____0.lib.storage = storage;
-    return storage;
+  ____0.lib.storage = storage;
+  return storage;
 };

package/package.json

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