Merge pull request #20 from jonwaldstein/develop

v1.0.8
jonwaldstein · Apr 11, 2021 · cc6e337 · cc6e337
2 parents 1b28896 + 257f1b1
commit cc6e337
Show file tree

Hide file tree

Showing 13 changed files with 19,546 additions and 18,168 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.0.8]
+
+-   Add date and time formatting options (#19)
+
 ## [1.0.7]
 
 -   Remove organizations from localized data (#12)

diff --git a/blocks-for-eventbrite.php b/blocks-for-eventbrite.php
@@ -3,7 +3,7 @@
 /**
  * Plugin Name:     Blocks for Eventbrite
  * Description:     Gutenberg blocks that display eventbrite events
- * Version:         1.0.7
+ * Version:         1.0.8
  * Author:          Jon Waldstein
  * Author URI:      https://jonwaldstein.com
  * License:         GPL-2.0-or-later
@@ -80,7 +80,15 @@
             'noEventsText' => [
                 'type' => 'string',
                 'default' => 'There are no events at this time. Please check back for upcoming events.'
-            ]
+            ],
+            'dateFormat' => [
+                'type' => 'string',
+                'default' => get_option('date_format')
+            ],
+            'timeFormat' => [
+                'type' => 'string',
+                'default' => get_option('time_format')
+            ],
         ]
     ));
 });
@@ -128,9 +136,9 @@ function render_blocks_for_eventbrite_card($attributes)
     // if transient is empty or attributes have changed
     if (!$transient || $transient['attributes'] !== $attributes) {
 
-        $status = $attributes['status'] ? $attributes['status'] : 'live';
-        $orderBy = $attributes['orderBy'] ? $attributes['orderBy'] : 'start_asc';
-        $nameFilter = $attributes['nameFilter'] ? $attributes['nameFilter'] : null;
+        $status = !empty($attributes['status']) ? $attributes['status'] : 'live';
+        $orderBy = !empty($attributes['orderBy']) ? $attributes['orderBy'] : 'start_asc';
+        $nameFilter = !empty($attributes['nameFilter']) ? $attributes['nameFilter'] : null;
 
         // make GET request to eventbrite api to get the user's organization ID
         $userResponse = wp_remote_get("https://www.eventbriteapi.com/v3/users/me/organizations?token={$attributes['apiKey']}");

diff --git a/build/index.asset.php b/build/index.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'react-dom', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-data', 'wp-date', 'wp-dom-ready', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => 'ccaa0b069611164b5c04c7f62575df58');
+<?php return array('dependencies' => array('react', 'react-dom', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-data', 'wp-date', 'wp-dom-ready', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => '6d378b5bfb38b5736c4c14f37ecbbe28');
diff --git a/build/index.js b/build/index.js
diff --git a/build/index.js.map b/build/index.js.map
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<?php return array('dependencies' => array('react', 'react-dom', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-data', 'wp-date', 'wp-dom-ready', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => 'ccaa0b069611164b5c04c7f62575df58');
		<?php return array('dependencies' => array('react', 'react-dom', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-data', 'wp-date', 'wp-dom-ready', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => '6d378b5bfb38b5736c4c14f37ecbbe28');