diff --git a/.gitignore b/.gitignore index 81452db..24d519b 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,6 @@ # Ignore master key for decrypting credentials and more. /config/master.key + +# Ignore vendor +/vendor diff --git a/.node-version b/.node-version new file mode 100644 index 0000000..fc2cbe5 --- /dev/null +++ b/.node-version @@ -0,0 +1 @@ +15.14.0 diff --git a/.rubocop.yml b/.rubocop.yml index 51b6561..31b59a4 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,4 +1,7 @@ # This file overrides https://github.com/bbatsov/rubocop/blob/master/config/default.yml + +require: + - rubocop-rails AllCops: NewCops: enable diff --git a/Gemfile b/Gemfile index 69a1e99..3ce42f9 100644 --- a/Gemfile +++ b/Gemfile @@ -5,8 +5,8 @@ ruby '2.6.6' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 5.2.5' -# Use sqlite3 as the database for Active Record -gem 'sqlite3' +gem 'sqlite3', group: :development +gem 'pg', group: :production # Use Puma as the app server gem 'puma', '~> 3.11' # Use SCSS for stylesheets @@ -18,8 +18,6 @@ gem 'uglifier', '>= 1.3.0' # 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 @@ -38,6 +36,7 @@ gem 'bootsnap', '>= 1.1.0', require: false gem 'bootstrap', '~> 4.5.0' gem 'font-awesome-sass', '~> 5.11.2' +gem 'sassc', '2.1.0' gem 'jquery-rails' gem 'sorcery', '0.15.0' diff --git a/Gemfile.lock b/Gemfile.lock index 4d91a41..c487244 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -96,7 +96,7 @@ GEM faraday-excon (1.1.0) faraday-net_http (1.0.1) faraday-net_http_persistent (1.1.0) - ffi (1.15.0) + ffi (1.15.5) font-awesome-sass (5.11.2) sassc (>= 1.11) globalid (0.4.2) @@ -140,6 +140,7 @@ GEM parallel (1.20.1) parser (3.0.1.0) ast (~> 2.4.1) + pg (1.3.5) popper_js (1.16.0) pry (0.14.1) coderay (~> 1.1) @@ -240,7 +241,7 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - sassc (2.4.0) + sassc (2.1.0) ffi (~> 1.9) sassc-rails (2.1.2) railties (>= 4.0.0) @@ -270,9 +271,6 @@ GEM thor (1.1.0) thread_safe (0.3.6) tilt (2.0.10) - turbolinks (5.2.1) - turbolinks-source (~> 5.2) - turbolinks-source (5.2.0) tzinfo (1.2.9) thread_safe (~> 0.1) uglifier (4.2.0) @@ -308,6 +306,7 @@ DEPENDENCIES font-awesome-sass (~> 5.11.2) jquery-rails listen (>= 3.0.5, < 3.2) + pg pry pry-byebug pry-doc @@ -320,11 +319,11 @@ DEPENDENCIES rubocop-checkstyle_formatter rubocop-rails sass-rails (~> 5.0) + sassc (= 2.1.0) sorcery (= 0.15.0) spring spring-watcher-listen (~> 2.0.0) sqlite3 - turbolinks (~> 5) tzinfo-data uglifier (>= 1.3.0) web-console (>= 3.3.0) diff --git a/README.md b/README.md index 0f10412..b2fb251 100644 --- a/README.md +++ b/README.md @@ -6,4 +6,7 @@ - Ruby 2.6.6 を設定 - プロジェクトで利用するgemをインストール + - `bundle config --local path 'vendor/bundle'` + - `bundle config --local build.sassc -- --disable-march-tune-native` + - `bundle install` - データベース、テーブルを作成 diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index bfbf451..3ebdd26 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -15,5 +15,4 @@ //= require bootstrap-sprockets //= require rails-ujs //= require activestorage -//= require turbolinks //= require_tree . diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 7d33891..d928a97 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -5,8 +5,8 @@ <%= csrf_meta_tags %> <%= csp_meta_tag %> - <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> - <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + <%= stylesheet_link_tag 'application', media: 'all' %> + <%= javascript_include_tag 'application' %>
diff --git a/app/views/shared/_before_login_header.html.erb b/app/views/shared/_before_login_header.html.erb index 25ccc8f..175de25 100644 --- a/app/views/shared/_before_login_header.html.erb +++ b/app/views/shared/_before_login_header.html.erb @@ -8,7 +8,7 @@ diff --git a/app/views/shared/_header.html.erb b/app/views/shared/_header.html.erb index 2cb8ce6..357668b 100644 --- a/app/views/shared/_header.html.erb +++ b/app/views/shared/_header.html.erb @@ -13,13 +13,13 @@