diff --git a/public/package.json b/public/package.json index 4c56a89..9d73c99 100644 --- a/public/package.json +++ b/public/package.json @@ -9,6 +9,7 @@ "author": "", "license": "ISC", "dependencies": { + "bootstrap": "^5.1.3", "chart.js": "^2.9.3", "chartkick": "^3.2.0" } diff --git a/public/style.css b/public/style.css index 7f7cc6b..3d5a568 100644 --- a/public/style.css +++ b/public/style.css @@ -1,6 +1,5 @@ body { font-family: 'Raleway', sans-serif; - max-width: 990px; margin: 30px auto; } @@ -8,6 +7,10 @@ h1 { text-align: center !important; } +.container { + margin-top: 30px; +} + section h1 { font-size: 16px; display: inline; diff --git a/public/yarn.lock b/public/yarn.lock index e2982bd..d2f3a69 100644 --- a/public/yarn.lock +++ b/public/yarn.lock @@ -2,6 +2,11 @@ # yarn lockfile v1 +bootstrap@^5.1.3: + version "5.1.3" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.1.3.tgz#ba081b0c130f810fa70900acbc1c6d3c28fa8f34" + integrity sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q== + chart.js@^2.9.3: version "2.9.4" resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.9.4.tgz#0827f9563faffb2dc5c06562f8eb10337d5b9684" diff --git a/views/home.erb b/views/home.erb index 85c9061..932168d 100644 --- a/views/home.erb +++ b/views/home.erb @@ -1,3 +1,17 @@ -

Data Transfer Test

-<%= bar_chart @transfer_rate, xtitle: "Rate", ytitle: "Datetime", id: "rate_transfer-chart", height: "700px" %> -<%= column_chart @download_rate, xtitle: "Datetime", ytitle: "Rate", id: "download_rate-chart", height: "700px" %> \ No newline at end of file +
+

Tranfer data Test

+
+
+

Transfer Rate

+ <%= bar_chart @transfer_rate, xtitle: "Rate", ytitle: "Datetime", id: "rate_transfer-chart", height: "700px" %> +
+
+

Download Rate

+ <%= bar_chart @download_rate, xtitle: "Rate", ytitle: "Datetime", id: "download_rate-chart", height: "700px" %> +
+
+

Upload Rate

+ <%= bar_chart @upload_rate, xtitle: "Rate", ytitle: "Datetime", id: "upload_rate-chart", height: "700px" %> +
+
+
\ No newline at end of file diff --git a/views/layout.erb b/views/layout.erb index e54e309..fc57c32 100644 --- a/views/layout.erb +++ b/views/layout.erb @@ -5,9 +5,11 @@ + + Data Transfer Test