diff --git a/backend/assets/AnalyticsAsset.php b/backend/assets/AnalyticsAsset.php index f7de167..0f0e5b5 100755 --- a/backend/assets/AnalyticsAsset.php +++ b/backend/assets/AnalyticsAsset.php @@ -15,10 +15,12 @@ public $baseUrl = '@web'; public $css = []; public $js = [ + 'js/jquery.animateNumber.js', 'js/analytics.js', ]; public $depends = [ 'artbox\core\assets\ArtboxAmChartAsset', + 'backend\assets\AppAsset', ]; } \ No newline at end of file diff --git a/backend/controllers/AjaxController.php b/backend/controllers/AjaxController.php old mode 100644 new mode 100755 index 4b03e33..0c70726 --- a/backend/controllers/AjaxController.php +++ b/backend/controllers/AjaxController.php @@ -5,7 +5,6 @@ use backend\models\Analytics; use common\models\Settings; use yii\filters\VerbFilter; - use yii\helpers\Json; use yii\web\Controller; use yii\web\Response; @@ -80,10 +79,10 @@ 'name' => 'Country', ] ), - 'sessions' => '
' . $data[ 'sessions' ] . '
', - 'users' => '
' . $data[ 'users' ] . '
', - 'views' => '
' . $data[ 'views' ] . '
', - 'newusers' => '
' . round(intval($data[ 'new' ]), 2) . ' %
', + 'sessions' => (int) $data[ 'sessions' ], + 'users' => (int) $data[ 'users' ], + 'views' => (int) $data[ 'views' ], + 'newusers' => round(intval($data[ 'new' ]), 2), ]; } diff --git a/backend/controllers/SiteController.php b/backend/controllers/SiteController.php index feebfc3..5a51140 100755 --- a/backend/controllers/SiteController.php +++ b/backend/controllers/SiteController.php @@ -1,14 +1,12 @@ 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('instruction'); + } else { + return $this->render('index'); + } } /** diff --git a/backend/views/site/analytics.php b/backend/views/site/analytics.php deleted file mode 100755 index 4bd21cc..0000000 --- a/backend/views/site/analytics.php +++ /dev/null @@ -1,236 +0,0 @@ - - -
-
-
-
-
-
- -

Sessions

-

Lorem ipsum psdea itgum rixt.

-
-
-
-
-
-
-
- -

Users

-

Lorem ipsum psdea itgum rixt.

-
-
-
-
-
-
-
- -

Page views

-

Lorem ipsum psdea itgum rixt.

-
-
-
-
-
-
-
%
- -

New sessions

-

Lorem ipsum psdea itgum rixt.

-
-
-
- -
-
- 'Analytics', - ] - ); ?> - - '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" => "Users: [[users]]", - "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" => "Sessions: [[sessions]]", - "lineColor" => '#A8E3D6', - ], - ], - 'chartCursor' => [ - "pan" => true, - "valueLineEnabled" => true, - "valueLineBalloonEnabled" => true, - "cursorAlpha" => 1, - "cursorColor" => "#1ABB9C", - "limitToGraph" => "g1", - "valueLineAlpha" => 0.2, - "valueZoomable" => true, - ], - ]; - - echo Widget::widget( - [ - 'chartConfiguration' => $chartConfiguration, - 'width' => '100%', - ] - ); - ?> - - - -
-
- -
-
- 'Analytics', - ] - ); ?> - - "pie", - "titleField" => "category", - "valueField" => "column-1", - "dataProvider" => [ - [ - "category" => "New Visitor", - "column-1" => round(intval($data[ 'new' ]), 2), - ], - [ - "category" => "Returning Visitor", - "column-1" => 100 - round(intval($data[ 'new' ]), 2), - ], - ], - "colors" => [ - "#A8E3D6", - "#9ABCC3", - ], - ]; - - echo Widget::widget( - [ - 'chartConfiguration' => $chartConfiguration, - 'width' => '100%', - ] - ); - ?> - - -
- -
- - 'Analytics', - ] - ); ?> - - [ - 'class' => 'bar_tabs', - ], - 'items' => [ - [ - 'label' => 'Browsers', - 'content' => $this->render( - '_table', - [ - 'data' => $browsers, - 'name' => 'Browser', - ] - ), - 'active' => true, - ], - [ - 'label' => 'Cities', - 'content' => $this->render( - '_table', - [ - 'data' => $cityes, - 'name' => 'City', - ] - ), - ], - [ - 'label' => 'Countries', - 'content' => $this->render( - '_table', - [ - 'data' => $countries, - 'name' => 'Country', - ] - ), - ], - ], - ] - ); - - ?> - - - -
- -
- diff --git a/backend/views/site/instruction.php b/backend/views/site/instruction.php new file mode 100755 index 0000000..cf0473d --- /dev/null +++ b/backend/views/site/instruction.php @@ -0,0 +1,27 @@ + + +
+ 'Instruction', + ] + ) ?> +
+

Hello, world!

+

This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.

+
+ +
+ diff --git a/backend/web/js/analytics.js b/backend/web/js/analytics.js index cfd1bb7..ab3e3b0 100755 --- a/backend/web/js/analytics.js +++ b/backend/web/js/analytics.js @@ -7,13 +7,13 @@ $( success: function(data) { // Replacing top data $('#sessions') - .replaceWith(data.sessions); + .animateNumber({number: data.sessions}, 2000); $('#users') - .replaceWith(data.users); + .animateNumber({number: data.users}, 2000); $('#views') - .replaceWith(data.views); + .animateNumber({number: data.views}, 2000); $('#newusers') - .replaceWith(data.newusers); + .animateNumber({number: data.newusers}, 2000); // Building main chart var chart = AmCharts.makeChart( "chartdiv", { diff --git a/backend/web/js/jquery.animateNumber.js b/backend/web/js/jquery.animateNumber.js old mode 100644 new mode 100755 index 7ea6e6e..7ea6e6e --- a/backend/web/js/jquery.animateNumber.js +++ b/backend/web/js/jquery.animateNumber.js diff --git a/common/config/settings.php b/common/config/settings.php index c685ca5..08e6a39 100755 --- a/common/config/settings.php +++ b/common/config/settings.php @@ -2,21 +2,21 @@ return [ 1 => [ - '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', + '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' => '11', diff --git a/frontend/web/img/7_bMIj6pnE4WCbYj8XV7jYIc3PmtwqBi_F.png b/frontend/web/img/7_bMIj6pnE4WCbYj8XV7jYIc3PmtwqBi_F.png old mode 100644 new mode 100755 index 4eb94e5..4eb94e5 Binary files a/frontend/web/img/7_bMIj6pnE4WCbYj8XV7jYIc3PmtwqBi_F.png and b/frontend/web/img/7_bMIj6pnE4WCbYj8XV7jYIc3PmtwqBi_F.png differ diff --git a/frontend/web/img/8_6cR4qWhyoJXORQG87Vm5K5O5vyq5-0k2.jpg b/frontend/web/img/8_6cR4qWhyoJXORQG87Vm5K5O5vyq5-0k2.jpg old mode 100644 new mode 100755 index dca89cc..dca89cc Binary files a/frontend/web/img/8_6cR4qWhyoJXORQG87Vm5K5O5vyq5-0k2.jpg and b/frontend/web/img/8_6cR4qWhyoJXORQG87Vm5K5O5vyq5-0k2.jpg differ -- libgit2 0.21.4