| @@ -13,9 +13,9 @@ | ||
| 13 | 13 | * Screen name. |
| 14 | 14 | * |
| 15 | 15 | * @var string |
| 16 | 16 | */ |
| 17 | - const SCREEN_NAME = 'dashboard_page_flywp'; | |
| 17 | + const SCREEN_NAME = 'tools_page_flywp'; | |
| 18 | 18 | |
| 19 | 19 | public $fastcgi = null; |
| 20 | 20 | |
| 21 | 21 | /** |
| @@ -28,10 +28,8 @@ | ||
| 28 | 28 | |
| 29 | 29 | new Admin\Adminbar(); |
| 30 | 30 | new Admin\Opcache(); |
| 31 | 31 | new Admin\Plugins(); |
| 32 | - new Admin\Email(); | |
| 33 | - new Admin\Optimizations(); | |
| 34 | 32 | } |
| 35 | 33 | |
| 36 | 34 | /** |
| 37 | 35 | * Register admin page. |
| @@ -36,9 +34,10 @@ | ||
| 36 | 34 | /** |
| 37 | 35 | * Register admin page. |
| 38 | 36 | */ |
| 39 | 37 | public function register_admin_page() { |
| 40 | - $hook = add_dashboard_page( | |
| 38 | + $hook = add_submenu_page( | |
| 39 | + 'tools.php', | |
| 41 | 40 | __( 'FlyWP', 'flywp' ), |
| 42 | 41 | __( 'FlyWP', 'flywp' ), |
| 43 | 42 | 'manage_options', |
| 44 | 43 | self::PAGE_SLUG, |
| @@ -55,9 +54,9 @@ | ||
| 55 | 54 | * |
| 56 | 55 | * @return string |
| 57 | 56 | */ |
| 58 | 57 | public function page_url() { |
| 59 | - return admin_url( 'index.php?page=' . self::PAGE_SLUG ); | |
| 58 | + return admin_url( 'tools.php?page=' . self::PAGE_SLUG ); | |
| 60 | 59 | } |
| 61 | 60 | |
| 62 | 61 | /** |
| 63 | 62 | * Add query args to removable query args. |
| @@ -86,9 +85,10 @@ | ||
| 86 | 85 | */ |
| 87 | 86 | public function enqueue_js() { |
| 88 | 87 | $min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min'; |
| 89 | 88 | |
| 90 | - wp_enqueue_script( 'flywp-admin-js', FLYWP_PLUGIN_URL . '/assets/js/admin' . $min . '.js', [ 'jquery' ], FLYWP_VERSION, true ); | |
| 89 | + wp_enqueue_script( 'flywp-chart', FLYWP_PLUGIN_URL . '/assets/js/chart.min.js', [], FLYWP_VERSION, true ); | |
| 90 | + wp_enqueue_script( 'flywp-admin-js', FLYWP_PLUGIN_URL . '/assets/js/admin' . $min . '.js', [ 'jquery', 'flywp-chart' ], FLYWP_VERSION, true ); | |
| 91 | 91 | } |
| 92 | 92 | |
| 93 | 93 | /** |
| 94 | 94 | * Render admin page. |
| @@ -93,58 +93,7 @@ | ||
| 93 | 93 | /** |
| 94 | 94 | * Render admin page. |
| 95 | 95 | */ |
| 96 | 96 | public function render_admin_page() { |
| 97 | - $tabs = [ | |
| 98 | - 'cache' => __( 'Caching', 'flywp' ), | |
| 99 | - 'email' => __( 'Email', 'flywp' ), | |
| 100 | - 'optimizations' => __( 'Optimizations', 'flywp' ), | |
| 101 | - ]; | |
| 102 | - | |
| 103 | - $active_tab = isset( $_GET['tab'] ) && array_key_exists( $_GET['tab'], $tabs ) ? $_GET['tab'] : 'cache'; | |
| 104 | - $site_info = $this->fetch_site_info(); | |
| 105 | - $app_site_url = $this->get_site_url( $site_info ); | |
| 106 | - | |
| 107 | 97 | include FLYWP_PLUGIN_DIR . '/views/admin.php'; |
| 108 | - } | |
| 109 | - | |
| 110 | - /** | |
| 111 | - * Fetch site info. | |
| 112 | - * | |
| 113 | - * @return array|false | |
| 114 | - */ | |
| 115 | - private function fetch_site_info() { | |
| 116 | - $transient_key = 'flywp_site_info'; | |
| 117 | - $site_info = get_transient( $transient_key ); | |
| 118 | - | |
| 119 | - if ( false === $site_info ) { | |
| 120 | - $site_info = flywp()->flyapi->site_info(); | |
| 121 | - | |
| 122 | - if ( isset( $site_info['error'] ) ) { | |
| 123 | - return false; | |
| 124 | - } | |
| 125 | - | |
| 126 | - set_transient( $transient_key, $site_info, DAY_IN_SECONDS ); | |
| 127 | - } | |
| 128 | - | |
| 129 | - return $site_info; | |
| 130 | - } | |
| 131 | - | |
| 132 | - /** | |
| 133 | - * Get site URL. | |
| 134 | - * | |
| 135 | - * @param array|false $info | |
| 136 | - * | |
| 137 | - * @return string | |
| 138 | - */ | |
| 139 | - private function get_site_url( $info ) { | |
| 140 | - if ( false === $info ) { | |
| 141 | - return 'https://app.flywp.com'; | |
| 142 | - } | |
| 143 | - | |
| 144 | - return sprintf( | |
| 145 | - 'https://app.flywp.com/servers/%d/sites/%d', | |
| 146 | - $info['server_id'], | |
| 147 | - $info['id'] | |
| 148 | - ); | |
| 149 | 98 | } |
| 150 | 99 | } |