Merge pull request #14 from cleaniquecoders/develop

Develop

Author: nasrulhazim

.php_cs

@@ -1,4 +1,5 @@
 <?php
+ini_set('memory_limit','1024M');
 $finder = PhpCsFixer\Finder::create()
     ->notPath('bootstrap/cache')
     ->notPath('storage')

app/Blade/Directives/Icon.php

@@ -1,16 +1,17 @@
-<?php 
+<?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>";
+    public static function register()
+    {
+        Blade::directive('icon', function ($icon) {
+            $icon = str_replace('\'', '"', $icon);
+
+            return "<i class={$icon}></i>";
         });
-	}
-}
+    }
+}

app/Http/Controllers/Api/Datatable/Manage/UserController.php

@@ -4,12 +4,16 @@
 
 use App\Http\Controllers\Controller;
 use App\Models\User;
+use App\Transformers\Datatable\UserTransformer;
 use Illuminate\Http\Request;
 
 class UserController extends Controller
 {
     public function __invoke(Request $request)
     {
-        return app('datatables')->eloquent(User::datatable())->toJson();
+        return app('datatables')
+        	->eloquent(User::datatable())
+        	->setTransformer(new UserTransformer())
+        	->toJson();
     }
 }

app/Http/Controllers/LanguageController.php

@@ -9,7 +9,7 @@ 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)) . '.')

app/Http/Kernel.php

@@ -43,11 +43,6 @@ class Kernel extends HttpKernel
             'throttle:60,1',
             'bindings',
         ],
-
-        'datatable' => [
-            'throttle:60,1',
-            'bindings',
-        ],
     ];
 
     /**
@@ -69,6 +64,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,
+        'theme'       => \CleaniqueCoders\Themer\Http\Middleware\ThemeLoader::class,
     ];
 }

app/Macros/Http/Response.php

@@ -8,7 +8,7 @@ class Response
 {
     public static function registerMacros()
     {
-        HttpResponse::macro('api', function ($data, $message = null, $status = true, $code = 200) {
+        HttpResponse::macro('api', function ($data = null, $message = null, $status = true, $code = 200) {
             return response()->json([
                 'data'    => $data,
                 'message' => $message,

app/Observers/ReferenceObserver.php

@@ -21,14 +21,14 @@ class ReferenceObserver
      */
     public function creating(Model $model)
     {
-        if (Schema::hasColumn($model->getTable(), 'reference') && is_null($model->reference)) {
-            $count = $model::count();
+        $count = method_exists($model, 'getCounter') ? $model->getCounter() : ($model::count() ?? 0);
 
-            $reference = isset($model->reference_prefix) ?
-            generate_reference($model->reference_prefix, $count) :
-            generate_reference(config('document.prefix'), $count);
+        $column = method_exists($model, 'getReferenceColumn') ? $model->getReferenceColumn() : 'reference';
 
-            $model->reference = $reference;
+        $prefix = method_exists($model, 'referencePrefix') ? $model->referencePrefix() : config('document.prefix');
+
+        if (Schema::hasColumn($model->getTable(), $column) && is_null($model->$column)) {
+            $model->$column = generate_reference($prefix, $count);
         }
     }
 }

app/Providers/BladeServiceProvider.php

@@ -3,26 +3,28 @@
 namespace App\Providers;
 
 use Illuminate\Support\ServiceProvider;
+use Illuminate\Support\Facades\Blade;
 
+/**
+ * @todo To create custom Blade Directives using Blade::component
+ */
 class BladeServiceProvider extends ServiceProvider
 {
     /**
      * Bootstrap services.
-     *
-     * @return void
      */
     public function boot()
     {
         \App\Blade\Directives\Icon::register();
+
+        // @todo to figure out, how to pass data to the custom component
+        Blade::component('components.cards.figure', 'figure');
     }
 
     /**
      * Register services.
-     *
-     * @return void
      */
     public function register()
     {
-        //
     }
 }

app/Providers/RouteServiceProvider.php

@@ -68,7 +68,7 @@ protected function mapApiRoutes()
     protected function mapDatatableRoutes()
     {
         Route::prefix('api/datatable')
-             ->middleware('datatable')
+             ->middleware('api')
              ->as('api.datatable.')
              ->namespace($this->namespace . '\Api\Datatable')
              ->group(base_path('routes/datatable.php'));

app/Providers/ThemeServiceProvider.php

@@ -2,19 +2,16 @@
 
 namespace App\Providers;
 
-use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\ServiceProvider;
-use Illuminate\View\Compilers\Concerns\CompilesLayouts;
 use Illuminate\Support\Str;
+use Illuminate\View\Compilers\Concerns\CompilesLayouts;
 
 class ThemeServiceProvider extends ServiceProvider
 {
     use CompilesLayouts;
 
     /**
      * Bootstrap services.
-     *
-     * @return void
      */
     public function boot()
     {
@@ -23,18 +20,16 @@ public function boot()
 
     /**
      * Register services.
-     *
-     * @return void
      */
     public function register()
     {
-        //
     }
 
     /**
      * Strip the parentheses from the given expression.
      *
-     * @param  string  $expression
+     * @param string $expression
+     *
      * @return string
      */
     public function stripParentheses($expression)