From 90eac27dae1cb8737e776e547ac505fd1725ee45 Mon Sep 17 00:00:00 2001
From: Chenx221 <chenx221@yandex.com>
Date: Fri, 14 Jun 2024 16:05:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A6=96=E9=A1=B5=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E8=A7=86=E8=A7=89=E5=8A=A0=E8=BD=BD=E6=80=A7=E8=83=BD?=
 =?UTF-8?q?=20=EF=BC=88=E6=94=B9=E6=88=90cdn=E5=8A=A0=E9=80=9F=EF=BC=8C?=
 =?UTF-8?q?=E5=8F=AF=E8=83=BD=E5=AF=B9=E4=B8=AD=E5=9B=BD=E5=A4=A7=E9=99=86?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=B8=8D=E5=A4=AA=E5=8F=8B=E5=A5=BD=EF=BC=9F?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/EChartsLiquidFillAsset.php |  13 --
 assets/TSParticlesAsset.php       |   4 +-
 composer.json                     |   2 -
 config/web.php                    |   2 +-
 views/site/index.php              | 200 ++++++++++++++++++++----------
 5 files changed, 137 insertions(+), 84 deletions(-)
 delete mode 100644 assets/EChartsLiquidFillAsset.php

diff --git a/assets/EChartsLiquidFillAsset.php b/assets/EChartsLiquidFillAsset.php
deleted file mode 100644
index 4465442..0000000
--- a/assets/EChartsLiquidFillAsset.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace app\assets;
-
-use yii\web\AssetBundle;
-
-class EChartsLiquidFillAsset extends AssetBundle
-{
-    public $sourcePath = '@npm/echarts-liquidfill/dist';
-    public $js = [
-        'echarts-liquidfill.js',
-    ];
-}
\ No newline at end of file
diff --git a/assets/TSParticlesAsset.php b/assets/TSParticlesAsset.php
index 9c4476e..df600a9 100644
--- a/assets/TSParticlesAsset.php
+++ b/assets/TSParticlesAsset.php
@@ -6,8 +6,8 @@ use yii\web\AssetBundle;
 
 class TSParticlesAsset extends AssetBundle
 {
-    public $sourcePath = '@npm/tsparticles--slim';
+    //use remote js file instead of local file (for better performance?)
     public $js = [
-        'tsparticles.slim.bundle.min.js',
+        'https://cdn.jsdelivr.net/npm/@tsparticles/slim@3.4.0/tsparticles.slim.bundle.min.js'
     ];
 }
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 4a9661f..ba65a0f 100644
--- a/composer.json
+++ b/composer.json
@@ -51,9 +51,7 @@
     "kartik-v/yii2-editable": "dev-master",
     "chenx221/yii2-bootstrap5": "dev-master",
     "npm-asset/echarts": "^5.5",
-    "npm-asset/echarts-liquidfill": "^3.1",
     "npm-asset/quill": "^1.3",
-    "npm-asset/tsparticles--slim": "3.3.0",
     "ext-mbstring": "*"
   },
   "require-dev": {
diff --git a/config/web.php b/config/web.php
index d268cf7..13c94a1 100644
--- a/config/web.php
+++ b/config/web.php
@@ -21,7 +21,7 @@ $config = [
         'authManager' => [
             'class' => 'yii\rbac\DbManager',
             // uncomment if you want to cache RBAC items hierarchy
-            // 'cache' => 'cache',
+//             'cache' => 'cache',
         ],
         'request' => [
             // !!! insert a secret key in the following (if it is empty) - this is required by cookie validation
diff --git a/views/site/index.php b/views/site/index.php
index a21a5bc..4bf7784 100644
--- a/views/site/index.php
+++ b/views/site/index.php
@@ -9,7 +9,6 @@ use yii\helpers\Url;
 
 $this->title = '首页';
 TSParticlesAsset::register($this);
-//$latestAnnouncements = []; emulating empty data
 ?>
     <div id="tsparticles" style="position: absolute;z-index: -1"></div>
     <div class="site-index">
@@ -105,75 +104,144 @@ $(document).ready(function() {
     });
   });
 });
