V2.0

simpliko · Apr 28, 2022 · b28006e · b28006e
1 parent 859d937
commit b28006e
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 25 deletions.
diff --git a/assets/css/tailwind.css b/assets/css/tailwind.css
@@ -92,13 +92,17 @@
     }
 
     .wpadverts-form .wpa-form-buttons {
-        @apply atw-flex atw-mt-3 atw-p-3 atw-bg-gray-50 atw-rounded-md atw-justify-end md:atw-flex-none;
+        @apply atw-flex atw-mt-3 atw-py-3 atw-bg-gray-50 atw-rounded-md atw-justify-end md:atw-flex-none;
     }
 
     .wpadverts-form .wpa-form-buttons-list {
         @apply atw-flex-none;
     }
 
+    #wpadverts-block-contact-box .wpadverts-form .wpa-form-buttons {
+        @apply atw--mx-0
+    }
+
     /* FORM STYLES */
 
     .wpadverts-form input[type=text],

diff --git a/assets/js/block-details.js b/assets/js/block-details.js
@@ -1,5 +1,6 @@
 jQuery(function($) {
 
+    /*
     $(".wpadverts-show-contact-form").on("click", function(e) {
         e.preventDefault();
 
@@ -13,4 +14,5 @@ jQuery(function($) {
             window.location.hash = "#wpadverts-block-contact-box";
         }
     });
+    */
 });
diff --git a/blocks/details/templates/single.php b/blocks/details/templates/single.php
@@ -112,11 +112,11 @@
     <?php do_action( "adverts_tpl_single_bottom", $post_id ) ?>
 
     <?php if( ! empty( $contact_options ) || ! empty( $options ) ): ?>
-    <div class="wpa-cpt-contact-details atw-my-3  atw--mx-1">
+    <div class="wpa-cpt-contact-details atw-my-3 atw--mx-1">
 
-        <div class="atw-relative atw-flex atw-flex-col md:atw-flex-row">
+        <div class="atw-relative atw-flex atw-flex-col md:atw-flex-row atw--mx-1">
 
-            <div class="atw-relative atw-flex atw-flex-1 atw-flex-col md:atw-flex-row">
+            <div class="atw-relative atw-flex atw-flex-1 atw-flex-col md:atw-flex-row md:atw-flex-none">
                 <?php foreach( $contact_options as $contact_option ): ?>
                 <div class="atw-flex-auto atw-mx-1 atw-mb-3">
                 <?php 
@@ -133,6 +133,7 @@
 
         <?php do_action( "wpadverts/block/details/tpl/contact-content", $post_id, $atts ) ?>
 
+        <?php /*
         <div class="wpa-contact-more atw-inset-x-0">
 
             <div class="atw-w-full atw-flex atw-flex-col md:atw-flex-row atw-my-3 atw-px-0 atw-mx-1 md:atw-my-0">
@@ -154,6 +155,7 @@
                     </div>
             </div>
         </div>
+        */ ?>
 
     </div>
 

