Skip to content

Switching to react av #508

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

Merged
AntonV1211 merged 3 commits into from
May 19, 2025
Merged

Switching to react av #508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
67f5c39
Edits for merging branches
AntonV1211 May 14, 2025
c7a059e
Fix. SpbcEnqueue. Editing the connection of the react bundle and font…
AntonV1211 May 15, 2025
ae3b7a2
Fix. Settings. Removed the extra spaces
AntonV1211 May 15, 2025
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
2 changes: 1 addition & 1 deletion css/spbc-icons.min.css
View file
Open in desktop

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

12 changes: 6 additions & 6 deletions css/src/spbc-icons.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
@font-face {
font-family: 'fontello';
src: url('./fonts/icons/icons.eot');
src: url('./fonts/icons/icons.eot') format('embedded-opentype'),
url('./fonts/icons/icons.woff2') format('woff2'),
url('./fonts/icons/icons.woff') format('woff'),
url('./fonts/icons/icons.ttf') format('truetype'),
url('./fonts/icons/icons.svg') format('svg');
src: url('./js/public/2c86476ce0cd763460fe.eot');
src: url('./js/public/2c86476ce0cd763460fe.eot') format('embedded-opentype'),
url('./js/public/d0e8437c6ac4a5a78136.woff2') format('woff2'),
url('./js/public/4e40a2ec13c745fb3b02.woff') format('woff'),
url('./js/public/bae698082a959c23069f.ttf') format('truetype'),
url('./js/public/26841eb4a862f951af20.svg') format('svg');
font-weight: normal;
font-style: normal;
}
Expand Down
220 changes: 0 additions & 220 deletions js/public/spbc-react-bundle_old.js
View file
Open in desktop

This file was deleted.

11 changes: 5 additions & 6 deletions lib/CleantalkSP/SpbctWP/SpbcEnqueue.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,18 +174,17 @@ private static function handlePluginSettingsPage()
self::getInstance()->js('spbc-table.js', array('jquery'), true);
self::getInstance()->js('spbc-scanner-plugin.js', array('jquery'), true);
self::getInstance()->js('spbc-modal.js', array('jquery'), true);
self::getInstance()->js('/public/spbct-react-bundle.js', array('wp-i18n'), ['in_footer']);
//self::getInstance()->js('/public/spbc-react-bundle_old.js', array('wp-i18n'), ['in_footer']);
self::getInstance()->js('public/spbct-react-bundle.js', array('wp-i18n'), ['in_footer']);

/*self::getInstance()->custom(
/*wp_enqueue_script(
'spbct-react-bundle',
SPBC_PATH . '/js/public/spbct-react-bundle.js',
array(),
array('wp-i18n'),
SPBC_VERSION,
true,
null
);*/
wp_set_script_translations('/public/spbct-react-bundle.js', 'security-malware-firewall');
wp_set_script_translations('spbct-react-bundle-js', 'security-malware-firewall');


/**
* ============== LOCALIZATION FOR JS SCRIPTS ==============
Expand Down
8 changes: 7 additions & 1 deletion lib/CleantalkSP/SpbctWP/Views/Settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,13 @@ public static function page($id_element = false)
// errors
'spbcErrors' => spbc_settings__error__output(),
];
echo '<div id="' . $id_element . '" data-data=\'' . json_encode($spbct_page_data) . '\' class="' . $class_element . '"></div>';

echo '<div
id="' . $id_element . '"
data-nonce=\'' . esc_attr(wp_create_nonce('spbc_secret_nonce')) . '\'
Comment thread
AntonV1211 marked this conversation as resolved.
data-ajaxurl=\'' . esc_attr(admin_url('admin-ajax.php')) . '\'
data-data=\'' . json_encode($spbct_page_data) . '\'
class="' . $class_element . '"></div>';
}

private static function getAdminsOnline()
Expand Down
2 changes: 0 additions & 2 deletions security-malware-firewall.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,8 +383,6 @@ function spbc_change_author_name($link, $_author_id, $_author_nicename)
add_action('admin_init', array('CleantalkSP\SpbctWP\Activator', 'redirectAfterActivation'), 1); // Redirect after activation
add_action('admin_init', 'spbc_admin_init', 1, 1); // Main admin hook
add_action('admin_menu', 'spbc_admin_add_page'); // Admin pages
//include_once SPBC_PLUGIN_DIR . 'inc\settings-react\spbct-settings-react.php';
//add_action('admin_menu', 'spbc_admin_add_react_page'); // Admin pages via REACT
add_action('network_admin_menu', 'spbc_admin_add_page'); // Network admin pages
add_action('admin_enqueue_scripts', array('CleantalkSP\SpbctWP\SpbcEnqueue', 'handleEnqueueHook')); // Scripts

Expand Down
Loading