isite 2023.1.8 → 2023.8.10

package/apps/charts/site_files/js/custom.js

@@ -1,161 +1,159 @@
-;
 ((w, d) => {
-
-    const YXChart = {
-
-        "data": [{
-            "country": "USA",
-            "visits": 3025
-        }],
-
-        "colors": {
-            "saturation": 0.4,
-            "list" : [
-                "#ff5722"
-            ]
+  const YXChart = {
+    data: [
+      {
+        country: 'USA',
+        visits: 3025,
+      },
+    ],
+
+    colors: {
+      saturation: 0.4,
+      list: ['#ff5722'],
+    },
+
+    yAxes: [
+      {
+        type: 'CategoryAxis',
+        renderer: {
+          minGridDistance: 20,
+          grid: {
+            location: 0,
+          },
         },
-
-        "yAxes": [{
-            "type": "CategoryAxis",
-            "renderer": {
-                "minGridDistance": 20,
-                "grid": {
-                    "location": 0
-                }
-            },
-            "dataFields": {
-                "category": "country"
-            }
-        }],
-
-
-        "xAxes": [{
-            "type": "ValueAxis",
-            "renderer": {
-                "maxLabelPosition": 0.98
-            }
-        }],
-
-
-        "series": [{
-            "name": "test name",
-            "type": "ColumnSeries",
-
-
-            "dataFields": {
-                "categoryY": "country",
-                "valueX": "visits"
-            },
-
-
-            "defaultState": {
-                "ransitionDuration": 1000
-            },
-
-
-            "sequencedInterpolation": !0,
-            "sequencedInterpolationDelay": 100,
-
-
-            "columns": {
-                "template": {
-                    "tooltipText": "",
-                    "fill": "#0000ff"
-                },
-                "strokeOpacity": 0
-            }
-        }],
-
-
-        "cursor": {
-            "type": "XYCursor",
-            "behavior": "zoomY"
-        }
-    };
-
-    const XYChart = {
-        "colors": {
-            "saturation": 0.4,
-            "list" : [
-                "#ff5722"
-            ]
+        dataFields: {
+          category: 'country',
         },
-        "data": [{
-            "country": "USA",
-            "visits": 3025
-        }],
-        "yAxes": [{
-            "type": "ValueAxis",
-            "renderer": {
-                "maxLabelPosition": 0.98
-            }
-        }],
-        "xAxes": [{
-            "type": "CategoryAxis",
-            "renderer": {
-                "minGridDistance": 20,
-                "grid": {
-                    "location": 0
-                }
-            },
-            "dataFields": {
-                "category": "country"
-            }
-        }],
-        "series": [{
-            "name": "test name",
-            "type": "ColumnSeries",
-            "dataFields": {
-                "categoryX": "country",
-                "valueY": "visits"
-            },
-            "columns": {
-                "template": {
-                    "tooltipText": "",
-                    "fill": "#0000ff"
-                },
-                "strokeOpacity": 0
-            },
-            "defaultState": {
-                "ransitionDuration": 1000
-            },
-            "sequencedInterpolation": !0,
-            "sequencedInterpolationDelay": 100
-        }],
-        
+      },
+    ],
+
+    xAxes: [
+      {
+        type: 'ValueAxis',
+        renderer: {
+          maxLabelPosition: 0.98,
+        },
+      },
+    ],
 
-        "cursor": {
-            "type": "XYCursor",
-            "behavior": "zoomX"
-        }
-    };
+    series: [
+      {
+        name: 'test name',
+        type: 'ColumnSeries',
 
-    w.site = w.site || {};
-    w.site.create_chart = function (options) {
-        am4core.useTheme(am4themes_animated);
+        dataFields: {
+          categoryY: 'country',
+          valueX: 'visits',
+        },
 
-        if (options.type == 'xy') {
-            XYChart.xAxes[0].dataFields.category = options.x;
-            XYChart.series[0].dataFields.categoryX = options.x;
-            XYChart.series[0].dataFields.valueY = options.y;
-            if(options.color){
-                XYChart.colors.list[0] = options.color;
-            }
-           
-            XYChart.data = options.data;
-            am4core.createFromConfig(XYChart, document.querySelector(options.selector), am4charts.XYChart);
-        } else if (options.type == 'yx') {
-            YXChart.yAxes[0].dataFields.category = options.y;
-            YXChart.series[0].dataFields.categoryY = options.y;
-            YXChart.series[0].dataFields.valueX = options.x;
-            if(options.color){
-                YXChart.colors.list[0] = options.color;
-            }
-            YXChart.data = options.data;
-            am4core.createFromConfig(YXChart, document.querySelector(options.selector), am4charts.XYChart);
-        }
+        defaultState: {
+          ransitionDuration: 1000,
+        },
 
-      
-    };
+        sequencedInterpolation: !0,
+        sequencedInterpolationDelay: 100,
 
-})(window, document);
+        columns: {
+          template: {
+            tooltipText: '',
+            fill: '#0000ff',
+          },
+          strokeOpacity: 0,
+        },
+      },
+    ],
+
+    cursor: {
+      type: 'XYCursor',
+      behavior: 'zoomY',
+    },
+  };
+
+  const XYChart = {
+    colors: {
+      saturation: 0.4,
+      list: ['#ff5722'],
+    },
+    data: [
+      {
+        country: 'USA',
+        visits: 3025,
+      },
+    ],
+    yAxes: [
+      {
+        type: 'ValueAxis',
+        renderer: {
+          maxLabelPosition: 0.98,
+        },
+      },
+    ],
+    xAxes: [
+      {
+        type: 'CategoryAxis',
+        renderer: {
+          minGridDistance: 20,
+          grid: {
+            location: 0,
+          },
+        },
+        dataFields: {
+          category: 'country',
+        },
+      },
+    ],
+    series: [
+      {
+        name: 'test name',
+        type: 'ColumnSeries',
+        dataFields: {
+          categoryX: 'country',
+          valueY: 'visits',
+        },
+        columns: {
+          template: {
+            tooltipText: '',
+            fill: '#0000ff',
+          },
+          strokeOpacity: 0,
+        },
+        defaultState: {
+          ransitionDuration: 1000,
+        },
+        sequencedInterpolation: !0,
+        sequencedInterpolationDelay: 100,
+      },
+    ],
+
+    cursor: {
+      type: 'XYCursor',
+      behavior: 'zoomX',
+    },
+  };
+
+  w.site = w.site || {};
+  w.site.create_chart = function (options) {
+    am4core.useTheme(am4themes_animated);
+
+    if (options.type == 'xy') {
+      XYChart.xAxes[0].dataFields.category = options.x;
+      XYChart.series[0].dataFields.categoryX = options.x;
+      XYChart.series[0].dataFields.valueY = options.y;
+      if (options.color) {
+        XYChart.colors.list[0] = options.color;
+      }
+
+      XYChart.data = options.data;
+      am4core.createFromConfig(XYChart, document.querySelector(options.selector), am4charts.XYChart);
+    } else if (options.type == 'yx') {
+      YXChart.yAxes[0].dataFields.category = options.y;
+      YXChart.series[0].dataFields.categoryY = options.y;
+      YXChart.series[0].dataFields.valueX = options.x;
+      if (options.color) {
+        YXChart.colors.list[0] = options.color;
+      }
+      YXChart.data = options.data;
+      am4core.createFromConfig(YXChart, document.querySelector(options.selector), am4charts.XYChart);
+    }
+  };
+})(window, document);

