-GA js ready

Alexey Boroda
1 parent f7011928
Showing 271 changed files with 535 additions and 119 deletions Show diff stats
.bowerrc
.gitignore
.htaccess
CHANGELOG.md
Initializer.php
LICENSE.md
README.md
backend/assets/AnalyticsAsset.php
backend/controllers/AjaxController.php
backend/controllers/SiteController.php
backend/models/Analytics.php
backend/views/site/_table.php → backend/views/ajax/_table.php
backend/views/settings/_codes_tab.php
backend/views/settings/_contact_tab.php
backend/views/settings/_main_tab.php
backend/views/settings/_social_tab.php
backend/views/site/analytics.php
backend/views/site/index.php
backend/views/sitemap/index.php
backend/views/sitemap/update.php
@@ -18,7 +18,7 @@
             'js/analytics.js',
         ];
         public $depends = [
-            'speixoto\amcharts\AmChartAsset',
+            'artbox\core\assets\ArtboxAmChartAsset',
         ];
     }
  
 \ No newline at end of file
+<?php
+    
+    namespace backend\controllers;
+    
+    use backend\models\Analytics;
+    use common\models\Settings;
+    use yii\filters\VerbFilter;
+    use yii\helpers\Json;
+    use yii\web\Controller;
+    use yii\web\Response;
+    
+    class AjaxController extends Controller
+    {
+        public $enableCsrfValidation = false;
+        
+        public function behaviors()
+        {
+            return [
+                'verbs' => [
+                    'class'   => VerbFilter::className(),
+                    'actions' => [
+                        'analytics' => [ 'post' ],
+                    ],
+                ],
+            ];
+        }
+        
+        public function actionAnalytics()
+        {
+            \Yii::$app->response->format = Response::FORMAT_JSON;
+            
+            $settings = Settings::getInstance();
+            
+            $analytics = new Analytics(
+                [
+                    'viewId' => $settings->analytics_key,
+                ]
+            );
+            $data = $analytics->generateData();
+            
+            $browsers = $data[ 'table' ][ 0 ];
+            arsort($browsers);
+            
+            $cityes = $data[ 'table' ][ 1 ];
+            arsort($cityes);
+            
+            $countries = $data[ 'table' ][ 2 ];
+            arsort($countries);
+            
+            return [
+                'plot'      => $data[ 'plot' ],
+                'pie'       => [
+                    [
+                        "category" => "New Visitor",
+                        "column-1" => round(intval($data[ 'new' ]), 2),
+                    ],
+                    [
+                        "category" => "Returning Visitor",
+                        "column-1" => 100 - round(intval($data[ 'new' ]), 2),
+                    ],
+                ],
+                'browsers'  => $this->renderPartial(
+                    '_table',
+                    [
+                        'data' => $browsers,
+                        'name' => 'Browser',
+                    ]
+                ),
+                'cityes'    => $this->renderPartial(
+                    '_table',
+                    [
+                        'data' => $cityes,
+                        'name' => 'City',
+                    ]
+                ),
+                'countries' => $this->renderPartial(
+                    '_table',
+                    [
+                        'data' => $countries,
+                        'name' => 'Country',
+                    ]
+                ),
+                'sessions'  => '<div class="count counter">' . $data[ 'sessions' ] . '</div>',
+                'users'     => '<div class="count">' . $data[ 'users' ] . '</div>',
+                'views'     => '<div class="count">' . $data[ 'views' ] . '</div>',
+                'newusers'  => '<div class="count">' . round(intval($data[ 'new' ]), 2) . ' %</div>',
+            ];
+        }
+        
+    }
 \ No newline at end of file
@@ -8,7 +8,8 @@
     use yii\filters\VerbFilter;
     use yii\filters\AccessControl;
     use common\models\LoginForm;
-
+    use yii\web\Response;
+    
     /**
      * Site controller
      */
@@ -34,7 +35,7 @@
                             'actions' => [
                                 'logout',
                                 'index',
-                                'analytic',
+                                'analytics',
                             ],
                             'allow'   => true,
                             'roles'   => [ '@' ],
@@ -44,7 +45,8 @@
                 'verbs'  => [
                     'class'   => VerbFilter::className(),
                     'actions' => [
-                        'logout' => [ 'post' ],
+                        'logout'    => [ 'post' ],
+                        'analytics' => [ 'post' ],
                     ],
                 ],
             ];
