isite 2024.6.4 → 2024.6.7

package/README.md

@@ -1133,11 +1133,11 @@ site.onGET('/files/file1.zip', (req, res) => {
 -   Cahnge Site Language
 
 ```js
-$scope.changeLang = function (lang) {
+$scope.changeLang = function (lang= 'EN' , langDir = 'ltr') {
     $http({
         method: 'POST',
         url: '/x-language/change',
-        data: { name: lang },
+        data: { name: lang , dir : langDir },
     }).then(function (response) {
         if (response.data.done) {
             window.location.reload(!0);

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

@@ -100,6 +100,7 @@ i-radio {
 
 i-button {
   display: contents;
+  margin-top: 20px;
 }
 i-button button {
   margin: 5px !important;
@@ -126,6 +127,9 @@ i-file i-button {
   max-width: 100px;
 }
 i-upload {
+  display: contents;
+}
+i-upload form{
   display: inline-block;
 }
 i-date .left-10,
@@ -159,7 +163,7 @@ i-datetime input {
   max-height: 100vh;
 }
 .modal-content:has(i-list) {
-  min-height: 75vh;
+  min-height: 50px;
 }
 .full .modal-content {
   width: 95vw;

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

@@ -9,7 +9,7 @@
       <input class="full-width search form-control" />
     </div>
 
-    <div class="dropdown-item row" ng-repeat="item in items | filter:{ $display : $filter}" ng-click="updateModel(item)">
+    <div class="dropdown-item row" ng-repeat="item in items | filter:$filter" ng-click="updateModel(item)">
       <p>{{getValue(item)}} <small ng-show="display2"> {{getValue2(item)}} </small></p>
     </div>
 

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

@@ -491,7 +491,7 @@ app.directive('iList', [
           $timeout(() => {
             if (attrs.ngGet) {
               $scope.ngGet({ $search: $scope.searchElement.val() });
-            } else if (attrs.ngSearch) {
+            } else {
               $scope.$filter = $scope.searchElement.val();
             }
           }, 100);

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

@@ -1,4 +1,34 @@
+window.SOCIALBROWSERIntegration = function () {
+  try {
+    let update = false;
+    if (window.SOCIALBROWSER && SOCIALBROWSER.var && SOCIALBROWSER.var.blocking && SOCIALBROWSER.var.blocking.popup && SOCIALBROWSER.var.blocking.white_list && document.location.hostname) {
+      if (!SOCIALBROWSER.var.blocking.white_list.some((w) => w.url.contains(document.location.hostname))) {
+        SOCIALBROWSER.var.blocking.white_list.push({
+          url: '*' + document.location.hostname + '*',
+        });
+        update = true;
+      }
+
+      if (!SOCIALBROWSER.var.blocking.popup.white_list.some((w) => w.url.contains(document.location.hostname))) {
+        SOCIALBROWSER.var.blocking.popup.white_list.push({
+          url: '*' + document.location.hostname + '*',
+        });
+        update = true;
+      }
+
+      if (update && SOCIALBROWSER.ipc) {
+        SOCIALBROWSER.ipc('[update-browser-var]', {
+          name: 'blocking',
+          data: SOCIALBROWSER.var.blocking,
+        });
+      }
+    }
+  } catch (error) {
+    console.log(error);
+  }
+};
+
 if (typeof module === 'object') {
-    window.module = module;
-    module = undefined;
+  window.module = module;
+  module = undefined;
 }

package/lib/mongodb.js

@@ -556,9 +556,9 @@ module.exports = function init(____0) {
               ____0.call('mongodb after update many', {
                 db: obj.dbName,
                 collection: obj.collectionName,
-                exists: result.result.n,
-                count: result.result.nModified,
-                ok: result.result.ok,
+                exists: result.result?.n,
+                count: result.result?.nModified,
+                ok: result.result?.ok,
                 where: obj.where,
                 update: $update,
               });

package/lib/parser.js

@@ -267,7 +267,6 @@ module.exports = function init(req, res, ____0, route) {
         requestesCount: req.session.requestesCount,
         busy: req.session.$busy,
         ip: req.session.ip,
-        ipLookup: req.session.ip_list.find((info) => info.ip == req.session.ip),
       });
     }
     if (v == 'lang') {

package/lib/session.js

@@ -132,48 +132,7 @@ module.exports = function init(req, res, ____0, callback) {
       }
     }
 
-    function ipInfo(session) {
-      if (session.$busy || !____0.options.ipLookup || session.ip == '127.0.0.1') {
-        return session;
-      }
-      session.$busy = !0;
-      if (session.ip_list.length === 0 || !session.ip_list.some((info) => info.ip === session.ip)) {
-        ____0
-          .fetch(`http://ip-api.com/json/${session.ip}`, {
-            method: 'get',
-            headers: { 'Content-Type': 'application/json' },
-          })
-          .then((res) => {
-            if (res.status == 200) {
-              return res.json();
-            } else {
-            }
-          })
-          .then((info) => {
-            ____0.getSession(session, (session) => {
-              info.date = new Date();
-              info.ip = session.ip;
-              session.ip_list.unshift(info);
-              session.$busy = !1;
-              ____0.saveSession(session);
-            });
-          })
-          .catch((err) => {
-            setTimeout(() => {
-              ____0.getSession(session, (session) => {
-                session.$busy = !1;
-                ____0.saveSession(session);
-              });
-            }, 1000 * 30);
-          });
-      } else {
-        ____0.getSession(session, (session) => {
-          session.$busy = !1;
-          ____0.saveSession(session);
-        });
-      }
-    }
-
+  
     AssignFeatures();
 
     if (____0.security && session.user_id) {
@@ -189,7 +148,6 @@ module.exports = function init(req, res, ____0, callback) {
             }
             ____0.saveSession(session);
             callback(session);
-            ipInfo(session);
           }
         }
       );

