Merge pull request #79 from tipoff/omnia/feature/25-Results

Omnia/feature/25 results
TIPOFF · Mar 27, 2021 · 241826c · 241826c
2 parents b0091d4 + 89ef5f6
commit 241826c
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 6 deletions.
diff --git a/database/migrations/2020_01_01_155000_create_results_table.php b/database/migrations/2020_01_01_155000_create_results_table.php
@@ -15,6 +15,7 @@ public function up()
             $table->foreignIdFor(app('ranking'))->index();
             $table->string('type')->index(); // Example: 'Organic', 'Local', 'Ads', 'Inline Video'
             $table->unsignedTinyInteger('position')->index();
+            $table->foreignIdFor(app('result'), 'parent_id')->nullable(); // Parent Result
 
             // resultable_id, resultable_type either Tipoff\Seo\Models\Webpage or Place
             $table->morphs('resultable');

diff --git a/src/Enum/ResultType.php b/src/Enum/ResultType.php
@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tipoff\Seo\Enum;
+
+use MabeEnum\Enum;
+
+/**
+ * @method static TaxCode ORGANIC_LISTING()
+ * @method static TaxCode LOCAL_LISTING()
+ * @method static TaxCode FEATURED_SNIPPET()
+ * @method static TaxCode INLINE_VIDEO_LISTINGS()
+ * @method static TaxCode ADS()
+ * @psalm-immutable
+ */
+class ResultType extends Enum
+{
+    const ORGANIC_LISTING = 'organic_listing';
+    const LOCAL_LISTING = 'local_listing';
+    const FEATURED_SNIPPET = 'featured_snippet';
+    const INLINE_VIDEO_LISTINGS = 'inline_video_listings';
+    const ADS = 'ads';
+}
diff --git a/src/Nova/Place.php b/src/Nova/Place.php
@@ -22,9 +22,11 @@ class Place extends BaseResource
     public static $search = [
         'id',
     ];
-    
+
     public static $group = 'SEO';
 
+    public static $displayInNavigation = false; //don't show resource in navigation
+
     public function fieldsForIndex(NovaRequest $request)
     {
         return array_filter([

diff --git a/src/Nova/PlaceDetails.php b/src/Nova/PlaceDetails.php
@@ -22,9 +22,11 @@ class PlaceDetails extends BaseResource
     public static $search = [
         'id',
     ];
-    
+
     public static $group = 'SEO';
 
+    public static $displayInNavigation = false; //don't show resource in navigation
+
     public function fieldsForIndex(NovaRequest $request)
     {
         return array_filter([

diff --git a/src/Nova/PlaceHours.php b/src/Nova/PlaceHours.php
@@ -21,9 +21,11 @@ class PlaceHours extends BaseResource
     public static $search = [
         'id',
     ];
-    
+
     public static $group = 'SEO';
 
+    public static $displayInNavigation = false; //don't show resource in navigation
+
     public function fieldsForIndex(NovaRequest $request)
     {
         return array_filter([

diff --git a/src/Nova/Result.php b/src/Nova/Result.php
@@ -9,9 +9,10 @@
 use Laravel\Nova\Fields\ID;
 use Laravel\Nova\Fields\MorphTo;
 use Laravel\Nova\Fields\Number;
-use Laravel\Nova\Fields\Text;
+use Laravel\Nova\Fields\Select;
 use Laravel\Nova\Http\Requests\NovaRequest;
 use Laravel\Nova\Panel;
+use Tipoff\Seo\Enum\ResultType;
 use Tipoff\Support\Nova\BaseResource;
 
 class Result extends BaseResource
@@ -23,9 +24,11 @@ class Result extends BaseResource
     public static $search = [
         'id',
     ];
-    
+
     public static $group = 'SEO';
 
+    public static $displayInNavigation = false; //don't show resource in navigation
+
     public function fieldsForIndex(NovaRequest $request)
     {
         return array_filter([
@@ -36,7 +39,13 @@ public function fieldsForIndex(NovaRequest $request)
     public function fields(Request $request)
     {
         return array_filter([
-            Text::make('Type')->required()->sortable(),
+            Select::make('Type')->options([
+                ResultType::ORGANIC_LISTING => 'Organic Listings',
+                ResultType::LOCAL_LISTING => 'Local Listings',
+                ResultType::FEATURED_SNIPPET => 'Featured Snippet',
+                ResultType::INLINE_VIDEO_LISTINGS => 'Inline Video Listings',
+                ResultType::ADS => 'Product',
+            ])->required(),
             Number::make('Position')->required()->min(0)->max(255)->sortable(),
 
             nova('ranking') ? BelongsTo::make('Ranking', 'ranking', nova('ranking'))->sortable() : null,

diff --git a/src/Nova/Webpage.php b/src/Nova/Webpage.php
@@ -25,6 +25,8 @@ class Webpage extends BaseResource
 
     public static $group = 'SEO';
 
+    public static $displayInNavigation = false; //don't show resource in navigation
+
     public function fieldsForIndex(NovaRequest $request)
     {
         return array_filter([