@@ -69,37 +71,37 @@
          */
         public function actionIndex()
         {
-            $settings = Settings::getInstance();
-    
-            if (empty($settings->analytics_key)) {
-                return $this->render('index');
-            } else {
-                $analytics = new Analytics(
-                    [
-                        'viewId' => $settings->analytics_key,
-                    ]
-                );
-                $data = $analytics->generateData();
-    
-                $browsers = $data[ 'table' ][ 0 ];
-                arsort($browsers);
-    
-                $cityes = $data[ 'table' ][ 1 ];
-                arsort($cityes);
-    
-                $countries = $data[ 'table' ][ 2 ];
-                arsort($countries);
-    
-                return $this->render(
-                    'analytics',
-                    [
-                        'data'      => $data,
-                        'browsers'  => $browsers,
-                        'cityes'    => $cityes,
-                        'countries' => $countries,
-                    ]
-                );
-            }
+            //            $settings = Settings::getInstance();
+            //
+            //            if (empty($settings->analytics_key)) {
+            return $this->render('index');
+            //            } else {
+            //                $analytics = new Analytics(
+            //                    [
+            //                        'viewId' => $settings->analytics_key,
+            //                    ]
+            //                );
+            //                $data = $analytics->generateData();
+            //
+            //                $browsers = $data[ 'table' ][ 0 ];
+            //                arsort($browsers);
+            //
+            //                $cityes = $data[ 'table' ][ 1 ];
+            //                arsort($cityes);
+            //
+            //                $countries = $data[ 'table' ][ 2 ];
+            //                arsort($countries);
+            //
+            //                return $this->render(
+            //                    'analytics',
+            //                    [
+            //                        'data'      => $data,
+            //                        'browsers'  => $browsers,
+            //                        'cityes'    => $cityes,
+            //                        'countries' => $countries,
+            //                    ]
+            //                );
+            //            }
         }
  
         /**
@@ -137,9 +139,4 @@
  
             return $this->goHome();
         }
-    
-        public function actionAnalytic()
-        {
-            return $this->render('analytic');
-        }
     }
@@ -4,22 +4,125 @@
      * @var View $this
      */
  
-    use artbox\gentelella\widgets\XPanel;
     use backend\assets\AnalyticsAsset;
+    use yii\bootstrap\Tabs;
     use yii\web\View;
+    use yiister\gentelella\widgets\Panel;
  
     $this->title = 'Artbox !';
  
     AnalyticsAsset::register($this);
 ?>
  
-<?php $panel = XPanel::begin(
-    [
-        'title'   => 'Hello!',
-        'toolbar' => false,
-    ]
-); ?>
+<div class="row">
+  <div class="animated flipInY col-lg-3 col-md-3 col-sm-6 col-xs-12">
+    <div class="tile-stats">
+      <div class="icon"><i class="fa fa-clock-o"></i>
+      </div>
+      
+      <div class="count" id="sessions">0</div>
+      
+      <h3>Sessions</h3>
+      <p>Lorem ipsum psdea itgum rixt.</p>
+    </div>
+  </div>
+  <div class="animated flipInY col-lg-3 col-md-3 col-sm-6 col-xs-12">
+    <div class="tile-stats">
+      <div class="icon"><i class="fa fa-user"></i>
+      </div>
+      
+      <div class="count" id="users">0</div>
+      
+      <h3>Users</h3>
+      <p>Lorem ipsum psdea itgum rixt.</p>
+    </div>
+  </div>
+  <div class="animated flipInY col-lg-3 col-md-3 col-sm-6 col-xs-12">
+    <div class="tile-stats">
+      <div class="icon"><i class="fa fa-eye"></i>
+      </div>
+      
+      <div class="count" id="views">0</div>
+      
+      <h3>Page views</h3>
+      <p>Lorem ipsum psdea itgum rixt.</p>
+    </div>
+  </div>
+  <div class="animated flipInY col-lg-3 col-md-3 col-sm-6 col-xs-12">
+    <div class="tile-stats">
+      <div class="icon"><i class="fa fa-plus"></i>
+      </div>
+      
+      <div class="count" id="newusers">0</div>
+      
+      <h3>New sessions</h3>
+      <p>Lorem ipsum psdea itgum rixt.</p>
+    </div>
+  </div>
+</div>
  
-<div id="chart"></div>
+<div class="row">
+  <div class="col-md-12">
+      <?php $panel = Panel::begin(
+          [
+              'header' => 'Analytic',
+          ]
+      ) ?>
+    
+    <div id="chartdiv" style="width: 100%;height: 500px"></div>
+      
+      <?php $panel::end(); ?>
+  </div>
+</div>
  
