Fixes icon fonts, cleans up asset structure

Publishes fewer files now. We were publishing more than was necessary.

common/config/aliases.php

@@ -5,6 +5,6 @@
 Yii::setAlias('@console', dirname(dirname(__DIR__)) . '/console');
 Yii::setAlias('@web', '/');
 Yii::setAlias('@webroot', '@site/web');
-Yii::setAlias('@assets', dirname(dirname(__DIR__)) . '/site/assets');
+Yii::setAlias('@assets', dirname(dirname(__DIR__)) . '/site/assets/publish');
 Yii::setAlias('@graphImgPath', '@webroot/charts');
 Yii::setAlias('@graphImgUrl', '/charts');

environments/dev/site/config/bundles-local.php

@@ -1,19 +1,10 @@
 <?php
 
+// uncheck the below to use compressed assets, after running the `./yii asset` command
+//return require(dirname($_SERVER['SCRIPT_FILENAME']) . '/../assets/assets-compressed.php');
+
 return [
-  'yii\bootstrap\BootstrapPluginAsset' => false,
-  'yii\bootstrap\BootstrapAsset' => false,
-  'yii\web\JqueryAsset' => [
-    'sourcePath' => '@assets',
-    'js' => [
-      'js/jquery-3.2.1.min.js',
-    ]
+  yii\bootstrap\BootstrapAsset::class => [
+    'css' => [], // disable bootstrap css because we pull it directly into our app.scss file
   ],
 ];
-//return array_merge(
-//  require(dirname($_SERVER['SCRIPT_FILENAME']) . '/../assets/assets-compressed.php'),
-//  [
-//    'yii\bootstrap\BootstrapPluginAsset' => false,
-//    'yii\bootstrap\BootstrapAsset' => false
-//  ]
-//);

environments/prod/site/config/bundles-local.php

@@ -0,0 +1,10 @@
+<?php
+
+// uncheck the below to use compressed assets, after running the `./yii asset` command
+//return require(dirname($_SERVER['SCRIPT_FILENAME']) . '/../assets/assets-compressed.php');
+
+return [
+  yii\bootstrap\BootstrapAsset::class => [
+    'css' => [], // disable bootstrap css because we pull it directly into our app.scss file
+  ],
+];

site/assets/AppAsset.php

@@ -1,18 +1,9 @@
 <?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
 
 namespace site\assets;
 
 use yii\web\AssetBundle;
 
-/**
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
 class AppAsset extends AssetBundle
 {
     public $sourcePath = '@assets';
@@ -22,9 +13,12 @@ class AppAsset extends AssetBundle
     ];
 
     public $depends = [
-        'yii\web\YiiAsset',
         'yii\web\JqueryAsset',
-        'site\assets\BootstrapPluginAsset',
+        'yii\web\YiiAsset',
+        // we disable all the css in the bootstrap asset here. But we pull the css into the main appasset css at the top.
+        // however, the bootstrap fonts are still pulled in here in this bootstrap asset. The url is different, because the css (pulled in via appasset) is looking for the fonts in its same asset directory.
+        'yii\bootstrap\BootstrapAsset',
+        'yii\bootstrap\BootstrapPluginAsset',
         'site\assets\MomentAsset',
         'site\assets\ChartjsAsset',
     ];

site/assets/ChartjsAsset.php

@@ -1,20 +1,9 @@
 <?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
 
 namespace site\assets;
 
 use yii\web\AssetBundle;
 
-/**
- * Asset bundle for the Twitter bootstrap css files.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
 class ChartjsAsset extends AssetBundle
 {
     public $sourcePath = '@bower/chartjs/dist';

site/assets/MomentAsset.php

@@ -1,20 +1,9 @@
 <?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
 
 namespace site\assets;
 
 use yii\web\AssetBundle;
 
-/**
- * Asset bundle for the Twitter bootstrap css files.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
 class MomentAsset extends AssetBundle
 {
     public $sourcePath = '@vendor/moment/moment/min';

site/assets/PickadateAsset.php

@@ -1,20 +1,9 @@
 <?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
 
 namespace site\assets;
 
 use yii\web\AssetBundle;
 
-/**
- * Asset bundle for the Twitter bootstrap css files.
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
- */
 class PickadateAsset extends AssetBundle
 {
     public $sourcePath = '@bower/pickadate/lib';

site/assets/assets.php

@@ -7,7 +7,7 @@
  Yii::setAlias('@webroot', __DIR__ . '/../web');
  Yii::setAlias('@web', '/');
 
-$mainConf = require(Yii::getAlias('@site/config/main.php'));
+$mainConf = require Yii::getAlias('@site/config/main.php');
 $converter = $mainConf['components']['assetManager']['converter'];
 $bundles = $mainConf['components']['assetManager']['bundles'];
 
@@ -21,7 +21,8 @@
       'yii\web\JqueryAsset',
       'site\assets\AppAsset',
       'yii\web\YiiAsset',
-      'site\assets\BootstrapPluginAsset',
+      'yii\bootstrap\BootstrapAsset',
+      'yii\bootstrap\BootstrapPluginAsset',
       'yii\widgets\ActiveFormAsset',
       'yii\validators\ValidationAsset',
       'yii\captcha\CaptchaAsset',

site/assets/css/app.scss → site/assets/publish/css/app.scss

@@ -3,6 +3,8 @@
  * $body-bg: lightgray;
  */
 $font-size-base: 16px !default;
+// we've copied the fonts to a different folder here. The reletive path is different, so we needed to change this variable.
+$icon-font-path: "../fonts/" !default;
 
 html,
 body {