diff --git a/Gemfile b/Gemfile index d9d2331..7ead611 100644 --- a/Gemfile +++ b/Gemfile @@ -47,6 +47,14 @@ gem 'bootsnap', '>= 1.1.0', require: false # Use Pry as your Rails console. gem 'pry-rails', '~> 0.3' +# This gem provides jQuery and the jQuery-ujs driver +# for your Rails 4+ application. +gem 'jquery-rails', '~> 4.3' + +# The most popular HTML, CSS, and JavaScript framework for developing +# responsive, mobile first projects on the web. +gem 'bootstrap', '~> 4.1.3' + group :development, :test do # factory_bot provides a framework and DSL for defining and using factories. gem 'factory_bot_rails', '~> 4.10' diff --git a/Gemfile.lock b/Gemfile.lock index 635a78c..0e20676 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -44,9 +44,15 @@ GEM tzinfo (~> 1.1) arel (9.0.0) ast (2.4.0) + autoprefixer-rails (9.3.1) + execjs bindex (0.5.0) bootsnap (1.3.2) msgpack (~> 1.0) + bootstrap (4.1.3) + autoprefixer-rails (>= 6.0.3) + popper_js (>= 1.12.9, < 2) + sass (>= 3.5.2) builder (3.2.3) byebug (10.0.2) coderay (1.1.2) @@ -70,6 +76,10 @@ GEM i18n (1.1.1) concurrent-ruby (~> 1.0) jaro_winkler (1.5.1) + jquery-rails (4.3.3) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) json (2.1.0) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) @@ -95,6 +105,7 @@ GEM parser (2.5.3.0) ast (~> 2.4.0) pg (1.1.3) + popper_js (1.14.5) powerpack (0.1.2) pry (0.12.2) coderay (~> 1.1.0) @@ -214,10 +225,12 @@ PLATFORMS DEPENDENCIES bootsnap (>= 1.1.0) + bootstrap (~> 4.1.3) byebug database_cleaner (~> 1.7) factory_bot_rails (~> 4.10) faker (~> 1.8) + jquery-rails (~> 4.3) listen (>= 3.0.5, < 3.2) pg (>= 0.18, < 2.0) pry-rails (~> 0.3) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 2af4e3e..7f337ad 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -1,4 +1,7 @@ //= require rails-ujs //= require activestorage //= require turbolinks +//= require jquery3 +//= require popper +//= require bootstrap-sprockets //= require_tree . diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css deleted file mode 100644 index 38fa2fb..0000000 --- a/app/assets/stylesheets/application.css +++ /dev/null @@ -1,4 +0,0 @@ -/* - *= require_tree . - *= require_self - */ diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss new file mode 100644 index 0000000..f9030ae --- /dev/null +++ b/app/assets/stylesheets/application.scss @@ -0,0 +1 @@ +@import 'bootstrap'; diff --git a/app/views/home/show.html.erb b/app/views/home/show.html.erb index e69de29..ebe13cf 100644 --- a/app/views/home/show.html.erb +++ b/app/views/home/show.html.erb @@ -0,0 +1,19 @@ +
+
+

+ Либертарианская партия России +
+ + в Пермском крае + +

+

+ Мы выступаем за свободный рынок и государственное невмешательство + в экономику, за принцип самопринадлежности и самоценности человеческой + личности. +

+ + Вступить + +
+