fix MR comment

remove validation and add specs
add Chat Now button
2020-07-15 19:03:35 +02:00 · 2020-07-15 12:25:54 +02:00 · 2020-07-15 12:25:54 +02:00 · 2020-07-15 12:25:54 +02:00 · 2020-07-15 11:58:34 +02:00 · 2020-07-14 14:10:30 +02:00
154 changed files with 4448 additions and 408 deletions
--- a/6
+++ b/6
@@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 ruby "2.6.3"

 # Bundle edge Rails instead: gem "rails", github: "rails/rails"
-gem "rails", "~> 6.0.0"
+gem "rails", "~> 6.0.3.1"
 # Use postgresql as the database for Active Record
 gem "pg", "~> 0.18"
 # Use Puma as the app server
@@ -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.31.0", require: false, group: [:production, :review]
+gem "aws-sdk-s3", "~> 1.48", require: false, group: [:production, :review]
 # Allow AWS API requests to be signed using IAM credentials
-gem "aws-sigv4", "~> 1.0.2"
+gem "aws-sigv4", "~> 1.1"

 # Reduces boot times through caching; required in config/boot.rb
 gem "bootsnap", ">= 1.1.0", require: false
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -44,71 +44,71 @@ GEM
  remote: https://rubygems.org/
  specs:
    Ascii85 (1.0.3)
-    actioncable (6.0.0)
-      actionpack (= 6.0.0)
+    actioncable (6.0.3.2)
+      actionpack (= 6.0.3.2)
      nio4r (~> 2.0)
      websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.0)
-      actionpack (= 6.0.0)
-      activejob (= 6.0.0)
-      activerecord (= 6.0.0)
-      activestorage (= 6.0.0)
-      activesupport (= 6.0.0)
+    actionmailbox (6.0.3.2)
+      actionpack (= 6.0.3.2)
+      activejob (= 6.0.3.2)
+      activerecord (= 6.0.3.2)
+      activestorage (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
      mail (>= 2.7.1)
-    actionmailer (6.0.0)
-      actionpack (= 6.0.0)
-      actionview (= 6.0.0)
-      activejob (= 6.0.0)
+    actionmailer (6.0.3.2)
+      actionpack (= 6.0.3.2)
+      actionview (= 6.0.3.2)
+      activejob (= 6.0.3.2)
      mail (~> 2.5, >= 2.5.4)
      rails-dom-testing (~> 2.0)
-    actionpack (6.0.0)
-      actionview (= 6.0.0)
-      activesupport (= 6.0.0)
-      rack (~> 2.0)
+    actionpack (6.0.3.2)
+      actionview (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
+      rack (~> 2.0, >= 2.0.8)
      rack-test (>= 0.6.3)
      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.0)
-      actionpack (= 6.0.0)
-      activerecord (= 6.0.0)
-      activestorage (= 6.0.0)
-      activesupport (= 6.0.0)
+    actiontext (6.0.3.2)
+      actionpack (= 6.0.3.2)
+      activerecord (= 6.0.3.2)
+      activestorage (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
      nokogiri (>= 1.8.5)
-    actionview (6.0.0)
-      activesupport (= 6.0.0)
+    actionview (6.0.3.2)
+      activesupport (= 6.0.3.2)
      builder (~> 3.1)
      erubi (~> 1.4)
      rails-dom-testing (~> 2.0)
      rails-html-sanitizer (~> 1.1, >= 1.2.0)
    active_storage_base64 (1.0.0)
      rails (~> 6.0)
-    activejob (6.0.0)
-      activesupport (= 6.0.0)
+    activejob (6.0.3.2)
+      activesupport (= 6.0.3.2)
      globalid (>= 0.3.6)
-    activemodel (6.0.0)
-      activesupport (= 6.0.0)
+    activemodel (6.0.3.2)
+      activesupport (= 6.0.3.2)
    activemodel-serializers-xml (1.0.2)
      activemodel (> 5.x)
      activesupport (> 5.x)
      builder (~> 3.1)
-    activerecord (6.0.0)
-      activemodel (= 6.0.0)
-      activesupport (= 6.0.0)
+    activerecord (6.0.3.2)
+      activemodel (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
    activeresource (5.1.0)
      activemodel (>= 5.0, < 7)
      activemodel-serializers-xml (~> 1.0)
      activesupport (>= 5.0, < 7)
-    activestorage (6.0.0)
-      actionpack (= 6.0.0)
-      activejob (= 6.0.0)
-      activerecord (= 6.0.0)
+    activestorage (6.0.3.2)
+      actionpack (= 6.0.3.2)
+      activejob (= 6.0.3.2)
+      activerecord (= 6.0.3.2)
      marcel (~> 0.3.1)
-    activesupport (6.0.0)
+    activesupport (6.0.3.2)
      concurrent-ruby (~> 1.0, >= 1.0.2)
      i18n (>= 0.7, < 2)
      minitest (~> 5.1)
      tzinfo (~> 1.1)
-      zeitwerk (~> 2.1, >= 2.1.8)
+      zeitwerk (~> 2.2, >= 2.2.2)
    addressable (2.7.0)
      public_suffix (>= 2.0.2, < 5.0)
    afm (0.2.2)
@@ -117,21 +117,22 @@ GEM
    ast (2.4.0)
    autoprefixer-rails (9.7.3)
      execjs
-    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)
+    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)
      jmespath (~> 1.0)
-    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.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)
-      aws-sigv4 (~> 1.0)
-    aws-sigv4 (1.0.3)
+      aws-sigv4 (~> 1.1)
+    aws-sigv4 (1.2.1)
+      aws-eventstream (~> 1, >= 1.0.2)
    axlsx (3.0.0.pre)
      htmlentities (~> 4.3, >= 4.3.4)
      mimemagic (~> 0.3)
@@ -181,7 +182,7 @@ GEM
      coffee-script-source
      execjs
    coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
    connection_pool (2.2.2)
    countries (2.1.4)
      i18n_data (~> 0.8.0)
@@ -230,7 +231,7 @@ GEM
    hubspot-ruby (0.9.0)
      activesupport (>= 3.0.0)
      httparty (>= 0.10.0)
-    i18n (1.8.2)
+    i18n (1.8.3)
      concurrent-ruby (~> 1.0)
    i18n_data (0.8.0)
    i18n_yaml_sorter (0.2.0)
@@ -270,22 +271,22 @@ GEM
      ruby_dep (~> 1.2)
    loaf (0.8.1)
      rails (>= 3.2)
-    loofah (2.4.0)
+    loofah (2.6.0)
      crass (~> 1.0.2)
      nokogiri (>= 1.5.9)
    mail (2.7.1)
      mini_mime (>= 0.1.1)
    marcel (0.3.3)
      mimemagic (~> 0.3.2)
-    method_source (0.9.2)
+    method_source (1.0.0)
    mime-types (3.3)
      mime-types-data (~> 3.2015)
    mime-types-data (3.2019.0904)
-    mimemagic (0.3.3)
+    mimemagic (0.3.5)
    mini_magick (4.9.5)
    mini_mime (1.0.2)
    mini_portile2 (2.4.0)
-    minitest (5.14.0)
+    minitest (5.14.1)
    monetize (1.9.2)
      money (~> 6.12)
    money (6.13.4)
@@ -298,8 +299,8 @@ GEM
    msgpack (1.3.1)
    multi_xml (0.6.0)
    multipart-post (2.1.1)
-    nio4r (2.5.1)
-    nokogiri (1.10.7)
+    nio4r (2.5.2)
+    nokogiri (1.10.9)
      mini_portile2 (~> 2.4.0)
    oath (1.1.0)
      bcrypt
@@ -337,20 +338,20 @@ GEM
      rack
    rack-test (1.1.0)
      rack (>= 1.0, < 3)
-    rails (6.0.0)
-      actioncable (= 6.0.0)
-      actionmailbox (= 6.0.0)
-      actionmailer (= 6.0.0)
-      actionpack (= 6.0.0)
-      actiontext (= 6.0.0)
-      actionview (= 6.0.0)
-      activejob (= 6.0.0)
-      activemodel (= 6.0.0)
-      activerecord (= 6.0.0)
-      activestorage (= 6.0.0)
-      activesupport (= 6.0.0)
+    rails (6.0.3.2)
+      actioncable (= 6.0.3.2)
+      actionmailbox (= 6.0.3.2)
+      actionmailer (= 6.0.3.2)
+      actionpack (= 6.0.3.2)
+      actiontext (= 6.0.3.2)
+      actionview (= 6.0.3.2)
+      activejob (= 6.0.3.2)
+      activemodel (= 6.0.3.2)
+      activerecord (= 6.0.3.2)
+      activestorage (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
      bundler (>= 1.3.0)
-      railties (= 6.0.0)
+      railties (= 6.0.3.2)
      sprockets-rails (>= 2.0.0)
    rails-controller-testing (1.0.4)
      actionpack (>= 5.0.1.x)
@@ -363,9 +364,9 @@ GEM
      nokogiri (>= 1.6)
    rails-html-sanitizer (1.3.0)
      loofah (~> 2.3)
-    railties (6.0.0)
-      actionpack (= 6.0.0)
-      activesupport (= 6.0.0)
+    railties (6.0.3.2)
+      actionpack (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
      method_source
      rake (>= 0.8.7)
      thor (>= 0.20.3, < 2.0)
@@ -469,7 +470,7 @@ GEM
    turbolinks-source (5.2.0)
    typhoeus (1.3.1)
      ethon (>= 0.9.0)
-    tzinfo (1.2.6)
+    tzinfo (1.2.7)
      thread_safe (~> 0.1)
    uglifier (4.1.20)
      execjs (>= 0.3.0, < 3)
@@ -494,9 +495,9 @@ GEM
      activesupport (>= 4.2)
      rack-proxy (>= 0.6.1)
      railties (>= 4.2)
-    websocket-driver (0.7.1)
+    websocket-driver (0.7.2)
      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.4)
+    websocket-extensions (0.1.5)
    will_paginate (3.2.1)
    will_paginate-bootstrap4 (0.2.2)
      will_paginate (~> 3.0, >= 3.0.0)
@@ -504,7 +505,7 @@ GEM
    wkhtmltopdf-heroku (2.12.5.0)
    xpath (3.2.0)
      nokogiri (~> 1.8)
-    zeitwerk (2.2.2)
+    zeitwerk (2.3.1)

 PLATFORMS
  ruby
@@ -514,8 +515,8 @@ DEPENDENCIES
  activeresource (= 5.1.0)
  acts-as-taggable-on!
  analytics-ruby
-  aws-sdk-s3 (~> 1.31.0)
-  aws-sigv4 (~> 1.0.2)
+  aws-sdk-s3 (~> 1.48)
+  aws-sigv4 (~> 1.1)
  axlsx (~> 3.0.0.pre)
  axlsx_rails (~> 0.5.2)
  axlsx_styler (~> 0.2.0)
@@ -561,7 +562,7 @@ DEPENDENCIES
  rack!
  rack-contrib (~> 2.0.1)
  rack-cors
-  rails (~> 6.0.0)
+  rails (~> 6.0.3.1)
  rails-controller-testing (~> 1.0.4)
  rails-data-migrations (~> 1.2.0)
  redcarpet (~> 3.4.0)
--- a/app/assets/javascripts/play_previous_recordings.js
+++ b/app/assets/javascripts/play_previous_recordings.js
@@ -1,24 +0,0 @@
-$(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>');
-});
-
--- a/app/assets/javascripts/play_previous_recordings.js.erb
+++ b/app/assets/javascripts/play_previous_recordings.js.erb
@@ -0,0 +1,26 @@
+$(document).on("click", "[data-behavior=play_recording]", function() {
+    if ($(this).hasClass('active')){
+        return false;
+    }
+
+    console.warn('Play prev : ', playback_url);
+
+    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>');
+});
--- a/app/assets/javascripts/update_required_status.js
+++ b/app/assets/javascripts/update_required_status.js
@@ -0,0 +1,13 @@
+$(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");
+        });
+    });
+});
--- a/app/assets/stylesheets/_bootstrap_overrides.scss
+++ b/app/assets/stylesheets/_bootstrap_overrides.scss
@@ -14,6 +14,7 @@ $red: #F9002B;
 $green: #51B61B;
 $teal: #32C498;
 $purple: #5139EE;
