Merge pull request #51 from AlexStack/alex_dev

Test Laravel 8.x

Author: AlexStack

README.md

@@ -5,13 +5,14 @@
 [![image](docs/images/min/styleci.svg)](https://github.com/AlexStack/Laravel-CMS/releases)
 [![Latest Stable Version](https://poser.pugx.org/alexstack/laravel-cms/v/stable)](https://github.com/AlexStack/Laravel-CMS/releases)
 
--   Free, open-source Simple Bootstrap Laravel CMS for any EXISTING Laravel 7.x or 6.x or old Laravel 5.x website.
+-   Free, open-source Simple Bootstrap Laravel CMS, support Laravel 8.x or 7.x or old Laravel 6.x & 5.x
+-   Can integrate with any existing Laravel project, install as an individual Laravel package
 -   Only add a few database tables with a prefix, not effect your existing database tables.
 -   You can easily custom the database table names, the page URL path(route) and the template(theme)
--   Website is ready after install. Easy to use, simple enough but flexible.
--   Basic Laravel 7.x /Laravel 6.x / Laravel 5.x syntax and blade template, no need to learn a new "language"
+-   Build-in Website is ready after install. Easy to use, simple enough but flexible.
+-   Basic Laravel 8.x/ Laravel 7.x /Laravel 6.x / Laravel 5.x syntax and blade template, no need to learn a "new language"
 
-## How to install & uninstall (Support Laravel 7.x & Laravel 6.x & Laravel 5.x)
+## How to install & uninstall (Support Laravel 8.x & Laravel 7.x & Laravel 6.x & Laravel 5.x)
 
 ```php
 // Make sure you already configured the database in the .env
@@ -58,7 +59,7 @@ php artisan laravelcms --action=uninstall
 -   Can be fixed by the below commands:
 
 ```php
-// Laravel 6.x & Laravel >= 7
+// Laravel 6.x & Laravel >= 7 & Laravel >= 8
 composer require laravel/ui && php artisan ui vue --auth
 // Laravel 5.x, run blow command instead
 php artisan make:auth && php artisan migrate
@@ -190,7 +191,7 @@ php artisan laravelcms --action=clear
 -   It's good for a local test
 
 ```php
-// Install Laravel 6.x/7.x & the CMS package
+// Install Laravel 6.x/7.x/8.x & the CMS package
 composer create-project --prefer-dist laravel/laravel cms && cd cms && composer require alexstack/laravel-cms
 
 // Then you need to change the database settings in the .env after that initialize CMS
@@ -200,7 +201,7 @@ php artisan laravelcms
 // Or initialize the CMS with silent mode
 php artisan laravelcms --action=initialize --locale=en --table_prefix=cms_  --silent=yes
 
-// Enable auth system for Laravel 6.x/7.x
+// Enable auth system for Laravel 6.x/7.x/8.x
 composer require laravel/ui && php artisan ui vue --auth && php artisan migrate
 
 // Config the document root to point to the cms/public then you can access the backend

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "alexstack/laravel-cms",
-    "description": "Simple Bootstrap Laravel CMS for any EXISTING or new Laravel website. Only add few database tables with prefix, not effect your existing database tables. Support Laravel 7 & Laravel 6 & Laravel 5. Amila Laravel CMS",
+    "description": "Simple Bootstrap Laravel CMS. Can integrate to any existing Laravel project. Only add few database tables with prefix, not effect your existing database tables. Support Laravel 7.x & Laravel 6.x & Laravel 5.x - Amila Laravel CMS",
     "type": "library",
     "homepage": "https://github.com/AlexStack/Laravel-CMS/",
     "keywords": ["laravel", "laravel cms", "laravel blog", "laravel wordpress", "LaravelCMS", "amila laravel cms", "php cms", "cms", "laravel 6", "laravel6", "laravel 7", "laravel7", "Amila CMS", "headless cms", "existing laravel project"],

src/database/migrations/2019_08_16_075528_add_foreign_keys_to_cms_pages_table.php

@@ -23,13 +23,13 @@ public function up()
             $table_name_files = $this->config['table_name']['files'];
             $table_name_pages = $this->table_name;
 
-            $table->foreign('main_image', 'cms_pages_ibfk_main_image')->references('id')->on($table_name_files)->onUpdate('RESTRICT')->onDelete('SET NULL');
-            $table->foreign('main_banner', 'cms_pages_ibfk_main_banner')->references('id')->on($table_name_files)->onUpdate('RESTRICT')->onDelete('SET NULL');
-            $table->foreign('extra_image_1', 'cms_pages_ibfk_extra_image_1')->references('id')->on($table_name_files)->onUpdate('RESTRICT')->onDelete('SET NULL');
-            $table->foreign('extra_image_2', 'cms_pages_ibfk_extra_image_2')->references('id')->on($table_name_files)->onUpdate('RESTRICT')->onDelete('SET NULL');
-            $table->foreign('extra_image_3', 'cms_pages_ibfk_extra_image_3')->references('id')->on($table_name_files)->onUpdate('RESTRICT')->onDelete('SET NULL');
-            $table->foreign('parent_id', 'cms_pages_ibfk_parent_id')->references('id')->on($table_name_pages)->onUpdate('RESTRICT')->onDelete('SET NULL');
-            //$table->foreign('user_id', 'cms_pages_ibfk_user_id')->references('id')->on('users')->onUpdate('RESTRICT')->onDelete('SET NULL');
+            $table->foreign('main_image', $this->table_name.'_ibfk_main_image')->references('id')->on($table_name_files)->onUpdate('RESTRICT')->onDelete('SET NULL');
+            $table->foreign('main_banner', $this->table_name.'_ibfk_main_banner')->references('id')->on($table_name_files)->onUpdate('RESTRICT')->onDelete('SET NULL');
+            $table->foreign('extra_image_1', $this->table_name.'_ibfk_extra_image_1')->references('id')->on($table_name_files)->onUpdate('RESTRICT')->onDelete('SET NULL');
+            $table->foreign('extra_image_2', $this->table_name.'_ibfk_extra_image_2')->references('id')->on($table_name_files)->onUpdate('RESTRICT')->onDelete('SET NULL');
+            $table->foreign('extra_image_3', $this->table_name.'_ibfk_extra_image_3')->references('id')->on($table_name_files)->onUpdate('RESTRICT')->onDelete('SET NULL');
+            $table->foreign('parent_id', $this->table_name.'_ibfk_parent_id')->references('id')->on($table_name_pages)->onUpdate('RESTRICT')->onDelete('SET NULL');
+            //$table->foreign('user_id', $this->table_name . '_ibfk_user_id')->references('id')->on('users')->onUpdate('RESTRICT')->onDelete('SET NULL');
         });
     }
 
@@ -39,12 +39,12 @@ public function up()
     public function down()
     {
         Schema::table($this->table_name, function (Blueprint $table) {
-            $table->dropForeign('cms_pages_ibfk_main_image');
-            $table->dropForeign('cms_pages_ibfk_main_banner');
-            $table->dropForeign('cms_pages_ibfk_extra_image_1');
-            $table->dropForeign('cms_pages_ibfk_extra_image_2');
-            $table->dropForeign('cms_pages_ibfk_extra_image_3');
-            //$table->dropForeign('cms_pages_ibfk_user_id');
+            $table->dropForeign($this->table_name.'_ibfk_main_image');
+            $table->dropForeign($this->table_name.'_ibfk_main_banner');
+            $table->dropForeign($this->table_name.'_ibfk_extra_image_1');
+            $table->dropForeign($this->table_name.'_ibfk_extra_image_2');
+            $table->dropForeign($this->table_name.'_ibfk_extra_image_3');
+            //$table->dropForeign($this->table_name . '_ibfk_user_id');
         });
     }
 }

src/resources/views/backend/file-list.blade.php

@@ -142,7 +142,6 @@ class="preview_link not_image icon" title="{{$file->filename}}">
                             title="{{$file->filename}}" class="preview_link not_image">{{strtoupper($file->suffix)}}
                             {{$helper->t('file')}}<i class="fas fa-external-link-alt ml-1 small text-secondary"></i></a>
                          {{($file->filesize/1024 > 1000) ? round($file->filesize/1024/1024,2) . ' MB' : (($file->filesize/1024 > 10) ? round($file->filesize/1024) . ' KB' : round($file->filesize/1024, 1) . ' KB') }}
-
                         <a href="#" onclick="return confirmDelete({{$file->id}})" class="del">D<i
                                 class="far fa-trash-alt ml-1 small text-secondary"></i></a>
                     </div>