Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix/470 #1153

Merged
merged 10 commits into from
May 23, 2024
Merged

Fix/470 #1153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2e20fdb
chore: replaced favicons with dashicons
GrigoreMihai May 17, 2024
1ea938f
chore: added renew notice dom cleanup on close
GrigoreMihai May 17, 2024
874cf97
chore: added proper links for license renew on lock notice
GrigoreMihai May 17, 2024
7c53f00
chore: optimized feature lock notice rendering
GrigoreMihai May 20, 2024
94c9181
removed leftover testing code
GrigoreMihai May 20, 2024
565348d
lint code
GrigoreMihai May 20, 2024
378fa1a
chore: mode the pro popup blocker to separate function
GrigoreMihai May 20, 2024
064c73b
lint code
GrigoreMihai May 20, 2024
7a58250
chore: addresed pr review changes
GrigoreMihai May 22, 2024
187c7f6
chore: added e2e test for pro chart lock
GrigoreMihai May 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions classes/Visualizer/Module/Admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1019,6 +1019,7 @@ public function renderLibraryPage() {
}
// enqueue charts array
$ajaxurl = admin_url( 'admin-ajax.php' );

wp_localize_script(
'visualizer-library',
'visualizer',
Expand Down
2 changes: 2 additions & 0 deletions classes/Visualizer/Plugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ class Visualizer_Plugin {
const ACTION_UPLOAD_DATA = 'visualizer-upload-data';
const ACTION_EXPORT_DATA = 'visualizer-export-data';

const STORE_URL = 'https://store.themeisle.com/';

/**
*Action used for fetching specific users/roles for permissions.
*/
Expand Down
52 changes: 52 additions & 0 deletions classes/Visualizer/Render/Library.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,55 @@ private function getDisplayForm() {
</form>
</div>';
}
/**
* Renders pro charts blocker.
*
* @access private
*/
private function _renderProPopupBlocker() {
GrigoreMihai marked this conversation as resolved.
Show resolved Hide resolved
if ( Visualizer_Module::is_pro() ) {
return;
}
$license = get_option( 'visualizer_pro_license_data', 'free' );
$license_key = '';
$download_id = '';
if ( ! empty( $license ) && is_object( $license ) ) {
$license_key = $license->key;
$download_id = $license->download_id;
}
$admin_license_url = admin_url( 'options-general.php#visualizer_pro_license' );
$renew_license_url = tsdk_utmify( Visualizer_Plugin::STORE_URL . '?edd_license_key=' . $license_key . '&download_id=' . $download_id, 'visualizer_license_block' );
echo '
<div class="vizualizer-renew-notice-overlay" id="overlay-visualizer"></div>
<div class="vizualizer-renew-notice-popup">
<h1 class="vizualizer-renew-notice-heading">Alert!</h1>
<p class="vizualizer-renew-notice-message">' . esc_html__( 'In order to edit premium charts, benefit from updates and support for Visualizer Premium plugin, please renew your license code or activate it.', 'visualizer' ) . '</p>
<div class="vizualizer-renew-notice-buttons-container">
<a href="' . esc_url( $renew_license_url) . '" target="_blank">
<button class="vizualizer-renew-notice-button vizualizer-renew-notice-renew-button">
<span class="dashicons dashicons-cart"></span>' . esc_html__( 'Renew License', 'visualizer' ) . '
</button>
</a>
<a href="' . esc_url( $admin_license_url ) . '">
<button class="vizualizer-renew-notice-button vizualizer-renew-notice-activate-button">
<span class="dashicons dashicons-unlock"></span> ' . esc_html__( 'Activate License', 'visualizer' ) . '
</button>
</a>
<button class="vizualizer-renew-notice-button vizualizer-renew-notice-close-icon" aria-label="Close" onclick="closePopup()">
<i class="dashicons dashicons-no"></i>
</button>
</div>
</div>
<script>
function closePopup() {
var overlay = document.getElementById("overlay-visualizer");
var popup = document.querySelector(".vizualizer-renew-notice-popup");
overlay.style.display = "none";
popup.style.display = "none";
}
</script>';

}
/**
* Renders library content.
*
Expand All @@ -215,10 +263,14 @@ private function getDisplayForm() {
* @access private
*/
private function _renderLibrary() {

// Added by Ash/Upwork
$filterBy = ! empty( $_GET['s'] ) ? sanitize_text_field( wp_unslash( $_GET['s'] ) ) : null; // phpcs:ignore WordPress.Security.NonceVerification.Recommended
// Added by Ash/Upwork
echo $this->custom_css;

$this->_renderProPopupBlocker();

echo '<div id="visualizer-types" class="visualizer-clearfix">';
echo '<svg xmlns="http://www.w3.org/2000/svg" style="display: none;"><symbol id="list-icon" fill="currentColor"><path d="M8 0C3.58 0 0 3.58 0 8C0 12.42 3.58 16 8 16C12.42 16 16 12.42 16 8C16 3.58 12.42 0 8 0ZM7.385 12.66H6.045L2.805 8.12L4.146 6.87L6.715 9.27L11.856 3.339L13.196 4.279L7.385 12.66Z"/></symbol></svg>';
$this->getDisplayForm();
Expand Down
16 changes: 13 additions & 3 deletions css/library.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,7 @@ div#visualizer-types ul, div#visualizer-types form p {


.vizualizer-renew-notice-overlay {
display: none;
position: fixed;
top: 0;
left: 0;
Expand All @@ -532,7 +533,7 @@ div#visualizer-types ul, div#visualizer-types form p {
}

.vizualizer-renew-notice-popup {
display: block;
display: none;
position: fixed;
top: 50%;
left: 50%;
Expand Down Expand Up @@ -594,8 +595,17 @@ div#visualizer-types ul, div#visualizer-types form p {

.vizualizer-renew-notice-close-icon {
position: absolute;
top: 10px;
right: 10px;
top: -10px;
right: -70px;
cursor: pointer;
color: #333;
background: none;
border: none;
padding: 0;
outline: none;
/* Reset button styles */
display: inline-block;
font: inherit;
text-align: inherit;
text-decoration: none;
}
89 changes: 17 additions & 72 deletions js/library.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,63 +33,13 @@
});
})(wp.media.view);

