From b9e9cdb6dfb0ad6f008f70d02c97c310ba27361c Mon Sep 17 00:00:00 2001 From: Ryo Takaishi Date: Sun, 11 Aug 2024 19:59:44 +0900 Subject: [PATCH 01/22] Refactor codebase and adjust packages for Turbo-rails integration. This commit revises the project's files for integration with Turbo-rails. It involves changes to Gemfile, Gemfile.lock to set specific versions of 'turbo-rails' and comment out 'turbolinks'. JavaScript files have been refactored to replace 'turbolinks' with '@hotwired/turbo-rails'. Changes in controllers and views streamline the streaming process and rasterization strategy for the admin track view. Various codebases were simplified and cleaned up as well. The 'stimulus' package was removed as it's no longer necessary with the new Turbo-rails integration. Modifications made to package.json reflect these changes. The transition to Turbo-rails provides a more efficient drive for Rails applications, benefiting overall project performance. --- Gemfile | 5 +- Gemfile.lock | 6 +- app/controllers/admin/talks_controller.rb | 57 +-- app/javascript/controllers/index.js | 9 - app/javascript/packs/application.js | 9 +- app/javascript/packs/cicd2021.js | 6 +- app/javascript/packs/cndf2023.js | 6 +- app/javascript/packs/cndo2021.js | 6 +- app/javascript/packs/cnds2024.js | 5 +- app/javascript/packs/cndt2023.js | 6 +- .../admin/talks/start_on_air.turbo_stream.erb | 15 +- .../admin/talks/stop_on_air.turbo_stream.erb | 15 +- app/views/admin/tracks/_tracks_nav.html.erb | 60 ++- app/views/admin/tracks/index.html.erb | 4 +- app/views/admin/tracks/index.js.erb | 5 - app/views/admin/tracks/index.turbo_stream.erb | 0 .../admin/tracks/partial/_messages.html.erb | 8 +- .../tracks/partial/_on_air_button.html.erb | 17 + .../admin/tracks/partial/_talks_table.erb | 73 ---- app/views/layouts/application.html.erb | 3 +- package.json | 4 +- webpack.config.js | 2 +- yarn.lock | 378 ++++++++---------- 23 files changed, 310 insertions(+), 389 deletions(-) delete mode 100644 app/javascript/controllers/index.js delete mode 100644 app/views/admin/tracks/index.js.erb delete mode 100644 app/views/admin/tracks/index.turbo_stream.erb create mode 100644 app/views/admin/tracks/partial/_on_air_button.html.erb delete mode 100644 app/views/admin/tracks/partial/_talks_table.erb diff --git a/Gemfile b/Gemfile index 4533c23eb..a71f45d1e 100644 --- a/Gemfile +++ b/Gemfile @@ -7,9 +7,6 @@ gem 'rails', '~> 7.0.5' gem 'puma', '~> 6.0' # Use SCSS for stylesheets gem 'sass-rails', '>= 6' -# Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker -# 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.11' gem 'jsbundling-rails' @@ -116,7 +113,7 @@ gem "aws-sdk-ssm" gem 'active_hash' -gem "turbo-rails" +gem "turbo-rails", "2.0.5" gem 'slack-ruby-client' diff --git a/Gemfile.lock b/Gemfile.lock index a52ad44aa..af5febca6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -657,9 +657,6 @@ GEM actionpack (>= 6.0.0) activejob (>= 6.0.0) railties (>= 6.0.0) - turbolinks (5.2.1) - turbolinks-source (~> 5.2) - turbolinks-source (5.2.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (2.5.0) @@ -746,8 +743,7 @@ DEPENDENCIES slack-ruby-client stackprof steep - turbo-rails - turbolinks (~> 5) + turbo-rails (= 2.0.5) tzinfo-data uppy-s3_multipart (~> 1.0) web-console (>= 3.3.0) diff --git a/app/controllers/admin/talks_controller.rb b/app/controllers/admin/talks_controller.rb index c5640be03..0fd92eaae 100644 --- a/app/controllers/admin/talks_controller.rb +++ b/app/controllers/admin/talks_controller.rb @@ -22,63 +22,34 @@ def update_talks end def start_on_air - date = params[:talk][:date] - track_name = params[:talk][:track_name] - talk = Talk.find(params[:talk][:id]) + @talk = Talk.find(params[:talk][:id]) respond_to do |format| - on_air_talks_of_other_days = talk.track.talks.includes([:conference_day, :video]).accepted_and_intermission.reject { |t| t.conference_day.id == talk.conference_day.id }.select { |t| t.video.on_air? } + on_air_talks_of_other_days = @talk.track.talks.includes([:conference_day, :video]).accepted_and_intermission.reject { |t| t.conference_day.id == @talk.conference_day.id }.select { |t| t.video.on_air? } if on_air_talks_of_other_days.size.positive? - format.html { - update_variables_for_tracks(talk) - redirect_to(admin_tracks_path(date:, track_name:), alert: "Talk id=#{on_air_talks_of_other_days.map(&:id).join(',')} are already on_air.") + format.turbo_stream { + flash[:alert] = "Talk id=#{on_air_talks_of_other_days.map(&:id).join(',')} are already on_air." + # render(partial: 'admin/tracks/partial/on_air_button', locals: { talk: @talk }) } - # format.turbo_stream { - # update_variables_for_tracks(talk) - # flash[:alert] = "Talk id=#{on_air_talks_of_other_days.map(&:id).join(',')} are already on_air." - # } else - talk.start_streaming - format.html { - update_variables_for_tracks(talk) - redirect_to(admin_tracks_path(date:, track_name:), notice: "OnAirに切り替えました: #{talk.start_to_end} #{talk.speaker_names.join(',')} #{talk.title}") + @talk.start_streaming + format.turbo_stream { + flash[:notice] = "OnAirに切り替えました: #{@talk.start_to_end} #{@talk.speaker_names.join(',')} #{@talk.title}" + # render(partial: 'admin/tracks/partial/on_air_button', locals: { talk: @talk }) } - # format.turbo_stream { - # update_variables_for_tracks(talk) - # flash[:notice] = "OnAirに切り替えました: #{talk.start_to_end} #{talk.speaker_names.join(',')} #{talk.title}" - # } end end end def stop_on_air - date = params[:talk][:date] - track_name = params[:talk][:track_name] - talk = Talk.find(params[:talk][:id]) - talk.stop_streaming - @conference_day = talk.conference_day - @track = talk.track - @talks = talk.track - .talks - .where(conference_day_id: talk.conference_day.id, track_id: talk.track.id) - .order('conference_day_id ASC, start_time ASC, track_id ASC').includes(:video, :speakers, :conference_day, :track) + @talk = Talk.find(params[:talk][:id]) + @talk.stop_streaming respond_to do |format| - format.html { - redirect_to(admin_tracks_path(date:, track_name:), notice: "Waiting に切り替えました: #{talk.start_to_end} #{talk.speaker_names.join(',')} #{talk.title}") + format.turbo_stream { + flash.now[:notice] = "Waitingに切り替えました: #{@talk.start_to_end} #{@talk.speaker_names.join(',')} #{@talk.title}" + # render(partial: 'admin/tracks/partial/on_air_button', locals: { talk: @talk }) } - # format.turbo_stream { - # flash[:notice] = "Waiting に切り替えました: #{talk.start_to_end} #{talk.speaker_names.join(',')} #{talk.title}" - # } end end - - private - - def update_variables_for_tracks(talk) - @conference_day = talk.conference_day - @track = talk.track - @talks = Talk.all.where(conference_day_id: @conference_day.id, track_id: @track.id) - .order('conference_day_id ASC, start_time ASC, track_id ASC').includes(:video, :speakers, :conference_day, :track) - end end diff --git a/app/javascript/controllers/index.js b/app/javascript/controllers/index.js deleted file mode 100644 index 6f53d84bb..000000000 --- a/app/javascript/controllers/index.js +++ /dev/null @@ -1,9 +0,0 @@ -// Load all the controllers within this directory and all subdirectories. -// Controller files must be named *_controller.js. - -import { Application } from "stimulus" -import { definitionsFromContext } from "stimulus/webpack-helpers" - -const application = Application.start() -const context = require.context("controllers", true, /_controller\.js$/) -application.load(definitionsFromContext(context)) diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js index ce44abac1..608b01bcb 100644 --- a/app/javascript/packs/application.js +++ b/app/javascript/packs/application.js @@ -3,8 +3,9 @@ // a relevant structure within app/javascript and only use these pack files to reference // that code so it'll be compiled. -require("@rails/ujs").start() -require("turbolinks").start() +import "@hotwired/turbo-rails" +Turbo.session.drive = false +// import "./controllers/index.js" // Uncomment to copy all static images under ../images to the output folder and reference // them with the image_pack_tag helper in views (e.g <%= image_pack_tag 'rails.png' %>) @@ -27,7 +28,3 @@ import './cropbox.js' import './copy.js' //require.context('images/cndo201', true, /\.(png|jpg|jpeg|svg)$/) - -// import 'regenerator-runtime/runtime' -// import "@hotwired/turbo-rails" -// import "controllers" diff --git a/app/javascript/packs/cicd2021.js b/app/javascript/packs/cicd2021.js index cb53b6cbf..3f5a8411a 100644 --- a/app/javascript/packs/cicd2021.js +++ b/app/javascript/packs/cicd2021.js @@ -3,8 +3,10 @@ // a relevant structure within app/javascript and only use these pack files to reference // that code so it'll be compiled. -require("@rails/ujs").start() -require("turbolinks").start() +import Rails from "@rails/ujs" +import "@hotwired/turbo-rails" + +Rails.start() // Uncomment to copy all static images under ../images to the output folder and reference // them with the image_pack_tag helper in views (e.g <%= image_pack_tag 'rails.png' %>) diff --git a/app/javascript/packs/cndf2023.js b/app/javascript/packs/cndf2023.js index 390334b40..fb98ff01c 100644 --- a/app/javascript/packs/cndf2023.js +++ b/app/javascript/packs/cndf2023.js @@ -3,8 +3,10 @@ // a relevant structure within app/javascript and only use these pack files to reference // that code so it'll be compiled. -require("@rails/ujs").start() -require("turbolinks").start() +import Rails from "@rails/ujs" +import "@hotwired/turbo-rails" + +Rails.start() // Uncomment to copy all static images under ../images to the output folder and reference // them with the image_pack_tag helper in views (e.g <%= image_pack_tag 'rails.png' %>) diff --git a/app/javascript/packs/cndo2021.js b/app/javascript/packs/cndo2021.js index 5b6194f95..7786524d9 100644 --- a/app/javascript/packs/cndo2021.js +++ b/app/javascript/packs/cndo2021.js @@ -3,8 +3,10 @@ // a relevant structure within app/javascript and only use these pack files to reference // that code so it'll be compiled. -require("@rails/ujs").start() -require("turbolinks").start() +import Rails from "@rails/ujs" +import "@hotwired/turbo-rails" + +Rails.start() // Uncomment to copy all static images under ../images to the output folder and reference // them with the image_pack_tag helper in views (e.g <%= image_pack_tag 'rails.png' %>) diff --git a/app/javascript/packs/cnds2024.js b/app/javascript/packs/cnds2024.js index 17a617a01..511d95098 100644 --- a/app/javascript/packs/cnds2024.js +++ b/app/javascript/packs/cnds2024.js @@ -3,8 +3,9 @@ // a relevant structure within app/javascript and only use these pack files to reference // that code so it'll be compiled. -require("@rails/ujs").start() -require("turbolinks").start() +import "@hotwired/turbo-rails" +Turbo.session.drive = false +// import "./controllers/index.js" // Uncomment to copy all static images under ../images to the output folder and reference // them with the image_pack_tag helper in views (e.g <%= image_pack_tag 'rails.png' %>) diff --git a/app/javascript/packs/cndt2023.js b/app/javascript/packs/cndt2023.js index 5f4751d1e..d8dde3497 100644 --- a/app/javascript/packs/cndt2023.js +++ b/app/javascript/packs/cndt2023.js @@ -3,8 +3,10 @@ // a relevant structure within app/javascript and only use these pack files to reference // that code so it'll be compiled. -require("@rails/ujs").start() -require("turbolinks").start() +import Rails from "@rails/ujs" +import "@hotwired/turbo-rails" + +Rails.start() // Uncomment to copy all static images under ../images to the output folder and reference // them with the image_pack_tag helper in views (e.g <%= image_pack_tag 'rails.png' %>) diff --git a/app/views/admin/talks/start_on_air.turbo_stream.erb b/app/views/admin/talks/start_on_air.turbo_stream.erb index 1c2edd2e8..081f1d74f 100644 --- a/app/views/admin/talks/start_on_air.turbo_stream.erb +++ b/app/views/admin/talks/start_on_air.turbo_stream.erb @@ -1,8 +1,7 @@ -<%= turbo_stream.prepend "messages", partial: 'admin/tracks/partial/messages' %> -<%= turbo_stream.update "talks", - partial: 'admin/tracks/partial/talks_table', - locals: { - conference_day: @conference_day, - talks: @talks, - track: @track - } %> +<%= turbo_stream.prepend "messages" do %> + <%= render partial: 'admin/tracks/partial/messages' %> +<% end %> + +<%= turbo_stream.replace "talk_#{@talk.id}" do %> + <%= render partial: 'admin/tracks/partial/on_air_button', locals: { talk: @talk } %> +<% end %> diff --git a/app/views/admin/talks/stop_on_air.turbo_stream.erb b/app/views/admin/talks/stop_on_air.turbo_stream.erb index 1c2edd2e8..081f1d74f 100644 --- a/app/views/admin/talks/stop_on_air.turbo_stream.erb +++ b/app/views/admin/talks/stop_on_air.turbo_stream.erb @@ -1,8 +1,7 @@ -<%= turbo_stream.prepend "messages", partial: 'admin/tracks/partial/messages' %> -<%= turbo_stream.update "talks", - partial: 'admin/tracks/partial/talks_table', - locals: { - conference_day: @conference_day, - talks: @talks, - track: @track - } %> +<%= turbo_stream.prepend "messages" do %> + <%= render partial: 'admin/tracks/partial/messages' %> +<% end %> + +<%= turbo_stream.replace "talk_#{@talk.id}" do %> + <%= render partial: 'admin/tracks/partial/on_air_button', locals: { talk: @talk } %> +<% end %> diff --git a/app/views/admin/tracks/_tracks_nav.html.erb b/app/views/admin/tracks/_tracks_nav.html.erb index 0e3bcda3b..78d304e81 100644 --- a/app/views/admin/tracks/_tracks_nav.html.erb +++ b/app/views/admin/tracks/_tracks_nav.html.erb @@ -14,7 +14,65 @@ -<%= render partial: 'admin/tracks/partial/talks_table', locals: {conference_day: conference_day, talks: @talks, track: @track}%> +<%= turbo_frame_tag 'talks', src: @talks.nil? ? admin_talks_path : nil do %> + + + + + + + + + + + + + + <% @talks.each do |talk| %> + + + + + + + + + <% end %> + + +
IDTimeSpeakers
Title		On AirRecordingRecording Status
<%= talk.id %> + Planned
+ <%= text_field_tag(talk.id.to_s + "_planned_start", talk.start_time.strftime('%H:%M'), {disabled: true, size: 1}) %>- + <%= text_field_tag(talk.id.to_s + "_planned_end", talk.end_time.strftime('%H:%M'), {disabled: true, size: 1}) %> +
+ Offset
+ <%= text_field_tag("time[][#{talk.id.to_s}][startOffset]", talk.start_offset.to_s, {size: 1, form: 'time', class: 'start-offset'}) %>- + <%= text_field_tag("time[][#{talk.id.to_s}][endOffset]", talk.end_offset.to_s, {size: 1, form: 'time'}) %> +
+ Actual
+ <%= text_field_tag(talk.id.to_s + "_actual_start", talk.actual_start_time.strftime('%H:%M'), {disabled: true, size: 1}) %>- + <%= text_field_tag(talk.id.to_s + "_actual_end", talk.actual_end_time.strftime('%H:%M'), {disabled: true, size: 1}) %> + 		+
<%= talk.title %>
+
    <% talk.speakers.each do |speaker| %>
  • <%= speaker.name %>
    • <% end %>
