update struct

app/controllers/broadcasts_controller.rb

@@ -5,7 +5,6 @@ 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])
@@ -50,10 +49,6 @@ 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

app/controllers/task_requests_controller.rb

@@ -4,6 +4,7 @@ class TaskRequestsController < ApplicationController
   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])
@@ -46,6 +47,10 @@ class TaskRequestsController < ApplicationController
 
   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

app/views/task_requests/splash.html.erb

@@ -1,12 +1,12 @@
 <div class="d-flex flex-row">
   <div class="d-flex flex-column">
-    <%= product_wordmark :direct_me, prefix: t('.headings.welcome'), class: "h2" %>
+    <%= 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(Broadcast).new? %>
-    <%= link_to t(".actions.create_stream"), [:new, @project, :broadcast], class: "btn btn-success border align-self-center h-50 pb-2" %>
+  <% 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>
 
@@ -36,10 +36,10 @@
         <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>
+            <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>
@@ -47,10 +47,9 @@
         <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'))) %>
+            <%= 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>

config/locales/en.yml

@@ -207,24 +207,6 @@ en:
     new:
       heading:
         Create Live Stream
-    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
   bulk_taggings:
     new_bulk_tag_modal:
       submit: Add
@@ -1220,6 +1202,23 @@ en:
       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

config/locales/es.yml

@@ -57,25 +57,6 @@ es:
     pdf:
       do_not_copy_warning: "Do not copy (ES)"
       serial_number_label: "Serial Number (ES)"
-  broadcasts:
-    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
   contract_templates:
     blank_contracts:
       create:
@@ -377,6 +358,23 @@ 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)

spec/controllers/broadcasts_controller_spec.rb

@@ -22,7 +22,7 @@ RSpec.describe BroadcastsController, type: :controller do
       expect(response).to be_successful
     end
 
-    it "renders content if theere are existing broadcasts" do
+    it "renders content" do
       create(:broadcast, project: project, name: "Another Broadcast")
 
       get :index, params: { project_id: project }
@@ -34,13 +34,12 @@ RSpec.describe BroadcastsController, type: :controller do
     end
 
     context "when there are no active broadcasts" do
-      it "renders splash screen" do
+      it "renders an empty message" do
         Broadcast.destroy_all
 
         get :index, params: { project_id: project }
 
-        expect(response.body).to have_link create_stream
-        expect(response.body).to have_link schedule_demo
+        expect(response.body).to have_content("Live streams will appear here")
       end
     end
 
@@ -56,8 +55,10 @@ RSpec.describe BroadcastsController, type: :controller do
 
     context "for xhr request" do
       it "filters the broadcasts by a query param" do
-        create(:broadcast, project: project, skip_create_callback: true, name: "Stream by Adam")
-        create(:broadcast, project: project, skip_create_callback: true, name: "Stream by Zoe")
+        appearance_releases = [
+          create(:broadcast, skip_create_callback: true, name: "Stream by Adam"),
+          create(:broadcast, skip_create_callback: true, name: "Stream by Zoe"),
+        ]
 
         get :index, params: { project_id: project, query: "Zoe" }, xhr: true
 
@@ -244,12 +245,4 @@ RSpec.describe BroadcastsController, type: :controller do
 
     { files: [contract_file] }
   end
-
-  def schedule_demo
-    t 'broadcasts.splash.actions.book_demo'
-  end
-
-  def create_stream
-    t 'broadcasts.splash.actions.create_stream'
-  end
 end

spec/controllers/task_requests_controller_spec.rb

@@ -18,7 +18,14 @@ RSpec.describe TaskRequestsController, type: :controller do
       expect(response).to be_successful
     end
 
-    it "renders content" do
+    it "renders splash page if there are no task requests" do
+      get :index, params: { project_id: project }
+
+      expect(response.body).to have_link "Create Task Request"
+      expect(response.body).to have_link schedule_demo
+    end
+
+    it "renders task requests table if there are task requests" do
       create(:task_request, project: project, description: "Another Request")
 
       get :index, params: { project_id: project }
@@ -126,4 +133,8 @@ RSpec.describe TaskRequestsController, type: :controller do
   def update_params
     { description: "This is updated description" }
   end
+
+  def schedule_demo
+    t 'task_requests.splash.actions.book_demo'
+  end
 end

spec/features/user_managing_broadcasts_spec.rb

@@ -12,13 +12,6 @@ feature 'User managing broadcasts' do
       allow(MuxLiveStream).to receive(:new).and_return(double(id: 'id', key: 'key', playback_id: 'playback_id'))
     end
 
-    scenario "splash page is shown if there are no existing streams" do
-      visit project_broadcasts_path(project)
-
-      expect(page).to have_content schedule_demo
-      expect(page).to have_content create_stream
-    end
-
     scenario 'creating and deleting a broadcast', js: true do
       visit new_project_broadcast_path(project)
 
@@ -138,29 +131,6 @@ feature 'User managing broadcasts' do
         end
       end
     end
-
-    context 'When the user is associate' do
-      let(:current_user) { create(:user, :associate) }
-
-      it 'does not show button to create new live stream' do
-        visit project_broadcasts_path(project)
-
-        expect(page).to have_content schedule_demo
-        expect(page).not_to have_content create_stream
-      end
-    end
-
-    context 'When the user is account manager' do
-      let(:current_user) { create(:user, :account_manager) }
-
-      it 'does show button to create new live stream' do
-        visit project_broadcasts_path(project)
-
-        expect(page).to have_content schedule_demo
-        expect(page).to have_content create_stream
-      end
-    end
-
   end
 
   private
@@ -181,12 +151,4 @@ feature 'User managing broadcasts' do
   def switch_view_dropdown
     'Switch View'
   end
-
-  def schedule_demo
-    t 'broadcasts.splash.actions.book_demo'
-  end
-
-  def create_stream
-    t 'broadcasts.splash.actions.create_stream'
-  end
 end

spec/features/user_managing_task_requests_spec.rb

@@ -8,7 +8,14 @@ feature "User managing task requests" do
     sign_in current_user
   end
 
+  scenario "splash page is shown if there are no task requests" do
+    visit project_task_requests_path(project)
+
+    expect(page).to have_content schedule_demo
+  end
+
   scenario "task requests table is visible" do
+    create(:task_request, project: project, description: 'Short Desc')
     visit project_task_requests_path(project)
 
     expect(page).to have_content "Created On"
@@ -19,10 +26,6 @@ feature "User managing task requests" do
   end
 
   scenario "sees list of task requests" do
-    visit project_task_requests_path(project)
-
-    expect(page).to have_content no_task_requests_label
-
     task_request = create(:task_request, project: project)
 
     visit project_task_requests_path(project)
@@ -113,4 +116,8 @@ feature "User managing task requests" do
   def long_description_text
     'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.'
   end
+
+  def schedule_demo
+    t 'task_requests.splash.actions.book_demo'
+  end
 end