From bb758ed116e0a43f31245271bf9d66c0f9f5910d Mon Sep 17 00:00:00 2001 From: Francesca Sperati <6431@ait.nsw.edu.au> Date: Sat, 12 Jan 2019 18:26:06 +1100 Subject: [PATCH] adjusting size of boxes --- src/assets/scripts/charts/chartJS/index.js | 12 +- .../scripts/charts/easyPieChart/index.js | 4 + src/assets/scripts/charts/sparkline/index.js | 8 +- src/assets/scripts/vectorMaps/index.js | 2 +- src/charts.html | 561 +++++++-------- src/charts_.html | 651 ++++++++++++++++++ src/index.html | 88 +-- src/sidebar.html | 123 ++++ src/topbar.html | 247 +++++++ 9 files changed, 1327 insertions(+), 369 deletions(-) mode change 100755 => 100644 src/charts.html create mode 100755 src/charts_.html create mode 100644 src/sidebar.html create mode 100644 src/topbar.html diff --git a/src/assets/scripts/charts/chartJS/index.js b/src/assets/scripts/charts/chartJS/index.js index 58e0de1..1d02273 100755 --- a/src/assets/scripts/charts/chartJS/index.js +++ b/src/assets/scripts/charts/chartJS/index.js @@ -15,19 +15,19 @@ export default (function () { new Chart(lineCtx, { type: 'line', data: { - labels: ['January', 'February', 'March', 'April', 'May', 'June', 'July'], + labels: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul'], datasets: [{ label : 'Series A', backgroundColor : 'rgba(237, 231, 246, 0.5)', borderColor : COLORS['deep-purple-500'], - pointBackgroundColor : COLORS['deep-purple-700'], + pointBackgroundColor : COLORS['white'], borderWidth : 2, - data : [60, 50, 70, 60, 50, 70, 60], + data : [60, 50, 70, 85, 50, 70, 60], }, { label : 'Series B', - backgroundColor : 'rgba(232, 245, 233, 0.5)', - borderColor : COLORS['blue-500'], - pointBackgroundColor : COLORS['blue-700'], + backgroundColor : 'rgba(189, 225, 242, 0.5)', + borderColor : COLORS['cyan-200'], + pointBackgroundColor : COLORS['white'], borderWidth : 2, data : [70, 75, 85, 70, 75, 85, 70], }], diff --git a/src/assets/scripts/charts/easyPieChart/index.js b/src/assets/scripts/charts/easyPieChart/index.js index 4eea285..4a76898 100755 --- a/src/assets/scripts/charts/easyPieChart/index.js +++ b/src/assets/scripts/charts/easyPieChart/index.js @@ -4,6 +4,10 @@ import 'easy-pie-chart/dist/jquery.easypiechart.min.js'; export default (function () { if ($('.easy-pie-chart').length > 0) { $('.easy-pie-chart').easyPieChart({ + lineWidth:7, + lineCap:"square", + scaleColor:false, + animate: 2500, onStep(from, to, percent) { this.el.children[0].innerHTML = `${Math.round(percent)} %`; }, diff --git a/src/assets/scripts/charts/sparkline/index.js b/src/assets/scripts/charts/sparkline/index.js index 6ef99d3..7d2abdd 100755 --- a/src/assets/scripts/charts/sparkline/index.js +++ b/src/assets/scripts/charts/sparkline/index.js @@ -10,7 +10,7 @@ export default (function () { const drawSparklines = () => { if ($('#sparklinedash').length > 0) { - $('#sparklinedash').sparkline([0, 5, 6, 10, 9, 12, 4, 9], { + $('#sparklinedash').sparkline([0, 55, 45, 54, 29, 33, 32, 57, 33, 69, 35], { type: 'bar', height: '20', barWidth: '3', @@ -21,7 +21,7 @@ export default (function () { } if ($('#sparklinedash2').length > 0) { - $('#sparklinedash2').sparkline([0, 5, 6, 10, 9, 12, 4, 9], { + $('#sparklinedash2').sparkline([0, 55, 45, 54, 29, 33, 32, 57, 33, 69, 35], { type: 'bar', height: '20', barWidth: '3', @@ -32,7 +32,7 @@ export default (function () { } if ($('#sparklinedash3').length > 0) { - $('#sparklinedash3').sparkline([0, 5, 6, 10, 9, 12, 4, 9], { + $('#sparklinedash3').sparkline([0, 55, 45, 54, 29, 33, 32, 57, 33, 69, 35], { type: 'bar', height: '20', barWidth: '3', @@ -43,7 +43,7 @@ export default (function () { } if ($('#sparklinedash4').length > 0) { - $('#sparklinedash4').sparkline([0, 5, 6, 10, 9, 12, 4, 9], { + $('#sparklinedash4').sparkline([0, 5, 15, 10, 9, 1, 4, 9, 3, 12, 7,3, 9, 5], { type: 'bar', height: '20', barWidth: '3', diff --git a/src/assets/scripts/vectorMaps/index.js b/src/assets/scripts/vectorMaps/index.js index f8d4426..c583916 100755 --- a/src/assets/scripts/vectorMaps/index.js +++ b/src/assets/scripts/vectorMaps/index.js @@ -15,7 +15,7 @@ export default (function () {
- Charts + Dashboard + + + + + + @@ -88,7 +92,20 @@
- + + + + + + + + + + + + + +
@@ -99,12 +116,9 @@
-
-
Adminator
-
@@ -120,179 +134,103 @@
- + + + + + + +
+
    + +
  • - 3 + 3 - +
    • - - Notifications + + Emails
      • @@ -329,14 +275,19 @@
- - John Doe - liked your post +
+
+
+

John Doe

+
+
+ 5 mins ago +
+
+ + Want to create your own customized data generator for your app... - -

- 5 mins ago -

+
@@ -346,14 +297,19 @@
- - Moo Doe - liked your cover image +
+
+
+

Moo Doe

+
+
+ 15 mins ago +
+
+ + Want to create your own customized data generator for your app... - -

- 7 mins ago -

+
@@ -363,14 +319,19 @@
- - Lee Doe - commented on your video +
+
+
+

Lee Doe

+
+
+ 25 mins ago +
+
+ + Want to create your own customized data generator for your app... - -

- 10 mins ago -

+
@@ -378,21 +339,21 @@
  • - View All Notifications + View All Email
    • +
  • - 3 + 3 - + -
    • -
    -
    -
    -

    John Doe

    -
    -
    - 5 mins ago -
    -
    - - Want to create your own customized data generator for your app... + + John Doe + liked your post -
    + +

    + 5 mins ago +

    @@ -424,19 +380,14 @@
    -
    -
    -
    -

    Moo Doe

    -
    -
    - 15 mins ago -
    -
    - - Want to create your own customized data generator for your app... + + Moo Doe + liked your cover image -
    + +

    + 7 mins ago +

    @@ -446,19 +397,14 @@
    -
    -
    -
    -

    Lee Doe

    -
    -
    - 25 mins ago -
    -
    - - Want to create your own customized data generator for your app... + + Lee Doe + commented on your video -
    + +

    + 10 mins ago +

    @@ -466,19 +412,26 @@
  • - View All Email + View All Notifications
    • +
  • + +
    +
    • + +
  • -
    - -
    - John Doe + Nomit Admin +
    +
    +
    +
    • +
  • + +
    +
    • +
  • + +
    + +
    +
    • - + + + + + + + + + + + -
    -
    -
    -
    -
    -
    -
    Line Chart
    -
    - -
    -
    -
    -
    -
    -
    Area Chart
    -
    - -
    -
    -
    -
    -
    -
    Scatter Chart
    -
    - -
    -
    -
    -
    -
    -
    Bar Chart
    -
    - -
    -
    -
    -
    -
    -
    jQuery Sparkline
    -
    -
    -
    - Spark Line -
    -
    -   -
    -
    -
    -
    - Spark Bar -
    -
    -   -
    -
    -
    -
    - Spark Tristate -
    -
    -   -
    -
    -
    -
    - Spark Discrete -
    -
    -   -
    -
    -
    -
    - Spark Bullet -
    -
    -   -
    -
    -
    -
    - Spark Box +
    +
    +
    +
    + Dashboard +
    +
    +
    +
    + +
    +
    + +
    +
    +
    +
    Total Ads Views
    -
    -   +
    +
    +
    + +
    +
    + 24K +
    +
    -
    -
    -
    -
    -
    Easy Pie Charts
    -
    -
    -
    -
    - -
    -
    New Users
    + + +
    +
    +
    +
    Successful Matches
    -
    -
    - +
    +
    +
    + +
    +
    + 127 +
    -
    New Purchases
    -
    -
    - -
    -
    New Customers
    +
    +
    + + +
    +
    +
    +
    New Ads (last month)
    -
    -
    - +
    +
    +
    + +
    +
    + 79 +
    -
    Bounce Rate
    -
    -
    -
    + +
    +
    +
    + + + + + + + + - - + diff --git a/src/charts_.html b/src/charts_.html new file mode 100755 index 0000000..2c3d30f --- /dev/null +++ b/src/charts_.html @@ -0,0 +1,651 @@ + + + + + + Charts + + + + + + + + + +
    + +
    + + + + + +
    + +
    +
    + + + + + +
    +
    + + +
    + +
    +
    + + +
    +
    + + +
    +
    +
    +
    +
    +
    +
    Line Chart
    +
    + +
    +
    +
    +
    +
    +
    Area Chart
    +
    + +
    +
    +
    +
    +
    +
    Scatter Chart
    +
    + +
    +
    +
    +
    +
    +
    Bar Chart
    +
    + +
    +
    +
    +
    +
    +
    jQuery Sparkline
    +
    +
    +
    + Spark Line +
    +
    +   +
    +
    +
    +
    + Spark Bar +
    +
    +   +
    +
    +
    +
    + Spark Tristate +
    +
    +   +
    +
    +
    +
    + Spark Discrete +
    +
    +   +
    +
    +
    +
    + Spark Bullet +
    +
    +   +
    +
    +
    +
    + Spark Box +
    +
    +   +
    +
    +
    +
    +
    +
    +
    +
    Easy Pie Charts
    +
    +
    +
    +
    + +
    +
    New Users
    +
    +
    +
    + +
    +
    New Purchases
    +
    +
    +
    + +
    +
    New Customers
    +
    +
    +
    + +
    +
    Bounce Rate
    +
    +
    +
    +
    +
    +
    +
    +
    + + + +
    +
    + + diff --git a/src/index.html b/src/index.html index 1a954d2..b9d4899 100755 --- a/src/index.html +++ b/src/index.html @@ -500,10 +500,10 @@ -
    +
    -
    -
    +
    +
    Dashboard
    @@ -519,11 +519,11 @@
    -
    - -
    +
    + +
    - +10% + 24K
    @@ -542,7 +542,7 @@
    - -7% + 127
    @@ -561,7 +561,7 @@
    - ~12% + 79
    @@ -605,17 +605,17 @@
    -
    +
    -
    +
    Successful Mathches
    -
    +
    -
    +
    Matched
    @@ -624,9 +624,9 @@
    -
    +
    -
    +
    @@ -685,40 +685,46 @@
    - -
    -
    -
    Visitors
    -
    - -
    +
    +
    + +
    +
    +
    Visitors
    +
    + +
    +
    -
    -
    - -
    -
    -
    -
    Visa Types
    -
    - -
    -
    - -
    - -
    -
    Matched
    +
    + +
    +
    +
    +
    Visa Types
    + +
    +
    + +
    + +
    +
    Matched
    +
    +
    -
    -
    +
    +
    +
    -
    + + +
    diff --git a/src/sidebar.html b/src/sidebar.html new file mode 100644 index 0000000..7b798a7 --- /dev/null +++ b/src/sidebar.html @@ -0,0 +1,123 @@ + +
    +
    + + + + + +
    +
    + + + + + + + + + + diff --git a/src/topbar.html b/src/topbar.html new file mode 100644 index 0000000..504db6b --- /dev/null +++ b/src/topbar.html @@ -0,0 +1,247 @@ + +
    +
    + + + +
    +
    \ No newline at end of file