fjordllc · komagata · Nov 7, 2024 · Oct 22, 2024 · Oct 22, 2024 · Oct 24, 2024
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -446,8 +446,7 @@ GEM
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
     retriable (3.1.2)
-    rexml (3.3.6)
-      strscan
+    rexml (3.3.9)
     rollbar (3.5.2)
     rss (0.3.0)
       rexml
@@ -536,7 +535,6 @@ GEM
       unicode_utils (~> 1.4)
     strings-ansi (0.2.0)
     stripe (10.1.0)
-    strscan (3.1.0)
     syntax_suggest (1.1.0)
     temple (0.10.3)
     thor (1.3.0)

diff --git a/README.md b/README.md
@@ -30,7 +30,7 @@ $ rails test:all
 ### 普通のブラウザーでテスト
 
 ```
-$ HEADFULL=1 rails test:all
+$ HEADFUL=1 rails test:all
 ```
 
 ### 並列実行せずにテスト

diff --git a/app/components/calendar/nico_nico_calendar_component.html.slim b/app/components/calendar/nico_nico_calendar_component.html.slim
@@ -4,7 +4,7 @@
       | ニコニコカレンダー
   hr.a-border-tint
   .card-body
-    .card__description
+    .card-body__description
       .niconico-calendar-nav
         - if prev_month?(current_date)
           = link_to prev_month_path do

diff --git a/app/controllers/api/reading_circles_controller.rb b/app/controllers/api/reading_circles_controller.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class API::ReadingCirclesController < API::BaseController
+  def index
+    @reading_circles = RegularEvent.category_reading_circle
+                                   .where(wip: false)
+                                   .order(updated_at: :desc, id: :desc)
+  end
+end
diff --git a/app/controllers/regular_events/participations_controller.rb b/app/controllers/regular_events/participations_controller.rb
@@ -11,7 +11,12 @@ def create
   end
 
   def destroy
-    @regular_event.cancel_participation(current_user)
+    if params[:participant_id] && current_user.admin?
+      user = User.find(params[:participant_id])
+      @regular_event.cancel_participation(user)
+    else
+      @regular_event.cancel_participation(current_user)
+    end
     redirect_to regular_event_path(@regular_event), notice: '参加を取り消しました。'
   end
 