+$yellow: #F9BE1B;
 $dark: $gray-900;
 $success: $teal;
 $link-color: $body-color;
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -37,14 +37,14 @@ label {
  &.release-me {
    span:last-child {
      background-color: $teal;
-      color: $body-color;
+      color: $white;
    }
  }

  &.direct-me {
    span:last-child {
      background-color: $green;
-      color: $body-color;
+      color: $white;
    }
  }

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

--- a/app/controllers/accounts_controller.rb
+++ b/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.email, account.name, i_m_interested_in: user.interested_product_name)
+          SubmitHubspotFormJob.perform_later(user.first_name, user.last_name, 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")
--- a/app/controllers/admin/task_requests_controller.rb
+++ b/app/controllers/admin/task_requests_controller.rb
@@ -0,0 +1,36 @@
+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
--- a/app/controllers/api/api_controller.rb
+++ b/app/controllers/api/api_controller.rb
@@ -17,7 +17,9 @@ class Api::ApiController < ActionController::Base
  def return_error(exception)
    raise exception if Rails.env.test? 

-    logger.error "==Handled======="
+    Raven.capture_exception(exception)
+
+    logger.error "==Handled======"
    logger.error exception.message
    logger.error exception.backtrace.join("\n")
    logger.error "==Handled=======" 
--- a/app/controllers/api/appearance_releases_controller.rb
+++ b/app/controllers/api/appearance_releases_controller.rb
@@ -19,5 +19,11 @@ 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
--- a/app/controllers/api/medical_releases_controller.rb
+++ b/app/controllers/api/medical_releases_controller.rb
@@ -0,0 +1,11 @@
+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
--- a/app/controllers/api/misc_releases_controller.rb
+++ b/app/controllers/api/misc_releases_controller.rb
@@ -0,0 +1,11 @@
+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
--- a/app/controllers/api/releases_controller.rb
+++ b/app/controllers/api/releases_controller.rb
@@ -103,10 +103,16 @@ class Api::ReleasesController < Api::ApiController
      if ["appearance_release", "talent_release"].include?(name)
        has_many :guardian_photos do
          data do
-            [@object.guardian_photo.try(:attachment)].compact
+            [
+              @object.guardian_photo.try(:attachment),
+              @object.guardian_2_photo.try(:attachment)
+            ].compact
          end
          meta do
-            { count: @object.try(:guardian_photo).try(:attached?) ? 1 : 0  }
+            { count:
+              (@object.try(:guardian_photo).try(:attached?) ? 1 : 0) +
+              (@object.try(:guardian_2_photo).try(:attached?) ? 1 : 0)
+            }
          end
        end
      end
@@ -170,7 +176,7 @@ class Api::ReleasesController < Api::ApiController

  def release_create_params
    parameters = params.require(model_name).permit!
-    keys = model_constant.new.attributes.keys + [:guardian_photo, :person_photo, :photos, :signature, :signature_base64, :file_infos_attributes]
+    keys = model_constant.new.attributes.keys + [:guardian_photo, :guardian_2_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
--- a/app/controllers/api/sync_controller.rb
+++ b/app/controllers/api/sync_controller.rb
@@ -10,8 +10,10 @@ 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 + @talent_releases + @acquired_media_releases ))
+    @notes = notes_query(Note.where(notable: @appearance_releases + @location_releases + @material_releases + @medical_releases + @misc_releases + @talent_releases + @acquired_media_releases ))

    render json: {
      data: {
@@ -22,6 +24,8 @@ 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
      }
--- a/app/controllers/api/talent_releases_controller.rb
+++ b/app/controllers/api/talent_releases_controller.rb
@@ -17,5 +17,11 @@ 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
--- a/app/controllers/api/user_token_controller.rb
+++ b/app/controllers/api/user_token_controller.rb
@@ -5,6 +5,8 @@ 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")
--- a/app/controllers/approvals_controller.rb
+++ b/app/controllers/approvals_controller.rb
@@ -0,0 +1,21 @@
+class ApprovalsController < ApplicationController
+  include MedicalReleaseContext
+
+  before_action :set_medical_release
+  before_action :set_project
+
+  layout "project"
+
+  def create
+    @medical_release.approve_by(current_user)
+    if @medical_release.save
+      redirect_to [@project, :medical_releases], notice: t('.release_approved')
+    end
+  end
+
+  private
+
+  def set_project
+    @project = @medical_release.project
+  end
+end
--- a/app/controllers/broadcasts_controller.rb
+++ b/app/controllers/broadcasts_controller.rb
@@ -5,6 +5,7 @@ class BroadcastsController < ApplicationController
  before_action :build_broadcast, only: [:new, :create]
  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])
@@ -32,6 +33,11 @@ class BroadcastsController < ApplicationController
  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)
    @files = @broadcast.files.order("created_at DESC").paginate(page: 1)

@@ -49,6 +55,10 @@ class BroadcastsController < ApplicationController

  private

+  def show_splash_screen
+    render :splash if broadcasts.count.zero?
+  end
+
  def broadcast_params
    params.require(:broadcast).permit(:name, files: [])
  end
--- a/app/controllers/contract_templates_controller.rb
+++ b/app/controllers/contract_templates_controller.rb
@@ -7,6 +7,7 @@ class ContractTemplatesController < ApplicationController

  before_action :set_project, except: [:destroy]
  before_action :set_contract_template, only: [:destroy]
+  before_action :show_splash_screen, only: :index

  def index
    @contract_templates = contract_templates.non_archived.order_by_name.paginate(page: params[:page])
@@ -38,6 +39,10 @@ class ContractTemplatesController < ApplicationController

  private

+  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
@@ -57,18 +62,19 @@ class ContractTemplatesController < ApplicationController
  def contract_template_params
    params
      .require(:contract_template)
-      .permit(:name, :release_type, :body, :guardian_clause, :fee,
+      .permit(:name, :release_type, :body, :guardian_clause,
+              :signature_legal_text, :fee,
              :applicable_medium_id, :applicable_medium_text,
              :territory_id, :territory_text,
-              :term_id, :term_text,
+              :term_id, :term_text, :accessibility,
              :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

--- a/app/controllers/public/misc_releases_controller.rb
+++ b/app/controllers/public/misc_releases_controller.rb
@@ -46,6 +46,7 @@ class Public::MiscReleasesController < Public::BaseController
      .permit(
        person_params,
        guardian_params,
+        questionnaire_params,
        :signature_base64,
        :locale,
        :contract_template,
@@ -85,6 +86,26 @@ 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
--- a/app/controllers/public/talent_releases_controller.rb
+++ b/app/controllers/public/talent_releases_controller.rb
@@ -45,42 +45,59 @@ class Public::TalentReleasesController < Public::BaseController
      .permit(
        person_params,
        guardian_params,
+        second_guardian_params,
        :signature_base64,
        :locale,
        :contract_template,
-        photos: [],
+        photos: []
      )
  end

  def person_params
-    [
-      :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,
+    %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
-    [
-      :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,
+    %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

--- a/app/controllers/stream_notifications_controller.rb
+++ b/app/controllers/stream_notifications_controller.rb
@@ -28,8 +28,9 @@ 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)
+      recording = @broadcast.broadcast_recordings.create!(asset_uid: asset_uid, asset_playback_uid: playback_uid, file_name: file_name, duration: duration)
      recordings = @broadcast.broadcast_recordings.order_by_recent.paginate(page: params[:page])

      link = helpers.link_to(recording.broadcast_name.titleize, recording.download_url, target: "_blank")
@@ -60,9 +61,14 @@ class StreamNotificationsController < ApplicationController
  def set_broadcast
    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)
+      @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
    end
  end

--- a/app/controllers/talent_releases_controller.rb
+++ b/app/controllers/talent_releases_controller.rb
@@ -61,15 +61,67 @@ 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_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
-    )
+    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)
  end

  def build_talent_release(attrs = {})
--- a/app/controllers/task_requests_controller.rb
+++ b/app/controllers/task_requests_controller.rb
@@ -0,0 +1,81 @@
+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
--- a/app/controllers/tasks_controller.rb
+++ b/app/controllers/tasks_controller.rb
@@ -0,0 +1,19 @@
+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
--- a/app/controllers/videos_controller.rb
+++ b/app/controllers/videos_controller.rb
@@ -3,6 +3,7 @@ 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?
@@ -60,6 +61,10 @@ 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
--- a/app/helpers/description_list_helper.rb
+++ b/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)
-    term        = translation_for(record, attribute)
+  def description_list_pair_for(record, attribute, append: nil, custom_label: nil)
+    term        = custom_label.nil? ? translation_for(record, attribute) : custom_label
    definition  = record.send(attribute)

    description_list_pair(term, definition, append: append)
--- a/app/helpers/dropzone_helper.rb
+++ b/app/helpers/dropzone_helper.rb
@@ -11,6 +11,8 @@ 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
--- a/app/helpers/tooltip_helper.rb
+++ b/app/helpers/tooltip_helper.rb
@@ -5,4 +5,12 @@ module TooltipHelper
      concat tag.div(class: "tooltip-inner")
    end
  end
+
+  def get_approval_data_for_medical_release(medical_release)
+    if medical_release.approved_by_user_name.present?
+      "#{medical_release.approved_by_user_name} [#{medical_release.approved_by_user_email}]"
+    else
+      medical_release.approved_by_user_email
+    end
+  end
 end
--- a/app/helpers/wordmark_helper.rb
+++ b/app/helpers/wordmark_helper.rb
@@ -13,10 +13,13 @@ module WordmarkHelper
    css += options[:class].to_s

    content_tag(:div, class: css) do
-      safe_join [
+      elements = [
        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
--- a/app/javascript/packs/datepickers.js
+++ b/app/javascript/packs/datepickers.js
@@ -1,5 +1,6 @@
 $(document).on("turbolinks:load", () => {
  $('.datepicker-control').datepicker({
-        format: "yyyy-mm-dd"
+      format: "yyyy-mm-dd",
+      todayHighlight: true
  });
 });
--- a/app/jobs/generate_contracts_zip_job.rb
+++ b/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,9 +20,14 @@ 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)
+      @download.file.attach(io: File.open(zipfile_name), filename: "#{@folder_name}.zip")
    end
  rescue StandardError => e
    Rails.logger.error("Failed to generate download for project (##{project.id}) with release type #{release_type}\n" + e.message)
@@ -43,6 +48,19 @@ 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
--- a/app/jobs/submit_hubspot_form_job.rb
+++ b/app/jobs/submit_hubspot_form_job.rb
@@ -1,12 +1,14 @@
 class SubmitHubspotFormJob < ApplicationJob
  queue_as :default

-  def perform(email, company_name, additional_params = {})
+  def perform(first_name, last_name, email, company_name, additional_params = {})
    hubspot_form_guid = ENV["HUBSPOT_FORM_GUID"]
    return unless hubspot_form_guid.present?

    submission_params = {
-      email: email, 
+      first_name: first_name,
+      last_name: last_name,
+      email: email,
      company: company_name
    }.merge(additional_params)

--- a/app/jobs/submit_hubspot_task_request_form_job.rb
+++ b/app/jobs/submit_hubspot_task_request_form_job.rb
@@ -0,0 +1,18 @@
+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
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -54,6 +54,7 @@ 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),
@@ -82,6 +83,10 @@ 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"
@@ -90,6 +95,8 @@ class Account < ApplicationRecord
      "DirectME"
    when "releaseme"
      "ReleaseME"
+    when "taskme"
+      "TaskME"
    when "me_suite"
      "ME Suite"
    end
--- a/app/models/acquired_media_release.rb
+++ b/app/models/acquired_media_release.rb
@@ -9,6 +9,13 @@ class AcquiredMediaRelease < ApplicationRecord
  include Signable
  include Syncable
  include PersonName
+  include CsvExportable
+
+  class << self
+    def custom_csv_exportable_headers
+      %i[name file_infos_count]
+    end
+  end

  has_many :file_infos, as: :releasable, dependent: :destroy

@@ -57,4 +64,8 @@ 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
--- a/app/models/appearance_release.rb
+++ b/app/models/appearance_release.rb
@@ -15,6 +15,13 @@ class AppearanceRelease < ApplicationRecord
  include SecondGuardianPhotoable
  include GuardianName
  include SecondGuardianName
+  include CsvExportable
+
+  class << self
+    def custom_csv_exportable_headers
+      %i[name contact_info]
+    end
+  end

  has_one_attached :person_photo

--- a/app/models/concerns/csv_exportable.rb
+++ b/app/models/concerns/csv_exportable.rb
@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module CsvExportable
+  extend ActiveSupport::Concern
+
+  COMMON_HEADERS = %i[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
--- a/app/models/contract_template.rb
+++ b/app/models/contract_template.rb
@@ -5,6 +5,8 @@ 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'
@@ -19,6 +21,7 @@ class ContractTemplate < ApplicationRecord
  monetize :fee_cents
  has_rich_text :body
  has_rich_text :guardian_clause
+  has_rich_text :signature_legal_text

  validates :name, presence: true
  validates :release_type, presence: true
@@ -40,6 +43,8 @@ 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
@@ -59,4 +64,14 @@ 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 attributes
+    result = super()
+    result[:signature_legal_text] = signature_legal_text.as_json 
+    result
+  end
 end
--- a/app/models/location_release.rb
+++ b/app/models/location_release.rb
@@ -10,6 +10,13 @@ class LocationRelease < ApplicationRecord
  include Syncable
  include Taggable
  include PersonName
+  include CsvExportable
+
+  class << self
+    def custom_csv_exportable_headers
+      %i[name address]
+    end
+  end

  composed_of :address,
              mapping: [
--- a/app/models/material_release.rb
+++ b/app/models/material_release.rb
@@ -10,8 +10,15 @@ class MaterialRelease < ApplicationRecord
  include Syncable
  include Taggable
  include PersonName
-  
-  composed_of :person_address, 
+  include CsvExportable
+
+  class << self
+    def custom_csv_exportable_headers
+      %i[name]
+    end
+  end
+
+  composed_of :person_address,
              class_name: "Address",
              mapping: [
                %w(person_address_street1 street1),
@@ -30,15 +37,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
--- a/app/models/medical_release.rb
+++ b/app/models/medical_release.rb
@@ -11,18 +11,47 @@ class MedicalRelease < ApplicationRecord
  include SecondGuardianPhotoable
  include GuardianName
  include SecondGuardianName
+  include CsvExportable
+
+  class << self
+    def custom_csv_exportable_headers
+      %i[approved? 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) 
+              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]
              ]

  def self.face_photo_acceptable_content_types
@@ -32,6 +61,7 @@ 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

@@ -76,4 +106,27 @@ 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
+
+  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?
+    approved_at.present?
+  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
--- a/app/models/misc_release.rb
+++ b/app/models/misc_release.rb
@@ -9,6 +9,15 @@ class MiscRelease < ApplicationRecord
  include PersonName
  include GuardianName
  include GuardianPhotoable
+  include CsvExportable
+
+  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",
--- a/app/models/music_release.rb
+++ b/app/models/music_release.rb
@@ -7,7 +7,14 @@ class MusicRelease < ApplicationRecord
  include Searchable
  include Taggable
  include PersonName
-  
+  include CsvExportable
+
+  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
@@ -72,6 +79,18 @@ 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
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -24,6 +24,7 @@ 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

--- a/app/models/qr_code.rb
+++ b/app/models/qr_code.rb
@@ -10,7 +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)
+    new(url, "#{filename}.png")
  end

  def initialize(url, filename = "qrcode.png")