function createPopupProBlocker() {

var link = document.createElement('link');
link.rel = 'stylesheet';
link.href = 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0-beta3/css/all.min.css';
document.head.appendChild(link);

var overlay = document.createElement('div');
overlay.classList.add('vizualizer-renew-notice-overlay');
overlay.id = 'overlay-visualizer';
document.body.appendChild(overlay);

var popup = document.createElement('div');
popup.classList.add('vizualizer-renew-notice-popup');

var closeIcon = document.createElement('i');
closeIcon.classList.add('fas', 'fa-times', 'vizualizer-renew-notice-close-icon');
closeIcon.addEventListener('click', function() {
document.body.removeChild(overlay);
popup.style.display = 'none';
});
popup.appendChild(closeIcon);

var heading = document.createElement('h1');
heading.textContent = 'Alert!';
heading.classList.add('vizualizer-renew-notice-heading');
popup.appendChild(heading);

var message = document.createElement('p');
message.textContent = 'In order to edit premium charts, benefit from updates and support for Visualizer Premium plugin, please renew your license code or activate it.';
message.classList.add('vizualizer-renew-notice-message');
popup.appendChild(message);

var buttonsContainer = document.createElement('div');
buttonsContainer.classList.add('vizualizer-renew-notice-buttons-container');

var link1 = document.createElement('a');
link1.href = 'https://store.themeisle.com/';
link1.target = '_blank';
var button1 = document.createElement('button');
button1.innerHTML = '<span class="fas fa-shopping-cart"></span> Renew License';
button1.classList.add('vizualizer-renew-notice-button', 'vizualizer-renew-notice-renew-button');
link1.appendChild(button1);
buttonsContainer.appendChild(link1);

var link2 = document.createElement('a');
link2.href = '/wp-admin/options-general.php#visualizer_pro_license';
var button2 = document.createElement('button');
button2.innerHTML = '<span class="fas fa-key"></span> Activate License';
button2.classList.add('vizualizer-renew-notice-button', 'vizualizer-renew-notice-activate-button');
link2.appendChild(button2);
buttonsContainer.appendChild(link2);

popup.appendChild(buttonsContainer);

document.body.appendChild(popup);

function createPopupProBlocker( $ , e ) {
if ( ! visualizer.is_pro_user && e.target.classList.contains('viz-is-pro-chart') ) {
$("#overlay-visualizer").css("display", "block");
$(".vizualizer-renew-notice-popup").css("display", "block");
return true;
}
return false;
}

(function ($, vmv, vu) {
Expand Down Expand Up @@ -135,12 +85,11 @@ function createPopupProBlocker() {
$(this).parent('form').submit();
});

$('.visualizer-chart-shortcode').click(function (e) {
$('.visualizer-chart-shortcode').click(function (event) {

if ( ! visualizer.is_pro_user && e.target.classList.contains('viz-is-pro-chart') ) {
createPopupProBlocker();
e.preventDefault();
e.stopPropagation();
if ( createPopupProBlocker( $, event ) ) {
event.preventDefault();
event.stopPropagation();
return;
}

Expand All @@ -149,12 +98,12 @@ function createPopupProBlocker() {
if (window.getSelection && document.createRange) {
selection = window.getSelection();
range = document.createRange();
range.selectNodeContents(e.target);
range.selectNodeContents(event.target);
selection.removeAllRanges();
selection.addRange(range);
} else if (document.selection && document.body.createTextRange) {
range = document.body.createTextRange();
range.moveToElementText(e.target);
range.moveToElementText(event.target);
range.select();
}
});
Expand Down Expand Up @@ -195,8 +144,7 @@ function createPopupProBlocker() {

$('.visualizer-chart-edit').click(function (event) {

if ( ! visualizer.is_pro_user && event.target.classList.contains('viz-is-pro-chart') ) {
createPopupProBlocker();
if ( createPopupProBlocker( $, event ) ) {
return;
}

Expand All @@ -215,16 +163,14 @@ function createPopupProBlocker() {
return false;
});
$(".visualizer-chart-clone").on("click", function ( event ) {
if ( ! visualizer.is_pro_user && event.target.classList.contains('viz-is-pro-chart') ) {
createPopupProBlocker();
if ( createPopupProBlocker( $, event ) ) {
event.preventDefault();
}
});

$(".visualizer-chart-export").on("click", function (event) {

if ( ! visualizer.is_pro_user && event.target.classList.contains('viz-is-pro-chart') ) {
createPopupProBlocker();
if ( createPopupProBlocker( $, event ) ) {
return;
}

Expand All @@ -249,8 +195,7 @@ function createPopupProBlocker() {
});

$(".visualizer-chart-image").on("click", function (event) {
if ( ! visualizer.is_pro_user && event.target.classList.contains('viz-is-pro-chart') ) {
createPopupProBlocker();
if ( createPopupProBlocker( $, event ) ) {
return;
}
$('body').trigger('visualizer:action:specificchart', {action: 'image', id: $(this).attr("data-chart"), data: null, dataObj: {name: $(this).attr("data-chart-title")}});
Expand Down
Loading
Loading