package/apps/client-side/app.js

@@ -46,6 +46,7 @@ module.exports = function (site) {
       __dirname + '/site_files/js/directive-core.js',
       __dirname + '/site_files/js/directive.js',
       __dirname + '/site_files/js/last.js',
+      __dirname + '/site_files/js/xlsx.js',
     ],
   });
 
@@ -70,6 +71,7 @@ module.exports = function (site) {
       __dirname + '/site_files/js/bootstrap5.js',
       __dirname + '/site_files/js/bootstrap-5-addon.js',
       __dirname + '/site_files/js/WebShareEditor.js',
+      __dirname + '/site_files/js/xlsx.js',
     ],
   });
 
@@ -98,7 +100,15 @@ module.exports = function (site) {
     ],
   });
 
-  
+  site.get(
+    {
+      name: '/x-words',
+    },
+    (req, res) => {
+      res.render('client-side/words.html', {}, { parser: 'html css js', public: true });
+    }
+  );
+
   site.get({
     name: '/x-css',
     path: __dirname + '/site_files/css',
@@ -162,7 +172,7 @@ module.exports = function (site) {
       __dirname + '/site_files/css/font-awesome.css',
     ],
   });
-  
+
   site.get({
     name: ['/x-css/bootstrap-5-support.css', '/x-css/bootstrap-support.css'],
     parser: 'css2',
@@ -192,7 +202,7 @@ module.exports = function (site) {
       __dirname + '/site_files/css/WebShareEditor.css',
     ],
   });
