From 3a89f7fa7ef4a6046cc2bfe244e1a79fc7b04bc1 Mon Sep 17 00:00:00 2001 From: yuji91 Date: Fri, 27 Aug 2021 18:21:56 +0900 Subject: [PATCH 01/19] bundle update ffi --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4d91a41..d6bd9a2 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.3) font-awesome-sass (5.11.2) sassc (>= 1.11) globalid (0.4.2) From 9886354f95fb749056950f780bf96080d687fce5 Mon Sep 17 00:00:00 2001 From: kenchasonakai Date: Tue, 5 Oct 2021 22:45:20 +0900 Subject: [PATCH 02/19] fix: ignore vendor/ --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 81452db..72db1b7 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,9 @@ # Ignore bundler config. /.bundle +# Ignore vendor +/vendor + # Ignore the default SQLite database. /db/*.sqlite3 /db/*.sqlite3-journal From 76be2bd0fe446eadc3fd378790b375988ffaf1ee Mon Sep 17 00:00:00 2001 From: YUJI ITO Date: Wed, 6 Oct 2021 12:18:22 +0900 Subject: [PATCH 03/19] =?UTF-8?q?Add:=20=E3=82=B3=E3=83=A1=E3=83=B3?= =?UTF-8?q?=E3=83=88=E3=82=92=E8=A3=9C=E8=B6=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 72db1b7..507d5a2 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,7 @@ # Ignore bundler config. /.bundle -# Ignore vendor +# Ignore vendor for CodeCommit Build /vendor # Ignore the default SQLite database. From 97ae43a2df96500a585c0bb7c65f0514b9f8b727 Mon Sep 17 00:00:00 2001 From: YUJI ITO Date: Tue, 15 Feb 2022 14:52:06 +0900 Subject: [PATCH 04/19] Update .gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 507d5a2..bbf636f 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,6 @@ # Ignore master key for decrypting credentials and more. /config/master.key + +# Ignore vendor +/vendor From cb544886795f8b9202ea2886cac3769dbae98e6e Mon Sep 17 00:00:00 2001 From: YUJI ITO Date: Tue, 15 Feb 2022 15:13:13 +0900 Subject: [PATCH 05/19] Update .gitignore --- .gitignore | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitignore b/.gitignore index bbf636f..24d519b 100644 --- a/.gitignore +++ b/.gitignore @@ -7,9 +7,6 @@ # Ignore bundler config. /.bundle -# Ignore vendor for CodeCommit Build -/vendor - # Ignore the default SQLite database. /db/*.sqlite3 /db/*.sqlite3-journal From a9791fc68fea4930b60a943c5fb947b844796cbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=AA=E3=81=8B=E3=81=84=E3=81=B2=E3=81=B3=E3=81=8D?= <67856090+kenchasonakai@users.noreply.github.com> Date: Mon, 21 Feb 2022 14:07:21 +0900 Subject: [PATCH 06/19] Update .rubocop.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ローカル環境でもrubocop-railsを読み込むように修正 --- .rubocop.yml | 3 +++ 1 file changed, 3 insertions(+) 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 From 880044d06da6410a27d1a96b4c66b629e458e672 Mon Sep 17 00:00:00 2001 From: yuji91 Date: Mon, 21 Feb 2022 19:42:37 +0900 Subject: [PATCH 07/19] =?UTF-8?q?Modify:=20sassc=E3=82=922.1.0=E3=81=AB?= =?UTF-8?q?=E6=8C=87=E5=AE=9A=E3=81=97=E3=81=A6bundle=20update?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 1 + Gemfile.lock | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 69a1e99..95fd0a8 100644 --- a/Gemfile +++ b/Gemfile @@ -38,6 +38,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 d6bd9a2..af07f90 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.3) + ffi (1.15.5) font-awesome-sass (5.11.2) sassc (>= 1.11) globalid (0.4.2) @@ -240,7 +240,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) @@ -320,6 +320,7 @@ 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) From d09b852b9bfb2b3610cccd02bfaa14347a58adeb Mon Sep 17 00:00:00 2001 From: yuji91 Date: Thu, 24 Feb 2022 16:03:21 +0900 Subject: [PATCH 08/19] Add node-version --- .node-version | 1 + 1 file changed, 1 insertion(+) create mode 100644 .node-version 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 From 44de1b4ce5517b72edb230300214c1ce63ad690c Mon Sep 17 00:00:00 2001 From: yuji91 Date: Thu, 24 Feb 2022 16:14:37 +0900 Subject: [PATCH 09/19] Disable turbolinks --- Gemfile | 2 -- Gemfile.lock | 4 ---- app/assets/javascripts/application.js | 1 - app/views/layouts/application.html.erb | 4 ++-- 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index 95fd0a8..0ce805b 100644 --- a/Gemfile +++ b/Gemfile @@ -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 diff --git a/Gemfile.lock b/Gemfile.lock index af07f90..de0aa65 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -270,9 +270,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) @@ -325,7 +322,6 @@ DEPENDENCIES spring spring-watcher-listen (~> 2.0.0) sqlite3 - turbolinks (~> 5) tzinfo-data uglifier (>= 1.3.0) web-console (>= 3.3.0) 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 e47832c..9bd9d1e 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' %> From b49f53b68e8f926b581044aa0be8e3b724a930e3 Mon Sep 17 00:00:00 2001 From: YUJI ITO Date: Mon, 14 Mar 2022 15:32:18 +0900 Subject: [PATCH 10/19] =?UTF-8?q?Add:=20sassc=E3=81=AE=E3=82=A4=E3=83=B3?= =?UTF-8?q?=E3=82=B9=E3=83=88=E3=83=BC=E3=83=AB=E6=89=8B=E9=A0=86=E3=82=92?= =?UTF-8?q?=E8=BF=BD=E8=A8=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 0f10412..f0180e7 100644 --- a/README.md +++ b/README.md @@ -6,4 +6,7 @@ - Ruby 2.6.6 を設定 - プロジェクトで利用するgemをインストール + - `bundle config set path 'vendor/bundle'` + - `bundle config build.sassc -- --disable-march-tune-native` + - `bundle install` - データベース、テーブルを作成 From a5fda36c435856b1ef540525b6383b215fa16c0f Mon Sep 17 00:00:00 2001 From: YUJI ITO Date: Mon, 14 Mar 2022 18:14:33 +0900 Subject: [PATCH 11/19] =?UTF-8?q?Modify:=20local=20app=E3=81=AB=E3=81=AE?= =?UTF-8?q?=E3=81=BF=E8=A8=AD=E5=AE=9A=E3=82=92=E5=8F=8D=E6=98=A0=E3=81=95?= =?UTF-8?q?=E3=81=9B=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f0180e7..1b184a2 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ - Ruby 2.6.6 を設定 - プロジェクトで利用するgemをインストール - - `bundle config set path 'vendor/bundle'` - - `bundle config build.sassc -- --disable-march-tune-native` + - `bundle config --local set path 'vendor/bundle'` + - `bundle config --local build.sassc -- --disable-march-tune-native` - `bundle install` - データベース、テーブルを作成 From be59b3f78e83a94b0321e5aeda4ced3b50d7b35e Mon Sep 17 00:00:00 2001 From: YUJI ITO Date: Mon, 14 Mar 2022 18:45:40 +0900 Subject: [PATCH 12/19] =?UTF-8?q?Fix:=20local=E3=82=AA=E3=83=97=E3=82=B7?= =?UTF-8?q?=E3=83=A7=E3=83=B3=E3=81=AE=E8=A8=98=E8=BC=89=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1b184a2..8c21865 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ - Ruby 2.6.6 を設定 - プロジェクトで利用するgemをインストール - - `bundle config --local set path 'vendor/bundle'` + - `bundle config set --local path 'vendor/bundle'` - `bundle config --local build.sassc -- --disable-march-tune-native` - `bundle install` - データベース、テーブルを作成 From f19ae96b63b0527e7a8b6171d8acf02d2cf40ad1 Mon Sep 17 00:00:00 2001 From: YUJI ITO Date: Mon, 14 Mar 2022 19:12:49 +0900 Subject: [PATCH 13/19] =?UTF-8?q?Fix:=20=E8=A8=98=E6=B3=95=E3=82=92?= =?UTF-8?q?=E7=B5=B1=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8c21865..b2fb251 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ - Ruby 2.6.6 を設定 - プロジェクトで利用するgemをインストール - - `bundle config set --local path 'vendor/bundle'` + - `bundle config --local path 'vendor/bundle'` - `bundle config --local build.sassc -- --disable-march-tune-native` - `bundle install` - データベース、テーブルを作成 From 067ce7699d1a009c8b2bda88c296ac4b05eb757d Mon Sep 17 00:00:00 2001 From: YUJI ITO Date: Fri, 18 Mar 2022 19:00:59 +0900 Subject: [PATCH 14/19] Modify: Convert jp to en --- app/views/shared/_header.html.erb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/shared/_header.html.erb b/app/views/shared/_header.html.erb index c9857c4..826240e 100644 --- a/app/views/shared/_header.html.erb +++ b/app/views/shared/_header.html.erb @@ -13,13 +13,13 @@
- <%= link_to 'Post一覧', posts_path, class: 'dropdown-item' %> - <%= link_to 'Post作成', new_post_path, class: 'dropdown-item' %> + <%= link_to 'List of posts', posts_path, class: 'dropdown-item' %> + <%= link_to 'New post', new_post_path, class: 'dropdown-item' %>
  • - <%= link_to 'Like一覧', '#', class: 'nav-link' %> + <%= link_to 'List of likes', '#', class: 'nav-link' %>
  • @@ -29,8 +29,8 @@
    <%# "#{current_user.last_name} #{current_user.first_name}" %>
    - <%= link_to 'プロフィール', '#', class: 'dropdown-item' %> - <%= link_to 'ログアウト', '#', class: 'dropdown-item' %> + <%= link_to 'Profile', '#', class: 'dropdown-item' %> + <%= link_to 'Logout', '#', class: 'dropdown-item' %>
    • From 7b37f1bb264e3d8182d02c9137c4db90ce6eea7b Mon Sep 17 00:00:00 2001 From: YUJI ITO Date: Fri, 18 Mar 2022 19:03:08 +0900 Subject: [PATCH 15/19] Modify: Convert jp to en --- app/views/shared/_before_login_header.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 @@ From 9811c8d62658172f519f9cbeca2481daf1464bab Mon Sep 17 00:00:00 2001 From: YUJI ITO Date: Fri, 18 Mar 2022 19:33:20 +0900 Subject: [PATCH 16/19] =?UTF-8?q?Fix:=20scaffold=E3=81=A7generate=E3=81=97?= =?UTF-8?q?=E3=81=9FView=E3=81=AEh1=E3=82=BF=E3=82=B0=E3=81=8C=E5=85=88?= =?UTF-8?q?=E9=A0=AD=E5=A4=A7=E6=96=87=E5=AD=97=E3=81=AA=E3=81=AE=E3=81=A7?= =?UTF-8?q?link=E3=82=82=E7=B5=B1=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/shared/_header.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/shared/_header.html.erb b/app/views/shared/_header.html.erb index 826240e..5b05b48 100644 --- a/app/views/shared/_header.html.erb +++ b/app/views/shared/_header.html.erb @@ -13,13 +13,13 @@
    - <%= link_to 'List of posts', posts_path, class: 'dropdown-item' %> - <%= link_to 'New post', new_post_path, class: 'dropdown-item' %> + <%= link_to 'List of Posts', posts_path, class: 'dropdown-item' %> + <%= link_to 'New Post', new_post_path, class: 'dropdown-item' %>
  • - <%= link_to 'List of likes', '#', class: 'nav-link' %> + <%= link_to 'List of Likes', '#', class: 'nav-link' %>
  • From ec4f554cb378793db816dad088fe1c651944e9ed Mon Sep 17 00:00:00 2001 From: yuji91 Date: Mon, 4 Apr 2022 12:43:05 +0900 Subject: [PATCH 17/19] for heroku deploy --- Gemfile | 4 ++-- Gemfile.lock | 2 ++ config/database.yml | 15 ++++++--------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Gemfile b/Gemfile index 0ce805b..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 diff --git a/Gemfile.lock b/Gemfile.lock index de0aa65..c487244 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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) @@ -305,6 +306,7 @@ DEPENDENCIES font-awesome-sass (~> 5.11.2) jquery-rails listen (>= 3.0.5, < 3.2) + pg pry pry-byebug pry-doc diff --git a/config/database.yml b/config/database.yml index 0d02f24..ce36d3c 100644 --- a/config/database.yml +++ b/config/database.yml @@ -1,9 +1,3 @@ -# SQLite version 3.x -# gem install sqlite3 -# -# Ensure the SQLite 3 gem is defined in your Gemfile -# gem 'sqlite3' -# default: &default adapter: sqlite3 pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> @@ -11,15 +5,18 @@ default: &default development: <<: *default - database: db/development.sqlite3 + database: db/development.pg # Warning: The database defined as "test" will be erased and # re-generated from your development database when you run "rake". # Do not set this db to the same as development or production. test: <<: *default - database: db/test.sqlite3 + database: db/test.pg production: <<: *default - database: db/production.sqlite3 + adapter: postgresql + encoding: unicode + pool: 5 + database: db/production.pg From 90874dff5aba8cbcc5784def5a13d67de3b70711 Mon Sep 17 00:00:00 2001 From: yuji91 Date: Mon, 4 Apr 2022 13:04:33 +0900 Subject: [PATCH 18/19] =?UTF-8?q?Fix:=20=E4=BB=96=E3=83=AA=E3=83=9D?= =?UTF-8?q?=E3=82=B8=E3=83=88=E3=83=AA=E3=81=A8=E8=A8=98=E6=B3=95=E3=82=92?= =?UTF-8?q?=E7=B5=B1=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/database.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/config/database.yml b/config/database.yml index ce36d3c..9ea67d8 100644 --- a/config/database.yml +++ b/config/database.yml @@ -1,3 +1,9 @@ +# SQLite version 3.x +# gem install sqlite3 +# +# Ensure the SQLite 3 gem is defined in your Gemfile +# gem 'sqlite3' +# default: &default adapter: sqlite3 pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> @@ -5,18 +11,17 @@ default: &default development: <<: *default - database: db/development.pg + database: db/development.sqlite3 # Warning: The database defined as "test" will be erased and # re-generated from your development database when you run "rake". # Do not set this db to the same as development or production. test: <<: *default - database: db/test.pg + database: db/test.sqlite3 production: <<: *default adapter: postgresql encoding: unicode pool: 5 - database: db/production.pg From 96da53b3cc8102cb06d6aa3bbbb8822727e680aa Mon Sep 17 00:00:00 2001 From: yuji91 Date: Mon, 4 Apr 2022 14:12:47 +0900 Subject: [PATCH 19/19] for production assets --- config/environments/production.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/environments/production.rb b/config/environments/production.rb index 1d5015c..86ca262 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -27,7 +27,7 @@ # config.assets.css_compressor = :sass # Do not fallback to assets pipeline if a precompiled asset is missed. - config.assets.compile = false + config.assets.compile = true # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb