Skip to content

Commit

Permalink
Merge branch '4.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
sampoyigi committed Mar 8, 2025
2 parents f85552e + 22fb7fb commit 4aa9b11
Show file tree
Hide file tree
Showing 11 changed files with 57 additions and 19 deletions.
24 changes: 24 additions & 0 deletions .github/workflows/pipeline.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: CI Pipeline

on: [ push, pull_request, workflow_dispatch ]

jobs:
php-tests:
name: PHP Tests
runs-on: ubuntu-latest
strategy:
matrix:
php-version: [ 8.3, 8.4 ]
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Setup PHP ${{ matrix.php-version }}
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php-version }}
tools: composer:v2
coverage: none

- name: Install composer dependencies
run: composer install --no-interaction --no-progress
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
[TastyIgniter](https://tastyigniter.com/) provides a professional and reliable platform for restaurants wanting to offer
online food ordering and table reservation to their customers.

![screenshot](https://tastyigniter.com/images/mockups/Menus-v2.png)
![screenshot](https://tastyigniter.com/images/mockups/v4/Menus.png)

### Documentation
The best place to learn TastyIgniter is by reading the [documentation](https://tastyigniter.com/docs)
Expand Down
5 changes: 2 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
],
"require": {
"php": "^8.3",
"laravel/framework": "^12.0",
"laravel/framework": "^11.0",
"laravel/tinker": "^2.10.1",
"tastyigniter/core": "^4.0"
},
Expand Down Expand Up @@ -63,8 +63,7 @@
"scripts": {
"post-autoload-dump": [
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
"@php artisan package:discover --ansi",
"@php artisan igniter:package-discover --ansi"
"@php artisan package:discover --ansi"
],
"post-update-cmd": [
"@php artisan vendor:publish --tag=igniter-assets --ansi --force"
Expand Down
2 changes: 1 addition & 1 deletion extensions/igniter/demo/Extension.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

class Extension extends BaseExtension
{
public function registerComponents()
public function registerComponents(): array
{
return [
\Igniter\Demo\Components\Block::class => [
Expand Down
22 changes: 22 additions & 0 deletions extensions/igniter/demo/composer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"name": "tastyigniter/ti-ext-demo",
"type": "tastyigniter-package",
"description": "Provides block component for demonstration",
"license": "MIT",
"extra": {
"tastyigniter-extension": {
"code": "igniter.demo",
"name": "Demo Extension",
"icon": {
"class": "fa fa-plug",
"color": "#fff",
"backgroundColor": "#000"
}
}
},
"autoload": {
"psr-4": {
"Igniter\\Demo\\": "/"
}
}
}
8 changes: 0 additions & 8 deletions extensions/igniter/demo/extension.json

This file was deleted.

4 changes: 2 additions & 2 deletions themes/demo/_layouts/default.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ class="text-white d-inline-block py-2 fs-3"
</header>

<div id="page-wrapper" class="pt-4">
@page
@themePage
</div>

<footer id="page-footer mt-auto">
@themePartial('footer')
</footer>
@scripts
@themeScripts
</body>
</html>
2 changes: 1 addition & 1 deletion themes/demo/_pages/home.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<a href="https://tastyigniter.com/docs/master/customize/themes">Themes documentation</a>.</p>

<p class="mb-4 img-holder mx-n3">
<img class="img-fluid rounded" src="https://tastyigniter.com/assets/ui/images/mockups/Menus-v2.png" alt="TastyIgniter Frontend">
<img class="img-fluid rounded" src="https://tastyigniter.com/assets/ui/images/mockups/v4/Menus.png" alt="TastyIgniter Frontend">
</p>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions themes/demo/_partials/head.blade.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{!! get_metas() !!}
<link href="{{ asset('favicon.svg') }}" rel="shortcut icon" type="image/ico">
<title>{{ sprintf(lang('igniter::main.site_title'), lang(get_title()), setting('site_name')) }}</title>
<title>{{ lang(get_title()).' | '.setting('site_name') }}</title>
<link href="{{ asset('vendor/igniter/css/app.css') }}" rel="stylesheet" type="text/css" id="igniter-css">
@styles
@themeStyles
1 change: 1 addition & 0 deletions themes/demo/screenshot.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion themes/demo/theme.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
"tags": {
"1.0.0": "Theme initialization"
}
}
}

0 comments on commit 4aa9b11

Please sign in to comment.