Compare commits
6 Commits
API-can-fe
...
add-splash
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
062b1d75cd | ||
|
|
ea025a86b3 | ||
|
|
c8f314142c | ||
|
|
2a7deef3c8 | ||
|
|
08e475642c | ||
|
|
f201580a01 |
@@ -7,6 +7,7 @@ class ContractTemplatesController < ApplicationController
|
|||||||
|
|
||||||
before_action :set_project, except: [:destroy]
|
before_action :set_project, except: [:destroy]
|
||||||
before_action :set_contract_template, only: [:destroy]
|
before_action :set_contract_template, only: [:destroy]
|
||||||
|
before_action :show_splash_screen, only: :index
|
||||||
|
|
||||||
def index
|
def index
|
||||||
@contract_templates = contract_templates.non_archived.order_by_name.paginate(page: params[:page])
|
@contract_templates = contract_templates.non_archived.order_by_name.paginate(page: params[:page])
|
||||||
@@ -38,6 +39,10 @@ class ContractTemplatesController < ApplicationController
|
|||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
|
def show_splash_screen
|
||||||
|
render :splash if contract_templates.non_archived.count.zero?
|
||||||
|
end
|
||||||
|
|
||||||
def set_contract_template
|
def set_contract_template
|
||||||
@contract_template = authorize contract_templates.find(params[:id])
|
@contract_template = authorize contract_templates.find(params[: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
|
||||||
|
|||||||
58
app/views/contract_templates/splash.html.erb
Normal file
58
app/views/contract_templates/splash.html.erb
Normal file
@@ -0,0 +1,58 @@
|
|||||||
|
<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">
|
||||||
|
<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.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>
|
||||||
@@ -252,6 +252,23 @@ en:
|
|||||||
signed_release_count: No. Signed Releases
|
signed_release_count: No. Signed Releases
|
||||||
new:
|
new:
|
||||||
heading: New Release Template
|
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:
|
contracts:
|
||||||
medical_questionnaire:
|
medical_questionnaire:
|
||||||
heading: Medical Questionnaire
|
heading: Medical Questionnaire
|
||||||
@@ -324,11 +341,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.
|
||||||
|
|||||||
@@ -70,6 +70,23 @@ es:
|
|||||||
heading: Legal (ES)
|
heading: Legal (ES)
|
||||||
release_info:
|
release_info:
|
||||||
heading: Release Info (ES)
|
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:
|
contracts:
|
||||||
photos:
|
photos:
|
||||||
guardian_2_photo_heading: Second guardian photo (ES)
|
guardian_2_photo_heading: Second guardian photo (ES)
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ describe ContractTemplatesController do
|
|||||||
expect(response).to be_successful
|
expect(response).to be_successful
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'renders content' do
|
it 'renders content if there are contract templates' do
|
||||||
contract_template = create(:contract_template,
|
contract_template = create(:contract_template,
|
||||||
name: 'My Contract Template', fee: 50, release_type: 'appearance',
|
name: 'My Contract Template', fee: 50, release_type: 'appearance',
|
||||||
project: project)
|
project: project)
|
||||||
@@ -39,10 +39,11 @@ describe ContractTemplatesController do
|
|||||||
end
|
end
|
||||||
|
|
||||||
context 'when there are no contract templates' do
|
context 'when there are no contract templates' 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('Release Templates will appear here')
|
expect(response.body).to have_link "Create New Release Template"
|
||||||
|
expect(response.body).to have_link schedule_demo
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -50,6 +51,7 @@ describe ContractTemplatesController do
|
|||||||
let(:current_user) { create(:user, :associate) }
|
let(:current_user) { create(:user, :associate) }
|
||||||
|
|
||||||
it 'does not show the new contract template button' do
|
it 'does not show the new contract template button' do
|
||||||
|
create(:contract_template, project: project)
|
||||||
get :index, params: { project_id: project }
|
get :index, params: { project_id: project }
|
||||||
|
|
||||||
expect(response.body).not_to have_link('Create New Release Template')
|
expect(response.body).not_to have_link('Create New Release Template')
|
||||||
@@ -166,4 +168,8 @@ describe ContractTemplatesController do
|
|||||||
restriction_text: 'restrictions'
|
restriction_text: 'restrictions'
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def schedule_demo
|
||||||
|
t 'contract_templates.splash.actions.book_demo'
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ feature "User imports release templates", type: :feature do
|
|||||||
end
|
end
|
||||||
|
|
||||||
scenario "importing two existing templates into a project" do
|
scenario "importing two existing templates into a project" do
|
||||||
|
create(:contract_template, project: project)
|
||||||
visit project_contract_templates_path(project)
|
visit project_contract_templates_path(project)
|
||||||
click_on "Import Release Template"
|
click_on "Import Release Template"
|
||||||
select_templates([project_one_template.id, project_two_template.id])
|
select_templates([project_one_template.id, project_two_template.id])
|
||||||
@@ -31,6 +32,7 @@ feature "User imports release templates", type: :feature do
|
|||||||
end
|
end
|
||||||
|
|
||||||
scenario "searching for a template", js: true do
|
scenario "searching for a template", js: true do
|
||||||
|
create(:contract_template, project: project)
|
||||||
visit project_contract_templates_path(project)
|
visit project_contract_templates_path(project)
|
||||||
click_on "Import Release Template"
|
click_on "Import Release Template"
|
||||||
fill_in "query", with: "Second"
|
fill_in "query", with: "Second"
|
||||||
|
|||||||
@@ -11,6 +11,13 @@ RSpec.feature 'User manages contract templates', type: :feature do
|
|||||||
sign_in(current_user)
|
sign_in(current_user)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
scenario 'splash page is shown if tehre are no contract templates' do
|
||||||
|
visit project_contract_templates_path(project)
|
||||||
|
|
||||||
|
expect(page).to have_content schedule_demo
|
||||||
|
expect(page).to have_content create_release_template
|
||||||
|
end
|
||||||
|
|
||||||
scenario 'creating a new release template' do
|
scenario 'creating a new release template' do
|
||||||
visit new_project_contract_template_path(project)
|
visit new_project_contract_template_path(project)
|
||||||
|
|
||||||
@@ -223,12 +230,20 @@ RSpec.feature 'User manages contract templates', type: :feature do
|
|||||||
let(:current_user) { create(:user, :associate) }
|
let(:current_user) { create(:user, :associate) }
|
||||||
|
|
||||||
it 'does not show management buttons for release templates' do
|
it 'does not show management buttons for release templates' do
|
||||||
|
create(:contract_template, project: project)
|
||||||
visit project_contract_templates_path(project)
|
visit project_contract_templates_path(project)
|
||||||
|
|
||||||
expect(page).not_to have_content('Create New Release Template')
|
expect(page).not_to have_content('Create New Release Template')
|
||||||
expect(page).not_to have_content(import_template_button)
|
expect(page).not_to have_content(import_template_button)
|
||||||
expect(page).not_to have_content('Delete')
|
expect(page).not_to have_content('Delete')
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it 'does not show create release button on splash page' do
|
||||||
|
visit project_contract_templates_path(project)
|
||||||
|
|
||||||
|
expect(page).to have_content schedule_demo
|
||||||
|
expect(page).not_to have_content create_release_template
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'When the user is account manager' do
|
context 'When the user is account manager' do
|
||||||
@@ -242,6 +257,13 @@ RSpec.feature 'User manages contract templates', type: :feature do
|
|||||||
click_on 'Manage'
|
click_on 'Manage'
|
||||||
expect(page).to have_content('Archive')
|
expect(page).to have_content('Archive')
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it 'does not show create release button on splash page' do
|
||||||
|
visit project_contract_templates_path(project)
|
||||||
|
|
||||||
|
expect(page).to have_content schedule_demo
|
||||||
|
expect(page).to have_content create_release_template
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
@@ -273,4 +295,12 @@ RSpec.feature 'User manages contract templates', type: :feature do
|
|||||||
def fill_hidden(id, with:)
|
def fill_hidden(id, with:)
|
||||||
find(:xpath, "//input[@id='#{id}']", visible: false).set with
|
find(:xpath, "//input[@id='#{id}']", visible: false).set with
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def schedule_demo
|
||||||
|
t 'contract_templates.splash.actions.book_demo'
|
||||||
|
end
|
||||||
|
|
||||||
|
def create_release_template
|
||||||
|
t 'contract_templates.splash.actions.create_template'
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user