diff --git a/Gemfile b/Gemfile index 15fb00c..0c84860 100644 --- a/Gemfile +++ b/Gemfile @@ -1,68 +1,68 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } ruby '2.5.5' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 5.2.3' # Use sqlite3 as the database for Active Record gem 'pg' # Use Puma as the app server gem 'puma', '~> 3.11' # Use SCSS for stylesheets gem 'sass-rails', '~> 5.0' # Use Uglifier as compressor for JavaScript assets gem 'uglifier', '>= 1.3.0' # See https://github.com/rails/execjs#readme for more supported runtimes # gem 'mini_racer', platforms: :ruby gem "chartkick" gem 'groupdate' gem "sentry-raven" gem 'telegram-bot' gem 'sidekiq' gem 'sidekiq-scheduler' -gem 'rails-assets-sweetalert2', '~> 5.1.1', source: 'https://rails-assets.org' +gem 'rails-assets-sweetalert2', '~> 5.1.1', source: 'https://rails-assets.org' # Use CoffeeScript for .coffee assets and views gem 'coffee-rails', '~> 4.2' # Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks gem 'turbolinks', '~> 5' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder gem 'jbuilder', '~> 2.5' # Use Redis adapter to run Action Cable in production # gem 'redis', '~> 4.0' # Use ActiveModel has_secure_password # gem 'bcrypt', '~> 3.1.7' # Use ActiveStorage variant # gem 'mini_magick', '~> 4.8' # Use Capistrano for deployment # gem 'capistrano-rails', group: :development # Reduces boot times through caching; required in config/boot.rb gem 'bootsnap', '>= 1.1.0', require: false group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] end group :development do # Access an interactive console on exception pages or by calling 'console' anywhere in the code. gem 'web-console', '>= 3.3.0' gem 'listen', '>= 3.0.5', '< 3.2' # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring' gem 'spring-watcher-listen', '~> 2.0.0' end group :test do # Adds support for Capybara system testing and selenium driver gem 'capybara', '>= 2.15' gem 'selenium-webdriver' # Easy installation and use of chromedriver to run system tests with Chrome gem 'chromedriver-helper' end # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] diff --git a/app/assets/stylesheets/standardpage.scss b/app/assets/stylesheets/standardpage.scss index 3b41528..ea26093 100644 --- a/app/assets/stylesheets/standardpage.scss +++ b/app/assets/stylesheets/standardpage.scss @@ -1,15 +1,15 @@ // Place all the styles related to the standardpage controller here. // They will automatically be included in application.css. // You can use Sass (SCSS) here: http://sass-lang.com/ .button { padding: .9em 2.1875em; border: 0; border-radius: .1875em; background-color: #3085d6; box-shadow: none; color: #fff; font-size: 1.125em; font-weight: 500; white-space: nowrap; cursor: pointer; -} \ No newline at end of file +} diff --git a/app/views/standardpage/grafico.html.erb b/app/views/standardpage/grafico.html.erb index fabb5b1..b48a88e 100644 --- a/app/views/standardpage/grafico.html.erb +++ b/app/views/standardpage/grafico.html.erb @@ -1,19 +1,19 @@ <% unless @sender.nil? %> <%= line_chart Asd.where(sender: @sender).group_by_day(:created_at).count %> -<% end %> +<% end %> <% unless @group.nil? %> <%= line_chart Asd.where(group: @group).group_by_day(:created_at).count %> <% end %> diff --git a/app/views/standardpage/home.html.erb b/app/views/standardpage/home.html.erb index cae4c67..00b6ead 100644 --- a/app/views/standardpage/home.html.erb +++ b/app/views/standardpage/home.html.erb @@ -1,49 +1,49 @@

AsdBot

diff --git a/yarn.lock b/yarn.lock index fb57ccd..4a58018 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1,4 +1,2 @@ # THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. # yarn lockfile v1 - -