+ 		+ <% if talk.video %> + <%= render('admin/tracks/partial/on_air_button', talk: talk) %> + <% end %> + + <% if talk.abstract != 'intermission' && talk.live? && talk.recordable? %> + <%= link_to "録画する", new_admin_harvest_job_path(talk_id: talk.id) %> + <% end %> + + <% if talk.video && talk.abstract != 'intermission' %> + <% if already_recorded?(talk) %> +
録画済み
+ <% else %> + 未録画 + <% end %> + <% end %> +
+<% end %> ※ Track video ID は On Air 状態のセッションがUIで表示された時に使われる (ライブ)
※ 各セッションの Video URL は Off Air 状態のセッションがUIで表示された時に使われる (アーカイブ) diff --git a/app/views/admin/tracks/index.html.erb b/app/views/admin/tracks/index.html.erb index e573b7b17..06ec6ecd9 100644 --- a/app/views/admin/tracks/index.html.erb +++ b/app/views/admin/tracks/index.html.erb @@ -22,7 +22,9 @@
<% @conference.conference_days.each do |day| %>
- <%= render 'admin/tracks/tracks_nav', conference: @conference, conference_day: day %> + <% if active_date_tab?(day) %> + <%= render 'admin/tracks/tracks_nav', conference: @conference, conference_day: day %> + <% end %>
<% end %>
diff --git a/app/views/admin/tracks/index.js.erb b/app/views/admin/tracks/index.js.erb deleted file mode 100644 index de40d64fa..000000000 --- a/app/views/admin/tracks/index.js.erb +++ /dev/null @@ -1,5 +0,0 @@ -$("#messages").html('<%= j(render partial: 'admin/tracks/partial/messages', locals: {flash: flash}) %>'); - -recording_group_target = document.getElementById('talks_table_tbody'); -html = "<%= j(render partial: 'admin/tracks/partial/talks_table', locals: {conference_day: @conference_day, talks: @talks, track: @track}) %>" -recording_group_target.innerHTML = html diff --git a/app/views/admin/tracks/index.turbo_stream.erb b/app/views/admin/tracks/index.turbo_stream.erb deleted file mode 100644 index e69de29bb..000000000 diff --git a/app/views/admin/tracks/partial/_messages.html.erb b/app/views/admin/tracks/partial/_messages.html.erb index 749e9e4ae..7f1404edb 100644 --- a/app/views/admin/tracks/partial/_messages.html.erb +++ b/app/views/admin/tracks/partial/_messages.html.erb @@ -1,8 +1,6 @@ <% flash.each do |message_type, message| %> - diff --git a/app/views/admin/show.html.erb b/app/views/admin/show.html.erb index 4d353d593..7d78d971e 100644 --- a/app/views/admin/show.html.erb +++ b/app/views/admin/show.html.erb @@ -6,17 +6,59 @@ <% end %>

<%= @conference.name %>

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FieldValue
カンファレンスステータス<%= @conference.conference_status %>
リハーサルモード<%= @conference.rehearsal_mode ? 'オン' : 'オフ' %>
CFPの結果公開<%= @conference.cfp_result_visible ? '公開' : '非公開' %>
登壇者のエントリー<%= @conference.speaker_entry %>
参加者の申し込み<%= @conference.attendee_entry %>
タイムテーブルを表示<%= @conference.show_timetable %>
現地参加定員<%= @conference.capacity %>
Contact Url<%= @conference.contact_url %>
Sponsor Guideline Url<%= link_to @conference.sponsor_guideline_url, @conference.sponsor_guideline_url, target: '_blank' %>
スポンサーを表示<%= @conference.show_sponsors ? '表示' : '非表示' %>
+ <%= link_to 'Edit', edit_admin_conference_path(id: @conference.id), class: 'btn btn-primary' %> From 2f80185b380adf35d88f3b9613a5593f8e1a4ba6 Mon Sep 17 00:00:00 2001 From: Ryo Takaishi Date: Mon, 12 Aug 2024 00:57:45 +0900 Subject: [PATCH 04/22] chore: use turbo streams for check in --- .../admin/check_in_events_controller.rb | 22 +++--- .../check_in_events/create.turbo_stream.erb | 11 +++ .../destroy_all.turbo_stream.erb | 11 +++ app/views/admin/profiles/index.html.erb | 69 +++++++++---------- .../partial/_check_in_button.html.erb | 14 ++++ .../partial/_check_in_status.html.erb | 3 + .../admin/profiles/partial/_messages.html.erb | 6 ++ config/routes.rb | 2 +- 8 files changed, 91 insertions(+), 47 deletions(-) create mode 100644 app/views/admin/check_in_events/create.turbo_stream.erb create mode 100644 app/views/admin/check_in_events/destroy_all.turbo_stream.erb create mode 100644 app/views/admin/profiles/partial/_check_in_button.html.erb create mode 100644 app/views/admin/profiles/partial/_check_in_status.html.erb create mode 100644 app/views/admin/profiles/partial/_messages.html.erb diff --git a/app/controllers/admin/check_in_events_controller.rb b/app/controllers/admin/check_in_events_controller.rb index df57a28e2..3480a095e 100644 --- a/app/controllers/admin/check_in_events_controller.rb +++ b/app/controllers/admin/check_in_events_controller.rb @@ -5,10 +5,13 @@ def create @check_in = CheckInConference.new(check_in_events_params.merge(conference_id: conference.id, check_in_timestamp: DateTime.now)) @profile = Profile.find(@check_in.profile_id) - if @check_in.save - redirect_back(fallback_location: "#{conference.abbr}/admin", allow_other_host: false) - else - redirect_back(fallback_location: "#{conference.abbr}/admin", allow_other_host: false, notice: "#{@profile.last_name} #{@profile.first_name} のチェックインに失敗しました") + respond_to do |format| + if @check_in.save + flash.now[:notice] = "#{@profile.last_name} #{@profile.first_name} をチェックインしました" + else + flash.now[:alert] = "#{@profile.last_name} #{@profile.first_name} のチェックインに失敗しました" + end + format.turbo_stream end end @@ -16,10 +19,13 @@ def destroy_all @check_ins = CheckInConference.where(profile_id: check_in_events_params[:profile_id], conference_id: conference.id) @profile = Profile.find(check_in_events_params[:profile_id]) - if @check_ins.map(&:destroy!) - redirect_back(fallback_location: "#{conference.abbr}/admin") - else - redirect_back(fallback_location: "#{conference.abbr}/admin", notice: "#{@profile.last_name} #{@profile.first_name} のチェックインキャンセルに失敗しました") + respond_to do |format| + if @check_ins.map(&:destroy!) + flash.now[:notice] = "#{@profile.last_name} #{@profile.first_name} のチェックインをキャンセルしました" + else + flash.now[:alert] = "#{@profile.last_name} #{@profile.first_name} のチェックインキャンセルに失敗しました" + end + format.turbo_stream end end diff --git a/app/views/admin/check_in_events/create.turbo_stream.erb b/app/views/admin/check_in_events/create.turbo_stream.erb new file mode 100644 index 000000000..1e822a274 --- /dev/null +++ b/app/views/admin/check_in_events/create.turbo_stream.erb @@ -0,0 +1,11 @@ +<%= turbo_stream.prepend "messages" do %> + <%= render partial: 'admin/tracks/partial/messages' %> +<% end %> + +<%= turbo_stream.replace "check_in_status_#{@profile.id}" do %> + <%= render partial: 'admin/profiles/partial/check_in_status', locals: { profile: @profile } %> +<% end %> + +<%= turbo_stream.replace "profile_#{@profile.id}" do %> + <%= render partial: 'admin/profiles/partial/check_in_button', locals: { profile: @profile } %> +<% end %> diff --git a/app/views/admin/check_in_events/destroy_all.turbo_stream.erb b/app/views/admin/check_in_events/destroy_all.turbo_stream.erb new file mode 100644 index 000000000..1e822a274 --- /dev/null +++ b/app/views/admin/check_in_events/destroy_all.turbo_stream.erb @@ -0,0 +1,11 @@ +<%= turbo_stream.prepend "messages" do %> + <%= render partial: 'admin/tracks/partial/messages' %> +<% end %> + +<%= turbo_stream.replace "check_in_status_#{@profile.id}" do %> + <%= render partial: 'admin/profiles/partial/check_in_status', locals: { profile: @profile } %> +<% end %> + +<%= turbo_stream.replace "profile_#{@profile.id}" do %> + <%= render partial: 'admin/profiles/partial/check_in_button', locals: { profile: @profile } %> +<% end %> diff --git a/app/views/admin/profiles/index.html.erb b/app/views/admin/profiles/index.html.erb index 362f68ac2..84af2fef6 100644 --- a/app/views/admin/profiles/index.html.erb +++ b/app/views/admin/profiles/index.html.erb @@ -1,4 +1,8 @@ <%= render 'admin/layout' do %> +
+ <%= render 'admin/profiles/partial/messages' %> +
+

Registered users

