diff --git a/Gemfile b/Gemfile index d3eae3c..288ddca 100644 --- a/Gemfile +++ b/Gemfile @@ -36,9 +36,6 @@ group :development, :test do end group :development do - # Access an IRB console on exception pages or by using <%= console %> in views - gem 'web-console', '~> 2.0' - # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring' end diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 84480ca..b84e9ad 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -20,3 +20,7 @@ //= require gentelella/vendors/moment/moment.js //= require gentelella/vendors/nprogress/nprogress.js //= require gentelella/vendors/validator/validator.js + +$(function() { + console.log("Application js"); +}); diff --git a/app/assets/javascripts/web/home/index.js b/app/assets/javascripts/web/home/index.js new file mode 100644 index 0000000..93bd4b7 --- /dev/null +++ b/app/assets/javascripts/web/home/index.js @@ -0,0 +1,77 @@ +function draw_datatable(){ + $('#file_manager_table').dataTable( { + "bSort": false, + initComplete: function(){ + $('#file_manager_table_filter').detach().appendTo("#file_manager_title_div").css({ + 'width':'250px' + }); + $('#file_manager_table_length').detach().appendTo("#file_manager_title_div").css({ + 'width':'150px', + 'float':'right' + }); + $('#file_manager_title_div').css({ + 'width':'100%', + 'height':'48px', + }); + $('#file_manager_title_div input').css({ + 'width':'70%', + 'height':'70%', + 'font-size':'14px', + 'padding':'5px' + }); + } + }); + + $('#disk_usage_tile_table').dataTable({ + "bSort":false, + "bFilter":false, + "bInfo":false, + initComplete: function(){ + $('#disk_usage_tile_table_length').detach().appendTo("#disk_usage_title_div").css({ + 'width':'150px', + 'float':'right' + }); + $('#disk_usage_title_div').css({ + 'width':'100%', + 'height':'48px', + }); + } + }); +} + +function draw_chart(du){ + var options = { + legend: false, + responsive: false + }; + var colors = ["#3498DB", "#26B99A", "#E74C3C", "#9B59B6", "#BDC3C7"]; + var labels = []; + var data = []; + var backgroundColor = []; + var hoverBackgroundColor = []; + + for(var i = 0; i < du.length; i++){ + labels.push(du[i]['file_name']); + data.push(du[i]['usage']); + backgroundColor.push(colors[i % colors.length]); + hoverBackgroundColor.push(colors[i % colors.length]); + } + + new Chart(document.getElementById("disk_usage_table_canvas"), { + type: 'doughnut', + tooltipFillColor: "rgba(51, 51, 51, 0.55)", + data: { + labels: labels, + datasets: [{ + data: data, + backgroundColor: backgroundColor, + hoverBackgroundColor: hoverBackgroundColor + }] + }, + options: options + }); +} + +$(function() { + console.log("Home js"); +}); diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 95cdbd8..0d623bc 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -1,5 +1,6 @@ -@import "bootstrap"; @import "bootstrap-sprockets"; +@import "bootstrap"; + @import "contextmenu"; @import "font-awesome"; @import "loading"; diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 2e4f3c6..523c16d 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,16 +1,14 @@ class ApplicationController < ActionController::Base - # Prevent CSRF attacks by raising an exception. - # For APIs, you may want to use :null_session instead. - # protect_from_forgery with: :exception - include ApplicationHelper - include HomeHelper - include VolumeHelper - include NodeHelper + protect_from_forgery with: :exception + include ApplicationHelper + include HomeHelper + include VolumeHelper + include NodeHelper - def require_login - unless user_signed_in? - flash[:error] = "Please, Login required to use the service." - redirect_to "/users/sign_in" # halts request cycle - end + def require_login + unless user_signed_in? + flash[:error] = "Please, Login required to use the service." + redirect_to "/users/sign_in" # halts request cycle end + end end diff --git a/app/controllers/home_controller.rb b/app/controllers/web/home_controller.rb similarity index 97% rename from app/controllers/home_controller.rb rename to app/controllers/web/home_controller.rb index 526e651..ee84871 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/web/home_controller.rb @@ -1,4 +1,4 @@ -class HomeController < ApplicationController +class Web::HomeController < WebController before_action :require_login def index diff --git a/app/controllers/node_controller.rb b/app/controllers/web/node_controller.rb similarity index 94% rename from app/controllers/node_controller.rb rename to app/controllers/web/node_controller.rb index c9c7294..beb1b9b 100644 --- a/app/controllers/node_controller.rb +++ b/app/controllers/web/node_controller.rb @@ -1,4 +1,4 @@ -class NodeController < ApplicationController +class Web::NodeController < WebController before_action :require_login def index @@ -6,7 +6,7 @@ class NodeController < ApplicationController def detail @node_id = params[:node_id] end - + def node_update one_node = Node.find(params[:node_id]) one_node.host_name = params[:host_name] @@ -14,9 +14,9 @@ class NodeController < ApplicationController one_node.user_name = params[:user_name] one_node.user_password = params[:user_password] one_node.save - + redirect_to '/node/detail/' + params[:node_id] - + end def node_add diff --git a/app/controllers/volume_controller.rb b/app/controllers/web/volume_controller.rb similarity index 98% rename from app/controllers/volume_controller.rb rename to app/controllers/web/volume_controller.rb index b52e56a..2fa65b4 100644 --- a/app/controllers/volume_controller.rb +++ b/app/controllers/web/volume_controller.rb @@ -1,4 +1,4 @@ -class VolumeController < ApplicationController +class Web::VolumeController < WebController before_action :require_login def index diff --git a/app/controllers/web_controller.rb b/app/controllers/web_controller.rb new file mode 100644 index 0000000..00168a4 --- /dev/null +++ b/app/controllers/web_controller.rb @@ -0,0 +1,2 @@ +class WebController < ApplicationController +end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 26d6f5d..bd29edb 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -2,126 +2,38 @@