Merge branch 'release/1.0.10'

nystudio107 · Jan 19, 2018 · b30369e · b30369e
2 parents e728f39 + 8acb5cf
commit b30369e
Show file tree

Hide file tree

Showing 14 changed files with 35 additions and 29 deletions.
diff --git a/composer.json b/composer.json
@@ -33,7 +33,7 @@
   },
   "autoload": {
     "psr-4": {
-      "modules\\site\\": "modules/site/src/"
+      "modules\\sitemodule\\": "modules/sitemodule/src/"
     }
   },
   "config": {

diff --git a/config/app.php b/config/app.php
@@ -17,10 +17,12 @@
 
     // All environments
     '*' => [
-        'modules' => [
-            'site' => \modules\site\SiteModule::class,
+        'modules'   => [
+            'site-module' => [
+                'class' => \modules\sitemodule\SiteModule::class,
+            ],
         ],
-        'bootstrap' => ['site'],
+        'bootstrap' => ['site-module'],
     ],
 
     // Live (production) environment

diff --git a/modules/site/.craftplugin → modules/sitemodule/.craftplugin b/modules/site/.craftplugin → modules/sitemodule/.craftplugin
diff --git a/modules/site/.gitignore → modules/sitemodule/.gitignore b/modules/site/.gitignore → modules/sitemodule/.gitignore
diff --git a/modules/site/CHANGELOG.md → modules/sitemodule/CHANGELOG.md b/modules/site/CHANGELOG.md → modules/sitemodule/CHANGELOG.md
diff --git a/modules/site/LICENSE.md → modules/sitemodule/LICENSE.md b/modules/site/LICENSE.md → modules/sitemodule/LICENSE.md
diff --git a/modules/site/README.md → modules/sitemodule/README.md b/modules/site/README.md → modules/sitemodule/README.md
@@ -14,16 +14,18 @@ First, you'll need to add the contents of the `app.php` file to your `config/app
 ```
 return [
     'modules' => [
-        'site' => \modules\site\SiteModule::class,
+        'site-module' => [
+            'class' => \modules\sitemodule\SiteModule::class,
+        ],
     ],
-    'bootstrap' => ['site'],
+    'bootstrap' => ['site-module'],
 ];
 ```
 You'll also need to make sure that you add the following to your project's `composer.json` file so that Composer can find your module:
 
     "autoload": {
         "psr-4": {
-          "modules\\site\\": "modules/site/src/"
+          "modules\\sitemodule\\": "modules/sitemodule/src/"
         }
     },
 

diff --git a/modules/site/config/app.php → modules/sitemodule/config/app.php b/modules/site/config/app.php → modules/sitemodule/config/app.php
@@ -14,7 +14,9 @@
  */
 return [
     'modules' => [
-        'site' => \modules\site\SiteModule::class,
+        'site-module' => [
+            'class' => \modules\sitemodule\SiteModule::class,
+        ],
     ],
-    'bootstrap' => ['site'],
+    'bootstrap' => ['site-module'],
 ];
diff --git a/modules/site/src/SiteModule.php → modules/sitemodule/src/SiteModule.php b/modules/site/src/SiteModule.php → modules/sitemodule/src/SiteModule.php
@@ -8,9 +8,9 @@
  * @copyright Copyright (c) 2018 nystudio107
  */
 
-namespace modules\site;
+namespace modules\sitemodule;
 
-use modules\site\assetbundles\site\SiteAsset;
+use modules\sitemodule\assetbundles\sitemodule\SiteModuleAsset;
 
 use Craft;
 use craft\events\RegisterTemplateRootsEvent;
@@ -23,10 +23,10 @@
 use yii\base\Module;
 
 /**
- * Class Site
+ * Class SiteModule
  *
  * @author    nystudio107
- * @package   Site
+ * @package   SiteModule
  * @since     1.0.0
  *
  */
@@ -36,7 +36,7 @@ class SiteModule extends Module
     // =========================================================================
 
     /**
-     * @var Site
+     * @var SiteModule
      */
     public static $instance;
 
@@ -48,8 +48,8 @@ class SiteModule extends Module
      */
     public function __construct($id, $parent = null, array $config = [])
     {
-        Craft::setAlias('@site', $this->getBasePath());
-        $this->controllerNamespace = 'site\controllers';
+        Craft::setAlias('@sitemodule', $this->getBasePath());
+        $this->controllerNamespace = 'sitemodule\controllers';
 
         // Translation category
         $i18n = Craft::$app->getI18n();
@@ -58,7 +58,7 @@ public function __construct($id, $parent = null, array $config = [])
             $i18n->translations[$id] = [
                 'class' => PhpMessageSource::class,
                 'sourceLanguage' => 'en-US',
-                'basePath' => '@site/translations',
+                'basePath' => '@sitemodule/translations',
                 'forceTranslation' => true,
                 'allowOverrides' => true,
             ];
@@ -91,7 +91,7 @@ public function init()
                 View::EVENT_BEFORE_RENDER_TEMPLATE,
                 function (TemplateEvent $event) {
                     try {
-                        Craft::$app->getView()->registerAssetBundle(SiteAsset::class);
+                        Craft::$app->getView()->registerAssetBundle(SiteModuleAsset::class);
                     } catch (InvalidConfigException $e) {
                         Craft::error(
                             'Error registering AssetBundle - '.$e->getMessage(),
@@ -104,7 +104,7 @@ function (TemplateEvent $event) {
 
         Craft::info(
             Craft::t(
-                'site',
+                'site-module',
                 '{name} module loaded',
                 ['name' => 'Site']
             ),

diff --git a/.../site/src/assetbundles/site/SiteAsset.php → ...setbundles/sitemodule/SiteModuleAsset.php b/.../site/src/assetbundles/site/SiteAsset.php → ...setbundles/sitemodule/SiteModuleAsset.php
@@ -1,25 +1,25 @@
 <?php
 /**
- * Site plugin for Craft CMS 3.x
+ * Site module for Craft CMS 3.x
  *
  * An example module for Craft CMS 3 that lets you enhance your websites with a custom site module
  *
  * @link      https://nystudio107.com/
  * @copyright Copyright (c) 2018 nystudio107
  */
 
-namespace modules\site\assetbundles\Site;
+namespace modules\sitemodule\assetbundles\SiteModule;
 
 use Craft;
 use craft\web\AssetBundle;
 use craft\web\assets\cp\CpAsset;
 
 /**
  * @author    nystudio107
- * @package   Site
+ * @package   SiteModule
  * @since     1.0.0
  */
-class SiteAsset extends AssetBundle
+class SiteModuleAsset extends AssetBundle
 {
     // Public Methods
     // =========================================================================
@@ -29,18 +29,18 @@ class SiteAsset extends AssetBundle
      */
     public function init()
     {
-        $this->sourcePath = "@site/assetbundles/site/dist";
+        $this->sourcePath = "@sitemodule/assetbundles/sitemodule/dist";
 
         $this->depends = [
             CpAsset::class,
         ];
 
         $this->js = [
-            'js/Site.js',
+            'js/SiteModule.js',
         ];
 
         $this->css = [
-            'css/Site.css',
+            'css/SiteModule.css',
         ];
 
         parent::init();

diff --git a/...e/src/assetbundles/site/dist/css/Site.css → ...undles/sitemodule/dist/css/SiteModule.css b/...e/src/assetbundles/site/dist/css/Site.css → ...undles/sitemodule/dist/css/SiteModule.css
@@ -6,6 +6,6 @@
  * @author    nystudio107
  * @copyright Copyright (c) 2018 nystudio107
  * @link      https://nystudio107.com/
- * @package   Site
+ * @package   SiteModule
  * @since     1.0.0
  */
diff --git a/.../assetbundles/site/dist/img/Site-icon.svg → ...s/sitemodule/dist/img/SiteModule-icon.svg b/.../assetbundles/site/dist/img/Site-icon.svg → ...s/sitemodule/dist/img/SiteModule-icon.svg
diff --git a/...ite/src/assetbundles/site/dist/js/Site.js → ...tbundles/sitemodule/dist/js/SiteModule.js b/...ite/src/assetbundles/site/dist/js/Site.js → ...tbundles/sitemodule/dist/js/SiteModule.js
@@ -6,6 +6,6 @@
  * @author    nystudio107
  * @copyright Copyright (c) 2018 nystudio107
  * @link      https://nystudio107.com/
- * @package   Site
+ * @package   SiteModule
  * @since     1.0.0
  */
diff --git a/modules/site/src/translations/en/site.php → ...odule/src/translations/en/site-module.php b/modules/site/src/translations/en/site.php → ...odule/src/translations/en/site-module.php
@@ -10,7 +10,7 @@
 
 /**
  * @author    nystudio107
- * @package   Site
+ * @package   SiteModule
  * @since     1.0.0
  */
 return [