-async function loadParticles(options) {
-    
-  await tsParticles.load({ id: "tsparticles", options });
-}
+(async () => {
+  await loadSlim(tsParticles);
 
-const configs = {
-    fpsLimit: 60,
-    particles: {
-      number: {
-        value: 100,
-        density: {
-          enable: true,
-          area: 800
-        }
-      },
-      color: {
-        value: ["#2EB67D", "#ECB22E", "#E01E5B", "#36C5F0"]
-      },
-      shape: {
-        type: "circle"
-      },
-      opacity: {
-        value: 0.4
-      },
-      size: {
-        value: { min: 4, max: 8 }
-      },
-      links: {
-        enable: true,
-        distance: 150,
-        color: "#808080",
-        opacity: 0.4,
-        width: 1
-      },
-      move: {
-        enable: true,
-        speed: 1,
-        outModes: {
-          default: "out"
-        }
-      }
-    },
-    interactivity: {
-      events: {
-        onHover: {
-          enable: true,
-          mode: "grab"
+  await tsParticles.load({
+    id: "tsparticles",
+    options: {
+        fpsLimit: 60,
+        particles: {
+            number: {
+            value: 100,
+            density: {
+                enable: true,
+                area: 800
+            }
+            },
+            color: {
+            value: ["#2EB67D", "#ECB22E", "#E01E5B", "#36C5F0"]
+            },
+            shape: {
+            type: "circle"
+            },
+            opacity: {
+            value: 0.4
+            },
+            size: {
+            value: { min: 4, max: 8 }
+            },
+            links: {
+            enable: true,
+            distance: 150,
+            color: "#808080",
+            opacity: 0.4,
+            width: 1
+            },
+            move: {
+            enable: true,
+            speed: 1,
+            outModes: {
+                default: "out"
+            }
+            }
         },
-        onClick: {
-          enable: true,
-          mode: "push"
+        interactivity: {
+            events: {
+            onHover: {
+                enable: true,
+                mode: "grab"
+            },
+            onClick: {
+                enable: true,
+                mode: "push"
+            }
+            },
+            modes: {
+            grab: {
+                distance: 230,
+                links: {
+                opacity: 1,
+                color: "#808080"
+                }
+            },
+            push: {
+                quantity: 4
+            }
+            }
         }
-      },
-      modes: {
-        grab: {
-          distance: 230,
-          links: {
-            opacity: 1,
-            color: "#808080"
-          }
-        },
-        push: {
-          quantity: 4
-        }
-      }
     }
-  };
-
-loadParticles(configs).then(r => console.log("Particles loaded"));
+  });
+})();
+// async function loadParticles(options) {
+//    
+//   await tsParticles.load({ id: "tsparticles", options });
+// }
+//
+// const configs = {
+//     fpsLimit: 60,
+//     particles: {
+//       number: {
+//         value: 100,
+//         density: {
+//           enable: true,
+//           area: 800
+//         }
+//       },
+//       color: {
+//         value: ["#2EB67D", "#ECB22E", "#E01E5B", "#36C5F0"]
+//       },
+//       shape: {
+//         type: "circle"
+//       },
+//       opacity: {
+//         value: 0.4
+//       },
+//       size: {
+//         value: { min: 4, max: 8 }
+//       },
+//       links: {
+//         enable: true,
+//         distance: 150,
+//         color: "#808080",
+//         opacity: 0.4,
+//         width: 1
+//       },
+//       move: {
+//         enable: true,
+//         speed: 1,
+//         outModes: {
+//           default: "out"
+//         }
+//       }
+//     },
+//     interactivity: {
+//       events: {
+//         onHover: {
+//           enable: true,
+//           mode: "grab"
+//         },
+//         onClick: {
+//           enable: true,
+//           mode: "push"
+//         }
+//       },
+//       modes: {
+//         grab: {
+//           distance: 230,
+//           links: {
+//             opacity: 1,
+//             color: "#808080"
+//           }
+//         },
+//         push: {
+//           quantity: 4
+//         }
+//       }
+//     }
+//   };
+//
+// loadParticles(configs).then(r => console.log("Particles loaded"));
 
 JS;