Merge pull request #12 from cleaniquecoders/develop

Tabler

Author: nasrulhazim

.env.example

@@ -1,4 +1,4 @@
-APP_NAME="Web Application Boilerplate"
+APP_NAME="boilerplate.app"
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true

app/Blade/Directives/Icon.php

@@ -0,0 +1,16 @@
+<?php 
+
+namespace App\Blade\Directives;
+
+use Illuminate\Support\Facades\Blade;
+
+class Icon
+{
+	public static function register()
+	{
+		Blade::directive('icon', function ($icon) {
+			$icon = str_replace('\'', '"', $icon);
+			return "<i class={$icon}></i>";
+        });
+	}
+}

app/Http/Controllers/LanguageController.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+class LanguageController extends Controller
+{
+    public function __invoke(Request $request, $language)
+    {
+        app()->setLocale($language);
+        
+        swal()->success(
+            __('Language'),
+            __('Current application language has been set to ' . __(strtoupper($language)) . '.')
+        );
+
+        return redirect()->back();
+    }
+}

app/Http/Controllers/User/AvatarController.php

@@ -28,7 +28,7 @@ public function store(Request $request)
             ->usingFileName('avatar.png')
             ->toMediaCollection('avatar');
 
-        audit(auth()->user(), 'Uploaded new avatar');
+        audit(user(), 'Uploaded new avatar');
 
         alert()->success('New Avatar Uploaded');
 

app/Http/Kernel.php

@@ -69,5 +69,6 @@ class Kernel extends HttpKernel
         'minify'      => \App\Http\Middleware\MinifyHtml::class,
         'jwt.auth'    => \Tymon\JWTAuth\Middleware\GetUserFromToken::class,
         'jwt.refresh' => \Tymon\JWTAuth\Middleware\RefreshToken::class,
+        'theme' => \CleaniqueCoders\Themer\Http\Middleware\ThemeLoader::class,
     ];
 }

app/Http/Middleware/Locale.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+
+class Locale
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param \Illuminate\Http\Request $request
+     * @param \Closure                 $next
+     *
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        if ($request->input('lang')) {
+            app()->setLocale($request->input('lang'));
+        }
+
+        return $next($request);
+    }
+}

app/Providers/BladeServiceProvider.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Providers;
+
+use Illuminate\Support\ServiceProvider;
+
+class BladeServiceProvider extends ServiceProvider
+{
+    /**
+     * Bootstrap services.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        \App\Blade\Directives\Icon::register();
+    }
+
+    /**
+     * Register services.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        //
+    }
+}

app/Providers/ThemeServiceProvider.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Providers;
+
+use Illuminate\Support\Facades\Blade;
+use Illuminate\Support\ServiceProvider;
+use Illuminate\View\Compilers\Concerns\CompilesLayouts;
+use Illuminate\Support\Str;
+
+class ThemeServiceProvider extends ServiceProvider
+{
+    use CompilesLayouts;
+
+    /**
+     * Bootstrap services.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        session(['theme' => config('theme.default')]);
+    }
+
+    /**
+     * Register services.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        //
+    }
+
+    /**
+     * Strip the parentheses from the given expression.
+     *
+     * @param  string  $expression
+     * @return string
+     */
+    public function stripParentheses($expression)
+    {
+        if (Str::startsWith($expression, '(')) {
+            $expression = substr($expression, 1, -1);
+        }
+
+        return $expression;
+    }
+}

app/Support/helpers.php

@@ -100,11 +100,12 @@ function audit($model, $message, $causedBy = null)
         if (is_null($causedBy)) {
             activity()
                 ->performedOn($model)
+                ->causedBy(user())
                 ->log($message);
         } else {
             activity()
                 ->performedOn($model)
-                ->causedBy(auth()->user())
+                ->causedBy($causedBy)
                 ->log($message);
         }
     }
@@ -146,6 +147,9 @@ function permissions()
     }
 }
 
+/*
+ * Minify given HTML Content
+ */
 if (! function_exists('minify')) {
     function minify($value)
     {
@@ -173,3 +177,15 @@ function minify($value)
         return preg_replace(array_keys($replace), array_values($replace), $value);
     }
 }
+
+/*
+ * Get Available Locales
+ */
+if (! function_exists('locales')) {
+    function locales()
+    {
+        return collect(explode(',', config('app.locales')))->reject(function ($locale) {
+            return ! file_exists(resource_path('lang/' . $locale));
+        });
+    }
+}

composer.json

@@ -5,11 +5,12 @@
     "license": "MIT",
     "type": "project",
     "require": {
-        "php": ">=7.0.0",
+        "php": ">=7.1.3",
         "andywer/js-localization": "dev-laravel-5",
         "cleaniquecoders/artisan-makers": "^1.0",
         "cleaniquecoders/blueprint-macro": "^1.0",
         "cleaniquecoders/profile": "^1.0",
+        "cleaniquecoders/themer": "^2.0",
         "davejamesmiller/laravel-breadcrumbs": "^5.0",
         "doctrine/dbal": "^2.7",
         "fideloper/proxy": "~4.0",