Compare commits
5 Commits
improve-do
...
add-splash
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
749aa4efd9 | ||
|
|
709cdc030d | ||
|
|
469839cee7 | ||
|
|
6fc05f0b7f | ||
|
|
ba985b0af6 |
@@ -3,6 +3,7 @@ class VideosController < ApplicationController
|
|||||||
|
|
||||||
before_action :set_project, only: [:index, :new, :create, :landing]
|
before_action :set_project, only: [:index, :new, :create, :landing]
|
||||||
before_action :set_video, only: [:edit, :update]
|
before_action :set_video, only: [:edit, :update]
|
||||||
|
before_action :show_splash_screen, only: :index
|
||||||
|
|
||||||
def landing
|
def landing
|
||||||
authorize Video, :new?
|
authorize Video, :new?
|
||||||
@@ -60,6 +61,10 @@ class VideosController < ApplicationController
|
|||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
|
def show_splash_screen
|
||||||
|
render :splash if videos.count.zero?
|
||||||
|
end
|
||||||
|
|
||||||
def set_project
|
def set_project
|
||||||
@project = policy_scope(Project).find(params[:project_id])
|
@project = policy_scope(Project).find(params[:project_id])
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -13,10 +13,13 @@ module WordmarkHelper
|
|||||||
css += options[:class].to_s
|
css += options[:class].to_s
|
||||||
|
|
||||||
content_tag(:div, class: css) do
|
content_tag(:div, class: css) do
|
||||||
safe_join [
|
elements = [
|
||||||
content_tag(:span, t("shared.#{product_name}")),
|
content_tag(:span, t("shared.#{product_name}")),
|
||||||
content_tag(:span, t("shared.me"))
|
content_tag(:span, t("shared.me"))
|
||||||
]
|
]
|
||||||
|
prefix = options[:prefix]
|
||||||
|
elements.unshift content_tag(:span, "#{prefix} ") unless prefix.blank?
|
||||||
|
safe_join elements
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
59
app/views/videos/splash.html.erb
Normal file
59
app/views/videos/splash.html.erb
Normal file
@@ -0,0 +1,59 @@
|
|||||||
|
<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"), [:new, @project, :video], 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.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>
|
||||||
@@ -324,11 +324,11 @@ en:
|
|||||||
notice: The release has been updated
|
notice: The release has been updated
|
||||||
helpers:
|
helpers:
|
||||||
help:
|
help:
|
||||||
task_request:
|
|
||||||
time_allowed: Minimum of 2 hours, no partial hours allowed
|
|
||||||
contract_template:
|
contract_template:
|
||||||
fee: Leave at $0.00 for no-fee
|
fee: Leave at $0.00 for no-fee
|
||||||
guardian_clause: Leave blank if not required for this contract
|
guardian_clause: Leave blank if not required for this contract
|
||||||
|
task_request:
|
||||||
|
time_allowed: Minimum of 2 hours, no partial hours allowed
|
||||||
video:
|
video:
|
||||||
audio_only_edl_file: If you do not upload an Audio Only EDL, the software will not generate a BiG Music Cue Sheet.
|
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.
|
edl_file: Please follow our directions on exporting the All Tracks EDL. Failure to do so could result in inaccurate and incomplete reporting.
|
||||||
@@ -1273,6 +1273,24 @@ en:
|
|||||||
new:
|
new:
|
||||||
heading: Upload Video
|
heading: Upload Video
|
||||||
subheading: 2 of 2 Files
|
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:
|
update:
|
||||||
notice: The video has been updated
|
notice: The video has been updated
|
||||||
video:
|
video:
|
||||||
|
|||||||
@@ -363,3 +363,22 @@ es:
|
|||||||
manage: Manage (ES)
|
manage: Manage (ES)
|
||||||
open_deliverable: Open Deliverable (ES)
|
open_deliverable: Open Deliverable (ES)
|
||||||
read_more: read more (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)
|
||||||
|
|||||||
@@ -9,20 +9,6 @@ SET xmloption = content;
|
|||||||
SET client_min_messages = warning;
|
SET client_min_messages = warning;
|
||||||
SET row_security = off;
|
SET row_security = off;
|
||||||
|
|
||||||
--
|
|
||||||
-- Name: plpgsql; Type: EXTENSION; Schema: -; Owner: -
|
|
||||||
--
|
|
||||||
|
|
||||||
CREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog;
|
|
||||||
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Name: EXTENSION plpgsql; Type: COMMENT; Schema: -; Owner: -
|
|
||||||
--
|
|
||||||
|
|
||||||
COMMENT ON EXTENSION plpgsql IS 'PL/pgSQL procedural language';
|
|
||||||
|
|
||||||
|
|
||||||
--
|
--
|
||||||
-- Name: fuzzystrmatch; Type: EXTENSION; Schema: -; Owner: -
|
-- Name: fuzzystrmatch; Type: EXTENSION; Schema: -; Owner: -
|
||||||
--
|
--
|
||||||
@@ -331,8 +317,8 @@ CREATE TABLE public.appearance_releases (
|
|||||||
person_last_name character varying,
|
person_last_name character varying,
|
||||||
guardian_first_name character varying,
|
guardian_first_name character varying,
|
||||||
guardian_last_name character varying,
|
guardian_last_name character varying,
|
||||||
guardian_email character varying,
|
|
||||||
identifier character varying,
|
identifier character varying,
|
||||||
|
guardian_email character varying,
|
||||||
person_address_street2 character varying,
|
person_address_street2 character varying,
|
||||||
person_address_city character varying,
|
person_address_city character varying,
|
||||||
person_address_state character varying,
|
person_address_state character varying,
|
||||||
@@ -666,15 +652,6 @@ CREATE SEQUENCE public.contract_templates_id_seq
|
|||||||
ALTER SEQUENCE public.contract_templates_id_seq OWNED BY public.contract_templates.id;
|
ALTER SEQUENCE public.contract_templates_id_seq OWNED BY public.contract_templates.id;
|
||||||
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Name: data_migrations; Type: TABLE; Schema: public; Owner: -
|
|
||||||
--
|
|
||||||
|
|
||||||
CREATE TABLE public.data_migrations (
|
|
||||||
version character varying NOT NULL
|
|
||||||
);
|
|
||||||
|
|
||||||
|
|
||||||
--
|
--
|
||||||
-- Name: directories; Type: TABLE; Schema: public; Owner: -
|
-- Name: directories; Type: TABLE; Schema: public; Owner: -
|
||||||
--
|
--
|
||||||
@@ -1401,6 +1378,7 @@ CREATE TABLE public.settings (
|
|||||||
--
|
--
|
||||||
|
|
||||||
CREATE SEQUENCE public.settings_id_seq
|
CREATE SEQUENCE public.settings_id_seq
|
||||||
|
AS integer
|
||||||
START WITH 1
|
START WITH 1
|
||||||
INCREMENT BY 1
|
INCREMENT BY 1
|
||||||
NO MINVALUE
|
NO MINVALUE
|
||||||
@@ -1436,6 +1414,7 @@ CREATE TABLE public.taggings (
|
|||||||
--
|
--
|
||||||
|
|
||||||
CREATE SEQUENCE public.taggings_id_seq
|
CREATE SEQUENCE public.taggings_id_seq
|
||||||
|
AS integer
|
||||||
START WITH 1
|
START WITH 1
|
||||||
INCREMENT BY 1
|
INCREMENT BY 1
|
||||||
NO MINVALUE
|
NO MINVALUE
|
||||||
@@ -1466,6 +1445,7 @@ CREATE TABLE public.tags (
|
|||||||
--
|
--
|
||||||
|
|
||||||
CREATE SEQUENCE public.tags_id_seq
|
CREATE SEQUENCE public.tags_id_seq
|
||||||
|
AS integer
|
||||||
START WITH 1
|
START WITH 1
|
||||||
INCREMENT BY 1
|
INCREMENT BY 1
|
||||||
NO MINVALUE
|
NO MINVALUE
|
||||||
@@ -1826,9 +1806,9 @@ CREATE TABLE public.zoom_meetings (
|
|||||||
api_meeting_id character varying,
|
api_meeting_id character varying,
|
||||||
created_at timestamp(6) without time zone NOT NULL,
|
created_at timestamp(6) without time zone NOT NULL,
|
||||||
updated_at timestamp(6) without time zone NOT NULL,
|
updated_at timestamp(6) without time zone NOT NULL,
|
||||||
status integer DEFAULT 0,
|
|
||||||
zoom_user_id bigint,
|
zoom_user_id bigint,
|
||||||
project_id bigint
|
project_id bigint,
|
||||||
|
status integer DEFAULT 0
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
||||||
@@ -2305,14 +2285,6 @@ ALTER TABLE ONLY public.contract_templates
|
|||||||
ADD CONSTRAINT contract_templates_pkey PRIMARY KEY (id);
|
ADD CONSTRAINT contract_templates_pkey PRIMARY KEY (id);
|
||||||
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Name: data_migrations data_migrations_pkey; Type: CONSTRAINT; Schema: public; Owner: -
|
|
||||||
--
|
|
||||||
|
|
||||||
ALTER TABLE ONLY public.data_migrations
|
|
||||||
ADD CONSTRAINT data_migrations_pkey PRIMARY KEY (version);
|
|
||||||
|
|
||||||
|
|
||||||
--
|
--
|
||||||
-- Name: directories directories_pkey; Type: CONSTRAINT; Schema: public; Owner: -
|
-- Name: directories directories_pkey; Type: CONSTRAINT; Schema: public; Owner: -
|
||||||
--
|
--
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ RSpec.describe VideosController, type: :controller do
|
|||||||
end
|
end
|
||||||
|
|
||||||
it "has a search form" do
|
it "has a search form" do
|
||||||
|
create(:video, project: project)
|
||||||
get :index, params: { project_id: project }
|
get :index, params: { project_id: project }
|
||||||
|
|
||||||
expect(response.body).to have_button("search-button")
|
expect(response.body).to have_button("search-button")
|
||||||
@@ -43,7 +44,7 @@ RSpec.describe VideosController, type: :controller do
|
|||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
it "renders content" do
|
it "renders content if there are existing videos" do
|
||||||
video = create(:video, project: project, name: "My Video", number: "001", created_at: 1.day.ago)
|
video = create(:video, project: project, name: "My Video", number: "001", created_at: 1.day.ago)
|
||||||
|
|
||||||
get :index, params: { project_id: project }
|
get :index, params: { project_id: project }
|
||||||
@@ -58,10 +59,11 @@ RSpec.describe VideosController, type: :controller do
|
|||||||
end
|
end
|
||||||
|
|
||||||
context "when there are no records" do
|
context "when there are no records" do
|
||||||
it "renders an empty message" do
|
it "renders splash screen" do
|
||||||
get :index, params: { project_id: project }
|
get :index, params: { project_id: project }
|
||||||
|
|
||||||
expect(response.body).to have_content("Videos will appear here")
|
expect(response.body).to have_link "Upload New Video"
|
||||||
|
expect(response.body).to have_link schedule_demo
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -277,4 +279,8 @@ RSpec.describe VideosController, type: :controller do
|
|||||||
def video_update_params
|
def video_update_params
|
||||||
attributes_for(:video, :with_graphics_only_edl_file, :with_audio_only_edl_file, name: "Test Video").except(:file)
|
attributes_for(:video, :with_graphics_only_edl_file, :with_audio_only_edl_file, name: "Test Video").except(:file)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def schedule_demo
|
||||||
|
t 'videos.splash.actions.book_demo'
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
require "rails_helper"
|
require "rails_helper"
|
||||||
|
|
||||||
feature "User managing videos" do
|
feature "User managing videos" do
|
||||||
let(:current_user) { create(:user) }
|
let(:current_user) { create(:user, :manager) }
|
||||||
let(:project) { create(:project, account: current_user.primary_account) }
|
let(:project) { create(:project, members: current_user, account: current_user.primary_account) }
|
||||||
let!(:video) do
|
let!(:video) do
|
||||||
create(:video,
|
create(:video,
|
||||||
:with_graphics_only_edl_file,
|
:with_graphics_only_edl_file,
|
||||||
@@ -17,6 +17,14 @@ feature "User managing videos" do
|
|||||||
sign_in current_user
|
sign_in current_user
|
||||||
end
|
end
|
||||||
|
|
||||||
|
scenario "splash page is shown if there are no existing videos" do
|
||||||
|
Video.delete_all
|
||||||
|
visit project_videos_path(project)
|
||||||
|
|
||||||
|
expect(page).to have_content schedule_demo
|
||||||
|
expect(page).to have_content upload_new_video
|
||||||
|
end
|
||||||
|
|
||||||
scenario "creating a video", js: true do
|
scenario "creating a video", js: true do
|
||||||
visit project_videos_path(project)
|
visit project_videos_path(project)
|
||||||
click_link "Upload New Video"
|
click_link "Upload New Video"
|
||||||
@@ -96,6 +104,30 @@ feature "User managing videos" do
|
|||||||
expect(page).to have_content("Second Video")
|
expect(page).to have_content("Second Video")
|
||||||
end
|
end
|
||||||
|
|
||||||
|
context 'When the user is associate' do
|
||||||
|
let(:current_user) { create(:user, :associate) }
|
||||||
|
|
||||||
|
it 'does show button to upload new video' do
|
||||||
|
Video.delete_all
|
||||||
|
visit project_videos_path(project)
|
||||||
|
|
||||||
|
expect(page).to have_content schedule_demo
|
||||||
|
expect(page).to have_content upload_new_video
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'When the user is account manager' do
|
||||||
|
let(:current_user) { create(:user, :account_manager) }
|
||||||
|
|
||||||
|
it 'does show button to upload new video' do
|
||||||
|
Video.delete_all
|
||||||
|
visit project_videos_path(project)
|
||||||
|
|
||||||
|
expect(page).to have_content schedule_demo
|
||||||
|
expect(page).to have_content upload_new_video
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def fill_in_video_fields(data)
|
def fill_in_video_fields(data)
|
||||||
@@ -115,4 +147,12 @@ feature "User managing videos" do
|
|||||||
def update_video_notice
|
def update_video_notice
|
||||||
t "videos.update.notice"
|
t "videos.update.notice"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def schedule_demo
|
||||||
|
t 'videos.splash.actions.book_demo'
|
||||||
|
end
|
||||||
|
|
||||||
|
def upload_new_video
|
||||||
|
t 'videos.splash.actions.upload_video'
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user