Context Navigation

← Previous Changeset
Next Changeset →

Changeset 2606364

Timestamp:

09/28/2021 07:54:50 PM (4 years ago)

Author:

mottodesignstudio

Message:

Preparing for 1.1.2 release

Location:

blaze-css/trunk

Files:

: 1808 added
: 13 edited

Legend:

: Unmodified
: Added
: Removed

blaze-css/trunk/README.txt

-                      r2584992
+                      r2606364
 Donate link: https://motto.ca
 Tags: purgecss, purifycss, uncss, tailwind, css optimization, pagespeed, lighthouse
 Requires at least: 4.1
 Tested up to: 5.7
 Stable tag: 1.0.1
+Requires at least: 5.2
+Tested up to: 5.8
+Stable tag: 1.1.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 …
 == Changelog ==
+= 1.1.2 =
+* Added settings menu.
+* Fixed PHP notices.
+* Vendor directory not being deployed properly.
 = 1.0.1 =
 * Fixed some PHP notices.

blaze-css/trunk/blaze-css.php

-                      r2584989
+                      r2606364
+ *
  * @link              https://motto.ca
  * @since             1.0.0
+ * @since             1.1.2
  * @package           Blaze_CSS
+ *
 …
  * Plugin URI:        https://github.com/wpmotto/wp-blaze-css
  * Description:       WordPress plugin to render your CSS as fast as possible. Crush your lighthouse scores by simply activating the plugin.
  * Version:           1.0.1
+ * Version:           1.1.2
  * Author:            Motto
  * Author URI:        https://motto.ca
 …
 \register_deactivation_hook( __FILE__, '\Motto\BlazeCss\Deactivator::deactivate' );
+if (!function_exists('write_log')) {
+    function write_log($log) {
+        if (true === WP_DEBUG) {
+            if (is_array($log) || is_object($log)) {
+                error_log(print_r($log, true));
+            } else {
+                error_log($log);
+            }
+        }
+    }
+}
 /**
  * Begins execution of the plugin.

blaze-css/trunk/dist/scripts/blaze-admin.js

-                      r2499500
+                      r2606364
 (function( $ ) {
     'use strict';
+    $( window ).load(function() {
+    /**
+     * All of the code for your Dashboard-specific JavaScript source
+     * should reside in this file.
+     *
+     * Note that this assume you're going to use jQuery, so it prepares
+     * the $ function reference to be used within the scope of this
+     * function.
+     *
+     * From here, you're able to define handlers for when the DOM is
+     * ready:
+     *
+     * $(function() {
+     *
+     * });
+     *
+     * Or when the window is loaded:
+     *
+     * $( window ).load(function() {
+     *
+     * });
+     *
+     * ...and so on.
+     *
+     * Remember that ideally, we should not attach any more than a single DOM-ready or window-load handler
+     * for any particular page. Though other scripts in WordPress core, other plugins, and other themes may
+     * be doing this, we should try to minimize doing that in our own work.
+     */
+        $( "#blaze_btn_generate_csv" ).click(function() {
+            fetch(blaze_ajax_object.ajax_url, {
+                method: 'POST',
+                credentials: 'same-origin',
+                headers: new Headers({'Content-Type': 'application/x-www-form-urlencoded'}),
+                body: new URLSearchParams({
+                    action: 'blaze_generate_csv',
+                    _ajax_nonce: blaze_ajax_object.ajax_nonce
+                })
+            })
+            .then(response => {
+                console.log('response', response);
+                // return response.json();
+            })
+            // .then(data => {
+            //  console.log('Success:', data);
+            // })
+            // .catch(error => {
+            //  console.error('Error:', error);
+            // });
+        });
+    });
 })( jQuery );

blaze-css/trunk/dist/scripts/blaze.js

r2499500	r2606364
22	22	_ajax_nonce: blaze_ajax_object.ajax_nonce,
23	23	url: window.location.href,
	24	width: window.innerWidth,
	25	height: window.innerHeight,
24	26	log: JSON.stringify(log),
25	27	})

