Merge branches 'master' and 'master' of github.com:40Q/acf-gutenberg

Author: jdebuchy

resources/blocks/sample-block/sample-block.blade.php

@@ -1,7 +1,8 @@
-<section class="">
+<section id="{{ $block->id }}" class="{{ $block->class }}" >
   <div class="container">
       <h2>{{ $block->title }}</h2>
       <p>{{ $block->text }}</p>
       <p>{{ $block->intro }}</p>
+      <p>{{ $block->custom_prop }}</p>
   </div>
 </section>

resources/blocks/sample-block/sample-block.class.php

@@ -18,6 +18,12 @@ class SampleBlock extends Block
     public function init()
     {
         // Use this method in extended classes
+        $this->set_custom_prop();
+    }
+
+    public function set_custom_prop()
+    {
+        $this->custom_prop = "Here the custom prop for: ". $this->title;
     }
 
     public function set_settings()

src/classes/Block.php

@@ -116,6 +116,13 @@ class Block
         'button' => false,
     ];
 
+    public $theme_colors = [
+        'primary' => 'Primary',
+        'secondary' => 'Secondary',
+        'light' => 'Light',
+        'dark' => 'Dark',
+    ];
+
     /**
      * Block constructor.
      *
@@ -130,6 +137,7 @@ public function __construct($block_slug)
         $this->set_class();
         $this->set_fields();
         $this->set_global_fields();
+        $this->set_theme_colors();
         add_action('init', array($this, 'build_fields'));
         $this->set_props();
         $this->set_position();
@@ -188,6 +196,13 @@ public function set_global_fields()
 
     }
 
+    public function set_theme_colors()
+    {
+        $colors = apply_filters( 'acfgb_theme_colors', $this->theme_colors);
+        $this->theme_colors = $colors;
+
+    }
+
     public function build_fields(){
         if (function_exists('acf_add_local_field_group')) {
 
@@ -214,9 +229,9 @@ public function build_fields(){
                     ]
                 ])
                     ->addSelect('bg_color')
-                        ->addChoices('green', 'orange', ['rose' => 'pink'], 'white')
+                        ->addChoices($this->theme_colors)
                     ->addSelect('text_color')
-                        ->addChoices('green', 'orange', ['rose' => 'pink'], 'white');
+                        ->addChoices($this->theme_colors);
             }
 
             if ($this->global_fields['block_id']){

src/lib/functions.php

@@ -94,27 +94,6 @@ function my_acf_block_render_callback($block)
 }
 
 
-
-/**
- * Modify
- */
-function test()
-{
-    wp_die('here');
+if (file_exists(get_template_directory() . "/acf-gutenberg/settings.php")) {
+    include get_template_directory() . "/acf-gutenberg/settings.php";
 }
-//test();
-
-
-add_action( 'admin_menu', function (){
-    add_options_page( 'My Plugin Options', 'My Plugin', 'manage_options', 'my-unique-identifier', function (){
-        echo '<div class="wrap">';
-        echo '<p>Here is where the form would go if I actually had options.aaa</p>';
-        echo '</div>';
-        echo '<pre>';
-        //print_r(Plugin::get_actions());
-        echo '</pre>';
-        echo '<pre>';
-        print_r($GLOBALS['theme_blade_engine']);
-        echo '</pre>';
-    } );
-});