--- a/app/models/talent_release.rb
+++ b/app/models/talent_release.rb
@@ -11,7 +11,16 @@ class TalentRelease < ApplicationRecord
  include Taggable
  include PersonName
  include GuardianPhotoable
+  include SecondGuardianPhotoable
  include GuardianName
+  include SecondGuardianName
+  include CsvExportable
+
+  class << self
+    def custom_csv_exportable_headers
+      %i[name phone email]
+    end
+  end

  composed_of :person_address, 
              class_name: "Address",
@@ -35,6 +44,17 @@ 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
@@ -58,6 +78,7 @@ 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

@@ -72,6 +93,14 @@ 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
@@ -84,6 +113,10 @@ class TalentRelease < ApplicationRecord
    false
  end

+  def second_guardian_present?
+    guardian_2_first_name.present?
+  end
+
  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
--- a/app/models/task_request.rb
+++ b/app/models/task_request.rb
@@ -0,0 +1,10 @@
+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
--- a/app/policies/contract_template_policy.rb
+++ b/app/policies/contract_template_policy.rb
@@ -3,8 +3,10 @@ class ContractTemplatePolicy < ApplicationPolicy
    def resolve
      if user.account_manager?
        scope.left_outer_joins(:project).where(projects: {account: user.account})
-      else
+      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 })
      end
    end
  end
--- a/app/policies/medical_release_policy.rb
+++ b/app/policies/medical_release_policy.rb
@@ -15,6 +15,14 @@ class MedicalReleasePolicy < ReleasePolicy
    user.manager? || user.account_manager?
  end

+  def review?
+    user.account_manager?
+  end
+
+  def approve?
+    review?
+  end
+
  def edit_photos?
    true
  end
--- a/app/policies/project_policy.rb
+++ b/app/policies/project_policy.rb
@@ -36,4 +36,8 @@ class ProjectPolicy < ApplicationPolicy
  def show_downloads?
    show?
  end
+
+  def show_task_results?
+    show?
+  end
 end
--- a/app/policies/task_request_policy.rb
+++ b/app/policies/task_request_policy.rb
@@ -0,0 +1,29 @@
+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
--- a/app/telemetry/analytics.rb
+++ b/app/telemetry/analytics.rb
@@ -151,6 +151,24 @@ 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

--- a/app/views/admin/application/_side_nav.html.erb
+++ b/app/views/admin/application/_side_nav.html.erb
@@ -7,6 +7,9 @@
      <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>
--- a/app/views/admin/task_requests/_form.html.erb
+++ b/app/views/admin/task_requests/_form.html.erb
@@ -0,0 +1,13 @@
+<%= 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 %>
--- a/app/views/admin/task_requests/_task_request.html.erb
+++ b/app/views/admin/task_requests/_task_request.html.erb
@@ -0,0 +1,32 @@
+<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>
--- a/app/views/admin/task_requests/edit.html.erb
+++ b/app/views/admin/task_requests/edit.html.erb
@@ -0,0 +1,6 @@
+<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>
--- a/app/views/admin/task_requests/index.html.erb
+++ b/app/views/admin/task_requests/index.html.erb
@@ -0,0 +1,25 @@
+<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>
--- a/app/views/admin/task_requests/show.html.erb
+++ b/app/views/admin/task_requests/show.html.erb
@@ -0,0 +1,49 @@
+<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>
--- a/app/views/application/_sidebar.html.erb
+++ b/app/views/application/_sidebar.html.erb
@@ -11,6 +11,14 @@
  <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 %>
--- a/app/views/approvals/new.html.erb
+++ b/app/views/approvals/new.html.erb
@@ -0,0 +1,15 @@
+<div class="card shadow-sm">
+  <%= card_header text: t(".heading"), close_action_path: [@project, :medical_releases] %>
+  <div class="card-body">
+    <embed class="embeded-contract-preview" type="application/pdf" src="<%= url_for [@medical_release, :contracts, format: "pdf"] %>" width="90%" height="1200" />
+
+    <%= bootstrap_form_with model: @medical_release, method: :post, url: medical_release_approvals_path(@medical_release), local: true do |form| %>
+      <div class="row align-items-center text-center mt-4">
+        <%= link_to t("shared.cancel"), [@medical_release.project, :medical_releases], 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>
--- a/app/views/broadcasts/show.html.erb
+++ b/app/views/broadcasts/show.html.erb
@@ -33,7 +33,7 @@
            <%= 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>
-              <span class="dropdown-item active"><%= fa_icon("check", text: @broadcast.name.titleize) %></span>
+              <%= link_to fa_icon("check", text: @broadcast.name.titleize), "#", class: "dropdown-item active" %>
              <% @multi_view_broadcasts.each do |broadcast| %>
                <% if broadcast.id != @broadcast.id %>
                  <%= link_to broadcast.name.titleize, broadcast.url, class: class_string("dropdown-item", "active" => @broadcast.id == broadcast.id) %>
@@ -102,6 +102,7 @@
                        <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>
@@ -110,6 +111,7 @@
                        <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>
@@ -159,4 +161,4 @@
      </div>
    </div>
  </div>
-<div>
+</div>
--- a/app/views/broadcasts/splash.html.erb
+++ b/app/views/broadcasts/splash.html.erb
@@ -0,0 +1,51 @@
+<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>
--- a/app/views/contract_templates/_contract_template.html.erb
+++ b/app/views/contract_templates/_contract_template.html.erb
@@ -15,7 +15,7 @@
  <td>
    <%= contract_template.releases.size %>
  </td>