blaze-css/trunk/lib/Admin.php

-                      r2499500
+                      r2606364
+ *
  * @link       https://github.com/wpmotto/wp-blaze-css
  * @since      1.0.0
+ * @since      1.1.2
+ *
  * @package    BlazeCss
 …
 namespace Motto\BlazeCss;
+use Motto\BlazeCss\Common\File;
 /**
 …
     private $plugin;
+    private $settings;
     /**
      * Initialize the class and set its properties.
 …
     public function __construct( Plugin $plugin ) {
         $this->plugin = $plugin;
+        $this->settings = new Settings( $plugin );
+        $this->settings->add_page('settings', 'Blaze Settings');
+    }
 …
         \wp_enqueue_style(
             $this->plugin->get_plugin_name(),
             \plugin_dir_url( dirname( __FILE__ ) ) . 'dist/styles/plugin-name-admin.css',
+            \plugin_dir_url( dirname( __FILE__ ) ) . 'dist/styles/blaze-admin.css',
             array(),
             $this->plugin->get_version(),
             'all' );
+    }
 …
         \wp_enqueue_script(
             $this->plugin->get_plugin_name(),
             \plugin_dir_url( dirname( __FILE__ ) ) . 'dist/scripts/plugin-name-admin.js',
+            \plugin_dir_url( dirname( __FILE__ ) ) . 'dist/scripts/blaze-admin.js',
             array( 'jquery' ),
             $this->plugin->get_version(),
             false );
+    }
+        \wp_localize_script(
+            $this->plugin->get_plugin_name(),
+            $this->plugin->get_plugin_name() . '_ajax_object', [
+            'ajax_url'   => admin_url( 'admin-ajax.php' ),
+            'ajax_nonce' => wp_create_nonce(
+                $this->plugin->get_ajax_nonce_name()
+            )
+        ]);
+    }
+    public function add_settings_page() {
+        add_options_page(
+            __( 'Blaze CSS Settings', 'blazecss' ),
+            __( 'Blaze', 'blazecss' ),
+            'manage_options',
+            $this->settings->get_page_name(),
+            [ $this->settings, 'renderPage' ]
+        );
+    }
+    private function getSettingsConfig() {
+        return [
+            'general_settings' => [
+                'label' => 'General',
+                'fields' => [
+                    [
+                        'name' => 'logging',
+                        'label' => 'Activate Logging',
+                    ],
+                    [
+                        'name' => 'log_for_all',
+                        'label' => 'Log for Logged in Users',
+                    ],
+                    [
+                        'name' => 'clean_data',
+                        'label' => 'Cleanup',
+                    ],
+                ],
+            ],
+            'generate_csv_settings' => [
+                'label' => 'Generation results CSV Options',
+                'fields' => [
+                    [
+                        'name' => 'gcsv_auto',
+                        'label' => 'Generate Automaticaly',
+                    ],
+                    [
+                        'name' => 'gcsv_path_file',
+                        'label' => 'Path CSV File',
+                    ],
+                ],
+            ]
+        ];
+    }
+    public function init_settings() {
+        $this->add_generate_csv_after_form();
+        add_option(
+            $this->settings->get_options_name(), [
+                'logging' => 0,
+                'log_for_all' => 0,
+                'clean_data' => 0,
+                'gcsv_auto' => 0,
+                'gcsv_path_file' => 'uploads/blaze.csv'
+            ]
+        );
+        register_setting(
+            $this->settings->get_options_name(),
+            $this->settings->get_options_name(),
+            [ $this, 'validate' ]
+        );
+        $this->settings->registerSettings( $this->getSettingsConfig() );
+    }
+    public function generate_csv()
+    {
+        // check nonce
+        \check_ajax_referer(
+            $this->plugin->get_ajax_nonce_name(),
+            '_ajax_nonce'
+        );
+        $file = new File($this->plugin);
+        $file->write();
+        die();
+    }
+    private function add_generate_csv_after_form()
+    {
+        add_action('after_blaze-settings_page', function() {
+            if( $this->settings->get_option('gcsv_auto') == 1 )
+                return;
+        ?>
+        <div>
+            <h3>Manually Generate CSS .CSV File</h3>
+            <p>Click on the following button to generate the .csv file with the results.</p>
+            <button id="<?php echo $this->settings->field_id_from_name('btn_generate_csv') ?>">
+                Generate CSV
+            </button>
+        </div>
+        <?php
+        });
+    }
+    public function validate( $input ) {
+        $input['logging'] = boolval($input['logging'] ?? false);
+        $input['clean_data'] = boolval($input['clean_data'] ?? false);
+        $input['gcsv_auto'] = boolval($input['gcsv_auto'] ?? false);
+        $input['gcsv_path_file'] = $this->sanitizeCsvPath($input['gcsv_path_file']);
+        return $input;
+    }
+    private function sanitizeCsvPath( $input )
+    {
+        $path = trim(strval($input ?? ''));
+        $dir = dirname(WP_CONTENT_DIR . "/$path");
+        if( $dir && file_exists($dir) ) {
+            return $path;
+        } else {
+            add_settings_error(
+                $this->settings->field_name_from_name('gcsv_path_file'), 'gcsv_path_file',
+                "This path does not exist."
+            );
+            return $this->settings->get_option('gcsv_path_file');
+        }
+    }
+}

blaze-css/trunk/lib/Common/File.php

-                      r2567479
+                      r2606364
 class File {
+    public static function write()
+    {
+        $path = wp_get_upload_dir()['basedir'] . '/blaze.csv';
+        $elements = (new Element)->select('DISTINCT el_class')->where('el_class IS NOT NULL')->get();
+        $classes = implode("\n", array_column($elements, 'el_class'));
+    protected $plugin;
+    public function __construct( \Motto\BlazeCss\Plugin $plugin ) {
+        $this->plugin = $plugin;
+    }
+    public function write()
+    {
+        $csv_file_path = $this->plugin->settings->get_option('gcsv_path_file');
+        $path = WP_CONTENT_DIR . $csv_file_path;
+        $elements = (new Element)->select('DISTINCT el_class')
+                                ->where('el_class IS NOT NULL')
+                                ->get();
+        $classes = implode(
+            "\n", array_column($elements, 'el_class')
+        );
         file_put_contents($path, $classes);
+    }

blaze-css/trunk/lib/Common/Logger.php

-                      r2584992
+                      r2606364
     protected $plugin;
     protected $url;
+    protected $viewport;
     protected $pageQuery;
     protected $log;
+    protected $log = null;
     public function __construct( Array $postData, Plugin $plugin )
 …
         $this->plugin = $plugin;
         $this->url = (object) parse_url($postData['url']);
+        $this->viewport = [
+            'width' => $postData['width'],
+            'height' => $postData['height'],
+        ];
         if( !isset($this->url->query) )
             $this->url->query = null;
 …
         if( $this->cacheMiss() ) {
             $this->create();
+            /**
+             * Log elements for each user-agent
+             */
             Element::fromLogger( $this );
