Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #209

Merged
merged 14 commits into from
Nov 2, 2022
8 changes: 3 additions & 5 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.*'

Expand All @@ -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
Expand Down
6 changes: 2 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
6 changes: 6 additions & 0 deletions resources/js/bootstrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -150,6 +153,9 @@ Alpine.data('app', () => ({
})
this.showConfirmationModal = false
}
init() {
console.log('sdfds')
}
}))

feather.replace()
4 changes: 4 additions & 0 deletions resources/views/catalog/attribute/index.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -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') }}
Expand Down
5 changes: 2 additions & 3 deletions resources/views/partials/sidebar.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -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 }"
Expand All @@ -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
Expand Down
4 changes: 3 additions & 1 deletion src/AvoRedServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
use Illuminate\Support\Facades\View;
use Illuminate\Support\ServiceProvider;
use Laravel\Passport\Passport;
use Livewire\LivewireServiceProvider;

class AvoRedServiceProvider extends ServiceProvider
{
Expand All @@ -45,7 +46,8 @@ class AvoRedServiceProvider extends ServiceProvider
PaymentProvider::class,
PermissionProvider::class,
ShippingProvider::class,
TabProvider::class
TabProvider::class,
LivewireServiceProvider::class
];

/**
Expand Down