From 119f825cbfb1b4fef01263102b5ce7570052bfc9 Mon Sep 17 00:00:00 2001 From: Twyco Date: Sat, 19 Sep 2026 13:41:12 +0200 Subject: [PATCH] format --- Dockerfile | 8 ----- app/Models/Team.php | 19 +++++++----- app/Models/TeamInvite.php | 30 +++++++++++++++++++ app/Models/TeamMember.php | 8 +++-- app/Models/User.php | 29 +++++++++++------- .../2026_09_10_192513_create_teams_table.php | 1 - 6 files changed, 65 insertions(+), 30 deletions(-) diff --git a/Dockerfile b/Dockerfile index b7a2960..8238806 100644 --- a/Dockerfile +++ b/Dockerfile @@ -52,16 +52,8 @@ WORKDIR /var/www FROM php_base AS build ARG VITE_APP_VERSION=local -ARG VITE_REVERB_APP_KEY -ARG VITE_REVERB_HOST -ARG VITE_REVERB_PORT -ARG VITE_REVERB_SCHEME ENV VITE_APP_VERSION=${VITE_APP_VERSION} \ - VITE_REVERB_APP_KEY=${VITE_REVERB_APP_KEY} \ - VITE_REVERB_HOST=${VITE_REVERB_HOST} \ - VITE_REVERB_PORT=${VITE_REVERB_PORT} \ - VITE_REVERB_SCHEME=${VITE_REVERB_SCHEME} COPY --from=node_binary /usr/local/ /usr/local/ COPY . /var/www diff --git a/app/Models/Team.php b/app/Models/Team.php index 621530a..c6b5c2d 100644 --- a/app/Models/Team.php +++ b/app/Models/Team.php @@ -2,9 +2,11 @@ namespace App\Models; +use Carbon\CarbonImmutable; use Illuminate\Database\Eloquent\Attributes\Fillable; use Illuminate\Database\Eloquent\Attributes\Scope; use Illuminate\Database\Eloquent\Builder; +use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Database\Eloquent\Relations\HasMany; @@ -13,24 +15,26 @@ use Illuminate\Database\Eloquent\Relations\HasMany; * @property int $id * @property string $name * @property string $slug - * @property int $created_by * @property bool $require_2fa - * @property \Carbon\CarbonImmutable|null $created_at - * @property \Carbon\CarbonImmutable|null $updated_at - * @property-read \App\Models\TeamMember|null $pivot - * @property-read \Illuminate\Database\Eloquent\Collection $members + * @property CarbonImmutable|null $created_at + * @property CarbonImmutable|null $updated_at + * @property-read Collection $invites + * @property-read int|null $invites_count + * @property-read TeamMember|null $pivot + * @property-read Collection $members * @property-read int|null $members_count + * * @method static Builder|Team newModelQuery() * @method static Builder|Team newQuery() * @method static Builder|Team query() - * @method static Builder|Team visibleTo(\App\Models\User $user) + * @method static Builder|Team scopeVisibleTo(\App\Models\User $user) * @method static Builder|Team whereCreatedAt($value) - * @method static Builder|Team whereCreatedBy($value) * @method static Builder|Team whereId($value) * @method static Builder|Team whereName($value) * @method static Builder|Team whereRequire2fa($value) * @method static Builder|Team whereSlug($value) * @method static Builder|Team whereUpdatedAt($value) + * * @mixin \Eloquent */ #[Fillable(['name', 'slug', 'require_2fa'])] @@ -43,6 +47,7 @@ class Team extends Model ->withPivot('role') ->withTimestamps(); } + public function invites(): HasMany { return $this->hasMany(TeamInvite::class); diff --git a/app/Models/TeamInvite.php b/app/Models/TeamInvite.php index 5b36eed..66ebe0f 100644 --- a/app/Models/TeamInvite.php +++ b/app/Models/TeamInvite.php @@ -3,15 +3,45 @@ namespace App\Models; use App\Notifications\InviteToTeam; +use Carbon\CarbonImmutable; use Illuminate\Database\Eloquent\Attributes\Fillable; use Illuminate\Database\Eloquent\Attributes\Scope; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; +use Illuminate\Notifications\DatabaseNotification; +use Illuminate\Notifications\DatabaseNotificationCollection; use Illuminate\Notifications\Notifiable; use Illuminate\Notifications\Notification; use Str; +/** + * @property int $id + * @property int $team_id + * @property int $invited_by_user_id + * @property string $invited_email + * @property string $invite_token + * @property CarbonImmutable|null $created_at + * @property CarbonImmutable|null $updated_at + * @property-read User $invitedBy + * @property-read DatabaseNotificationCollection $notifications + * @property-read int|null $notifications_count + * @property-read Team $team + * + * @method static Builder|TeamInvite findByPlainToken(string $token) + * @method static Builder|TeamInvite newModelQuery() + * @method static Builder|TeamInvite newQuery() + * @method static Builder|TeamInvite query() + * @method static Builder|TeamInvite whereCreatedAt($value) + * @method static Builder|TeamInvite whereId($value) + * @method static Builder|TeamInvite whereInviteToken($value) + * @method static Builder|TeamInvite whereInvitedByUserId($value) + * @method static Builder|TeamInvite whereInvitedEmail($value) + * @method static Builder|TeamInvite whereTeamId($value) + * @method static Builder|TeamInvite whereUpdatedAt($value) + * + * @mixin \Eloquent + */ #[Fillable(['team_id', 'invited_by_user_id', 'invited_email'])] class TeamInvite extends Model { diff --git a/app/Models/TeamMember.php b/app/Models/TeamMember.php index b5b496a..45d4de3 100644 --- a/app/Models/TeamMember.php +++ b/app/Models/TeamMember.php @@ -3,15 +3,16 @@ namespace App\Models; use App\Enums\TeamMemberRole; -use Illuminate\Database\Eloquent\Relations\BelongsTo; +use Carbon\CarbonImmutable; use Illuminate\Database\Eloquent\Relations\Pivot; /** * @property int $team_id * @property int $user_id * @property TeamMemberRole $role - * @property \Carbon\CarbonImmutable|null $created_at - * @property \Carbon\CarbonImmutable|null $updated_at + * @property CarbonImmutable|null $created_at + * @property CarbonImmutable|null $updated_at + * * @method static \Illuminate\Database\Eloquent\Builder|TeamMember newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|TeamMember newQuery() * @method static \Illuminate\Database\Eloquent\Builder|TeamMember query() @@ -20,6 +21,7 @@ use Illuminate\Database\Eloquent\Relations\Pivot; * @method static \Illuminate\Database\Eloquent\Builder|TeamMember whereTeamId($value) * @method static \Illuminate\Database\Eloquent\Builder|TeamMember whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|TeamMember whereUserId($value) + * * @mixin \Eloquent */ class TeamMember extends Pivot diff --git a/app/Models/User.php b/app/Models/User.php index 3c199a9..5b7aeee 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -2,37 +2,43 @@ namespace App\Models; -use Illuminate\Contracts\Auth\MustVerifyEmail; +use Carbon\CarbonImmutable; use Database\Factories\UserFactory; +use Illuminate\Contracts\Auth\MustVerifyEmail; use Illuminate\Database\Eloquent\Attributes\Fillable; use Illuminate\Database\Eloquent\Attributes\Hidden; +use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Foundation\Auth\User as Authenticatable; +use Illuminate\Notifications\DatabaseNotification; +use Illuminate\Notifications\DatabaseNotificationCollection; use Illuminate\Notifications\Notifiable; use Laravel\Fortify\Contracts\PasskeyUser; use Laravel\Fortify\PasskeyAuthenticatable; use Laravel\Fortify\TwoFactorAuthenticatable; +use Laravel\Passkeys\Passkey; /** * @property int $id * @property string $name * @property string $email - * @property \Carbon\CarbonImmutable|null $email_verified_at + * @property CarbonImmutable|null $email_verified_at * @property string $password - * @property string|null $remember_token - * @property \Carbon\CarbonImmutable|null $created_at - * @property \Carbon\CarbonImmutable|null $updated_at * @property string|null $two_factor_secret * @property string|null $two_factor_recovery_codes - * @property \Carbon\CarbonImmutable|null $two_factor_confirmed_at - * @property-read \Illuminate\Notifications\DatabaseNotificationCollection $notifications + * @property CarbonImmutable|null $two_factor_confirmed_at + * @property string|null $remember_token + * @property CarbonImmutable|null $created_at + * @property CarbonImmutable|null $updated_at + * @property-read DatabaseNotificationCollection $notifications * @property-read int|null $notifications_count - * @property-read \Illuminate\Database\Eloquent\Collection $passkeys + * @property-read Collection $passkeys * @property-read int|null $passkeys_count - * @property-read \App\Models\TeamMember|null $pivot - * @property-read \Illuminate\Database\Eloquent\Collection $teams + * @property-read TeamMember|null $pivot + * @property-read Collection $teams * @property-read int|null $teams_count + * * @method static \Database\Factories\UserFactory factory($count = null, $state = []) * @method static \Illuminate\Database\Eloquent\Builder|User newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|User newQuery() @@ -48,11 +54,12 @@ use Laravel\Fortify\TwoFactorAuthenticatable; * @method static \Illuminate\Database\Eloquent\Builder|User whereTwoFactorRecoveryCodes($value) * @method static \Illuminate\Database\Eloquent\Builder|User whereTwoFactorSecret($value) * @method static \Illuminate\Database\Eloquent\Builder|User whereUpdatedAt($value) + * * @mixin \Eloquent */ #[Fillable(['name', 'email', 'password'])] #[Hidden(['password', 'two_factor_secret', 'two_factor_recovery_codes', 'remember_token'])] -class User extends Authenticatable implements PasskeyUser, MustVerifyEmail +class User extends Authenticatable implements MustVerifyEmail, PasskeyUser { /** @use HasFactory */ use HasFactory, Notifiable, PasskeyAuthenticatable, TwoFactorAuthenticatable; diff --git a/database/migrations/2026_09_10_192513_create_teams_table.php b/database/migrations/2026_09_10_192513_create_teams_table.php index 1ad28ad..7544d53 100644 --- a/database/migrations/2026_09_10_192513_create_teams_table.php +++ b/database/migrations/2026_09_10_192513_create_teams_table.php @@ -1,6 +1,5 @@