From 019f8ddf867e4003d5cfd37faa97f38e6ccdc17d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20T=C4=83b=C4=83citu?= Date: Fri, 17 Mar 2023 16:47:47 +0700 Subject: [PATCH 01/11] rename everything to CoreUI v4 --- composer.json | 24 +++++++++++++------ ...{theme-coreuiv2.php => theme-coreuiv4.php} | 0 readme.md | 20 ++++++++-------- src/AddonServiceProvider.php | 2 +- 4 files changed, 28 insertions(+), 18 deletions(-) rename config/{theme-coreuiv2.php => theme-coreuiv4.php} (100%) diff --git a/composer.json b/composer.json index ff2c39e..71e9aac 100644 --- a/composer.json +++ b/composer.json @@ -1,17 +1,27 @@ { - "name": "backpack/theme-coreuiv2", - "description": "UI that uses CoreUI v2 and Bootstrap v4, provided as a legacy theme for Backpack v6.", + "name": "backpack/theme-coreuiv4", + "description": "UI for Backpack v6 that uses CoreUI v4 and Bootstrap v5.", "license": "MIT", "authors": [ { "name": "Cristian Tabacitu", "email": "hello@backpackforlaravel.com", "homepage": "https://backpackforlaravel.com" + }, + { + "name": "Antonio Almeida", + "email": "promatik@gmail.com", + "homepage": "https://backpackforlaravel.com" + }, + { + "name": "Mauro Martinez", + "email": "maurohmartinez@gmail.com", + "homepage": "https://backpackforlaravel.com" } ], - "homepage": "https://github.com/backpack/theme-coreuiv2", + "homepage": "https://github.com/backpack/theme-coreuiv4", "keywords": [ - "Laravel", "Backpack", "Backpack for Laravel", "Backpack Addon", "ThemeCoreuiv2" + "Laravel", "Backpack", "Backpack for Laravel", "Backpack Addon", "ThemeCoreuiv4" ], "require": { "illuminate/support": "~8|~9", @@ -23,12 +33,12 @@ }, "autoload": { "psr-4": { - "Backpack\\ThemeCoreuiv2\\": "src/" + "Backpack\\ThemeCoreuiv4\\": "src/" } }, "autoload-dev": { "psr-4": { - "Backpack\\ThemeCoreuiv2\\Tests\\": "tests" + "Backpack\\ThemeCoreuiv4\\Tests\\": "tests" } }, "scripts": { @@ -37,7 +47,7 @@ "extra": { "laravel": { "providers": [ - "Backpack\\ThemeCoreuiv2\\AddonServiceProvider" + "Backpack\\ThemeCoreuiv4\\AddonServiceProvider" ] } } diff --git a/config/theme-coreuiv2.php b/config/theme-coreuiv4.php similarity index 100% rename from config/theme-coreuiv2.php rename to config/theme-coreuiv4.php diff --git a/readme.md b/readme.md index 7b7c845..97930ce 100644 --- a/readme.md +++ b/readme.md @@ -1,4 +1,4 @@ -# Theme CoreUI v2 +# Theme CoreUI v4 [![Latest Version on Packagist][ico-version]][link-packagist] [![Total Downloads][ico-downloads]][link-downloads] @@ -24,14 +24,14 @@ If you're one of the developers above, fear not... this package offers a way for **Step 1.** Install via Composer ``` bash -composer require backpack/theme-coreuiv2 +composer require backpack/theme-coreuiv4 ``` **Step 2.** Go to `config/backpack/base.php` and change your view namespace: ```diff - 'view_namespace' => 'backpack::', -+ 'view_namespace' => 'backpack.theme-coreuiv2::', ++ 'view_namespace' => 'backpack.theme-coreuiv4::', ``` ## Overriding @@ -42,15 +42,15 @@ The more files you copy-paste and customize, the more difficult it will be to up ```bash # create the custom directory if it's not already there -mkdir -p resources/views/vendor/backpack/theme-coreuiv2 +mkdir -p resources/views/vendor/backpack/theme-coreuiv4 # copy the blade file inside the folder we created above -cp -i vendor/backpack/theme-coreuiv2/src/resources/views/dashboard.blade.php resources/views/vendor/backpack/theme-coreuiv2/dashboard.blade.php +cp -i vendor/backpack/theme-coreuiv4/src/resources/views/dashboard.blade.php resources/views/vendor/backpack/theme-coreuiv4/dashboard.blade.php ``` ## Change log -Changes are documented here on Github. Please see the [Releases tab](https://github.com/backpack/theme-coreuiv2/releases). +Changes are documented here on Github. Please see the [Releases tab](https://github.com/backpack/theme-coreuiv4/releases). ## Contributing @@ -69,10 +69,10 @@ If you discover any security related issues, please email hello@backpackforlarav This project was released under MIT, so you can install it on top of any Backpack & Laravel project. Please see the [license file](license.md) for more information. -[ico-version]: https://img.shields.io/packagist/v/backpack/theme-coreuiv2.svg?style=flat-square -[ico-downloads]: https://img.shields.io/packagist/dt/backpack/theme-coreuiv2.svg?style=flat-square +[ico-version]: https://img.shields.io/packagist/v/backpack/theme-coreuiv4.svg?style=flat-square +[ico-downloads]: https://img.shields.io/packagist/dt/backpack/theme-coreuiv4.svg?style=flat-square -[link-packagist]: https://packagist.org/packages/backpack/theme-coreuiv2 -[link-downloads]: https://packagist.org/packages/backpack/theme-coreuiv2 +[link-packagist]: https://packagist.org/packages/backpack/theme-coreuiv4 +[link-downloads]: https://packagist.org/packages/backpack/theme-coreuiv4 [link-author]: https://github.com/backpack [link-contributors]: ../../contributors diff --git a/src/AddonServiceProvider.php b/src/AddonServiceProvider.php index ff7a63e..77cf40e 100644 --- a/src/AddonServiceProvider.php +++ b/src/AddonServiceProvider.php @@ -9,6 +9,6 @@ class AddonServiceProvider extends ServiceProvider use AutomaticServiceProvider; protected $vendorName = 'backpack'; - protected $packageName = 'theme-coreuiv2'; + protected $packageName = 'theme-coreuiv4'; protected $commands = []; } From 72823f0832f6d8dce764ec55d0934f79f95ed722 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20T=C4=83b=C4=83citu?= Date: Fri, 17 Mar 2023 16:51:11 +0700 Subject: [PATCH 02/11] change namespace to CoreUIv4 --- src/AddonServiceProvider.php | 2 +- src/AutomaticServiceProvider.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/AddonServiceProvider.php b/src/AddonServiceProvider.php index 77cf40e..5cf3165 100644 --- a/src/AddonServiceProvider.php +++ b/src/AddonServiceProvider.php @@ -1,6 +1,6 @@ Date: Fri, 17 Mar 2023 11:54:29 +0200 Subject: [PATCH 03/11] Initial HTML changes to make the UI prettier on CoreUI v4 --- .../views/auth/passwords/email.blade.php | 10 +- .../views/auth/passwords/reset.blade.php | 12 +-- resources/views/auth/register.blade.php | 18 ++-- resources/views/inc/breadcrumbs.blade.php | 2 +- resources/views/inc/footer.blade.php | 2 +- resources/views/inc/getting_started.blade.php | 10 +- resources/views/inc/main_header.blade.php | 21 ++-- .../views/inc/menu_user_dropdown.blade.php | 4 +- resources/views/inc/scripts.blade.php | 11 +-- resources/views/inc/sidebar.blade.php | 97 ++++--------------- resources/views/inc/theme_scripts.blade.php | 5 +- resources/views/inc/theme_styles.blade.php | 15 ++- .../views/inc/topbar_right_content.blade.php | 2 +- resources/views/layouts/top_left.blade.php | 11 ++- resources/views/widgets/alert.blade.php | 10 +- resources/views/widgets/card.blade.php | 2 +- resources/views/widgets/progress.blade.php | 6 +- resources/views/widgets/style.blade.php | 2 +- 18 files changed, 100 insertions(+), 140 deletions(-) diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php index 6054f43..ae3b32d 100644 --- a/resources/views/auth/passwords/email.blade.php +++ b/resources/views/auth/passwords/email.blade.php @@ -2,18 +2,18 @@ {{-- Main Content --}} @section('content') -
+

{{ trans('backpack::base.reset_password') }}

-
-
+
+
@if (session('status'))
{{ session('status') }} @@ -22,7 +22,7 @@
{!! csrf_field() !!} -
+
diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php index 8f83034..5c682c1 100644 --- a/resources/views/auth/passwords/reset.blade.php +++ b/resources/views/auth/passwords/reset.blade.php @@ -1,7 +1,7 @@ @extends(backpack_view('layouts.plain')) @section('content') -
+

{{ trans('backpack::base.reset_password') }}

@@ -11,8 +11,8 @@
-
-
+
+
@if (session('status'))
{{ session('status') }} @@ -23,7 +23,7 @@ -
+
@@ -37,7 +37,7 @@
-
+
@@ -51,7 +51,7 @@
-
+
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index 0555f8e..08a713d 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -1,15 +1,15 @@ @extends(backpack_view('layouts.plain')) @section('content') -
-
+
+

{{ trans('backpack::base.register') }}

-
+
{!! csrf_field() !!} -
+
@@ -23,7 +23,7 @@
-
+
@@ -37,7 +37,7 @@
-
+
@@ -51,7 +51,7 @@
-
+
@@ -65,7 +65,7 @@
-
+
@if (backpack_users_have_email() && backpack_email_column() == 'email' && config('backpack.base.setup_password_recovery_routes', true)) -
{{ trans('backpack::base.forgot_your_password') }}
+
{{ trans('backpack::base.forgot_your_password') }}
@endif
{{ trans('backpack::base.login') }}
diff --git a/resources/views/inc/breadcrumbs.blade.php b/resources/views/inc/breadcrumbs.blade.php index 05e449d..b59d430 100644 --- a/resources/views/inc/breadcrumbs.blade.php +++ b/resources/views/inc/breadcrumbs.blade.php @@ -1,6 +1,6 @@ @if (config('backpack.base.breadcrumbs') && isset($breadcrumbs) && is_array($breadcrumbs) && count($breadcrumbs))