Merge pull request #385 from NFDI4Chem/development

v1.5.0-alpha - Merge Development to Main

app/Http/Controllers/Admin/LicenseController.php

@@ -17,8 +17,6 @@ public function index(Request $request)
         $licenses = Cache::rememberForever('licenses', function () {
             return License::select('id', 'title', 'description')->get();
         });
-
-        // $licenses = License::select('id','title')->get();
         return $licenses;
     }
 

app/Http/Resources/LicenseResource.php

@@ -22,6 +22,7 @@ public function toArray($request)
             'html_url' => $this->html_url,
             'permissions' => $this->permissions,
             'description' => $this->description,
+            'body'        => $this->body,
         ];
     }
 }

config/app.php

@@ -236,6 +236,4 @@
         'View' => Illuminate\Support\Facades\View::class,
 
     ],
-
-    'github_license_url' => env('GITHUB_LICENSE_URL', 'https://api.github.com/licenses'),
 ];

database/migrations/2022_08_22_081209_update_license_table.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('licenses', function (Blueprint $table) {
+            $table->dropColumn('node_id');
+            $table->dropColumn('html_url');
+            $table->dropColumn('implementation');
+            $table->dropColumn('permissions');
+            $table->string('category')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+};