-  <td class="text-right">
+  <td class="text-right" nowrap>
    <div class="btn-group">
      <%= button_tag t(".actions.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">
@@ -27,7 +27,7 @@
          <%= link_to fa_icon("print", text: "Print"), [:new, contract_template, :blank_contracts], class: "dropdown-item", target: :_blank %>
        <% end %>
        <% if policy(contract_template).destroy? %>
-          <%= link_to fa_icon("archive", text: "Archive"), contract_template, class: "dropdown-item", method: :delete, data: { confirm: "Are you sure?" } %>
+          <%= link_to fa_icon("trash", text: "Delete"), contract_template, class: "dropdown-item", method: :delete, data: { confirm: "Are you sure?" } %>
        <% end %>
      </div>
    </div>
--- a/app/views/contract_templates/_form.html.erb
+++ b/app/views/contract_templates/_form.html.erb
@@ -2,7 +2,11 @@
  <%= field_set_tag content_tag(:span, t(".release_info.heading"), class: "h6 text-muted text-uppercase") do %>
    <div class="form-row">
      <%= form.text_field :name, wrapper_class: "col-sm-6" %>
-      <%= form.select :release_type, options_for_release_type_select(project, @release_type), { wrapper_class: "col-sm-6" }, data: { toggle: "collapse-select", target_show_values_mapping: { "#guardian_clause": %w(appearance talent misc medical), "#fee_field": %w(appearance talent location material acquired_media), "#exploitable_rights_fields": %w(appearance talent location material acquired_media), "#custom_fields": %w(medical) } }, class: "form-control custom-select" %>
+      <%= form.select :release_type, options_for_release_type_select(project, @release_type), { wrapper_class: "col-sm-6" }, data: { toggle: "collapse-select", target_show_values_mapping: { "#guardian_clause": %w(appearance talent misc medical), "#fee_field": %w(appearance talent location material acquired_media), "#exploitable_rights_fields": %w(appearance talent location material acquired_media), "#custom_fields": %w(medical misc) } }, class: "form-control custom-select" %>
+    </div>
+    <div class="form-row mb-3">
+      <%= form.radio_button :accessibility, :public_template, label: "Public", wrapper_class: "mr-3" %>
+      <%= form.radio_button :accessibility, :private_template, label: "Private" %>
    </div>
    <div class="form-row" id="fee_field">
      <%= form.number_field :fee, min:"0", max:"99999999", step: "0.01", prepend: "$", wrapper_class: "col-sm-6" %>
@@ -25,6 +29,11 @@
        <%= form.rich_text_area :guardian_clause %>
      <% end %>
    </div>
+    <div id="signature_legal_text">
+      <%= form.form_group do %>
+        <%= form.rich_text_area :signature_legal_text %>
+      <% end %>
+    </div>
  <% end %>

  <%= field_set_tag content_tag(:span, t(".custom_fields.heading"), class: "h6 text-muted text-uppercase"), id: "custom_fields", style: "display: none;" do %>
--- a/app/views/contract_templates/splash.html.erb
+++ b/app/views/contract_templates/splash.html.erb
@@ -0,0 +1,50 @@
+<div class="d-flex flex-row">
+  <div class="d-flex flex-column">
+    <%= product_wordmark :release_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(ContractTemplate).new? %>
+    <%= link_to t(".actions.create_template"), [:new, @project, :contract_template], 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/435942851" 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_releases' %></li>
+            <li><%= t '.list_items.download_mobile_app' %></li>
+            <li><%= t '.list_items.print_QR_code' %></li>
+            <li><%= t '.list_items.releases_automatically_organized' %></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.all_releases_available'))) %>
+            <%= content_tag(:li, fa_icon("check li", text: t('.list_items.manage_large_audience'))) %>
+            <%= content_tag(:li, fa_icon("check li", text: t('.list_items.add_tags_and_notes'))) %>
+          </ul>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
--- a/app/views/contracts/_for_office_use_only.erb
+++ b/app/views/contracts/_for_office_use_only.erb
@@ -0,0 +1,13 @@
+<% if preview %>
+  <h1>PREVIEW ONLY</h1>
+<% end %>
+
+<p class="heading"><strong><u><%= t '.heading' %></u></strong></p>
+
+<dl>
+  <%= description_list_pair t('.description_labels.producer'), releasable.project.account.name %>
+  <%= description_list_pair t('.description_labels.production'), releasable.project.name %>
+  <%= description_list_pair t('.description_labels.employee_issued_to'), releasable.name %>
+  <%= description_list_pair t('.description_labels.issued_by'), releasable.approved_by_user_name %>
+  <%= description_list_pair t('.description_labels.date_issued'), releasable.approved_at %>
+</dl>
--- a/app/views/contracts/_medical_questionnaire.html.erb
+++ b/app/views/contracts/_medical_questionnaire.html.erb
@@ -1,8 +1,8 @@
-<p class="heading"><strong><u><%= t ".heading" %></u></strong></p>
+<p class="heading"><strong><u><%= t ".heading.#{releasable.model_name.param_key}" %></u></strong></p>
  
-<% (1..MedicalRelease::NUMBER_OF_CUSTOM_FIELDS).each do |n| %>
+<% (1..releasable.class::NUMBER_OF_CUSTOM_FIELDS).each do |n| %>
  <% if contract_template.public_send("question_#{n}_text").present? %>
    <p><strong><%= contract_template.public_send("question_#{n}_text") %></strong></p>
    <p><%= releasable.public_send("question_#{n}_answer") %></p>
  <% end %>
-<% end %>
+<% end %>
--- a/app/views/contracts/pdf.html.erb
+++ b/app/views/contracts/pdf.html.erb
@@ -16,15 +16,22 @@
  <%= contract_template.guardian_clause %>
 <% end %>

-<% if releasable.model_name == "MedicalRelease" %>
+<% if releasable.model_name.in? %w(MedicalRelease MiscRelease) %>
  <div class="page">
-    <%= render "contracts/medical_questionnaire", releasable: releasable, contract_template: contract_template, preview: preview %>
+    <%= render "contracts/questionnaire", releasable: releasable, contract_template: contract_template, preview: preview %>
  </div>  
 <% end %>

 <div class="page">
  <%= render "contracts/signature_page", releasable: releasable, contract_template: contract_template, preview: preview %>
 </div>
+
+<% if releasable.class == MedicalRelease && releasable.approved? %>
+  <div class="page">
+    <%= render "contracts/for_office_use_only", releasable: releasable, preview: preview %>
+  </div>
+<% end %>
+
 <% if releasable.class == AcquiredMediaRelease %>
  <div class="page">
    <%= render "contracts/files", release: releasable, preview: preview %>
--- a/app/views/medical_releases/_medical_release.html.erb
+++ b/app/views/medical_releases/_medical_release.html.erb
@@ -1,5 +1,13 @@
 <tr id="<%= dom_id(medical_release) %>">
  <td data-behavior="select"><%= check_box_tag "medical_release_ids[]", medical_release.id, false %></td>
+  <td class="text-center">
+    <% if medical_release.approved? %>
+      <% tooltip_user_data = get_approval_data_for_medical_release(medical_release) %>
+      <i class="fa fa-check-circle fa-2x text-success"
+         data-toggle="tooltip"
+         title="<%= t '.messages.approved_tooltip', user: tooltip_user_data, timestamp: medical_release.approved_at %>"></i>
+    <% end %>
+  </td>
  <td>
    <% if medical_release.photo.attached? %>
      <%= image_tag medium_variant(medical_release.photo), class: "img-fluid" %>
@@ -37,6 +45,9 @@
        <% if policy(medical_release.tags).new? %>
          <%= link_to fa_icon("tags fw", text: "Tags"), [:new, medical_release, :acts_as_taggable_on_tag], class: "dropdown-item", remote: true %>
        <% end %>
+        <% if policy(MedicalRelease).review? %>
+          <%= link_to fa_icon("search fw", text: t('.actions.review')), new_medical_release_approvals_path(medical_release), class: "dropdown-item" %>
+        <% end %>
        <% if policy(MedicalRelease).download_single? && policy(Contract).show? && (medical_release.contract.attached? || medical_release.contract_template.present?) %>
          <%= link_to fa_icon("download fw", text: "Download"), [medical_release, :contracts, format: "pdf"], class: "dropdown-item", target: "_blank" %>
        <% end %>
--- a/app/views/medical_releases/index.html.erb
+++ b/app/views/medical_releases/index.html.erb
@@ -22,6 +22,7 @@
    <thead class="thead-light">
      <tr>
        <th data-behavior="all-selectable"><%= check_box_tag "medical_release_ids[]", false, false %></th>
+        <th><%= t '.table_headers.approved'%></th>
        <th></th>
        <th><%= MedicalRelease.human_attribute_name(:person_name) %></th>
        <th><%= MedicalRelease.human_attribute_name(:contact_info) %></th>
--- a/app/views/medical_releases/review.html.erb
+++ b/app/views/medical_releases/review.html.erb
@@ -0,0 +1,15 @@
+<div class="card shadow-sm">
+  <%= card_header text: t(".heading"), close_action_path: [@project, :medical_releases] %>
+  <div class="card-body">
+    <embed class="embeded-contract-preview" type="application/pdf" src="<%= url_for [@medical_release, :contracts, format: "pdf"] %>" width="90%" height="1200" />
+
+    <%= bootstrap_form_with model: @medical_release, method: :patch, url: [:approve, @medical_release], local: true do |form| %>
+      <div class="row align-items-center text-center mt-4">
+        <%= link_to t("shared.cancel"), [@medical_release.project, :medical_releases], 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>
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -16,6 +16,11 @@
      <%= link_to t("projects.show.downloads"), [@project, :downloads], class: "text-decoration-none text-reset stretched-link" %>
    <% end %>
  <% end %>
+  <% if policy(Project).show_task_results? %>
+    <%= render "folder_card" do %>
+      <%= link_to t("projects.show.tasks"), [@project, :tasks], class: "text-decoration-none text-reset stretched-link" %>
+    <% end %>
+  <% end %>
 </div>

 <hr/>
--- a/app/views/public/acquired_media_releases/new.html.erb
+++ b/app/views/public/acquired_media_releases/new.html.erb
@@ -50,7 +50,7 @@
      <hr>

      <%= card_field_set_tag t(".signature.heading") do %>
-        <%= render "shared/signature_fields", form: form %>
+        <%= render "shared/signature_fields", form: form, signature_legal_text: @contract_template.signature_legal_text %>
      <% end %>

      <div class="mt-5">
--- a/app/views/public/appearance_releases/new.html.erb
+++ b/app/views/public/appearance_releases/new.html.erb
@@ -16,7 +16,7 @@

      <% unless @contract_template.guardian_clause.blank? %>
        <%= form.form_group :minor do %>
-          <%= form.check_box :minor, label: t("helpers.label.appearance_release.minor"), data: { target: "[data-ujs-target=guardian-fields]", toggle: "collapse" } %>
+          <%= form.check_box :minor, label: t("helpers.label.appearance_release.minor"), data: { behavior: "update-required-status", target: "[data-ujs-target=guardian-fields]", toggle: "collapse" } %>
        <% end %>

        <%= card_field_set_tag t(".guardian_clause.heading") do %>
@@ -72,12 +72,12 @@
        <div class="<%= class_string("collapse" => !@appearance_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: @appearance_release.minor?, wrapper_class: "col-sm-3" %>
-              <%= form.text_field :guardian_last_name, required: @appearance_release.minor?, wrapper_class: "col-sm-3" %>
-              <%= form.phone_field :guardian_phone, required: @appearance_release.minor?, wrapper_class: "col-sm-6" %>
-              <%= form.text_field :guardian_email, required: @appearance_release.minor?, wrapper_class: "col-sm-6" %>
+              <%= form.text_field :guardian_first_name, required: @appearance_release.minor?, wrapper_class: "col-sm-3", data: { required_tag: "guardian" } %>
+              <%= form.text_field :guardian_last_name, required: @appearance_release.minor?, wrapper_class: "col-sm-3", data: { required_tag: "guardian" } %>
+              <%= form.phone_field :guardian_phone, required: @appearance_release.minor?, wrapper_class: "col-sm-6", data: { required_tag: "guardian" } %>
+              <%= form.text_field :guardian_email, required: @appearance_release.minor?, wrapper_class: "col-sm-6", data: { required_tag: "guardian" } %>
            </div>
-            <%= render "shared/address_fields", form: form, subject: "guardian", required: @appearance_release.minor? %>
+            <%= render "shared/address_fields", form: form, subject: "guardian", required: @appearance_release.minor?, data: { required_tag: "guardian" } %>
          <% end %>

          <hr>
@@ -156,7 +156,7 @@
      <% end %>

      <%= card_field_set_tag t(".signature.heading") do %>
-        <%= render "shared/signature_fields", form: form %>
+        <%= render "shared/signature_fields", form: form, signature_legal_text: @contract_template.signature_legal_text %>
      <% end %>

      <div class="mt-5">
--- a/app/views/public/location_releases/new.html.erb
+++ b/app/views/public/location_releases/new.html.erb
@@ -50,7 +50,7 @@
      <% end %>

      <%= card_field_set_tag t(".signature.heading") do %>
-        <%= render "shared/signature_fields", form: form, instruction: 'An Authorized Signatory' %>
+        <%= render "shared/signature_fields", form: form, instruction: 'An Authorized Signatory', signature_legal_text: @contract_template.signature_legal_text %>
      <% end %>

      <div class="mt-5">
--- a/app/views/public/material_releases/new.html.erb
+++ b/app/views/public/material_releases/new.html.erb
@@ -41,7 +41,7 @@
      <hr>

      <%= card_field_set_tag t(".signature.heading") do %>
-        <%= render "shared/signature_fields", form: form, instruction: 'For Owner or Authorized Signatory' %>
+        <%= render "shared/signature_fields", form: form, instruction: 'For Owner or Authorized Signatory', signature_legal_text: @contract_template.signature_legal_text %>
      <% end %>

      <div class="mt-5">
--- a/app/views/public/medical_releases/new.html.erb
+++ b/app/views/public/medical_releases/new.html.erb
@@ -16,7 +16,7 @@

      <% unless @contract_template.guardian_clause.blank? %>
        <%= form.form_group :minor do %>
-          <%= form.check_box :minor, label: t("helpers.label.medical_release.minor"), data: { target: "[data-ujs-target=guardian-fields]", toggle: "collapse" } %>
+          <%= form.check_box :minor, label: t("helpers.label.medical_release.minor"), data: { behavior: "update-required-status", target: "[data-ujs-target=guardian-fields]", toggle: "collapse" } %>
        <% end %>

        <%= card_field_set_tag t(".guardian_clause.heading") do %>
@@ -30,7 +30,7 @@
          <% (1..MedicalRelease::NUMBER_OF_CUSTOM_FIELDS).each do |n| %>
            <% if @contract_template.public_send("question_#{n}_text").present? %>
              <div class="form-row">
-                <%= form.text_area "question_#{n}_answer", wrapper_class: "col-sm-12", label: @contract_template.public_send("question_#{n}_text") %>
+                <%= form.text_area "question_#{n}_answer", required: true, wrapper_class: "col-sm-12", label: @contract_template.public_send("question_#{n}_text") %>
              </div>
            <% end %>
          <% end %>
@@ -59,14 +59,12 @@
        <div class="<%= class_string("collapse" => !@medical_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: @medical_release.minor?, wrapper_class: "col-sm-3" %>
-              <%= form.text_field :guardian_last_name, required: @medical_release.minor?, wrapper_class: "col-sm-3" %>
-              <%= form.phone_field :guardian_phone, required: @medical_release.minor?, wrapper_class: "col-sm-6" %>
+              <%= form.text_field :guardian_first_name, required: @medical_release.minor?, wrapper_class: "col-sm-3", data: { required_tag: "guardian" } %>
+              <%= form.text_field :guardian_last_name, required: @medical_release.minor?, wrapper_class: "col-sm-3", data: { required_tag: "guardian" } %>
+              <%= form.phone_field :guardian_phone, required: @medical_release.minor?, wrapper_class: "col-sm-6", data: { required_tag: "guardian" } %>
+              <%= form.text_field :guardian_email, required: @medical_release.minor?, wrapper_class: "col-sm-6", data: { required_tag: "guardian" } %>
            </div>
-            <div class="form-row">
-              <%= form.text_field :guardian_email, required: @medical_release.minor?, wrapper_class: "col-sm-6" %>
-            </div>
-            <%= render "shared/address_fields", form: form, subject: "guardian", required: @medical_release.minor? %>
+            <%= render "shared/address_fields", form: form, subject: "guardian", required: @medical_release.minor?, data: { required_tag: "guardian" } %>
          <% end %>

          <hr>
@@ -147,7 +145,7 @@
      <% end %>

      <%= card_field_set_tag t(".signature.heading") do %>
-        <%= render "shared/signature_fields", form: form %>
+        <%= render "shared/signature_fields", form: form, signature_legal_text: @contract_template.signature_legal_text %>
      <% end %>

      <div class="mt-5">
--- a/app/views/public/misc_releases/new.html.erb
+++ b/app/views/public/misc_releases/new.html.erb
@@ -11,7 +11,7 @@

      <% unless @contract_template.guardian_clause.blank? %>
        <%= form.form_group :minor do %>
-          <%= form.check_box :minor, label: t("helpers.label.appearance_release.minor"), data: { target: "[data-ujs-target=guardian-fields]", toggle: "collapse" } %>
+          <%= form.check_box :minor, label: t("helpers.label.appearance_release.minor"), data: { behavior: "update-required-status", target: "[data-ujs-target=guardian-fields]", toggle: "collapse" } %>
        <% end %>

        <%= card_field_set_tag t(".guardian_clause.heading") do %>
@@ -20,15 +20,26 @@
        <hr>
      <% end %>

+      <% if @contract_template.has_questionnaire? %>
+        <%= card_field_set_tag t(".questionnaire.heading") do %>
+          <% (1..MiscRelease::NUMBER_OF_CUSTOM_FIELDS).each do |n| %>
+            <% if @contract_template.public_send("question_#{n}_text").present? %>
+              <div class="form-row">
+                <%= form.text_area "question_#{n}_answer", wrapper_class: "col-sm-12", label: @contract_template.public_send("question_#{n}_text") %>
+              </div>
+            <% end %>
+          <% end %>
+        <% end %>
+        <hr>
+      <% end %>
+
      <%= card_field_set_tag t(".personal_info.heading") do %>
        <div class="alert alert-warning font-weight-bold"><%= t ".personal_info.instructions" %></div>
        <div class="form-row">
          <%= form.text_field :person_first_name, required: true, wrapper_class: "col-sm-6" %>
          <%= form.text_field :person_last_name, required: true, wrapper_class: "col-sm-6" %>
          <%= form.phone_field :person_phone, wrapper_class: "col-sm-6" %>
-        </div>
-        <div class="form-row">
-          <%= form.email_field :person_email, wrapper_class: "col-sm-6" %>
+          <%= form.email_field :person_email, required: true, wrapper_class: "col-sm-6" %>
        </div>
        <%= render "shared/address_fields", form: form, subject: "person" %>
      <% end %>
@@ -43,14 +54,12 @@
        <div class="<%= class_string("collapse" => !@misc_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: @misc_release.minor?, wrapper_class: "col-sm-3" %>
-              <%= form.text_field :guardian_last_name, required: @misc_release.minor?, wrapper_class: "col-sm-3" %>
-              <%= form.phone_field :guardian_phone, wrapper_class: "col-sm-6" %>
+              <%= form.text_field :guardian_first_name, required: @misc_release.minor?, wrapper_class: "col-sm-3", data: { required_tag: "guardian" } %>
+              <%= form.text_field :guardian_last_name, required: @misc_release.minor?, wrapper_class: "col-sm-3", data: { required_tag: "guardian" } %>
+              <%= form.phone_field :guardian_phone, wrapper_class: "col-sm-6", data: { required_tag: "guardian" } %>
+              <%= form.text_field :guardian_email, wrapper_class: "col-sm-6", data: { required_tag: "guardian" } %>
            </div>
-            <div class="form-row">
-              <%= form.text_field :guardian_email, wrapper_class: "col-sm-6" %>
-            </div>
-            <%= render "shared/address_fields", form: form, subject: "guardian" %>
+            <%= render "shared/address_fields", form: form, subject: "guardian", data: { required_tag: "guardian" } %>
          <% end %>

          <hr>
@@ -86,7 +95,7 @@
      <% end %>

      <%= card_field_set_tag t(".signature.heading") do %>
-        <%= render "shared/signature_fields", form: form %>
+        <%= render "shared/signature_fields", form: form, signature_legal_text: @contract_template.signature_legal_text %>
      <% end %>

      <div class="mt-5">
--- a/app/views/public/talent_releases/new.html.erb
+++ b/app/views/public/talent_releases/new.html.erb
@@ -16,7 +16,7 @@

      <% unless @contract_template.guardian_clause.blank? %>
        <%= form.form_group :minor do %>
-          <%= form.check_box :minor, label: t("helpers.label.appearance_release.minor"), data: { target: "[data-ujs-target=guardian-fields]", toggle: "collapse" } %>
+          <%= form.check_box :minor, label: t("helpers.label.appearance_release.minor"), data: { behavior: "update-required-status", target: "[data-ujs-target=guardian-fields]", toggle: "collapse" } %>
        <% end %>

        <%= card_field_set_tag t(".guardian_clause.heading") do %>
@@ -31,8 +31,6 @@
          <%= form.text_field :person_first_name, required: true, wrapper_class: "col-sm-6" %>
          <%= form.text_field :person_last_name, required: true, wrapper_class: "col-sm-6" %>
          <%= form.phone_field :person_phone, wrapper_class: "col-sm-6" %>
-        </div>
-        <div class="form-row">
          <%= form.email_field :person_email, wrapper_class: "col-sm-6" %>
        </div>
        <%= render "shared/address_fields", form: form, subject: "person" %>
@@ -48,14 +46,12 @@
        <div class="<%= class_string("collapse" => !@talent_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: @talent_release.minor?, wrapper_class: "col-sm-3" %>
-              <%= form.text_field :guardian_last_name, required: @talent_release.minor?, wrapper_class: "col-sm-3" %>
-              <%= form.phone_field :guardian_phone, wrapper_class: "col-sm-6" %>
+              <%= form.text_field :guardian_first_name, required: @talent_release.minor?, wrapper_class: "col-sm-3", data: { required_tag: "guardian" } %>
+              <%= form.text_field :guardian_last_name, required: @talent_release.minor?, wrapper_class: "col-sm-3", data: { required_tag: "guardian" } %>
+              <%= form.phone_field :guardian_phone, wrapper_class: "col-sm-6", data: { required_tag: "guardian" } %>
+              <%= form.text_field :guardian_email, wrapper_class: "col-sm-6", data: { required_tag: "guardian" } %>
            </div>
-            <div class="form-row">
-              <%= form.text_field :guardian_email, wrapper_class: "col-sm-6" %>
-            </div>
-            <%= render "shared/address_fields", form: form, subject: "guardian" %>
+            <%= render "shared/address_fields", form: form, subject: "guardian", data: { required_tag: "guardian" } %>
          <% end %>

          <hr>
@@ -87,13 +83,55 @@
            </div>
          <% end %>

+          <hr>
+
+          <%= 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 %>
+
+          <hr>
+
+          <%= card_field_set_tag t(".guardian_2_photo.heading") do %>
+            <div class="alert alert-warning font-weight-bold"><%= t ".guardian_2_photo.instructions" %></div>
+            <div class="text-center">
+              <div 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><%= t ".guardian_2_photo.no_photo" %></span>
+                </div>
+              </div>
+              <div class="d-inline-block text-left">
+                <% if @talent_release.guardian_2_photo.attached? %>
+                  <%= javascript_tag nonce: true do %>
+                    App.PhotoPreview.set("[data-behavior=guardian-photo-preview]", "<%= url_for(@talent_release.guardian_2_photo.variant(auto_orient: true, resize: '200x200')) %>");
+                  <% end %>
+                <% end %>
+                <div class="hidden-file-input">
+                  <%= form.hidden_field :guardian_2_photo, value: form.object.guardian_2_photo.signed_id if @talent_release.guardian_2_photo.attached? %>
+                  <%= form.file_field :guardian_2_photo, hide_label: true, data: { ujs_target: "guardian-2-photo-input" }, accept: @talent_release.class.face_photo_acceptable_content_types.join(","), direct_upload: true %>
+                </div>
+                <%= button_tag t(".guardian_2_photo.take_photo"), type: "button", class: "btn btn-lg btn-primary take-photo-button", data: { behavior: "trigger-click", target: "[data-ujs-target=guardian-2-photo-input]" } %>
+              </div>
+              <p class="p-2 font-weight-bold">
+                <%= fa_icon "arrow-up", text: t(".guardian_2_photo.camera_instructions_html") %><br>
+                <small class="text-muted"><%= t ".guardian_2_photo.warning" %></small>
+              </p>
+            </div>
+          <% end %>
+
+          <hr>

        </div>
        <hr>
      <% end %>

      <%= card_field_set_tag t(".signature.heading") do %>
-        <%= render "shared/signature_fields", form: form %>
+        <%= render "shared/signature_fields", form: form, signature_legal_text: @contract_template.signature_legal_text %>
      <% end %>

      <div class="mt-5">
--- a/app/views/shared/_address_fields.html.erb
+++ b/app/views/shared/_address_fields.html.erb
@@ -1,14 +1,15 @@
 <% field_name_prefix = subject.present? ? "#{subject}_" : "" %>
 <% required = required || false %>
+<% data = data || nil %>

 <div class="form-row">
-  <%= form.text_field "#{field_name_prefix}address_street1", required: required, wrapper_class: "col-sm-6" %>
+  <%= form.text_field "#{field_name_prefix}address_street1", required: required, wrapper_class: "col-sm-6", data: data %>
  <%= form.text_field "#{field_name_prefix}address_street2", wrapper_class: "col-sm-6" %>
 </div>
 <div class="form-row">
-  <%= form.text_field "#{field_name_prefix}address_city", required: required, wrapper_class: "col-sm-6" %>
-  <%= form.text_field "#{field_name_prefix}address_state", required: required, wrapper_class: "col-sm-3" %>
-  <%= form.text_field "#{field_name_prefix}address_zip", required: required, wrapper_class: "col-sm-3" %>
+  <%= form.text_field "#{field_name_prefix}address_city", required: required, wrapper_class: "col-sm-6", data: data %>
+  <%= form.text_field "#{field_name_prefix}address_state", required: required, wrapper_class: "col-sm-3", data: data %>
+  <%= form.text_field "#{field_name_prefix}address_zip", required: required, wrapper_class: "col-sm-3", data: data %>
 </div>
 <%= form.form_group "#{field_name_prefix}address_country" do %>
  <%= form.label "#{field_name_prefix}address_country" %>
--- a/app/views/shared/_signature_fields.html.erb
+++ b/app/views/shared/_signature_fields.html.erb
@@ -12,4 +12,8 @@
    <%= fa_icon "refresh" %> <%= t "shared.clear" %>
  <% end %>
 </div>
+<br>

+<% if local_assigns[:signature_legal_text] && signature_legal_text.present? %>
+  <div class="alert alert-warning font-weight-bold"><%= signature_legal_text %></div>
+<% end %>
--- a/app/views/talent_releases/_form.html.erb
+++ b/app/views/talent_releases/_form.html.erb
@@ -9,22 +9,30 @@
      <%= form.text_field :person_first_name, required: true, wrapper_class: "col-sm-3" %>
      <%= form.text_field :person_last_name, required: true, wrapper_class: "col-sm-3" %>
      <%= form.phone_field :person_phone, wrapper_class: "col-sm-6" %>
-    </div>
-    <div class="form-row">
      <%= form.email_field :person_email, wrapper_class: "col-sm-6" %>
    </div>
    <%= render "shared/address_fields", form: form, subject: "person" %>

    <div class="<%= class_string("collapse" => !talent_release.minor?) %>" data-ujs-target="guardian-fields">
-      <div class="form-row">
-        <%= form.text_field :guardian_first_name, required: talent_release.minor?, wrapper_class: "col-sm-3" %>
-        <%= form.text_field :guardian_last_name, required: talent_release.minor?, wrapper_class: "col-sm-3" %>
-        <%= form.phone_field :guardian_phone, wrapper_class: "col-sm-6" %>
-      </div>
-      <div class="form-row">
-        <%= form.text_field :guardian_email, wrapper_class: "col-sm-6" %>
-      </div>
-      <%= render "shared/address_fields", form: form, subject: "guardian" %>
+      <%= card_field_set_tag t(".guardian_info.heading") do %>
+        <div class="form-row">
+          <%= form.text_field :guardian_first_name, required: talent_release.minor?, wrapper_class: "col-sm-3" %>
+          <%= form.text_field :guardian_last_name, required: talent_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, required: talent_release.minor?, wrapper_class: "col-sm-3" %>
+          <%= form.text_field :guardian_2_last_name, required: talent_release.minor?, 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 %>

@@ -44,20 +52,36 @@
      <br>
      <div class="text-left">
        <p><%= t(".photos.guardian_photo.heading") %></p>
-        <div class="d-inline-block mb-2" data-behavior="guardian-photo-preview" data-file-input="[data-ujs-target=guardian-photo-input]">
+        <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 talent_release.guardian_photo.attached? %>
          <%= javascript_tag nonce: true do %>
-            App.PhotoPreview.set("[data-behavior=guardian-photo-preview]", "<%= url_for(talent_release.guardian_photo.variant(auto_orient: true, resize: '200x200')) %>");
+            App.PhotoPreview.set("#guardian-photo-preview", "<%= url_for(talent_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 talent_release.guardian_photo.attached?%>
          <%= form.file_field :guardian_photo, hide_label: true, data: { ujs_target: "guardian-photo-input" }, help: "PNG or JPG only", accept: talent_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 talent_release.guardian_2_photo.attached? %>
+          <%= javascript_tag nonce: true do %>
+            App.PhotoPreview.set("#guardian-2-photo-preview", "<%= url_for(talent_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 talent_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: talent_release.class.face_photo_acceptable_content_types.join(",") %>
+        </div>
      </div>
      <hr>
    </div>
--- a/app/views/task_requests/_file.html.erb
+++ b/app/views/task_requests/_file.html.erb
@@ -0,0 +1,6 @@
+<tr>
+  <td><%= file.filename %></td>
+  <td class="text-right">
+    <%= link_to fa_icon("download"), file, target: "_blank" %>
+  </td>
+</tr>
--- a/app/views/task_requests/_form.html.erb
+++ b/app/views/task_requests/_form.html.erb
@@ -0,0 +1,49 @@
+<%= errors_summary_for task_request %>
+
+<%= bootstrap_form_with model: model, url: [@project, @task_request, show_chat: true], local: true do |form| %>
+
+  <div class="d-flex">
+    <div class="row">
+      <div class="col-xl-10 col-12">
+        <div class="alert alert-info text-center text-md-left">
+          <%= fa_icon "info-circle" %>
+          <strong><%= t '.info_message' %></strong>
+        </div>
+      </div>
+      <div class="col-xl-2 col-12">
+        <%= form.submit t('.actions.chat_now'), class: "btn btn-block btn-warning pt-4 pb-4 mb-1", data: { disable_with: t("shared.disable_with") } %>
+      </div>
+    </div>
+  </div>
+
+  <%= form.text_area :description, label: t('.labels.description') %>
+  <%= form.text_field :deadline, class: "datepicker-control", label: t('.labels.deadline') %>
+  <%= form.number_field :time_allowed, label: t('.labels.time_allowed'), min: 2, step: 1, pattern: "\d+" %>
+  <%= form.text_area :additional_notes, label: t('.labels.additional_notes') %>
+  <%= field_set_tag content_tag(:span, t('.labels.files'), class: "h6 text-muted text-uppercase") do %>
+    <div class="field d-none">
+      <%= form.label :files %>
+      <%= form.file_field :files, disable: true, direct_upload: true, multiple: true, id: "task_request_files", hide_label: true %>
+      <% task_request.files.each do |file| %>
+        <% unless file.persisted? %>
+          <%= hidden_field_tag "#{task_request.model_name.param_key}[files][]", file.signed_id %>
+        <% end %>
+      <% end %>
+    </div>
+
+    <div class="dropzone field border-dashed" 
+      data-accepted-files="audio/*,image/*,video/*,application/*"
+      data-behavior="dropzone" 
+      data-file-input-id="task_request_files" 
+      data-existing-files="<%= mock_photos_json(task_request.files) %>" 
+      data-placeholder="<%= dropzone_placeholder_message_for(task_request) %>"
+      data-submit-button="#submit_folder"></div>
+  <% end %>
+
+  <div class="row align-items-center text-center mt-4">
+    <%= link_to t("shared.cancel"), [project, :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 %>
--- a/app/views/task_requests/_task_request.html.erb
+++ b/app/views/task_requests/_task_request.html.erb
@@ -0,0 +1,45 @@
+<tr>
+  <td>
+    <%= task_request.created_at.strftime('%D') %>
+  </td>
+  <td>
+    <%= task_request.deadline.try(:strftime, '%D') %>
+  </td>
+  <td>
+    <%= truncate(task_request.description) {
+      link_to t('.actions.read_more'),
+              '#',
+              class: 'alert-link',
+              data: {
+                  toggle: "popover",
+                  content: task_request.description,
+                  trigger: "hover"
+              }
+    } %>
+  </td>
+  <td>
+    <%= task_request.time_allowed %>
+  </td>
+  <td>
+    <%= task_request.status.titleize %>
+  </td>
+  <td class="text-right">
+    <div class="btn-group">
+      <%= button_tag t(".actions.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">
+        <% if policy(task_request).show? %>
+          <%= link_to fa_icon("tasks fw", text: "View"), [task_request.project, task_request], class: "dropdown-item", target: '_blank' %>
+        <% end %>
+        <% if policy(task_request).edit? %>
+          <%= link_to fa_icon("pencil fw", text: "Edit"), [:edit, task_request.project, task_request], class: "dropdown-item" %>
+        <% end %>
+        <% if policy(task_request).open_deliverable? && task_request.status == "completed" %>
+          <%= link_to fa_icon("external-link fw", text: t(".actions.open_deliverable")), task_request.deliverable_url, class: "dropdown-item", target: '_blank' %>
+        <% end %>
+        <% if policy(task_request).cancel? && !task_request.cancelled? %>
+          <%= link_to fa_icon("ban fw", text: "Cancel"), [:cancel, task_request.project, task_request], class: "dropdown-item", method: :post %>
+        <% end %>
+      </div>
+    </div>
+  </td>
+</tr>
--- a/app/views/task_requests/create.html.erb
+++ b/app/views/task_requests/create.html.erb
@@ -0,0 +1,16 @@
+<% if params[:show_chat] %>
+  <%= javascript_include_tag "//js.hs-scripts.com/7344617.js", defer: "defer", async: true, id: "hs-script-loader" %>
+  <%= javascript_tag nonce: true do %>
+    function onConversationsAPIReady() {
+      window.HubSpotConversations.widget.load({ widgetOpen: true });
+      window.HubSpotConversations.widget.open();
+    }
+    if (window.HubSpotConversations) {
+      onConversationsAPIReady();
+    } else {
+      window.hsConversationsOnReady = [onConversationsAPIReady];
+    }
+  <% end %>
+<% end %>
+<p class="alert alert-success p-3 lead text-center"><%= t '.success_message' %></p>
+<%= link_to fa_icon("arrow-left", text: "Back"), [@project, :task_requests], class: "btn btn-primary" %>
--- a/app/views/task_requests/edit.html.erb
+++ b/app/views/task_requests/edit.html.erb
@@ -0,0 +1,6 @@
+<div class="card shadow-sm">
+  <%= card_header text: t(".heading"), close_action_path: [@project, :task_requests] %>
+  <div class="card-body">
+    <%= render "form", model: [@project, @task_request], task_request: @task_request, project: @project %>
+  </div>
+</div>
--- a/app/views/task_requests/index.html.erb
+++ b/app/views/task_requests/index.html.erb
@@ -0,0 +1,39 @@
+<%= product_wordmark :task_me, class: "small mb-3" %>
+
+<div class="row">
+  <div class="col-md-12">
+    <div class="d-md-flex d-sm-flex flex-sm-column flex-md-row flex-md-wrap mb-3">
+      <% if policy(TaskRequest).new? %>
+        <%= link_to fa_icon("plus", text: t(".actions.new")), [:new, @project, :task_request], class: "btn btn-primary mb-2" %>
+      <% end %>
+    </div>
+  </div>
+</div>
+
+<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><%= t(".table_headers.task_request_created_on") %></th>
+        <th><%= t(".table_headers.task_request_deadline") %></th>
+        <th><%= t(".table_headers.task_request_description") %></th>
+        <th><%= t(".table_headers.task_request_time_allowed") %></th>
+        <th><%= t(".table_headers.task_request_status") %></th>
+        <th></th>
+      </tr>
+    </thead>
+    <tbody id="task_requests">
+      <% 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>
+
+<div id="task_requests_pagination" class="mt-3">
+  <%= will_paginate @task_requests %>
+</div>
--- a/app/views/task_requests/new.html.erb
+++ b/app/views/task_requests/new.html.erb
@@ -0,0 +1,6 @@
+<div class="card shadow-sm">
+  <%= card_header text: t(".heading"), close_action_path: [@project, :task_requests] %>
+  <div class="card-body">
+    <%= render "form", model: [@project, @task_request], task_request: @task_request, project: @project %>
+  </div>
+</div>
--- a/app/views/task_requests/show.html.erb
+++ b/app/views/task_requests/show.html.erb
@@ -0,0 +1,46 @@
+<div class="card shadow-sm">
+  <%= card_header text: "Task Details", close_action_path: [@project, :task_requests] %>
+  <div class="card-body">
+    <div class="row">
+      <div class="col-md-6 col-sm-12">
+        <dl>
+          <%= description_list_pair_for @task_request, :description, append: ":" %>
+          <%= description_list_pair_for @task_request, :created_at, 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, :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: "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>
--- a/app/views/task_requests/splash.html.erb
+++ b/app/views/task_requests/splash.html.erb
@@ -0,0 +1,58 @@
+<div class="d-flex flex-row">
+  <div class="d-flex flex-column">
+    <%= product_wordmark :task_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(TaskRequest).new? %>
+    <%= link_to t(".actions.create_task_request"), [:new, @project, :task_request], 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">
+            <table class="w-100 h-100 bg-secondary">
+              <tbody>
+              <tr>
+                <td class="text-center align-middle text-white">
+                  Video tutorial will be available soon
+                </td>
+              </tr>
+              </tbody>
+            </table>
+          </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.enter_task_request' %></li>
+            <li><%= t '.list_items.state_deadline' %></li>
+            <li><%= t '.list_items.enter_number_of_hours' %></li>
+            <li><%= t '.list_items.virtual_assistant_delivers_task' %></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.reduces_need_for_full_time_staff'))) %>
+            <%= content_tag(:li, fa_icon("check li", text: t('.list_items.reduces_workload'))) %>
+            <%= content_tag(:li, fa_icon("check li", text: t('.list_items.spend_per_task'))) %>
+          </ul>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
--- a/app/views/tasks/_task.html.erb
+++ b/app/views/tasks/_task.html.erb
@@ -0,0 +1,17 @@
+<tr>
+  <td>
+    <%= task.created_at.strftime('%D') %>
+  </td>
+  <td>
+    <%= task.deadline.try(:strftime, '%D') %>
+  </td>
+  <td>
+    <%= task.time_allowed %>
+  </td>
+  <td>
+    <%= task.status.titleize %>
+  </td>
+  <td>
+    <%= link_to "View Deliverable", task.deliverable_url, target: "_blank" %>
+  </td>
+</tr>
--- a/app/views/tasks/index.html.erb
+++ b/app/views/tasks/index.html.erb
@@ -0,0 +1,26 @@
+<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><%= t(".table_headers.task_request_created_on") %></th>
+        <th><%= t(".table_headers.task_request_deadline") %></th>
+        <th><%= t(".table_headers.task_request_time_allowed") %></th>
+        <th><%= t(".table_headers.task_request_status") %></th>
+        <th><%= t(".table_headers.task_request_results") %></th>
+      </tr>
+    </thead>
+    <tbody id="task_requests">
+      <% if @tasks.any? %>
+        <%= render partial: "task", collection: @tasks %>
+      <% else %>
+        <tr>
+          <td colspan="5" class="py-4 text-center text-muted"><%= t(".empty") %></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>
+
+<div id="task_requests_pagination" class="mt-3">
+  <%= will_paginate @tasks %>
+</div>
--- a/app/views/videos/splash.html.erb
+++ b/app/views/videos/splash.html.erb
@@ -0,0 +1,51 @@
+<div class="d-flex flex-row">
+  <div class="d-flex flex-column">
+    <%= product_wordmark :deliver_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(Video).new? %>
+    <%= link_to t(".actions.upload_video"), [:landing, @project, :videos], 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/435943995" 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.import_video' %></li>
+            <li><%= t '.list_items.import_EDLs' %></li>
+            <li><%= t '.list_items.AI_generates_documents' %></li>
+            <li><%= t '.list_items.download_documents' %></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.reduces_labor_cost'))) %>
+            <%= content_tag(:li, fa_icon("check li", text: t('.list_items.more_accurate'))) %>
+            <%= content_tag(:li, fa_icon("check li", text: t('.list_items.simplifies_cue_sheets'))) %>
+            <%= content_tag(:li, fa_icon("check li", text: t('.list_items.production_elements_logs'))) %>
+          </ul>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -50,6 +50,7 @@ en:
      empty: Acquired Media Releases will appear here
      table_headers:
        file_infos_count: No. Files
+        name: Name
        notes: Notes
        signed_at: Date Signed
        tags: Tags
@@ -97,6 +98,13 @@ en:
    application:
      header:
        sign_out: Sign Out
+    task_requests:
+      index:
+        empty: Task requests will appear here
+      show:
+        empty: Attached files will appear here.
+      update:
+        notice: The task request has been updated successfully
    users:
      create:
        notice: The user was created
@@ -144,6 +152,8 @@ en:
      empty: Appearance Releases will appear here
      imported_appearance_release_missing_attachment: Person photo or contract missing for imported appearance release
      table_headers:
+        contact_info: Contact info
+        name: Name
        notes: Notes
        signed_at: Date Signed
        tags: Tags
@@ -164,6 +174,13 @@ en:
    sidebar:
      files: Files
      team_member: Team Member
+  approvals:
+    create:
+      release_approved: Medical release has been approved
+    new:
+      actions:
+        approve: Approve
+      heading: Review Medical Release
  blank_contracts:
    new:
      number_of_copies_label: Number of copies
@@ -200,6 +217,29 @@ en:
    new:
      heading:
        Create Live Stream
+    show:
+      actions:
+        reset_url: Reset URL
+    splash:
+      actions:
+        book_demo: Schedule a Demo
+        create_stream: Create New Live Stream
+      headings:
+        benefits: Benefits
+        how_it_works: How It Works
+        subtitle: Remote directing and video village solution
+        welcome: Welcome to
+      list_items:
+        create_stream: Create a live stream
+        direct_shoots_anywhere: Direct shoots anywhere around the world
+        launch_video_conference: Launch Video Conference using plugin
+        share_files: Share files via the ME Suite mobile app
+        share_live_stream: Share live stream with clients all over the the world
+        share_stream: Share live stream link with clients
+        stream_from_mobile_app: Stream from ME Suite Mobile app, or via a professional camera
+        stream_multiple_cameras: Stream multiple cameras at one time
+    update:
+      reset_notice: The Share URL has been reset, and the previous URL will no longer work. Please click "Copy URL" and share it again with those who you want to have access to this live stream
  bulk_taggings:
    new_bulk_tag_modal:
      submit: Add
@@ -226,7 +266,7 @@ en:
      archived_notice: The release template has been archived
    form:
      custom_fields:
-        heading: Medical Questionnaire
+        heading: Questionnaire
        instructions: Please list the questions you wish the signer to answer. Any unused question fields will be hidden.
      exploitable_rights:
        heading: Exploitable Rights
@@ -245,9 +285,32 @@ en:
        signed_release_count: No. Signed Releases
    new:
      heading: New Release Template
+    splash:
+      actions:
+        book_demo: Schedule a Demo
+        create_template: Create New Release Template
+      headings:
+        benefits: Benefits
+        how_it_works: How It Works
+        subtitle: The easiest way to create and manage releases.
+        welcome: Welcome to
+      list_items:
+        add_tags_and_notes: Add tags and notes to releases for added organization and searchability
+        all_releases_available: All release types available including Covid Medical, Appearance, Location and more
+        create_releases: Create releases for your video shoot
+        download_mobile_app: Download the ME Suite mobile app
+        manage_large_audience: Easily manage large audiences with the crowd control feature
+        print_QR_code: Print out release QR codes
+        releases_automatically_organized: Releases are automatically organized as they’re submitted
  contracts:
-    medical_questionnaire:
-      heading: Medical Questionnaire
+    for_office_use_only:
+      description_labels:
+        date_issued: Date Issued
+        employee_issued_to: Employee Issued To
+        issued_by: Issued By
+        producer: Producer
+        production: Production
+      heading: For Office Use Only
    photos:
      guardian_2_photo_heading: Second guardian photo
      guardian_photo_heading: Guardian photo
@@ -257,6 +320,10 @@ en:
      minor_photos_heading:
        one: Minor photo
        other: Minor photos
+    questionnaire:
+      heading: 
+        medical_release: Medical Questionnaire
+        misc_release: Questionnaire
    signature_page:
      heading: Signature Page
      instructions: "By signing this signature page, as of the date listed below, I hereby agree, acknowledge and accept the terms and conditions listed in this %{releasable_name}."
@@ -320,6 +387,9 @@ en:
      contract_template:
        fee: Leave at $0.00 for no-fee
        guardian_clause: Leave blank if not required for this contract
+        signature_legal_text: Leave blank if not required for this contract
+      task_request:
+        time_allowed: Minimum of 2 hours, no partial hours allowed
      video:
        audio_only_edl_file: If you do not upload an Audio Only EDL, the software will not generate a BiG Music Cue Sheet.
        edl_file: Please follow our directions on exporting the All Tracks EDL. Failure to do so could result in inaccurate and incomplete reporting.
@@ -442,6 +512,30 @@ en:
        person_last_name: Last name
        person_name: Name
        person_phone: Phone number
+      misc_release:
+        guardian_address_city: Guardian city
+        guardian_address_country: Guardian country
+        guardian_address_state: Guardian state
+        guardian_address_street1: Guardian address
+        guardian_address_street2: Guardian address (Line 2)
+        guardian_address_zip: Guardian zip code
+        guardian_email: Guardian email
+        guardian_first_name: Guardian first name
+        guardian_last_name: Guardian last name
+        guardian_phone: Guardian phone
+        minor: Is the person a minor?
+        person_address_city: City
+        person_address_country: Country
+        person_address_state: State
+        person_address_street1: Address
+        person_address_street2: Address (Line 2)
+        person_address_zip: Zip code
+        person_date_of_birth: Date of birth
+        person_email: Email address
+        person_first_name: First name
+        person_last_name: Last name
+        person_name: Name
+        person_phone: Phone number
      music_release:
        person_address: Address
        person_address_city: City
@@ -458,6 +552,16 @@ en:
      project:
        predefined_client_name: Client
      talent_release:
+        guardian_2_address_city: Guardian 2 city
+        guardian_2_address_country: Guardian 2 country
+        guardian_2_address_state: Guardian 2 state
+        guardian_2_address_street1: Guardian 2 address
+        guardian_2_address_street2: Guardian 2 address (Line 2)
+        guardian_2_address_zip: Guardian 2 zip code
+        guardian_2_email: Guardian 2 email
+        guardian_2_first_name: Guardian 2 first name
+        guardian_2_last_name: Guardian 2 last name
+        guardian_2_phone: Guardian 2 phone
        guardian_address_city: City
        guardian_address_country: Guardian country
        guardian_address_state: State
@@ -646,6 +750,7 @@ en:
      empty: Location Releases will appear here
      table_headers:
        address: Address
+        name: Name
        notes: Notes
        signed_at: Date Signed
        tags: Tags
@@ -680,6 +785,7 @@ en:
        search: Search
      empty: Material Releases will appear here
      table_headers:
+        name: Name
        notes: Notes
        signed_at: Date Signed
        tags: Tags
@@ -692,6 +798,8 @@ en:
    update:
      notice: The material release has been updated
  medical_releases:
+    custom_validation_errors:
+      question_answer_is_required: answer is required
    destroy:
      alert: The medical release has been deleted
    index:
@@ -699,12 +807,19 @@ en:
        search: Search
      empty: Medical releases will appear here
      table_headers:
+        approved: Approved
+        approved?: Approved
+        contact_info: Contact info
+        name: Person name
        notes: Notes
        signed_at: Date Signed
        tags: Tags
    medical_release:
      actions:
        manage: Manage
+        review: Review
+      messages:
+        approved_tooltip: Approved by %{user} on %{timestamp}
  misc_releases:
    destroy:
      alert: The misc release has been deleted
@@ -713,6 +828,8 @@ en:
        search: Search
      empty: Misc Releases will appear here
      table_headers:
+        contact_info: Contact info
+        name: Person name
        notes: Notes
        signed_at: Date Signed
        tags: Tags
@@ -747,6 +864,7 @@ en:
      table_headers:
        composers_count: No. Composers
        file_infos_count: No. Files
+        name: Name
        notes: Notes
        publishers_count: No. Publishers
        signed_at: Date Signed
@@ -857,6 +975,7 @@ en:
      music_release: Music Releases (%{count})
      report: Reports
      talent_release: Talent Releases (%{count})
+      tasks: Tasks
  public:
    acquired_media_releases:
      new:
@@ -1004,6 +1123,8 @@ en:
          instructions: Now, enter your personal information.
        photo:
          heading: Photos
+        questionnaire:
+          heading: Questionnaire
        signature:
          heading: Signature
    talent_releases:
@@ -1011,6 +1132,16 @@ en:
        notice: Your release has been signed. Thank you!
      new:
        cancel: Cancel
+        guardian_2_info:
+          heading: Second Guardian Information (if company requires)
+        guardian_2_photo:
+          camera_instructions_html: Click <em>Take Photo</em> to Turn ON Camera
+          heading: Second Guardian Photo
+          instructions: >
+            Lastly, it's time for second guardian to take a selfie photo! Please remove your hat and sunglasses (regular eyewear is ok), make sure that you are the only person in the photo, look straight into the camera, and say Cheese!
+          no_photo: No photo yet
+          take_photo: Take Photo
+          warning: If your photo appears sideways, it will be autocorrected when you submit your release.
        guardian_clause:
          heading: Guardian Clause
        guardian_info:
@@ -1098,6 +1229,7 @@ en:
    tag_multiple_releases: Add Tag
    tag_multiple_releases_form:
      submit: Add
+    task_me: Task
  tags:
    form:
      submit: Add
@@ -1111,7 +1243,13 @@ en:
    form:
      contract_and_rights:
        heading: 2 of 3 Contract & Exploitable Rights
+      guardian_2_info:
+        heading: Guardian Information (if company requires)
+      guardian_info:
+        heading: Guardian Information
      photos:
+        guardian_2_photo:
+          heading: Second Guardian Photo
        guardian_photo:
          heading: Guardian Photo
        heading: 3 of 3 Photos
@@ -1123,7 +1261,10 @@ en:
        search: Search
      empty: Talent Releases will appear here
      table_headers:
+        email: Email
+        name: Name
        notes: Notes
+        phone: Phone
        signed_at: Date Signed
        tags: Tags
    new:
@@ -1133,6 +1274,73 @@ en:
        manage: Manage
    update:
      notice: The talent release has been updated
+  task_requests:
+    cancel:
+      notice: Task has been cancelled successfully.
+    create:
+      notice: Task request created succussfully.
+      success_message: Your task request was successfully submitted. Thank you. A chat window will pop up on the lower right in a few seconds.
+    edit:
+      heading:
+        Edit Task Request
+    form:
+      actions:
+        chat_now: Chat Now
+      info_message: For best results, please fill out this form prior to being connected with a TaskME assistant. However, if urgent, you can start speaking with a TaskME assistant by pressing the Chat Now button to the right
+      labels:
+        additional_notes: Please add any additional notes we should be aware of regarding this task.
+        deadline: What is the deadline for this task?
+        description: Please describe the task.
+        files: Please attach any files related to this task
+        time_allowed: How many hours would you like a TaskME representative to work on this task?
+    index:
+      actions:
+        new: Create Task Request
+      empty: Task requests will appear here.
+      table_headers:
+        task_request_created_on: Created On
+        task_request_deadline: Deadline
+        task_request_description: Description
+        task_request_results: Task Results
+        task_request_status: Status
+        task_request_time_allowed: Time Allowed
+    new:
+      heading: New Task Request
+    show:
+      empty: Attached files will appear here.
+    splash:
+      actions:
+        book_demo: Schedule a Demo
+        create_task_request: Create Task Request
+      headings:
+        benefits: Benefits
+        how_it_works: How It Works
+        subtitle: Pay-by-the-hour, digitally-enabled remote assistants
+        welcome: Welcome to
+      list_items:
+        enter_number_of_hours: Enter the number of hours you want the task worked on
+        enter_task_request: Enter your task request
+        reduces_need_for_full_time_staff: Reduces need to hire full-time staff
+        reduces_workload: Reduces workload for current staff
+        spend_per_task: Spend as little as $60 per task
+        state_deadline: State your deadline
+        virtual_assistant_delivers_task: Virtual assistant delivers task via TaskME portal
+    task_request:
+      actions:
+        manage: Manage
+        open_deliverable: Open Deliverable
+        read_more: read more
+    update:
+      notice: Task request updated successfully.
+  tasks:
+    index:
+      empty: Tasks will appear here.
+      table_headers:
+        task_request_created_on: Created On
+        task_request_deadline: Deadline
+        task_request_results: Task Results
+        task_request_status: Status
+        task_request_time_allowed: Time Allowed
  user_mailer: 
    existing_account: 
      subject: You've been added as a ME Suite Account Manager 
@@ -1188,6 +1396,24 @@ en:
    new:
      heading: Upload Video
      subheading: 2 of 2 Files
+    splash:
+      actions:
+        book_demo: Schedule a Demo
+        upload_video: Upload New Video
+      headings:
+        benefits: Benefits
+        how_it_works: How It Works
+        subtitle: Automate your deliverable documents
+        welcome: Welcome to
+      list_items:
+        AI_generates_documents: AI generates deliverable documents
+        download_documents: Download deliverable documents
+        import_EDLs: Import your EDLs
+        import_video: Import your video
+        more_accurate: More accurate than human-generated reports
+        production_elements_logs: Production Elements Logs, and more
+        reduces_labor_cost: Reduces labor costs
+        simplifies_cue_sheets: Simplifies Music Cue Sheets, Graphic Cue Sheets
    update:
      notice: The video has been updated
    video:
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1,4 +1,14 @@
 es:
+  acquired_media_releases:
+    acquired_media_release:
+      no_media: No Media (ES)
+    index:
+      table_headers:
+        file_infos_count: No. Files (ES)
+        name: Name (ES)
+        notes: Notes (ES)
+        signed_at: Date Signed (ES)
+        tags: Tags (ES)
  activerecord:
    attributes:
      appearance_release:
@@ -41,6 +51,12 @@ es:
          heading: Person Photo (ES)
    index:
      imported_appearance_release_missing_attachment: Person photo or contract missing for imported appearance release (ES)
+      table_headers:
+        contact_info: ""
+        name: ""
+        notes: ""
+        signed_at: ""
+        tags: ""
    shared:
      imported_appearance_release_contract_name: Contrato Importado
      imported_appearance_release_headshot_name: Retrato Importado
@@ -50,6 +66,13 @@ es:
      all_releases: All Releases (ES)
      complete_releases: Complete Releases (ES)
      incomplete_releases: Incomplete Releases (ES)
+  approvals:
+    create:
+      release_approved: Medical release has been approved (ES)
+    new:
+      actions:
+        approve: Approve (ES)
+      heading: Review Medical Release (ES)
  blank_contracts:
    new:
      number_of_copies_label: Number of copies (ES)
@@ -57,6 +80,30 @@ es:
    pdf:
      do_not_copy_warning: "Do not copy (ES)"
      serial_number_label: "Serial Number (ES)"
+  broadcasts:
+    show:
+      actions:
+        reset_url: Reset URL (ES)
+    splash:
+      actions:
+        book_demo: Schedule a Demo
+        create_stream: Create New Live Stream
+      headings:
+        benefits: Benefits
+        how_it_works: How It Works
+        subtitle: Remote directing and video village solution
+        welcome: Welcome to
+      list_items:
+        create_stream: Create a live stream
+        direct_shoots_anywhere: Direct shoots anywhere around the world
+        launch_video_conference: Launch Video Conference using plugin
+        share_files: Share files via the ME Suite mobile app
+        share_live_stream: Share live stream with clients all over the the world
+        share_stream: Share live stream link with clients
+        stream_from_mobile_app: Stream from ME Suite Mobile app, or via a professional camera
+        stream_multiple_cameras: Stream multiple cameras at one time
+    update:
+      reset_notice: The Share URL has been reset, and the previous URL will no longer work. Please click "Copy URL" and share it again with those who you want to have access to this live stream
  contract_templates:
    blank_contracts:
      create:
@@ -70,7 +117,32 @@ es:
        heading: Legal (ES)
      release_info:
        heading: Release Info (ES)
+    splash:
+      actions:
+        book_demo: Schedule a Demo (ES)
+        create_template: Create New Release Template (ES)
+      headings:
+        benefits: ""
+        how_it_works: How It Works (ES)
+        subtitle: The easiest way to create and manage releases. (ES)
+        welcome: Welcome to (ES)
+      list_items:
+        add_tags_and_notes: Add tags and notes to releases for added organization and searchability (ES)
+        all_releases_available: All release types available including Covid Medical, Appearance, Location and more (ES)
+        create_releases: Create releases for your video shoot (ES)
+        download_mobile_app: Download the ME Suite mobile app (ES)
+        manage_large_audience: Easily manage large audiences with the crowd control feature (ES)
+        print_QR_code: Print out release QR codes (ES)
+        releases_automatically_organized: Releases are automatically organized as they’re submitted (ES)
  contracts:
+    for_office_use_only:
+      description_labels:
+        date_issued: Date Issued (ES)
+        employee_issued_to: Employee Issued To (ES)
+        issued_by: Issued By (ES)
+        producer: Producer (ES)
+        production: Production (ES)
+      heading: For Office Use Only (ES)
    photos:
      guardian_2_photo_heading: Second guardian photo (ES)
      guardian_photo_heading: Guardian photo (ES)
@@ -124,6 +196,7 @@ es:
      contract_template:
        fee: Leave at $0.00 for no-fee (ES)
        guardian_clause: Leave blank if not required for this contract (ES)
+        signature_legal_text: Leave blank if not required for this contract (ES)
    label:
      appearance_release:
        guardian_2_address_city: Guardian 2 city (ES)
@@ -194,6 +267,36 @@ es:
        name: Nómbre del proyecto de vídeo
        producer_address: Dirección del productor
        producer_name: Nómbre del productor
+      talen_release:
+        guardian_2_address_city: Guardian 2 city (ES)
+        guardian_2_address_country: Guardian 2 country (ES)
+        guardian_2_address_state: Guardian 2 state (ES)
+        guardian_2_address_street1: Guardian 2 address (ES)
+        guardian_2_address_street2: Guardian 2 address (Line 2) (ES)
+        guardian_2_address_zip: Guardian 2 zip code (ES)
+        guardian_2_email: Guardian 2 email (ES)
+        guardian_2_first_name: Guardian 2 first name (ES)
+        guardian_2_last_name: Guardian 2 last name (ES)
+        guardian_2_phone: Guardian 2 phone (ES)
+        guardian_address_city: City (ES)
+        guardian_address_country: Guardian country (ES)
+        guardian_address_state: State (ES)
+        guardian_address_street1: Guardian address (ES)
+        guardian_address_street2: Guardian address (Line 2) (ES)
+        guardian_address_zip: Zip code (ES)
+        guardian_email: Guardian email address (ES)
+        guardian_name: Guardian name (ES)
+        guardian_phone: Guardian phone number (ES)
+        minor: Is the person a minor? (ES)
+        person_address_city: City (ES)
+        person_address_country: Country (ES)
+        person_address_state: State (ES)
+        person_address_street1: Address (ES)
+        person_address_street2: Address (Line 2) (ES)
+        person_address_zip: Zip code (ES)
+        person_email: Email address (ES)
+        person_name: Name (ES)
+        person_phone: Phone number (ES)
    placeholder:
      appearance_release:
        person_address: Calle, Número de apartamento, Ciudad, Estado, Código Postal
@@ -207,15 +310,64 @@ es:
        create: Create Live Stream (ES)
        update: Save Changes (ES)
      create: 'Crear %{model}'
+      medical_release:
+        update: Approve (ES)
      update: 'Actualizar %{model}'
  location_releases:
    form:
      photos:
        dropzone_label: Tap to take a photo of the Property (optional) (ES)
+    index:
+      table_headers:
+        address: Address (ES)
+        notes: Notes (ES)
+        signed_at: Date Signed (ES)
+        tags: Tags (ES)
  material_releases:
    form:
      photos:
        dropzone_label: Tap to take a photo of Licensed Material (optional) (ES)
+    index:
+      table_headers:
+        name: Name (ES)
+        notes: Notes (ES)
+        signed_at: Date Signed (ES)
+        tags: Tags (ES)
+  medical_releases:
+    custom_validation_errors:
+      question_answer_is_required: answer is required (ES)
+    index:
+      table_headers:
+        approved: Approved (ES)
+        approved?: Approved (ES)
+        contact_info: Contact info (ES)
+        name: Person name (ES)
+        notes: Notes (ES)
+        signed_at: Date Signed (ES)
+        tags: Tags (ES)
+    medical_release:
+      actions:
+        review: Review (ES)
+      messages:
+        approved_tooltip: ""
+  misc_releases:
+    index:
+      table_headers:
+        contact_info: Contact info (ES)
+        name: Person name (ES)
+        notes: Notes (ES)
+        signed_at: Date Signed (ES)
+        tags: Tags (ES)
+  music_releases:
+    index:
+      table_headers:
+        composers_count: No. Composers (ES)
+        file_infos_count: No. Files (ES)
+        name: Name (ES)
+        notes: Notes (ES)
+        publishers_count: No. Publishers (ES)
+        signed_at: Date Signed (ES)
+        tags: Tags (ES)
  public:
    appearance_releases:
      create:
@@ -281,8 +433,19 @@ es:
          warning: Si su foto aparece de lado, se corregirá automáticamente cuando actualizar la autorización
    talent_releases:
      new:
+        guardian_2_info:
+          heading: Second Guardian Information (if company requires) (ES)
+        guardian_2_photo:
+          camera_instructions_html: ""
+          heading: Second Guardian Photo (ES)
+          instructions: ""
+          no_photo: ""
+          take_photo: ""
+          warning: ""
        guardian_clause:
          heading: Guardian Clause (ES)
+        guardian_info:
+          heading: ""
        guardian_photo:
          camera_instructions_html: (ES) Click <em>Take Photo</em> to Turn ON Camera (ES)
          heading: Guardian Photo (ES)
@@ -290,6 +453,8 @@ es:
          no_photo: No hay foto todavía
          take_photo: Take Photo (ES)
          warning: (ES) If your photo appears sideways, it will be autocorrected when you submit your release. (ES)
+        photo:
+          heading: Photos (ES)
    teams:
      show:
        choose_project: ¿Qué proyecto de la lista de abajo asistirá?
@@ -298,6 +463,71 @@ es:
    print: Print (ES)
  talent_releases:
    form:
+      guardian_2_info:
+        heading: Guardian Information (if company requires) (ES)
+      guardian_info:
+        heading: Guardian Information (ES)
      photos:
+        guardian_2_photo:
+          heading: Second Guardian Photo (ES)
        guardian_photo:
          heading: Guardian Photo (ES)
+    index:
+      table_headers:
+        email: Email (ES)
+        name: Name (ES)
+        notes: Notes (ES)
+        phone: Phone (ES)
+        signed_at: Date Signed (ES)
+        tags: Tags (ES)
+  task_requests:
+    create:
+      success_message: Your task request was successfully submitted. Thank you. A chat window will pop up on the lower right in a few seconds. (ES)
+    form:
+      actions:
+        chat_now: Chat Now (ES)
+      info_message: For best results, please fill out this form prior to being connected with a TaskME assistant. However, if urgent, you can start speaking with a TaskME assistant by pressing the Chat Now button to the right (ES)
+    index:
+      table_headers:
+        task_request_description: Description (ES)
+    splash:
+      actions:
+        book_demo: Schedule a Demo (ES)
+        create_task_request: Create Task Request
+      headings:
+        benefits: Benefits (ES)
+        how_it_works: How It Works (ES)
+        subtitle: Pay-by-the-hour, digitally-enabled remote assistants (ES)
+        welcome: Welcome to (ES)
+      list_items:
+        enter_number_of_hours: Enter the number of hours you want the task worked on (ES)
+        enter_task_request: Enter your task request (ES)
+        reduces_need_for_full_time_staff: Reduces need to hire full-time staff (ES)
+        reduces_workload: Reduces workload for current staff (ES)
+        spend_per_task: Spend as little as $60 per task (ES)
+        state_deadline: State your deadline (ES)
+        virtual_assistant_delivers_task: Virtual assistant delivers task via TaskME portal (ES)
+    task_request:
+      actions:
+        manage: Manage (ES)
+        open_deliverable: Open Deliverable (ES)
+        read_more: read more (ES)
+  videos:
+    splash:
+      actions:
+        book_demo: Schedule a Demo (ES)
+        upload_video: Upload New Video (ES)
+      headings:
+        benefits: Benefits (ES)
+        how_it_works: How It Works (ES)
+        subtitle: Automate your deliverable documents (ES)
+        welcome: Welcome to (ES)
+      list_items:
+        AI_generates_documents: AI generates deliverable documents (ES)
+        download_documents: Download deliverable documents (ES)
+        import_EDLs: Import your EDLs (ES)
+        import_video: Import your video (ES)
+        more_accurate: More accurate than human-generated reports (ES)
+        production_elements_logs: Production Elements Logs, and more (ES)
+        reduces_labor_cost: Reduces labor costs (ES)
+        simplifies_cue_sheets: Simplifies Music Cue Sheets, Graphic Cue Sheets (ES)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -2,7 +2,7 @@ require 'oath/constraints/signed_in'
 require 'sidekiq/web'

 Rails.application.routes.draw do
-  AVAILABLE_LOCALES_REGEX = /#{I18n.available_locales.join("|")}/
+  AVAILABLE_LOCALES_REGEX = /#{I18n.available_locales.join("|")}/.freeze

  concern :confirmable do
    resources :video_release_confirmations, only: [:new, :create, :destroy]
@@ -31,6 +31,7 @@ Rails.application.routes.draw do
      resources :users, only: [:index, :new, :create, :edit, :update, :destroy] do
        resource :masquerade, only: :create
      end
+      resources :task_requests, only: [:index, :edit, :update, :show]

      root to: "accounts#index", as: :signed_in_root
    end
@@ -99,6 +100,12 @@ Rails.application.routes.draw do
          delete :destroy_file
        end
      end
+      resources :task_requests, except: :destroy do
+        member do
+          post :cancel
+        end
+      end
+      resources :tasks, only: :index
    end
    resource :profile, only: [:show, :update]
    resources :videos, only: [] do
@@ -129,13 +136,18 @@ Rails.application.routes.draw do
      end
    end

-    RELEASES = [:acquired_media_releases, :appearance_releases, :talent_releases, :material_releases, :location_releases]
-    ALL_RELEASES = RELEASES + [:music_releases, :medical_releases, :misc_releases]
+    RELEASES = [:acquired_media_releases, :appearance_releases, :talent_releases, :material_releases, :medical_releases, :misc_releases, :location_releases].freeze
+    ALL_RELEASES = RELEASES + [:music_releases]

    ALL_RELEASES.each do |release|
      resources release, only: [], concerns: :taggable
    end

+    # Customization for medical releases
+    resources :medical_releases, only: [], concerns: :taggable do
+      resource :approvals, only: [:new, :create]
+    end
+
    resources :bulk_taggings, only: [:new, :create]

    namespace :api do
@@ -151,7 +163,7 @@ Rails.application.routes.draw do
          resources :contract_templates, only: [:index]
        end
        resources :contract_templates, only: [:show] do
-          RELEASES.each do |release|
+          (RELEASES - [:misc_releases, :medical_releases]).each do |release|
            resources release, controller: release, only: [:create]
          end
        end
--- a/db/data_migrations/20200712192301_add_duration_to_broadcast_recordings.rb
+++ b/db/data_migrations/20200712192301_add_duration_to_broadcast_recordings.rb
@@ -0,0 +1,18 @@
+class AddDurationToBroadcastRecordings < ActiveRecord::DataMigration
+  def up
+    recordings = BroadcastRecording.where(duration: nil)
+    client = MuxRuby::AssetsApi.new
+
+    recordings.each do |recording|
+      begin
+        response = client.get_asset(recording.asset_uid)
+        duration = response.data.duration
+        recording.update(duration: duration)
+      rescue MuxRuby::ApiError => e
+        Rails.logger.error("Failed to update duration for broadcast recording with id #{recording.id}\n" + e.message)
+      end
+
+      sleep(1)
+    end
+  end
+end
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Bilal	c17f41525d	fix MR comment	2020-07-15 19:03:35 +02:00
Bilal	d12cec8487	remove validation and add specs	2020-07-15 12:25:54 +02:00
Bilal	bde18ab0f1	add Chat Now button	2020-07-15 12:25:54 +02:00
Bilal	fc320a3421	rebase	2020-07-15 12:25:54 +02:00
Senad Uka	7f49f31ebf	Master sync	2020-07-15 11:58:34 +02:00
Senad Uka	4c49a5db03	Upstream sync	2020-07-14 14:10:30 +02:00
Senad Uka	35303cb570	Upstream sync	2020-07-09 11:06:17 +02:00
Senad Uka	1127f09263	Upstream sync	2020-07-08 18:27:49 +02:00
Senad Uka	19b1e75384	Upstream sync	2020-07-07 23:14:42 +02:00
Senad Uka	93a4ce462d	Upstream sync	2020-07-07 21:45:30 +02:00
Senad Uka	0e16791d8b	Upstream sync	2020-07-07 05:08:32 +02:00
Senad Uka	7cdb814d6d	Upstream sync	2020-07-06 10:22:04 +02:00
Senad Uka	2dea0f29b9	Upstream sync	2020-07-03 10:23:03 +02:00
Senad Uka	d6a3542308	Upstream sync	2020-07-02 10:34:24 +02:00
Senad Uka	e49498bbbf	Upstream sync	2020-07-01 06:39:02 +02:00
Senad Uka	dd0ac5b110	Upstream sync	2020-06-30 05:07:43 +02:00