From 45f87c5841d17a8574dc6b9550e7e3829a5fba1f Mon Sep 17 00:00:00 2001 From: Fabiano Alencar Date: Mon, 19 Feb 2018 14:23:04 -0300 Subject: [PATCH] add statistics for users: map and google charts. --- src/assets/js/charts.js | 23 ++++++++++++++++++++++ src/assets/scss/bootstrap_custom.scss | 6 +++++- src/functions.php | 5 +++-- src/single-colecoes.php | 28 ++++++++++++++++++++++----- 4 files changed, 54 insertions(+), 8 deletions(-) create mode 100644 src/assets/js/charts.js diff --git a/src/assets/js/charts.js b/src/assets/js/charts.js new file mode 100644 index 0000000..f1211f1 --- /dev/null +++ b/src/assets/js/charts.js @@ -0,0 +1,23 @@ +google.charts.load('current', {'packages':['corechart']}); +google.charts.setOnLoadCallback(drawChart); + +function drawChart() { + + var data = google.visualization.arrayToDataTable([ + ['Task', 'Hours per Day'], + ['Work', 11], + ['Eat', 2], + ['Commute', 2], + ['Watch TV', 2], + ['Sleep', 7] + ]); + var options = { + legend: {alignment: 'end'}, + pieHole: 0.4, + width: '500px', + backgroundColor: '#000' + }; + var chart = new google.visualization.PieChart(document.getElementById('collectionGraph')); + + chart.draw(data, options); +} \ No newline at end of file diff --git a/src/assets/scss/bootstrap_custom.scss b/src/assets/scss/bootstrap_custom.scss index 0ac2593..4392150 100644 --- a/src/assets/scss/bootstrap_custom.scss +++ b/src/assets/scss/bootstrap_custom.scss @@ -4,6 +4,8 @@ $scooter: #2cb4c1; $jungle-green: #25a189; $haiti: #150e38; $oslo-gray: #898d8f; +$dodger-blue: #04a5ff; +$black: rgba(0, 0, 0, 0.01); $theme-colors: ( @@ -12,7 +14,9 @@ $theme-colors: ( "scooter": $scooter, "jungle-green": $jungle-green, "haiti": $haiti, - "oslo-gray": $oslo-gray + "oslo-gray": $oslo-gray, + "dodger-blue": $dodger-blue, + "black-opacit": $black ); $font-family-sans-serif: "Roboto", "Helvetica Neue", Arial, sans-serif; @import "../vendor/bootstrap/scss/bootstrap"; \ No newline at end of file diff --git a/src/functions.php b/src/functions.php index c12abbc..bbafc14 100644 --- a/src/functions.php +++ b/src/functions.php @@ -36,9 +36,11 @@ function tainacanEnqueueScripts(){ wp_enqueue_script('popper', get_template_directory_uri() . '/assets/vendor/bootstrap/js/popper.min.js', '', '', true); //JS Bootstrap 4 wp_enqueue_script('bootstrap', get_template_directory_uri() . '/assets/vendor/bootstrap/js/bootstrap.min.js', array('jquery'), '4.0.0', true); + wp_enqueue_script( 'charts', 'https://www.gstatic.com/charts/loader.js'); //Javascript for Tainacan - wp_enqueue_script('jsTainacan', get_template_directory_uri() . '/assets/js/js.js', '', '', true); + wp_enqueue_script('jsTainacan', get_template_directory_uri() . '/assets/js/js.js', '', '1.0', true); + wp_enqueue_script('collectionGraph', get_template_directory_uri() . '/assets/js/charts.js', array('charts'), '1.0'); } add_action('wp_enqueue_scripts', 'tainacanEnqueueScripts'); @@ -48,7 +50,6 @@ add_action('wp_enqueue_scripts', 'tainacanEnqueueScripts'); function tainacanEnqueueStyles(){ //Style Bootstrap 4 wp_enqueue_style('bootstrap', get_template_directory_uri() . '/assets/vendor/bootstrap/css/bootstrap.min.css'); - //Style Tainacan wp_enqueue_style('style', get_stylesheet_uri(), array('bootstrap')); } diff --git a/src/single-colecoes.php b/src/single-colecoes.php index d687d27..922f32f 100644 --- a/src/single-colecoes.php +++ b/src/single-colecoes.php @@ -91,10 +91,10 @@
-
+

Estatísticas

Ver mais
-
- +
+
+
Localização do usuário
+
+ +
+
+
+
Coleções do usuário
+
+
+
+ +
+
+ +