format
CI/CD / test_and_check_app (push) Failing after 8s
CI/CD / Publish immutable image (push) Skipped

This commit is contained in:
2026-09-19 13:41:12 +02:00
parent ff74d34efd
commit 119f825cbf
6 changed files with 65 additions and 30 deletions
-8
View File
@@ -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
+12 -7
View File
@@ -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<int, \App\Models\User> $members
* @property CarbonImmutable|null $created_at
* @property CarbonImmutable|null $updated_at
* @property-read Collection<int, TeamInvite> $invites
* @property-read int|null $invites_count
* @property-read TeamMember|null $pivot
* @property-read Collection<int, User> $members
* @property-read int|null $members_count
*
* @method static Builder<static>|Team newModelQuery()
* @method static Builder<static>|Team newQuery()
* @method static Builder<static>|Team query()
* @method static Builder<static>|Team visibleTo(\App\Models\User $user)
* @method static Builder<static>|Team scopeVisibleTo(\App\Models\User $user)
* @method static Builder<static>|Team whereCreatedAt($value)
* @method static Builder<static>|Team whereCreatedBy($value)
* @method static Builder<static>|Team whereId($value)
* @method static Builder<static>|Team whereName($value)
* @method static Builder<static>|Team whereRequire2fa($value)
* @method static Builder<static>|Team whereSlug($value)
* @method static Builder<static>|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);
+30
View File
@@ -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<int, DatabaseNotification> $notifications
* @property-read int|null $notifications_count
* @property-read Team $team
*
* @method static Builder<static>|TeamInvite findByPlainToken(string $token)
* @method static Builder<static>|TeamInvite newModelQuery()
* @method static Builder<static>|TeamInvite newQuery()
* @method static Builder<static>|TeamInvite query()
* @method static Builder<static>|TeamInvite whereCreatedAt($value)
* @method static Builder<static>|TeamInvite whereId($value)
* @method static Builder<static>|TeamInvite whereInviteToken($value)
* @method static Builder<static>|TeamInvite whereInvitedByUserId($value)
* @method static Builder<static>|TeamInvite whereInvitedEmail($value)
* @method static Builder<static>|TeamInvite whereTeamId($value)
* @method static Builder<static>|TeamInvite whereUpdatedAt($value)
*
* @mixin \Eloquent
*/
#[Fillable(['team_id', 'invited_by_user_id', 'invited_email'])]
class TeamInvite extends Model
{
+5 -3
View File
@@ -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<static>|TeamMember newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder<static>|TeamMember newQuery()
* @method static \Illuminate\Database\Eloquent\Builder<static>|TeamMember query()
@@ -20,6 +21,7 @@ use Illuminate\Database\Eloquent\Relations\Pivot;
* @method static \Illuminate\Database\Eloquent\Builder<static>|TeamMember whereTeamId($value)
* @method static \Illuminate\Database\Eloquent\Builder<static>|TeamMember whereUpdatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder<static>|TeamMember whereUserId($value)
*
* @mixin \Eloquent
*/
class TeamMember extends Pivot
+18 -11
View File
@@ -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<int, \Illuminate\Notifications\DatabaseNotification> $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<int, DatabaseNotification> $notifications
* @property-read int|null $notifications_count
* @property-read \Illuminate\Database\Eloquent\Collection<int, \Laravel\Passkeys\Passkey> $passkeys
* @property-read Collection<int, Passkey> $passkeys
* @property-read int|null $passkeys_count
* @property-read \App\Models\TeamMember|null $pivot
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Team> $teams
* @property-read TeamMember|null $pivot
* @property-read Collection<int, Team> $teams
* @property-read int|null $teams_count
*
* @method static \Database\Factories\UserFactory factory($count = null, $state = [])
* @method static \Illuminate\Database\Eloquent\Builder<static>|User newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder<static>|User newQuery()
@@ -48,11 +54,12 @@ use Laravel\Fortify\TwoFactorAuthenticatable;
* @method static \Illuminate\Database\Eloquent\Builder<static>|User whereTwoFactorRecoveryCodes($value)
* @method static \Illuminate\Database\Eloquent\Builder<static>|User whereTwoFactorSecret($value)
* @method static \Illuminate\Database\Eloquent\Builder<static>|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<UserFactory> */
use HasFactory, Notifiable, PasskeyAuthenticatable, TwoFactorAuthenticatable;
@@ -1,6 +1,5 @@
<?php
use App\Models\User;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;