From 76ef50e0c51f6b9f39ee9835d2bfaea4fa536b5f Mon Sep 17 00:00:00 2001 From: Bhargav Raviya Date: Sun, 16 Apr 2023 12:02:22 +0530 Subject: [PATCH] change in theme --- composer.json | 4 ++-- src/TailwindCssPreset.php | 15 +++++++-------- .../resources/views/auth/login.blade.php | 4 ++-- .../views/auth/passwords/confirm.blade.php | 2 +- .../views/auth/passwords/email.blade.php | 2 +- .../views/auth/passwords/reset.blade.php | 6 +++--- .../resources/views/auth/register.blade.php | 8 ++++---- .../resources/views/layouts/app.blade.php | 2 +- src/tailwindcss-stubs/tailwind.config.js | 11 +++++------ src/tailwindcss-stubs/webpack.mix.js | 5 +---- 10 files changed, 27 insertions(+), 32 deletions(-) diff --git a/composer.json b/composer.json index e728f720..1f24a566 100644 --- a/composer.json +++ b/composer.json @@ -8,8 +8,8 @@ ], "license": "MIT", "require": { - "laravel/framework": "^8.0", - "laravel/ui": "^3.0" + "laravel/framework": "^9.0", + "laravel/ui": "^3.4" }, "autoload": { "psr-4": { diff --git a/src/TailwindCssPreset.php b/src/TailwindCssPreset.php index b35bc499..a9d6ccdf 100644 --- a/src/TailwindCssPreset.php +++ b/src/TailwindCssPreset.php @@ -29,13 +29,10 @@ public static function installAuth() protected static function updatePackageArray(array $packages) { return array_merge([ - '@tailwindcss/ui' => '^0.3', - 'autoprefixer' => '^9.6', - 'laravel-mix' => '^5.0.1', - 'postcss-import' => '^12.0', - 'postcss-nested' => '^4.2', - 'tailwindcss' => '^1.8', - 'vue-template-compiler' => '^2.6.11', + 'tailwindcss' => '^3.0.23', + 'postcss' => '^8.4.12', + 'autoprefixer' => '^10.4.4', + 'laravel-mix' => '^6.0', ], Arr::except($packages, [ 'bootstrap', 'bootstrap-sass', @@ -65,6 +62,8 @@ protected static function updateBootstrapping() copy(__DIR__.'/tailwindcss-stubs/tailwind.config.js', base_path('tailwind.config.js')); copy(__DIR__.'/tailwindcss-stubs/webpack.mix.js', base_path('webpack.mix.js')); + + // copy(__DIR__.'/tailwindcss-stubs/postcss.config.js', base_path('postcss.config.js')); copy(__DIR__.'/tailwindcss-stubs/resources/js/bootstrap.js', resource_path('js/bootstrap.js')); } @@ -119,7 +118,7 @@ protected static function scaffoldAuth() protected static function compileControllerStub() { return str_replace( - '{{namespace}}', + '{{ namespace }}', Container::getInstance()->getNamespace(), file_get_contents(__DIR__.'/tailwindcss-stubs/controllers/HomeController.stub') ); diff --git a/src/tailwindcss-stubs/resources/views/auth/login.blade.php b/src/tailwindcss-stubs/resources/views/auth/login.blade.php index dd59b76a..fda0c355 100644 --- a/src/tailwindcss-stubs/resources/views/auth/login.blade.php +++ b/src/tailwindcss-stubs/resources/views/auth/login.blade.php @@ -19,7 +19,7 @@ @error('email') @@ -35,7 +35,7 @@ class="form-input w-full @error('email') border-red-500 @enderror" name="email" @error('password') diff --git a/src/tailwindcss-stubs/resources/views/auth/passwords/confirm.blade.php b/src/tailwindcss-stubs/resources/views/auth/passwords/confirm.blade.php index 3bfbfc8d..119931b7 100644 --- a/src/tailwindcss-stubs/resources/views/auth/passwords/confirm.blade.php +++ b/src/tailwindcss-stubs/resources/views/auth/passwords/confirm.blade.php @@ -23,7 +23,7 @@ @error('password') diff --git a/src/tailwindcss-stubs/resources/views/auth/passwords/email.blade.php b/src/tailwindcss-stubs/resources/views/auth/passwords/email.blade.php index 6969e12e..b8b71d51 100644 --- a/src/tailwindcss-stubs/resources/views/auth/passwords/email.blade.php +++ b/src/tailwindcss-stubs/resources/views/auth/passwords/email.blade.php @@ -26,7 +26,7 @@ @error('email') diff --git a/src/tailwindcss-stubs/resources/views/auth/passwords/reset.blade.php b/src/tailwindcss-stubs/resources/views/auth/passwords/reset.blade.php index 19fdcc0e..aed7efc5 100644 --- a/src/tailwindcss-stubs/resources/views/auth/passwords/reset.blade.php +++ b/src/tailwindcss-stubs/resources/views/auth/passwords/reset.blade.php @@ -21,7 +21,7 @@ @error('email') @@ -37,7 +37,7 @@ class="form-input w-full @error('email') border-red-500 @enderror" name="email" @error('password') @@ -52,7 +52,7 @@ class="form-input w-full @error('password') border-red-500 @enderror" name="pass {{ __('Confirm Password') }}: - diff --git a/src/tailwindcss-stubs/resources/views/auth/register.blade.php b/src/tailwindcss-stubs/resources/views/auth/register.blade.php index 22d10ac4..aa38982f 100644 --- a/src/tailwindcss-stubs/resources/views/auth/register.blade.php +++ b/src/tailwindcss-stubs/resources/views/auth/register.blade.php @@ -19,7 +19,7 @@ {{ __('Name') }}: - @error('name') @@ -35,7 +35,7 @@ @error('email') @@ -51,7 +51,7 @@ class="form-input w-full @error('email') border-red-500 @enderror" name="email" @error('password') @@ -66,7 +66,7 @@ class="form-input w-full @error('password') border-red-500 @enderror" name="pass {{ __('Confirm Password') }}: - diff --git a/src/tailwindcss-stubs/resources/views/layouts/app.blade.php b/src/tailwindcss-stubs/resources/views/layouts/app.blade.php index 22e70cfe..288f9cee 100644 --- a/src/tailwindcss-stubs/resources/views/layouts/app.blade.php +++ b/src/tailwindcss-stubs/resources/views/layouts/app.blade.php @@ -17,7 +17,7 @@
-
+