Merge branch 'develop' into feat/optimize-using-cache

.github/workflows/blade.yml

@@ -0,0 +1,24 @@
+name: Fix Blade formatting
+
+on: pull_request
+
+jobs:
+  format-blade:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Install NPM dependencies
+        run: npm ci
+
+      - name: Run Blade Formatter
+        run: node_modules/.bin/blade-formatter --write --sort-tailwindcss-classes --wrap-attributes=force-expand-multiline resources/**/*.blade.php
+
+      - name: Commit changes
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: "style: Blade formatting"
+        env:
+          GITHUB_TOKEN: ${{ secrets.PERSONAL_TOKEN }}

.github/workflows/insights.yml

@@ -0,0 +1,18 @@
+name: PHP Insights
+
+on:
+  pull_request:
+    paths:
+      - "**.php"
+
+jobs:
+    phpinsights:
+        runs-on: ubuntu-latest
+        name: PHP Insights checks
+        steps:
+            - uses: actions/checkout@v2
+            - uses: shivammathur/setup-php@v2
+              with:
+                  php-version: 8.2
+            - run: composer install --prefer-dist --no-progress --no-suggest
+            - run: vendor/bin/phpinsights -n --ansi --format=github-action

composer.json

@@ -18,13 +18,13 @@
     "require": {
         "spatie/laravel-package-tools": "^1.14.0",
         "spatie/laravel-honeypot": "^4.3.2",
-        "illuminate/contracts": "^10.0",
-        "notfoundnl/siteboss-layout": "^1.4.1",
-        "notfoundnl/siteboss-static": "^1.12",
-        "mcamara/laravel-localization": "^1.8",
+        "illuminate/contracts": "^10.0|^11.0",
+        "notfoundnl/siteboss-layout": "^1.6.1",
+        "notfoundnl/siteboss-static": "^1.13",
+        "mcamara/laravel-localization": "^2.0",
         "xenolope/quahog": "^3.0",
         "firebase/php-jwt": "^6.3",
-        "intervention/image": "^2.7",
+        "intervention/image": "^3.0",
         "php": "^8.1",
         "doctrine/dbal": "^3.6"
     },
@@ -38,7 +38,8 @@
         "phpstan/extension-installer": "^1.1",
         "phpstan/phpstan-deprecation-rules": "^1.0",
         "phpstan/phpstan-phpunit": "^1.0",
-        "phpunit/phpunit": "^9.5"
+        "phpunit/phpunit": "^9.5",
+        "nunomaduro/phpinsights": "^2.9.0"
     },
     "autoload": {
         "psr-4": {
@@ -65,7 +66,10 @@
         "sort-packages": true,
         "allow-plugins": {
             "pestphp/pest-plugin": true,
-            "phpstan/extension-installer": true
+            "phpstan/extension-installer": true,
+            "php-http/discovery": true,
+            "bamarni/composer-bin-plugin": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true
         }
     },
     "extra": {

config/app.php

@@ -149,6 +149,8 @@
         NotFound\Framework\Providers\RouteServiceProvider::class,
         NotFound\Framework\Providers\LogServiceProvider::class,
         NotFound\Framework\Providers\MigrationServiceProvider::class,
+        NotFound\Framework\Providers\GlobalStringServiceProvider::class,
+        NotFound\Framework\Providers\PageInfoServiceProvider::class,
 
     ])->toArray(),
 
@@ -165,6 +167,7 @@
 
     'aliases' => Facade::defaultAliases()->merge([
         'Sb' => \NotFound\Framework\Helpers\SitebossHelper::class,
+        'Info' => \NotFound\Framework\Facades\Info::class,
     ])->toArray(),
 
 ];

config/siteboss.php

@@ -38,4 +38,26 @@
 
     'frontend_api_prefix' => env('SB_FRONTEND_API_PREFIX', 'api'),
 
+    /*
+    |--------------------------------------------------------------------------
+    | CMS importer
+    |--------------------------------------------------------------------------
+    |
+    | Do you want to retain the database id's for tables and table items.
+    |
+    */
+
+    'export_retain_ids' => env('SB_EXPORT_RETAIN_IDS', false),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Admin email
+    |--------------------------------------------------------------------------
+    |
+    | Email address to send admin notifications to.
+    |
+    */
+
+    'admin_email' => env('SB_ADMIN_EMAIL', null),
+
 ];

database/migrations/2023_10_25_171457_add_created_at_to_menu_table.php

@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        if (Schema::hasColumn('menu', 'created_at')) {
+            return;
+        }
+        Schema::table('menu', function (Blueprint $table) {
+            $table->timestamp('created_at')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('menu', function (Blueprint $table) {
+            $table->dropColumn('created_at');
+        });
+    }
+};

database/migrations/2023_10_27_163933_create_table_redirects.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('cms_redirects', function (Blueprint $table) {
+            $table->id();
+            $table->string('url')->unique();
+            $table->string('redirect');
+            $table->boolean('recursive')->default(false);
+            $table->boolean('rewrite')->default(false);
+            $table->boolean('enabled')->default(false);
+            $table->timestamps();
+            $table->softDeletes();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('cms_redirects');
+    }
+};

database/migrations/2024_01_02_142937_update_cms_config.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up()
+    {
+        Schema::table('cms_config', function (Blueprint $table) {
+            $table->renameColumn('rights', 'editable');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('cms_config', function (Blueprint $table) {
+            $table->renameColumn('editable', 'rights');
+        });
+    }
+};

database/migrations/2024_01_10_122234_update_cms_user_table.php

@@ -0,0 +1,31 @@
+<?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('cms_user', function (Blueprint $table) {
+            $table->string('sub')->nullable()->default(null)->change();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+};

database/migrations/2024_01_18_143607_add_model_column_to_table_table.php

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

database/migrations/2024_02_15_122044_update_cms_template_column_controller.php

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

database/seeders/CmsUserSeeder.php

@@ -17,6 +17,7 @@ public function run()
         DB::table('cms_user')->insertOrIgnore([
             'name' => 'Beheerder Notfound',
             'email' => env('SB_ADMIN_EMAIL', ''),
+            'email_verified_at' => now(),
             'enabled' => 1,
         ]);