diff --git a/Gemfile b/Gemfile index 98d190e..8784861 100644 --- a/Gemfile +++ b/Gemfile @@ -11,7 +11,7 @@ gem 'pg', '>= 0.18', '< 2.0' gem 'puma', '~> 3.11' gem 'devise', '~> 4.6', '>= 4.6.1' - +gem 'bootstrap' # gem 'pry-rails', :group => :development # Use SCSS for stylesheets diff --git a/Gemfile.lock b/Gemfile.lock index 0291f8b..5321eaa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -47,10 +47,16 @@ GEM archive-zip (0.12.0) io-like (~> 0.3.0) arel (9.0.0) + autoprefixer-rails (9.4.10.2) + execjs bcrypt (3.1.12) bindex (0.5.0) bootsnap (1.4.1) msgpack (~> 1.0) + bootstrap (4.3.1) + autoprefixer-rails (>= 9.1.0) + popper_js (>= 1.14.3, < 2) + sassc-rails (>= 2.0.0) builder (3.2.3) byebug (11.0.0) capybara (3.14.0) @@ -118,6 +124,7 @@ GEM mini_portile2 (~> 2.4.0) orm_adapter (0.5.0) pg (1.1.4) + popper_js (1.14.5) public_suffix (3.0.3) puma (3.12.0) rack (2.0.6) @@ -168,6 +175,15 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) + sassc (2.0.1) + ffi (~> 1.9) + rake + sassc-rails (2.1.0) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt selenium-webdriver (3.141.0) childprocess (~> 0.5) rubyzip (~> 1.2, >= 1.2.2) @@ -208,6 +224,7 @@ PLATFORMS DEPENDENCIES bootsnap (>= 1.1.0) + bootstrap byebug capybara (>= 2.15) carrierwave (~> 0.10.0) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.scss similarity index 96% rename from app/assets/stylesheets/application.css rename to app/assets/stylesheets/application.scss index d05ea0f..94efe12 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.scss @@ -13,3 +13,5 @@ *= require_tree . *= require_self */ + + @import 'bootstrap'; \ No newline at end of file diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 5ce8c16..09705d1 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,4 +1,2 @@ class ApplicationController < ActionController::Base - skip_before_action :verify_authenticity_token - end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index efedd4b..7e1c081 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -10,6 +10,7 @@ +

<%= notice %>

<%= alert %>

<% if user_signed_in? %> @@ -18,8 +19,10 @@ <% else %> <%= link_to "login", new_user_session_path %> <% end %> +
- - <%= yield %> +
+ <%= yield %> +
diff --git a/public/uploads/book/image/1/th.jpeg b/public/uploads/book/image/1/th.jpeg new file mode 100644 index 0000000..6455d6f Binary files /dev/null and b/public/uploads/book/image/1/th.jpeg differ