diff --git a/composer.json b/composer.json index be40484..fd2001f 100644 --- a/composer.json +++ b/composer.json @@ -31,7 +31,7 @@ "filament/spatie-laravel-media-library-plugin": "^2.0", "filament/spatie-laravel-tags-plugin": "^2.0", "filament/spatie-laravel-translatable-plugin": "^2.0", - "lara-zeus/core": "dev-main", + "lara-zeus/core": "^2.3", "mohamedsabil83/filament-forms-tinyeditor": "^1.5", "spatie/laravel-medialibrary": "^10.0.0", "spatie/laravel-sluggable": "^3.3", @@ -82,11 +82,5 @@ "LaraZeus\\Sky\\SkyServiceProvider" ] } - }, - "repositories": [ - { - "type": "path", - "url": "../core" - } - ] + } } diff --git a/composer.lock b/composer.lock index 0cb7454..523f5a0 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "c1b6c54885152b1e4274ec5a6d45f0ac", + "content-hash": "b549264bbd929e2023b71a096a67ed8d", "packages": [ { "name": "akaunting/laravel-money", @@ -1277,16 +1277,16 @@ }, { "name": "filament/filament", - "version": "v2.16.5", + "version": "v2.16.6", "source": { "type": "git", "url": "https://github.com/filamentphp/admin.git", - "reference": "94320edcd20fbd30db5b93c0ba43326d83953bf3" + "reference": "9a81d4af2a18cb60d01a372843625a3e2fd19022" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filamentphp/admin/zipball/94320edcd20fbd30db5b93c0ba43326d83953bf3", - "reference": "94320edcd20fbd30db5b93c0ba43326d83953bf3", + "url": "https://api.github.com/repos/filamentphp/admin/zipball/9a81d4af2a18cb60d01a372843625a3e2fd19022", + "reference": "9a81d4af2a18cb60d01a372843625a3e2fd19022", "shasum": "" }, "require": { @@ -1336,20 +1336,20 @@ "issues": "https://github.com/filamentphp/filament/issues", "source": "https://github.com/filamentphp/filament" }, - "time": "2022-09-16T14:59:12+00:00" + "time": "2022-09-17T17:15:49+00:00" }, { "name": "filament/forms", - "version": "v2.16.5", + "version": "v2.16.6", "source": { "type": "git", "url": "https://github.com/filamentphp/forms.git", - "reference": "a9c3f8a0f5c6cefa1190f77ee48ddda98ba95649" + "reference": "2b89a8ad13d619289e60bb2ca0d62f8049cd9449" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filamentphp/forms/zipball/a9c3f8a0f5c6cefa1190f77ee48ddda98ba95649", - "reference": "a9c3f8a0f5c6cefa1190f77ee48ddda98ba95649", + "url": "https://api.github.com/repos/filamentphp/forms/zipball/2b89a8ad13d619289e60bb2ca0d62f8049cd9449", + "reference": "2b89a8ad13d619289e60bb2ca0d62f8049cd9449", "shasum": "" }, "require": { @@ -1394,20 +1394,20 @@ "issues": "https://github.com/filamentphp/filament/issues", "source": "https://github.com/filamentphp/filament" }, - "time": "2022-09-16T14:59:17+00:00" + "time": "2022-09-17T17:15:40+00:00" }, { "name": "filament/notifications", - "version": "v2.16.5", + "version": "v2.16.6", "source": { "type": "git", "url": "https://github.com/filamentphp/notifications.git", - "reference": "8bc1cbfb4aede05113d499677be870d71b87ddf1" + "reference": "93919a0d067c82001ca8168eb0ac599d3c63967a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filamentphp/notifications/zipball/8bc1cbfb4aede05113d499677be870d71b87ddf1", - "reference": "8bc1cbfb4aede05113d499677be870d71b87ddf1", + "url": "https://api.github.com/repos/filamentphp/notifications/zipball/93919a0d067c82001ca8168eb0ac599d3c63967a", + "reference": "93919a0d067c82001ca8168eb0ac599d3c63967a", "shasum": "" }, "require": { @@ -1444,11 +1444,11 @@ "issues": "https://github.com/filamentphp/filament/issues", "source": "https://github.com/filamentphp/filament" }, - "time": "2022-09-16T10:23:15+00:00" + "time": "2022-09-17T17:15:43+00:00" }, { "name": "filament/spatie-laravel-media-library-plugin", - "version": "v2.16.5", + "version": "v2.16.6", "source": { "type": "git", "url": "https://github.com/filamentphp/spatie-laravel-media-library-plugin.git", @@ -1485,7 +1485,7 @@ }, { "name": "filament/spatie-laravel-tags-plugin", - "version": "v2.16.5", + "version": "v2.16.6", "source": { "type": "git", "url": "https://github.com/filamentphp/spatie-laravel-tags-plugin.git", @@ -1522,7 +1522,7 @@ }, { "name": "filament/spatie-laravel-translatable-plugin", - "version": "v2.16.5", + "version": "v2.16.6", "source": { "type": "git", "url": "https://github.com/filamentphp/spatie-laravel-translatable-plugin.git", @@ -1568,16 +1568,16 @@ }, { "name": "filament/support", - "version": "v2.16.5", + "version": "v2.16.6", "source": { "type": "git", "url": "https://github.com/filamentphp/support.git", - "reference": "d4cb0588141371ed8a49aa472ca5c8ea3b732e96" + "reference": "27877ed82f411379dbd0ee4facbffa53bfb3fe51" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filamentphp/support/zipball/d4cb0588141371ed8a49aa472ca5c8ea3b732e96", - "reference": "d4cb0588141371ed8a49aa472ca5c8ea3b732e96", + "url": "https://api.github.com/repos/filamentphp/support/zipball/27877ed82f411379dbd0ee4facbffa53bfb3fe51", + "reference": "27877ed82f411379dbd0ee4facbffa53bfb3fe51", "shasum": "" }, "require": { @@ -1614,20 +1614,20 @@ "issues": "https://github.com/filamentphp/filament/issues", "source": "https://github.com/filamentphp/filament" }, - "time": "2022-09-16T10:23:06+00:00" + "time": "2022-09-17T17:15:37+00:00" }, { "name": "filament/tables", - "version": "v2.16.5", + "version": "v2.16.6", "source": { "type": "git", "url": "https://github.com/filamentphp/tables.git", - "reference": "def2615dc4a37dacd736ec3b1aa4041ac01e5e62" + "reference": "1feac2d27ea3ee5a22ba07bd7c7c02f28d9e27d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filamentphp/tables/zipball/def2615dc4a37dacd736ec3b1aa4041ac01e5e62", - "reference": "def2615dc4a37dacd736ec3b1aa4041ac01e5e62", + "url": "https://api.github.com/repos/filamentphp/tables/zipball/1feac2d27ea3ee5a22ba07bd7c7c02f28d9e27d9", + "reference": "1feac2d27ea3ee5a22ba07bd7c7c02f28d9e27d9", "shasum": "" }, "require": { @@ -1670,7 +1670,7 @@ "issues": "https://github.com/filamentphp/filament/issues", "source": "https://github.com/filamentphp/filament" }, - "time": "2022-09-16T10:23:07+00:00" + "time": "2022-09-17T17:15:41+00:00" }, { "name": "fruitcake/php-cors", @@ -2082,11 +2082,17 @@ }, { "name": "lara-zeus/core", - "version": "dev-main", + "version": "2.3.1", + "source": { + "type": "git", + "url": "https://github.com/lara-zeus/core.git", + "reference": "3fd995a86691ac2b5354a0bc587b8c7205a84bbd" + }, "dist": { - "type": "path", - "url": "../core", - "reference": "195c4306713bbef1f23003243bbf24069c3277d2" + "type": "zip", + "url": "https://api.github.com/repos/lara-zeus/core/zipball/3fd995a86691ac2b5354a0bc587b8c7205a84bbd", + "reference": "3fd995a86691ac2b5354a0bc587b8c7205a84bbd", + "shasum": "" }, "require": { "archtechx/laravel-seo": "^0.5", @@ -2098,9 +2104,17 @@ "php": "^8.0" }, "require-dev": { - "laravel/pint": "^1.2", + "laravel/pint": "^1.0", + "nunomaduro/larastan": "^2.0.1", "orchestra/testbench": "^6.0 || ^7.0", - "phpunit/phpunit": "^9.5.10" + "pestphp/pest": "^1.21", + "pestphp/pest-plugin-laravel": "^1.1", + "pestphp/pest-plugin-livewire": "^1.0", + "pestphp/pest-plugin-parallel": "^0.3", + "phpstan/extension-installer": "^1.1", + "phpstan/phpstan-deprecation-rules": "^1.0", + "phpstan/phpstan-phpunit": "^1.0", + "phpunit/phpunit": "^9.5" }, "type": "library", "extra": { @@ -2118,19 +2132,7 @@ "LaraZeus\\Core\\": "src" } }, - "autoload-dev": { - "psr-4": { - "LaraZeus\\Core\\Tests\\": "tests" - } - }, - "scripts": { - "test": [ - "vendor/bin/phpunit" - ], - "test-coverage": [ - "vendor/bin/phpunit --coverage-html coverage" - ] - }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -2150,9 +2152,17 @@ "lara-zeus", "laravel" ], - "transport-options": { - "relative": true - } + "support": { + "issues": "https://github.com/lara-zeus/core/issues", + "source": "https://github.com/lara-zeus/core/tree/2.3.1" + }, + "funding": [ + { + "url": "https://github.com/atmonshi", + "type": "github" + } + ], + "time": "2022-09-17T17:33:39+00:00" }, { "name": "laravel/framework", @@ -11669,9 +11679,7 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": { - "lara-zeus/core": 20 - }, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": { diff --git a/resources/views/themes/zeus/addons/faq.blade.php b/resources/views/themes/zeus/addons/faq.blade.php index 5050368..3b1c117 100644 --- a/resources/views/themes/zeus/addons/faq.blade.php +++ b/resources/views/themes/zeus/addons/faq.blade.php @@ -1,29 +1,28 @@
@if(!$faqs->isEmpty()) -
-
-
-

- {{ __('question and answer') }} -

-
- @foreach($faqs as $faq) -
-
- +
+
+
+ {!! $faq->answer !!}
- @endforeach -
+
+ @endforeach
diff --git a/resources/views/themes/zeus/home.blade.php b/resources/views/themes/zeus/home.blade.php index be330d4..6bb86f7 100644 --- a/resources/views/themes/zeus/home.blade.php +++ b/resources/views/themes/zeus/home.blade.php @@ -10,11 +10,11 @@
@unless ($posts->isEmpty()) -

{{ __('Posts') }}

+

{{ __('Posts') }}

@if(request()->filled('search')) {{ __('Showing Search result of') }}: {{ request('search') }} - + @endif @each($theme.'.partial.post', $posts, 'post') diff --git a/resources/views/themes/zeus/page.blade.php b/resources/views/themes/zeus/page.blade.php index 4755003..c6511f5 100644 --- a/resources/views/themes/zeus/page.blade.php +++ b/resources/views/themes/zeus/page.blade.php @@ -2,12 +2,12 @@ @if($post->parent !== null)
  • - {{ $post->parent->title }} + {{ $post->parent->title }}
  • @endif
  • - {{ $post->title }} + {{ $post->title }}
  • @@ -15,9 +15,9 @@ @endif -
    +
    - {{ optional($post->published_at)->diffForHumans() ?? '' }} + {{ optional($post->published_at)->diffForHumans() ?? '' }}
    @unless ($post->tags->isEmpty()) @each($theme.'.partial.tag', $post->tags->where('type','category'), 'tag') @@ -27,16 +27,16 @@ @@ -46,7 +46,7 @@ @if(!$children->isEmpty())
    -

    children pages

    +

    children pages

    @foreach($children as $post) diff --git a/resources/views/themes/zeus/partial/post.blade.php b/resources/views/themes/zeus/partial/post.blade.php index af2d072..f3d3d8f 100644 --- a/resources/views/themes/zeus/partial/post.blade.php +++ b/resources/views/themes/zeus/partial/post.blade.php @@ -1,7 +1,7 @@
    -
    +
    - {{ optional($post->published_at)->diffForHumans() ?? '' }} + {{ optional($post->published_at)->diffForHumans() ?? '' }}
    @unless ($post->tags->isEmpty()) @each($theme.'.partial.tag', $post->tags->where('type','category'), 'tag') @@ -9,21 +9,21 @@
    diff --git a/resources/views/themes/zeus/partial/sidebar/authors.blade.php b/resources/views/themes/zeus/partial/sidebar/authors.blade.php index c0449cb..758d57c 100644 --- a/resources/views/themes/zeus/partial/sidebar/authors.blade.php +++ b/resources/views/themes/zeus/partial/sidebar/authors.blade.php @@ -1,6 +1,6 @@
    -

    Authors

    -
    +

    Authors

    +