Merge c777281 into 2dbced6

database/migrations/2019_01_31_093608_add_permanent_column_to_redirects_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddPermanentColumnToRedirectsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('redirects', function (Blueprint $table) {
+            $table->integer('status')->default(301);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('redirects', function (Blueprint $table) {
+            $table->dropColumn('status');
+        });
+    }
+}

resources/lang/en/redirect.php

@@ -0,0 +1,11 @@
+<?php
+
+return [
+    'status' => [
+        'name' => 'Status',
+        '301' => 'Permanent',
+        '302' => 'Temporary'
+    ],
+    'from_url' => 'From url',
+    'to_url' => 'To url'
+];

src/Http/Controllers/Admin/RedirectsController.php

@@ -3,6 +3,7 @@
 namespace Arbory\Base\Http\Controllers\Admin;
 
 use Arbory\Base\Admin\Form;
+use Arbory\Base\Admin\Form\Fields\Select;
 use Arbory\Base\Admin\Form\Fields\Text;
 use Arbory\Base\Admin\Grid;
 use Arbory\Base\Admin\Traits\Crudify;
@@ -23,13 +24,20 @@ class RedirectsController extends Controller
      * @param Model $model
      * @return Form
      */
-    protected function form( Model $model )
+    protected function form(Model $model)
     {
-        $form = $this->module()->form( $model, function( Form $form )
-        {
-            $form->addField( new Text( 'from_url' ) )->rules( 'required' );
-            $form->addField( new Text( 'to_url' ) )->rules( 'required' );
-        } );
+        $form = $this->module()->form($model, function (Form $form) {
+            $form->addField(new Text('from_url'))
+                ->rules('required')
+                ->setLabel(trans('arbory::redirect.from_url'));
+            $form->addField(new Text('to_url'))
+                ->rules('required')
+                ->setLabel(trans('arbory::redirect.to_url'));
+
+            $form->addField(new Select('status'))
+                ->options($this->getStatusOptions())
+                ->setLabel(trans('arbory::redirect.status.name'));
+        });
 
         return $form;
     }
@@ -39,12 +47,21 @@ protected function form( Model $model )
      */
     public function grid()
     {
-        $grid = $this->module()->grid( $this->resource(), function( Grid $grid )
-        {
-            $grid->column( 'from_url' );
-            $grid->column( 'to_url' );
-        } );
+        $grid = $this->module()->grid($this->resource(), function (Grid $grid) {
+            $grid->column('from_url', trans('arbory::redirect.from_url'));
+            $grid->column('to_url', trans('arbory::redirect.to_url'));
+        });
 
         return $grid;
     }
+
+    private function getStatusOptions()
+    {
+        $statusOptions = [];
+        foreach ($this->resource::AVAILABLE_STATUSES as $status) {
+            $statusOptions[$status] = trans('arbory::redirect.status.' . $status);
+        }
+
+        return $statusOptions;
+    }
 }

src/Http/Middleware/ArboryRouteRedirectMiddleware.php

@@ -16,20 +16,20 @@ class ArboryRouteRedirectMiddleware
      * @param \Closure $next
      * @return RedirectResponse
      */
-    public function handle( $request, Closure $next )
+    public function handle($request, Closure $next)
     {
         $redirect = Redirect::query();
 
-        $redirect->where( 'from_url', $request->url() );
-        $redirect->orWhere( 'from_url', 'LIKE', '_' . $request->path() . '_' );
-
-        $redirect = $redirect->first( [ 'to_url' ] );
+        $redirect->where('from_url', $request->url());
+        $redirect->orWhere('from_url', 'LIKE', '_' . $request->path() . '_');
 
-        if( $redirect )
-        {
-            return \Redirect::to( $redirect->to_url, 301 );
+        $redirect = $redirect->first(['to_url', 'status']);
+
+        if ($redirect) {
+
+            return \Redirect::to($redirect->to_url, $redirect->status);
         }
 
-        return $next( $request );
+        return $next($request);
     }
 }

src/Pages/Redirect.php

@@ -6,19 +6,25 @@
 
 class Redirect extends Model
 {
+    public const AVAILABLE_STATUSES = [
+        301,
+        302
+    ];
+
     /**
      * @var array
      */
     protected $fillable = [
         'from_url',
-        'to_url'
+        'to_url',
+        'status'
     ];
 
     /**
      * @return string
      */
     public function __toString()
     {
-        return (string) $this->to_url;
+        return (string)$this->to_url;
     }
 }