updated - and moved classes related to the widgets class

equalizedigital · Dec 15, 2023 · e99fd27 · e99fd27
1 parent 935e376
commit e99fd27
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 38 deletions.
diff --git a/accessibility-checker.php b/accessibility-checker.php
@@ -158,12 +158,12 @@
 require_once plugin_dir_path( __FILE__ ) . 'includes/purge.php';
 require_once plugin_dir_path( __FILE__ ) . 'includes/system-info.php';
 //require_once plugin_dir_path( __FILE__ ) . 'includes/classes/class-admin-notices.php';
-require_once plugin_dir_path( __FILE__ ) . 'includes/classes/class-rest-api.php';
-require_once plugin_dir_path( __FILE__ ) . 'includes/classes/class-helpers.php';
-require_once plugin_dir_path( __FILE__ ) . 'includes/classes/class-settings.php';
-require_once plugin_dir_path( __FILE__ ) . 'includes/classes/class-issues-query.php';
-require_once plugin_dir_path( __FILE__ ) . 'includes/classes/class-scans-stats.php';
-require_once plugin_dir_path( __FILE__ ) . 'includes/classes/class-widgets.php';
+//require_once plugin_dir_path( __FILE__ ) . 'includes/classes/class-rest-api.php';
+//require_once plugin_dir_path( __FILE__ ) . 'includes/classes/class-helpers.php';
+//require_once plugin_dir_path( __FILE__ ) . 'includes/classes/class-settings.php';
+//require_once plugin_dir_path( __FILE__ ) . 'includes/classes/class-issues-query.php';
+//require_once plugin_dir_path( __FILE__ ) . 'includes/classes/class-scans-stats.php';
+//require_once plugin_dir_path( __FILE__ ) . 'includes/classes/class-widgets.php';
 //require_once plugin_dir_path( __FILE__ ) . 'includes/classes/class-welcome-page.php';
 //require_once plugin_dir_path( __FILE__ ) . 'includes/classes/class-ajax.php';
 //require_once plugin_dir_path( __FILE__ ) . 'includes/classes/class-frontend-highlight.php';
@@ -172,7 +172,6 @@
 /**
  * Filters and Actions
  */
-add_action( 'init', 'edac_init' );
 add_action( 'admin_enqueue_scripts', 'edac_admin_enqueue_scripts' );
 add_action( 'admin_enqueue_scripts', 'edac_admin_enqueue_styles' );
 add_action( 'wp_enqueue_scripts', 'edac_enqueue_scripts' );
@@ -193,15 +192,6 @@
 	add_action( 'updated_post_meta', 'edac_oxygen_builder_save_post', 10, 4 );
 }
 //add_action( 'admin_init', 'edac_anww_update_post_meta' );
-add_action( 'wp_dashboard_setup', 'edac_wp_dashboard_setup' );
-
-/**
- * Init the plugin
- */
-function edac_init() {
-	// instantiate the classes that need to load hooks early.
-	new \EDAC\Rest_Api();
-}
 
 /**
  * Create/Update database
@@ -307,22 +297,6 @@ function edac_before_page_render() {
 	}
 }
 
-/**
- * Add dashboard widget
- *
- * @return void
- */
-function edac_wp_dashboard_setup() {
-	wp_add_dashboard_widget(
-		'edac_dashboard_scan_summary',
-		'Accessibility Checker',
-		array(
-			'\EDAC\Widgets',
-			'render_dashboard_scan_summary',
-		)
-	);
-}
-
 /**
  * Summary Data
  *

diff --git a/admin/class-admin.php b/admin/class-admin.php
@@ -6,6 +6,7 @@
  */
 
 namespace EDAC\Admin;
+use EDAC;
 
 /**
  * Admin handling class.
@@ -28,6 +29,11 @@ public function __construct() {
 	private function init() {
 		$admin_notices = new \EDAC\Admin\Admin_Notices();
 		$admin_notices->init_hooks();
+
+		$widgets = new \EDAC\Admin\Widgets();
+		$widgets->init_hooks();
+
+		new EDAC\REST_Api();
 	}
 
 	/**
@@ -46,5 +52,4 @@ private function init_ajax() {
 		$frontend_highlight = new \EDAC\Admin\Frontend_Highlight();
 		$frontend_highlight->init_hooks();
 	}
-
 }
diff --git a/includes/classes/class-issues-query.php → admin/class-issues-query.php b/includes/classes/class-issues-query.php → admin/class-issues-query.php
@@ -8,7 +8,7 @@
 namespace EDAC;
 
 use EDAC\Helpers;
-use EDAC\Settings;
+use EDAC\Admin\Settings;
 
 /**
  * Class that handles calculating scan report data

diff --git a/includes/classes/class-rest-api.php → admin/class-rest-api.php b/includes/classes/class-rest-api.php → admin/class-rest-api.php
@@ -8,7 +8,7 @@
 namespace EDAC;
 
 use EDAC\Scans_Stats;
-use EDAC\Settings;
+use EDAC\Admin\Settings;
 use EDAC\Helpers;
 
 

diff --git a/includes/classes/class-scans-stats.php → admin/class-scans-stats.php b/includes/classes/class-scans-stats.php → admin/class-scans-stats.php
@@ -7,7 +7,7 @@
 
 namespace EDAC;
 
-use EDAC\Settings;
+use EDAC\Admin\Settings;
 use EDAC\Helpers;
 use EDAC\Issues_Query;
 

diff --git a/includes/classes/class-settings.php → admin/class-settings.php b/includes/classes/class-settings.php → admin/class-settings.php
@@ -5,7 +5,7 @@
  * @package Accessibility_Checker
  */
 
-namespace EDAC;
+namespace EDAC\Admin;
 
 use EDAC\Helpers;
 

diff --git a/includes/classes/class-widgets.php → admin/class-widgets.php b/includes/classes/class-widgets.php → admin/class-widgets.php
@@ -5,13 +5,34 @@
  * @package Accessibility_Checker
  */
 
-namespace EDAC;
+namespace EDAC\Admin;
 
 /**
  * Class that handles widgets
  */
 class Widgets {
 
+	/**
+	 * Initialize hooks.
+	 *
+	 * @return void
+	 */
+	public function init_hooks() {
+		add_action( 'wp_dashboard_setup', array( $this, 'dashboard_setup' ) );
+	}
+
+	/**
+	 * Add dashboard widget
+	 *
+	 * @return void
+	 */
+	public function dashboard_setup() {
+		wp_add_dashboard_widget(
+			'edac_dashboard_scan_summary',
+			'Accessibility Checker',
+			array( $this, 'render_dashboard_scan_summary' )
+		);
+	}
 
 	/**
 	 * Renders as widget