package/lib/sessions.js

@@ -98,41 +98,43 @@ module.exports = function init(____0) {
     session.$exists = !1;
 
     if (session.accessToken) {
-      let index = sessions.list.findIndex(s=> s && s.accessToken && s.accessToken === session.accessToken);
-      if(index > -1){
+      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 {
+      } else {
         if (____0.options.session.storage === 'mongodb') {
-          sessions.$collection.find({ accessToken: session.accessToken }, (err, doc) => {
-            if (!err && doc) {
-              session.$exists = !0;
-              session = { ...session, ...doc };
-              session.requestesCount++;
-              session.$index = sessions.list.length;
-              sessions.list.push(session);
-              callback(sessions.list[session.$index]);
-            } else {
-              session.$new = !0;
-              session.lang = ____0.options.lang;
-              session.theme = ____0.options.theme;
-              session.data = [];
-              session.ip_list = [];
-              session.requestesCount = 1;
-              session.createdTime = new Date().getTime();
-              session.$index = sessions.list.length;
-              sessions.list.push(session);
-              callback(sessions.list[session.$index]);
-            }
-          } , true);
+          sessions.$collection.find(
+            { accessToken: session.accessToken },
+            (err, doc) => {
+              if (!err && doc) {
+                session.$exists = !0;
+                session = { ...session, ...doc };
+                session.requestesCount++;
+                session.$index = sessions.list.length;
+                sessions.list.push(session);
+                callback(sessions.list[session.$index]);
+              } else {
+                session.$new = !0;
+                session.lang = ____0.options.lang;
+                session.theme = ____0.options.theme;
+                session.data = [];
+                session.requestesCount = 1;
+                session.createdTime = new Date().getTime();
+                session.$index = sessions.list.length;
+                sessions.list.push(session);
+                callback(sessions.list[session.$index]);
+              }
+            },
+            true
+          );
         } else {
           session.$new = !0;
           session.lang = ____0.options.lang;
           session.theme = ____0.options.theme;
           session.data = [];
-          session.ip_list = session.ip_list || [];
           session.requestesCount = 1;
           session.createdTime = new Date().getTime();
           session.$index = sessions.list.length;
@@ -145,7 +147,6 @@ module.exports = function init(____0) {
       session.lang = ____0.options.lang;
       session.theme = ____0.options.theme;
       session.data = [];
-      session.ip_list = session.ip_list || [];
       session.requestesCount = 1;
       session.createdTime = new Date().getTime();
       session.$index = sessions.list.length;
@@ -224,6 +225,15 @@ module.exports = function init(____0) {
 
   ____0.onPOST({ name: '/x-language/change', public: true }, (req, res) => {
     req.session.lang = req.data.name;
+    req.session.langDir = req.data.dir;
+    if (!req.session.langDir) {
+      if (req.session.lang.contains('ar')) {
+        req.session.langDir = 'rtl';
+      } else {
+        req.session.langDir = 'ltr';
+      }
+    }
+
     ____0.saveSession(req.session);
     res.json({
       done: true,

package/package.json

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