add comment

.env.sample

@@ -16,10 +16,9 @@ REDIS_URL=
 # Required for Zoom.us integration
 ZOOM_API_KEY=
 ZOOM_API_SECRET=
-ZOOM_ACCOUNT_NUMBER=
 ZOOM_PRO_USERS_LIMIT= # defaults to 3
 ZOOM_USER_TYPE= # 'pro' / 'basic'
-ZOOM_ENABLE_RECORDINGS= # true / false (default: false)
+ZOOM_ENABLE_RECORDINGS=0 # 0 / 1
 # Token for webhooks authorization
 ZOOM_VERIFICATION_TOKEN=
 
@@ -28,11 +27,3 @@ MUX_TOKEN_ID=
 MUX_TOKEN_SECRET=
 MUX_BROADCAST_SERVER_URL=rtmp://global-live.mux.com:5222/app
 MUX_TEST_MODE_DISABLED=
-
-
-# Required for Microsoft Azure AD Auth
-AZURE_CLIENT_ID     = Client App ID
-AZURE_CLIENT_SECRET = Client App Secret
-AZURE_TENANT_ID     = Client App Tenant ID
-AZURE_REDIRECT_URI  = where microsoft will redirect after login, eg. http://localhost:3000/auth/azure_ad/callback
-AZURE_SCOPES        = Scopes required for Application, eg. 'openid email profile User.Read offline_access OnlineMeetings.ReadWrite'

Gemfile

@@ -30,9 +30,9 @@ gem "active_storage_base64", "~> 1.0.0"
 gem "image_processing", "~> 1.2"
 
 # Use Amazon Web Services S3 for file uploads in production
-gem "aws-sdk-s3", "~> 1.48", require: false, group: [:production, :review]
+gem "aws-sdk-s3", "~> 1.31.0", require: false, group: [:production, :review]
 # Allow AWS API requests to be signed using IAM credentials
-gem "aws-sigv4", "~> 1.1"
+gem "aws-sigv4", "~> 1.0.2"
 
 # Reduces boot times through caching; required in config/boot.rb
 gem "bootsnap", ">= 1.1.0", require: false
@@ -139,15 +139,6 @@ gem 'rack-cors'
 # Ruby wrappers for the HubSpot REST API
 gem "hubspot-ruby"
 
-# OAuth
-gem 'omniauth-oauth2', '~> 1.6'
-# OmniAuth CSRF protection
-gem 'omniauth-rails_csrf_protection', '~> 0.1.2'
-
-# authenticate via Microsoft 
-# gem 'omniauth-microsoft_graph', git: 'https://github.com/m4c3/omniauth-microsoft_graph'
-# gem 'omniauth-microsoft_graph'
-
 group :development, :test, :review do
   # Call "byebug" anywhere in the code to stop execution and get a debugger console
   gem "byebug", "~> 11.0.1", platforms: [:mri, :mingw, :x64_mingw]

Gemfile.lock

@@ -117,22 +117,21 @@ GEM
     ast (2.4.0)
     autoprefixer-rails (9.7.3)
       execjs
-    aws-eventstream (1.1.0)
-    aws-partitions (1.337.0)
-    aws-sdk-core (3.102.1)
-      aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.239.0)
-      aws-sigv4 (~> 1.1)
+    aws-eventstream (1.0.3)
+    aws-partitions (1.210.0)
+    aws-sdk-core (3.46.2)
+      aws-eventstream (~> 1.0)
+      aws-partitions (~> 1.0)
+      aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.35.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.72.0)
-      aws-sdk-core (~> 3, >= 3.102.1)
+    aws-sdk-kms (1.13.0)
+      aws-sdk-core (~> 3, >= 3.39.0)
+      aws-sigv4 (~> 1.0)
+    aws-sdk-s3 (1.31.0)
+      aws-sdk-core (~> 3, >= 3.39.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.1)
-      aws-eventstream (~> 1, >= 1.0.2)
+      aws-sigv4 (~> 1.0)
+    aws-sigv4 (1.0.3)
     axlsx (3.0.0.pre)
       htmlentities (~> 4.3, >= 4.3.4)
       mimemagic (~> 0.3)
@@ -220,7 +219,6 @@ GEM
       activesupport (>= 4.2.0)
     hashdiff (1.0.1)
     hashery (2.1.2)
-    hashie (4.1.0)
     hexapdf (0.9.3)
       cmdparse (~> 3.0, >= 3.0.3)
       geom2d (~> 0.2)
@@ -298,7 +296,6 @@ GEM
       money (~> 6.13.2)
       railties (>= 3.0)
     msgpack (1.3.1)
-    multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     nio4r (2.5.2)
@@ -310,21 +307,6 @@ GEM
       warden
     oath-generators (1.0.1)
       oath (>= 0.0.12)
-    oauth2 (1.4.4)
-      faraday (>= 0.8, < 2.0)
-      jwt (>= 1.0, < 3.0)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
-    omniauth (1.9.1)
-      hashie (>= 3.4.6)
-      rack (>= 1.6.2, < 3)
-    omniauth-oauth2 (1.6.0)
-      oauth2 (~> 1.1)
-      omniauth (~> 1.9)
-    omniauth-rails_csrf_protection (0.1.2)
-      actionpack (>= 4.2)
-      omniauth (>= 1.3.1)
     parallel (1.19.1)
     parity (3.2.0)
     parser (2.6.5.0)
@@ -532,8 +514,8 @@ DEPENDENCIES
   activeresource (= 5.1.0)
   acts-as-taggable-on!
   analytics-ruby
-  aws-sdk-s3 (~> 1.48)
-  aws-sigv4 (~> 1.1)
+  aws-sdk-s3 (~> 1.31.0)
+  aws-sigv4 (~> 1.0.2)
   axlsx (~> 3.0.0.pre)
   axlsx_rails (~> 0.5.2)
   axlsx_styler (~> 0.2.0)
@@ -569,8 +551,6 @@ DEPENDENCIES
   mux_ruby!
   oath (~> 1.1.0)
   oath-generators (~> 1.0.1)
-  omniauth-oauth2 (~> 1.6)
-  omniauth-rails_csrf_protection (~> 0.1.2)
   parity (~> 3.2.0)
   pdf-reader (~> 2.1.0)
   pdfkit (~> 0.8.2)

app/assets/javascripts/channels/broadcasts.coffee

@@ -21,13 +21,11 @@ $(document).on "turbolinks:load", ->
 
     refreshBroadcastVideo: (data) ->
       $("#broadcast_updates").html data.status_content
