diff --git a/.blueprint b/.blueprint index 9ca13e30..5e074684 100644 --- a/.blueprint +++ b/.blueprint @@ -8,16 +8,16 @@ created: - database/factories/VenueFactory.php - database/factories/EventFactory.php - database/factories/RegistrationFactory.php - - database/migrations/2022_11_30_170514_create_countries_table.php - - database/migrations/2022_11_30_170515_create_cities_table.php - - database/migrations/2022_11_30_170516_create_lecturers_table.php - - database/migrations/2022_11_30_170517_create_participants_table.php - - database/migrations/2022_11_30_170518_create_categories_table.php - - database/migrations/2022_11_30_170519_create_courses_table.php - - database/migrations/2022_11_30_170520_create_venues_table.php - - database/migrations/2022_11_30_170521_create_events_table.php - - database/migrations/2022_11_30_170522_create_registrations_table.php - - database/migrations/2022_11_30_170523_create_category_course_table.php + - database/migrations/2022_12_01_100450_create_countries_table.php + - database/migrations/2022_12_01_100451_create_cities_table.php + - database/migrations/2022_12_01_100452_create_lecturers_table.php + - database/migrations/2022_12_01_100453_create_participants_table.php + - database/migrations/2022_12_01_100454_create_categories_table.php + - database/migrations/2022_12_01_100455_create_courses_table.php + - database/migrations/2022_12_01_100456_create_venues_table.php + - database/migrations/2022_12_01_100457_create_events_table.php + - database/migrations/2022_12_01_100458_create_registrations_table.php + - database/migrations/2022_12_01_100459_create_category_course_table.php - app/Models/Country.php - app/Models/City.php - app/Models/Lecturer.php diff --git a/app/Actions/Fortify/CreateNewUser.php b/app/Actions/Fortify/CreateNewUser.php index 9cfe6da3..0bcbc3f0 100644 --- a/app/Actions/Fortify/CreateNewUser.php +++ b/app/Actions/Fortify/CreateNewUser.php @@ -24,18 +24,20 @@ class CreateNewUser implements CreatesNewUsers public function create(array $input) { Validator::make($input, [ - 'name' => ['required', 'string', 'max:255'], - 'email' => ['required', 'string', 'email', 'max:255', 'unique:users'], - 'password' => app()->environment('local') ? 'required' : $this->passwordRules(), - 'terms' => Jetstream::hasTermsAndPrivacyPolicyFeature() ? ['accepted', 'required'] : '', + 'name' => ['required', 'string', 'max:255'], + 'email' => ['required', 'string', 'email', 'max:255', 'unique:users'], + 'password' => app()->environment('local') ? 'required' : $this->passwordRules(), + 'terms' => Jetstream::hasTermsAndPrivacyPolicyFeature() ? ['accepted', 'required'] : '', + 'is_lecturer' => ['required'], ]) ->validate(); return DB::transaction(function () use ($input) { return tap(User::create([ - 'name' => $input['name'], - 'email' => $input['email'], - 'password' => Hash::make($input['password']), + 'name' => $input['name'], + 'email' => $input['email'], + 'password' => Hash::make($input['password']), + 'is_lecturer' => $input['is_lecturer'] === 'on', ]), function (User $user) { $this->createTeam($user); }); diff --git a/app/Models/User.php b/app/Models/User.php index 645f2f4d..c31ab2df 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -25,7 +25,10 @@ class User extends Authenticatable implements MustVerifyEmail * @var string[] */ protected $fillable = [ - 'name', 'email', 'password', + 'name', + 'email', + 'password', + 'is_lecturer', ]; /** diff --git a/app/Models/Venue.php b/app/Models/Venue.php index 544fe9ea..d2bd6dc6 100644 --- a/app/Models/Venue.php +++ b/app/Models/Venue.php @@ -11,6 +11,7 @@ class Venue extends Model /** * The attributes that are mass assignable. + * * @var array */ protected $fillable = [ @@ -22,10 +23,11 @@ class Venue extends Model /** * The attributes that should be cast to native types. + * * @var array */ protected $casts = [ - 'id' => 'integer', + 'id' => 'integer', 'city_id' => 'integer', ]; diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php index 84c648c7..e05cead8 100644 --- a/database/migrations/2014_10_12_000000_create_users_table.php +++ b/database/migrations/2014_10_12_000000_create_users_table.php @@ -4,11 +4,9 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -return new class extends Migration -{ +return new class extends Migration { /** * Run the migrations. - * * @return void */ public function up() @@ -16,19 +14,24 @@ return new class extends Migration Schema::create('users', function (Blueprint $table) { $table->id(); $table->string('name'); - $table->string('email')->unique(); - $table->timestamp('email_verified_at')->nullable(); + $table->string('email') + ->unique(); + $table->timestamp('email_verified_at') + ->nullable(); $table->string('password'); $table->rememberToken(); - $table->foreignId('current_team_id')->nullable(); - $table->string('profile_photo_path', 2048)->nullable(); + $table->foreignId('current_team_id') + ->nullable(); + $table->string('profile_photo_path', 2048) + ->nullable(); + $table->boolean('is_lecturer') + ->default(false); $table->timestamps(); }); } /** * Reverse the migrations. - * * @return void */ public function down() diff --git a/database/migrations/2022_11_30_170514_create_countries_table.php b/database/migrations/2022_12_01_100450_create_countries_table.php similarity index 100% rename from database/migrations/2022_11_30_170514_create_countries_table.php rename to database/migrations/2022_12_01_100450_create_countries_table.php diff --git a/database/migrations/2022_11_30_170515_create_cities_table.php b/database/migrations/2022_12_01_100451_create_cities_table.php similarity index 100% rename from database/migrations/2022_11_30_170515_create_cities_table.php rename to database/migrations/2022_12_01_100451_create_cities_table.php diff --git a/database/migrations/2022_11_30_170516_create_lecturers_table.php b/database/migrations/2022_12_01_100452_create_lecturers_table.php similarity index 100% rename from database/migrations/2022_11_30_170516_create_lecturers_table.php rename to database/migrations/2022_12_01_100452_create_lecturers_table.php diff --git a/database/migrations/2022_11_30_170517_create_participants_table.php b/database/migrations/2022_12_01_100453_create_participants_table.php similarity index 100% rename from database/migrations/2022_11_30_170517_create_participants_table.php rename to database/migrations/2022_12_01_100453_create_participants_table.php diff --git a/database/migrations/2022_11_30_170518_create_categories_table.php b/database/migrations/2022_12_01_100454_create_categories_table.php similarity index 100% rename from database/migrations/2022_11_30_170518_create_categories_table.php rename to database/migrations/2022_12_01_100454_create_categories_table.php diff --git a/database/migrations/2022_11_30_170519_create_courses_table.php b/database/migrations/2022_12_01_100455_create_courses_table.php similarity index 100% rename from database/migrations/2022_11_30_170519_create_courses_table.php rename to database/migrations/2022_12_01_100455_create_courses_table.php diff --git a/database/migrations/2022_11_30_170520_create_venues_table.php b/database/migrations/2022_12_01_100456_create_venues_table.php similarity index 100% rename from database/migrations/2022_11_30_170520_create_venues_table.php rename to database/migrations/2022_12_01_100456_create_venues_table.php diff --git a/database/migrations/2022_11_30_170521_create_events_table.php b/database/migrations/2022_12_01_100457_create_events_table.php similarity index 100% rename from database/migrations/2022_11_30_170521_create_events_table.php rename to database/migrations/2022_12_01_100457_create_events_table.php diff --git a/database/migrations/2022_11_30_170522_create_registrations_table.php b/database/migrations/2022_12_01_100458_create_registrations_table.php similarity index 100% rename from database/migrations/2022_11_30_170522_create_registrations_table.php rename to database/migrations/2022_12_01_100458_create_registrations_table.php diff --git a/database/migrations/2022_11_30_170523_create_category_course_table.php b/database/migrations/2022_12_01_100459_create_category_course_table.php similarity index 100% rename from database/migrations/2022_11_30_170523_create_category_course_table.php rename to database/migrations/2022_12_01_100459_create_category_course_table.php diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index 6d414c3f..ac1fd035 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -37,11 +37,13 @@ class DatabaseSeeder extends Seeder 'password' => bcrypt('1234'), 'remember_token' => Str::random(10), ]); - Team::create([ + $team = Team::create([ 'name' => 'Admin Team', 'user_id' => $user->id, 'personal_team' => true, ]); + $user->current_team_id = $team->id; + $user->save(); Country::create([ 'name' => 'Deutschland', 'code' => 'de', diff --git a/lang/de.json b/lang/de.json index b2213f88..fe4e0f9b 100644 --- a/lang/de.json +++ b/lang/de.json @@ -1,4 +1,5 @@ { + "I want to submit new courses on this platform": "Ich bin Dozent und möchte neue Kurse auf dieser Plattform einstellen", "(and :count more error)": "(und :count weiterer Fehler)", "(and :count more errors)": "(und :count weitere Fehler)", "A fresh verification link has been sent to your email address.": "Ein neuer Bestätigungslink wurde an Ihre E-Mail-Adresse gesendet.", @@ -202,4 +203,4 @@ "You may not delete your personal team.": "Sie können Ihr persönliches Team nicht löschen.", "You may not leave a team that you created.": "Sie können ein von Ihnen erstelltes Team nicht verlassen.", "Your email address is unverified.": "Ihre E-Mail-Adresse ist nicht verifiziert." -} \ No newline at end of file +} diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 4be83f7e..ba5b5269 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -37,6 +37,7 @@
+ @if (Route::has('password.request')) @@ -47,6 +48,7 @@ {{ __('Log in') }} +
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index 794f23e0..bcf8e863 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -1,39 +1,55 @@ - + - +
@csrf
- - + +
- - + +
- - + +
- - + + +
+ +
+ +
+ + +
+ {{ __('I want to submit new courses on this platform') }} +
+
+
@if (Laravel\Jetstream\Jetstream::hasTermsAndPrivacyPolicyFeature())
- +
{!! __('I agree to the :terms_of_service and :privacy_policy', [ diff --git a/resources/views/vendor/jetstream/components/authentication-card.blade.php b/resources/views/vendor/jetstream/components/authentication-card.blade.php index f0af1d33..84c3010d 100644 --- a/resources/views/vendor/jetstream/components/authentication-card.blade.php +++ b/resources/views/vendor/jetstream/components/authentication-card.blade.php @@ -3,7 +3,7 @@ {{ $logo }}
-
+
{{ $slot }}