Merge branch 'dev' into cwbs_template

.env.example

@@ -11,13 +11,14 @@ CACHE_DRIVER=file
 SESSION_DRIVER=file
 QUEUE_DRIVER=sync
 
-REDIS_HOST=localhost
-REDIS_PASSWORD=null
-REDIS_PORT=6379
-
 MAIL_DRIVER=smtp
 MAIL_HOST=mailtrap.io
 MAIL_PORT=2525
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
+
+SITE_URL=/
+UPLOAD_URL=/public/uploads
+THUMBNAILS_URL=/uploads/thumbnails
+THEME=

app/Helpers/Template.php

@@ -39,4 +39,8 @@ class Template
 
         return $view;
     }
+
+    public static function asset($path) {
+        return env('SITE_URL').'/assets/'.config('app.theme').'/'.$path;
+    }
 }

app/Providers/GlobalViewDataProvider.php

@@ -39,7 +39,7 @@ class GlobalViewDataProvider extends ServiceProvider
      */
     private function createPattern($function)
     {
-        return '/(?<!\w)(\s*)@' . $function . '\(\s*(.*)\)/';
+        return '/(?<!\w)(\s*)@' . $function.'\(([^)]+)*\)/';
     }
 
     /**
@@ -65,6 +65,13 @@ class GlobalViewDataProvider extends ServiceProvider
             return preg_replace($pattern, $code, $view);
         });
 
+        Blade::extend(function ($view) {
+            $pattern = $this->createPattern('asset');
+            $code = '<?php echo \App\Helpers\Template::asset($2); ?>';
+
+            return preg_replace($pattern, $code, $view);
+        });
+        
         // register extension for rendering widget areas
         Blade::extend(function ($view) {
             $pattern = $this->createPattern('widgetArea');