Merge pull request #84 from NotFoundNL/develop

feat!: Version 0.9.0

Author: 64knl

composer.json

@@ -32,7 +32,7 @@
         "laravel/pint": "^1.0",
         "nunomaduro/collision": "^6.0",
         "nunomaduro/larastan": "^2.0.1",
-        "orchestra/testbench": "^7.0",
+        "orchestra/testbench": "^8.9",
         "pestphp/pest": "^1.21",
         "pestphp/pest-plugin-laravel": "^1.1",
         "phpstan/extension-installer": "^1.1",

config/database.php

@@ -109,7 +109,7 @@
     |
     */
 
-    'migrations' => 'migrations',
+    'migrations' => 'cms_migrations',
 
     /*
     |--------------------------------------------------------------------------

config/solr.php config/indexer.phpconfig/solr.php renamed to config/indexer.php

@@ -12,5 +12,14 @@
     | Relative path to the sitemap.txt created by the SOLR indexer.
     |
     */
-    'sitemap' => env('SOLR_SITEMAP', 'public/sitemap.txt'),
+    'engine' => env('INDEXER_ENGINE', 'solr'), // 'solr' or 'elastic
+    'sitemap' => env('INDEXER_SITEMAP', 'public/sitemap.txt'),
+
+    'solr' => [
+        'host' => env('SOLR_HOST', ''),
+        'user' => env('SOLR_USER', ''),
+        'pass' => env('SOLR_PASS', ''),
+        'core' => env('SOLR_CORE', ''),
+    ],
+
 ];

config/siteboss.php

@@ -13,9 +13,20 @@
     | are using a different API prefix for your application.
     |
     */
-
     'api_prefix' => env('SB_BACKEND_API_PREFIX', '/siteboss/api'),
 
