ItinerisLtd · danlapteacru · Jun 3, 2020 · Jun 3, 2020 · Jun 4, 2020 · Jun 8, 2020
diff --git a/composer.json b/composer.json
@@ -4,15 +4,10 @@
     "license": "proprietary",
     "require": {
         "php": "^7.1",
-        "illuminate/support": "^5.4",
-        "roots/sage-lib": "^9.0"
+        "roots/acorn": "^1.0.1"
     },
     "require-dev": {
-        "automattic/vipwpcs": "dev-master",
-        "beaver-builder/bb-plugin": "*",
-        "beaver-builder/bb-theme-builder": "*",
         "roave/security-advisories": "dev-master",
-        "roots/sage": "*",
         "wp-coding-standards/wpcs": "^1.0"
     },
     "config": {
@@ -21,39 +16,17 @@
     "extra": {
         "branch-alias": {
             "dev-master": "0.11.x-dev"
+        },
+        "acorn": {
+            "providers": "Itineris\\SageFLBuilder\\SageFLBuilderServiceProvider"
         }
     },
     "autoload": {
         "psr-4": {
             "Itineris\\SageFLBuilder\\": "src/"
         }
     },
-    "repositories": [
-        {
-            "type": "package",
-            "package": {
-                "name": "beaver-builder/bb-plugin",
-                "type": "wordpress-plugin",
-                "version": "999.999.999",
-                "dist": {
-                    "type": "zip",
-                    "url": "https://updates.wpbeaverbuilder.com/?fl-api-method=composer_download&download=bb-plugin-pro.zip&license=78682e62702e6676657261766776407a7667"
-                }
-            }
-        },
-        {
-            "type": "package",
-            "package": {
-                "name": "beaver-builder/bb-theme-builder",
-                "type": "wordpress-plugin",
-                "version": "999.999.999",
-                "dist": {
-                    "type": "zip",
-                    "url": "https://updates.wpbeaverbuilder.com/?fl-api-method=composer_download&download=bb-theme-builder.zip&license=78682e62702e6676657261766776407a7667"
-                }
-            }
-        }
-    ],
+    "minimum-stability": "dev",
     "prefer-stable": true,
     "scripts": {
         "check-style": "phpcs --standard=ruleset.xml --colors -p -s",

diff --git a/resources/views/fl-builder-archive.blade.php b/resources/views/fl-builder-archive.blade.php
@@ -0,0 +1,13 @@
+@extends("ItinerisSageFLBuilderViews::layouts.archive")
+
+@section('content')
+    @php
+    $ids = FLThemeBuilderLayoutData::get_current_page_content_ids();
+    if ( 'fl-theme-layout' == get_post_type() && count( $ids ) > 1 ) {
+        $post_id = FLBuilderModel::get_post_id();
+    } else {
+        $post_id = $ids[0];
+    }
+    FLBuilder::render_content_by_id($post_id, 'div', apply_filters('fl_theme_builder_content_attrs', []));
+    @endphp
+@endsection
diff --git a/resources/views/fl-builder-single.blade.php b/resources/views/fl-builder-single.blade.php
@@ -0,0 +1,13 @@
+@extends("ItinerisSageFLBuilderViews::layouts.archive")
+
+@section('content')
+    @php
+    $ids = FLThemeBuilderLayoutData::get_current_page_content_ids();
+    if ( 'fl-theme-layout' == get_post_type() && count( $ids ) > 1 ) {
+        $post_id = FLBuilderModel::get_post_id();
+    } else {
+        $post_id = $ids[0];
+    }
+    FLBuilder::render_content_by_id($post_id, 'div', apply_filters('fl_theme_builder_content_attrs', []));
+    @endphp
+@endsection
diff --git a/resources/views/layouts/archive.blade.php b/resources/views/layouts/archive.blade.php
@@ -0,0 +1,25 @@
+<!doctype html>
+<html @php language_attributes(); @endphp>
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="x-ua-compatible" content="ie=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    @php wp_head(); @endphp
+  </head>
+
+  <body @php body_class(); @endphp>
+    @php
+      wp_body_open();
+      do_action('get_header');
+    @endphp
+
+    <div id="app">
+      @include('layouts.app')
+    </div>
+
+    @php
+      do_action('get_footer');
+      wp_footer();
+    @endphp
+  </body>
+</html>
diff --git a/src/AbstractBladeModule.php b/src/AbstractBladeModule.php
@@ -5,7 +5,7 @@
 namespace Itineris\SageFLBuilder;
 
 use FLBuilderModule;
-use function App\sage;
+use function Roots\app;
 
 /**
  * Add Laravel Blade support.
@@ -32,8 +32,8 @@ public static function renderFrontendTemplate(string $file, FLBuilderModule $mod
         }
 
         /** @var AbstractHelper $helper */
-        $helper = sage(AbstractHelper::class);
-        $path = $helper->templatePath($module->dir . 'includes/frontend.blade.php');
+        $helper = app(AbstractHelper::class);
+        $path = $module->slug . '/includes/frontend';
 
         echo $helper->template($path, [
             'module' => $module,

diff --git a/src/AbstractHelper.php b/src/AbstractHelper.php
@@ -4,6 +4,9 @@
 
 namespace Itineris\SageFLBuilder;
 
+use function Roots\view;
+use function Roots\asset;
+
 abstract class AbstractHelper
 {
     /**
@@ -12,22 +15,11 @@ abstract class AbstractHelper
      *
      * @return string
      */
-    public function template($file, $data = []): string
+    public function template(string $file, array $data = []): string
     {
-        return \App\template($file, $data);
-    }
-
-    /**
-     * Retrieve path to a compiled blade view
-     *
-     * @param       $file
-     * @param array $data
-     *
-     * @return string
-     */
-    public function templatePath($file, $data = []): string
-    {
-        return \App\template_path($file, $data);
+        return view()->exists("ItinerisSageFLBuilder::{$file}")
+            ? view("ItinerisSageFLBuilder::{$file}", $data)->render()
+            : '';
     }
 
     /**
@@ -37,7 +29,7 @@ public function templatePath($file, $data = []): string
      */
     public function assetPath($asset): string
     {
-        return \App\asset_path($asset);
+        return asset($asset)->uri();
     }
 
     public function getModuleGroup(): string
@@ -57,13 +49,6 @@ public function getModuleCategory(): string
         return __('Custom Widgets', 'fabric');
     }
 
-    /**
-     * @param string|string[] $templates Relative path to possible template files.
-     *
-     * @return string Location of the template
-     */
-    abstract public function locateTemplate($templates): string;
-
     /**
      * Button Styles usable in the cutup
      *
@@ -76,59 +61,5 @@ abstract public function buttonStyles(): array;
      */
     abstract public function breadcrumbs();
 
-    /**
-     * Some times le wild <span class="blue hedgehog"> appears, which is when you need this function, to validate both
-     * blue and hedgehog because sanitize_html_class doesn't allow spaces.
-     *
-     * @param  mixed $classes  "blue hedgehog goes shopping" or array("blue", "hedgehog", "goes", "shopping").
-     * @param  mixed $fallback Anything you want returned in case of a failure.
-     *
-     * @return string
-     */
-    abstract public function sanitizeHtmlClasses($classes, $fallback = null): string;
-
-    /**
-     * @param string $videoUrl
-     * @param bool   $isElement
-     * @param int    $size
-     * @param string $altText
-     *
-     * @return string|null
-     */
-    abstract public function videoThumb($videoUrl, $isElement = false, $size = '0', string $altText = '');
-
-    /**
-     * @param string $videoUrl
-     * @param string $urlType
-     *
-     * @return string
-     */
-    abstract public function formatVideoUrl($videoUrl, $urlType = 'embed'): string;
-
-    /**
-     * Creates a responsive iframe and embeds a video player
-     * or an embed URL for the video
-     *
-     * @param  string  $videoUrl URL of the video.
-     * @param  boolean $isUrl    If true, returns the iframe URL, not the iframe.
-     * @param  int     $width    The width of the iframe.
-     * @param  int     $height   The height of the iframe.
-     *
-     * @return string|false Video embed URL or HTML for iframe embed
-     */
-    abstract public function videoEmbed($video_url, $width = null, $height = null);
-
-    /**
-     * Builds a navigation menu based on parent post, children and siblings
-     */
-    abstract public function getSecondaryNav();
-
     abstract public function getGravityForms(): array;
-
-    /**
-     * Full path to PostGrid template directory.
-     *
-     * @return string
-     */
-    abstract public function getPostGridTemplateDir(): string;
 }
diff --git a/src/God.php b/src/God.php
diff --git a/src/Modules/Accordion/Accordion.php b/src/Modules/Accordion/Accordion.php
@@ -7,7 +7,7 @@
 use FLBuilder;
 use Itineris\SageFLBuilder\AbstractHelper;
 use Itineris\SageFLBuilder\AbstractModule;
-use function App\sage;
+use function Roots\app;
 
 /**
  * Generic Bootstrap accordion widget
@@ -87,7 +87,7 @@ public static function register(): void
     public function __construct()
     {
         /** @var AbstractHelper $helper */
-        $helper = sage(AbstractHelper::class);
+        $helper = app(AbstractHelper::class);
 
         parent::__construct([
             'name' => __('Accordion', 'fabric'),