chore(admin-pages): create two admin pages [WIP]

fixes #53
wp-pwa · Nov 20, 2018 · ab976e0 · ab976e0
1 parent f23b19d
commit ab976e0
Show file tree

Hide file tree

Showing 7 changed files with 73 additions and 101 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 node_modules
 .env.local
+dist
diff --git a/assets/frontity_20x20.png → admin/assets/frontity_20x20.png b/assets/frontity_20x20.png → admin/assets/frontity_20x20.png
diff --git a/admin/frontity-settings.php b/admin/frontity-settings.php
@@ -0,0 +1,3 @@
+
+<div>Settings</div>
+
diff --git a/assets/css/wp-pwa-plugin.css b/assets/css/wp-pwa-plugin.css
diff --git a/frontity.php b/frontity.php
@@ -1,10 +1,10 @@
 <?php
 /*
-Plugin Name: WordPress PWA
+Plugin Name: Frontity
 Plugin URI: https://wordpress.org/plugins/wordpress-pwa/
 Description: WordPress plugin to turn WordPress blogs into Progressive Web Apps.
 Version: 1.8.0
-Author: WordPress PWA
+Author: Frontity
 Author URI:
 License: GPL v3
 Copyright: Worona Labs SL
@@ -482,7 +482,7 @@ public function register_wp_pwa_styles($hook) {
 	* Register and enqueue scripts.
 	*/
 	public function register_wp_pwa_scripts($hook) {
-		wp_register_script('frontity_admin_js',plugin_dir_url(__FILE__) . 'admin/frontity-admin.js', array('jquery'), $this->plugin_version, true);
+		wp_register_script('frontity_admin_js',plugin_dir_url(__FILE__) . 'admin/dist/frontity-admin.js', array('jquery'), $this->plugin_version, true);
 		wp_enqueue_script('frontity_admin_js');
 	}
 
@@ -500,18 +500,27 @@ public function register_wp_pwa_scripts($hook) {
 	*  @return	N/A
 	*/
 	function wp_pwa_admin_actions() {
-		$icon_url	= trailingslashit(plugin_dir_url( __FILE__ )) . "assets/frontity_20x20.png";
+		$icon_url	= trailingslashit(plugin_dir_url( __FILE__ )) . "admin/assets/frontity_20x20.png";
 		$position	= 64.999989; //Right before the "Plugins"
 
 		add_menu_page(
-			'Frontity - Admin',
+			'Frontity',
 			'Frontity',
 			1,
 			'frontity-admin',
 			array($this, 'render_frontity_admin'),
 			$icon_url,
 			$position
 		);
+
+		add_submenu_page(
+			'frontity-admin',
+			'Frontity - Settings',
+			'Settings',
+			1,
+			'frontity-settings',
+			array($this, 'render_frontity_settings')
+		);
 	}
 
 	/*
@@ -532,6 +541,10 @@ function render_frontity_admin() {
 	  include('admin/frontity-admin.php');
 	}
 
+	function render_frontity_settings() {
+		include('admin/frontity-settings.php');
+	}
+
 	function get_wp_pwa_site_id() {
 		$settings = get_option('wp_pwa_settings');
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -54,7 +54,7 @@
     "husky": "^1.0.0",
     "replace-in-file": "^3.4.2",
     "semantic-release": "^15.9.16",
-    "semantic-release-cli": "^4.0.9",
+    "semantic-release-cli": "^4.0.10",
     "simple-git": "^1.102.0",
     "webpack": "^4.25.0",
     "webpack-cli": "^3.1.2"