From 0b315675ecd98bf2169c61cdc0c416c97ed3a9c5 Mon Sep 17 00:00:00 2001 From: masyuko0222 Date: Tue, 22 Oct 2024 20:42:52 +0900 Subject: [PATCH 01/29] =?UTF-8?q?=E3=83=AB=E3=83=BC=E3=83=86=E3=82=A3?= =?UTF-8?q?=E3=83=B3=E3=82=B0=E3=81=AE=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/routes/api.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/config/routes/api.rb b/config/routes/api.rb index 2c8d74d2400..b9af1cf4ab3 100644 --- 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 From 322438bfa3c7c04ae8c96cddd8ff66e050472e91 Mon Sep 17 00:00:00 2001 From: masyuko0222 Date: Tue, 22 Oct 2024 21:15:17 +0900 Subject: [PATCH 02/29] =?UTF-8?q?API=E3=81=AE=E5=AE=9F=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/api/reading_circles_controller.rb | 9 +++++++++ .../reading_circles/_reading_circle.json.jbuilder | 1 + app/views/api/reading_circles/index.json.jbuilder | 1 + test/integration/api/reading_circles_test.rb | 15 +++++++++++++++ 4 files changed, 26 insertions(+) create mode 100644 app/controllers/api/reading_circles_controller.rb create mode 100644 app/views/api/reading_circles/_reading_circle.json.jbuilder create mode 100644 app/views/api/reading_circles/index.json.jbuilder create mode 100644 test/integration/api/reading_circles_test.rb diff --git a/app/controllers/api/reading_circles_controller.rb b/app/controllers/api/reading_circles_controller.rb new file mode 100644 index 00000000000..a3e8188844c --- /dev/null +++ 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/views/api/reading_circles/_reading_circle.json.jbuilder b/app/views/api/reading_circles/_reading_circle.json.jbuilder new file mode 100644 index 00000000000..baa7cb8dca7 --- /dev/null +++ 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 new file mode 100644 index 00000000000..53a8b5c2233 --- /dev/null +++ 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/test/integration/api/reading_circles_test.rb b/test/integration/api/reading_circles_test.rb new file mode 100644 index 00000000000..d28a80decae --- /dev/null +++ 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 From 044897d203d6c87f497b5183d3f556d2191c98aa Mon Sep 17 00:00:00 2001 From: ryo Date: Thu, 24 Oct 2024 13:39:28 +0900 Subject: [PATCH 03/29] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=83=87?= =?UTF-8?q?=E3=83=BC=E3=82=BF=E3=82=92=E5=89=8A=E9=99=A4=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/fixtures/reports.yml | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/db/fixtures/reports.yml b/db/fixtures/reports.yml index 3b82653b55f..f6e6a77c30f 100644 --- 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 %> From 86542b9bb95403d360f6f2b0bb6cd5b2b57e0b03 Mon Sep 17 00:00:00 2001 From: Shohei Umemoto Date: Sun, 27 Oct 2024 11:39:28 +0900 Subject: [PATCH 04/29] Fix a typo (HEADFULL -> HEADFUL) --- README.md | 2 +- test/application_system_test_case.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 67c06147128..c3e06902a77 100644 --- 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/test/application_system_test_case.rb b/test/application_system_test_case.rb index bad4092a098..56266f91224 100644 --- 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| From bf3e726118875539671d773a3c9af4acfada89f1 Mon Sep 17 00:00:00 2001 From: hagiya0121 Date: Fri, 25 Oct 2024 20:11:39 +0900 Subject: [PATCH 05/29] =?UTF-8?q?=E3=83=96=E3=83=A9=E3=82=A6=E3=82=B6?= =?UTF-8?q?=E3=81=AE=E3=82=BF=E3=83=96=E3=81=AE=E3=82=BF=E3=82=A4=E3=83=88?= =?UTF-8?q?=E3=83=AB=E3=81=A8=E3=83=9A=E3=83=BC=E3=82=B8=E3=81=AE=E7=A8=AE?= =?UTF-8?q?=E9=A1=9E=E3=81=8C=E4=B8=80=E8=87=B4=E3=81=97=E3=81=AA=E3=81=84?= =?UTF-8?q?=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/pages/unauthorized_show.slim | 4 ++-- app/views/practices/unauthorized_show.slim | 4 ++-- app/views/questions/unauthorized_show.slim | 4 ++-- app/views/unauthorized/_unauthorized_header.html.slim | 4 +--- app/views/users/unauthorized_show.slim | 4 ++-- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/app/views/pages/unauthorized_show.slim b/app/views/pages/unauthorized_show.slim index 64889315ae3..67ffcd789b6 100644 --- 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/unauthorized_show.slim b/app/views/practices/unauthorized_show.slim index 08e0a260f9d..1dcadc80dd4 100644 --- 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 index 42a37c0e548..ae7131470ae 100644 --- a/app/views/questions/unauthorized_show.slim +++ b/app/views/questions/unauthorized_show.slim @@ -1,10 +1,10 @@ -- title @question.title +- title "Q&A: #{truncate(@question.title, length: 35, omission: '...')}" - 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/unauthorized/_unauthorized_header.html.slim b/app/views/unauthorized/_unauthorized_header.html.slim index 4bb36e8ce50..babd6ee9294 100644 --- 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') @@ -8,5 +6,5 @@ header.unauthorized-header = label h1.unauthorized-header__title span.font-thin 「 - = title + = truncate(title, length: 35, omission: '...') span.font-thin 」 diff --git a/app/views/users/unauthorized_show.slim b/app/views/users/unauthorized_show.slim index c30751ed6ba..bb50c63b8e1 100644 --- 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 From 6d063e0a7c8a38678ba8f12709df16faeeae6e52 Mon Sep 17 00:00:00 2001 From: hagiya0121 Date: Sun, 27 Oct 2024 16:36:08 +0900 Subject: [PATCH 06/29] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=81=8C?= =?UTF-8?q?=E9=80=9A=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=83=A1=E3=82=BF?= =?UTF-8?q?=E3=82=BF=E3=82=B0=E3=81=AEtitle=E3=82=92=E8=A8=AD=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/questions/unauthorized_show.slim | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/views/questions/unauthorized_show.slim b/app/views/questions/unauthorized_show.slim index ae7131470ae..6b46d5f0eea 100644 --- a/app/views/questions/unauthorized_show.slim +++ b/app/views/questions/unauthorized_show.slim @@ -1,6 +1,8 @@ -- title "Q&A: #{truncate(@question.title, length: 35, omission: '...')}" -- 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 From 9a4961bb701fd49fcbc0387ea0b575608f68fa28 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2024 18:53:30 +0000 Subject: [PATCH 07/29] Bump rexml from 3.3.6 to 3.3.9 Bumps [rexml](https://github.com/ruby/rexml) from 3.3.6 to 3.3.9. - [Release notes](https://github.com/ruby/rexml/releases) - [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md) - [Commits](https://github.com/ruby/rexml/compare/v3.3.6...v3.3.9) --- updated-dependencies: - dependency-name: rexml dependency-type: indirect ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9319d8b96d1..fba7b391c98 100644 --- 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) From 7a29d98a4f20ee4b1b5ff5bfb5e84ee97e9b2ed2 Mon Sep 17 00:00:00 2001 From: hagiya0121 Date: Tue, 29 Oct 2024 10:48:49 +0900 Subject: [PATCH 08/29] =?UTF-8?q?=E3=82=BF=E3=82=A4=E3=83=88=E3=83=AB?= =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=82=92=E4=BB=95=E6=A7=98=E3=81=AB=E5=90=88?= =?UTF-8?q?=E3=82=8F=E3=81=9B=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/unauthorized/_unauthorized_header.html.slim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/unauthorized/_unauthorized_header.html.slim b/app/views/unauthorized/_unauthorized_header.html.slim index babd6ee9294..ab9504727c5 100644 --- a/app/views/unauthorized/_unauthorized_header.html.slim +++ b/app/views/unauthorized/_unauthorized_header.html.slim @@ -6,5 +6,5 @@ header.unauthorized-header = label h1.unauthorized-header__title span.font-thin 「 - = truncate(title, length: 35, omission: '...') + = title span.font-thin 」 From 5272ed8b2dfac858f0830a332a8287dbeba17cec Mon Sep 17 00:00:00 2001 From: hagiya0121 Date: Tue, 29 Oct 2024 10:55:13 +0900 Subject: [PATCH 09/29] =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=83=87=E3=83=B3?= =?UTF-8?q?=E3=83=88=E3=82=92=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/questions/unauthorized_show.slim | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/questions/unauthorized_show.slim b/app/views/questions/unauthorized_show.slim index 6b46d5f0eea..4c6c32784f5 100644 --- a/app/views/questions/unauthorized_show.slim +++ b/app/views/questions/unauthorized_show.slim @@ -1,8 +1,8 @@ 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 + 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 From 4d8b44b394dbf83faf4ad504eabb5630d002ec3e Mon Sep 17 00:00:00 2001 From: machida Date: Wed, 30 Oct 2024 23:37:39 +0900 Subject: [PATCH 10/29] =?UTF-8?q?=E5=90=8D=E5=89=8D=E3=81=8C=E9=95=B7?= =?UTF-8?q?=E3=81=84=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC=E3=81=8C=E3=81=84?= =?UTF-8?q?=E3=81=A6=E3=82=82=E3=80=81=E3=83=A1=E3=83=B3=E3=82=BF=E3=83=BC?= =?UTF-8?q?=E3=83=80=E3=83=83=E3=82=B7=E3=83=A5=E3=83=9C=E3=83=BC=E3=83=89?= =?UTF-8?q?=E3=81=AE=E7=B5=8C=E9=81=8E=E6=97=A5=E6=95=B0=E3=82=AB=E3=83=A9?= =?UTF-8?q?=E3=83=A0=E3=81=AE=E3=83=AC=E3=82=A4=E3=82=A2=E3=82=A6=E3=83=88?= =?UTF-8?q?=E3=82=92=E5=B4=A9=E3=82=8C=E3=81=AA=E3=81=8F=E3=81=95=E3=81=9B?= =?UTF-8?q?=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/blocks/dashboard/_dashboard-contents.sass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/javascript/stylesheets/application/blocks/dashboard/_dashboard-contents.sass b/app/javascript/stylesheets/application/blocks/dashboard/_dashboard-contents.sass index f44a6870901..e43e87656b6 100644 --- 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 From c1ebfd51aa6e957fa8b8d7159bae9a62084d2da7 Mon Sep 17 00:00:00 2001 From: machida Date: Wed, 30 Oct 2024 23:43:16 +0900 Subject: [PATCH 11/29] =?UTF-8?q?=E5=BA=83=E3=81=84=E3=83=87=E3=82=A3?= =?UTF-8?q?=E3=82=B9=E3=83=97=E3=83=AC=E3=82=A4=E3=81=A7=E3=82=82=E3=83=A6?= =?UTF-8?q?=E3=83=BC=E3=82=B6=E3=83=BC=E4=B8=80=E8=A6=A7=E3=82=92=E8=A6=8B?= =?UTF-8?q?=E3=82=84=E3=81=99=E3=81=8F=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/javascript/components/User.jsx | 2 +- app/views/users/_user.html.slim | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/javascript/components/User.jsx b/app/javascript/components/User.jsx index 0680308695e..2202444cbf0 100644 --- 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 ( -
+
{currentUser && diff --git a/app/views/users/_user.html.slim b/app/views/users/_user.html.slim index d5896fe7e3e..ed42ec6b89d 100644 --- 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 From 29600fc32b4f673f57bf968b93892af82d5adb15 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2024 02:18:59 +0000 Subject: [PATCH 12/29] Bump elliptic from 6.5.7 to 6.6.0 Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.7 to 6.6.0. - [Commits](https://github.com/indutny/elliptic/compare/v6.5.7...v6.6.0) --- updated-dependencies: - dependency-name: elliptic dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index bb80fa4733d..458c7484927 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3329,9 +3329,9 @@ electron-to-chromium@^1.4.535: integrity sha512-yXsZyXJfAqzWk1WKryr0Wl0MN2D47xodPvEEwlVePBnhU5E7raevLQR+E6b9JAD3GfL/7MbAL9ZtWQQPcLx7wA== elliptic@^6.5.3, elliptic@^6.5.4: - version "6.5.7" - resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.7.tgz#8ec4da2cb2939926a1b9a73619d768207e647c8b" - integrity sha512-ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q== + version "6.6.0" + resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.6.0.tgz#5919ec723286c1edf28685aa89261d4761afa210" + integrity sha512-dpwoQcLc/2WLQvJvLRHKZ+f9FgOdjnq11rurqwekGQygGPsYSK29OMMD2WalatiqQ+XGFDglTNixpPfI+lpaAA== dependencies: bn.js "^4.11.9" brorand "^1.1.0" From fc5931c302597363ea5d77b6b7b76d5a54214934 Mon Sep 17 00:00:00 2001 From: ayu-0505 Date: Tue, 8 Oct 2024 10:39:27 +0900 Subject: [PATCH 13/29] =?UTF-8?q?=E5=AE=9A=E6=9C=9F=E3=82=A4=E3=83=99?= =?UTF-8?q?=E3=83=B3=E3=83=88=E5=8F=82=E5=8A=A0=E8=80=85=E4=B8=80=E8=A6=A7?= =?UTF-8?q?=E3=81=AE=E3=82=A2=E3=82=A4=E3=82=B3=E3=83=B3=E6=A8=AA=E3=81=AB?= =?UTF-8?q?=E3=80=8C=E5=89=8A=E9=99=A4=E3=81=99=E3=82=8B=E3=80=8D=E3=83=AA?= =?UTF-8?q?=E3=83=B3=E3=82=AF=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/regular_events/participations_controller.rb | 3 ++- app/views/regular_events/_regular_event.html.slim | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controllers/regular_events/participations_controller.rb b/app/controllers/regular_events/participations_controller.rb index 4e4bae86e09..72b746c7a35 100644 --- a/app/controllers/regular_events/participations_controller.rb +++ b/app/controllers/regular_events/participations_controller.rb @@ -11,7 +11,8 @@ def create end def destroy - @regular_event.cancel_participation(current_user) + @user = User.find(params[:user_id]) + @regular_event.cancel_participation(@user) redirect_to regular_event_path(@regular_event), notice: '参加を取り消しました。' end diff --git a/app/views/regular_events/_regular_event.html.slim b/app/views/regular_events/_regular_event.html.slim index 916ec87f6f1..21ea6df23c1 100644 --- a/app/views/regular_events/_regular_event.html.slim +++ b/app/views/regular_events/_regular_event.html.slim @@ -87,6 +87,9 @@ = 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 + = link_to regular_event_participation_path(regular_event_id: regular_event, user_id: participant.id), method: :delete, + data: { confirm: 'イベントの参加をキャンセルします。よろしいですか?' }, class: 'event-main-actions__item-cancel' do + | 削除する - else .o-empty-message .o-empty-message__icon From 60848b6a056225c402c6b3bcd4b1ad1b6ecd233a Mon Sep 17 00:00:00 2001 From: ayu-0505 Date: Tue, 8 Oct 2024 14:17:47 +0900 Subject: [PATCH 14/29] =?UTF-8?q?=E5=8F=82=E5=8A=A0=E8=80=85=E5=89=8A?= =?UTF-8?q?=E9=99=A4=E3=82=92=E5=8F=82=E5=8A=A0=E8=80=85=E6=9C=AC=E4=BA=BA?= =?UTF-8?q?=E3=81=A8=E3=83=A1=E3=83=B3=E3=82=BF=E3=83=BC=E3=81=AE=E3=81=BF?= =?UTF-8?q?=E3=81=8C=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= =?UTF-8?q?=E3=82=B3=E3=83=B3=E3=83=88=E3=83=AD=E3=83=BC=E3=83=A9=E3=83=BC?= =?UTF-8?q?=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/regular_events/participations_controller.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controllers/regular_events/participations_controller.rb b/app/controllers/regular_events/participations_controller.rb index 72b746c7a35..8865ae5af0e 100644 --- a/app/controllers/regular_events/participations_controller.rb +++ b/app/controllers/regular_events/participations_controller.rb @@ -11,7 +11,7 @@ def create end def destroy - @user = User.find(params[:user_id]) + @user = User.find(params[:user_id]) if current_user.mentor? || correct_user? @regular_event.cancel_participation(@user) redirect_to regular_event_path(@regular_event), notice: '参加を取り消しました。' end @@ -31,4 +31,8 @@ def create_watch ) watch.save! end + + def correct_user? + current_user.id == params[:user_id].to_i + end end From d733f293163911909f81a47ca339533419e5909d Mon Sep 17 00:00:00 2001 From: ayu-0505 Date: Tue, 8 Oct 2024 15:08:55 +0900 Subject: [PATCH 15/29] =?UTF-8?q?=E3=82=B3=E3=83=B3=E3=83=88=E3=83=AD?= =?UTF-8?q?=E3=83=BC=E3=83=A9=E3=83=BC=E5=86=85=E3=81=AE=E3=82=A4=E3=83=B3?= =?UTF-8?q?=E3=82=B9=E3=82=BF=E3=83=B3=E3=82=B9=E5=A4=89=E6=95=B0=E3=82=92?= =?UTF-8?q?=E3=83=AD=E3=83=BC=E3=82=AB=E3=83=AB=E5=A4=89=E6=95=B0=E3=81=AB?= =?UTF-8?q?=E5=A4=89=E6=9B=B4=EF=BC=88view=E3=81=AB=E6=B8=A1=E3=81=95?= =?UTF-8?q?=E3=81=AA=E3=81=84=E3=81=9F=E3=82=81=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/regular_events/participations_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/regular_events/participations_controller.rb b/app/controllers/regular_events/participations_controller.rb index 8865ae5af0e..1e2146317d6 100644 --- a/app/controllers/regular_events/participations_controller.rb +++ b/app/controllers/regular_events/participations_controller.rb @@ -11,8 +11,8 @@ def create end def destroy - @user = User.find(params[:user_id]) if current_user.mentor? || correct_user? - @regular_event.cancel_participation(@user) + user = User.find(params[:user_id]) if current_user.mentor? || correct_user? + @regular_event.cancel_participation(user) redirect_to regular_event_path(@regular_event), notice: '参加を取り消しました。' end From 3df12bbe131d2f6460f5d1288283e27d040cd5b9 Mon Sep 17 00:00:00 2001 From: ayu-0505 Date: Wed, 9 Oct 2024 11:50:46 +0900 Subject: [PATCH 16/29] =?UTF-8?q?destroy=E3=82=A2=E3=82=AF=E3=82=B7?= =?UTF-8?q?=E3=83=A7=E3=83=B3=E3=81=AB=E3=81=A6=E5=BE=8C=E7=BD=AE=E3=81=8D?= =?UTF-8?q?if=E3=82=92=E3=82=AC=E3=83=BC=E3=83=89=E7=AF=80=E3=81=AB?= =?UTF-8?q?=E5=A4=89=E6=9B=B4=E3=80=81=5Fparticipation.html.slim=E3=81=A7u?= =?UTF-8?q?ser=5Fid=E3=82=92=E9=80=81=E4=BF=A1=E3=81=99=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/regular_events/participations_controller.rb | 4 +++- app/views/regular_events/_participation.html.slim | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/controllers/regular_events/participations_controller.rb b/app/controllers/regular_events/participations_controller.rb index 1e2146317d6..472f5694c76 100644 --- a/app/controllers/regular_events/participations_controller.rb +++ b/app/controllers/regular_events/participations_controller.rb @@ -11,7 +11,9 @@ def create end def destroy - user = User.find(params[:user_id]) if current_user.mentor? || correct_user? + return if !correct_user? && !current_user.mentor? + + user = User.find(params[:user_id]) @regular_event.cancel_participation(user) redirect_to regular_event_path(@regular_event), notice: '参加を取り消しました。' end diff --git a/app/views/regular_events/_participation.html.slim b/app/views/regular_events/_participation.html.slim index 05b61691df7..7517b37d736 100644 --- a/app/views/regular_events/_participation.html.slim +++ b/app/views/regular_events/_participation.html.slim @@ -5,7 +5,7 @@ | 参加登録しています。 ul.event-main-actions__items li.event-main-actions__item - = link_to regular_event_participation_path(regular_event_id: regular_event), method: :delete, + = link_to regular_event_participation_path(regular_event_id: regular_event, user_id: current_user.id), method: :delete, data: { confirm: 'イベントの参加をキャンセルします。よろしいですか?' }, class: 'event-main-actions__item-cancel' do | 参加を取り消す - else From 92acfc9eff30041f793b93fae6b0932b7cfc6ab2 Mon Sep 17 00:00:00 2001 From: ayu-0505 Date: Wed, 9 Oct 2024 12:10:22 +0900 Subject: [PATCH 17/29] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=81=AB?= =?UTF-8?q?=E3=81=8A=E3=81=84=E3=81=A6=E5=89=8A=E9=99=A4=E3=83=AA=E3=83=B3?= =?UTF-8?q?=E3=82=AF=E3=82=92=EF=BC=92=E7=AE=87=E6=89=80=E6=84=9F=E7=9F=A5?= =?UTF-8?q?=E3=81=97=E3=81=A6=E3=81=84=E3=81=9F=E3=81=AE=E3=82=92=E3=80=81?= =?UTF-8?q?=E6=8C=87=E5=AE=9A=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= =?UTF-8?q?=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/system/regular_events_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/system/regular_events_test.rb b/test/system/regular_events_test.rb index 9a889682ab6..9e7016a2367 100644 --- a/test/system/regular_events_test.rb +++ b/test/system/regular_events_test.rb @@ -115,7 +115,7 @@ class RegularEventsTest < ApplicationSystemTestCase find 'h2', text: 'コメント' find 'div.container > div.user-icons > ul.user-icons__items', visible: :all accept_confirm do - click_link '削除' + find('.card-main-actions__muted-action', text: '削除').click end assert_text '定期イベントを削除しました。' end From dca3a75d7b4c95f617cd9dfd4a6c71cc7b441f2d Mon Sep 17 00:00:00 2001 From: ayu-0505 Date: Fri, 11 Oct 2024 10:18:35 +0900 Subject: [PATCH 18/29] =?UTF-8?q?=E5=AE=9F=E8=A3=85=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E3=82=92=E6=97=A9=E6=9C=9F=E3=83=AA=E3=82=BF=E3=83=BC=E3=83=B3?= =?UTF-8?q?=E3=81=8B=E3=82=89=E6=9D=A1=E4=BB=B6=E5=88=86=E5=B2=90=E3=81=AB?= =?UTF-8?q?=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../regular_events/participations_controller.rb | 14 ++++++-------- app/views/regular_events/_participation.html.slim | 2 +- app/views/regular_events/_regular_event.html.slim | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/app/controllers/regular_events/participations_controller.rb b/app/controllers/regular_events/participations_controller.rb index 472f5694c76..5256b8ed6bb 100644 --- a/app/controllers/regular_events/participations_controller.rb +++ b/app/controllers/regular_events/participations_controller.rb @@ -11,10 +11,12 @@ def create end def destroy - return if !correct_user? && !current_user.mentor? - - user = User.find(params[:user_id]) - @regular_event.cancel_participation(user) + if params[:participant_id] && current_user.mentor? + 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 @@ -33,8 +35,4 @@ def create_watch ) watch.save! end - - def correct_user? - current_user.id == params[:user_id].to_i - end end diff --git a/app/views/regular_events/_participation.html.slim b/app/views/regular_events/_participation.html.slim index 7517b37d736..05b61691df7 100644 --- a/app/views/regular_events/_participation.html.slim +++ b/app/views/regular_events/_participation.html.slim @@ -5,7 +5,7 @@ | 参加登録しています。 ul.event-main-actions__items li.event-main-actions__item - = link_to regular_event_participation_path(regular_event_id: regular_event, user_id: current_user.id), method: :delete, + = link_to regular_event_participation_path(regular_event_id: regular_event), method: :delete, data: { confirm: 'イベントの参加をキャンセルします。よろしいですか?' }, class: 'event-main-actions__item-cancel' do | 参加を取り消す - else diff --git a/app/views/regular_events/_regular_event.html.slim b/app/views/regular_events/_regular_event.html.slim index 21ea6df23c1..347f7a3ca9b 100644 --- a/app/views/regular_events/_regular_event.html.slim +++ b/app/views/regular_events/_regular_event.html.slim @@ -87,7 +87,7 @@ = 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 - = link_to regular_event_participation_path(regular_event_id: regular_event, user_id: participant.id), method: :delete, + = link_to regular_event_participation_path(regular_event_id: regular_event, participant_id: participant), method: :delete, data: { confirm: 'イベントの参加をキャンセルします。よろしいですか?' }, class: 'event-main-actions__item-cancel' do | 削除する - else From 75f438b89e1263cbe8027e06a387d185cdcfebc1 Mon Sep 17 00:00:00 2001 From: ayu-0505 Date: Fri, 11 Oct 2024 14:14:50 +0900 Subject: [PATCH 19/29] =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E7=B3=BB=E3=83=86?= =?UTF-8?q?=E3=82=B9=E3=83=88=E3=82=92=E8=BF=BD=E5=8A=A0=EF=BC=88=E3=83=A1?= =?UTF-8?q?=E3=83=B3=E3=82=BF=E3=83=BC=E3=81=AB=E3=82=88=E3=82=8B=E5=8F=82?= =?UTF-8?q?=E5=8A=A0=E8=80=85=E5=89=8A=E9=99=A4=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/system/regular_events_test.rb | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/test/system/regular_events_test.rb b/test/system/regular_events_test.rb index 9e7016a2367..4c59223882d 100644 --- a/test/system/regular_events_test.rb +++ b/test/system/regular_events_test.rb @@ -385,4 +385,17 @@ class RegularEventsTest < ApplicationSystemTestCase end end end + + test 'mentor can remove others from participation' do + regular_event = regular_events(:regular_event1) + visit_with_auth regular_event_path(regular_event), 'komagata' + assert_difference 'regular_event.participants.count', -1 do + accept_confirm do + within('.a-card.participants') do + first('a', text: '削除する').click + end + end + assert_text '参加を取り消しました。' + end + end end From 4d2dbe3c0e81b34063be7f4dca3f5867dc8d1533 Mon Sep 17 00:00:00 2001 From: ayu-0505 Date: Fri, 11 Oct 2024 14:15:40 +0900 Subject: [PATCH 20/29] =?UTF-8?q?=E4=BD=99=E5=88=86=E3=81=AA=E3=82=AF?= =?UTF-8?q?=E3=83=A9=E3=82=B9=E6=8C=87=E5=AE=9A=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/regular_events/_regular_event.html.slim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/regular_events/_regular_event.html.slim b/app/views/regular_events/_regular_event.html.slim index 347f7a3ca9b..af91d452b54 100644 --- a/app/views/regular_events/_regular_event.html.slim +++ b/app/views/regular_events/_regular_event.html.slim @@ -88,7 +88,7 @@ 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 = link_to regular_event_participation_path(regular_event_id: regular_event, participant_id: participant), method: :delete, - data: { confirm: 'イベントの参加をキャンセルします。よろしいですか?' }, class: 'event-main-actions__item-cancel' do + data: { confirm: 'イベントの参加をキャンセルします。よろしいですか?' } do | 削除する - else .o-empty-message From 585096c2ca7ecd3aeea1e700c930797400851810 Mon Sep 17 00:00:00 2001 From: machida Date: Tue, 15 Oct 2024 17:27:40 +0900 Subject: [PATCH 21/29] =?UTF-8?q?=E5=89=8A=E9=99=A4=E3=81=8C=E3=81=A7?= =?UTF-8?q?=E3=81=8D=E3=82=8B=E3=81=AE=E3=81=AF=E3=83=A1=E3=83=B3=E3=82=BF?= =?UTF-8?q?=E3=83=BC=E3=81=8B=E3=82=89=E7=AE=A1=E7=90=86=E8=80=85=E3=81=AB?= =?UTF-8?q?=E5=A4=89=E6=9B=B4=E3=81=97=E3=80=81=E5=89=8A=E9=99=A4=E3=83=AA?= =?UTF-8?q?=E3=83=B3=E3=82=AF=E3=81=AB=E3=83=87=E3=82=B6=E3=82=A4=E3=83=B3?= =?UTF-8?q?=E3=82=92=E5=85=A5=E3=82=8C=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/regular_events/participations_controller.rb | 2 +- app/javascript/stylesheets/shared/blocks/_footprints.sass | 4 ++++ app/views/regular_events/_regular_event.html.slim | 2 +- test/system/regular_events_test.rb | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/controllers/regular_events/participations_controller.rb b/app/controllers/regular_events/participations_controller.rb index 5256b8ed6bb..b17e4418251 100644 --- a/app/controllers/regular_events/participations_controller.rb +++ b/app/controllers/regular_events/participations_controller.rb @@ -11,7 +11,7 @@ def create end def destroy - if params[:participant_id] && current_user.mentor? + if params[:participant_id] && current_user.admin? user = User.find(params[:participant_id]) @regular_event.cancel_participation(user) else diff --git a/app/javascript/stylesheets/shared/blocks/_footprints.sass b/app/javascript/stylesheets/shared/blocks/_footprints.sass index 2d1f7ac604d..c7fc88aaa0f 100644 --- 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/regular_events/_regular_event.html.slim b/app/views/regular_events/_regular_event.html.slim index af91d452b54..257920a5484 100644 --- a/app/views/regular_events/_regular_event.html.slim +++ b/app/views/regular_events/_regular_event.html.slim @@ -87,7 +87,7 @@ = 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 - = link_to regular_event_participation_path(regular_event_id: regular_event, participant_id: participant), method: :delete, + = 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 diff --git a/test/system/regular_events_test.rb b/test/system/regular_events_test.rb index 4c59223882d..91a63d5b682 100644 --- a/test/system/regular_events_test.rb +++ b/test/system/regular_events_test.rb @@ -386,7 +386,7 @@ class RegularEventsTest < ApplicationSystemTestCase end end - test 'mentor can remove others from participation' do + test 'admin can remove others from participation' do regular_event = regular_events(:regular_event1) visit_with_auth regular_event_path(regular_event), 'komagata' assert_difference 'regular_event.participants.count', -1 do From 69144d3744f19c5b8cdcc1dca474eb68034eb419 Mon Sep 17 00:00:00 2001 From: machida Date: Tue, 15 Oct 2024 17:32:55 +0900 Subject: [PATCH 22/29] =?UTF-8?q?admin=E3=81=A7=E3=83=AD=E3=82=B0=E3=82=A4?= =?UTF-8?q?=E3=83=B3=E3=81=97=E3=81=9F=E3=81=A8=E3=81=8D=E3=81=A0=E3=81=91?= =?UTF-8?q?=E3=80=81=E5=89=8A=E9=99=A4=E3=83=AA=E3=83=B3=E3=82=AF=E3=82=92?= =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= =?UTF-8?q?=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/regular_events/_regular_event.html.slim | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/regular_events/_regular_event.html.slim b/app/views/regular_events/_regular_event.html.slim index 257920a5484..db05f6cb9b9 100644 --- a/app/views/regular_events/_regular_event.html.slim +++ b/app/views/regular_events/_regular_event.html.slim @@ -87,8 +87,9 @@ = 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 - = 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 + - 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 From 100f1d971c8e8438f02ffaa218579ded10315a45 Mon Sep 17 00:00:00 2001 From: machida Date: Wed, 16 Oct 2024 10:27:06 +0900 Subject: [PATCH 23/29] =?UTF-8?q?=E3=83=AA=E3=83=B3=E3=82=AF=E3=81=AE?= =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=83=87=E3=83=B3=E3=83=88=E3=81=9A=E3=82=8C?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/regular_events/_regular_event.html.slim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/regular_events/_regular_event.html.slim b/app/views/regular_events/_regular_event.html.slim index db05f6cb9b9..769c246f209 100644 --- a/app/views/regular_events/_regular_event.html.slim +++ b/app/views/regular_events/_regular_event.html.slim @@ -90,7 +90,7 @@ - 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 From 7fdc51aa4bb577ca6f81a971ef53b0115c6d48ae Mon Sep 17 00:00:00 2001 From: ayu-0505 Date: Fri, 1 Nov 2024 10:50:29 +0900 Subject: [PATCH 24/29] =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=89=E3=81=AE?= =?UTF-8?q?=EF=BC=91=E8=A1=8C=E3=81=8C=E9=95=B7=E3=81=8F=E3=81=AA=E3=81=A3?= =?UTF-8?q?=E3=81=A6=E3=81=84=E3=81=9F=E3=81=AE=E3=81=A7=E6=94=B9=E8=A1=8C?= =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/regular_events/_regular_event.html.slim | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/regular_events/_regular_event.html.slim b/app/views/regular_events/_regular_event.html.slim index 769c246f209..cb73723bbc8 100644 --- a/app/views/regular_events/_regular_event.html.slim +++ b/app/views/regular_events/_regular_event.html.slim @@ -88,7 +88,9 @@ 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, + = 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 From b89d0d54acf0098f8434287ad11a8b1f22df5721 Mon Sep 17 00:00:00 2001 From: machida Date: Sun, 3 Nov 2024 16:30:10 +0900 Subject: [PATCH 25/29] =?UTF-8?q?=E7=A0=94=E4=BF=AE=E7=94=9F=E8=A1=A8?= =?UTF-8?q?=E7=A4=BA=E3=81=AE=E3=83=87=E3=82=B6=E3=82=A4=E3=83=B3=E5=B4=A9?= =?UTF-8?q?=E3=82=8C=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/javascript/components/User.jsx | 8 -------- app/javascript/components/UserSns.jsx | 8 ++++++++ app/javascript/components/user-sns.vue | 5 +++++ app/javascript/components/user.vue | 4 ---- .../stylesheets/application/blocks/user/_sns-links.sass | 4 ++++ .../stylesheets/application/blocks/user/_users-item.sass | 9 +++++++-- app/views/users/_sns.html.slim | 3 +++ app/views/users/_user.html.slim | 3 --- 8 files changed, 27 insertions(+), 17 deletions(-) diff --git a/app/javascript/components/User.jsx b/app/javascript/components/User.jsx index 2202444cbf0..4b1e7d7bd5a 100644 --- a/app/javascript/components/User.jsx +++ b/app/javascript/components/User.jsx @@ -70,14 +70,6 @@ export default function User({ user, currentUser }) {
) } diff --git a/app/javascript/components/user-sns.vue b/app/javascript/components/user-sns.vue index bd294f104ce..4240638784e 100644 --- a/app/javascript/components/user-sns.vue +++ b/app/javascript/components/user-sns.vue @@ -36,6 +36,11 @@ 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')