From 626901d1044d7edadfae92795659d58045b93534 Mon Sep 17 00:00:00 2001
From: Yuriy Bakhtin <yurybakh@gmail.com>
Date: Tue, 28 May 2024 16:27:36 +0200
Subject: [PATCH] Update module resources path

---
 Assets.php                                    |  29 ------------------
 assets/Assets.php                             |  26 ++++++++++++++++
 docs/CHANGELOG.md                             |   4 +++
 module.json                                   |   6 ++--
 {assets => resources/css}/mostactiveusers.css |   0
 {assets => resources}/module_image.png        | Bin
 {assets => resources}/screen1.PNG             | Bin
 {assets => resources}/screen2.PNG             | Bin
 {assets => resources}/screen3.PNG             | Bin
 widgets/views/sidebar.php                     |   3 +-
 10 files changed, 34 insertions(+), 34 deletions(-)
 delete mode 100644 Assets.php
 create mode 100644 assets/Assets.php
 rename {assets => resources/css}/mostactiveusers.css (100%)
 mode change 100755 => 100644
 rename {assets => resources}/module_image.png (100%)
 rename {assets => resources}/screen1.PNG (100%)
 rename {assets => resources}/screen2.PNG (100%)
 rename {assets => resources}/screen3.PNG (100%)

diff --git a/Assets.php b/Assets.php
deleted file mode 100644
index fa52501..0000000
--- a/Assets.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/**
- * @link https://www.humhub.org/
- * @copyright Copyright (c) 2015 HumHub GmbH & Co. KG
- * @license https://www.humhub.com/licences
- */
-
-namespace humhub\modules\mostactiveusers;
-
-use yii\web\AssetBundle;
-
-class Assets extends AssetBundle
-{
-
-    public $publishOptions = [
-        'forceCopy' => true
-    ];
-    public $css = [
-        'mostactiveusers.css',
-    ];
-
-    public function init()
-    {
-        $this->sourcePath = dirname(__FILE__) . '/assets';
-        parent::init();
-    }
-
-}
diff --git a/assets/Assets.php b/assets/Assets.php
new file mode 100644
index 0000000..7431645
--- /dev/null
+++ b/assets/Assets.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * @link https://www.humhub.org/
+ * @copyright Copyright (c) 2015 HumHub GmbH & Co. KG
+ * @license https://www.humhub.com/licences
+ */
+
+namespace humhub\modules\mostactiveusers\assets;
+
+use yii\web\AssetBundle;
+
+class Assets extends AssetBundle
+{
+    /**
+     * @inheritdoc
+     */
+    public $sourcePath = '@mostactiveusers/resources';
+
+    /**
+     * @inheritdoc
+     */
+    public $css = [
+        'css/mostactiveusers.css',
+    ];
+}
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 2c00330..10b1522 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,6 +1,10 @@
 Changelog
 =========
 
+0.3.0 - Unreleased
+----------------------
+- Fix #23: Update module resources path
+
 0.2.7 - April 14, 2022
 ----------------------
 - Enh #4823: Remove CHTML/CActiveForm usages
diff --git a/module.json b/module.json
index 940b35e..aeb0534 100755
--- a/module.json
+++ b/module.json
@@ -3,14 +3,14 @@
     "name": "Most Active Users",
     "description": "Adds a widget to the dashboard showing the most active users",
     "keywords": ["most", "active", "users", "widget", "dashboard"],
-    "version": "0.2.7",
+    "version": "0.3.0",
     "humhub": {
-        "minVersion": "1.0"
+        "minVersion": "1.17"
     },
     "homepage": "https://github.com/humhub-contrib/mostactiveusers",
     "authors": [
         {
             "name": "Marjana Pesic"
         }
-    ]  
+    ]
 }
diff --git a/assets/mostactiveusers.css b/resources/css/mostactiveusers.css
old mode 100755
new mode 100644
similarity index 100%
rename from assets/mostactiveusers.css
rename to resources/css/mostactiveusers.css
diff --git a/assets/module_image.png b/resources/module_image.png
similarity index 100%
rename from assets/module_image.png
rename to resources/module_image.png
diff --git a/assets/screen1.PNG b/resources/screen1.PNG
similarity index 100%
rename from assets/screen1.PNG
rename to resources/screen1.PNG
diff --git a/assets/screen2.PNG b/resources/screen2.PNG
similarity index 100%
rename from assets/screen2.PNG
rename to resources/screen2.PNG
diff --git a/assets/screen3.PNG b/resources/screen3.PNG
similarity index 100%
rename from assets/screen3.PNG
rename to resources/screen3.PNG
diff --git a/widgets/views/sidebar.php b/widgets/views/sidebar.php
index 4bc3a7b..9f69d9d 100755
--- a/widgets/views/sidebar.php
+++ b/widgets/views/sidebar.php
@@ -2,7 +2,7 @@
 
 use yii\helpers\Html;
 
-humhub\modules\mostactiveusers\Assets::register($this);
+humhub\modules\mostactiveusers\assets\Assets::register($this);
 ?>
 <div class="panel panel-default" id="mostactiveusers-panel">
 
@@ -38,4 +38,3 @@
         ?>
     </div>
 </div>
-