diff --git a/.idea/mseals.iml b/.idea/mseals.iml index dcfa0c166..7ed32e1fd 100644 --- a/.idea/mseals.iml +++ b/.idea/mseals.iml @@ -52,6 +52,7 @@ + diff --git a/Gemfile b/Gemfile index 5fa744e2f..b88d0397f 100644 --- a/Gemfile +++ b/Gemfile @@ -92,3 +92,5 @@ gem 'hotwire-rails', '~> 0.1.3' gem 'image_processing' gem 'mini_magick' + +gem 'chartkick', '~> 5.0' diff --git a/Gemfile.lock b/Gemfile.lock index 5206e7d75..3e9575fec 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -93,6 +93,7 @@ GEM rack-test (>= 0.6.3) regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) + chartkick (5.0.6) cloudinary (1.29.0) aws_cf_signer rest-client (>= 2.0.0) @@ -182,18 +183,8 @@ GEM net-protocol netrc (0.11.0) nio4r (2.7.0) - nokogiri (1.16.3-aarch64-linux) - racc (~> 1.4) - nokogiri (1.16.3-arm-linux) - racc (~> 1.4) - nokogiri (1.16.3-arm64-darwin) - racc (~> 1.4) - nokogiri (1.16.3-x86-linux) - racc (~> 1.4) nokogiri (1.16.3-x86_64-darwin) racc (~> 1.4) - nokogiri (1.16.3-x86_64-linux) - racc (~> 1.4) orm_adapter (0.5.0) pagy (6.5.0) parallel (1.24.0) @@ -290,18 +281,8 @@ GEM stimulus-rails (1.3.3) railties (>= 6.0.0) stringio (3.1.0) - tailwindcss-rails (2.3.0) - railties (>= 6.0.0) - tailwindcss-rails (2.3.0-aarch64-linux) - railties (>= 6.0.0) - tailwindcss-rails (2.3.0-arm-linux) - railties (>= 6.0.0) - tailwindcss-rails (2.3.0-arm64-darwin) - railties (>= 6.0.0) tailwindcss-rails (2.3.0-x86_64-darwin) railties (>= 6.0.0) - tailwindcss-rails (2.3.0-x86_64-linux) - railties (>= 6.0.0) thor (1.3.1) timeout (0.4.1) tinymce-rails (6.8.3) @@ -333,18 +314,14 @@ GEM zeitwerk (2.6.13) PLATFORMS - aarch64-linux - arm-linux - arm64-darwin - x86-linux - x86_64-darwin - x86_64-linux + x86_64-darwin-22 DEPENDENCIES annotate (~> 3.2) bootsnap cancancan capybara + chartkick (~> 5.0) cloudinary (~> 1.29.0) debug devise (~> 4.9, >= 4.9.2) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index c6cea575f..ba685fe11 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -36,7 +36,7 @@ <%= render "layouts/navbar" %> -
+
<%= yield %>
<%= render "layouts/footer" %> diff --git a/app/views/news/_news_render.html.erb b/app/views/news/_news_render.html.erb index eb54a6293..5a58f235b 100644 --- a/app/views/news/_news_render.html.erb +++ b/app/views/news/_news_render.html.erb @@ -11,7 +11,7 @@

<%= news.type_of_news %>

-
+
<%= news.header_news %>