diff --git a/app/javascript/components/User.jsx b/app/javascript/components/User.jsx
@@ -24,7 +24,7 @@ export default function User({ user, currentUser }) {
   const roleClass = () => `is-${user.primary_role}`
 
   return (
-    <div className="col-xxl-3 col-xl-4 col-lg-4 col-md-6 col-xs-12">
+    <div className="col-xxxl-2 col-xxl-3 col-xl-4 col-lg-4 col-md-6 col-xs-12">
       <div className="users-item is-react">
         <div className={`users-item__inner a-card ${roleClass()}`}>
           {currentUser &&
@@ -70,14 +70,6 @@ export default function User({ user, currentUser }) {
                   <div className="card-list-item__row">
                     <div className="card-list-item-title">
                       <div className="card-list-item-title__end">
-                        {user.company && user.company.logo_url && (
-                          <a href={user.company.url}>
-                            <img
-                              className="user-item__company-logo"
-                              src={user.company.logo_url}
-                            />
-                          </a>
-                        )}
                         <a
                           className="card-list-item-title__title is-lg a-text-link"
                           href={user.url}>

diff --git a/app/javascript/components/UserSns.jsx b/app/javascript/components/UserSns.jsx
@@ -73,6 +73,14 @@ export default function UserSns({ user }) {
           )}
         </li>
       </ul>
+      {user.company && user.company.logo_url && (
+        <a href={user.company.url}>
+          <img
+            className="user-item__company-logo"
+            src={user.company.logo_url}
+          />
+        </a>
+      )}
     </div>
   )
 }
diff --git a/app/javascript/components/user-sns.vue b/app/javascript/components/user-sns.vue
@@ -36,6 +36,9 @@
         i.fa-solid.fa-clock
       .sns-links__item-link.a-button.is-sm.is-disabled.is-icon(v-else)
         i.fa-solid.fa-clock
+
+  a(v-if='user.company && user.company.logo_url', :href='user.company.url')
+    img.user-item__company-logo(:src='user.company.logo_url')
 </template>
 <script>
 export default {

diff --git a/app/javascript/components/user.vue b/app/javascript/components/user.vue
@@ -49,10 +49,6 @@
                         .a-meta__icon
                           i.fa-brands.fa-discord
                         | {{ user.discord_profile.account_name }}
-          a(
-            v-if='user.company && user.company.logo_url',
-            :href='user.company.url')
-            img.user-item__company-logo(:src='user.company.logo_url')
         user-sns(:user='user')
         user-activity-counts(:user='user')
       .users-item__body

diff --git a/app/javascript/stylesheets/application/blocks/dashboard/_dashboard-contents.sass b/app/javascript/stylesheets/application/blocks/dashboard/_dashboard-contents.sass
@@ -7,9 +7,9 @@
 .dashboard-contents__col
   width: 100%
   &.is-sub
-    +media-breakpoint-up(lg)
-      max-width: 20rem
     +media-breakpoint-up(md)
+      max-width: 20rem
+    +media-breakpoint-up(sm)
       flex: 1
   &.is-main
     flex: 1

diff --git a/app/javascript/stylesheets/application/blocks/user/_sns-links.sass b/app/javascript/stylesheets/application/blocks/user/_sns-links.sass
@@ -1,5 +1,9 @@
 .sns-links
   margin-top: .5rem
+  display: flex
+  gap: 1rem
+  align-items: center
+  justify-content: space-between
 
 .sns-links__items
   +media-breakpoint-down(xs)

diff --git a/app/javascript/stylesheets/application/blocks/user/_users-item.sass b/app/javascript/stylesheets/application/blocks/user/_users-item.sass
@@ -26,6 +26,12 @@
 .users-item__header-end
   flex: 1
 
+.users-item__icon
+  +media-breakpoint-up(md)
+    min-width: 3.5rem
+  +media-breakpoint-down(sm)
+    min-width: 2.5rem
+
 .users-item__user-icon-image
   background-color: var(--base)
   +media-breakpoint-up(md)
@@ -65,12 +71,11 @@
 
 .user-item__company-logo
   +size(3rem)
+  min-width: 3rem
   object-fit: cover
   background-color: var(--base)
   border-radius: .25rem
   border: solid 1px var(--border-tint)
-  float: right
-  margin-left: .5rem
 
 .users-item__footer
   position: relative

diff --git a/app/javascript/stylesheets/not-logged-in/_join-us-nav.sass b/app/javascript/stylesheets/not-logged-in/_join-us-nav.sass
@@ -7,6 +7,8 @@
 
 .join-us-nav__item
   width: 100%
+  display: flex
+  justify-content: center
   &.is-main
     .join-us-nav__item-link
       width: 22.5rem

diff --git a/app/javascript/stylesheets/shared/blocks/_footprints.sass b/app/javascript/stylesheets/shared/blocks/_footprints.sass
@@ -21,6 +21,10 @@
 .user-icons-item
   display: flex
   align-items: center
+  gap: .25rem
+
+.user-icons-item__delete
+  +text-block(.75rem 1.4)
 
 .user-icons__more
   +text-block(.8125rem 1.4, block nowrap)

diff --git a/app/views/api/reading_circles/_reading_circle.json.jbuilder b/app/views/api/reading_circles/_reading_circle.json.jbuilder
@@ -0,0 +1 @@
+json.(reading_circle, :id, :title, :finished, :updated_at)
diff --git a/app/views/api/reading_circles/index.json.jbuilder b/app/views/api/reading_circles/index.json.jbuilder
@@ -0,0 +1 @@
+json.reading_circles @reading_circles, partial: "api/reading_circles/reading_circle", as: :reading_circle
diff --git a/app/views/pages/unauthorized_show.slim b/app/views/pages/unauthorized_show.slim
@@ -1,10 +1,10 @@
-- title @page.title
+- title "Docs: #{@page.title}"
 - description "オンラインプログラミングスクール「フィヨルドブートキャンプ」のドキュメント「#{@page.title}」のページです。"
 - content_for :extra_body_classes
 
 .page-body
   article.unauthorized
-    = render '/unauthorized/unauthorized_header', label: 'ドキュメント', title: title
+    = render '/unauthorized/unauthorized_header', label: 'ドキュメント', title: @page.title
     .unauthorized__body
       .container.is-md
         .unauthorized__contents

diff --git a/app/views/practices/submission_answer/_description.html.slim b/app/views/practices/submission_answer/_description.html.slim
@@ -5,6 +5,6 @@
         = SubmissionAnswer.human_attribute_name :description
     hr.a-border
       .card-body.is-practice
-        .card__description
+        .card-body__description
           .a-long-text.is-md.js-markdown-view
             = submission_answer.description
diff --git a/app/views/practices/unauthorized_show.slim b/app/views/practices/unauthorized_show.slim
@@ -1,4 +1,4 @@
-- title @practice.title
+- title "プラクティス #{@practice.title}"
 - description "オンラインプログラミングスクール「フィヨルドブートキャンプ」のプラクティス「#{@practice.title}」のページです。"
 - content_for :extra_body_classes
 
@@ -10,7 +10,7 @@ ruby:
 
 .page-body
   article.unauthorized
-    = render '/unauthorized/unauthorized_header', label: 'プラクティス', title: title
+    = render '/unauthorized/unauthorized_header', label: 'プラクティス', title: @practice.title
 
     .unauthorized__body
       .container.is-md

diff --git a/app/views/questions/unauthorized_show.slim b/app/views/questions/unauthorized_show.slim
@@ -1,10 +1,12 @@
-- title @question.title
-- description "オンラインプログラミングスクール「フィヨルドブートキャンプ」のQ&A「#{@question.title}」のページです。"
-- content_for :extra_body_classes
+ruby:
+  title "Q&A: #{truncate(@question.title, length: 35, omission: '...')}"
+  set_meta_tags og: { title: "Q&A: #{@question.title}" }
+  description "オンラインプログラミングスクール「フィヨルドブートキャンプ」のQ&A「#{@question.title}」のページです。"
+  content_for :extra_body_classes
 
 .page-body
   article.unauthorized
-    = render '/unauthorized/unauthorized_header', label: 'Q&A', title: title
+    = render '/unauthorized/unauthorized_header', label: 'Q&A', title: @question.title
     .unauthorized__body
       .container.is-md
         .unauthorized__contents

diff --git a/app/views/regular_events/_regular_event.html.slim b/app/views/regular_events/_regular_event.html.slim
@@ -87,6 +87,12 @@
                   = link_to participant do
                     span class="a-user-role is-#{participant.primary_role}"
                       = image_tag participant.avatar_url, title: participant.icon_title, class: "a-user-icon is-sm is-#{participant.login_name}", alt: participant.login_name
+                  - if admin_login?
+                    = link_to regular_event_participation_path(regular_event_id: regular_event, participant_id: participant),
+                      class: 'user-icons-item__delete a-text-link is-only-mentor',
+                      method: :delete,
+                      data: { confirm: 'イベントの参加をキャンセルします。よろしいですか?' } do
+                      | 削除する
           - else
             .o-empty-message
               .o-empty-message__icon

diff --git a/app/views/reports/_recent_reports.html.slim b/app/views/reports/_recent_reports.html.slim
@@ -10,7 +10,7 @@
         = render partial: 'reports/report', collection: @recent_reports, locals: { user_icon_display: false, actions_display: false }
     - else
       .card-body
-        .card__description
+        .card-body__description
           .o-empty-message
             .o-empty-message__icon
               i.fa-regular.fa-sad-tear

diff --git a/app/views/reports/index.html.slim b/app/views/reports/index.html.slim
@@ -24,7 +24,7 @@ header.page-header
     .o-empty-message
       .o-empty-message__icon
         .card-list.a-card
-          .card__description
+          .card-body__description
             .o-empty-message
               .o-empty-message__icon
                 i.fa-regular.fa-sad-tear

diff --git a/app/views/unauthorized/_unauthorized_header.html.slim b/app/views/unauthorized/_unauthorized_header.html.slim
@@ -1,5 +1,3 @@
-- title "Q&A: #{truncate(title, length: 35, omission: '...')}"
-- set_meta_tags og: { title: "Q&A: #{title}" }
 header.unauthorized-header
   .container
     = image_tag('shared/piyo.svg', alt: 'フィヨルドブートキャンプのキャラクター画像', class: 'unauthorized-header__image')

diff --git a/app/views/users/_sns.html.slim b/app/views/users/_sns.html.slim
@@ -35,3 +35,6 @@
       - else
         .sns-links__item-link.a-button.is-sm.is-disabled.is-icon
           i.fa-solid.fa-clock
+  - if user.company&.logo_url
+    = link_to company_path(user.company) do
+      img.user-item__company-logo src=user.company.logo_url
diff --git a/app/views/users/_user.html.slim b/app/views/users/_user.html.slim
@@ -1,4 +1,4 @@
-.col-xxl-3.col-xl-4.col-lg-4.col-md-6.col-xs-12
+.col-xxxl-2.col-xxl-3.col-xl-4.col-lg-4.col-md-6.col-xs-12
   .users-item.is-rails
     .users-item__inner.a-card
       .users-item__inactive-message-container.is-only-mentor
@@ -46,9 +46,6 @@
                           .a-meta__icon
                             i.fa-brands.fa-discord
                             | #{user.discord_profile.account_name}
-          - if user.company&.logo_url
-            = link_to company_path(user.company) do
-              img.user-item__company-logo src=user.company.logo_url
         = render 'users/sns', user: user
         - if user.student_or_trainee?
           .card-counts.is-users.mt-3

diff --git a/app/views/users/show.html.slim b/app/views/users/show.html.slim
@@ -73,6 +73,8 @@
               = react_component 'Grass', { userId: @user.id }, { class: 'a-card' }
             - if @user.student_or_trainee?
               = render(Calendar::NicoNicoCalendarComponent.new(user: @user, path: :niconico_calendar_date_in_profile_path, current_date: @calendar.current_date, current_calendar: @calendar.with_reports))
+            - if @user.github_account.present?
+                = render 'users/github_grass', user: @user
             - if @user.completed_practices.present?
               - cache [@user, @completed_learnings] do
                 = render '/users/practices/completed_practices', user: @user, completed_learnings: @completed_learnings

diff --git a/app/views/users/unauthorized_show.slim b/app/views/users/unauthorized_show.slim
@@ -1,11 +1,11 @@
-- title "@#{@user.login_name}"
+- title "#{@user.login_name}さんのプロフィール"
 - description "オンラインプログラミングスクール「フィヨルドブートキャンプ」の@#{@user.login_name}さんのプロフィールページ"
 - content_for :extra_body_classes
 
 .page-body
   article.unauthorized
     = render '/unauthorized/unauthorized_header',
-      label: 'ユーザープロフィールページ', title: title.to_s
+      label: 'ユーザープロフィールページ', title: title
     .unauthorized__body
       .container.is-md
         .unauthorized__contents

diff --git a/config/routes/api.rb b/config/routes/api.rb
@@ -89,5 +89,6 @@
     resources :survey_question_listings, only: %i() do
       resource :position, only: %i(update), controller: "survey_question_listings/position"
     end
+    resources :reading_circles, only: %i(index)
   end
 end
diff --git a/db/fixtures/reports.yml b/db/fixtures/reports.yml
@@ -338,29 +338,3 @@ report88:
   description: |-
     お世話になりました
   reported_on: <%= Time.now - 1.month - 1.day %>
-
-# ステージング環境で日報100回目のお祝いメッセージの動作確認が終わり次第、削除します
-
-<% 95.times do |i| %>
-report<%= i + 88 %>:
-  user: komagata
-  title: <%= "テスト日報 #{i + 4}" %>
-  description: 動作確認が終わり次第、削除します
-  reported_on: <%= Time.zone.today - (97 - i) %>
-  wip: false
-  emotion: 2
-  created_at: <%= Time.zone.today - (96 - i).days %>
-  updated_at: <%= Time.zone.today - (96 - i).days %>
-  published_at: <%= Time.zone.today - (96 - i).days %>
-<% end %>
-
-report184:
-  user: komagata
-  title: "テスト日報（下書き） 99"
-  description: 動作確認が終わり次第、削除します
-  reported_on: <%= Time.zone.today - 2 %>
-  wip: true
-  emotion: 2
-  created_at: <%= Time.zone.today - 1 %>
-  updated_at: <%= Time.zone.today - 1 %>
-  published_at: <%= Time.zone.today - 1 %>
diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb
@@ -22,7 +22,7 @@ class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
   include MockEnvHelper
   include ArticleHelper
 
-  if ENV['HEADFULL']
+  if ENV['HEADFUL']
     driven_by :selenium, using: :chrome
   else
     driven_by(:selenium, using: :headless_chrome) do |driver_option|

diff --git a/test/integration/api/reading_circles_test.rb b/test/integration/api/reading_circles_test.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+class API::ReadingCirclesTest < ActionDispatch::IntegrationTest
+  test 'GET /api/reading_circles.json' do
+    get api_reading_circles_path(format: :json)
+    assert_response :unauthorized
+
+    token = create_token('kimura', 'testtest')
+    get api_reading_circles_path(format: :json),
+        headers: { 'Authorization' => "Bearer #{token}" }
+    assert_response :ok
+  end
+end