-  
+
   site.get({
     name: ['/x-css/sa.css'],
     parser: 'css2',
@@ -225,27 +235,43 @@ module.exports = function (site) {
   });
 
   site.post({ name: '/x-api/upload/image', public: true }, (req, res) => {
-    site.createDir(site.options.upload_dir + '/' + req.headers['folder'], () => {
-      site.createDir(site.options.upload_dir + '/' + req.headers['folder'] + '/images', () => {
+    let folder = req.headers['folder'] || new Date().getFullYear() + '_' + new Date().getMonth() + '_' + new Date().getDate();
+
+    site.createDir(site.options.upload_dir + '/' + folder, () => {
+      site.createDir(site.options.upload_dir + '/' + folder + '/images', () => {
         let response = {
           image: {},
           done: !0,
         };
         let file = req.files.fileToUpload;
         if (file) {
-          let newName = 'image_' + new Date().getTime().toString() + Math.random().toString() + site.path.extname(file.originalFilename);
-          let newpath = site.path.resolve(site.options.upload_dir + '/' + req.headers['folder'] + '/images/' + newName);
+          let name1 = 'image_' + new Date().getTime().toString() + Math.random().toString().replace('.', '_');
+          let newName = name1 + site.path.extname(file.originalFilename);
+          let newName2 = name1 + '.webp';
+          let newpath = site.path.resolve(site.options.upload_dir + '/' + folder + '/images/' + newName);
+          let newpath2 = site.path.resolve(site.options.upload_dir + '/' + folder + '/images/' + newName2);
           site.mv(file.filepath, newpath, function (err) {
             if (err) {
               response.error = err;
               response.done = !1;
+              res.json(response);
             } else {
               response.image.name = file.originalFilename;
               response.image.path = newpath;
-              response.image.url = '/x-api/image/' + req.headers['folder'] + '/' + newName;
+              response.image.url = '/x-api/image/' + folder + '/' + newName;
               response.image.size = file.size;
+              if (!response.image.name.like('*.webp')) {
+                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, () => {});
+                });
+              } else {
+                res.json(response);
+              }
             }
-            res.json(response);
           });
         } else {
           response.error = 'no file';
@@ -257,7 +283,7 @@ module.exports = function (site) {
   });
 
   site.get({ name: '/x-api/image/:category/:name', public: true }, (req, res) => {
-    res.set('Cache-Control', 'public, max-age=2592000');
+    res.set('Cache-Control', 'public, max-age=' + 60 * site.options.cache.images);
     res.download(site.options.upload_dir + '/' + req.params.category + '/images/' + req.params.name);
   });
 
@@ -294,11 +320,10 @@ module.exports = function (site) {
   });
 
   site.get({ name: '/x-api/audio/:category/:name', public: true }, (req, res) => {
-    res.set('Cache-Control', 'public, max-age=2592000');
+    res.set('Cache-Control', 'public, max-age=' + 60 * site.options.cache.images);
     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', () => {
@@ -332,11 +357,10 @@ module.exports = function (site) {
   });
 
   site.get({ name: '/x-api/video/:category/:name', public: true }, (req, res) => {
-    res.set('Cache-Control', 'public, max-age=2592000');
+    res.set('Cache-Control', 'public, max-age=' + 60 * site.options.cache.images);
     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', () => {
@@ -375,6 +399,7 @@ module.exports = function (site) {
   site.getTLV = function (name, value) {
     return Buffer.concat([Buffer.from([name], 'utf8'), Buffer.from([value.length], 'utf8'), Buffer.from(value, 'utf8')]);
   };
+
   site.onPOST('/x-api/zakat', (req, res) => {
     let obj = req.data || {};
     let value = [];

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

@@ -42,6 +42,7 @@ body {
 }
 label {
   float: left;
+  color: var(--label-color);
 }
 .ar label {
   float: right;
@@ -66,7 +67,7 @@ fieldset legend {
   width: auto;
   padding: 5px;
 }
-.ar fieldset legend{
+.ar fieldset legend {
   float: right;
 }
 legend::after {
@@ -101,8 +102,8 @@ i-button {
   display: contents;
 }
 i-button button {
-  margin: 5px;
-  padding: 7px 9px;
+  margin: 5px !important;
+  padding: 7px 9px !important;
 }
 i-button.default button {
   margin: 3px;
@@ -124,19 +125,30 @@ i-file button {
 i-upload {
   display: inline-block;
 }
-i-date .fa {
+i-date .left-10,
+i-datetime .left-10 {
+  margin-left: 10px;
+}
+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;
 }
 i-date p,
 i-datetime p {
-  margin-top: 10px !important;
+  margin: 0 !important;
 }
-i-datetime.is-invalid .row {
-  border: 1px solid #dc3545 !important;
-  border-radius: 10px !important;
+i-date input,
+i-datetime input {
+  margin: 0 !important;
 }
+
 .modal-content {
   width: 75vw;
   height: 100vh;

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

@@ -110,8 +110,8 @@
     justify-content: center;
   }
   .center {
-    margin: 0 auto;
-    text-align: center;
+    margin: 0 auto ;
+    text-align: center ;
   }
   .center,
   .center p,

package/apps/client-side/site_files/css/font-awesome.css

@@ -4585,8 +4585,8 @@ readers do not read off random characters that represent icons */
   font-style: normal;
   font-weight: 400;
   font-display: block;
-  src: url("../webfonts/fa-brands-400.eot");
-  src: url("../webfonts/fa-brands-400.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-brands-400.woff2") format("woff2"), url("../webfonts/fa-brands-400.woff") format("woff"), url("../webfonts/fa-brands-400.ttf") format("truetype"), url("../webfonts/fa-brands-400.svg#fontawesome") format("svg"); }
+  src: url("/webfonts/fa-brands-400.eot");
+  src: url("/webfonts/fa-brands-400.eot?#iefix") format("embedded-opentype"), url("/webfonts/fa-brands-400.woff2") format("woff2"), url("/webfonts/fa-brands-400.woff") format("woff"), url("/webfonts/fa-brands-400.ttf") format("truetype"), url("/webfonts/fa-brands-400.svg#fontawesome") format("svg"); }
 
 .fab {
   font-family: 'Font Awesome 5 Brands';
@@ -4596,8 +4596,8 @@ readers do not read off random characters that represent icons */
   font-style: normal;
   font-weight: 400;
   font-display: block;
-  src: url("../webfonts/fa-regular-400.eot");
-  src: url("../webfonts/fa-regular-400.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-regular-400.woff2") format("woff2"), url("../webfonts/fa-regular-400.woff") format("woff"), url("../webfonts/fa-regular-400.ttf") format("truetype"), url("../webfonts/fa-regular-400.svg#fontawesome") format("svg"); }
+  src: url("/webfonts/fa-regular-400.eot");
+  src: url("/webfonts/fa-regular-400.eot?#iefix") format("embedded-opentype"), url("/webfonts/fa-regular-400.woff2") format("woff2"), url("/webfonts/fa-regular-400.woff") format("woff"), url("/webfonts/fa-regular-400.ttf") format("truetype"), url("/webfonts/fa-regular-400.svg#fontawesome") format("svg"); }
 
 .far {
   font-family: 'Font Awesome 5 Free';
@@ -4607,8 +4607,8 @@ readers do not read off random characters that represent icons */
   font-style: normal;
   font-weight: 900;
   font-display: block;
-  src: url("../webfonts/fa-solid-900.eot");
-  src: url("../webfonts/fa-solid-900.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-solid-900.woff2") format("woff2"), url("../webfonts/fa-solid-900.woff") format("woff"), url("../webfonts/fa-solid-900.ttf") format("truetype"), url("../webfonts/fa-solid-900.svg#fontawesome") format("svg"); }
+  src: url("/webfonts/fa-solid-900.eot");
+  src: url("/webfonts/fa-solid-900.eot?#iefix") format("embedded-opentype"), url("/webfonts/fa-solid-900.woff2") format("woff2"), url("/webfonts/fa-solid-900.woff") format("woff"), url("/webfonts/fa-solid-900.ttf") format("truetype"), url("/webfonts/fa-solid-900.svg#fontawesome") format("svg"); }
 
 .fa,
 .fas {