Display tutorial only to new users

[MAILPOET-3206]
This commit is contained in:
Pavel Dohnal
2020-11-24 15:08:43 +01:00
committed by Veljko V
parent 2ef27608e9
commit bfaa1bbec4
4 changed files with 17 additions and 0 deletions

View File

@ -1,6 +1,7 @@
import React from 'react'; import React from 'react';
import Modal from 'common/modal/modal'; import Modal from 'common/modal/modal';
import { useSelect, useDispatch } from '@wordpress/data'; import { useSelect, useDispatch } from '@wordpress/data';
import MailPoet from 'mailpoet';
export const Tutorial = () => { export const Tutorial = () => {
const url = useSelect( const url = useSelect(
@ -17,6 +18,13 @@ export const Tutorial = () => {
return null; return null;
} }
const installedAtDate = new Date(MailPoet.installedAt);
const sevenDaysAgo = new Date();
sevenDaysAgo.setDate(sevenDaysAgo.getDate() - 7);
if (installedAtDate < sevenDaysAgo) {
return null; // only show to new users
}
function onClose() { function onClose() {
tutorialDismissed(); tutorialDismissed();
} }

View File

@ -11,6 +11,7 @@ var MailPoet = {
isWoocommerceActive: window.mailpoet_woocommerce_active, isWoocommerceActive: window.mailpoet_woocommerce_active,
premiumActive: window.mailpoet_premium_active, premiumActive: window.mailpoet_premium_active,
subscribersLimit: window.mailpoet_subscribers_limit, subscribersLimit: window.mailpoet_subscribers_limit,
installedAt: window.mailpoet_installed_at,
subscribersLimitReached: window.mailpoet_subscribers_limit_reached, subscribersLimitReached: window.mailpoet_subscribers_limit_reached,
subscribersCountTowardsLimit: window.mailpoet_premium_subscribers_count, subscribersCountTowardsLimit: window.mailpoet_premium_subscribers_count,
hasPremiumSupport: window.mailpoet_has_premium_support, hasPremiumSupport: window.mailpoet_has_premium_support,

View File

@ -78,6 +78,7 @@ use MailPoet\Models\Segment;
use MailPoet\Router\Endpoints\FormPreview; use MailPoet\Router\Endpoints\FormPreview;
use MailPoet\Router\Router; use MailPoet\Router\Router;
use MailPoet\Settings\Pages; use MailPoet\Settings\Pages;
use MailPoet\Settings\SettingsController;
use MailPoet\Settings\UserFlagsController; use MailPoet\Settings\UserFlagsController;
use MailPoet\WP\Functions as WPFunctions; use MailPoet\WP\Functions as WPFunctions;
@ -112,6 +113,9 @@ class FormEditor {
/** @var UserFlagsController */ /** @var UserFlagsController */
private $userFlags; private $userFlags;
/** @var SettingsController */
private $settings;
private $activeTemplates = [ private $activeTemplates = [
FormEntity::DISPLAY_TYPE_POPUP => [ FormEntity::DISPLAY_TYPE_POPUP => [
Template1Popup::ID, Template1Popup::ID,
@ -195,6 +199,7 @@ class FormEditor {
FormFactory $formsFactory, FormFactory $formsFactory,
Localizer $localizer, Localizer $localizer,
UserFlagsController $userFlags, UserFlagsController $userFlags,
SettingsController $settings,
TemplateRepository $templateRepository TemplateRepository $templateRepository
) { ) {
$this->pageRenderer = $pageRenderer; $this->pageRenderer = $pageRenderer;
@ -207,6 +212,7 @@ class FormEditor {
$this->localizer = $localizer; $this->localizer = $localizer;
$this->templatesRepository = $templateRepository; $this->templatesRepository = $templateRepository;
$this->userFlags = $userFlags; $this->userFlags = $userFlags;
$this->settings = $settings;
} }
public function render() { public function render() {
@ -251,6 +257,7 @@ class FormEditor {
'products' => $this->getWooCommerceProducts(), 'products' => $this->getWooCommerceProducts(),
'product_categories' => $this->getWooCommerceCategories(), 'product_categories' => $this->getWooCommerceCategories(),
'product_tags' => $this->getWooCommerceTags(), 'product_tags' => $this->getWooCommerceTags(),
'installed_at' => $this->settings->get('installed_at'),
]; ];
$this->wp->wpEnqueueMedia(); $this->wp->wpEnqueueMedia();
$this->pageRenderer->displayPage('form/editor.html', $data); $this->pageRenderer->displayPage('form/editor.html', $data);

View File

@ -41,6 +41,7 @@
var mailpoet_close_icons_url = '<%= image_url("form_close_icon") %>'; var mailpoet_close_icons_url = '<%= image_url("form_close_icon") %>';
var mailpoet_tutorial_seen = '<%= editor_tutorial_seen %>'; var mailpoet_tutorial_seen = '<%= editor_tutorial_seen %>';
var mailpoet_tutorial_url = '<%= cdn_url('form-editor/tutorial.mp4') %>'; var mailpoet_tutorial_url = '<%= cdn_url('form-editor/tutorial.mp4') %>';
var mailpoet_installed_at = '<%= installed_at %>';
<% endautoescape %> <% endautoescape %>
</script> </script>