@@ -11,44 +15,33 @@
- - - - - - - - - - - - - - <% @profiles.each do |profile| %> + <%= turbo_frame_tag 'profiles' do %> +
NameName(Kana)登録に用いたEmail参加方法二次元バーコードチェックイン状況
+ - - - - - - - + + + + + + + - <% end %> - -
<%= profile.last_name %> <%= profile.first_name %><%= profile.last_name_kana %> <%= profile.first_name_kana %><%= profile.email %><%= Profile.participations[profile.participation] %><%= link_to 'QRコードを表示する', admin_entry_sheet_path(id: profile.id) %><%= profile.check_in_conferences.present? ? profile.check_in_conferences.first.created_at : "未チェックイン" %> - <% if profile.check_in_conferences.nil? || profile.check_in_conferences.empty? %> - <%= form_with(url: admin_check_in_events_path, method: "post", remote: true) do |f| %> - <%= f.hidden_field "check_in_event[profile_id]", value: profile.id %> - <%= f.submit 'チェックイン', data: { confirm: "#{profile.last_name} #{profile.first_name} をチェックインする"} %> - <% end %> - <% else %> - チェックイン済み - <%= form_with(url: admin_check_in_events_path, method: "delete", remote: true) do |f| %> - <%= f.hidden_field "check_in_event[profile_id]", value: profile.id %> - <%= f.submit '(チェックインをキャンセル)', data: { confirm: "#{profile.last_name} #{profile.first_name} のイベントへのチェックインをキャンセルしますか？"} %> - <% end %> - <% end %> - NameName(Kana)登録に用いたEmail参加方法二次元バーコードチェックイン状況
-
+ + + <% @profiles.each do |profile| %> + + <%= profile.last_name %> <%= profile.first_name %> + <%= profile.last_name_kana %> <%= profile.first_name_kana %> + <%= profile.email %> + <%= Profile.participations[profile.participation] %> + <%= link_to 'QRコードを表示する', admin_entry_sheet_path(id: profile.id) %> + <%= render('admin/profiles/partial/check_in_status', profile: profile) %> + <%= render('admin/profiles/partial/check_in_button', profile: profile) %> + + <% end %> + + + + <% end %> <% end %> diff --git a/app/views/admin/profiles/partial/_check_in_button.html.erb b/app/views/admin/profiles/partial/_check_in_button.html.erb new file mode 100644 index 000000000..e1f0ef8e6 --- /dev/null +++ b/app/views/admin/profiles/partial/_check_in_button.html.erb @@ -0,0 +1,14 @@ +
+ <% if profile.check_in_conferences.nil? || profile.check_in_conferences.empty? %> + <%= form_with(url: admin_check_in_events_path, method: "post") do |f| %> + <%= f.hidden_field "check_in_event[profile_id]", value: profile.id %> + <%= f.submit 'チェックイン', data: { turbo_confirm: "#{profile.last_name} #{profile.first_name} をチェックインする"} %> + <% end %> + <% else %> + チェックイン済み + <%= form_with(url: admin_check_in_events_path, method: "delete", remote: true) do |f| %> + <%= f.hidden_field "check_in_event[profile_id]", value: profile.id %> + <%= f.submit '(チェックインをキャンセル)', data: { turbo_confirm: "#{profile.last_name} #{profile.first_name} のイベントへのチェックインをキャンセルしますか？"} %> + <% end %> + <% end %> +
diff --git a/app/views/admin/profiles/partial/_check_in_status.html.erb b/app/views/admin/profiles/partial/_check_in_status.html.erb new file mode 100644 index 000000000..0be98c250 --- /dev/null +++ b/app/views/admin/profiles/partial/_check_in_status.html.erb @@ -0,0 +1,3 @@ +
+ <%= profile.check_in_conferences.present? ? profile.check_in_conferences.first.created_at : "未チェックイン" %> +
diff --git a/app/views/admin/profiles/partial/_messages.html.erb b/app/views/admin/profiles/partial/_messages.html.erb new file mode 100644 index 000000000..7f1404edb --- /dev/null +++ b/app/views/admin/profiles/partial/_messages.html.erb @@ -0,0 +1,6 @@ +<% flash.each do |message_type, message| %> + +<% end %> diff --git a/config/routes.rb b/config/routes.rb index a890ad2d2..e4ed14934 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -56,7 +56,7 @@ get 'export_speakers' => 'speakers#export_speakers' get 'export_profiles' => 'profiles#export_profiles' get 'speaker_check_in_statuses' => 'speakers#check_in_statuses' - resources :check_in_events, only: [:create] + resources :check_in_events, only: [:create, :destroy] delete 'check_in_events' => 'check_in_events#destroy_all' resources :talks, only: [:index] resources :rooms, only: [:index, :update] From 0aa07fe6d4623f9056da8daacdcf4d8960c75bef Mon Sep 17 00:00:00 2001 From: Ryo Takaishi Date: Sat, 17 Aug 2024 09:55:32 +0900 Subject: [PATCH 05/22] chore: remove jQuery package --- package.json | 1 - yarn.lock | 5 ----- 2 files changed, 6 deletions(-) diff --git a/package.json b/package.json index 5cc439540..59e1257d6 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,6 @@ "cropperjs": "1.6.2", "css-loader": "^7.1.2", "file-loader": "^6.2.0", - "jquery": "3.7.1", "mini-css-extract-plugin": "^2.9.0", "nodemon": "^3.1.4", "particles.js": "^2.0.0", diff --git a/yarn.lock b/yarn.lock index d68f381bd..765c8ea0c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1146,11 +1146,6 @@ jest-worker@^27.4.5: merge-stream "^2.0.0" supports-color "^8.0.0" -jquery@3.7.1: - version "3.7.1" - resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.7.1.tgz#083ef98927c9a6a74d05a6af02806566d16274de" - integrity sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg== - json-parse-even-better-errors@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" From 22672d3ee1364ab28a17b26738528648397b2746 Mon Sep 17 00:00:00 2001 From: Ryo Takaishi Date: Sat, 17 Aug 2024 10:34:09 +0900 Subject: [PATCH 06/22] remove jquery import --- app/javascript/packs/application.js | 4 ---- app/javascript/packs/cicd2021.js | 12 +++++------- app/javascript/packs/cndf2023.js | 11 +++++++---- app/javascript/packs/cndo2021.js | 2 -- app/javascript/packs/cnds2024.js | 2 -- app/javascript/packs/cndt2023.js | 10 ++++++---- webpack.config.js | 4 ---- 7 files changed, 18 insertions(+), 27 deletions(-) diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js index bde69e84f..3c5a38f2d 100644 --- a/app/javascript/packs/application.js +++ b/app/javascript/packs/application.js @@ -14,14 +14,10 @@ Turbo.session.drive = false // const images = require.context('../images', true) // const imagePath = (name) => images(name, true) // import '../stylesheets/application' -import $ from 'jquery' import './bootstrap_custom.js' -window.jQuery = $ -import './scripts.js' import './timetable.js' import './talks.js' import './conference_form.js' - import './contents.js' import './speaker_form.js' import './cropbox.js' diff --git a/app/javascript/packs/cicd2021.js b/app/javascript/packs/cicd2021.js index 89d4068bf..c9a92f182 100644 --- a/app/javascript/packs/cicd2021.js +++ b/app/javascript/packs/cicd2021.js @@ -14,16 +14,14 @@ Rails.start() // // const images = require.context('../images', true) // const imagePath = (name) => images(name, true) -import $ from 'jquery' +import '../stylesheets/cicd2021' import './bootstrap_custom.js' -window.jQuery = $ +import './utils' import './scripts.js' import './talks.js' +import './sponsor_form.js' import './conference_form.js' import './contents.js' -import './cropbox.js' -import './timetable.js' -import './attendee_dashboard.js' -import "particles.js"; -import './copy.js' import './speaker_form.js' + +require.context('images', true, /\.(png|jpg|jpeg|svg)$/) diff --git a/app/javascript/packs/cndf2023.js b/app/javascript/packs/cndf2023.js index 88636c3e9..c5b6bf04d 100644 --- a/app/javascript/packs/cndf2023.js +++ b/app/javascript/packs/cndf2023.js @@ -14,19 +14,22 @@ Rails.start() // // const images = require.context('../images', true) // const imagePath = (name) => images(name, true) -import $ from 'jquery' +import '../stylesheets/cndf2023' import './bootstrap_custom.js' -window.jQuery = $ +import './utils' import './scripts.js' import './talks.js' +import './sponsor_form.js' import './conference_form.js' import './contents.js' +import './speaker_form.js' import './cropbox.js' import './timetable.js' import './attendee_dashboard.js' -import "particles.js"; import './copy.js' -import './speaker_form.js' + +require.context('images', true, /\.(png|jpg|jpeg|svg)$/) + // import 'regenerator-runtime/runtime' // import "@hotwired/turbo-rails" // import "controllers" diff --git a/app/javascript/packs/cndo2021.js b/app/javascript/packs/cndo2021.js index dc2315b0f..da4831bcb 100644 --- a/app/javascript/packs/cndo2021.js +++ b/app/javascript/packs/cndo2021.js @@ -15,9 +15,7 @@ Rails.start() // const images = require.context('../images', true) // const imagePath = (name) => images(name, true) // import '../stylesheets/cndo2021' -import $ from 'jquery' import './bootstrap_custom.js' -window.jQuery = $ import './scripts.js' import './talks.js' import './conference_form.js' diff --git a/app/javascript/packs/cnds2024.js b/app/javascript/packs/cnds2024.js index e102999a0..349d6219e 100644 --- a/app/javascript/packs/cnds2024.js +++ b/app/javascript/packs/cnds2024.js @@ -14,9 +14,7 @@ Turbo.session.drive = false // const images = require.context('../images', true) // const imagePath = (name) => images(name, true) // import '../stylesheets/cnds2024' -import $ from 'jquery' import './bootstrap_custom.js' -window.jQuery = $ import './scripts.js' import './talks.js' import './conference_form.js' diff --git a/app/javascript/packs/cndt2023.js b/app/javascript/packs/cndt2023.js index af5b0c188..366f6f8aa 100644 --- a/app/javascript/packs/cndt2023.js +++ b/app/javascript/packs/cndt2023.js @@ -14,19 +14,21 @@ Rails.start() // // const images = require.context('../images', true) // const imagePath = (name) => images(name, true) -import $ from 'jquery' +import '../stylesheets/cndt2023' import './bootstrap_custom.js' -window.jQuery = $ +import './utils' import './scripts.js' import './talks.js' +import './sponsor_form.js' import './conference_form.js' import './contents.js' import './cropbox.js' import './timetable.js' import './attendee_dashboard.js' -import "particles.js"; +import './particles.min.js' import './copy.js' -import './speaker_form.js' + +require.context('images', true, /\.(png|jpg|jpeg|svg)$/) // import 'regenerator-runtime/runtime' // import "@hotwired/turbo-rails" diff --git a/webpack.config.js b/webpack.config.js index 24403e5ac..28a11f656 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -94,9 +94,5 @@ module.exports = { }), new RemoveEmptyScriptsPlugin(), new MiniCssExtractPlugin(), - new webpack.ProvidePlugin({ - $: 'jquery', - jQuery: 'jquery' - }) ] } From 8d926696d1feb91815309829031337b4867cdce3 Mon Sep 17 00:00:00 2001 From: Ryo Takaishi Date: Sat, 17 Aug 2024 10:35:39 +0900 Subject: [PATCH 07/22] migrate attendee_dashboard.js to stimulus --- app/javascript/packs/attendee_dashboard.js | 4 ---- app/javascript/packs/cndf2023.js | 2 +- app/javascript/packs/cndo2021.js | 1 - app/javascript/packs/cnds2024.js | 3 +-- app/javascript/packs/cndt2023.js | 1 - app/javascript/packs/controllers/application.js | 12 ++++++++++++ app/javascript/packs/controllers/index.js | 14 ++++++++++++++ .../controllers/share_registration_controller.js | 10 ++++++++++ app/views/attendee_dashboards/show.html.erb | 6 +++--- package.json | 2 ++ yarn.lock | 10 ++++++++++ 11 files changed, 53 insertions(+), 12 deletions(-) delete mode 100644 app/javascript/packs/attendee_dashboard.js create mode 100644 app/javascript/packs/controllers/application.js create mode 100644 app/javascript/packs/controllers/index.js create mode 100644 app/javascript/packs/controllers/share_registration_controller.js diff --git a/app/javascript/packs/attendee_dashboard.js b/app/javascript/packs/attendee_dashboard.js deleted file mode 100644 index 819a1adcd..000000000 --- a/app/javascript/packs/attendee_dashboard.js +++ /dev/null @@ -1,4 +0,0 @@ -$(document).on('click', '#twitter_share', function(event) { - const content = document.getElementById("tweet_content") - window.open(`https://twitter.com/intent/tweet?text=${encodeURIComponent(content.value)}`); -}); diff --git a/app/javascript/packs/cndf2023.js b/app/javascript/packs/cndf2023.js index c5b6bf04d..b51dc6d3d 100644 --- a/app/javascript/packs/cndf2023.js +++ b/app/javascript/packs/cndf2023.js @@ -25,7 +25,7 @@ import './contents.js' import './speaker_form.js' import './cropbox.js' import './timetable.js' -import './attendee_dashboard.js' + import './copy.js' require.context('images', true, /\.(png|jpg|jpeg|svg)$/) diff --git a/app/javascript/packs/cndo2021.js b/app/javascript/packs/cndo2021.js index da4831bcb..b99dd3680 100644 --- a/app/javascript/packs/cndo2021.js +++ b/app/javascript/packs/cndo2021.js @@ -22,7 +22,6 @@ import './conference_form.js' import './contents.js' import './cropbox.js' import './timetable.js' -import './attendee_dashboard.js' import "particles.js"; import './copy.js' import './speaker_form.js' \ No newline at end of file diff --git a/app/javascript/packs/cnds2024.js b/app/javascript/packs/cnds2024.js index 349d6219e..93152cbf2 100644 --- a/app/javascript/packs/cnds2024.js +++ b/app/javascript/packs/cnds2024.js @@ -5,7 +5,7 @@ import "@hotwired/turbo-rails" Turbo.session.drive = false -// import "./controllers/index.js" +import "./controllers/index.js" // Uncomment to copy all static images under ../images to the output folder and reference // them with the image_pack_tag helper in views (e.g <%= image_pack_tag 'rails.png' %>) @@ -21,7 +21,6 @@ import './conference_form.js' import './contents.js' import './cropbox.js' import './timetable.js' -import './attendee_dashboard.js' import "particles.js"; import './copy.js' import './speaker_form.js' diff --git a/app/javascript/packs/cndt2023.js b/app/javascript/packs/cndt2023.js index 366f6f8aa..b5f441050 100644 --- a/app/javascript/packs/cndt2023.js +++ b/app/javascript/packs/cndt2023.js @@ -24,7 +24,6 @@ import './conference_form.js' import './contents.js' import './cropbox.js' import './timetable.js' -import './attendee_dashboard.js' import './particles.min.js' import './copy.js' diff --git a/app/javascript/packs/controllers/application.js b/app/javascript/packs/controllers/application.js new file mode 100644 index 000000000..3e85a580f --- /dev/null +++ b/app/javascript/packs/controllers/application.js @@ -0,0 +1,12 @@ +import { Application } from "@hotwired/stimulus" +import { definitionsFromContext } from "@hotwired/stimulus-webpack-helpers" + +const application = Application.start() +const context = require.context("./", true, /\.js$/) +application.load(definitionsFromContext(context)) + +// Configure Stimulus development experience +application.debug = true +window.Stimulus = application + +export { application } diff --git a/app/javascript/packs/controllers/index.js b/app/javascript/packs/controllers/index.js new file mode 100644 index 000000000..49b4e9e14 --- /dev/null +++ b/app/javascript/packs/controllers/index.js @@ -0,0 +1,14 @@ +// Import and register all your controllers from the importmap under controllers/* + +import { application } from "./application.js" + +// Eager load all controllers defined in the import map under controllers/**/*_controller +// import { eagerLoadControllersFrom } from "@hotwired/stimulus-loading" +// eagerLoadControllersFrom("controllers", application) + +// Lazy load controllers as they appear in the DOM (remember not to preload controllers in import map!) +// import { lazyLoadControllersFrom } from "@hotwired/stimulus-loading" +// lazyLoadControllersFrom("controllers", application) + +import ShareRegistrationController from "./share_registration_controller.js" +application.register("share-registration", ShareRegistrationController) diff --git a/app/javascript/packs/controllers/share_registration_controller.js b/app/javascript/packs/controllers/share_registration_controller.js new file mode 100644 index 000000000..86bf5ad2f --- /dev/null +++ b/app/javascript/packs/controllers/share_registration_controller.js @@ -0,0 +1,10 @@ +import { Controller } from "@hotwired/stimulus" + +export default class extends Controller { + static targets = [ "tweet_content" ] + + windowOpen() { + const value = this.tweet_contentTarget.value + window.open(`https://twitter.com/intent/tweet?text=${encodeURIComponent(value)}`); + } +} diff --git a/app/views/attendee_dashboards/show.html.erb b/app/views/attendee_dashboards/show.html.erb index 983314b09..81dc2a292 100644 --- a/app/views/attendee_dashboards/show.html.erb +++ b/app/views/attendee_dashboards/show.html.erb @@ -79,17 +79,17 @@ <% end %>
-
+
X(Twitter)でシェアしよう！
- " /> + " />
- +
diff --git a/package.json b/package.json index 59e1257d6..38acda999 100644 --- a/package.json +++ b/package.json @@ -2,6 +2,8 @@ "name": "cndtattend", "private": true, "dependencies": { + "@hotwired/stimulus": "^3.2.2", + "@hotwired/stimulus-webpack-helpers": "^1.0.1", "@hotwired/turbo-rails": "8.0.4", "@popperjs/core": "^2.11.8", "@rails/actioncable": "7.2.0", diff --git a/yarn.lock b/yarn.lock index 765c8ea0c..07d4aea25 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14,6 +14,16 @@ resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70" integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== +"@hotwired/stimulus-webpack-helpers@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@hotwired/stimulus-webpack-helpers/-/stimulus-webpack-helpers-1.0.1.tgz#4cd74487adeca576c9865ac2b9fe5cb20cef16dd" + integrity sha512-wa/zupVG0eWxRYJjC1IiPBdt3Lruv0RqGN+/DTMmUWUyMAEB27KXmVY6a8YpUVTM7QwVuaLNGW4EqDgrS2upXQ== + +"@hotwired/stimulus@^3.2.2": + version "3.2.2" + resolved "https://registry.yarnpkg.com/@hotwired/stimulus/-/stimulus-3.2.2.tgz#071aab59c600fed95b97939e605ff261a4251608" + integrity sha512-eGeIqNOQpXoPAIP7tC1+1Yc1yl1xnwYqg+3mzqxyrbE5pg5YFBZcA6YoTiByJB6DKAEsiWtl6tjTJS4IYtbB7A== + "@hotwired/turbo-rails@8.0.4": version "8.0.4" resolved "https://registry.yarnpkg.com/@hotwired/turbo-rails/-/turbo-rails-8.0.4.tgz#d224f524a9e33fe687cec5d706054eb6fe13fa5b" From 6abbd686217d262e2558c4c2697dd1d739187a70 Mon Sep 17 00:00:00 2001 From: Ryo Takaishi Date: Sat, 17 Aug 2024 10:36:02 +0900 Subject: [PATCH 08/22] Add turbo stream to append link fields in admin conferences This commit introduces a new Turbo Stream view for appending link fields in the admin conference section. It renders a partial to dynamically add link fields when needed. --- app/views/admin/conferences/add_link_field.turbo_stream.erb | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 app/views/admin/conferences/add_link_field.turbo_stream.erb diff --git a/app/views/admin/conferences/add_link_field.turbo_stream.erb b/app/views/admin/conferences/add_link_field.turbo_stream.erb new file mode 100644 index 000000000..3969e6924 --- /dev/null +++ b/app/views/admin/conferences/add_link_field.turbo_stream.erb @@ -0,0 +1,3 @@ +<%= turbo_stream.append "link_fields" do %> + <%= render partial: 'admin/conferences/partial/link_fields' %> +<% end %> From 8b82b3606ca29a6f0cd51a0ac914b90e4ab0a38f Mon Sep 17 00:00:00 2001 From: Ryo Takaishi Date: Sat, 17 Aug 2024 10:56:57 +0900 Subject: [PATCH 09/22] chore: remove unused codes related to sponsors --- app/javascript/packs/cicd2021.js | 1 - app/javascript/packs/cndf2023.js | 1 - app/javascript/packs/cndt2023.js | 1 - 3 files changed, 3 deletions(-) diff --git a/app/javascript/packs/cicd2021.js b/app/javascript/packs/cicd2021.js index c9a92f182..00653f1f5 100644 --- a/app/javascript/packs/cicd2021.js +++ b/app/javascript/packs/cicd2021.js @@ -19,7 +19,6 @@ import './bootstrap_custom.js' import './utils' import './scripts.js' import './talks.js' -import './sponsor_form.js' import './conference_form.js' import './contents.js' import './speaker_form.js' diff --git a/app/javascript/packs/cndf2023.js b/app/javascript/packs/cndf2023.js index b51dc6d3d..54c3f394b 100644 --- a/app/javascript/packs/cndf2023.js +++ b/app/javascript/packs/cndf2023.js @@ -19,7 +19,6 @@ import './bootstrap_custom.js' import './utils' import './scripts.js' import './talks.js' -import './sponsor_form.js' import './conference_form.js' import './contents.js' import './speaker_form.js' diff --git a/app/javascript/packs/cndt2023.js b/app/javascript/packs/cndt2023.js index b5f441050..cb493718e 100644 --- a/app/javascript/packs/cndt2023.js +++ b/app/javascript/packs/cndt2023.js @@ -19,7 +19,6 @@ import './bootstrap_custom.js' import './utils' import './scripts.js' import './talks.js' -import './sponsor_form.js' import './conference_form.js' import './contents.js' import './cropbox.js' From 66b43a30955d69c6850d0c4f6802177d0adc6062 Mon Sep 17 00:00:00 2001 From: Ryo Takaishi Date: Sat, 17 Aug 2024 11:18:55 +0900 Subject: [PATCH 10/22] remove unused code --- app/helpers/application_helper.rb | 18 ------------------ app/javascript/packs/conference_form.js | 24 +----------------------- 2 files changed, 1 insertion(+), 41 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index b596e009f..2887a1470 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -33,24 +33,6 @@ def event_image_url end end - def link_to_add_link_fields(name, f, association, **args) - new_object = f.object.to_model.class.reflect_on_association(association).klass.new - id = new_object.object_id - fields = f.fields_for(association, new_object, child_index: id) do |builder| - render(association.to_s.singularize + '_fields', f: builder) - end - link_to(name, '#', class: 'add_link_fields ' + args[:class], data: { id:, fields: fields.gsub("\n", '') }, style: args[:style]) - end - - def link_to_add_conference_day_fields(name, f, association, **args) - new_object = f.object.to_model.class.reflect_on_association(association).klass.new - id = new_object.object_id - fields = f.fields_for(association, new_object, child_index: id) do |builder| - render(association.to_s.singularize + '_fields', f: builder) - end - link_to(name, '#', class: 'add_conference_day_fields ' + args[:class], data: { id:, fields: fields.gsub("\n", '') }, style: args[:style]) - end - def markdown(text) html_render = Redcarpet::Render::HTML options = { diff --git a/app/javascript/packs/conference_form.js b/app/javascript/packs/conference_form.js index b51546501..d02251ca1 100644 --- a/app/javascript/packs/conference_form.js +++ b/app/javascript/packs/conference_form.js @@ -1,27 +1,5 @@ -$(document).on('click', '.add_link_fields', function(event) { - var regexp, time; - time = new Date().getTime(); - regexp = new RegExp($(this).data('id'), 'g'); - $('.link-fields').append($(this).data('fields').replace(regexp, time)); - return event.preventDefault(); -}) - -$(document).on('click', '.remove_link_field', function(event) { +(document).on('click', '.remove_link_field', function(event) { $(this).prev('input[type=hidden]').val('1'); $(this).closest('.link-field').hide(); return event.preventDefault(); }) - -$(document).on('click', '.add_conference_day_fields', function(event) { - var regexp, time; - time = new Date().getTime(); - regexp = new RegExp($(this).data('id'), 'g'); - $('.conference-day-fields').append($(this).data('fields').replace(regexp, time)); - return event.preventDefault(); -}) - -$(document).on('click', '.remove_conference_day_field', function(event) { - $(this).prev('input[type=hidden]').val('1'); - $(this).closest('.conference-day-field').hide(); - return event.preventDefault(); -}) \ No newline at end of file From 3c64791f8aacd7f70f99d9f1750949990a2b28b7 Mon Sep 17 00:00:00 2001 From: Ryo Takaishi Date: Sat, 17 Aug 2024 11:19:09 +0900 Subject: [PATCH 11/22] switch to stimulus --- app/javascript/packs/controllers/index.js | 3 +++ .../packs/controllers/remove_link_field_controller.js | 10 ++++++++++ app/views/admin/conferences/_link_fields.html.erb | 4 ++-- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 app/javascript/packs/controllers/remove_link_field_controller.js diff --git a/app/javascript/packs/controllers/index.js b/app/javascript/packs/controllers/index.js index 49b4e9e14..e99c02cdb 100644 --- a/app/javascript/packs/controllers/index.js +++ b/app/javascript/packs/controllers/index.js @@ -12,3 +12,6 @@ import { application } from "./application.js" import ShareRegistrationController from "./share_registration_controller.js" application.register("share-registration", ShareRegistrationController) + +import RemoveLinkFieldController from "./remove_link_field_controller.js" +application.register("remove-link-field", RemoveLinkFieldController) diff --git a/app/javascript/packs/controllers/remove_link_field_controller.js b/app/javascript/packs/controllers/remove_link_field_controller.js new file mode 100644 index 000000000..5d8201e8f --- /dev/null +++ b/app/javascript/packs/controllers/remove_link_field_controller.js @@ -0,0 +1,10 @@ +import { Controller } from "@hotwired/stimulus" + +export default class extends Controller { + static targets = [ "tweet_content" ] + + remove() { + const value = this.tweet_contentTarget.value + window.open(`https://twitter.com/intent/tweet?text=${encodeURIComponent(value)}`); + } +} diff --git a/app/views/admin/conferences/_link_fields.html.erb b/app/views/admin/conferences/_link_fields.html.erb index bf024a4d2..14c615c61 100644 --- a/app/views/admin/conferences/_link_fields.html.erb +++ b/app/views/admin/conferences/_link_fields.html.erb @@ -1,4 +1,4 @@ -
+
<%= f.text_field :title %> @@ -6,7 +6,7 @@ <%= f.text_field :description %> <%= f.hidden_field :_destroy %> - <%= link_to 'Delete', '#', class: 'remove_link_field' %> + <%= link_to 'Delete', '#', class: 'remove_link_field', data: {"data-action": "click->remove-link-field#remove" } %>
From 9754230b2574e9884975710fdfa1e95d7f5d5bce Mon Sep 17 00:00:00 2001 From: Ryo Takaishi Date: Sat, 17 Aug 2024 12:21:01 +0900 Subject: [PATCH 12/22] migrate add and delete link form turbo-stream and stimulus --- .../admin/conferences_controller.rb | 14 ++++++++ app/javascript/packs/application.js | 1 - app/javascript/packs/cicd2021.js | 1 - app/javascript/packs/cndf2023.js | 1 - app/javascript/packs/cndo2021.js | 1 - app/javascript/packs/cnds2024.js | 1 - app/javascript/packs/cndt2023.js | 1 - app/javascript/packs/conference_form.js | 5 --- .../remove_link_field_controller.js | 9 ++--- app/views/admin/conferences/_form.html.erb | 34 +++++++++---------- .../admin/conferences/_link_fields.html.erb | 22 +++++------- .../conferences/add_link.turbo_stream.erb | 5 +++ .../add_link_field.turbo_stream.erb | 3 -- config/routes.rb | 4 ++- 14 files changed, 52 insertions(+), 50 deletions(-) delete mode 100644 app/javascript/packs/conference_form.js create mode 100644 app/views/admin/conferences/add_link.turbo_stream.erb delete mode 100644 app/views/admin/conferences/add_link_field.turbo_stream.erb diff --git a/app/controllers/admin/conferences_controller.rb b/app/controllers/admin/conferences_controller.rb index 1a0ec6e37..081717c5c 100644 --- a/app/controllers/admin/conferences_controller.rb +++ b/app/controllers/admin/conferences_controller.rb @@ -31,6 +31,20 @@ def update end end + def add_link + @conference_form = ConferenceForm.new(conference: @conference) + + helpers.fields(model: @conference_form) do |f| + f.fields_for(:links, Link.new, child_index: Process.clock_gettime(Process::CLOCK_REALTIME, :millisecond)) do |ff| + render(turbo_stream: turbo_stream.append( + 'link_fields', + partial: 'admin/conferences/link_fields', + locals: { f: ff } + )) + end + end + end + private def conference_params diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js index 3c5a38f2d..14f221a59 100644 --- a/app/javascript/packs/application.js +++ b/app/javascript/packs/application.js @@ -17,7 +17,6 @@ Turbo.session.drive = false import './bootstrap_custom.js' import './timetable.js' import './talks.js' -import './conference_form.js' import './contents.js' import './speaker_form.js' import './cropbox.js' diff --git a/app/javascript/packs/cicd2021.js b/app/javascript/packs/cicd2021.js index 00653f1f5..36cb2b7c2 100644 --- a/app/javascript/packs/cicd2021.js +++ b/app/javascript/packs/cicd2021.js @@ -19,7 +19,6 @@ import './bootstrap_custom.js' import './utils' import './scripts.js' import './talks.js' -import './conference_form.js' import './contents.js' import './speaker_form.js' diff --git a/app/javascript/packs/cndf2023.js b/app/javascript/packs/cndf2023.js index 54c3f394b..3f9f93e43 100644 --- a/app/javascript/packs/cndf2023.js +++ b/app/javascript/packs/cndf2023.js @@ -19,7 +19,6 @@ import './bootstrap_custom.js' import './utils' import './scripts.js' import './talks.js' -import './conference_form.js' import './contents.js' import './speaker_form.js' import './cropbox.js' diff --git a/app/javascript/packs/cndo2021.js b/app/javascript/packs/cndo2021.js index b99dd3680..9417bcb05 100644 --- a/app/javascript/packs/cndo2021.js +++ b/app/javascript/packs/cndo2021.js @@ -18,7 +18,6 @@ Rails.start() import './bootstrap_custom.js' import './scripts.js' import './talks.js' -import './conference_form.js' import './contents.js' import './cropbox.js' import './timetable.js' diff --git a/app/javascript/packs/cnds2024.js b/app/javascript/packs/cnds2024.js index 93152cbf2..9901680f9 100644 --- a/app/javascript/packs/cnds2024.js +++ b/app/javascript/packs/cnds2024.js @@ -17,7 +17,6 @@ import "./controllers/index.js" import './bootstrap_custom.js' import './scripts.js' import './talks.js' -import './conference_form.js' import './contents.js' import './cropbox.js' import './timetable.js' diff --git a/app/javascript/packs/cndt2023.js b/app/javascript/packs/cndt2023.js index cb493718e..14b6105fc 100644 --- a/app/javascript/packs/cndt2023.js +++ b/app/javascript/packs/cndt2023.js @@ -19,7 +19,6 @@ import './bootstrap_custom.js' import './utils' import './scripts.js' import './talks.js' -import './conference_form.js' import './contents.js' import './cropbox.js' import './timetable.js' diff --git a/app/javascript/packs/conference_form.js b/app/javascript/packs/conference_form.js deleted file mode 100644 index d02251ca1..000000000 --- a/app/javascript/packs/conference_form.js +++ /dev/null @@ -1,5 +0,0 @@ -(document).on('click', '.remove_link_field', function(event) { - $(this).prev('input[type=hidden]').val('1'); - $(this).closest('.link-field').hide(); - return event.preventDefault(); -}) diff --git a/app/javascript/packs/controllers/remove_link_field_controller.js b/app/javascript/packs/controllers/remove_link_field_controller.js index 5d8201e8f..b85c7b87d 100644 --- a/app/javascript/packs/controllers/remove_link_field_controller.js +++ b/app/javascript/packs/controllers/remove_link_field_controller.js @@ -1,10 +1,11 @@ import { Controller } from "@hotwired/stimulus" export default class extends Controller { - static targets = [ "tweet_content" ] + static targets = ["hiddenInput", "linkField"] - remove() { - const value = this.tweet_contentTarget.value - window.open(`https://twitter.com/intent/tweet?text=${encodeURIComponent(value)}`); + remove(event) { + this.hiddenInputTarget.value = '1'; + this.linkFieldTarget.style.display = 'none'; + event.preventDefault(); } } diff --git a/app/views/admin/conferences/_form.html.erb b/app/views/admin/conferences/_form.html.erb index 6eb2820ea..348d7a15e 100644 --- a/app/views/admin/conferences/_form.html.erb +++ b/app/views/admin/conferences/_form.html.erb @@ -87,24 +87,22 @@ <%= form.label :links, 'Links' %> -
-

<%= link_to_add_link_fields "Add Link", form, :links, class: 'add-link btn btn-primary' %>

- - - - - - - - - - - <%= form.fields_for :links do |f| %> - <%= render 'admin/conferences/link_fields', :f => f %> - <% end %> - -
TitleURLDescription
-
+

<%= link_to "Add Link", admin_conference_add_link_path(conference_id: @conference.abbr), method: :post, data: { turbo_method: :post } %>

+ + + + + + + + + + + <%= form.fields_for :links do |f| %> + <%= render 'admin/conferences/link_fields', :f => f %> + <% end %> + +
TitleURLDescription
diff --git a/app/views/admin/conferences/_link_fields.html.erb b/app/views/admin/conferences/_link_fields.html.erb index 14c615c61..1c4d2685e 100644 --- a/app/views/admin/conferences/_link_fields.html.erb +++ b/app/views/admin/conferences/_link_fields.html.erb @@ -1,13 +1,9 @@ -
-
-
- <%= f.text_field :title %> - <%= f.text_field :url %> - <%= f.text_field :description %> - - <%= f.hidden_field :_destroy %> - <%= link_to 'Delete', '#', class: 'remove_link_field', data: {"data-action": "click->remove-link-field#remove" } %> - -
-
-
+ + <%= f.text_field :title %> + <%= f.text_field :url %> + <%= f.text_field :description %> + + <%= f.hidden_field :_destroy, data: { "remove-link-field-target": "hiddenInput" } %> + + + diff --git a/app/views/admin/conferences/add_link.turbo_stream.erb b/app/views/admin/conferences/add_link.turbo_stream.erb new file mode 100644 index 000000000..436666de1 --- /dev/null +++ b/app/views/admin/conferences/add_link.turbo_stream.erb @@ -0,0 +1,5 @@ +<%= turbo_stream.append "link_fields" do %> + render turbo_stream: turbo_stream.append("links-fields", partial: "admin/conferences/link_fields", locals: { f: form_with(model: @conference, local: true) { |form| form.fields_for(:links, link) } }) + + <%= render partial: 'admin/conferences/link_fields', locals: { f: form_with_model(@link) } %> +<% end %> diff --git a/app/views/admin/conferences/add_link_field.turbo_stream.erb b/app/views/admin/conferences/add_link_field.turbo_stream.erb deleted file mode 100644 index 3969e6924..000000000 --- a/app/views/admin/conferences/add_link_field.turbo_stream.erb +++ /dev/null @@ -1,3 +0,0 @@ -<%= turbo_stream.append "link_fields" do %> - <%= render partial: 'admin/conferences/partial/link_fields' %> -<% end %> diff --git a/config/routes.rb b/config/routes.rb index e4ed14934..fe897eeae 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -51,7 +51,9 @@ resources :check_ins, only: [:index, :create, :destroy] resources :admin_profiles, only: [:edit, :update] resources :sponsors, only: [:index, :new, :create, :show, :edit, :update, :destroy] - resources :conferences, only: [:index, :show, :edit, :update] + resources :conferences, only: [:index, :show, :edit, :update] do + post 'add_link' => 'conferences#add_link' + end resources :speakers, only: [:index, :edit, :update] get 'export_speakers' => 'speakers#export_speakers' get 'export_profiles' => 'profiles#export_profiles' From 2a5885d9b90172f62683f98edd858ea8428dae0a Mon Sep 17 00:00:00 2001 From: Ryo Takaishi Date: Sat, 17 Aug 2024 13:05:28 +0900 Subject: [PATCH 13/22] remove unused code --- app/javascript/packs/application.js | 1 - app/javascript/packs/cicd2021.js | 1 - app/javascript/packs/cndf2023.js | 1 - app/javascript/packs/cndo2021.js | 1 - app/javascript/packs/cnds2024.js | 1 - app/javascript/packs/cndt2023.js | 1 - app/javascript/packs/contents.js | 10 ---------- 7 files changed, 16 deletions(-) delete mode 100644 app/javascript/packs/contents.js diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js index 14f221a59..76516a5c5 100644 --- a/app/javascript/packs/application.js +++ b/app/javascript/packs/application.js @@ -17,7 +17,6 @@ Turbo.session.drive = false import './bootstrap_custom.js' import './timetable.js' import './talks.js' -import './contents.js' import './speaker_form.js' import './cropbox.js' import './copy.js' diff --git a/app/javascript/packs/cicd2021.js b/app/javascript/packs/cicd2021.js index 36cb2b7c2..2aa3da73b 100644 --- a/app/javascript/packs/cicd2021.js +++ b/app/javascript/packs/cicd2021.js @@ -19,7 +19,6 @@ import './bootstrap_custom.js' import './utils' import './scripts.js' import './talks.js' -import './contents.js' import './speaker_form.js' require.context('images', true, /\.(png|jpg|jpeg|svg)$/) diff --git a/app/javascript/packs/cndf2023.js b/app/javascript/packs/cndf2023.js index 3f9f93e43..d5af6457b 100644 --- a/app/javascript/packs/cndf2023.js +++ b/app/javascript/packs/cndf2023.js @@ -19,7 +19,6 @@ import './bootstrap_custom.js' import './utils' import './scripts.js' import './talks.js' -import './contents.js' import './speaker_form.js' import './cropbox.js' import './timetable.js' diff --git a/app/javascript/packs/cndo2021.js b/app/javascript/packs/cndo2021.js index 9417bcb05..d95e6c0e2 100644 --- a/app/javascript/packs/cndo2021.js +++ b/app/javascript/packs/cndo2021.js @@ -18,7 +18,6 @@ Rails.start() import './bootstrap_custom.js' import './scripts.js' import './talks.js' -import './contents.js' import './cropbox.js' import './timetable.js' import "particles.js"; diff --git a/app/javascript/packs/cnds2024.js b/app/javascript/packs/cnds2024.js index 9901680f9..b648a2252 100644 --- a/app/javascript/packs/cnds2024.js +++ b/app/javascript/packs/cnds2024.js @@ -17,7 +17,6 @@ import "./controllers/index.js" import './bootstrap_custom.js' import './scripts.js' import './talks.js' -import './contents.js' import './cropbox.js' import './timetable.js' import "particles.js"; diff --git a/app/javascript/packs/cndt2023.js b/app/javascript/packs/cndt2023.js index 14b6105fc..17c63587e 100644 --- a/app/javascript/packs/cndt2023.js +++ b/app/javascript/packs/cndt2023.js @@ -19,7 +19,6 @@ import './bootstrap_custom.js' import './utils' import './scripts.js' import './talks.js' -import './contents.js' import './cropbox.js' import './timetable.js' import './particles.min.js' diff --git a/app/javascript/packs/contents.js b/app/javascript/packs/contents.js deleted file mode 100644 index 8e9a4b624..000000000 --- a/app/javascript/packs/contents.js +++ /dev/null @@ -1,10 +0,0 @@ -$(function(){ - $(".collapse-button").on("click", function() { - $(this).toggleClass("on-click"); - if ($(this).hasClass('on-click')) { - $(this).html("↑") - } else { - $(this).html("↓ Read More ↓") - } - }); -}); \ No newline at end of file From 70690fa4af6202c751ee6bd52fac75d51dedfc56 Mon Sep 17 00:00:00 2001 From: Ryo Takaishi Date: Sat, 17 Aug 2024 13:08:29 +0900 Subject: [PATCH 14/22] Switch jQuery ready to DOMContentLoaded event Replaced the jQuery document ready function with the standard DOMContentLoaded event listener. This improves compatibility with environments that do not include jQuery. --- app/javascript/packs/talks.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/javascript/packs/talks.js b/app/javascript/packs/talks.js index 9a52cef33..77e335fba 100644 --- a/app/javascript/packs/talks.js +++ b/app/javascript/packs/talks.js @@ -1,4 +1,4 @@ -$(function() { +window.addEventListener('DOMContentLoaded', function() { clearInterval(window.timer); console.log("timer activated"); From eac0639751cc1d9f5c4acc7c6dd4beef6c5beed7 Mon Sep 17 00:00:00 2001 From: Ryo Takaishi Date: Sat, 17 Aug 2024 15:11:36 +0900 Subject: [PATCH 15/22] Refactor clipboard copying to use a Stimulus controller instead of plain JavaScript. The 'copy.js' file was removed and the CopyController was added in 'controllers/index.js'. The copy-to-clipboard functionality was updated to use this controller which improves structure and maintainability. Changes involved updating references in several JavaScript packs and modifying the 'dest_url_box' in 'streamings/_default.html.erb'. --- app/javascript/packs/application.js | 1 - app/javascript/packs/cndf2023.js | 1 - app/javascript/packs/cndo2021.js | 3 +-- app/javascript/packs/cnds2024.js | 3 +-- app/javascript/packs/cndt2023.js | 4 --- .../packs/controllers/copy_controller.js | 26 +++++++++++++++++++ app/javascript/packs/controllers/index.js | 4 +++ app/javascript/packs/copy.js | 23 ---------------- app/views/admin/streamings/_default.html.erb | 6 ++--- 9 files changed, 35 insertions(+), 36 deletions(-) create mode 100644 app/javascript/packs/controllers/copy_controller.js delete mode 100644 app/javascript/packs/copy.js diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js index 76516a5c5..1cfee0201 100644 --- a/app/javascript/packs/application.js +++ b/app/javascript/packs/application.js @@ -19,6 +19,5 @@ import './timetable.js' import './talks.js' import './speaker_form.js' import './cropbox.js' -import './copy.js' //require.context('images/cndo201', true, /\.(png|jpg|jpeg|svg)$/) diff --git a/app/javascript/packs/cndf2023.js b/app/javascript/packs/cndf2023.js index d5af6457b..62479eeef 100644 --- a/app/javascript/packs/cndf2023.js +++ b/app/javascript/packs/cndf2023.js @@ -23,7 +23,6 @@ import './speaker_form.js' import './cropbox.js' import './timetable.js' -import './copy.js' require.context('images', true, /\.(png|jpg|jpeg|svg)$/) diff --git a/app/javascript/packs/cndo2021.js b/app/javascript/packs/cndo2021.js index d95e6c0e2..96445ddd7 100644 --- a/app/javascript/packs/cndo2021.js +++ b/app/javascript/packs/cndo2021.js @@ -21,5 +21,4 @@ import './talks.js' import './cropbox.js' import './timetable.js' import "particles.js"; -import './copy.js' -import './speaker_form.js' \ No newline at end of file +import './speaker_form.js' diff --git a/app/javascript/packs/cnds2024.js b/app/javascript/packs/cnds2024.js index b648a2252..a16735b29 100644 --- a/app/javascript/packs/cnds2024.js +++ b/app/javascript/packs/cnds2024.js @@ -15,12 +15,11 @@ import "./controllers/index.js" // const imagePath = (name) => images(name, true) // import '../stylesheets/cnds2024' import './bootstrap_custom.js' -import './scripts.js' +// import './scripts.js' import './talks.js' import './cropbox.js' import './timetable.js' import "particles.js"; -import './copy.js' import './speaker_form.js' document.addEventListener('DOMContentLoaded', function () { diff --git a/app/javascript/packs/cndt2023.js b/app/javascript/packs/cndt2023.js index 17c63587e..6c51d6dc5 100644 --- a/app/javascript/packs/cndt2023.js +++ b/app/javascript/packs/cndt2023.js @@ -16,15 +16,11 @@ Rails.start() // const imagePath = (name) => images(name, true) import '../stylesheets/cndt2023' import './bootstrap_custom.js' -import './utils' import './scripts.js' import './talks.js' import './cropbox.js' import './timetable.js' -import './particles.min.js' -import './copy.js' -require.context('images', true, /\.(png|jpg|jpeg|svg)$/) // import 'regenerator-runtime/runtime' // import "@hotwired/turbo-rails" diff --git a/app/javascript/packs/controllers/copy_controller.js b/app/javascript/packs/controllers/copy_controller.js new file mode 100644 index 000000000..abf4a7122 --- /dev/null +++ b/app/javascript/packs/controllers/copy_controller.js @@ -0,0 +1,26 @@ +import { Controller } from "@hotwired/stimulus" + +export default class extends Controller { + static targets = ["button", "url"] + + copy(event) { + console.log("AAAAAAAAAAAAAAAAAAAAAA") + event.preventDefault(); + const url = this.urlTarget.textContent; + const parent = event.target.parentElement; + const icon = event.target; + + navigator.clipboard.writeText(url) + .then(() => { + console.log("Copied to clipboard successfully!"); + parent.textContent = "Copied"; + setTimeout(() => { + parent.textContent = ""; + parent.appendChild(icon); + }, 5000); + }) + .catch((error) => { + console.error("Failed to copy", error); + }); + } +} diff --git a/app/javascript/packs/controllers/index.js b/app/javascript/packs/controllers/index.js index e99c02cdb..dfd3bf845 100644 --- a/app/javascript/packs/controllers/index.js +++ b/app/javascript/packs/controllers/index.js @@ -15,3 +15,7 @@ application.register("share-registration", ShareRegistrationController) import RemoveLinkFieldController from "./remove_link_field_controller.js" application.register("remove-link-field", RemoveLinkFieldController) + +import CopyController from "./copy_controller.js" +application.register("copy", CopyController) + diff --git a/app/javascript/packs/copy.js b/app/javascript/packs/copy.js deleted file mode 100644 index 5269199c9..000000000 --- a/app/javascript/packs/copy.js +++ /dev/null @@ -1,23 +0,0 @@ -window.onload = () => { - Array.from(document.getElementsByClassName('copy_button')).forEach((elm) => { - elm.addEventListener('click', (e) => { - const url = e.target.parentElement.parentElement.querySelector('.dest_url').textContent - const parent = e.target.parentElement - const icon = e.target - - navigator.clipboard.writeText(url) - .then(() => { - console.log("Copied to clipboard successfully!") - e.target.parentElement.textContent = "Copied" - setTimeout(() => { - parent.textContent = "" - parent.appendChild(icon) - }, 5000) - }) - .catch((error) => { - console.error("Failed to copy", error); - }); - - }); - }) -} diff --git a/app/views/admin/streamings/_default.html.erb b/app/views/admin/streamings/_default.html.erb index 345e93ab2..536ea6062 100644 --- a/app/views/admin/streamings/_default.html.erb +++ b/app/views/admin/streamings/_default.html.erb @@ -94,9 +94,9 @@ <% @tracks.each do |track| %> <%= track.name %> (<%= track.id %>) - -
<%= track.streaming&.destination_url %>
-
<%= image_tag "icons/copy.svg" %>
+ +
<%= track.streaming&.destination_url %>
+
<%= image_tag "icons/copy.svg" %>
<%= track.streaming&.playback_url %> From b8ac96868fee47853ec00826eac6e79bab2c61b6 Mon Sep 17 00:00:00 2001 From: Ryo Takaishi Date: Sat, 17 Aug 2024 15:15:18 +0900 Subject: [PATCH 16/22] remove unused import --- app/javascript/packs/cicd2021.js | 2 -- app/javascript/packs/cndf2023.js | 2 -- 2 files changed, 4 deletions(-) diff --git a/app/javascript/packs/cicd2021.js b/app/javascript/packs/cicd2021.js index 2aa3da73b..0851cebca 100644 --- a/app/javascript/packs/cicd2021.js +++ b/app/javascript/packs/cicd2021.js @@ -16,9 +16,7 @@ Rails.start() // const imagePath = (name) => images(name, true) import '../stylesheets/cicd2021' import './bootstrap_custom.js' -import './utils' import './scripts.js' import './talks.js' import './speaker_form.js' -require.context('images', true, /\.(png|jpg|jpeg|svg)$/) diff --git a/app/javascript/packs/cndf2023.js b/app/javascript/packs/cndf2023.js index 62479eeef..49e438eef 100644 --- a/app/javascript/packs/cndf2023.js +++ b/app/javascript/packs/cndf2023.js @@ -16,7 +16,6 @@ Rails.start() // const imagePath = (name) => images(name, true) import '../stylesheets/cndf2023' import './bootstrap_custom.js' -import './utils' import './scripts.js' import './talks.js' import './speaker_form.js' @@ -24,7 +23,6 @@ import './cropbox.js' import './timetable.js' -require.context('images', true, /\.(png|jpg|jpeg|svg)$/) // import 'regenerator-runtime/runtime' // import "@hotwired/turbo-rails" From 39c5b1953f75fc81aa6f075f8f5e600a59c79d8b Mon Sep 17 00:00:00 2001 From: Ryo Takaishi Date: Sat, 17 Aug 2024 16:00:09 +0900 Subject: [PATCH 17/22] remove smooth scroll --- app/javascript/packs/cicd2021.js | 1 - app/javascript/packs/cndf2023.js | 1 - app/javascript/packs/cndo2021.js | 1 - app/javascript/packs/cnds2024.js | 1 - app/javascript/packs/cndt2023.js | 1 - app/javascript/packs/scripts.js | 47 -------------------------------- 6 files changed, 52 deletions(-) delete mode 100644 app/javascript/packs/scripts.js diff --git a/app/javascript/packs/cicd2021.js b/app/javascript/packs/cicd2021.js index 0851cebca..a82111d82 100644 --- a/app/javascript/packs/cicd2021.js +++ b/app/javascript/packs/cicd2021.js @@ -16,7 +16,6 @@ Rails.start() // const imagePath = (name) => images(name, true) import '../stylesheets/cicd2021' import './bootstrap_custom.js' -import './scripts.js' import './talks.js' import './speaker_form.js' diff --git a/app/javascript/packs/cndf2023.js b/app/javascript/packs/cndf2023.js index 49e438eef..12f4a18d0 100644 --- a/app/javascript/packs/cndf2023.js +++ b/app/javascript/packs/cndf2023.js @@ -16,7 +16,6 @@ Rails.start() // const imagePath = (name) => images(name, true) import '../stylesheets/cndf2023' import './bootstrap_custom.js' -import './scripts.js' import './talks.js' import './speaker_form.js' import './cropbox.js' diff --git a/app/javascript/packs/cndo2021.js b/app/javascript/packs/cndo2021.js index 96445ddd7..8cba89eef 100644 --- a/app/javascript/packs/cndo2021.js +++ b/app/javascript/packs/cndo2021.js @@ -16,7 +16,6 @@ Rails.start() // const imagePath = (name) => images(name, true) // import '../stylesheets/cndo2021' import './bootstrap_custom.js' -import './scripts.js' import './talks.js' import './cropbox.js' import './timetable.js' diff --git a/app/javascript/packs/cnds2024.js b/app/javascript/packs/cnds2024.js index a16735b29..e0f1296f0 100644 --- a/app/javascript/packs/cnds2024.js +++ b/app/javascript/packs/cnds2024.js @@ -15,7 +15,6 @@ import "./controllers/index.js" // const imagePath = (name) => images(name, true) // import '../stylesheets/cnds2024' import './bootstrap_custom.js' -// import './scripts.js' import './talks.js' import './cropbox.js' import './timetable.js' diff --git a/app/javascript/packs/cndt2023.js b/app/javascript/packs/cndt2023.js index 6c51d6dc5..5a162e292 100644 --- a/app/javascript/packs/cndt2023.js +++ b/app/javascript/packs/cndt2023.js @@ -16,7 +16,6 @@ Rails.start() // const imagePath = (name) => images(name, true) import '../stylesheets/cndt2023' import './bootstrap_custom.js' -import './scripts.js' import './talks.js' import './cropbox.js' import './timetable.js' diff --git a/app/javascript/packs/scripts.js b/app/javascript/packs/scripts.js deleted file mode 100644 index e8cbcd8ed..000000000 --- a/app/javascript/packs/scripts.js +++ /dev/null @@ -1,47 +0,0 @@ -/*! - * Start Bootstrap - Creative v6.0.2 (https://startbootstrap.com/themes/creative) - * Copyright 2013-2020 Start Bootstrap - * Licensed under MIT (https://github.com/BlackrockDigital/startbootstrap-creative/blob/master/LICENSE) - */ -(function($) { - "use strict"; // Start of use strict - - // Smooth scrolling using jQuery easing - $('a.js-scroll-trigger[href*="#"]:not([href="#"])').click(function() { - if (location.pathname.replace(/^\//, '') == this.pathname.replace(/^\//, '') && location.hostname == this.hostname) { - var target = $(this.hash); - target = target.length ? target : $('[name=' + this.hash.slice(1) + ']'); - if (target.length) { - $('html, body').animate({ - scrollTop: (target.offset().top - 72) - }, 1000, "easeInOutExpo"); - return false; - } - } - }); - - // Closes responsive menu when a scroll trigger link is clicked - $('.js-scroll-trigger').click(function() { - $('.navbar-collapse').collapse('hide'); - }); - - // // Activate scrollspy to add active class to navbar items on scroll - // $('body').scrollspy({ - // target: '#mainNav', - // offset: 75 - // }); - - // // Collapse Navbar - // var navbarCollapse = function() { - // if ($("#mainNav").offset().top > 100) { - // $("#mainNav").addClass("navbar-scrolled"); - // } else { - // $("#mainNav").removeClass("navbar-scrolled"); - // } - // }; - // // Collapse now if page is not at top - // navbarCollapse(); - // // Collapse the navbar when page is scrolled - // $(window).scroll(navbarCollapse); - -})(jQuery); // End of use strict \ No newline at end of file From 7960c5d856d87853391d3601e33960469f8fa3bf Mon Sep 17 00:00:00 2001 From: Ryo Takaishi Date: Sat, 17 Aug 2024 16:08:45 +0900 Subject: [PATCH 18/22] bump --- yarn.lock | 198 +++++++++++++++++++++++++++++------------------------- 1 file changed, 106 insertions(+), 92 deletions(-) diff --git a/yarn.lock b/yarn.lock index 07d4aea25..fefc840b9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -108,42 +108,32 @@ resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f" integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A== -"@rails/actioncable@7.0.6": - version "7.0.6" - resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-7.0.6.tgz#60765c8e9c357a0ba0840fb1e409caedc233ea0d" - integrity sha512-ybBsUrIsu5geM8BtqnpM7ZA9D8uzSz+e1B4JR57NaCmasHKWap6AX5DT7NHIbp21opVet1qqoVSdsoLDqXeB2A== - -"@rails/actioncable@^7.0": +"@rails/actioncable@7.2.0", "@rails/actioncable@^7.0": version "7.2.0" resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-7.2.0.tgz#dee66d21bc125a9819dc8080ce896eac78d8c63f" integrity sha512-crcsPF3skrqJkFZLxesZoyUEt8ol25XtTuOAUMdLa5qQKWTZpL8eLVW71bDCwKDQLbV2z5sBZ/XGEC0i+ZZa+A== -"@rails/activestorage@7.0.6": - version "7.0.6" - resolved "https://registry.yarnpkg.com/@rails/activestorage/-/activestorage-7.0.6.tgz#8b762e7142eb8332541dffa0f841d7a5026f64fd" - integrity sha512-sLr5Uj8cnWkX9lLV7wk8mIVFt6XFOJR7mAXm0QmDnrR/YGMF4Ho5tcVRUHzlyAisRQcHp6D0zHSVgOUukF8OHg== +"@rails/activestorage@7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@rails/activestorage/-/activestorage-7.2.0.tgz#bc03b52a687ba2bb9d2e6381f25795cda037494e" + integrity sha512-jXK9tKDZn/j+ZeJuFdrtyrLNLWjzYRyp+mejWTfSp+egAp1okXsdfFNe8jqqgwcP8gytqJSPwo0sZwQVdQpuIA== dependencies: spark-md5 "^3.0.1" -"@rails/ujs@7.0.6": - version "7.0.6" - resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-7.0.6.tgz#fd8937c92335f3da9495e07292511ad5f7547a6a" - integrity sha512-s5v3AC6AywOIFMz0RIMW83Xc8FPIvKMkP3ZHFlM4ISNkhdUwP9HdhVtxxo6z3dIhe9vI0Our2A8kN/QpUV02Qg== +"@rails/ujs@7.1.2": + version "7.1.2" + resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-7.1.2.tgz#ea903bcc0224e17156015d995b6f1b83e27d64b2" + integrity sha512-c5x02djEKEVVE4qfN4XgElJS4biM0xxtIVpcJ0ZHLK116U19rowTtmD0AJ/RCb3Xaewa4GPIWLlwgeC0dCQqzw== "@sindresorhus/merge-streams@^2.1.0": version "2.3.0" resolved "https://registry.yarnpkg.com/@sindresorhus/merge-streams/-/merge-streams-2.3.0.tgz#719df7fb41766bc143369eaa0dd56d8dc87c9958" integrity sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg== -"@transloadit/prettier-bytes@0.0.7": - version "0.0.7" - resolved "https://registry.yarnpkg.com/@transloadit/prettier-bytes/-/prettier-bytes-0.0.7.tgz#cdb5399f445fdd606ed833872fa0cabdbc51686b" - integrity sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA== - -"@transloadit/prettier-bytes@0.0.9": - version "0.0.9" - resolved "https://registry.yarnpkg.com/@transloadit/prettier-bytes/-/prettier-bytes-0.0.9.tgz#8d3146f75fd9d3c544cb63ec7dbdeb6670d3e2d7" - integrity sha512-pCvdmea/F3Tn4hAtHqNXmjcixSaroJJ+L3STXlYJdir1g1m2mRQpWbN8a4SvgQtaw2930Ckhdx8qXdXBFMKbAA== +"@transloadit/prettier-bytes@^0.3.4": + version "0.3.4" + resolved "https://registry.yarnpkg.com/@transloadit/prettier-bytes/-/prettier-bytes-0.3.4.tgz#51f837a49cab10a42ef64d6f227d1a859ba435aa" + integrity sha512-8/SnIF9Q2k52mbjRVAYLranwkaDTLb+O9r4Z/uo8uNw//SjygKvvbF4BHSOuReufaAyum1q13602VcNud25Dfg== "@types/eslint-scope@^3.7.3": version "3.7.7" @@ -176,47 +166,53 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.13.tgz#ee1128e881b874c371374c1f72201893616417c9" integrity sha512-rouEWBImiRaSJsVA+ITTFM6ZxibuAlTuNOCyxVbwreu6k6+ujs7DfnU9o+PShFhET78pMBl3eH+AGSI5eOTkPA== -"@uppy/aws-s3-multipart@3.6.0": - version "3.6.0" - resolved "https://registry.yarnpkg.com/@uppy/aws-s3-multipart/-/aws-s3-multipart-3.6.0.tgz#df0a40e5fdd4ff52f350872832c518f2214f35a3" - integrity sha512-4TYOptKsofNks11ktRbrGaPvEapd3hj+IIatcAxjJ0RX4SwwjMbvSNKzS3PBbwLnpVfAIFHA/n5S9EgKocVmYg== +"@types/retry@0.12.2": + version "0.12.2" + resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.2.tgz#ed279a64fa438bb69f2480eda44937912bb7480a" + integrity sha512-XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow== + +"@uppy/aws-s3-multipart@3.12.0": + version "3.12.0" + resolved "https://registry.yarnpkg.com/@uppy/aws-s3-multipart/-/aws-s3-multipart-3.12.0.tgz#cbd7a545cd321db92565664a10a167fb5c751d3b" + integrity sha512-l6/TlRjde/mP4LMFWdJIRBEUUceYXtAiNAHukfyzM3VbY3/+YrEJTAchsa4DrqAiyToJJu6b+xxvL2H46cDs3Q== dependencies: - "@uppy/companion-client" "^3.4.0" - "@uppy/utils" "^5.5.0" + "@uppy/companion-client" "^3.8.1" + "@uppy/utils" "^5.9.0" -"@uppy/companion-client@^3.4.0": - version "3.4.0" - resolved "https://registry.yarnpkg.com/@uppy/companion-client/-/companion-client-3.4.0.tgz#a69e35673ab10eb74867fad0b5bf0edcc182379b" - integrity sha512-mGm3I/VdlaXvvYnbkidQDk3ttPY7VjvRwoHdXaAOHsIwPZBFUlCRggw84TQN9NejiasqTK/U7xvARDunjVhGBA== +"@uppy/companion-client@^3.8.1": + version "3.8.2" + resolved "https://registry.yarnpkg.com/@uppy/companion-client/-/companion-client-3.8.2.tgz#8dd531ea378826db699be835442c687405e55604" + integrity sha512-WLjZ0Y6Fe7lzwU1YPvvQ/YqooejcgIZkT2TC39xr+QQ7Y1FwJECsyUdlKwgi1ee8TNpjoCrj3Q1Hjel/+p0VhA== dependencies: - "@uppy/utils" "^5.5.0" + "@uppy/utils" "^5.9.0" namespace-emitter "^2.0.1" + p-retry "^6.1.0" -"@uppy/core@3.5.0": - version "3.5.0" - resolved "https://registry.yarnpkg.com/@uppy/core/-/core-3.5.0.tgz#534d364d5f4fb90e57e9968c58b3925bd405957b" - integrity sha512-Ujm3VrFkqCNnsqvjZL1RQhIdccbjUxfLJW6EhirYcOLr1kCUjhgKSE/iOJnC2eadohHwOWFTx+X8e9bhH6HT7g== +"@uppy/core@3.13.1": + version "3.13.1" + resolved "https://registry.yarnpkg.com/@uppy/core/-/core-3.13.1.tgz#01b42684b5c08186033bb8c86bbfb5a1d8b5ae94" + integrity sha512-iQGAUO4ziQRpfv7kix6tO6JOWqjI0K4vt8AynvHWzDPZxYSba3zd6RojGNPsYWSR7Xv+dRXYx+GU8oTiK1FRUA== dependencies: - "@transloadit/prettier-bytes" "0.0.9" - "@uppy/store-default" "^3.0.3" - "@uppy/utils" "^5.5.0" + "@transloadit/prettier-bytes" "^0.3.4" + "@uppy/store-default" "^3.2.2" + "@uppy/utils" "^5.9.0" lodash "^4.17.21" mime-match "^1.0.2" namespace-emitter "^2.0.1" nanoid "^4.0.0" preact "^10.5.13" -"@uppy/dashboard@3.5.2": - version "3.5.2" - resolved "https://registry.yarnpkg.com/@uppy/dashboard/-/dashboard-3.5.2.tgz#fc57cdb83bcd4163c26fd30aa600c573a31fac39" - integrity sha512-6CWhqqm93Uo2QpwYrDRCVrpxStCCK359Wr8CvaOi14BJrcE8JyPczXbrzHMzbjKt2Rz8G3TzQUa1r9nZkylrGQ== - dependencies: - "@transloadit/prettier-bytes" "0.0.7" - "@uppy/informer" "^3.0.3" - "@uppy/provider-views" "^3.5.0" - "@uppy/status-bar" "^3.2.4" - "@uppy/thumbnail-generator" "^3.0.4" - "@uppy/utils" "^5.5.0" +"@uppy/dashboard@3.9.1": + version "3.9.1" + resolved "https://registry.yarnpkg.com/@uppy/dashboard/-/dashboard-3.9.1.tgz#257c8b920ccd7883129c22cc956c176f939a2a79" + integrity sha512-zZp+5Dwqu1jUdAZEu0Os2kC/8bF3cdrkve8CYEwqP/12yjNe8PF+XUQKF1RCYITjDE4hPSXcTh0MWw6t2LONuw== + dependencies: + "@transloadit/prettier-bytes" "^0.3.4" + "@uppy/informer" "^3.1.0" + "@uppy/provider-views" "^3.13.0" + "@uppy/status-bar" "^3.3.3" + "@uppy/thumbnail-generator" "^3.1.0" + "@uppy/utils" "^5.9.0" classnames "^2.2.6" is-shallow-equal "^1.0.1" lodash "^4.17.21" @@ -224,64 +220,63 @@ nanoid "^4.0.0" preact "^10.5.13" -"@uppy/informer@^3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@uppy/informer/-/informer-3.0.3.tgz#cdb6177ad1cef6545876e122a9435d5e5c37f40a" - integrity sha512-jMMlZ0bCJ2ruJJ0LMl7pJrM/b0e9vjVEHvYYdQghnRSRDSMONcTJXEqNZ0Lu4x7OZR1SGvqqchFk7n3vAsuERw== +"@uppy/informer@^3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@uppy/informer/-/informer-3.1.0.tgz#40a8489f508911c778a7305fd5c551947fd4c96b" + integrity sha512-vmpTLqzSLmZSuIVDZV0o19yXVqyTh5/uCbKUEiyfBhR726kQiuYQLP/ZHaKcvW3c1ESQGbNg53iNHbFBqF681w== dependencies: - "@uppy/utils" "^5.4.3" + "@uppy/utils" "^5.7.4" preact "^10.5.13" -"@uppy/provider-views@^3.5.0": - version "3.5.0" - resolved "https://registry.yarnpkg.com/@uppy/provider-views/-/provider-views-3.5.0.tgz#0041677d856ba82a11f09f1c9fdf379f1f0ca815" - integrity sha512-xSp5xQ6NsPLS2XJdsdBQCLgQELEd0BvVM2R34/XFyGTSqeA4NJKHfM6kSKwjW/jkj26CyFN5nth6CGeNaaKQ+w== +"@uppy/provider-views@^3.13.0": + version "3.13.0" + resolved "https://registry.yarnpkg.com/@uppy/provider-views/-/provider-views-3.13.0.tgz#9fa98b35e0827ef24c264de1729241f85e29bfa2" + integrity sha512-Z2oI88A+GC2zIPk8beoeFN/miHKkhtF58mYjvb5miGCMMZM7p7LRj98sgb5OOdKsGrfeiuTavtgL424BvcVd8w== dependencies: - "@uppy/utils" "^5.4.3" + "@uppy/utils" "^5.9.0" classnames "^2.2.6" nanoid "^4.0.0" p-queue "^7.3.4" preact "^10.5.13" -"@uppy/status-bar@^3.2.4": - version "3.2.4" - resolved "https://registry.yarnpkg.com/@uppy/status-bar/-/status-bar-3.2.4.tgz#58adbfa5662c967dcbb53a5dbe990c26d572acc3" - integrity sha512-WuK0LRmz7H7iBDV0VO+iUNoXmhbyeCEAWzslX0nqhkGuMchIQprVwd80ZegACySajqcpV1RDNxdhmgtCbRn8wA== +"@uppy/status-bar@^3.3.3": + version "3.3.3" + resolved "https://registry.yarnpkg.com/@uppy/status-bar/-/status-bar-3.3.3.tgz#3ad4bd5477904fd137ee46c69c3e5fd3b22e5d08" + integrity sha512-TCcnBjTDbq/AmnGOcWbCpQNsv05Z6Y36zdmTCt/xNe2/gTVAYAzGRoGOrkeb6jf/E4AAi25VyOolSqL2ibB8Kw== dependencies: - "@transloadit/prettier-bytes" "0.0.9" - "@uppy/utils" "^5.4.3" + "@transloadit/prettier-bytes" "^0.3.4" + "@uppy/utils" "^5.9.0" classnames "^2.2.6" preact "^10.5.13" -"@uppy/store-default@^3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@uppy/store-default/-/store-default-3.0.3.tgz#37d0e95c8fd360b3283bca7fdf94cce7400008e7" - integrity sha512-/zlvQNj4HjkthI+7dNdj/8mOlTg1Zb1gJ/ZsOxof0g3xXD+OAwm7asRnOwpfj2dos+lExdW/zMn8XsRGsuvb6Q== +"@uppy/store-default@^3.2.2": + version "3.2.2" + resolved "https://registry.yarnpkg.com/@uppy/store-default/-/store-default-3.2.2.tgz#19ef59ea9a427372b21395fd4c842e193b9a9dde" + integrity sha512-OiSgT++Jj4nLK0N9WTeod3UNjCH81OXE5BcMJCd9oWzl2d0xPNq2T/E9Y6O72XVd+6Y7+tf5vZlPElutfMB3KQ== -"@uppy/thumbnail-generator@^3.0.4": - version "3.0.4" - resolved "https://registry.yarnpkg.com/@uppy/thumbnail-generator/-/thumbnail-generator-3.0.4.tgz#18a0eccef50c0d0bc5061fb18cdfbae97c0af8c5" - integrity sha512-f7E+4F6UWunX3jnV3wfL+k5zQaukKmD1z2qYbmRg5OuE9CxDJrNdAVk14KDAi79seejPJa6VVfCgGjTlIGLaRA== +"@uppy/thumbnail-generator@^3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@uppy/thumbnail-generator/-/thumbnail-generator-3.1.0.tgz#8352542a12c0a4ed209c16c55850b3744af7d59c" + integrity sha512-tDKK/cukC0CrM0F/OlHFmvpGGUq+Db4YfakhIGPKtT7ZO8aWOiIu5JIvaYUnKRxGq3RGsk4zhkxYXuoxVzzsGA== dependencies: - "@uppy/utils" "^5.4.3" + "@uppy/utils" "^5.7.5" exifr "^7.0.0" -"@uppy/utils@^5.4.3", "@uppy/utils@^5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@uppy/utils/-/utils-5.5.0.tgz#2d90a3d48249d3ffb42e62baf325871f1310bff3" - integrity sha512-hNeYEbihSq/dKK7CZ3euvv3pN2NAO0z1x2FFoZsTajSxY4f7PPOZJoltvOQEKx1vFljhLvOY33s3KNlvXjogqg== +"@uppy/utils@^5.7.4", "@uppy/utils@^5.7.5", "@uppy/utils@^5.9.0": + version "5.9.0" + resolved "https://registry.yarnpkg.com/@uppy/utils/-/utils-5.9.0.tgz#c88827f9678a53cd13c7cd2f51e7682efd060e7d" + integrity sha512-9Ubddd3orCOLYjf0KobwgJ+aTrABSxk9t4X/QdM4qJHVZuMIftkaMplrViRUO+kvIBCXEZDIP2AmS060siDNGw== dependencies: lodash "^4.17.21" preact "^10.5.13" -"@uppy/xhr-upload@3.4.0": - version "3.4.0" - resolved "https://registry.yarnpkg.com/@uppy/xhr-upload/-/xhr-upload-3.4.0.tgz#9461dd2fdc988a6a5dd878100460b8c79407c466" - integrity sha512-JfJWYkV4NCkeDgS80XpSZwV6D7ssVgTeVckE/h96Sg+ehc7kXCb1aqurzOLZJJmuRiZZzcLpZEMRXYSu1tIPRQ== +"@uppy/xhr-upload@3.6.8": + version "3.6.8" + resolved "https://registry.yarnpkg.com/@uppy/xhr-upload/-/xhr-upload-3.6.8.tgz#8282dee5c71f337e92052f1c74b5da17dbd79493" + integrity sha512-zr3OHrIdo08jmCqTYKS0C7o3E0XQpjtZI40wmB6VvXYzu4x/aZankG9QqKxLiY0n8KbZ9aCIvO8loxBGoL7Kaw== dependencies: - "@uppy/companion-client" "^3.4.0" - "@uppy/utils" "^5.5.0" - nanoid "^4.0.0" + "@uppy/companion-client" "^3.8.1" + "@uppy/utils" "^5.9.0" "@videojs/http-streaming@3.0.2": version "3.0.2" @@ -742,10 +737,10 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== -cropperjs@1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/cropperjs/-/cropperjs-1.6.0.tgz#de9f23b7e397a53fd0dc10cc0d6fe31fe1e2019a" - integrity sha512-BzLU/ecrfsbflwxgu+o7sQTrTlo52pVRZkTVrugEK5uyj6n8qKwAHP4s6+DWHqlXLqQ5B9+cM2MKeXiNfAsF6Q== +cropperjs@1.6.2: + version "1.6.2" + resolved "https://registry.yarnpkg.com/cropperjs/-/cropperjs-1.6.2.tgz#d1a5d627d880581cca41b7901f06923500e4201b" + integrity sha512-nhymn9GdnV3CqiEHJVai54TULFAE3VshJTXSqSJKa8yXAKyBKDWdhHarnlIPrshJ0WMFTGuFvG02YjLXfPiuOA== cross-spawn@^7.0.3: version "7.0.3" @@ -1120,6 +1115,11 @@ is-glob@^4.0.1, is-glob@~4.0.1: dependencies: is-extglob "^2.1.1" +is-network-error@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-network-error/-/is-network-error-1.1.0.tgz#d26a760e3770226d11c169052f266a4803d9c997" + integrity sha512-tUdRRAnhT+OtCZR/LxZelH/C7QtjtFrTu5tXCA8pl55eTUElUHT+GPYV8MBMBvea/j+NxQqVt3LbWMRir7Gx9g== + is-number@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" @@ -1432,6 +1432,15 @@ p-queue@^7.3.4: eventemitter3 "^5.0.1" p-timeout "^5.0.2" +p-retry@^6.1.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-6.2.0.tgz#8d6df01af298750009691ce2f9b3ad2d5968f3bd" + integrity sha512-JA6nkq6hKyWLLasXQXUrO4z8BUZGUt/LjlJxx8Gb2+2ntodU/SS63YZ8b0LUTbQ8ZB9iwOfhEPhg4ykKnn2KsA== + dependencies: + "@types/retry" "0.12.2" + is-network-error "^1.0.0" + retry "^0.13.1" + p-timeout@^5.0.2: version "5.1.0" resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-5.1.0.tgz#b3c691cf4415138ce2d9cfe071dba11f0fee085b" @@ -1679,6 +1688,11 @@ resolve@^1.20.0: path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" +retry@^0.13.1: + version "0.13.1" + resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658" + integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg== + reusify@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" From dfe9463595d58f34f426f336d0590b69cafe9bd5 Mon Sep 17 00:00:00 2001 From: Ryo Takaishi Date: Sun, 18 Aug 2024 09:47:33 +0900 Subject: [PATCH 19/22] fix: test --- app/controllers/admin/talks_controller.rb | 3 --- app/javascript/packs/application.js | 1 - spec/requests/admin/check_in_events_spec.rb | 23 +++++++++++++---- spec/requests/admin/talks_spec.rb | 28 +++++++++------------ spec/requests/admin_spec.rb | 9 ++++++- 5 files changed, 38 insertions(+), 26 deletions(-) diff --git a/app/controllers/admin/talks_controller.rb b/app/controllers/admin/talks_controller.rb index 0fd92eaae..823fb7a1d 100644 --- a/app/controllers/admin/talks_controller.rb +++ b/app/controllers/admin/talks_controller.rb @@ -29,13 +29,11 @@ def start_on_air if on_air_talks_of_other_days.size.positive? format.turbo_stream { flash[:alert] = "Talk id=#{on_air_talks_of_other_days.map(&:id).join(',')} are already on_air." - # render(partial: 'admin/tracks/partial/on_air_button', locals: { talk: @talk }) } else @talk.start_streaming format.turbo_stream { flash[:notice] = "OnAirに切り替えました: #{@talk.start_to_end} #{@talk.speaker_names.join(',')} #{@talk.title}" - # render(partial: 'admin/tracks/partial/on_air_button', locals: { talk: @talk }) } end end @@ -48,7 +46,6 @@ def stop_on_air respond_to do |format| format.turbo_stream { flash.now[:notice] = "Waitingに切り替えました: #{@talk.start_to_end} #{@talk.speaker_names.join(',')} #{@talk.title}" - # render(partial: 'admin/tracks/partial/on_air_button', locals: { talk: @talk }) } end end diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js index 1cfee0201..b60bcb118 100644 --- a/app/javascript/packs/application.js +++ b/app/javascript/packs/application.js @@ -5,7 +5,6 @@ import "@hotwired/turbo-rails" Turbo.session.drive = false -// import "./controllers/index.js" // Uncomment to copy all static images under ../images to the output folder and reference // them with the image_pack_tag helper in views (e.g <%= image_pack_tag 'rails.png' %>) diff --git a/spec/requests/admin/check_in_events_spec.rb b/spec/requests/admin/check_in_events_spec.rb index 0bd93dd6d..df37099f8 100644 --- a/spec/requests/admin/check_in_events_spec.rb +++ b/spec/requests/admin/check_in_events_spec.rb @@ -8,7 +8,13 @@ let!(:alice) { create(:alice, :on_cndt2020) } describe 'POST /:event/admin/check_in_events' do - subject { post(admin_check_in_events_path(event: 'cndt2020'), params: { check_in_event: params }, headers: { 'HTTP_REFERER' => admin_speaker_check_in_statuses_path(event: 'cndt2020') }) } + subject do + post(admin_check_in_events_path(event: 'cndt2020'), + params: { + check_in_event: params + }, + as: :turbo_stream) + end context 'create' do let(:roles) { ['CNDT2020-Admin'] } @@ -20,15 +26,22 @@ } } before do - allow_any_instance_of(ActionDispatch::Request::Session).to(receive(:[]).and_return(session[:userinfo])) + ActionDispatch::Request::Session.define_method(:original, ActionDispatch::Request::Session.instance_method(:[])) + allow_any_instance_of(ActionDispatch::Request::Session).to(receive(:[]) do |*arg| + if arg[1] == :userinfo + session[:userinfo] + else + arg[0].send(:original, arg[1]) + end + end) end it 'return ok' do subject - expect(response).to_not(be_successful) - expect(response).to(have_http_status('302')) - expect(response).to(redirect_to(admin_speaker_check_in_statuses_path(event: 'cndt2020'))) + expect(flash.now[:notice]).to(eq('alice Alice をチェックインしました')) + expect(response).to(be_successful) + expect(response).to(have_http_status('200')) end end end diff --git a/spec/requests/admin/talks_spec.rb b/spec/requests/admin/talks_spec.rb index c5ecf0cf6..c8a5b9b95 100644 --- a/spec/requests/admin/talks_spec.rb +++ b/spec/requests/admin/talks_spec.rb @@ -87,11 +87,10 @@ let!(:video2) { create(:video, talk: talk2, on_air: false) } it 'success to change to start on air' do - post admin_start_on_air_path(event: 'cndt2020'), params: { talk: { id: talk2.id } } - expect(response).to_not(be_successful) - expect(response).to(have_http_status('302')) + post admin_start_on_air_path(event: 'cndt2020'), params: { talk: { id: talk2.id } }.to_json, headers: { "Content-Type": 'application/json' }, as: :turbo_stream + expect(response).to(be_successful) + expect(response).to(have_http_status('200')) expect(Video.find(talk2.video.id).on_air).to(be_truthy) - expect(response).to(redirect_to('http://www.example.com/cndt2020/admin/tracks')) end end @@ -100,11 +99,10 @@ let!(:video2) { create(:video, talk: talk2, on_air: false) } it 'can not to change to start on air' do - post admin_start_on_air_path(event: 'cndt2020'), params: { talk: { id: talk2.id } }.to_json, headers: { "Content-Type": 'application/json' } - expect(response).to_not(be_successful) - expect(response).to(have_http_status('302')) + post admin_start_on_air_path(event: 'cndt2020'), params: { talk: { id: talk2.id } }.to_json, headers: { "Content-Type": 'application/json' }, as: :turbo_stream + expect(response).to(be_successful) + expect(response).to(have_http_status('200')) expect(Video.find(talk2.video.id).on_air).to(be_falsey) - expect(response).to(redirect_to('http://www.example.com/cndt2020/admin/tracks')) expect(flash[:alert]).to(include("Talk id=#{talk1.id} are already on_air.")) end end @@ -119,10 +117,9 @@ let!(:video2) { create(:video, talk: intermission2, on_air: false) } it 'can not to change to start on air' do - post admin_start_on_air_path(event: 'cndt2020'), params: { talk: { id: intermission2.id } }.to_json, headers: { "Content-Type": 'application/json' } - expect(response).to_not(be_successful) - expect(response).to(have_http_status('302')) - expect(response).to(redirect_to('http://www.example.com/cndt2020/admin/tracks')) + post admin_start_on_air_path(event: 'cndt2020'), params: { talk: { id: intermission2.id } }.to_json, headers: { "Content-Type": 'application/json' }, as: :turbo_stream + expect(response).to(be_successful) + expect(response).to(have_http_status('200')) expect(Video.find(intermission2.video.id).on_air).to(be_truthy) end end @@ -132,10 +129,9 @@ let!(:video2) { create(:video, talk: intermission2, on_air: false) } it 'can not to change to start on air' do - post admin_start_on_air_path(event: 'cndt2020'), params: { talk: { id: intermission2.id } }.to_json, headers: { "Content-Type": 'application/json' } - expect(response).to_not(be_successful) - expect(response).to(have_http_status('302')) - expect(response).to(redirect_to('http://www.example.com/cndt2020/admin/tracks')) + post admin_start_on_air_path(event: 'cndt2020'), params: { talk: { id: intermission2.id } }.to_json, headers: { "Content-Type": 'application/json' }, as: :turbo_stream + expect(response).to(be_successful) + expect(response).to(have_http_status('200')) expect(Video.find(intermission2.video.id).on_air).to(be_falsey) expect(flash[:alert]).to(include("Talk id=#{intermission1.id} are already on_air.")) end diff --git a/spec/requests/admin_spec.rb b/spec/requests/admin_spec.rb index 35bc820d1..0c854105f 100644 --- a/spec/requests/admin_spec.rb +++ b/spec/requests/admin_spec.rb @@ -75,7 +75,14 @@ context 'user logged in' do before do - allow_any_instance_of(ActionDispatch::Request::Session).to(receive(:[]).and_return(session[:userinfo])) + ActionDispatch::Request::Session.define_method(:original, ActionDispatch::Request::Session.instance_method(:[])) + allow_any_instance_of(ActionDispatch::Request::Session).to(receive(:[]) do |*arg| + if arg[1] == :userinfo + session[:userinfo] + else + arg[0].send(:original, arg[1]) + end + end) end context 'user is not registered' do From 9bb835e78396a989018e9bc6e32e3bfe1232ef2b Mon Sep 17 00:00:00 2001 From: Ryo Takaishi Date: Sun, 18 Aug 2024 10:31:15 +0900 Subject: [PATCH 20/22] fix: specify turbo-method --- app/views/admin/talks/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admin/talks/index.html.erb b/app/views/admin/talks/index.html.erb index 7f743febc..f6307b080 100644 --- a/app/views/admin/talks/index.html.erb +++ b/app/views/admin/talks/index.html.erb @@ -30,7 +30,7 @@ - <%= form_with(url: admin_talks_path, id: "talk_list", method: "put") do |f| %> + <%= form_with(url: admin_talks_path, id: "talk_list", method: "put", data: { turbo_method: :post } ) do |f| %> <% @talks.each do |talk| %> <%= talk.id %> From ab118d60fab551702024c05ddd475109a1f2c054 Mon Sep 17 00:00:00 2001 From: Ryo Takaishi Date: Sun, 18 Aug 2024 10:46:46 +0900 Subject: [PATCH 21/22] =?UTF-8?q?chore:=20=E3=82=BB=E3=83=83=E3=82=B7?= =?UTF-8?q?=E3=83=A7=E3=83=B3=E4=B8=80=E8=A6=A7=E7=94=BB=E9=9D=A2=E3=81=AB?= =?UTF-8?q?=E3=82=AA=E3=83=B3=E3=82=A8=E3=82=A2=E3=83=9C=E3=82=BF=E3=83=B3?= =?UTF-8?q?=E3=81=AF=E4=B8=8D=E8=A6=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/admin/talks/index.html.erb | 8 -------- 1 file changed, 8 deletions(-) diff --git a/app/views/admin/talks/index.html.erb b/app/views/admin/talks/index.html.erb index f6307b080..cbf47b1a1 100644 --- a/app/views/admin/talks/index.html.erb +++ b/app/views/admin/talks/index.html.erb @@ -26,7 +26,6 @@ 公開可否 Video File Video URL - On Air @@ -64,13 +63,6 @@ <% video_id = talk.video ? talk.video.video_id : nil %> <%= text_field_tag "video[#{talk.id}][video_id]", video_id,placeholder: "video url", size: "9" %> - - <% if talk.video %> - - <% end %> - <% end %> <% end %> From 891e13f7552ebd2a761f36cb64ff0b4a46dac19a Mon Sep 17 00:00:00 2001 From: Ryo Takaishi Date: Sun, 25 Aug 2024 20:42:14 +0900 Subject: [PATCH 22/22] Update app/javascript/packs/controllers/copy_controller.js Co-authored-by: Kazuto Kusama --- app/javascript/packs/controllers/copy_controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/javascript/packs/controllers/copy_controller.js b/app/javascript/packs/controllers/copy_controller.js index abf4a7122..36cf04b88 100644 --- a/app/javascript/packs/controllers/copy_controller.js +++ b/app/javascript/packs/controllers/copy_controller.js @@ -4,7 +4,7 @@ export default class extends Controller { static targets = ["button", "url"] copy(event) { - console.log("AAAAAAAAAAAAAAAAAAAAAA") + event.preventDefault(); const url = this.urlTarget.textContent; const parent = event.target.parentElement;