diff --git a/composer.json b/composer.json index 56a86a4b..4e78ec44 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,10 @@ "name": "laravel/laravel", "type": "project", "description": "The Laravel Framework.", - "keywords": ["framework", "laravel"], + "keywords": [ + "framework", + "laravel" + ], "license": "MIT", "require": { "php": "^8.1", @@ -14,6 +17,7 @@ "livewire/livewire": "^2.5" }, "require-dev": { + "naoray/blueprint-nova-addon": "dev-master#a7791033d1cb68d4e82631305e26b64e18464494", "fakerphp/faker": "^1.9.1", "fidum/laravel-blueprint-pestphp-addon": "^2.2", "jasonmccreary/laravel-test-assertions": "^2.1", @@ -50,7 +54,8 @@ ], "post-create-project-cmd": [ "@php artisan key:generate --ansi" - ] + ], + "blueprint": "php artisan blueprint:erase && php artisan blueprint:build && php artisan migrate:fresh --seed" }, "extra": { "laravel": { @@ -66,5 +71,11 @@ } }, "minimum-stability": "dev", - "prefer-stable": true + "prefer-stable": true, + "repositories": [ + { + "type": "vcs", + "url": "https://github.com/affektde/blueprint-nova-addon" + } + ] } diff --git a/composer.lock b/composer.lock index a880ce2e..abc8a79c 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": "b688b365bafc4372895765268dab540c", + "content-hash": "1f8fd1523946b409c720bda1df3eab4e", "packages": [ { "name": "bacon/bacon-qr-code", @@ -1135,16 +1135,16 @@ }, { "name": "laravel/fortify", - "version": "v1.13.7", + "version": "v1.14.0", "source": { "type": "git", "url": "https://github.com/laravel/fortify.git", - "reference": "28c2dc66639571ac656c13617a1a0876a82319b1" + "reference": "20aeaf31edbf01e21348954088641cdb3d48ebe8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/fortify/zipball/28c2dc66639571ac656c13617a1a0876a82319b1", - "reference": "28c2dc66639571ac656c13617a1a0876a82319b1", + "url": "https://api.github.com/repos/laravel/fortify/zipball/20aeaf31edbf01e21348954088641cdb3d48ebe8", + "reference": "20aeaf31edbf01e21348954088641cdb3d48ebe8", "shasum": "" }, "require": { @@ -1194,20 +1194,20 @@ "issues": "https://github.com/laravel/fortify/issues", "source": "https://github.com/laravel/fortify" }, - "time": "2022-11-04T20:57:17+00:00" + "time": "2022-11-23T09:03:43+00:00" }, { "name": "laravel/framework", - "version": "v9.41.0", + "version": "v9.42.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "cc902ce61b4ca08ca7449664cfab2fa96a1d1e28" + "reference": "0bb828f0b8d1b320cac0b71874807ea2f334ea89" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/cc902ce61b4ca08ca7449664cfab2fa96a1d1e28", - "reference": "cc902ce61b4ca08ca7449664cfab2fa96a1d1e28", + "url": "https://api.github.com/repos/laravel/framework/zipball/0bb828f0b8d1b320cac0b71874807ea2f334ea89", + "reference": "0bb828f0b8d1b320cac0b71874807ea2f334ea89", "shasum": "" }, "require": { @@ -1380,7 +1380,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2022-11-22T15:10:46+00:00" + "time": "2022-11-29T15:18:16+00:00" }, { "name": "laravel/jetstream", @@ -6802,16 +6802,16 @@ }, { "name": "laravel/pint", - "version": "v1.2.0", + "version": "v1.2.1", "source": { "type": "git", "url": "https://github.com/laravel/pint.git", - "reference": "1d276e4c803397a26cc337df908f55c2a4e90d86" + "reference": "e60e2112ee779ce60f253695b273d1646a17d6f1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/pint/zipball/1d276e4c803397a26cc337df908f55c2a4e90d86", - "reference": "1d276e4c803397a26cc337df908f55c2a4e90d86", + "url": "https://api.github.com/repos/laravel/pint/zipball/e60e2112ee779ce60f253695b273d1646a17d6f1", + "reference": "e60e2112ee779ce60f253695b273d1646a17d6f1", "shasum": "" }, "require": { @@ -6823,10 +6823,10 @@ }, "require-dev": { "friendsofphp/php-cs-fixer": "^3.11.0", - "illuminate/view": "^9.27", - "laravel-zero/framework": "^9.1.3", - "mockery/mockery": "^1.5.0", - "nunomaduro/larastan": "^2.2", + "illuminate/view": "^9.32.0", + "laravel-zero/framework": "^9.2.0", + "mockery/mockery": "^1.5.1", + "nunomaduro/larastan": "^2.2.0", "nunomaduro/termwind": "^1.14.0", "pestphp/pest": "^1.22.1" }, @@ -6864,7 +6864,7 @@ "issues": "https://github.com/laravel/pint/issues", "source": "https://github.com/laravel/pint" }, - "time": "2022-09-13T15:07:15+00:00" + "time": "2022-11-29T16:25:20+00:00" }, { "name": "laravel/sail", @@ -7057,6 +7057,80 @@ ], "time": "2022-03-03T13:19:32+00:00" }, + { + "name": "naoray/blueprint-nova-addon", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/affektde/blueprint-nova-addon.git", + "reference": "a7791033d1cb68d4e82631305e26b64e18464494" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/affektde/blueprint-nova-addon/zipball/a7791033d1cb68d4e82631305e26b64e18464494", + "reference": "a7791033d1cb68d4e82631305e26b64e18464494", + "shasum": "" + }, + "require": { + "illuminate/pipeline": "^6.0 || ^7.0 || ^8.0 || ^9.0", + "illuminate/support": "^6.0 || ^7.0 || ^8.0 || ^9.0", + "laravel-shift/blueprint": "^1.18 || ^2.0" + }, + "require-dev": { + "mockery/mockery": "^1.3", + "orchestra/testbench": "^4.0 || ^5.0 || ^6.0", + "phpunit/phpunit": "^9.0" + }, + "default-branch": true, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "Naoray\\BlueprintNovaAddon\\BlueprintNovaAddonServiceProvider" + ] + } + }, + "autoload": { + "psr-4": { + "Naoray\\BlueprintNovaAddon\\": "src" + } + }, + "autoload-dev": { + "psr-4": { + "Naoray\\BlueprintNovaAddon\\Tests\\": "tests" + } + }, + "scripts": { + "test": [ + "vendor/bin/phpunit" + ] + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Krishan König", + "email": "krishan.koenig@gmail.com", + "role": "Developer" + } + ], + "homepage": "https://github.com/naoray/blueprint-nova-addon", + "keywords": [ + "blueprint-nova-addon", + "naoray" + ], + "support": { + "source": "https://github.com/affektde/blueprint-nova-addon/tree/master" + }, + "funding": [ + { + "type": "github", + "url": "https://github.com/Naoray" + } + ], + "time": "2022-05-21T13:21:07+00:00" + }, { "name": "nunomaduro/collision", "version": "v6.3.1", @@ -9112,11 +9186,13 @@ ], "aliases": [], "minimum-stability": "dev", - "stability-flags": [], + "stability-flags": { + "naoray/blueprint-nova-addon": 20 + }, "prefer-stable": true, "prefer-lowest": false, "platform": { - "php": "^8.0.2" + "php": "^8.1" }, "platform-dev": [], "plugin-api-version": "2.3.0" diff --git a/config/fortify.php b/config/fortify.php index 510a5391..33fa5d29 100644 --- a/config/fortify.php +++ b/config/fortify.php @@ -103,7 +103,7 @@ return [ */ 'limiters' => [ - 'login' => 'login', + 'login' => 'login', 'two-factor' => 'two-factor', ], @@ -134,11 +134,11 @@ return [ 'features' => [ Features::registration(), Features::resetPasswords(), - // Features::emailVerification(), + Features::emailVerification(), Features::updateProfileInformation(), Features::updatePasswords(), Features::twoFactorAuthentication([ - 'confirm' => true, + 'confirm' => true, 'confirmPassword' => true, // 'window' => 0, ]), diff --git a/config/jetstream.php b/config/jetstream.php index cfe14d99..30185f65 100644 --- a/config/jetstream.php +++ b/config/jetstream.php @@ -58,8 +58,8 @@ return [ */ 'features' => [ - // Features::termsAndPrivacyPolicy(), - // Features::profilePhotos(), + Features::termsAndPrivacyPolicy(), + Features::profilePhotos(), // Features::api(), Features::teams(['invitations' => true]), Features::accountDeletion(), diff --git a/database/migrations/.gitignore b/database/migrations/.gitignore new file mode 100644 index 00000000..074dfc1c --- /dev/null +++ b/database/migrations/.gitignore @@ -0,0 +1,4 @@ +!2014_* +!2019_* +!2020_* +2022_* diff --git a/database/migrations/2022_11_29_111353_create_sessions_table.php b/database/migrations/2021_05_21_400000_create_sessions_table.php similarity index 100% rename from database/migrations/2022_11_29_111353_create_sessions_table.php rename to database/migrations/2021_05_21_400000_create_sessions_table.php diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index 76d96dc7..5cb0c19e 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -3,22 +3,26 @@ namespace Database\Seeders; // use Illuminate\Database\Console\Seeds\WithoutModelEvents; +use App\Models\User; use Illuminate\Database\Seeder; class DatabaseSeeder extends Seeder { /** * Seed the application's database. - * * @return void */ public function run() { - // \App\Models\User::factory(10)->create(); + User::factory() + ->count(5) + ->withPersonalTeam() + ->create(); - // \App\Models\User::factory()->create([ - // 'name' => 'Test User', - // 'email' => 'test@example.com', - // ]); + $this->call([ + CountrySeeder::class, + CitySeeder::class, + LecturerSeeder::class, + ]); } }