kamilniemczycki/toby
1
0
Fork 0
Code Issues Pull Requests 2 Projects Releases Activity

Merge branch 'main' into #20-vacation-requests

Browse Source 
# Conflicts:
#	app/Architecture/Providers/ObserverServiceProvider.php
#	app/Domain/Role.php
#	app/Domain/Rules/ApprovedVacationDaysInSameRange.php
#	app/Domain/Rules/DoesNotExceedLimitRule.php
#	app/Domain/Rules/MinimumOneVacationDayRule.php
#	app/Domain/Rules/PendingVacationRequestInSameRange.php
#	app/Domain/Rules/UsedVacationDaysInSameRange.php
#	app/Domain/Rules/VacationRequestRule.php
#	app/Domain/VacationRequestState.php
#	app/Domain/VacationRequestStateManager.php
#	app/Domain/VacationRequestValidator.php
#	app/Domain/VacationType.php
#	app/Domain/VacationTypeConfigRetriever.php
#	app/Eloquent/Models/User.php
#	app/Infrastructure/Http/Controllers/UserController.php
#	app/Infrastructure/Http/Kernel.php
#	app/Infrastructure/Http/Requests/UserRequest.php
#	database/factories/UserFactory.php
#	database/seeders/DatabaseSeeder.php
#	routes/web.php
#	tests/Feature/UserTest.php
This commit is contained in:
Adrian Hopek
2022-02-01 11:10:59 +01:00
parent fc84efd95f f6d59f8bfb
commit 3ebc391b83
106 changed files with 333 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
database/migrations/2014_10_12_000000_create_users_table.php
View File

@@ -5,7 +5,7 @@ declare(strict_types=1);
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
use Toby\Enums\Role;
use Toby\Domain\Enums\Role;
return new class() extends Migration {
public function up(): void

4
database/migrations/2022_01_19_140630_create_vacation_limits_table.php
View File

@@ -5,8 +5,8 @@ declare(strict_types=1);
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
use Toby\Models\User;
use Toby\Models\YearPeriod;
use Toby\Eloquent\Models\User;
use Toby\Eloquent\Models\YearPeriod;
return new class() extends Migration {
public function up(): void

2
database/migrations/2022_01_20_140544_create_holidays_table.php
View File

@@ -5,7 +5,7 @@ declare(strict_types=1);
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
use Toby\Models\YearPeriod;
use Toby\Eloquent\Models\YearPeriod;
return new class() extends Migration {
public function up(): void

2
database/migrations/2022_01_26_100039_create_vacation_requests_table.php
View File

@@ -5,7 +5,7 @@ declare(strict_types=1);
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
use Toby\Models\User;
use Toby\Eloquent\Models\User;
return new class() extends Migration {
public function up(): void

7
database/migrations/2022_01_28_140009_create_vacation_request_activities_table.php
View File

@@ -5,8 +5,8 @@ declare(strict_types=1);
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
use Toby\Models\User;
use Toby\Models\VacationRequest;
use Toby\Eloquent\Models\User;
use Toby\Eloquent\Models\VacationRequest;
return new class() extends Migration {
public function up(): void
@@ -21,9 +21,6 @@ return new class() extends Migration {
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::dropIfExists("vacation_request_activities");