+    /*
+    |--------------------------------------------------------------------------
+    | Cache prefix
+    |--------------------------------------------------------------------------
+    |
+    | Boolean to prefix the asset URL with a number based on the updated_at
+    | of the AssetItem.
+    |
+    */
+
+    'cache_prefix' => env('SB_CACHE_PREFIX', false),
+
     /*
     |--------------------------------------------------------------------------
     | API prefix

database/migrations/2021_10_27_182234_create_cms_search_table.php

@@ -18,7 +18,7 @@ public function up()
             $table->string('type', 64)->nullable();
             $table->integer('updated')->nullable();
             $table->integer('site_id')->nullable();
-            $table->set('search_status', ['PENDING', 'UPDATED', 'SKIPPED', 'INSERTED', 'NOT_INDEXABLE', 'NOT_FOUND'])->nullable();
+            $table->set('search_status', ['PENDING', 'UPDATED', 'SKIPPED', 'INSERTED', 'NOT_INDEXABLE', 'NOT_FOUND', 'FAILED'])->nullable();
         });
     }
 

resources/views/configuration/configuration-check.blade.php

@@ -0,0 +1,19 @@
+<table id="result">
+    <tr>
+        <th>Test</th>
+        <th>Result</th>
+    </tr>
+    @foreach ($tests as $test)
+        <tr class="result @if ($test->result !== true) error @endif">
+            <td>
+                @if ($test->result === true)
+                    ✅
+                @else
+                    ❌
+                @endif {{ $test->name }}
+            </td>
+            <td>{{ $test->result === true ? 'Success' : $test->result ?? 'Unkown error' }}
+            </td>
+        </tr>
+    @endforeach
+</table>

routes/console.php

@@ -4,9 +4,9 @@
 use Illuminate\Support\Facades\Artisan;
 use NotFound\Framework\Services\Indexer\IndexBuilderService;
 
-Artisan::command('siteboss:indexSite {--debug : Whether debug messages should be displayed}', function ($debug) {
+Artisan::command('siteboss:index-site {--debug : Whether debug messages should be displayed}', function ($debug) {
     //
-    $indexer = new IndexBuilderService('solr', $debug);
+    $indexer = new IndexBuilderService($debug);
     $indexer->run();
 
     return Command::SUCCESS;

src/Auth/Middleware/EnsureEmailIsVerified.php

@@ -4,7 +4,6 @@
 
 use Closure;
 use Illuminate\Contracts\Auth\MustVerifyEmail;
-use Illuminate\Support\Facades\Redirect;
 
 class EnsureEmailIsVerified
 {

src/FrameworkServiceProvider.php

@@ -8,6 +8,7 @@
 use Illuminate\Support\ServiceProvider;
 use NotFound\Framework\Auth\Notifications\VerifyEmail;
 use NotFound\Framework\Models\Lang;
+use NotFound\Framework\View\Components\ConfigurationCheck;
 use NotFound\Framework\View\Components\Forms\Form;
 
 class FrameworkServiceProvider extends ServiceProvider
@@ -21,6 +22,7 @@ public function boot(): void
         $this->loadTranslationsFrom(__DIR__.'/../lang', 'siteboss');
 
         Blade::component('formbuilder-form', Form::class);
+        Blade::component('configuration-check', ConfigurationCheck::class);
         Blade::componentNamespace('NotFound\\Framework\\View\\Components\\Forms\\Fields', 'fields');
 
         $this->publishes([
@@ -31,7 +33,7 @@ public function boot(): void
             __DIR__.'/../config/openid.php' => config_path('openid.php'),
             __DIR__.'/../config/clamav.php' => config_path('clamav.php'),
             __DIR__.'/../config/database.php' => config_path('database.php'),
-            __DIR__.'/../config/solr.php' => config_path('solr.php'),
+            __DIR__.'/../config/indexer.php' => config_path('indexer.php'),
             __DIR__.'/../config/laravellocalization.php' => config_path('laravellocalization.php'),
             __DIR__.'/Providers/AuthServiceProvider.php' => app_path('Providers/AuthServiceProvider.php'),
         ], 'siteboss-framework');

src/Http/Controllers/CmsEditor/CmsEditorMenuController.php

@@ -10,11 +10,8 @@
 use NotFound\Layout\Elements\LayoutButton;
 use NotFound\Layout\Elements\LayoutForm;
 use NotFound\Layout\Elements\LayoutPage;
+use NotFound\Layout\Elements\LayoutText;
 use NotFound\Layout\Elements\LayoutWidget;
-use NotFound\Layout\Elements\Table\LayoutTable;
-use NotFound\Layout\Elements\Table\LayoutTableColumn;
-use NotFound\Layout\Elements\Table\LayoutTableHeader;
-use NotFound\Layout\Elements\Table\LayoutTableRow;
 use NotFound\Layout\Helpers\LayoutWidgetHelper;
 use NotFound\Layout\Inputs\LayoutInputCheckbox;
 use NotFound\Layout\Inputs\LayoutInputDropdown;
@@ -39,40 +36,10 @@ public function index()
 
         $widget1 = new LayoutWidget('CMS Menu', 12);
 
-        $table = new LayoutTable(delete: true, edit: true, create: true, sort: true);
-        $table->addHeader(new LayoutTableHeader('Name', 'table'));
-        $table->addHeader(new LayoutTableHeader('Level', 'level'));
-        $table->addHeader(new LayoutTableHeader('Icon', 'icon'));
-        $table->addHeader(new LayoutTableHeader('Rights', 'rights'));
-        $table->addHeader(new LayoutTableHeader('Enabled', 'enabled'));
-        $tables = CmsMenu::orderBy('order')->get();
-
-        foreach ($tables as $cmsTable) {
-            $row = new LayoutTableRow($cmsTable->id, '/app/editor/menu/'.$cmsTable->id);
-            $row->addColumn(new LayoutTableColumn($cmsTable->level == 1 ? '- '.$cmsTable->title : $cmsTable->title, 'table'));
-            $row->addColumn(new LayoutTableColumn($cmsTable->level, 'level'));
-            $row->addColumn(new LayoutTableColumn($cmsTable->icon, 'icon'));
-            $row->addColumn(new LayoutTableColumn($cmsTable->rights, 'rights'));
-            $row->addColumn(new LayoutTableColumn($cmsTable->enabled, 'enabled'));
-            $table->addRow($row);
-        }
-        $widget1->addTable($table);
-        $widget1->noPadding();
+        $widget1->addText(new LayoutText('Menu is editable in the file resources/siteboss/menu.json'));
 
         $page->addWidget($widget1);
 
-        $widget2 = new LayoutWidget('Add new item', 12);
-
-        $newFieldForm = new LayoutForm('/app/editor/menu/');
-
-        $newFieldForm->addInput((new LayoutInputText('name', 'Display name'))->setRequired());
-        $newFieldForm->addInput((new LayoutInputText('to', 'Target Path'))->setRequired());
-        $newFieldForm->addButton(new LayoutButton('Add menuitem'));
-
-        $widget2->addForm($newFieldForm);
-
-        $page->addWidget($widget2);
-
         $response->addUIElement($page);
 
         return $response->build();