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.

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

Enhance - Dashboard page #1271

Merged
merged 36 commits into from
Jul 1, 2024
Merged
Show file tree
Hide file tree
Changes from 33 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
ac02a90
Added - Input field to enter the activation license key
riteelama May 28, 2024
e83d123
Added - Validation for license field input
riteelama May 29, 2024
117d5ae
Added - License and plugin version validation
riteelama May 31, 2024
444b8b4
Added - Loaading on button while retrieving license activation response
riteelama Jun 3, 2024
95db7d8
Added - Page reload after the license activation
riteelama Jun 3, 2024
ccaf8ef
Added -Toggle to activate/deactivate the module
riteelama Jun 3, 2024
5c9b7e2
Fix - plugin activation/deactivation toggle and upgrade plan
riteelama Jun 3, 2024
b19c630
Added - Settings URL for global settings
riteelama Jun 4, 2024
4d066ed
Fix - Settings URL and button style
riteelama Jun 5, 2024
486c12e
Added - Play button for demo vido on module hover
riteelama Jun 5, 2024
3680702
Fix - Video URL
riteelama Jun 5, 2024
eafbbf4
Added - Video Player for modules
riteelama Jun 5, 2024
6667c36
Fix - Video play option while license deactivated
riteelama Jun 6, 2024
32ca5e3
Fix - Searching module
riteelama Jun 6, 2024
94ce3c2
Added - copy button to copy shortcode
riteelama Jun 7, 2024
294c819
Added - Shortcode copied to clipboard
riteelama Jun 10, 2024
b4a4662
Tweak - Shortcode copy style
riteelama Jun 10, 2024
1825e80
Fix - Settings icon size, search module and settings link
riteelama Jun 17, 2024
4040d54
Add - open global settings on new tab
riteelama Jun 17, 2024
151ab4c
Add - Shortcode copy icon for shortcode example
riteelama Jun 17, 2024
3cc3a8a
Add - video url for ai contact and frontend listing
riteelama Jun 17, 2024
0c22421
Remove - Pop up for plan update in free version
riteelama Jun 24, 2024
ed5640b
Fix - Searching of module
riteelama Jun 24, 2024
452d7c8
Fix - Video loading and bulk plugin activation or deactivation
riteelama Jun 25, 2024
7e31ec7
Fix - No item found text
riteelama Jun 26, 2024
2f62bfa
Fix - Addon activation issues
riteelama Jun 26, 2024
c4d6233
Fix - Upgrade plan UTM
riteelama Jun 26, 2024
b6aa5e6
Fix - License Activation
riteelama Jun 26, 2024
28006ce
Add - id to some shortcode
riteelama Jun 26, 2024
35e4331
Fix - Search issue
deepench Jun 27, 2024
4aa132b
Tweak - Width of notice drawer
riteelama Jun 27, 2024
f95e88c
Fix - Sorting of modules by descending order
riteelama Jun 27, 2024
0895331
Fix - Sorting of modules on popular basis
riteelama Jun 27, 2024
f71321e
Merge branch 'pre-develop' into EVF-1002-enhance/dashboard-enhancement
riteelama Jul 1, 2024
841dc82
Merge branch 'pre-develop' into EVF-1002-enhance/dashboard-enhancement
riteelama Jul 1, 2024
7f1cdde
Update - Changelog
riteelama Jul 1, 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
218 changes: 173 additions & 45 deletions assets/extensions-json/sections/all_extensions.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/blocks.min.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions dist/dashboard.min.js

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions dist/dashboard.min.js.LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
/**
* @license
* Lodash <https://lodash.com/>
* Copyright OpenJS Foundation and other contributors <https://openjsf.org/>
* Released under MIT license <https://lodash.com/license>
* Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
* Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
*/

/**
* @license React
* react-dom.production.min.js
Expand Down
1 change: 1 addition & 0 deletions dist/reactPlayerPreview.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

47 changes: 46 additions & 1 deletion includes/RestApi/controllers/version1/class-evf-modules.php
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,15 @@ public function register_routes() {
'permission_callback' => array( __CLASS__, 'check_admin_plugin_activation_permissions' ),
)
);
register_rest_route(
$this->namespace,
'/' . $this->rest_base . '/activate-license',
array(
'methods' => 'POST',
'callback' => array( __CLASS__, 'activate_license' ),
'permission_callback' => array( __CLASS__, 'check_admin_plugin_activation_permissions' ),
)
);
}

/**
Expand Down Expand Up @@ -602,7 +611,7 @@ public static function bulk_install_addons( $addon_data ) {
);
$status = self::install_individual_addon( $slug, $plugin, $name, $status );

if ( isset( $status['success'] ) && ! $status['success'] ) {
if ( isset( $status['success'] ) && '' === $status['success'] ) {
array_push( $failed_addon, $name );
continue;
}
Expand Down Expand Up @@ -693,4 +702,40 @@ public static function check_admin_plugin_activation_permissions( $request ) {
public static function check_admin_plugin_installation_permissions( $request ) {
return current_user_can( 'install_plugins' ) && current_user_can( 'activate_plugin' );
}

/**
* Activate the plugin license.
*
* @since 3.0.1
*
* @param WP_REST_Request $request Full details about the request.
*
* @return WP_Error|WP_REST_Response
*/
public static function activate_license( $request ) {
if ( isset( $request['licenseActivationKey'] ) ) {
$evf_dashboard_plugin_updater = new EVF_Plugin_Updater();
$evf_dashboard_plugin_activator = $evf_dashboard_plugin_updater->activate_license( $request['licenseActivationKey'] );

if ( isset( $evf_dashboard_plugin_activator ) && $evf_dashboard_plugin_activator ) {
return new \WP_REST_Response(
array(
'status' => true,
'message' => esc_html__( 'Everest Forms Pro activated successfully.', 'everest-forms' ),
'code' => 200,
),
200
);
} else {
return new \WP_REST_Response(
array(
'status' => true,
'message' => esc_html__( 'Please enter the valid license key.', 'everest-forms' ),
'code' => 400,
),
200
);
}
}
}
}
Loading
Loading