Updated vendors; Refactored Assets

README.md

@@ -11,8 +11,6 @@ Author: Alex Solomaha <cyanofresh@gmail.com>
 
 Feel free to contribute!
 
-![Screen of Panel](http://image.prntscr.com/image/6e4e6e725328456e960e4a384e3bccba.png)
-
 FEATURES
 ------------
 
@@ -31,13 +29,13 @@ I've selected ESP8266 NodeMCU boards for low price and websocket module support.
 - [NodeMCU #2](https://github.com/CyanoFresh/SmartHome-NodeMCU-2)
 - [NodeMCU #3](https://github.com/CyanoFresh/SmartHome-NodeMCU-3)
 - [WeMos D1 Mini #1](https://github.com/CyanoFresh/SmartHome-Wemos-1)
-
+- ...
 
 REQUIREMENTS
 ------------
 
 - PHP >= 5.4.0
-- At least 1 open port (8081)
+- At least 1 open port for websockets (8081)
 
 
 INSTALLATION
@@ -52,18 +50,15 @@ composer install
 php init
 ~~~
 
-Then configure DB in config/db-local.php and run:
+Configure DB in config/db-local.php and run:
 
 ~~~
 php yii migrate
 ~~~
 
-**NOTES:**
-- Check and edit the other files in the `config/` directory to customize your application as required.
-
 
 To start the Main server:
 
 ~~~
-php yii panel
+php yii start-core-server
 ~~~

assets/AppAsset.php

@@ -9,20 +9,28 @@ class AppAsset extends AssetBundle
     public $basePath = '@webroot';
     public $baseUrl = '@web';
     public $css = [
-        'https://fonts.googleapis.com/css?family=Product+Sans',
+        'css/theme.css',
+        'css/ripples.css',
+        'css/md.theme.css',
         'css/site.css',
     ];
     public $js = [
+        'js/ripples.js',
+        'js/md.theme.js',
         'js/site.js',
     ];
     public $depends = [
-        'yii\web\YiiAsset',
+        'app\assets\vendors\FontsAsset',
+        'yii\web\JqueryAsset',
         'yii\bootstrap\BootstrapPluginAsset',
+        'yii\web\YiiAsset',
         'rmrevin\yii\fontawesome\AssetBundle',
+        'app\assets\vendors\SnackbarjsAsset',
+//        'app\assets\vendors\SpectrumAsset',
 //        'dmstr\web\AdminLteAsset',
 //        'shifrin\noty\NotyAsset',
-        'app\assets\MDThemeAsset',
-//        'app\assets\JSCookieAsset',
-//        'app\assets\ChartjsAsset',
+//        'app\assets\MDThemeAsset',
+//        'app\assets\vendors\JSCookieAsset',
+//        'app\assets\vendors\ChartjsAsset',
     ];
 }

assets/MDThemeAsset.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace app\assets;
-
-use yii\web\AssetBundle;
-
-class MDThemeAsset extends AssetBundle
-{
-    public $basePath = '@webroot';
-    public $baseUrl = '@web';
-    public $css = [
-        'css/theme.css',
-        'css/ripples.css',
-        'css/md.theme.css',
-    ];
-    public $js = [
-        'js/ripples.js',
-        'js/md.theme.js',
-    ];
-    public $depends = [
-        'yii\web\JqueryAsset',
-        'yii\bootstrap\BootstrapPluginAsset',
-        'app\assets\SnackbarjsAsset',
-        'app\assets\SpectrumAsset',
-    ];
-}

assets/PanelAsset.php

@@ -16,9 +16,9 @@ class PanelAsset extends AssetBundle
     ];
     public $depends = [
         'app\assets\AppAsset',
-        'app\assets\HandlebarsAsset',
-        'app\assets\SpectrumAsset',
-        'app\assets\ChartjsAsset',
+        'app\assets\vendors\HandlebarsAsset',
+        'app\assets\vendors\SpectrumAsset',
+        'app\assets\vendors\ChartjsAsset',
         'yii\web\JqueryAsset',
     ];
 }

assets/vendors/ChartjsAsset.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace app\assets;
+namespace app\assets\vendors;
 
 use yii\web\AssetBundle;
 

assets/vendors/FontawesomeIconpickerAsset.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace app\assets;
+namespace app\assets\vendors;
 
 use yii\web\AssetBundle;
 

assets/vendors/FontsAsset.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace app\assets\vendors;
+
+use yii\web\AssetBundle;
+
+class FontsAsset extends AssetBundle
+{
+    public $css = [
+        'https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Product+Sans',
+    ];
+}

assets/vendors/HandlebarsAsset.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace app\assets;
+namespace app\assets\vendors;
 
 use yii\web\AssetBundle;
 

assets/vendors/JSCookieAsset.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace app\assets;
+namespace app\assets\vendors;
 
 use yii\web\AssetBundle;
 

assets/vendors/SnackbarjsAsset.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace app\assets;
+namespace app\assets\vendors;
 
 use yii\web\AssetBundle;
 

assets/vendors/SpectrumAsset.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace app\assets;
+namespace app\assets\vendors;
 
 use yii\web\AssetBundle;
 

composer.json

@@ -6,20 +6,16 @@
     "yiisoft/yii2": ">=2.0.5",
     "yiisoft/yii2-bootstrap": "*",
     "yiisoft/yii2-swiftmailer": "*",
-    "rmrevin/yii2-minify-view": "*",
-    "react/event-loop": "0.3.*",
-    "cboden/ratchet": "^0.3.4",
+    "rmrevin/yii2-minify-view": "^1.15",
+    "cboden/ratchet": "~0.3.6",
+    "rmrevin/yii2-fontawesome": "~2.17",
+    "ratchet/pawl": "~0.2.3",
+    "kartik-v/yii2-widgets": "^3.4",
+    "kartik-v/yii2-datecontrol": "^1.9",
+    "voskobovich/yii2-linker-behavior": "^4.0",
     "bower-asset/handlebars": "^4.0",
     "bower-asset/spectrum": "^1.8",
     "bower-asset/snackbarjs": "dev-fixes",
-    "rmrevin/yii2-fontawesome": "~2.12",
-    "linslin/yii2-curl": "1.0.8",
-    "shifrin/yii2-noty": "^1.0",
-    "ratchet/pawl": "^0.2.2",
-    "voskobovich/yii2-many-many-behavior": "^3.2",
-    "kartik-v/yii2-widgets": "^3.4",
-    "kartik-v/yii2-datecontrol": "^1.9",
-    "voskobovich/yii2-linker-behavior": "4.0.1-rc",
     "bower-asset/js-cookie": "^2.1",
     "bower-asset/chart.js": ">=2.5",
     "bower-asset/fontawesome-iconpicker": "^1.3"

config/main.php

@@ -55,7 +55,6 @@ return [
         'view' => [
             'class' => 'rmrevin\yii\minify\View',
             'minify_path' => '@webroot/assets',
-            'js_position' => [\yii\web\View::POS_END],
             'force_charset' => 'UTF-8',
         ],
         'formatter' => [

modules/admin/views/item-widget/_form.php

@@ -11,7 +11,7 @@ use kartik\select2\Select2;
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 
-\app\assets\FontawesomeIconpickerAsset::register($this);
+\app\assets\vendors\FontawesomeIconpickerAsset::register($this);
 
 $this->registerJs("
 $('.fontawesome-iconpicker-input').iconpicker({container: 'body', inputSearch: true,});

views/layouts/base.php

@@ -6,10 +6,8 @@
 use app\assets\MDThemeAsset;
 use yii\helpers\Html;
 use app\assets\AppAsset;
-use yii\helpers\Url;
 
 AppAsset::register($this);
-MDThemeAsset::register($this);
 
 $bodyClass = isset($this->params['bodyClass']) ? $this->params['bodyClass'] : '';
 ?>

web/css/theme.css

@@ -1,6 +1,5 @@
 /*! Generated by Live LESS Theme Customizer */
 
-@import url("https://fonts.googleapis.com/css?family=Roboto:300,400,500,700");
 /*!
  * Bootstrap v3.3.7 (http://getbootstrap.com)
  * Copyright 2011-2016 Twitter, Inc.