diff --git a/blocks/list/src/block.json b/blocks/list/src/block.json
@@ -82,7 +82,7 @@
         },
         "grid_img_height": {
             "type": "integer",
-            "default": 6
+            "default": 8
         },
         "grid_img_fit": {
             "type": "string",
@@ -95,8 +95,8 @@
         "data": {
             "type": "array",
             "default": [
-                { "name": "meta__adverts_location" },
-                { "name": "pattern__post_date" }
+                { "name": "pattern__post_date" },
+                { "name": "meta__adverts_location" }
             ]
         },
         "default_image_url": {

diff --git a/blocks/list/src/edit.js b/blocks/list/src/edit.js
@@ -472,7 +472,7 @@ class Edit extends Component {
                 <>
 
                 <InspectorControls>
-                    <PanelBody title="Display Options">
+                    <PanelBody title="Display Options" initialOpen={ true }>
 
 
                     <ToggleControl
@@ -529,7 +529,7 @@ class Edit extends Component {
 
                     </PanelBody>
 
-                    <PanelBody title="Display Information">
+                    <PanelBody title="Display Information" initialOpen={ false }>
 
                         <ToggleControl
                             label="Show image column/row."
@@ -568,7 +568,7 @@ class Edit extends Component {
                     </PanelBody>
 
 
-                    <PanelBody title="List View Options">
+                    <PanelBody title="List View Options" initialOpen={ false }>
 
                         <RangeControl
                             label="Image Width"
@@ -619,7 +619,7 @@ class Edit extends Component {
 
                     </PanelBody>                    
 
-                    <PanelBody title="Grid View Options">
+                    <PanelBody title="Grid View Options" initialOpen={ false }>
 
                         <TextControl
                             label="Columns in the Grid view."
@@ -680,7 +680,7 @@ class Edit extends Component {
                         />
                     </PanelBody>
 
-                    <PanelBody title="Featured Ads">
+                    <PanelBody title="Featured Ads" initialOpen={ false }>
 
                         <SelectControl 
                             label="Show on the list"
@@ -704,7 +704,7 @@ class Edit extends Component {
 
                     </PanelBody>
 
-                    <PanelBody title="Filters / Basic">
+                    <PanelBody title="Filters / Basic" initialOpen={ false }>
 
                         <SelectControl
                             label="Default Sorting and Order"
@@ -730,7 +730,7 @@ class Edit extends Component {
                         />
                     </PanelBody>
 
-                    <PanelBody title="Filters / Taxonomies">
+                    <PanelBody title="Filters / Taxonomies" initialOpen={ false }>
 
                         <BaseControl label="">
                             <Button 
@@ -793,7 +793,7 @@ class Edit extends Component {
                     </PanelBody>
 
 
-                    <PanelBody title="Colors">
+                    <PanelBody title="Colors" initialOpen={ false }>
 
                         <AdvertsColorPicker
                             label="Price Color"

diff --git a/blocks/manage/src/block.json b/blocks/manage/src/block.json
@@ -79,7 +79,7 @@
         },
         "grid_img_height": {
             "type": "integer",
-            "default": 6
+            "default": 8
         },
         "grid_img_fit": {
             "type": "string",

diff --git a/blocks/manage/src/edit.js b/blocks/manage/src/edit.js
@@ -441,7 +441,7 @@ class Edit extends Component {
 
                     <InspectorControls>
 
-                        <PanelBody title="Display Options">
+                        <PanelBody title="Display Options" initialOpen={ true }>
 
                             <ToggleControl
                                 label="Show number of found results."
@@ -493,7 +493,7 @@ class Edit extends Component {
 
                         </PanelBody>
 
-                        <PanelBody title="Display Information">
+                        <PanelBody title="Display Information" initialOpen={ false }>
 
                             <ToggleControl
                                 label="Show image column/row."
@@ -521,7 +521,7 @@ class Edit extends Component {
 
                         </PanelBody>
 
-                        <PanelBody title="List View Options">
+                        <PanelBody title="List View Options" initialOpen={ false }>
 
                             <RangeControl
                                 label="Image Width"
@@ -572,7 +572,7 @@ class Edit extends Component {
 
                         </PanelBody>    
 
-                        <PanelBody title="Grid View Options">
+                        <PanelBody title="Grid View Options" initialOpen={ false }>
 
                             <TextControl
                                 label="Columns in the Grid view."
@@ -633,7 +633,7 @@ class Edit extends Component {
                             />
                         </PanelBody>
 
-                        <PanelBody title="Filters / Basic">
+                        <PanelBody title="Filters / Basic" initialOpen={ false }>
 
                             <SelectControl
                                 label="Default Sorting and Order"

diff --git a/includes/class-block-templates.php b/includes/class-block-templates.php
@@ -196,8 +196,10 @@ public function get_default_post_template( $post_type ) {
      * @param   string      $taxonomy       Taxonomy name
      * @return  string                      block template string
      */
-    public function get_default_taxonomy_template() {
-        return '@todo: default taxonomy template';
+    public function get_default_taxonomy_template( $taxonomy ) {
+        $tpl  = sprintf( '<!-- wp:wpadverts/search {"post_type":"advert"} /-->', $taxonomy );
+        $tpl .= sprintf( '<!-- wp:wpadverts/list { "post_type": "advert", "query":{"term_autodetect":true} } /-->', $taxonomy );
+        return $tpl;
     }
 
     /**

diff --git a/wpadverts.php b/wpadverts.php
@@ -85,8 +85,8 @@
         'image_sizes' => array(
             // supported sizes: adverts-upload-thumbnail, adverts-list, adverts-gallery
             "adverts-gallery" => array( 'enabled' => 1, 'width' => 650, 'height' => 300, 'crop' => false ),
-            "adverts-list" => array( 'enabled' => 1, 'width' => 310, 'height' => 190, 'crop' => true ),
-            "adverts-upload-thumbnail" => array( 'enabled' => 1, 'width' => 150, 'height' => 105, 'crop' => true ),
+            "adverts-list" => array( 'enabled' => 1, 'width' => 310, 'height' => 190, 'crop' => false ),
+            "adverts-upload-thumbnail" => array( 'enabled' => 1, 'width' => 150, 'height' => 105, 'crop' => false ),
             //"adverts-gallery-thumbnail"
         ),
         'image_editor' => ''