fjordllc · komagata · Oct 27, 2021 · Oct 17, 2021 · Oct 17, 2021 · Oct 17, 2021
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -15,7 +15,7 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6.8
+        ruby-version: 2.7.4
         bundler-cache: true
 
     - name: Cache node modules

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -38,12 +38,9 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby
-    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
-    # change this to (see https://github.com/ruby/setup-ruby#versioning):
-    # uses: ruby/setup-ruby@v1
-      uses: ruby/setup-ruby@0c7e9c4d53d534e2c72b5b06535a3817d6d39fe1
+      uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6.8
+        ruby-version: 2.7.4
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically
 
     - name: Cache node modules

diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.6.8
+2.7.4
diff --git a/.traceroute.yml b/.traceroute.yml
@@ -2,6 +2,7 @@ ignore_unused_routes:
   - rails\/.*
   - static_pages#thanks
   - static_pages#retire
+  - any_login\/.*
 ignore_unreachable_actions:
   - rails\/.*
   - .*#admin_login\?
@@ -22,3 +23,4 @@ ignore_unreachable_actions:
   - reports#convert_to_ceiled_hour
   - reports#practice_options
   - home#pricing
+  - any_login\/.*
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.6.8-alpine
+FROM ruby:2.7.4-alpine
 
 ENV RAILS_ENV production
 WORKDIR /app

diff --git a/Gemfile b/Gemfile
@@ -3,7 +3,7 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby RUBY_VERSION
+ruby '2.7.4'
 
 gem 'bootsnap', '>= 1.4.4', require: false
 gem 'image_processing', '~> 1.2'
@@ -72,7 +72,7 @@ group :development do
   gem 'letter_opener_web', '~> 1.0'
   gem 'rack-mini-profiler', '~> 2.0'
   gem 'rubocop', require: false
-  gem 'rubocop-fjord', require: false
+  gem 'rubocop-fjord', '~> 0.2.0', require: false
   gem 'rubocop-minitest', require: false
   gem 'rubocop-performance', require: false
   gem 'rubocop-rails', require: false

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -81,7 +81,7 @@ GEM
       activerecord (>= 4.2)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
-    any_login (1.4.3)
+    any_login (1.4.4)
       rails (>= 4.2.7)
     ast (2.4.2)
     bcrypt (3.1.16)
@@ -356,7 +356,7 @@ GEM
       unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.8.0)
       parser (>= 3.0.1.1)
-    rubocop-fjord (0.1.4)
+    rubocop-fjord (0.2.0)
       rubocop (>= 1.0)
       rubocop-performance
     rubocop-minitest (0.11.0)
@@ -529,7 +529,7 @@ DEPENDENCIES
   ransack
   rollbar
   rubocop
-  rubocop-fjord
+  rubocop-fjord (~> 0.2.0)
   rubocop-minitest
   rubocop-performance
   rubocop-rails
@@ -553,7 +553,7 @@ DEPENDENCIES
   webpacker (~> 5.0)
 
 RUBY VERSION
-   ruby 2.6.8p205
+   ruby 2.7.4p191
 
 BUNDLED WITH
-   2.2.24
+   2.2.27
diff --git a/app/assets/stylesheets/atoms/_a-button.sass b/app/assets/stylesheets/atoms/_a-button.sass
@@ -30,6 +30,13 @@
   &.is-lg-icon
     i
       font-size: 1.5em
+  &.is-text
+    background: none
+    border: none
+    +hover-link-reversal
+    +default-link
+    height: auto !important
+    padding: 0 !important
 
   //size
   &.is-xs,

diff --git a/app/assets/stylesheets/blocks/practice/_practice-first-actions.sass b/app/assets/stylesheets/blocks/practice/_practice-first-actions.sass
@@ -0,0 +1,16 @@
+.practice-first-actions
+  +media-breakpoint-up(md)
+    display: flex
+    margin-bottom: 1.5rem
+  +media-breakpoint-down(sm)
+    margin-bottom: 1rem
+
+.practice-first-actions__start
+  flex: 1
+
+.practice-first-actions__end
+  min-width: 6rem
+  .is-inactive
+    background-color: $background-shade
+  +media-breakpoint-down(sm)
+    margin-top: .75rem
diff --git a/app/assets/stylesheets/blocks/practice/_practice-status-buttons.sass b/app/assets/stylesheets/blocks/practice/_practice-status-buttons.sass
@@ -1,9 +1,3 @@
-.practice-status-buttons
-  +media-breakpoint-up(md)
-    margin-bottom: 1.5rem
-  +media-breakpoint-down(sm)
-    margin-bottom: 1rem
-
 .practice-status-buttons__start
   text-align: center
   width: 100%

diff --git a/app/assets/stylesheets/blocks/thread/_thread-comment-form.sass b/app/assets/stylesheets/blocks/thread/_thread-comment-form.sass
@@ -1,4 +1,3 @@
-$thread-header-author: 4.75rem
 .thread-comment-form
   +media-breakpoint-up(md)
     +position(relative)

diff --git a/app/assets/stylesheets/blocks/thread/_thread-comments-more.sass b/app/assets/stylesheets/blocks/thread/_thread-comments-more.sass
@@ -0,0 +1,25 @@
+.thread-comments-more
+  +position(relative)
+  +media-breakpoint-up(md)
+    margin-bottom: 2rem
+    padding-left: $thread-header-author
+  +media-breakpoint-down(sm)
+    padding-left: 0
+    margin-bottom: 1rem
+  &::before,
+  &::after
+    content: ''
+    display: block
+    height: 8px
+    width: 100%
+    height: 7px
+    background: repeating-linear-gradient(-45deg, $border-shade, $border-shade 3px, transparent 3px, transparent 6px)
+
+.thread-comments-more__inner
+  +padding(vertical, 1rem)
+
+.thread-comments-more__action
+  +media-breakpoint-up(md)
+    max-width: 16rem
+    +padding(horizontal, .375rem)
+    +margin(horizontal, auto)
diff --git a/app/assets/stylesheets/blocks/thread/_thread-comments.sass b/app/assets/stylesheets/blocks/thread/_thread-comments.sass
@@ -1,4 +1,3 @@
-$thread-header-author: 3.5rem
 .thread-comments
   +position(relative)
   +margin(horizontal, auto)