-      stream_selected = $("#broadcast_video").data('videoType') == 'stream';
-      if data.streamer_status == 'recording' && data.status == 'active' && stream_selected
+      if data.streamer_status == 'recording' && data.status == 'active'
         $("#broadcast_video").html data.video_content
         new (Clappr.Player)(
-          <%= "baseUrl: 'http://cdn.clappr.io/latest'," if Rails.env.test? %>
           parentId: '#broadcast_video'
-          source: data.full_live_stream_playback_url
+          source: data.playback_url
           width: '100%',
           height: '100%',
           mute: true,

app/assets/javascripts/group_qr_code.js

@@ -1,50 +0,0 @@
-$(document).on("click", "[data-behavior=select_contract_template]", function() {
-  var _this = this;
-  var checkbox = $(this).children("input:checkbox");
-
-  selectContractTemplate(_this, checkbox);
-});
-
-$(document).on("click", "[data-behavior=select_contract_template] input[type='checkbox']", function(e) {
-  e.stopPropagation();
-
-  var _this = this;
-  var checkbox = $(this);
-
-  selectContractTemplate(_this, checkbox);
-});
-
-function selectContractTemplate(clicked_element, checkbox) {
-  if (clicked_element.hasChildNodes()) {
-    if(checkbox.prop("checked")) {
-      checkbox.prop('checked', false);
-    } else {
-      checkbox.prop('checked', true);
-    }
-  }
-
-  var checked = checkbox.prop("checked");
-  var project_id = JSON.parse($('#group_qr_code').attr('data-project-id'));
-  var contract_template_ids = JSON.parse($('#group_qr_code').attr('data-contract-template-ids'));
-  var selected_contract_template_id = checkbox.val();
-
-  if (checked && !contract_template_ids.includes(selected_contract_template_id)) {
-    contract_template_ids.push(selected_contract_template_id);
-  } else if(!checked && contract_template_ids.includes(selected_contract_template_id)) {
-    contract_template_ids.splice( $.inArray(selected_contract_template_id, contract_template_ids), 1 );
-  }
-  
-  $('#group_qr_code').attr('data-contract-template-ids', JSON.stringify(contract_template_ids));
-
-  if (contract_template_ids.length >= 2) {
-    multi_sign_ids = $.param({multi_sign_ids: contract_template_ids});
-    contract_template_url = "/en/contract_templates/" + contract_template_ids[0] + "/qr_codes?" + multi_sign_ids
-
-    $("#group_qr_code").attr("href", contract_template_url);
-    $("#group_qr_code").attr("target", "_blank");
-    $("#group_qr_code").removeClass('disabled');
-  } else if (contract_template_ids.length < 2) {
-    $("#group_qr_code").attr("href", "javascript:void(0);");
-    $("#group_qr_code").addClass('disabled');
-  }
-}

app/assets/javascripts/play_previous_recordings.js

@@ -0,0 +1,24 @@
+$(document).on("click", "[data-behavior=play_recording]", function() {
+  if ($(this).hasClass('active')){
+    return false;
+  }
+
+  var playback_url = $(this).attr("data-playback-url")
+  $("#broadcast_video").empty();
+
+  new Clappr.Player({
+    parentId: '#broadcast_video',
+    source: playback_url,
+    width: '100%',
+    height: '100%',
+    autoPlay: true
+  });
+
+  $(".dropdown-menu").children().removeClass('active');
+  $(".dropdown-menu").children().children('i').remove();
+  $(this).siblings().removeClass('active');
+  $(this).siblings().children("i").remove();
+  $(this).addClass('active');
+  $(this).prepend('<i class="fa fa-check">&nbsp;</i>');
+});
+

app/assets/javascripts/stream_player.js.erb

@@ -1,28 +0,0 @@
-$(document).on("click", "[data-behavior=play_recording]", function() {
-    if ($(this).hasClass('active')){
-        return false;
-    }
-
-    $("#broadcast_video").data('videoType', 'recording');
-
-    var playback_url = $(this).attr("data-playback-url")
-    $("#broadcast_video").empty();
-
-    new Clappr.Player({
-        <%= "baseUrl: 'http://cdn.clappr.io/latest'," if Rails.env.test? %>
-        parentId: '#broadcast_video',
-        source: playback_url,
-        width: '100%',
-        height: '100%',
-        autoPlay: true
-    });
-
-    $(".dropdown-menu").children().removeClass('active');
-    $(".dropdown-menu").children().children('i').remove();
-    $(this).siblings().removeClass('active');
-    $(this).siblings().children("i").remove();
-    $(this).addClass('active');
-    $(this).prepend('<i class="fa fa-check">&nbsp;</i>');
-});
-
-$(document).on("click", "[data-behavior=play_stream]", function() { $("#broadcast_video").data('videoType', 'stream'); });

app/assets/javascripts/update_required_status.js

@@ -1,13 +0,0 @@
-$(document).on("turbolinks:load", function() {
-    $("[data-behavior=update-required-status]").click(function(e) {
-        const required = !!($(this)[0] && $(this)[0].checked);
-
-
-        $("[data-required-tag=guardian]").each(function(index, element) {
-            const labelForField = element.previousSibling;
-
-            element.required = required;
-            labelForField.classList.add("required");
-        });
-    });
-});

app/assets/stylesheets/_bootstrap_overrides.scss

@@ -14,7 +14,6 @@ $red: #F9002B;
 $green: #51B61B;
 $teal: #32C498;
 $purple: #5139EE;
-$yellow: #F9BE1B;
 $dark: $gray-900;
 $success: $teal;
 $link-color: $body-color;

app/assets/stylesheets/application.scss

@@ -37,14 +37,14 @@ label {
   &.release-me {
     span:last-child {
       background-color: $teal;
-      color: $white;
+      color: $body-color;
     }
   }
 
   &.direct-me {
     span:last-child {
       background-color: $green;
-      color: $white;
+      color: $body-color;
     }
   }
 
@@ -58,14 +58,7 @@ label {
   &.deliver-me {
     span:last-child {
       background-color: $purple;
-      color: $white;
-    }
-  }
-
-  &.task-me {
-    span:last-child {
-      background-color: $yellow;
-      color: $white;
+      color: white;
     }
   }
 

app/channels/broadcasts_channel.rb

@@ -16,7 +16,6 @@ class BroadcastsChannel < ApplicationCable::Channel
       event: :broadcast_stream_update,
       status: broadcast.status,
       playback_url: broadcast.stream_playback_url,
-      full_live_stream_playback_url: broadcast.full_live_stream_playback_url,
       video_content: video_content,
       status_content: status_content,
       streamer_status: broadcast.streamer_status

app/controllers/accounts_controller.rb

@@ -17,7 +17,7 @@ class AccountsController < ApplicationController
 
         if sign_in(user)
           TrackAnalyticsJob.perform_later(user, user.primary_account, :track_guest_sign_up, user_agent: request.user_agent, user_ip: request.remote_ip)
-          SubmitHubspotFormJob.perform_later(user.first_name, user.last_name, user.email, account.name, i_m_interested_in: user.interested_product_name)
+          SubmitHubspotFormJob.perform_later(user.email, account.name, i_m_interested_in: user.interested_product_name)
           redirect_to signed_in_root_path
         else
           redirect_to new_session_path, alert: t(".notice")

app/controllers/acquired_media_releases_controller.rb

@@ -56,74 +56,35 @@ class AcquiredMediaReleasesController < ApplicationController
     end
   end
 
-  def person_params
-    %i[
-      person_first_name
-      person_last_name
-      person_phone
-      person_company
-      person_email
-      person_title
-      person_address_street1
-      person_address_street2
-      person_address_city
-      person_address_state
-      person_address_zip
-      person_address_country
-    ]
-  end
-
-  def guardian_params
-    %i[
-      guardian_first_name
-      guardian_last_name
-      guardian_phone
-      guardian_email
-      guardian_photo
-      guardian_address_street1
-      guardian_address_street2
-      guardian_address_city
-      guardian_address_state
-      guardian_address_zip
-      guardian_address_country
-    ]
-  end
-
-  def second_guardian_params
-    %i[
-      guardian_2_first_name
-      guardian_2_last_name
-      guardian_2_phone
-      guardian_2_email
-      guardian_2_photo
-      guardian_2_address_street1
-      guardian_2_address_street2
-      guardian_2_address_city
-      guardian_2_address_state
-      guardian_2_address_zip
-      guardian_2_address_country
-    ]
-  end
-
   def acquired_media_release_params
-    params.require(:acquired_media_release).permit(person_params,
-                                                   guardian_params,
-                                                   second_guardian_params,
-                                                   :minor,
-                                                   :name,
-                                                   :territory,
-                                                   :term,
-                                                   :contract,
-                                                   :applicable_medium_id, :applicable_medium_text,
-                                                   :territory_id, :territory_text,
-                                                   :term_id, :term_text,
-                                                   :restriction_id, :restriction_text,
-                                                   categories: [],
-                                                   file_infos_attributes: %i[
-                                                     filename
-                                                     content_type
-                                                     byte_size
-                                                   ])
+    params.require(:acquired_media_release).permit(
+      :name,
+      :territory,
+      :term,
+      :person_first_name,
+      :person_last_name,
+      :person_phone,
+      :person_email,
+      :person_company,
+      :person_title,
+      :person_address_street1,
+      :person_address_street2,
+      :person_address_city,
+      :person_address_state,
+      :person_address_zip,
+      :person_address_country,
+      :contract,
+      :applicable_medium_id, :applicable_medium_text,
+      :territory_id, :territory_text,
+      :term_id, :term_text,
+      :restriction_id, :restriction_text,
+      categories: [],
+      file_infos_attributes: [
+        :filename,
+        :content_type,
+        :byte_size
+      ]
+    )
   end
 
   def build_acquired_media_release(attrs = {})

app/controllers/admin/task_requests_controller.rb

@@ -1,36 +0,0 @@
-class Admin::TaskRequestsController < Admin::ApplicationController
-  before_action :set_task_request, only: [:edit, :update, :show]
-
-  def index
-    @task_requests = task_requests.order_by_recent.paginate(page: params[:page])
-  end
-
-  def edit
-  end
-
-  def show
-    @files = @task_request.files.paginate(page: params[:page])
-  end
-
-  def update
-    if @task_request.update(task_request_params)
-      redirect_to [:admin, :task_requests], notice: t(".notice")
-    else
-      render :edit
-    end
-  end
-
-  private
-
-  def task_request_params
-    params.require(:task_request).permit(:status, :deliverable_url)
-  end
-
-  def task_requests
-    policy_scope TaskRequest
-  end
-
-  def set_task_request
-    @task_request = authorize policy_scope(TaskRequest).find(params[:id])
-  end
-end

app/controllers/api/api_controller.rb

@@ -17,9 +17,7 @@ class Api::ApiController < ActionController::Base
   def return_error(exception)
     raise exception if Rails.env.test? 
 
-    Raven.capture_exception(exception)
-
-    logger.error "==Handled======"
+    logger.error "==Handled======="
     logger.error exception.message
     logger.error exception.backtrace.join("\n")
     logger.error "==Handled=======" 

app/controllers/api/appearance_releases_controller.rb

@@ -19,11 +19,5 @@ class Api::AppearanceReleasesController < Api::ReleasesController
       guardian_photo[:io] = StringIO.new(Base64.decode64(guardian_photo[:io]))
       release.guardian_photo.attach(io: guardian_photo[:io], filename: guardian_photo[:filename])
     end
-
-    guardian_2_photo = release_create_params[:guardian_2_photo]
-    if guardian_2_photo
-      guardian_2_photo[:io] = StringIO.new(Base64.decode64(guardian_2_photo[:io]))
-      release.guardian_2_photo.attach(io: guardian_2_photo[:io], filename: guardian_2_photo[:filename])
-    end
   end
 end

app/controllers/api/medical_releases_controller.rb

@@ -1,11 +0,0 @@
-class Api::MedicalReleasesController < Api::ReleasesController
-  deserializable_resource :medical_release, only: [:create, :update]
-
-  def model_name
-    "medical_release"
-  end
-
-  def attributes_for_index
-    [:name]
-  end
-end

app/controllers/api/misc_releases_controller.rb

@@ -1,11 +0,0 @@
-class Api::MiscReleasesController < Api::ReleasesController
-  deserializable_resource :misc_release, only: [:create, :update]
-
-  def model_name
-    "misc_release"
-  end
-
-  def attributes_for_index
-    [:name]
-  end
-end

app/controllers/api/releases_controller.rb

@@ -103,16 +103,10 @@ class Api::ReleasesController < Api::ApiController
       if ["appearance_release", "talent_release"].include?(name)
         has_many :guardian_photos do
           data do
-            [
-              @object.guardian_photo.try(:attachment),
-              @object.guardian_2_photo.try(:attachment)
-            ].compact
+            [@object.guardian_photo.try(:attachment)].compact
           end
           meta do
-            { count:
-              (@object.try(:guardian_photo).try(:attached?) ? 1 : 0) +
-              (@object.try(:guardian_2_photo).try(:attached?) ? 1 : 0)
-            }
+            { count: @object.try(:guardian_photo).try(:attached?) ? 1 : 0  }
           end
         end
       end
@@ -176,7 +170,7 @@ class Api::ReleasesController < Api::ApiController
 
   def release_create_params
     parameters = params.require(model_name).permit!
-    keys = model_constant.new.attributes.keys + [:guardian_photo, :guardian_2_photo, :person_photo, :photos, :signature, :signature_base64, :file_infos_attributes]
+    keys = model_constant.new.attributes.keys + [:guardian_photo, :person_photo, :photos, :signature, :signature_base64, :file_infos_attributes]
     parameters[:signature_base64] = parameters[:signature]
     parameters = parameters.slice(*keys).except(:created_at, :updated_at, :id, :user_id, :signature)
     parameters

app/controllers/api/sync_controller.rb

@@ -10,10 +10,8 @@ class Api::SyncController < Api::ApiController
     @appearance_releases = (AppearanceRelease.where(project: accessible_projects))
     @location_releases = (LocationRelease.where(project: accessible_projects))
     @material_releases = (MaterialRelease.where(project: accessible_projects))
-    @medical_releases = MedicalRelease.where(project: accessible_projects)
-    @misc_releases = MiscRelease.where(project: accessible_projects)
     @talent_releases = (TalentRelease.where(project: accessible_projects))
-    @notes = notes_query(Note.where(notable: @appearance_releases + @location_releases + @material_releases + @medical_releases + @misc_releases + @talent_releases + @acquired_media_releases ))
+    @notes = notes_query(Note.where(notable: @appearance_releases + @location_releases + @material_releases + @talent_releases + @acquired_media_releases ))
 
     render json: {
       data: {
@@ -24,8 +22,6 @@ class Api::SyncController < Api::ApiController
         appearance_releases: releases_query(@appearance_releases),
         location_releases: releases_query(@location_releases),
         material_releases: releases_query(@material_releases),
-        medical_releases: releases_query(@medical_releases),
-        misc_releases: releases_query(@misc_releases),
         talent_releases: releases_query(@talent_releases),
         notes: @notes
       }

app/controllers/api/talent_releases_controller.rb

@@ -17,11 +17,5 @@ class Api::TalentReleasesController < Api::ReleasesController
       guardian_photo[:io] = StringIO.new(Base64.decode64(guardian_photo[:io]))
       release.guardian_photo.attach(io: guardian_photo[:io], filename: guardian_photo[:filename])
     end
-
-    guardian_2_photo = release_create_params[:guardian_2_photo]
-    if guardian_2_photo
-      guardian_2_photo[:io] = StringIO.new(Base64.decode64(guardian_2_photo[:io]))
-      release.guardian_2_photo.attach(io: guardian_2_photo[:io], filename: guardian_2_photo[:filename])
-    end
   end
 end

app/controllers/api/user_token_controller.rb

@@ -5,8 +5,6 @@ class Api::UserTokenController < Knock::AuthTokenController
 
   # Catch exception and return JSON-formatted error
   def return_error(exception)
-    Raven.capture_exception(exception)
-
     logger.error "==Handled======="
     logger.error exception.message
     logger.error exception.backtrace.join("\n")

app/controllers/approvals_controller.rb

@@ -1,28 +0,0 @@
-class ApprovalsController < ApplicationController
-  before_action :set_releasable
-  before_action :set_project
-
-  layout "project"
-
-  def create
-    @releasable.approve_by(current_user)
-
-    if @releasable.save
-      redirect_to [@project, "#{@releasable_param.name.pluralize}"], notice: t('.release_approved', release_type: @releasable.model_name.human)
-    end
-  end
-
-  private
-
-  def releasable_param
-    @releasable_param ||= ReleasableParam.new(params.to_unsafe_h)
-  end
-
-  def set_releasable
-    @releasable = authorize policy_scope(releasable_param.type).find(releasable_param.id)
-  end
-
-  def set_project
-    @project = @releasable.project
-  end
-end

app/controllers/broadcasts_controller.rb

@@ -3,9 +3,8 @@ class BroadcastsController < ApplicationController
 
   before_action :set_project
   before_action :build_broadcast, only: [:new, :create]
-  before_action :set_broadcast, only: [:show, :destroy, :update, :destroy_file]
+  before_action :set_broadcast, only: [:show, :destroy, :update]
   before_action :set_multi_view_broadcasts, only: [:show]
-  before_action :show_splash_screen, only: :index
 
   def index
     @broadcasts = filtered_broadcasts.order_by_recent.paginate(page: params[:page])
@@ -26,20 +25,18 @@ class BroadcastsController < ApplicationController
   end
 
   def show
-    @conference_url = url_for [@broadcast.project, @broadcast, :conference_meeting]
+    @conference_url = url_for [@broadcast.project, @broadcast, :zoom_meeting]
     @recordings = @broadcast.broadcast_recordings.order_by_recent.paginate(page: params[:page])
     @files = @broadcast.files.order("created_at DESC").paginate(page: params[:files_page])
     render layout: 'application'
   end
 
   def update
-    unless params.has_key?(:broadcast)
-      @broadcast.regenerate_token
-      redirect_to([@project, @broadcast], notice: t('.reset_notice')) and return
-    end
-
     @broadcast.update(broadcast_params)
-    update_files_section
+    @files = @broadcast.files.order("created_at DESC").paginate(page: 1)
+
+    pagination_content = ApplicationController.render html: helpers.will_paginate(@files, params: { active_tab: params[:active_tab], page: params[:page], active_files_tab: params[:active_files_tab] })
+    BroadcastsChannel.broadcast_file_upload_updates(@broadcast, @files, pagination_content)
   end
 
   def destroy
@@ -50,29 +47,10 @@ class BroadcastsController < ApplicationController
     end
   end
 
-  def destroy_file
-    authorize Broadcast
-    file = ActiveStorage::Attachment.find(params[:file_id])
-    file.destroy
-
-    update_files_section
-  end
-
   private
 
-  def update_files_section
-    @files = @broadcast.files.order("created_at DESC").paginate(page: 1)
-
-    pagination_content = ApplicationController.render html: helpers.will_paginate(@files, params: { active_tab: params[:active_tab], page: params[:page], active_files_tab: params[:active_files_tab] })
-    BroadcastsChannel.broadcast_file_upload_updates(@broadcast, @files, pagination_content)
-  end
-
-  def show_splash_screen
-    render :splash if broadcasts.count.zero?
-  end
-
   def broadcast_params
-    params.require(:broadcast).permit(:name, :shoot_location_time_zone, :conference_option, files: [])
+    params.require(:broadcast).permit(:name, files: [])
   end
 
   def set_project

app/controllers/callbacks_controller.rb

@@ -1,22 +0,0 @@
-class CallbacksController < ApplicationController
-  skip_before_action :require_login
-  skip_after_action :verify_authorized, except: :index
-  skip_after_action :verify_policy_scoped, only: :index
-  skip_before_action :verify_authenticity_token
-
-  def create
-    uid = request.env['omniauth.auth'][:uid]
-    token_data = request.env['omniauth.auth'][:credentials]
-
-    current_user&.tap do |user|
-      user.microsoft_user_id = uid
-      user.microsoft_access_token = token_data.token
-      user.microsoft_refresh_token = token_data.refresh_token
-      user.microsoft_token_expires_at = token_data.expires_at # Expiration time is returned in seconds
-      user.save
-    end
-
-    redirect_to profile_path
-  end
-
-end

app/controllers/conference_meetings_controller.rb

@@ -1,45 +0,0 @@
-class ConferenceMeetingsController < ApplicationController
-  require 'microsoft_graph'
-
-  def show
-    authorize broadcast = Broadcast.find(params[:broadcast_id])
-    case broadcast.conference_option
-    when 'zoom'
-      redirect_to broadcast.zoom_meeting_url
-    when 'ms_teams'
-      if broadcast.conference_join_url.nil?
-        begin
-          graph_api = MicrosoftGraph.new(
-            current_user,
-            ENV['AZURE_CLIENT_ID'],
-            ENV['AZURE_CLIENT_SECRET'],
-            ENV['AZURE_TENANT_ID'],
-            ENV['AZURE_SCOPES']
-          )
-
-          subject = "#{broadcast.name} Online Meeting"
-          teams_meeting = graph_api.create_teams_meeting(subject)
-          join_url = teams_meeting['joinUrl']
-
-          if join_url.present?
-            broadcast.conference_join_url = join_url
-            broadcast.save
-          else
-            raise StandardError, 'Failed to read teams meeting join URL'
-          end
-        rescue ActionController::InvalidAuthenticityToken => e
-          Rails.logger.error(e.message)
-          redirect_to project_broadcast_url(broadcast.project, broadcast), alert: t('.alerts.not_authenticated')
-          return
-        rescue StandardError => e
-          Rails.logger.error(e.message)
-          redirect_to project_broadcast_url(broadcast.project, broadcast), alert: t('.alerts.failed_to_join')
-          return
-        end
-      end
-      redirect_to broadcast.conference_join_url
-    else
-      redirect_to project_broadcast_url(broadcast.project, broadcast), alert: t('.alerts.unknown_conference_option')
-    end
-  end
-end

app/controllers/contract_templates/duplicates_controller.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-class ContractTemplates::DuplicatesController < ApplicationController
-  before_action :set_contract_template
-
-  def create
-    authorize(ContractTemplate)
-    new_contract_template = @contract_template.dup
-    new_contract_template.name = I18n.t('contract_templates.duplicate.name_prefix', template_name: @contract_template.name)
-
-    # Duplicate rich text fields
-
-    new_contract_template.body = @contract_template.body
-    new_contract_template.guardian_clause = @contract_template.guardian_clause
-    new_contract_template.signature_legal_text = @contract_template.signature_legal_text
-
-    if new_contract_template.save
-      redirect_to [:edit, new_contract_template]
-    else
-      redirect_to [@contract_template.project, :contract_templates], alert: t('.error')
-    end
-  end
-
-  private
-
-  def contract_templates
-    policy_scope(ContractTemplate)
-  end
-
-  def set_contract_template
-    @contract_template = contract_templates.find(params[:contract_template_id])
-  end
-end

app/controllers/contract_templates/qr_codes_controller.rb

@@ -16,12 +16,7 @@ class ContractTemplates::QrCodesController < ApplicationController
   end
 
   def qr_code
-    if params[:multi_sign_ids].present?
-      contract_templates_group = authorize contract_templates.where(id: params[:multi_sign_ids]).order_by_recent
-      authorize QrCode.build_from_multiple_contract_templates(contract_templates_group, @contract_template.project)
-    else
-      authorize QrCode.build_from_contract_template(@contract_template)
-    end
+    authorize QrCode.build_from_contract_template(@contract_template)
   end
 
   def download_attributes

app/controllers/contract_templates_controller.rb

@@ -5,10 +5,8 @@ class ContractTemplatesController < ApplicationController
 
   layout 'project'
 
-  before_action :set_project, except: [:destroy, :edit, :update]
-  before_action :set_contract_template, only: [:destroy, :edit, :update]
-  before_action :set_project_from_contract_template, only: [:edit, :update]
-  before_action :show_splash_screen, only: :index
+  before_action :set_project, except: [:destroy]
+  before_action :set_contract_template, only: [:destroy]
 
   def index
     @contract_templates = contract_templates.non_archived.order_by_name.paginate(page: params[:page])
@@ -33,20 +31,6 @@ class ContractTemplatesController < ApplicationController
     end
   end
 
-  def edit
-    @release_type = @contract_template.release_type
-  end
-
-  def update
-    @contract_template.attributes = contract_template_params
-
-    if @contract_template.save
-      redirect_to [@project, :contract_templates], notice: t('.notice')
-    else
-      render :edit
-    end
-  end
-
   def destroy
     @contract_template.archive
     redirect_to [@contract_template.project, :contract_templates], alert: t('.archived_notice')
@@ -54,14 +38,6 @@ class ContractTemplatesController < ApplicationController
 
   private
 
-  def set_project_from_contract_template
-    @project = @contract_template.project
-  end
-
-  def show_splash_screen
-    render :splash if contract_templates.non_archived.count.zero?
-  end
-
   def set_contract_template
     @contract_template = authorize contract_templates.find(params[:id])
   end
@@ -81,19 +57,18 @@ class ContractTemplatesController < ApplicationController
   def contract_template_params
     params
       .require(:contract_template)
-      .permit(:name, :release_type, :body, :guardian_clause,
-              :signature_legal_text, :fee, :amendment_clause,
+      .permit(:name, :release_type, :body, :guardian_clause, :fee,
               :applicable_medium_id, :applicable_medium_text,
               :territory_id, :territory_text,
-              :term_id, :term_text, :accessibility,
+              :term_id, :term_text,
               :restriction_id, :restriction_text,
-              :question_1_text, :question_2_text,
-              :question_3_text, :question_4_text,
-              :question_5_text, :question_6_text,
-              :question_7_text, :question_8_text,
+              :question_1_text, :question_2_text, 
+              :question_3_text, :question_4_text, 
+              :question_5_text, :question_6_text, 
+              :question_7_text, :question_8_text, 
               :question_9_text, :question_10_text,
-              :question_11_text, :question_12_text,
-              :question_13_text, :question_14_text,
+              :question_11_text, :question_12_text, 
+              :question_13_text, :question_14_text, 
               :question_15_text)
   end
 

app/controllers/public/acquired_media_releases_controller.rb

@@ -41,70 +41,31 @@ class Public::AcquiredMediaReleasesController < Public::BaseController
     end
   end
 
-  def person_params
-    %i[
-      person_first_name
-      person_last_name
-      person_phone
-      person_fax
-      person_email
-      person_title
-      person_address_street1
-      person_address_street2
-      person_address_city
-      person_address_state
-      person_address_zip
-      person_address_country
-    ]
-  end
-
-  def guardian_params
-    %i[
-      guardian_first_name
-      guardian_last_name
-      guardian_phone
-      guardian_email
-      guardian_photo
-      guardian_address_street1
-      guardian_address_street2
-      guardian_address_city
-      guardian_address_state
-      guardian_address_zip
-      guardian_address_country
-    ]
-  end
-
-  def second_guardian_params
-    %i[
-      guardian_2_first_name
-      guardian_2_last_name
-      guardian_2_phone
-      guardian_2_email
-      guardian_2_photo
-      guardian_2_address_street1
-      guardian_2_address_street2
-      guardian_2_address_city
-      guardian_2_address_state
-      guardian_2_address_zip
-      guardian_2_address_country
-    ]
-  end
-
   def acquired_media_release_params
-    params.require(:acquired_media_release).permit(person_params,
-                                                   guardian_params,
-                                                   second_guardian_params,
-                                                   :minor,
-                                                   :name,
-                                                   :description,
-                                                   :signature_base64,
-                                                   :locale, :contract_template,
-                                                   categories: [],
-                                                   file_infos_attributes: %i[
-                                                     filename
-                                                     content_type
-                                                     byte_size
-                                                   ])
+    params.require(:acquired_media_release).permit(
+      :name, 
+      :description,
+      :person_first_name,
+      :person_last_name,
+      :person_email,
+      :person_title,
+      :person_phone,
+      :person_fax,
+      :person_address_street1, 
+      :person_address_street2, 
+      :person_address_city, 
+      :person_address_state, 
+      :person_address_zip, 
+      :person_address_country,
+      :signature_base64,
+      :locale, :contract_template,
+      categories: [],
+      file_infos_attributes: [
+        :filename,
+        :content_type,
+        :byte_size
+      ]
+    )
   end
 
   def acquired_media_release_params_with_locale

app/controllers/public/amendments_controller.rb

@@ -1,47 +0,0 @@
-class Public::AmendmentsController < Public::BaseController
-  skip_after_action :verify_authorized, :verify_policy_scoped
-  before_action :set_account, :set_project, :set_contract_template, :set_release
-
-  def new
-    if @release.amendment_signed?
-      render :create, locals: { already_signed: true }
-    end
-  end
-
-  def create
-    if @release.amendment_signed?
-      render :create, locals: { already_signed: true }
-      return
-    end
-
-    @release.attributes = amendment_params
-
-    render :new unless @release.save(context: :amendment)
-  end
-
-  private
-
-  def amendment_params
-    params.require(releasable_param.name).permit(:amendment_signer_name, :amendment_signature_base64)
-  end
-
-  def releasable_param
-    @releasable_param ||= ReleasableParam.new(params.to_unsafe_h)
-  end
-
-  def set_release
-    @release = @contract_template.releases.find(releasable_param.id)
-  end
-
-  def set_contract_template
-    @contract_template = @project.contract_templates.find(params[:contract_template_id])
-  end
-
-  def set_project
-    @project = @account.projects.find(params[:project_id])
-  end
-
-  def set_account
-    @account = Account.find_by(slug: params[:account_id])
-  end
-end

app/controllers/public/contract_templates_controller.rb

@@ -1,18 +0,0 @@
-class Public::ContractTemplatesController < Public::BaseController
-  skip_after_action :verify_authorized, :verify_policy_scoped
-  before_action :set_account, :set_project
-
-  def index
-    @contract_templates = @project.contract_templates.where(id: params[:contract_template_ids]).order_by_name.paginate(page: params[:page])
-  end
-
-  private
-
-  def set_project
-    @project = @account.projects.find(params[:project_id])
-  end
-
-  def set_account
-    @account = Account.find_by(slug: params[:account_id])
-  end
-end

app/controllers/public/misc_releases_controller.rb

@@ -46,7 +46,6 @@ class Public::MiscReleasesController < Public::BaseController
       .permit(
         person_params,
         guardian_params,
-        questionnaire_params,
         :signature_base64,
         :locale,
         :contract_template,
@@ -86,26 +85,6 @@ class Public::MiscReleasesController < Public::BaseController
     ]
   end
 
-  def questionnaire_params
-    [
-      :question_1_answer,
-      :question_2_answer,
-      :question_3_answer,
-      :question_4_answer,
-      :question_5_answer,
-      :question_6_answer,
-      :question_7_answer,
-      :question_8_answer,
-      :question_9_answer,
-      :question_10_answer,
-      :question_11_answer,
-      :question_12_answer,
-      :question_13_answer,
-      :question_14_answer,
-      :question_15_answer,
-    ]
-  end
-
   def misc_release_params_with_locale
     misc_release_params.merge(locale: I18n.locale)
   end

app/controllers/public/talent_releases_controller.rb

@@ -45,59 +45,42 @@ class Public::TalentReleasesController < Public::BaseController
       .permit(
         person_params,
         guardian_params,
-        second_guardian_params,
         :signature_base64,
         :locale,
         :contract_template,
-        photos: []
+        photos: [],
       )
   end
 
   def person_params
-    %i[
-      person_first_name
-      person_last_name
-      person_phone
-      person_email
-      person_address_street1
-      person_address_street2
-      person_address_city
-      person_address_state
-      person_address_zip
-      person_address_country
+    [
+      :person_first_name,
+      :person_last_name,
+      :person_phone,
+      :person_email,
+      :person_address_street1,
+      :person_address_street2,
+      :person_address_city,
+      :person_address_state,
+      :person_address_zip,
+      :person_address_country,
     ]
   end
 
   def guardian_params
-    %i[
-      guardian_first_name
-      guardian_last_name
-      guardian_phone
-      guardian_email
-      minor
-      guardian_address_street1
-      guardian_address_street2
-      guardian_address_city
-      guardian_address_state
-      guardian_address_zip
-      guardian_address_country
-      guardian_photo
-    ]
-  end
-
-  def second_guardian_params
-    %i[
-      guardian_2_first_name
-      guardian_2_last_name
-      guardian_2_phone
-      guardian_2_email
-      guardian_2_address_street1
-      guardian_2_address_street2
-      guardian_2_address_city
-      guardian_2_address_state
-      guardian_2_address_zip
-      guardian_2_address_country
-      guardian_2_photo
+    [
+      :guardian_first_name,
+      :guardian_last_name,
+      :guardian_phone,
+      :guardian_email,
+      :minor,
+      :guardian_address_street1,
+      :guardian_address_street2,
+      :guardian_address_city,
+      :guardian_address_state,
+      :guardian_address_zip,
+      :guardian_address_country,
+      :guardian_photo,
     ]
   end
 

app/controllers/stream_notifications_controller.rb

@@ -14,10 +14,6 @@ class StreamNotificationsController < ApplicationController
     when "video.live_stream.recording"
       @broadcast.streamer_recording!
       notify_users
-    when "video.asset.ready"
-      full_live_stream_playback_uid = notification.dig(:data, :playback_ids, 0, :id)
-      @broadcast.update(full_live_stream_playback_uid: full_live_stream_playback_uid)
-      notify_users
     when "video.live_stream.active"
       @broadcast.active!
       notify_users
@@ -32,9 +28,8 @@ class StreamNotificationsController < ApplicationController
       asset_uid = notification.dig(:object, :id)
       playback_uid = notification.dig(:data, :playback_ids, 0, :id)
       file_name = notification.dig(:data, :static_renditions, :files, -1, :name)
-      duration = notification.dig(:data, :duration)
 
-      recording = @broadcast.broadcast_recordings.create!(asset_uid: asset_uid, asset_playback_uid: playback_uid, file_name: file_name, duration: duration)
+      recording = @broadcast.broadcast_recordings.create!(asset_uid: asset_uid, asset_playback_uid: playback_uid, file_name: file_name)
       recordings = @broadcast.broadcast_recordings.order_by_recent.paginate(page: params[:page])
 
       link = helpers.link_to(recording.broadcast_name.titleize, recording.download_url, target: "_blank")
@@ -63,17 +58,11 @@ class StreamNotificationsController < ApplicationController
   end
 
   def set_broadcast
-    case notification_type
-    when "video.asset.static_renditions.ready", "video.asset.ready"
+    if notification_type == "video.asset.static_renditions.ready"
       live_stream_id = notification.dig(:stream_notification, :data, :live_stream_id)
-      @broadcast = Broadcast.find_by(stream_uid: live_stream_id)
+      @broadcast = Broadcast.find_by!(stream_uid: live_stream_id)
     else
-      @broadcast = Broadcast.find_by(stream_uid: notification_object_id)
-    end
-
-    if @broadcast.nil?
-      logger.info "Ignoring broadcast from other environment. Type = #{notification_type}. Id = #{live_stream_id} / #{notification_object_id}"
-      head :ok
+      @broadcast = Broadcast.find_by!(stream_uid: notification_object_id)
     end
   end
 

app/controllers/talent_releases_controller.rb

@@ -61,67 +61,15 @@ class TalentReleasesController < ApplicationController
     end
   end
 
-  def person_params
-    %i[
-      person_first_name
-      person_last_name
-      person_phone
-      person_email
-      person_address_street1
-      person_address_street2
-      person_address_city
-      person_address_state
-      person_address_zip
-      person_address_country
-    ]
-  end
-
-  def guardian_params
-    %i[
-      guardian_first_name
-      guardian_last_name
-      guardian_phone
-      guardian_email
-      minor
-      guardian_address_street1
-      guardian_address_street2
-      guardian_address_city
-      guardian_address_state
-      guardian_address_zip
-      guardian_address_country
-      guardian_photo
-    ]
-  end
-
-  def second_guardian_params
-    %i[
-      guardian_2_first_name
-      guardian_2_last_name
-      guardian_2_phone
-      guardian_2_email
-      guardian_2_address_street1
-      guardian_2_address_street2
-      guardian_2_address_city
-      guardian_2_address_state
-      guardian_2_address_zip
-      guardian_2_address_country
-      guardian_2_photo
-    ]
-  end
-
   def talent_release_params
-    params.require(:talent_release).permit(person_params,
-                                           guardian_params,
-                                           second_guardian_params,
-                                           :contract, { photos: [] },
-                                           :applicable_medium_id,
-                                           :applicable_medium_text,
-                                           :territory_id,
-                                           :territory_text,
-                                           :term_id,
-                                           :term_text,
-                                           :restriction_id,
-                                           :restriction_text)
+    params.require(:talent_release).permit(
+      :person_first_name, :person_last_name, :person_phone, :guardian_photo, :person_email,
+      :person_address_street1, :person_address_street2, :person_address_city, :person_address_state, :person_address_zip, :person_address_country,
+      :guardian_first_name, :guardian_last_name, :guardian_phone, :guardian_email, :minor,
+      :guardian_address_street1, :guardian_address_street2, :guardian_address_city, :guardian_address_state, :guardian_address_zip, :guardian_address_country,
+      :contract, { photos: [] },
+      :applicable_medium_id, :applicable_medium_text, :territory_id, :territory_text, :term_id, :term_text, :restriction_id, :restriction_text
+    )
   end
 
   def build_talent_release(attrs = {})

app/controllers/task_requests_controller.rb

@@ -1,81 +0,0 @@
-class TaskRequestsController < ApplicationController
-  layout "project"
-
-  before_action :set_project
-  before_action :build_task_request, only: [:new, :create]
-  before_action :set_task_request, only: [:show, :edit, :update, :cancel]
-  before_action :show_splash_screen, only: :index
-
-  def index
-    @task_requests = task_requests.order_by_recent.paginate(page: params[:page])
-  end
-
-  def new
-  end
-
-  def create
-    @task_request.attributes = task_request_params_with_email
-
-    if @task_request.save
-      log_create_analytics
-      taskme_url = url_for([:admin, @task_request])
-      SubmitHubspotTaskRequestFormJob.perform_later(@task_request.user_email, taskme_url)
-    else
-      render :new
-    end
-  end
-
-  def show
-    @files = @task_request.files.paginate(page: params[:page])
-  end
-  
-  def edit
-  end
-
-  def update
-    if @task_request.update(task_request_params)
-      redirect_to [@project, :task_requests], notice: t(".notice")
-    else
-      render :edit
-    end
-  end
-
-  def cancel
-    @task_request.cancelled!
-    redirect_to [@project, :task_requests], notice: t(".notice")
-  end
-
-  private
-
-  def show_splash_screen
-    render :splash if task_requests.count.zero?
-  end
-
-  def task_request_params
-    params.require(:task_request).permit(:description, :deadline, :time_allowed, :additional_notes, files: [])
-  end
-
-  def task_request_params_with_email
-    task_request_params.merge(user_email: Current.user.email)
-  end
-
-  def set_project
-    @project = policy_scope(Project).find(params[:project_id])
-  end
-
-  def set_task_request
-    @task_request = authorize policy_scope(TaskRequest).find(params[:id])
-  end
-
-  def task_requests
-    authorize policy_scope(@project.task_requests)
-  end
-
-  def build_task_request
-    @task_request = authorize @project.task_requests.build
-  end
-
-  def log_create_analytics
-    TrackAnalyticsJob.perform_later(Current.user, Current.account, :track_create_task_request, user_agent: request.user_agent, user_ip: request.remote_ip)
-  end
-end

app/controllers/tasks_controller.rb

@@ -1,19 +0,0 @@
-class TasksController < ApplicationController
-  before_action :set_project
-
-  include ProjectLayout
-
-  def index
-    @tasks = task_requests.completed.order_by_recent.paginate(page: params[:page])
-  end
-
-  private
-  
-  def set_project
-    @project = policy_scope(Project).find(params[:project_id])
-  end
-
-  def task_requests
-    authorize policy_scope(@project.task_requests)
-  end
-end

app/controllers/videos_controller.rb

@@ -3,7 +3,6 @@ class VideosController < ApplicationController
 
   before_action :set_project, only: [:index, :new, :create, :landing]
   before_action :set_video, only: [:edit, :update]
-  before_action :show_splash_screen, only: :index
 
   def landing
     authorize Video, :new?
@@ -61,10 +60,6 @@ class VideosController < ApplicationController
 
   private
 
-  def show_splash_screen
-    render :splash if videos.count.zero?
-  end
-
   def set_project
     @project = policy_scope(Project).find(params[:project_id])
   end

app/helpers/broadcast_conferences_helper.rb

@@ -1,17 +0,0 @@
-module BroadcastConferencesHelper
-  def options_for_conference_select
-    [
-        ['Zoom', 'zoom'],
-        ['MS Teams', 'ms_teams']
-    ]
-  end
-
-  def conference_option_name_from_key(key)
-    option = options_for_conference_select.find { |option| option[1] == key }
-    if option.present?
-      option.first
-    else
-      'Unknown conference option'
-    end
-  end
-end

app/helpers/description_list_helper.rb

@@ -7,8 +7,8 @@ module DescriptionListHelper
     safe_join(tags)
   end
 
-  def description_list_pair_for(record, attribute, append: nil, custom_label: nil)
-    term        = custom_label.nil? ? translation_for(record, attribute) : custom_label
+  def description_list_pair_for(record, attribute, append: nil)
+    term        = translation_for(record, attribute)
     definition  = record.send(attribute)
 
     description_list_pair(term, definition, append: append)

app/helpers/dropzone_helper.rb

@@ -11,8 +11,6 @@ module DropzoneHelper
       t 'location_releases.form.photos.dropzone_label'
     when "directory"
       "To Add Files to the Folder:<br>Drag & Drop Files<br>or<br>Click or Tap here to browse files"
-    when "task_request"
-      "To Add Files for the Task:<br>Drag & Drop Files<br>or<br>Click or Tap here to browse files"
     else
       "To Add Photos to the release:<br>Drag & Drop Files<br>or<br>Click or Tap here to browse photos and connect to Camera"
     end

app/helpers/tooltip_helper.rb

@@ -5,12 +5,4 @@ module TooltipHelper
       concat tag.div(class: "tooltip-inner")
     end
   end
-
-  def get_approval_data_for_releasable(release)
-    if release.approved_by_user_name.present?
-      "#{release.approved_by_user_name} [#{release.approved_by_user_email}]"
-    else
-      release.approved_by_user_email
-    end
-  end
 end

app/helpers/wordmark_helper.rb

@@ -13,13 +13,10 @@ module WordmarkHelper
     css += options[:class].to_s
 
     content_tag(:div, class: css) do
-      elements = [
+      safe_join [
         content_tag(:span, t("shared.#{product_name}")),
         content_tag(:span, t("shared.me"))
       ]
-      prefix = options[:prefix]
-      elements.unshift content_tag(:span, "#{prefix} ") unless prefix.blank?
-      safe_join elements
     end
   end
 end

app/javascript/packs/datepickers.js

@@ -1,6 +1,5 @@
 $(document).on("turbolinks:load", () => {
   $('.datepicker-control').datepicker({
-      format: "yyyy-mm-dd",
-      todayHighlight: true
+        format: "yyyy-mm-dd"
   });
 });

app/jobs/generate_contracts_zip_job.rb

@@ -6,8 +6,8 @@ class GenerateContractsZipJob < ApplicationJob
   before_perform do |job|
     @project = job.arguments.first
     @download = job.arguments.second
-    @release_type = job.arguments.third
-    @folder_name = "#{@project.name.parameterize}_#{get_release_name(@release_type).gsub('_', '-')}"
+    release_type = job.arguments.third
+    @folder_name = "#{@project.name.parameterize}_#{get_release_name(release_type).gsub('_', '-')}"
     @download.update!(name: @folder_name, status: :pending)
   end
 
@@ -20,14 +20,9 @@ class GenerateContractsZipJob < ApplicationJob
         files.each do |attachment|
           zipfile.add(attachment, File.join("#{dir}/", attachment))
         end
-
-        if @release_type.constantize.include?(CsvExportable)
-          csv_file = generate_csv releases
-          zipfile.get_output_stream("#{@folder_name}.csv") { |f| f.puts(csv_file) }
-        end
       end
 
-      @download.file.attach(io: File.open(zipfile_name), filename: "#{@folder_name}.zip")
+      @download.file.attach(io: File.open(zipfile_name), filename: @folder_name)
     end
   rescue StandardError => e
     Rails.logger.error("Failed to generate download for project (##{project.id}) with release type #{release_type}\n" + e.message)
@@ -48,19 +43,6 @@ class GenerateContractsZipJob < ApplicationJob
 
   private
 
-  def generate_csv(releases)
-    release_class = @release_type.constantize
-    headers = release_class.csv_headers
-
-    CSV.generate(headers: true) do |csv|
-      csv << headers
-      releases.each do |release|
-        csv_row_data = release.to_csv_row
-        csv << csv_row_data
-      end
-    end
-  end
-
   def get_release_name(release_type)
     release_type.constantize.model_name.plural
   end

app/jobs/submit_hubspot_form_job.rb

@@ -1,14 +1,12 @@
 class SubmitHubspotFormJob < ApplicationJob
   queue_as :default
 
-  def perform(first_name, last_name, email, company_name, additional_params = {})
+  def perform(email, company_name, additional_params = {})
     hubspot_form_guid = ENV["HUBSPOT_FORM_GUID"]
     return unless hubspot_form_guid.present?
 
     submission_params = {
-      first_name: first_name,
-      last_name: last_name,
-      email: email,
+      email: email, 
       company: company_name
     }.merge(additional_params)
 

app/jobs/submit_hubspot_task_request_form_job.rb

@@ -1,18 +0,0 @@
-class SubmitHubspotTaskRequestFormJob < ApplicationJob
-  queue_as :default
-
-  def perform(user_email, taskme_url)
-    hubspot_task_request_form_guid = ENV["HUBSPOT_TASK_REQUEST_FORM_GUID"]
-    return unless hubspot_task_request_form_guid.present?
-
-    submission_params = {
-      email: user_email, 
-      taskme_url: taskme_url
-    }
-
-    form = Hubspot::Form.new("guid" => hubspot_task_request_form_guid)
-    is_form_sumitted = form.submit(submission_params)
-
-    raise StandardError.new "Failed to submit the task request hubspot form data: #{is_form_sumitted}" unless is_form_sumitted
-  end
-end

app/models/account.rb

@@ -54,7 +54,6 @@ class Account < ApplicationRecord
         Download.where(project: projects),
         User.joins(:project_memberships).where(project_memberships: { project: projects }),
         Broadcast.where(project: projects),
-        TaskRequest.where(project: projects),
         ZoomMeeting.where(project: projects),
         MedicalRelease.where(project: projects),
         MiscRelease.where(project: projects),
@@ -83,10 +82,6 @@ class Account < ApplicationRecord
     plan_uid.to_s == "me_suite" || plan_uid.to_s == "releaseme"
   end
 
-  def taskme_enabled?
-    ENV["TASKME_ENABLED"] && (plan_uid.to_s == "me_suite" || plan_uid.to_s == "taskme")
-  end
-
   def plan_name
     case plan_uid.to_s
     when "deliverme"
@@ -95,8 +90,6 @@ class Account < ApplicationRecord
       "DirectME"
     when "releaseme"
       "ReleaseME"
-    when "taskme"
-      "TaskME"
     when "me_suite"
       "ME Suite"
     end

app/models/acquired_media_release.rb

@@ -9,18 +9,6 @@ class AcquiredMediaRelease < ApplicationRecord
   include Signable
   include Syncable
   include PersonName
-  include CsvExportable
-  include Approvable
-  include GuardianPhotoable
-  include SecondGuardianPhotoable
-  include GuardianName
-  include SecondGuardianName
-
-  class << self
-    def custom_csv_exportable_headers
-      %i[name file_infos_count]
-    end
-  end
 
   has_many :file_infos, as: :releasable, dependent: :destroy
 
@@ -37,38 +25,6 @@ class AcquiredMediaRelease < ApplicationRecord
                 %w(person_address_country country) 
               ]
 
-  composed_of :guardian_address,
-              class_name: 'Address',
-              mapping: [
-                  %w[guardian_address_street1 street1],
-                  %w[guardian_address_street2 street2],
-                  %w[guardian_address_city city],
-                  %w[guardian_address_state state],
-                  %w[guardian_address_zip zip],
-                  %w[guardian_address_country country]
-              ]
-
-  composed_of :guardian_2_address,
-              class_name: 'Address',
-              mapping: [
-                  %w[guardian_2_address_street1 street1],
-                  %w[guardian_2_address_street2 street2],
-                  %w[guardian_2_address_city city],
-                  %w[guardian_2_address_state state],
-                  %w[guardian_2_address_zip zip],
-                  %w[guardian_2_address_country country]
-              ]
-
-  # We don't care for the argument but method WILL receive option name
-  # when called from inside with_option block, hence * argument
-  def self.face_photo_acceptable_content_types(*)
-    ['image/png', 'image/jpeg']
-  end
-
-  def self.acceptable_import_file_extensions
-    ['.png', '.jpeg', '.jpg', '.pdf']
-  end
-
   validates :name, presence: true
   validates :person_email, email: true, allow_blank: true
 
@@ -90,8 +46,8 @@ class AcquiredMediaRelease < ApplicationRecord
   # CATEGORIES = ["Artwork", "Film Footage", "Video Footage", "Still Photograph"].freeze
   CATEGORIES = ["Film Footage", "Video Footage", "Still Photograph"].freeze
 
-  def second_guardian_present?
-    guardian_2_first_name.present?
+  def minor?
+    false
   end
 
   def contact_person
@@ -101,8 +57,4 @@ class AcquiredMediaRelease < ApplicationRecord
   def uses_edl?
     true
   end
-
-  def file_infos_count
-    file_infos.any? ? file_infos.size : I18n.t('acquired_media_releases.acquired_media_release.no_media')
-  end
 end

app/models/app_host.rb

@@ -15,7 +15,7 @@ class AppHost
   end
 
   def domain_with_port
-    [domain, port].reject(&:blank?).compact.join(":")
+    [domain, port].compact.join(":")
   end
 
   def protocol

app/models/appearance_release.rb

@@ -15,14 +15,6 @@ class AppearanceRelease < ApplicationRecord
   include SecondGuardianPhotoable
   include GuardianName
   include SecondGuardianName
-  include CsvExportable
-  include Approvable
-
-  class << self
-    def custom_csv_exportable_headers
-      %i[name contact_info]
-    end
-  end
 
   has_one_attached :person_photo
 

app/models/broadcast.rb

@@ -30,10 +30,6 @@ class Broadcast < ApplicationRecord
     "https://stream.mux.com/#{stream_playback_uid}.m3u8"
   end
 
-  def full_live_stream_playback_url
-    full_live_stream_playback_uid.blank? ? stream_playback_url : "https://stream.mux.com/#{full_live_stream_playback_uid}.m3u8"
-  end
-
   def stream_server_url
     ENV['MUX_BROADCAST_SERVER_URL']
   end

app/models/broadcast_recording.rb

@@ -14,6 +14,6 @@ class BroadcastRecording < ApplicationRecord
   end
 
   def download_file_name
-    "#{broadcast_name}_Date_#{created_at.in_time_zone(broadcast.shoot_location_time_zone).strftime("%Y-%m-%d")}_Time_#{created_at.in_time_zone(broadcast.shoot_location_time_zone).strftime("%T")}".parameterize
+    "#{broadcast_name}_Date_#{created_at.strftime("%Y-%m-%d")}_Time_#{created_at.strftime("%T")}".parameterize
   end
 end

app/models/concerns/amendmenable.rb

@@ -1,32 +0,0 @@
-module Amendmenable
-  extend ActiveSupport::Concern
-
-  included do
-    include ActiveStorageSupport::SupportForBase64
-
-    has_one_base64_attached :amendment_signature
-
-    with_options on: :amendment do
-      validates :amendment_signer_name, presence: true
-      validates :amendment_signature, attached: true
-    end
-  end
-
-  def amendment_signable?
-    contract_template.present? && contract_template.amendment_clause.present?
-  end
-
-  def amendment_signed?
-    amendment_signature.attached?
-  end
-
-  def amendment_signature_base64
-    nil
-  end
-
-  def amendment_signature_base64=(data_uri)
-    return if data_uri.blank?
-
-    amendment_signature.attach(data: data_uri, filename: "amendment_signature.png", content_type: "image/png", identify: "false")
-  end
-end

app/models/concerns/approvable.rb

@@ -1,17 +0,0 @@
-module Approvable
-  extend ActiveSupport::Concern
-  
-  included do
-    def approve_by(user)
-      return unless approved_at.nil?
-  
-      self.approved_by_user_name = user.full_name
-      self.approved_by_user_email = user.email
-      self.approved_at = Time.zone.now
-    end
-  
-    def approved?
-      self.approved_at.present?
-    end
-  end
-end

app/models/concerns/csv_exportable.rb

@@ -1,56 +0,0 @@
-# frozen_string_literal: true
-
-module CsvExportable
-  extend ActiveSupport::Concern
-
-  COMMON_HEADERS = %i[approved? notes tags signed_at].freeze
-  COMMON_VALUES = %w[clean_notes clean_tags signed_on].freeze
-
-  included do
-    class << self
-      def custom_csv_exportable_headers
-        []
-      end
-
-      def csv_headers
-        headers = custom_csv_exportable_headers + COMMON_HEADERS
-
-        headers.map do |header|
-          I18n.t("#{model_name.plural}.index.table_headers.#{header}")
-        end
-      end
-    end
-
-    def to_csv_row
-      (self.class.custom_csv_exportable_headers + COMMON_VALUES).map do |function|
-        send(function)
-      end
-    end
-
-    private
-
-    def contact_info
-      contact_info = ''
-      contact_info += "#{person_address}; " if person_address.present?
-      contact_info += "P: #{person_phone}; " if person_phone.present?
-      contact_info += "E: #{person_email}" if person_email.present?
-      contact_info.delete_suffix '; '
-    end
-
-    def clean_notes
-      notes = ''
-      self.notes.order_by_recent.each do |note|
-        notes += "#{note.content}(#{note.email}), "
-      end
-      notes.delete_suffix ', '
-    end
-
-    def clean_tags
-      tags = ''
-      self.tags.each do |tag|
-        tags += "#{tag.name}, "
-      end
-      tags.delete_suffix ', '
-    end
-  end
-end

app/models/contract_template.rb

@@ -5,8 +5,6 @@ class ContractTemplate < ApplicationRecord
   include Syncable
   include PgSearch
 
-  NUMBER_OF_CUSTOM_FIELDS = 15
-
   belongs_to :project
   belongs_to :parent, class_name: 'ContractTemplate', optional: true
   has_many :duplicates, class_name: 'ContractTemplate', foreign_key: 'parent_id'
@@ -21,8 +19,6 @@ class ContractTemplate < ApplicationRecord
   monetize :fee_cents
   has_rich_text :body
   has_rich_text :guardian_clause
-  has_rich_text :signature_legal_text
-  has_rich_text :amendment_clause
 
   validates :name, presence: true
   validates :release_type, presence: true
@@ -44,8 +40,6 @@ class ContractTemplate < ApplicationRecord
   scope :non_archived, -> { where(archived_at: nil) }
   scope :order_by_name, -> { order(:name) }
 
-  enum accessibility: [:public_template, :private_template]
-
   def fee?
     !fee.zero?
   end
@@ -65,18 +59,4 @@ class ContractTemplate < ApplicationRecord
   def archive
     update(archived_at: Time.zone.now)
   end
-
-  def has_questionnaire?
-    (1..NUMBER_OF_CUSTOM_FIELDS).any? { |n| public_send("question_#{n}_text").presence }
-  end
-
-  def editable?
-    releases.size.zero?
-  end
-
-  def attributes
-    result = super()
-    result[:signature_legal_text] = signature_legal_text.as_json
-    result
-  end
 end

app/models/location_release.rb

@@ -10,15 +10,6 @@ class LocationRelease < ApplicationRecord
   include Syncable
   include Taggable
   include PersonName
-  include CsvExportable
-  include Approvable
-  include Amendmenable
-
-  class << self
-    def custom_csv_exportable_headers
-      %i[name address]
-    end
-  end
 
   composed_of :address,
               mapping: [

app/models/material_release.rb

@@ -10,16 +10,8 @@ class MaterialRelease < ApplicationRecord
   include Syncable
   include Taggable
   include PersonName
-  include CsvExportable
-  include Approvable
-
-  class << self
-    def custom_csv_exportable_headers
-      %i[name]
-    end
-  end
-
-  composed_of :person_address,
+  
+  composed_of :person_address, 
               class_name: "Address",
               mapping: [
                 %w(person_address_street1 street1),
@@ -38,15 +30,15 @@ class MaterialRelease < ApplicationRecord
     validates :signature, attached: true
   end
 
-  searchable_on %i[
-    name
+  searchable_on %i[ 
+    name 
     person_address_street1 person_address_street2 person_address_city person_address_state person_address_zip person_address_country
   ]
 
   def contact_person
     @contact_person ||= Contact.new(person_name, person_address, person_email, person_phone)
   end
-
+  
   def minor?
     false
   end

app/models/medical_release.rb

@@ -11,48 +11,18 @@ class MedicalRelease < ApplicationRecord
   include SecondGuardianPhotoable
   include GuardianName
   include SecondGuardianName
-  include CsvExportable
-  include Approvable
-
-  class << self
-    def custom_csv_exportable_headers
-      %i[name contact_info]
-    end
-  end
 
   NUMBER_OF_CUSTOM_FIELDS = 15
 
-  composed_of :person_address,
+  composed_of :person_address, 
               class_name: "Address",
-              mapping: [
-                %w[person_address_street1 street1],
-                %w[person_address_street2 street2],
-                %w[person_address_city city],
-                %w[person_address_state state],
-                %w[person_address_zip zip],
-                %w[person_address_country country]
-              ]
-
-  composed_of :guardian_address,
-              class_name: 'Address',
-              mapping: [
-                %w[guardian_address_street1 street1],
-                %w[guardian_address_street2 street2],
-                %w[guardian_address_city city],
-                %w[guardian_address_state state],
-                %w[guardian_address_zip zip],
-                %w[guardian_address_country country]
-              ]
-
-  composed_of :guardian_2_address,
-              class_name: 'Address',
-              mapping: [
-                %w[guardian_2_address_street1 street1],
-                %w[guardian_2_address_street2 street2],
-                %w[guardian_2_address_city city],
-                %w[guardian_2_address_state state],
-                %w[guardian_2_address_zip zip],
-                %w[guardian_2_address_country country]
+              mapping: [ 
+                %w(person_address_street1 street1), 
+                %w(person_address_street2 street2), 
+                %w(person_address_city city), 
+                %w(person_address_state state), 
+                %w(person_address_zip zip), 
+                %w(person_address_country country) 
               ]
 
   def self.face_photo_acceptable_content_types
@@ -62,7 +32,6 @@ class MedicalRelease < ApplicationRecord
   # These validations apply to all releases
   validates :person_first_name, :person_last_name, presence: true
   validates :person_email, email: true, allow_blank: true
-  validate :valid_answers
 
   acts_as_taggable_on :internal_tags, :tags
 
@@ -107,15 +76,4 @@ class MedicalRelease < ApplicationRecord
   def contract_file_name
     "#{project.name.parameterize}_#{contract_template.release_type}_#{(signed_at || created_at).strftime("%Y.%m.%d")}_#{release_number}_#{filename_suffix.parameterize}"
   end
-
-  private
-
-  def valid_answers
-    (1..ContractTemplate::NUMBER_OF_CUSTOM_FIELDS).each do |index|
-      if contract_template && contract_template["question_#{index}_text"].present? &&
-         public_send("question_#{index}_answer").blank?
-        errors.add("question_#{index}", I18n.t('medical_releases.custom_validation_errors.question_answer_is_required'))
-      end
-    end
-  end
 end

app/models/misc_release.rb

@@ -9,16 +9,6 @@ class MiscRelease < ApplicationRecord
   include PersonName
   include GuardianName
   include GuardianPhotoable
-  include CsvExportable
-  include Approvable
-
-  class << self
-    def custom_csv_exportable_headers
-      %i[name contact_info]
-    end
-  end
-
-  NUMBER_OF_CUSTOM_FIELDS = 15
 
   composed_of :person_address, 
               class_name: "Address",

app/models/music_release.rb

@@ -7,15 +7,7 @@ class MusicRelease < ApplicationRecord
   include Searchable
   include Taggable
   include PersonName
-  include CsvExportable
-  include Approvable
-
-  class << self
-    def custom_csv_exportable_headers
-      %i[name file_infos_count composers_count publishers_count]
-    end
-  end
-
+  
   has_many :file_infos, as: :releasable, dependent: :destroy
   has_many :composers, dependent: :destroy
   has_many :publishers, dependent: :destroy
@@ -80,18 +72,6 @@ class MusicRelease < ApplicationRecord
     false
   end
 
-  def file_infos_count
-    file_infos.size
-  end
-
-  def composers_count
-    composers.size
-  end
-
-  def publishers_count
-    publishers.size
-  end
-
   private
 
   def publisher_percentages_add_up_to_100

app/models/project.rb

@@ -24,7 +24,6 @@ class Project < ApplicationRecord
   has_many :downloads, dependent: :destroy
   has_many :broadcasts, dependent: :destroy
   has_many :zoom_meetings, dependent: :destroy
-  has_many :task_requests, dependent: :destroy
 
   accepts_nested_attributes_for :project_memberships
 

app/models/qr_code.rb

@@ -10,19 +10,7 @@ class QrCode
     url       = Rails.application.routes.url_helpers.url_for(route)
     filename  = [contract_template.project.name, contract_template.name].map(&:parameterize).join("_")
 
-    new(url, "#{filename}.png")
-  end
-
-  def self.build_from_multiple_contract_templates(contract_templates, project)
-    account   = project.account
-    locale    = I18n.locale
-    host      = AppHost.new.domain_with_port
-    route     = [account, project, :contract_templates, contract_template_ids: contract_templates.ids, locale: I18n.locale, host: AppHost.new.domain_with_port]
-
-    url       = Rails.application.routes.url_helpers.url_for(route)
-    filename  = [project.account.name, project.name].map(&:parameterize).join("_")
-
-    new(url, "#{filename}.png")
+    new(url, filename)
   end
 
   def initialize(url, filename = "qrcode.png")

app/models/talent_release.rb

@@ -11,17 +11,7 @@ class TalentRelease < ApplicationRecord
   include Taggable
   include PersonName
   include GuardianPhotoable
-  include SecondGuardianPhotoable
   include GuardianName
-  include SecondGuardianName
-  include CsvExportable
-  include Approvable
-
-  class << self
-    def custom_csv_exportable_headers
-      %i[name phone email]
-    end
-  end
 
   composed_of :person_address, 
               class_name: "Address",
@@ -45,17 +35,6 @@ class TalentRelease < ApplicationRecord
                 %w(guardian_address_country country) 
               ]
 
-  composed_of :guardian_2_address,
-              class_name: "Address",
-              mapping: [
-                  %w(guardian_2_address_street1 street1),
-                  %w(guardian_2_address_street2 street2),
-                  %w(guardian_2_address_city city),
-                  %w(guardian_2_address_state state),
-                  %w(guardian_2_address_zip zip),
-                  %w(guardian_2_address_country country)
-              ]
-
   def self.face_photo_acceptable_content_types
     ["image/png", "image/jpeg"]
   end
@@ -79,7 +58,6 @@ class TalentRelease < ApplicationRecord
   # These validations apply to releases being signed by a minor
   with_options if: :minor? do
     validates :guardian_first_name, :guardian_last_name, presence: true
-    validates :guardian_email, :guardian_2_email, email: true, allow_blank: true
     validates :guardian_phone, presence: true
   end
 
@@ -94,14 +72,6 @@ class TalentRelease < ApplicationRecord
     person_name
   end
 
-  def phone
-    person_phone
-  end
-
-  def email
-    person_email
-  end
-
   def filename_suffix
     "#{person_last_name} #{person_first_name}"
   end
@@ -111,11 +81,7 @@ class TalentRelease < ApplicationRecord
   end
 
   def uses_edl?
-    true
-  end
-
-  def second_guardian_present?
-    guardian_2_first_name.present?
+    false
   end
 
   def contract_file_name

app/models/task_request.rb

@@ -1,10 +0,0 @@
-class TaskRequest < ApplicationRecord
-  belongs_to :project
-  has_many_attached :files
-
-  enum status: [:pending, :completed, :cancelled]
-
-  scope :order_by_recent, -> { order(created_at: :desc) }
-
-  validates :time_allowed, numericality: { only_integer: true, greater_than_or_equal_to: 2 }, allow_blank: true
-end

app/policies/acquired_media_release_policy.rb

@@ -30,12 +30,4 @@ class AcquiredMediaReleasePolicy < ApplicationPolicy
   def download_multiple?
     true
   end
-
-  def review?
-    user.account_manager?
-  end
-
-  def approve?
-    review?
-  end
 end

app/policies/appearance_release_policy.rb

@@ -26,12 +26,4 @@ class AppearanceReleasePolicy < ReleasePolicy
   def download_multiple?
     true
   end
-
-  def review?
-    user.account_manager?
-  end
-
-  def approve?
-    review?
-  end
 end

app/policies/broadcast_policy.rb

@@ -18,12 +18,4 @@ class BroadcastPolicy < ApplicationPolicy
   def update?
     true
   end
-
-  def destroy_file?
-    if user.nil? || user.user.nil?
-      return false
-    end
-
-    user.manager? || user.account_manager?
-  end
 end

app/policies/contract_template_policy.rb

@@ -3,10 +3,8 @@ class ContractTemplatePolicy < ApplicationPolicy
     def resolve
       if user.account_manager?
         scope.left_outer_joins(:project).where(projects: {account: user.account})
-      elsif user.manager?
-        scope.left_outer_joins(project: :project_memberships).where(project_memberships: { user_id: user.id })
       else
-        scope.public_template.left_outer_joins(project: :project_memberships).where(project_memberships: { user_id: user.id })
+        scope.left_outer_joins(project: :project_memberships).where(project_memberships: { user_id: user.id })
       end
     end
   end
@@ -23,18 +21,6 @@ class ContractTemplatePolicy < ApplicationPolicy
     create?
   end
 
-  def edit?
-    record.editable? && create?
-  end
-
-  def update?
-    edit?
-  end
-
-  def duplicate?
-    create?
-  end
-
   def import?
     if user.account_manager?
       record.project.account = user.account

app/policies/location_release_policy.rb

@@ -34,16 +34,4 @@ class LocationReleasePolicy < ReleasePolicy
   def download_multiple?
     true
   end
-
-  def review?
-    user.account_manager?
-  end
-
-  def sign_amendment?
-    user.manager? || user.account_manager?
-  end
-
-  def approve?
-    review?
-  end
 end

app/policies/material_release_policy.rb

@@ -34,12 +34,4 @@ class MaterialReleasePolicy < ReleasePolicy
   def download_multiple?
     true
   end
-
-  def review?
-    user.account_manager?
-  end
-
-  def approve?
-    review?
-  end
 end

app/policies/medical_release_policy.rb

@@ -15,14 +15,6 @@ class MedicalReleasePolicy < ReleasePolicy
     user.manager? || user.account_manager?
   end
 
-  def review?
-    user.account_manager?
-  end
-
-  def approve?
-    review?
-  end
-
   def edit_photos?
     true
   end

app/policies/misc_release_policy.rb

@@ -38,12 +38,4 @@ class MiscReleasePolicy < ReleasePolicy
   def download_multiple?
     download_single?
   end
-
-  def review?
-    user.account_manager?
-  end
-
-  def approve?
-    review?
-  end
 end

app/policies/music_release_policy.rb

@@ -22,12 +22,4 @@ class MusicReleasePolicy < ReleasePolicy
   def download_multiple?
     true
   end
-
-  def review?
-    user.account_manager?
-  end
-
-  def approve?
-    review?
-  end
 end

app/policies/project_policy.rb

@@ -36,8 +36,4 @@ class ProjectPolicy < ApplicationPolicy
   def show_downloads?
     show?
   end
-
-  def show_task_results?
-    show?
-  end
 end

app/policies/talent_release_policy.rb

@@ -34,12 +34,4 @@ class TalentReleasePolicy < ReleasePolicy
   def download_multiple?
     true
   end
-
-  def review?
-    user.account_manager?
-  end
-
-  def approve?
-    review?
-  end
 end

app/policies/task_request_policy.rb

@@ -1,29 +0,0 @@
-class TaskRequestPolicy < ApplicationPolicy
-  def index?
-    true
-  end
-
-  def show?
-    true
-  end
-
-  def create?
-    true
-  end
-
-  def destroy?
-    true
-  end
-
-  def update?
-    true
-  end
-
-  def cancel?
-    true
-  end
-
-  def open_deliverable?
-    true
-  end
-end

app/telemetry/analytics.rb

@@ -151,24 +151,6 @@ class Analytics
       )
     end
   end
-
-  def track_create_task_request(user_agent:, user_ip:)
-    if analytics_enabled?
-      identify
-      track(
-        {
-          user_id: user.id,
-          event: "Task request created",
-          properties: {
-            account: account.try(:name),
-            account_id: account.try(:id),
-            user_agent: user_agent,
-            ip: user_ip,
-          },
-        }
-      )
-    end
-  end
   
   private
 

app/views/acquired_media_releases/_acquired_media_release.html.erb

@@ -1,13 +1,5 @@
 <tr id="<%= dom_id(acquired_media_release) %>">
   <td data-behavior="select"><%= check_box_tag "acquired_media_release_ids[]", acquired_media_release.id, false %></td>
-  <td class="text-center">
-    <% if acquired_media_release.approved? %>
-      <% tooltip_user_data = get_approval_data_for_releasable(acquired_media_release) %>
-      <i class="fa fa-check-circle fa-2x text-success"
-         data-toggle="tooltip"
-         title="<%= t '.messages.approved_tooltip', user: tooltip_user_data, timestamp: acquired_media_release.approved_at %>"></i>
-    <% end %>
-  </td>
   <td>
     <%= acquired_media_release.name %>
   </td>
@@ -43,9 +35,6 @@
         <% if policy(Contract).show? && (acquired_media_release.contract.attached? || acquired_media_release.contract_template.present?) %>
           <%= link_to fa_icon("download fw", text: "Download"), [acquired_media_release, :contracts, format: "pdf"], class: "dropdown-item", target: "_blank" %>
         <% end %>
-        <% if policy(AcquiredMediaRelease).review? %>
-          <%= link_to fa_icon("search fw", text: t('.actions.review')), new_acquired_media_release_approvals_path(acquired_media_release), class: "dropdown-item" %>
-        <% end %>
         <% if policy(acquired_media_release).edit? %>
           <%= link_to fa_icon("pencil fw", text: "Edit"), [:edit, acquired_media_release], class: "dropdown-item" %>
         <% end %>

app/views/acquired_media_releases/_form.html.erb

@@ -1,10 +1,6 @@
 <%= errors_summary_for acquired_media_release %>
 <%= bootstrap_form_with model: model, local: true do |form| %>
   <%= field_set_tag content_tag(:span, t(".acquired_media_details.heading"), class: "h6 text-muted text-uppercase") do %>
-    <%= form.form_group :minor do %>
-      <%= form.check_box :minor, label: t("helpers.label.talent_release.minor"), data: { target: "[data-ujs-target=guardian-fields]", toggle: "collapse" } %>
-    <% end %>
-
     <div class="form-row">
       <%= form.text_field :name, required: true, wrapper_class: "col-12" %>
     </div>
@@ -13,28 +9,6 @@
         <%= form.check_box :categories, { multiple: true, label: category }, category, false %>
       <% end %>
     <% end %>
-
-    <div class="<%= class_string("collapse" => !acquired_media_release.minor?) %>" data-ujs-target="guardian-fields">
-      <%= card_field_set_tag t(".guardian_info.heading") do %>
-        <div class="form-row">
-          <%= form.text_field :guardian_first_name, required: acquired_media_release.minor?, wrapper_class: "col-sm-3" %>
-          <%= form.text_field :guardian_last_name, required: acquired_media_release.minor?, wrapper_class: "col-sm-3" %>
-          <%= form.phone_field :guardian_phone, wrapper_class: "col-sm-6" %>
-          <%= form.text_field :guardian_email, wrapper_class: "col-sm-6" %>
-        </div>
-        <%= render "shared/address_fields", form: form, subject: "guardian" %>
-      <% end %>
-
-      <%= card_field_set_tag t(".guardian_2_info.heading") do %>
-        <div class="form-row">
-          <%= form.text_field :guardian_2_first_name, wrapper_class: "col-sm-3" %>
-          <%= form.text_field :guardian_2_last_name, wrapper_class: "col-sm-3" %>
-          <%= form.phone_field :guardian_2_phone, wrapper_class: "col-sm-6" %>
-          <%= form.text_field :guardian_2_email, wrapper_class: "col-sm-6" %>
-        </div>
-        <%= render "shared/address_fields", form: form, subject: "guardian_2" %>
-      <% end %>
-    </div>
   <% end %>
 
   <hr>
@@ -45,44 +19,6 @@
       <strong>For optimal accuracy, please ensure video file names and photo file names match the source file name in the editing sequence.</strong>
     </div>
     <%= render "shared/file_infos_dropzone", form: form, releasable: acquired_media_release %>
-
-    <div class="<%= class_string("collapse" => !acquired_media_release.minor?) %>" data-ujs-target="guardian-fields">
-      <br>
-      <div class="text-left">
-        <p><%= t(".photos.guardian_photo.heading") %></p>
-        <div id="guardian-photo-preview" class="d-inline-block mb-2" data-behavior="guardian-photo-preview" data-file-input="[data-ujs-target=guardian-photo-input]">
-          <div class="align-items-center d-flex photo-preview img-thumbnail justify-content-center">
-            <span>No photo yet</span>
-          </div>
-        </div>
-        <% if acquired_media_release.guardian_photo.attached? %>
-          <%= javascript_tag nonce: true do %>
-            App.PhotoPreview.set("#guardian-photo-preview", "<%= url_for(acquired_media_release.guardian_photo.variant(auto_orient: true, resize: '200x200')) %>");
-          <% end %>
-        <% end %>
-        <div class="d-inline-block">
-          <%= form.hidden_field :guardian_photo, value: form.object.guardian_photo.signed_id if acquired_media_release.guardian_photo.attached?%>
-          <%= form.file_field :guardian_photo, hide_label: true, data: { ujs_target: "guardian-photo-input" }, help: "PNG or JPG only", accept: acquired_media_release.class.face_photo_acceptable_content_types.join(",") %>
-        </div>
-
-        <p><%= t(".photos.guardian_2_photo.heading") %></p>
-        <div id="guardian-2-photo-preview" class="d-inline-block mb-2" data-behavior="guardian-photo-preview" data-file-input="[data-ujs-target=guardian-2-photo-input]">
-          <div class="align-items-center d-flex photo-preview img-thumbnail justify-content-center">
-            <span>No photo yet</span>
-          </div>
-        </div>
-        <% if acquired_media_release.guardian_2_photo.attached? %>
-          <%= javascript_tag nonce: true do %>
-            App.PhotoPreview.set("#guardian-2-photo-preview", "<%= url_for(acquired_media_release.guardian_2_photo.variant(auto_orient: true, resize: '200x200')) %>");
-          <% end %>
-        <% end %>
-        <div class="d-inline-block">
-          <%= form.hidden_field :guardian_2_photo, value: form.object.guardian_2_photo.signed_id if acquired_media_release.guardian_2_photo.attached?%>
-          <%= form.file_field :guardian_2_photo, hide_label: true, data: { ujs_target: "guardian-2-photo-input" }, help: "PNG or JPG only", accept: acquired_media_release.class.face_photo_acceptable_content_types.join(",") %>
-        </div>
-      </div>
-      <hr>
-    </div>
   <% end %>
 
   <hr>

app/views/acquired_media_releases/index.html.erb

@@ -26,7 +26,6 @@
     <thead class="thead-light">
       <tr>
         <th data-behavior="all-selectable"><%= check_box_tag "acquired_media_release_ids[]", false, false %></th>
-        <th><%= t '.table_headers.approved'%></th>
         <th><%= AcquiredMediaRelease.human_attribute_name(:name) %></th>
         <th><%= t(".table_headers.file_infos_count") %></th>
         <th><%= t(".table_headers.notes") %></th>

app/views/admin/application/_side_nav.html.erb

@@ -7,9 +7,6 @@
       <li class="nav-item">
         <%= link_to fa_icon("users fw", text: "Users"), [:admin, :users], class: class_string("nav-link", "active" => controller_name == "users") %>
       </li>
-      <li class="nav-item">
-        <%= link_to fa_icon("tasks fw", text: "Task Requests"), [:admin, :task_requests], class: class_string("nav-link", "active" => controller_name == "task_requests") %>
-      </li>
       <li class="nav-item">
         <%= link_to fa_icon("bug fw", text: "Errors"), "https://sentry.io/bigmedia/", class: "nav-link", target: :_blank %>
       </li>

app/views/admin/task_requests/_form.html.erb

@@ -1,13 +0,0 @@
-<%= errors_summary_for task_request %>
-
-<%= bootstrap_form_with model: model, local: true do |form| %>
-  <%= form.select :status, options_for_select(TaskRequest.statuses.except(:cancelled).keys, task_request.status), {}, class: "form-control custom-select" %>
-  <%= form.text_field :deliverable_url  %>
-
-  <div class="row align-items-center text-center mt-4">
-    <%= link_to t("shared.cancel"), [:admin, :task_requests], class: "col-3 text-reset" %>
-    <div class="col-9">
-      <%= form.submit class: class_string("btn btn-block", ["btn-success", "btn-primary"] => task_request.new_record?), data: { disable_with: t("shared.disable_with") } %>
-    </div>
-  </div>
-<% end %>

app/views/admin/task_requests/_task_request.html.erb

@@ -1,32 +0,0 @@
-<tr id="<%= dom_id(task_request) %>">
-  <td>
-    <%= task_request.id %>
-  </td>
-  <td>
-    <%= task_request.project.account.name %>
-  </td>
-  <td>
-    <%= task_request.project.name %>
-  </td>
-  <td>
-    <%= task_request.created_at.strftime("%D") %>
-  </td>
-  <td>
-    <%= task_request.deadline.try(:strftime, '%D') %>
-  </td>
-  <td>
-    <%= task_request.time_allowed %>
-  </td>
-  <td>
-    <%= task_request.status.titleize %>
-  </td>
-  <td class="text-right">
-    <div class="btn-group">
-      <%= button_tag "Manage", class: "btn btn-light btn-sm dropdown-toggle border", data: { toggle: "dropdown", boundary: "window" }, aria: { haspopup: true, expanded: false } %>
-      <div class="dropdown-menu dropdown-menu-right">
-        <%= link_to fa_icon("tasks", text: "View"), [:admin, task_request], class: "dropdown-item", target: '_blank' %>
-        <%= link_to fa_icon("pencil", text: "Edit"), [:edit, :admin, task_request], class: "dropdown-item" %>
-      </div>
-    </div>
-  </td>
-</tr>

app/views/admin/task_requests/edit.html.erb

@@ -1,6 +0,0 @@
-<div class="card shadow-sm">
-  <%= card_header text: "Edit Task Request", close_action_path: [:admin, :task_requests] %>
-  <div class="card-body">
-    <%= render "form", model: [:admin, @task_request], task_request: @task_request %>
-  </div>
-</div>

app/views/admin/task_requests/index.html.erb

@@ -1,25 +0,0 @@
-<div class="border bg-white rounded shadow-sm pb-3 table-responsive">
-  <table class="table table-striped tr-px-4 align-all-middle">
-    <thead class="thead-light">
-      <tr>
-        <th>Task ID</th>
-        <th>Account Name</th>
-        <th>Project Name</th>
-        <th>Created On</th>
-        <th>Deadline</th>
-        <th>Time Allowed</th>
-        <th>Status</th>
-        <th></th>
-      </tr>
-    </thead>
-    <tbody id="users">
-      <% if @task_requests.any? %>
-        <%= render @task_requests %>
-      <% else %>
-        <tr>
-          <td colspan="20" class="py-4 text-center text-muted"><%= t(".empty") %></td>
-        </tr>
-      <% end %>
-    </tbody>
-  </table>
-</div>

app/views/admin/task_requests/show.html.erb

@@ -1,49 +0,0 @@
-<div class="card shadow-sm">
-  <%= card_header text: "Task Details", close_action_path: [:admin, :task_requests] %>
-  <div class="card-body">
-    <div class="row">
-      <div class="col-md-6 col-sm-12">
-        <dl>
-          <%= description_list_pair_for @task_request.project.account, :name, custom_label: "Account Name", append: ":" %>
-          <%= description_list_pair_for @task_request.project, :name, custom_label: "Project Name", append: ":" %>
-          <%= description_list_pair_for @task_request, :created_at, append: ":" %>
-          <%= description_list_pair_for @task_request, :user_email, append: ":" %>
-          <%= description_list_pair_for @task_request, :status, append: ":" %>
-        </dl>
-      </div>
-      <div class="col-md-6 col-sm-12">
-        <dl>
-          <%= description_list_pair_for @task_request, :deadline, append: ":" %>
-          <%= description_list_pair_for @task_request, :time_allowed, append: ":" %>
-          <%= description_list_pair_for @task_request, :description, append: ":" %>
-          <%= description_list_pair_for @task_request, :additional_notes, append: ":" %>
-        </dl>
-      </div>
-      <div class="col-md-12">
-        <h2 class="h6 mt-3">Files:</h2>
-        <div class="pt-2 mx-n3">
-          <table class="table table-striped tr-px-4 align-all-middle">
-            <thead class="thead-light">
-              <tr>
-                <th>Filename</th>
-                <th></th>
-              </tr>
-            </thead>
-            <tbody id="task_requests">
-              <% if @files.any? %>
-                <%= render partial: "task_requests/file", collection: @files %>
-              <% else %>
-                <tr>
-                  <td colspan="12" class="py-4 text-center text-muted"><%= t(".empty") %></td>
-                </tr>
-              <% end %>
-            </tbody>
-          </table>
-          <div class="mt-4" id="task_requests_pagiantion">
-            <%= will_paginate @files %>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>

app/views/appearance_releases/_appearance_release.html.erb

@@ -1,13 +1,5 @@
 <tr id="<%= dom_id(appearance_release) %>">
   <td data-behavior="select"><%= check_box_tag "appearance_release_ids[]", appearance_release.id, false %></td>
-  <td class="text-center">
-    <% if appearance_release.approved? %>
-      <% tooltip_user_data = get_approval_data_for_releasable(appearance_release) %>
-      <i class="fa fa-check-circle fa-2x text-success"
-          data-toggle="tooltip"
-          title="<%= t '.messages.approved_tooltip', user: tooltip_user_data, timestamp: appearance_release.approved_at %>"></i>
-    <% end %>
-  </td>
   <td>
     <% if appearance_release.photo.attached? %>
       <%= image_tag medium_variant(appearance_release.photo) %>
@@ -47,9 +39,6 @@
         <% if policy(Contract).show? && (appearance_release.contract.attached? || appearance_release.contract_template.present?) %>
           <%= link_to fa_icon("download fw", text: "Download"), [appearance_release, :contracts, format: "pdf"], class: "dropdown-item", target: "_blank" %>
         <% end %>
-        <% if policy(AppearanceRelease).review? %>
-          <%= link_to fa_icon("search fw", text: t('.actions.review')), new_appearance_release_approvals_path(appearance_release), class: "dropdown-item" %>
-        <% end %>
         <% if policy(appearance_release).edit? %>
           <%= link_to fa_icon("pencil fw", text: "Edit"), [:edit, appearance_release], class: "dropdown-item" %>
         <% end %>

app/views/appearance_releases/index.html.erb

@@ -44,7 +44,6 @@
     <thead class="thead-light">
       <tr>
         <th data-behavior="all-selectable"><%= check_box_tag "appearance_release_ids[]", false, false %></th>
-        <th><%= t '.table_headers.approved'%></th>
         <th></th>
         <th><%= AppearanceRelease.human_attribute_name(:person_name) %></th>
         <th><%= AppearanceRelease.human_attribute_name(:contact_info) %></th>

app/views/application/_sidebar.html.erb

@@ -11,14 +11,6 @@
   <hr class="divider-light mx-n4">
   <nav>
     <ul class="nav nav-pills nav-pills-dark flex-column">
-      <% if Current.account.taskme_enabled? %>
-        <li class="nav-item">
-          <%= link_to [project, :task_requests], class: class_string("nav-link", "active" => controller_name == "task_requests") do %>
-            <%= lock_icon_for(Current.account, :taskme) %>
-            <%= product_wordmark :task_me, class: class_string("d-inline-block", "disabled" => !Current.account.taskme_enabled?) %>
-          <% end %>
-        </li>
-      <% end %>
       <li class="nav-item">
         <%= link_to [project, :contract_templates], class: class_string("nav-link", "active" => %w(contract_templates release_template_imports).include?(controller_name)) do %>
           <%= lock_icon_for Current.account, :releaseme %>

app/views/approvals/new.html.erb

@@ -1,15 +0,0 @@
-<div class="card shadow-sm">
-  <%= card_header text: t(".heading", release_type: @releasable_param.name.titleize), close_action_path: [@project, "#{@releasable_param.name.pluralize}"] %>
-  <div class="card-body">
-    <embed class="embeded-contract-preview" type="application/pdf" src="<%= url_for [@releasable, :contracts, format: "pdf"] %>" width="90%" height="1200" />
-
-    <%= bootstrap_form_with model: @releasable, method: :post, url: public_send("#{@releasable_param.name}_approvals_path", @releasable), local: true do |form| %>
-      <div class="row align-items-center text-center mt-4">
-        <%= link_to t("shared.cancel"), [@releasable.project, "#{@releasable_param.name.pluralize}"], class: "col-3 text-reset" %>
-        <div class="col-9">
-          <%= form.button t('.actions.approve'), id: "approve_release", class: class_string("btn btn-block btn-success btn-primary"), data: { disable_with: t("shared.disable_with") } %>
-        </div>
-      </div>
-    <% end %>
-  </div>
-</div>

app/views/broadcasts/_broadcast.html.erb

@@ -3,9 +3,6 @@
   <td>
     <%= broadcast.name %>
   </td>
-  <td>
-    <%= broadcast.shoot_location_time_zone %>
-  </td>
   <td>
     <%= broadcast.status.titleize %>
   </td>

app/views/broadcasts/_file.html.erb

@@ -1,25 +1,12 @@
-<div class="row">
-  <% broadcast = file.record %>
-  <% show_delete = controller.class.module_parent.to_s == "Public" ? false : policy(broadcast).destroy_file? %>
-  <% file_class = show_delete ? "col-8" : "col-12" %>
-  <div class="<%= file_class %>">
-    <li class="my-2" id="<%= dom_id(file) %>">
-      <% if file.variable? %>
-        <%= link_to image_tag(file.variant(resize_and_pad: [300, 300, background: "#F7F8F9"]), class: "bg-light img-thumbnail img-fluid"), file, target: "_blank" %>
-      <% else %>
-        <div class="border rounded bg-light text-muted d-flex justify-content-center align-items-center img-fluid fix-h-and-w">
-          <%= link_to file, target: "_blank" do %>
-            <%= fa_icon("file", style: "font-size: 2rem") %>
-            <div class="mt-2"><%= file.filename %></div>
-          <% end %>
-        </div>
+<li class="my-2" id="<%= dom_id(file) %>">
+  <% if file.variable? %>
+    <%= link_to image_tag(file.variant(resize_and_pad: [300, 300, background: "#F7F8F9"]), class: "bg-light img-thumbnail img-fluid"), file, target: "_blank" %>
+  <% else %>
+    <div class="border rounded bg-light text-muted d-flex justify-content-center align-items-center fix-h-and-w">
+      <%= link_to file, target: "_blank" do %>
+        <%= fa_icon("file", style: "font-size: 2rem") %>
+        <div class="mt-2"><%= file.filename %></div>
       <% end %>
-    </li>
-  </div>
-  <% if show_delete %>
-    <div class="col-4 align-self-center p-0 m-0">
-      <% url = url_for [:destroy_file, broadcast.project, broadcast, { file_id: file.id }] %>
-      <%= link_to fa_icon("trash fw", text: t('.actions.delete_file')), url, class: "btn btn-danger", remote: true, method: :delete, data: { confirm: t('.confirm_delete') } %>
     </div>
   <% end %>
-</div>
+</li>

app/views/broadcasts/_form.html.erb

@@ -2,8 +2,6 @@
 
 <%= bootstrap_form_with model: model, local: true do |form| %>
   <%= form.text_field :name %>
-  <%= form.select :conference_option, options_for_conference_select, { label: t('.labels.conference_option') }, class: "form-control custom-select" %>
-  <%= form.time_zone_select(:shoot_location_time_zone, nil, label: "Time zone of shoot location") %>
 
   <div class="row align-items-center text-center mt-4">
     <%= link_to t("shared.cancel"), [project, :broadcasts], class: "col-3 text-reset" %>

app/views/broadcasts/_video.html.erb

@@ -1,7 +1,7 @@
 <% if broadcast.streamer_recording? && broadcast.active? %>
-  <div id="broadcast_video" class="embed-responsive-item" data-video-type="stream"></div>
+  <div id="broadcast_video" class="embed-responsive-item"></div>
 <% else %>
-  <div id="broadcast_video" class="embed-responsive-item" data-video-type="stream">
+  <div id="broadcast_video" class="embed-responsive-item">
     <table class="w-100 h-100 bg-secondary">
       <tbody>
         <tr>

app/views/broadcasts/index.html.erb

@@ -22,7 +22,6 @@
       <tr>
         <th></th>
         <th><%= t(".table_headers.broadcast_name") %></th>
-        <th><%= t(".table_headers.broadcast_time_zone") %></th>
         <th><%= t(".table_headers.broadcast_status") %></th>
         <th><%= t(".table_headers.broadcast_created_at") %></th>
         <th></th>
@@ -33,7 +32,7 @@
         <%= render @broadcasts %>
       <% else %>
         <tr>
-          <td colspan="6" class="py-4 text-center text-muted"><%= t(".empty") %></td>
+          <td colspan="5" class="py-4 text-center text-muted"><%= t(".empty") %></td>
         </tr>
       <% end %>
     </tbody>

app/views/broadcasts/show.html.erb

@@ -33,10 +33,10 @@
             <%= link_to "Switch View", "#", class: "btn btn-light border dropdown-toggle", role: "button", id: "dropdownMenuLink", data: { toggle: "dropdown" }, aria: { haspopup: "true", expanded: "false" } %>
             <div class="dropdown-menu" aria-labelledby="dropdownMenuLink">
               <h5 class="dropdown-header">Live Streams</h5>
-              <%= link_to fa_icon("check", text: @broadcast.name.titleize), "#", data: { behavior: "play_stream"}, class: "dropdown-item active" %>
+              <span class="dropdown-item active"><%= fa_icon("check", text: @broadcast.name.titleize) %></span>
               <% @multi_view_broadcasts.each do |broadcast| %>
                 <% if broadcast.id != @broadcast.id %>
-                  <%= link_to broadcast.name.titleize, broadcast.url, data: { behavior: "play_stream"}, class: class_string("dropdown-item", "active" => @broadcast.id == broadcast.id) %>
+                  <%= link_to broadcast.name.titleize, broadcast.url, class: class_string("dropdown-item", "active" => @broadcast.id == broadcast.id) %>
                 <% end %>
               <% end %>
               <h5 class="dropdown-header">Previous Sessions</h5>
@@ -102,7 +102,6 @@
                         <i class="fa fa-clipboard"></i>
                         Copy URL
                       </button>
-                      <%= link_to t('.actions.reset_url'), [@project, @broadcast], method: :patch, class: "btn btn-danger" %>
                     </div>
                   <% else %>
                     <input type="text" class="form-control" value="<%= broadcast_url(@broadcast.token) %>" readonly>
@@ -111,15 +110,14 @@
                         <i class="fa fa-clipboard"></i>
                         Copy URL
                       </button>
-                      <%= link_to t('.actions.reset_url'), [@project, @broadcast], method: :patch, class: "btn btn-danger" %>
                     </div>
                   <% end %>
                 </div>
               </div>
               <hr>
             <% end %>
-            <p class="card-text"><%= "If you want to join the #{conference_option_name_from_key(@broadcast.conference_option)} meeting dedicated to this broadcast, follow the link below." %></p>
-            <%= link_to 'Video Conference', @conference_url, class: "btn btn-primary btn-block", target: '_blank' %>
+            <p class="card-text">If you want to join the ZOOM meeting dedicated to this broadcast, follow the link below.</p>
+            <%= link_to 'Video Conference', @conference_url, class: 'btn btn-primary btn-block', target: '_blank' %>
           </div>
           <div class="<%= class_string("tab-pane fade show", "active" => params[:active_tab] == 'recordings') %>" id="recordings">
             <div id="broadcast_recordings">
@@ -161,4 +159,4 @@
       </div>
     </div>
   </div>
-</div>
+<div>

app/views/broadcasts/splash.html.erb

@@ -1,51 +0,0 @@
-<div class="d-flex flex-row">
-  <div class="d-flex flex-column">
-    <%= product_wordmark :direct_me, prefix: t('.headings.welcome'), class: "h2" %>
-    <p class="text-muted"><%= t '.headings.subtitle' %>
-  </div>
-
-  <%= link_to t(".actions.book_demo"), 'https://meetings.hubspot.com/bray2', class: "btn btn-primary border align-self-center h-50 ml-auto mr-2 pb-2", target: '_blank' %>
-  <% if policy(Broadcast).new? %>
-    <%= link_to t(".actions.create_stream"), [:new, @project, :broadcast], class: "btn btn-success border align-self-center h-50 pb-2" %>
-  <% end %>
-</div>
-
-<hr>
-
-<div class="pt-2">
-  <div class="row">
-    <div class="col">
-      <div class="card-body p-0">
-        <div class="embed-responsive embed-responsive-16by9">
-          <div class="embed-responsive-item">
-            <div style="padding:56.25% 0 0 0;position:relative;"><iframe src="https://player.vimeo.com/video/435943632" style="position:absolute;top:0;left:0;width:100%;height:100%;" frameborder="0" allow="autoplay; fullscreen" allowfullscreen></iframe></div><script src="https://player.vimeo.com/api/player.js"></script>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="col">
-      <div class="row">
-        <div class="col">
-          <h3><%= t '.headings.how_it_works' %></h3>
-          <ol>
-            <li><%= t '.list_items.create_stream' %></li>
-            <li><%= t '.list_items.share_stream' %></li>
-            <li><%= t '.list_items.launch_video_conference' %></li>
-            <li><%= t '.list_items.share_files' %></li>
-          </ol>
-        </div>
-      </div>
-      <div class="row">
-        <div class="col">
-          <h3><%= t '.headings.benefits' %></h3>
-          <ul class="fa-ul ml-5">
-            <%= content_tag(:li, fa_icon("check li", text: t('.list_items.stream_from_mobile_app'))) %>
-            <%= content_tag(:li, fa_icon("check li", text: t('.list_items.direct_shoots_anywhere'))) %>
-            <%= content_tag(:li, fa_icon("check li", text: t('.list_items.share_live_stream'))) %>
-            <%= content_tag(:li, fa_icon("check li", text: t('.list_items.stream_multiple_cameras'))) %>
-          </ul>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>