Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ trim_trailing_whitespace = true
[*.md]
trim_trailing_whitespace = false

[*.{yml,yaml}]
[*.{yml,yaml,vue}]
indent_size = 2

[docker-compose.yml]
Expand Down
2 changes: 1 addition & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ APP_URL=http://localhost

DB_CONNECTION=mysql
DB_HOST=127.0.0.1
DB_PORT=3306
#DB_PORT=3306 #TODO needs to be removed from .env.example
DB_DATABASE=seatplus
DB_USERNAME=seatplus
DB_PASSWORD=secret
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,5 @@ _ide_helper.php
package-lock.json
/resources/
/lang

/packages/
3 changes: 2 additions & 1 deletion app/Providers/AppServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace App\Providers;

use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\ServiceProvider;

class AppServiceProvider extends ServiceProvider
Expand All @@ -19,6 +20,6 @@ public function register(): void
*/
public function boot(): void
{
//
Model::preventLazyLoading(! app()->isProduction());
}
}
49 changes: 40 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,36 @@
],
"license": "MIT",
"require": {
"php": "^8.1",
"php": "^8.2",
"ext-json": "*",
"ext-redis": "*",
"guzzlehttp/guzzle": "^7.2",
"laravel/framework": "^10.0",
"laravel/framework": "^11.0",
"laravel/tinker": "^2.8",
"seatplus/web": "^4.0",
"symfony/process": "^6.3.4"
"laravel/wayfinder": "^0.1.4",
"wikimedia/composer-merge-plugin": "^2.1"
},
"replace": {
"seatplus/web": "*",
"seatplus/auth": "*",
"seatplus/eveapi": "*",
"seatplus/esi-client": "*"
},
"require-dev": {
"barryvdh/laravel-ide-helper": "^3.0",
"fakerphp/faker": "^1.9.1",
"mockery/mockery": "^1.4.4",
"nunomaduro/collision": "^7.0",
"phpunit/phpunit": "^10.0",
"spatie/laravel-ignition": "^2.0"
},
"autoload": {
"psr-4": {
"App\\": "app/",
"Database\\Factories\\": "database/factories/",
"Database\\Seeders\\": "database/seeders/"
"Database\\Seeders\\": "database/seeders/",
"Seatplus\\Eveapi\\": "packages/eveapi/src/",
"Seatplus\\Web\\": "packages/web/src/",
"Seatplus\\Auth\\": "packages/auth/src/"
}
},
"autoload-dev": {
Expand All @@ -56,12 +65,33 @@
"@php artisan lang:publish",
"@php artisan vendor:publish --tag=laravel-assets --ansi --force",
"@php artisan vendor:publish --tag=web-static --force",
"@php artisan vendor:publish --tag=web --force"
"@php artisan vendor:publish --tag=web --force",
"Illuminate\\Foundation\\ComposerScripts::postUpdate",
"@php artisan ide-helper:generate",
"@php artisan ide-helper:meta"
]
},
"extra": {
"laravel": {
"dont-discover": []
"dont-discover": [],
"providers": [
"Seatplus\\Web\\Providers\\WebServiceProvider",
"Seatplus\\Auth\\Providers\\AuthServiceProvider",
"Seatplus\\Eveapi\\Providers\\EveapiServiceProvider"
]
},
"merge-plugin": {
"include": [
"packages/*/composer.json"
],
"recurse": true,
"replace": false,
"ignore-duplicates": false,
"merge-dev": false,
"merge-extra": true,
"merge-extra-deep": true,
"merge-replace": true,
"merge-scripts": false
}
},
"config": {
Expand All @@ -70,7 +100,8 @@
"sort-packages": true,
"allow-plugins": {
"pestphp/pest-plugin": true,
"php-http/discovery": true
"php-http/discovery": true,
"wikimedia/composer-merge-plugin": true
}
},
"minimum-stability": "dev",
Expand Down
4 changes: 4 additions & 0 deletions config/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,10 @@
* Package Service Providers...
*/

\Seatplus\Eveapi\EveapiServiceProvider::class,
\Seatplus\Web\WebServiceProvider::class,
\Seatplus\Auth\AuthenticationServiceProvider::class,

/*
* Application Service Providers...
*/
Expand Down
10 changes: 10 additions & 0 deletions jsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"compilerOptions": {
"baseUrl": ".",
"paths": {
"@/*": ["resources/js/*"],
"@actions/*": ["resources/js/actions/*"]
}
},
"exclude": ["node_modules", "dist"]
}