@@ -8,10 +7,11 @@ $thread-header-author: 3.5rem
 .thread-comment
   +position(relative)
   border-radius: .25rem
-  margin-bottom: 2rem
-  padding-left: $thread-header-author + 1.25rem
   &.is-no-author-icon
     padding-left: 0
+  +media-breakpoint-up(md)
+    margin-bottom: 2rem
+    padding-left: $thread-header-author
   +media-breakpoint-down(sm)
     padding-left: 0
     margin-bottom: 1rem

diff --git a/app/assets/stylesheets/blocks/thread/_thread-header-actions.sass b/app/assets/stylesheets/blocks/thread/_thread-header-actions.sass
@@ -23,6 +23,7 @@
   justify-content: flex-end
 
 .thread-header-actions__action
+  min-width: 5.5rem
   +media-breakpoint-up(md)
     +padding(horizontal, .25rem)
     min-width: 7rem

diff --git a/app/assets/stylesheets/blocks/thread/_thread-questions.sass b/app/assets/stylesheets/blocks/thread/_thread-questions.sass
@@ -1,4 +1,3 @@
-$thread-header-author: 3.5rem
 .thread-questions
   +position(relative)
   border-radius: .25rem
@@ -7,7 +6,7 @@ $thread-header-author: 3.5rem
   +position(relative)
   border-radius: .25rem
   margin-bottom: 2rem
-  padding-left: $thread-header-author + 1.25rem
+  padding-left: $thread-header-author
   &.is-no-author-icon
     padding-left: 0
   +media-breakpoint-down(sm)

diff --git a/app/assets/stylesheets/blocks/thread/_thread.sass b/app/assets/stylesheets/blocks/thread/_thread.sass
@@ -1,4 +1,3 @@
-$thread-header-author: 6rem
 .thread
   +position(relative)
   +margin(horizontal, auto)

diff --git a/app/assets/stylesheets/variables/_layout.sass b/app/assets/stylesheets/variables/_layout.sass
@@ -34,3 +34,4 @@ $header-height: 4rem
 $main-visual-height: 20rem
 $page-header-height: 6rem
 $thread-max-width: 53rem
+$thread-header-author: 4.75rem
diff --git a/app/controllers/api/comments_controller.rb b/app/controllers/api/comments_controller.rb
@@ -5,7 +5,10 @@ class API::CommentsController < API::BaseController
   before_action :set_available_emojis, only: %i[index create]
 
   def index
-    @comments = commentable.comments.order(created_at: :asc)
+    @comments = commentable.comments.order(created_at: :desc)
+    @comment_total_count = @comments.size
+    @comments = @comments.limit(params[:comment_limit])
+                         .offset(params[:comment_offset])
   end
 
   def create

diff --git a/app/controllers/api/products/unassigned_controller.rb b/app/controllers/api/products/unassigned_controller.rb
@@ -9,7 +9,6 @@ def index
                 .not_wip
                 .list
                 .order_for_not_wip_list
-                .page(params[:page])
     @latest_product_submitted_just_5days = @products.find { |product| product.elapsed_days == 5 }
     @latest_product_submitted_just_6days = @products.find { |product| product.elapsed_days == 6 }
     @latest_product_submitted_over_7days = @products.find { |product| product.elapsed_days >= 7 }

diff --git a/app/javascript/bookmarks.vue b/app/javascript/bookmarks.vue
@@ -6,7 +6,13 @@
       |
       | ロード中
   .container.is-md(v-else)
-    .thread-list-tools(v-if='bookmarks.length')
+    .thread-list-tools(v-if='bookmarks.length === 0')
+      .o-empty-message
+        .o-empty-message__icon
+          i.far.fa-sad-tear
+        p.o-empty-message__text
+          | ブックマークしているものはありません。
+    .thread-list-tools(v-else)
       .form-item.is-inline
         label.a-form-label(for='thread-list-tools__action')
           | 編集
@@ -17,25 +23,19 @@
             v-model='checked'
           )
           span#spec-edit-mode
-    .thread-list-tools(v-else)
-      .o-empty-message
-        .o-empty-message__icon
-          i.far.fa-sad-tear
-        p.o-empty-message__text
-          | ブックマークしているものはありません。
-    nav.pagination(v-if='totalPages > 1')
-      pager(v-bind='pagerProps')
-    .thread-list.a-card
-      .thread-list__items
-        bookmark(
-          v-for='bookmark in bookmarks',
-          :key='bookmark.id',
-          :bookmark='bookmark',
-          :checked='checked',
-          @updateIndex='updateIndex'
-        )
-    nav.pagination(v-if='totalPages > 1')
-      pager(v-bind='pagerProps')
+      nav.pagination(v-if='totalPages > 1')
+        pager(v-bind='pagerProps')
+      .thread-list.a-card
+        .thread-list__items
+          bookmark(
+            v-for='bookmark in bookmarks',
+            :key='bookmark.id',
+            :bookmark='bookmark',
+            :checked='checked',
+            @updateIndex='updateIndex'
+          )
+      nav.pagination(v-if='totalPages > 1')
+        pager(v-bind='pagerProps')
 </template>
 <script>
 import Bookmark from './bookmark.vue'