-<?php $panel::end(); ?>
+<div class="row">
+  <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
+      <?php $panel = Panel::begin(
+          [
+              'header' => 'Pie chart',
+          ]
+      ) ?>
+    
+    <div id="piediv" style="width: 100%;height: 400px"></div>
+      
+      <?php $panel::end(); ?>
+  </div>
+  
+  <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
+      
+      <?php $panel = Panel::begin(
+          [
+              'header' => 'Some stats',
+          ]
+      ); ?>
+      
+      <?php
+          echo Tabs::widget(
+              [
+                  'options' => [
+                      'class' => 'bar_tabs',
+                  ],
+                  'items'   => [
+                      [
+                          'label'   => 'Browsers',
+                          'content' => '<div id="browsers"></div>',
+                          'active'  => true,
+                      ],
+                      [
+                          'label'   => 'Cities',
+                          'content' => '<div id="cities"></div>',
+                      ],
+                      [
+                          'label'   => 'Countries',
+                          'content' => '<div id="countries"></div>',
+                      ],
+                  ],
+              ]
+          );
+      
+      ?>
+      
+      <?php $panel::end(); ?>
+  
+  </div>
+</div>
-var chart = AmCharts.makeChart(
-    "chart", {
-        "type": "pie",
-        "dataProvider": [
+$(
+    function() {
+        $.ajax(
             {
-                "country": "Lithuania",
-                "litres": 501.9
-            },
-            {
-                "country": "Czech Republic",
-                "litres": 301.9
-            },
-            {
-                "country": "Ireland",
-                "litres": 201.1
-            },
-            {
-                "country": "Germany",
-                "litres": 165.8
-            },
-            {
-                "country": "Australia",
-                "litres": 139.9
-            },
-            {
-                "country": "Austria",
-                "litres": 128.3
-            },
-            {
-                "country": "UK",
-                "litres": 99
-            },
-            {
-                "country": "Belgium",
-                "litres": 60
-            },
-            {
-                "country": "The Netherlands",
-                "litres": 50
+                url: "/admin/ajax/analytics",
+                type: "POST",
+                success: function(data) {
+                    // Replacing top data
+                    $('#sessions')
+                        .replaceWith(data.sessions);
+                    $('#users')
+                        .replaceWith(data.users);
+                    $('#views')
+                        .replaceWith(data.views);
+                    $('#newusers')
+                        .replaceWith(data.newusers);
+                    // Building main chart
+                    var chart = AmCharts.makeChart(
+                        "chartdiv", {
+                            "type": "serial",
+                            'dataProvider': data.plot,
+                            'categoryField': 'day',
+                            'categoryAxis': {
+                                'labelFrequency': 5
+                            },
+                            'graphs': [
+                                {
+                                    'balloon': {
+                                        "drop": true,
+                                        "adjustBorderColor": false,
+                                        "color": "#ffffff"
+                                    },
+                                    "bullet": "round",
+                                    "bulletBorderAlpha": 1,
+                                    "bulletColor": "#FFFFFF",
+                                    "bulletSize": 5,
+                                    "hideBulletsCount": 50,
+                                    "lineThickness": 2,
+                                    "title": "red line",
+                                    "useLineColorForBulletBorder": true,
+                                    "valueField": "users",
+                                    "balloonText": "<span style='font-size:18px;'>Users: [[users]]</span>",
+                                    "lineColor": '#9ABCC3'
+                                },
+                                {
+                                    'balloon': {
+                                        "drop": true,
+                                        "adjustBorderColor": false,
+                                        "color": "#ffffff"
+                                    },
+                                    "bullet": "round",
+                                    "bulletBorderAlpha": 1,
+                                    "bulletColor": "#FFFFFF",
+                                    "bulletSize": 5,
+                                    "hideBulletsCount": 50,
+                                    "lineThickness": 2,
+                                    "title": "red line",
+                                    "useLineColorForBulletBorder": true,
+                                    "valueField": "sessions",
+                                    "balloonText": "<span style='font-size:18px;'>Sessions: [[sessions]]</span>",
+                                    "lineColor": '#A8E3D6'
+                                }
+                            ],
+                            'chartCursor': {
+                                "pan": true,
+                                "valueLineEnabled": true,
+                                "valueLineBalloonEnabled": true,
+                                "cursorAlpha": 1,
+                                "cursorColor": "#1ABB9C",
+                                "limitToGraph": "g1",
+                                "valueLineAlpha": 0.2,
+                                "valueZoomable": true
+                            }
+                        }
+                    );
+
+                    // Building pie chart
+                    var pie = AmCharts.makeChart(
+                        "piediv", {
+                            "type": "pie",
+                            'dataProvider': data.pie,
+                            "titleField": "category",
+                            "valueField": "column-1",
+                            'colors': [
+                                "#A8E3D6",
+                                "#9ABCC3"
+                            ]
+                        }
+                    );
+                    // Replacing table stabs
+                    $('#browsers')
+                        .replaceWith(data.browsers);
+                    $('#cities')
+                        .replaceWith(data.cityes);
+                    $('#countries')
+                        .replaceWith(data.countries);
+                }
             }
-        ],
-        "valueField": "litres",
-        "titleField": "country",
-        "balloon": {
-            "fixedPosition": true
-        },
-        "export": {
-            "enabled": true
-        }
+        )
     }
-);
 \ No newline at end of file
+);
+
@@ -5045,7 +5045,7 @@ if (typeof NProgress != &#39;undefined&#39;) {
 		init_daterangepicker_reservation();
 		init_SmartWizard();
 		init_EasyPieChart();
-		init_charts();
+        //		init_charts();
 		init_echarts();
 		init_morris_charts();
 		init_skycons();
+/** @preserve jQuery animateNumber plugin v0.0.14
+ * (c) 2013, Alexandr Borisov.
+ * https://github.com/aishek/jquery-animateNumber
+ */
+
+// ['...'] notation using to avoid names minification by Google Closure Compiler
+(function($) {
+    var reverse = function(value) {
+        return value.split('')
+                    .reverse()
+                    .join('');
+    };
+
+    var defaults = {
+        numberStep: function(now, tween) {
+            var floored_number = Math.floor(now), target = $(tween.elem);
+
+            target.text(floored_number);
+        }
+    };
+
+    var handle = function(tween) {
+        var elem = tween.elem;
+        if (elem.nodeType && elem.parentNode) {
+            var handler = elem._animateNumberSetter;
+            if (!handler) {
+                handler = defaults.numberStep;
+            }
+            handler(tween.now, tween);
+        }
+    };
+
+    if (!$.Tween || !$.Tween.propHooks) {
+        $.fx.step.number = handle;
+    } else {
+        $.Tween.propHooks.number = {
+            set: handle
+        };
+    }
+
+    var extract_number_parts = function(separated_number, group_length) {
+        var numbers = separated_number.split('')
+                                      .reverse(), number_parts = [], current_number_part, current_index, q;
+
+        for (var i = 0, l = Math.ceil(separated_number.length / group_length); i < l; i++) {
+            current_number_part = '';
+            for (q = 0; q < group_length; q++) {
+                current_index = i * group_length + q;
+                if (current_index === separated_number.length) {
+                    break;
+                }
+
+                current_number_part = current_number_part + numbers[ current_index ];
+            }
+            number_parts.push(current_number_part);
+        }
+
+        return number_parts;
+    };
+
+    var remove_precending_zeros = function(number_parts) {
+        var last_index = number_parts.length - 1, last = reverse(number_parts[ last_index ]);
+
+        number_parts[ last_index ] = reverse(
+            parseInt(last, 10)
+                .toString()
+        );
+        return number_parts;
+    };
+
+    $.animateNumber = {
+        numberStepFactories: {
+            /**
+             * Creates numberStep handler, which appends string to floored animated number on each step.
+             *
+             * @example
+             * // will animate to 100 with "1 %", "2 %", "3 %", ...
+             * $('#someid').animateNumber({
+       *   number: 100,
+       *   numberStep: $.animateNumber.numberStepFactories.append(' %')
+       * });
+             *
+             * @params {String} suffix string to append to animated number
+             * @returns {Function} numberStep-compatible function for use in animateNumber's parameters
+             */
+            append: function(suffix) {
+                return function(now, tween) {
+                    var floored_number = Math.floor(now), target = $(tween.elem);
+
+                    target.prop('number', now)
+                          .text(floored_number + suffix);
+                };
+            },
+
+            /**
+             * Creates numberStep handler, which format floored numbers by separating them to groups.
+             *
+             * @example
+             * // will animate with 1 ... 217,980 ... 95,217,980 ... 7,095,217,980
+             * $('#world-population').animateNumber({
+       *    number: 7095217980,
+       *    numberStep: $.animateNumber.numberStepFactories.separator(',')
+       * });
+             * @example
+             * // will animate with 1% ... 217,980% ... 95,217,980% ... 7,095,217,980%
+             * $('#salesIncrease').animateNumber({
+       *   number: 7095217980,
+       *   numberStep: $.animateNumber.numberStepFactories.separator(',', 3, '%')
+       * });
+             *
+             * @params {String} [separator=' '] string to separate number groups
+             * @params {String} [group_length=3] number group length
+             * @params {String} [suffix=''] suffix to append to number
+             * @returns {Function} numberStep-compatible function for use in animateNumber's parameters
+             */
+            separator: function(separator, group_length, suffix) {
+                separator = separator || ' ';
+                group_length = group_length || 3;
+                suffix = suffix || '';
+
+                return function(now, tween) {
+                    var negative = now < 0, floored_number = Math.floor((negative ? -1 : 1) * now), separated_number = floored_number.toString(), target = $(tween.elem);
+
+                    if (separated_number.length > group_length) {
+                        var number_parts = extract_number_parts(separated_number, group_length);
+
+                        separated_number = remove_precending_zeros(number_parts)
+                            .join(separator);
+                        separated_number = reverse(separated_number);
+                    }
+
+                    target.prop('number', now)
+                          .text((negative ? '-' : '') + separated_number + suffix);
+                };
+            }
+        }
+    };
+
+    $.fn.animateNumber = function() {
+        var options = arguments[ 0 ], settings = $.extend({}, defaults, options),
+
+            target = $(this), args = [ settings ];
+
+        for (var i = 1, l = arguments.length; i < l; i++) {
+            args.push(arguments[ i ]);
+        }
+
+        // needs of custom step function usage
+        if (options.numberStep) {
+            // assigns custom step functions
+            var items = this.each(
+                function() {
+                    this._animateNumberSetter = options.numberStep;
+                }
+            );
+
+            // cleanup of custom step functions after animation
+            var generic_complete = settings.complete;
+            settings.complete = function() {
+                items.each(
+                    function() {
+                        delete this._animateNumberSetter;
+                    }
+                );
+
+                if (generic_complete) {
+                    generic_complete.apply(this, arguments);
+                }
+            };
+        }
+
+        return target.animate.apply(target, args);
+    };
+
+}(jQuery));
@@ -5,29 +5,29 @@ return [
         'phone' => '+38 (044) 593-73-76',
         'phone2' => '+38 (098) 468-07-64',
         'skype' => 'artwebstudio',
-        'email' => 'artweb.ua@gmail.com',
-        'house' => '1-М',
-        'street' => 'пр. М. Бажана',
-        'office' => '25',
-        'city' => 'Киев',
-        'country' => 'Украина',
-        'lat' => '50.403696',
-        'lon' => '30.641481',
-        'facebook' => 'https://www.facebook.com/ArtWeb.ua/',
-        'vk' => 'https://vk.com/artwebua',
-        'ok' => 'https://ok.ru/artwebua',
-        'google' => 'https://plus.google.com/+ArtwebUaAgency',
-        'twitter' => 'https://twitter.com/ArtWeb_ua',
-        'name' => 'Artweb',
-        'logo' => '2',
-        'about' => 'Строим бизнес в онлайне',
+        'email'         => 'artweb.ua@gmail.com',
+        'house'         => '1-М',
+        'street'        => 'пр. М. Бажана',
+        'office'        => '25',
+        'city'          => 'Киев',
+        'country'       => 'Украина',
+        'lat'           => '50.403696',
+        'lon'           => '30.641481',
+        'facebook'      => 'https://www.facebook.com/ArtWeb.ua/',
+        'vk'            => 'https://vk.com/artwebua',
+        'ok'            => 'https://ok.ru/artwebua',
+        'google'        => 'https://plus.google.com/+ArtwebUaAgency',
+        'twitter'       => 'https://twitter.com/ArtWeb_ua',
+        'name'          => 'Artweb',
+        'logo'          => '11',
+        'about'         => 'Строим бизнес в онлайне',
         'analytics_key' => '119240817',
-        'robots' => 'User-agent: Google
+        'robots'        => 'User-agent: Google
 Disallow:
 ',
-        'ga_code' => '796967',
-        'ya_code' => '08908908',
-        'tag_manager' => '',
-        'id' => 1,
+        'ga_code'       => '796967',
+        'ya_code'       => '08908908',
+        'tag_manager'   => '',
+        'id'            => 1,
     ],
 ];
 \ No newline at end of file