Merge pull request #209 from avored/develop

Develop
avored · Nov 2, 2022 · 01b1c7e · 01b1c7e
2 parents f13d907 + 272dc0e
commit 01b1c7e
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 13 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -15,11 +15,9 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest]
-        php: [8.0]
-        laravel: ['8.*', '9.*']
+        php: [8.1]
+        laravel: ['9.*']
         include:
-          - laravel: '8.*'
-            testbench: '6.*'
           - laravel: '9.*'
             testbench: '7.*'
 
@@ -43,7 +41,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
+          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo, xdebug
           coverage: none
 
       - name: Setup problem matchers

diff --git a/composer.json b/composer.json
@@ -26,15 +26,13 @@
         "rebing/graphql-laravel": "^8.2",
         "nyholm/psr7": "^1.4",
         "laravel/passport": "^10.1|^10.2|^10.3",
-        "symfony/yaml": "^5.3|^6.0",
+        "symfony/yaml": "^6.0",
         "livewire/livewire": "^2.10"
     },
     "require-dev": {
-        "brianium/paratest": "^6.0",
         "friendsofphp/php-cs-fixer": "^3.1",
         "nunomaduro/collision": "^5.3|^6.0",
-        "orchestra/testbench": "6.*|7.*",
-        "phpunit/phpunit": "^9.5",
+        "orchestra/testbench": "7.*",
         "vimeo/psalm": "^4.8"
     },
     "autoload": {

diff --git a/resources/js/bootstrap.js b/resources/js/bootstrap.js
@@ -111,6 +111,9 @@ Alpine.data('app', () => ({
     },
     showAlert(type) {
         this.openAlertBox = true
+        this.showAlert = true
+        this.showAlertMessage = 'test message'
+        console.log(type)
         switch (type) {
             case 'success':
                 this.alertBackgroundColor = 'bg-green-500'
@@ -150,6 +153,9 @@ Alpine.data('app', () => ({
             })
         this.showConfirmationModal = false
     }
+    init() {
+        console.log('sdfds')
+    }
 }))
 
 feather.replace()
diff --git a/resources/views/catalog/attribute/index.blade.php b/resources/views/catalog/attribute/index.blade.php
@@ -5,6 +5,10 @@
             <h2 class="text-2xl text-red-700 font-semibold">
                 {{ __('avored::system.attribute') }} {{ __('avored::system.list') }}
             </h2>
+
+
+
+
             <span class="ml-auto">
                 <x-avored::link url="{{ route('admin.attribute.create') }}" style="button-primary">
                     {{ __('avored::system.create') }}

diff --git a/resources/views/partials/sidebar.blade.php b/resources/views/partials/sidebar.blade.php
@@ -3,7 +3,7 @@
     x-transition.duration.300ms>
     <div class="bg-white text-red-700 h-16 p-2 flex items-center shadow">
         <img class="h-8 w-8 ml-4" src="{{ asset('/vendor/avored/images/logo_only.svg') }}" alt="AvoRed Ecommerce" />
-        <span class="font-bold ml-2">AvoRed</span>
+        <span class="hidden lg:block font-bold ml-2">AvoRed</span>
     </div>
 
     <div class="space-x-8 p-2 overflow-hidden">
@@ -17,7 +17,7 @@ class="flex items-center my-5 ml-3 pr-2 text-white transition-colors rounded-md"
                         <span aria-hidden="true">
                             <i class="h-5 w-5" data-feather="{{ $adminMenu->icon() }}"></i>
                         </span>
-                        <span class="ml-3 text-sm">{{ $adminMenu->label() }}</span>
+                        <span class="ml-3 pl-1 text-sm">{{ $adminMenu->label() }}</span>
                         <span class="ml-auto" aria-hidden="true">
                             <!-- active class 'rotate-180' -->
                             <svg class="w-4 h-4 transition-transform transform" :class="{ 'rotate-180': open }"
@@ -33,7 +33,6 @@ class="block p-2 text-sm text-white transition-colors duration-200 rounded-md da
                                 {{ $subMenu->label() }}
                             </a>
                         @endforeach
-
                     </div>
                 </div>
             @endforeach

diff --git a/src/AvoRedServiceProvider.php b/src/AvoRedServiceProvider.php
@@ -25,6 +25,7 @@
 use Illuminate\Support\Facades\View;
 use Illuminate\Support\ServiceProvider;
 use Laravel\Passport\Passport;
+use Livewire\LivewireServiceProvider;
 
 class AvoRedServiceProvider extends ServiceProvider
 {
@@ -45,7 +46,8 @@ class AvoRedServiceProvider extends ServiceProvider
         PaymentProvider::class,
         PermissionProvider::class,
         ShippingProvider::class,
-        TabProvider::class
+        TabProvider::class,
+        LivewireServiceProvider::class
     ];
 
     /**