+            File::write();
+            // change for event driven do_action
+            if( (bool) $this->plugin->settings->get_option('gcsv_auto') ) {
+                $file = new File($this->plugin);
+                $file->write();
+            }
+        }
+    }
 …
             $this->log = $found;
         return true;
+        return is_null($this->log);
+    }
 …
             host = %s
             AND path = %s
+        ", [$this->url->host, $this->url->path])->get();
+            AND query = %s
+        ", [
+            $this->url->host,
+            $this->url->path,
+            $this->url->query,
+        ])->get();
         if( !empty($logs) ) {
 …
             $this->log->update([
                 'logged_at' => time(),
+                'logged_at' => date('Y-m-d H:i:s'),
                 'hash' => $this->hash(),
             ]);
         } else {
+            $current_theme = wp_get_theme();
             $this->log = new Log;
             $this->log->insert([
 …
                 'query' => $this->url->query,
                 'hash' => $this->hash(),
+                'theme' => $current_theme->get( 'Name' ),
+                'width' => $this->viewport['width'],
+                'height' => $this->viewport['height'],
             ]);
+        }

blaze-css/trunk/lib/Common/Model.php

-                      r2584992
+                      r2606364
+    {
         $sql = <<<SQL
         SELECT {$this->query['select']}
         FROM {$this->getTable()}
         WHERE {$this->query['where']}
         SQL;
+SELECT {$this->query['select']}
+FROM {$this->getTable()}
+WHERE {$this->query['where']}
+SQL;
         return $this->db->get_results(
 …
+    {
         $sql = <<<SQL
         SELECT * FROM {$this->getTable()}
         WHERE $prop = %s
         SQL;
+SELECT * FROM {$this->getTable()}
+WHERE $prop = %s
+SQL;
         $row = $this->db->get_row(

blaze-css/trunk/lib/Common/Schema.php

-                      r2499500
+                      r2606364
     protected $tables = [
+        'elements',
         'logs',
-        'elements'
     ];
     protected $db;
 …
+    {
         return <<<SQL
+            id mediumint(9) NOT NULL AUTO_INCREMENT,
+            logged_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+            `host` varchar(55) NOT NULL,
+            `path` varchar(55) NOT NULL,
+            `query` varchar(55),
+            hash CHAR(32) NOT NULL,
+            PRIMARY KEY (id),
+            UNIQUE KEY(`host`, `path`, hash)
+        `id` mediumint(9) NOT NULL AUTO_INCREMENT,
+        `logged_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        `host` varchar(55) NOT NULL,
+        `path` varchar(55) NOT NULL,
+        `query` varchar(55),
+        `hash` CHAR(32) NOT NULL,
+        `theme` varchar(55) NOT NULL,
+        `width` mediumint(9) UNSIGNED NOT NULL,
+        `height` mediumint(9) UNSIGNED NOT NULL,
+        PRIMARY KEY  (id),
+        UNIQUE KEY (`host`, `path`, `hash`)
         SQL;
+    }
 …
+    {
         return <<<SQL
+            id mediumint(9) NOT NULL AUTO_INCREMENT,
+            log_id mediumint(9) NOT NULL,
+            el_tag tinytext NOT NULL,
+            el_id VARCHAR(255),
+            el_class VARCHAR(510),
+            height FLOAT,
+            `left` FLOAT,
+            `right` FLOAT,
+            `top` FLOAT,
+            width FLOAT,
+            x FLOAT,
+            y FLOAT,
+            PRIMARY KEY  (id)
+        `id` mediumint(9) NOT NULL AUTO_INCREMENT,
+        `log_id` mediumint(9) NOT NULL,
+        `el_tag` tinytext NOT NULL,
+        `el_id` VARCHAR(255),
+        `el_class` VARCHAR(510),
+        `user_agent` VARCHAR(255),
+        `height` FLOAT,
+        `left` FLOAT,
+        `right` FLOAT,
+        `top` FLOAT,
+        `width` FLOAT,
+        `x` FLOAT,
+        `y` FLOAT,
+        PRIMARY KEY  (`id`)
         SQL;
+    }
 …
     public function init()
+    {
         $sql = [];
+        require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
         foreach( $this->tables as $table ) {
             $schema = $this->{$table . '_schema'}();
             $sql[] = "CREATE TABLE {$this->getTableName($table)} (
+            $sql = "CREATE TABLE IF NOT EXISTS {$this->getTableName($table)} (
                 $schema
+            ) {$this->db->get_charset_collate()};";
+            ) {$this->db->get_charset_collate()}";
+            dbDelta( $sql );
+        }
+        require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+        dbDelta( $sql );
         add_option( $this->version_key, $this->version );
+    }
 …
         //     update_option( "jal_db_version", $jal_db_version );
         // }
+        // }
+    }
+}

blaze-css/trunk/lib/Deactivator.php

-                      r2499500
+                      r2606364
      */
     public static function deactivate() {
+        $schema = new Schema((new Plugin));
+        $schema->destroy();
+        $plugin = new Plugin();
+        if( $plugin->settings->get_option('clean_data') == 1 ) {
+            $schema = new Schema($plugin);
+            $schema->destroy();
+            $plugin->settings->destroy();
+        }
+    }

blaze-css/trunk/lib/Frontend.php

-                      r2567479
+                      r2606364
      */
     public function enqueue_scripts() {
-        if( is_user_logged_in() )
-            return;
         \wp_enqueue_script(
             $this->plugin->get_plugin_name(),

blaze-css/trunk/lib/Models/Element.php

-                      r2499500
+                      r2606364
     public static function fromLogger( Logger $logger )
+    {
+        /**
+         * TODO: only add if body width and height are different
+         */
         (new self)->delete(['log_id' => $logger->getLogId()]);
         foreach( $logger->getPageQuery() as $data )

blaze-css/trunk/lib/Plugin.php

-                      r2584989
+                      r2606364
+ *
  * @link       https://github.com/wpmotto/wp-blaze-css
  * @since      1.0.0
+ * @since      1.1.2
+ *
  * @package    BlazeCss
 …
  * version of the plugin.
+ *
  * @since      1.0.0
+ * @since      1.1.2
  * @package    BlazeCss
  * @subpackage BlazeCss/includes
 …
      * the plugin.
+     *
      * @since    1.0.0
+     * @since    1.1.2
      * @access   protected
      * @var      Motto\BlazeCss\Loader    $loader    Maintains and registers all hooks for the plugin.
 …
     protected $loader;
+    public $settings;
     protected $db;
 …
      * @var      string    $version    The current version of the plugin.
      */
     protected $version = '1.0.0';
+    protected $version = '1.1.2';
     /**
 …
     public function __construct() {
         $this->loader = new Loader();
+        $this->settings = new Settings($this);
+    }
+    public function get_root_path()
+    {
+        return plugin_dir_path( dirname( __FILE__ ) );
+    }
 …
         // $this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_scripts' );
+        $this->loader->add_action( 'admin_menu', $plugin_admin, 'add_settings_page' );
+        $this->loader->add_action( 'admin_init', $plugin_admin, 'init_settings' );
+        if( (bool) $this->settings->get_option('gcsv_auto') )
+            $this->loader->add_action( 'wp_ajax_blaze_generate_csv', $plugin_admin, 'generate_csv' );
+    }
 …
         $plugin_frontend = new Frontend( $this );
+        $this->loader->add_action( 'wp_enqueue_scripts', $plugin_frontend, 'enqueue_scripts' );
+        $this->loader->add_action( 'get_header', $plugin_frontend, 'debug' );
+        if( $this->should_log() ) {
+            $this->loader->add_action(
+                'wp_enqueue_scripts', $plugin_frontend, 'enqueue_scripts'
+            );
+            $this->loader->add_action(
+                'get_header', $plugin_frontend, 'debug'
+            );
+        }
         /**
 …
         // to logged in users
         // $this->loader->add_action( 'wp_ajax_blaze_ajax', $plugin_frontend, 'save_page_elements' );
+        $this->loader->add_action( 'wp_ajax_blaze_ajax', $plugin_frontend, 'save_page_elements' );
         // to not logged in users or users without permissions
+        $this->loader->add_action( 'wp_ajax_nopriv_blaze_ajax', $plugin_frontend, 'save_page_elements' );
+        $this->loader->add_action(
+            'wp_ajax_nopriv_blaze_ajax', $plugin_frontend, 'save_page_elements'
+        );
+    }
+    private function should_log()
+    {
+        $logging = (bool) $this->settings->get_option('logging');
+        $log_for_all = (bool) $this->settings->get_option('log_for_all');
+        if( !$logging )
+            return false;
+        if( !$log_for_all && is_user_logged_in() )
+            return false;
+        return true;
+    }

Note: See TracChangeset for help on using the changeset viewer.

Trac UI Preferences

Plugin Directory