Skip to content

Commit e8c2306

Browse files
authored
Merge pull request #31 from artisan-build/get-hallway-stuff-working
Get hallway stuff working
2 parents 4002fca + 589ddb5 commit e8c2306

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1925
-203
lines changed

app/Models/User.php

+11
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
namespace App\Models;
44

5+
use App\States\UserState;
6+
use ArtisanBuild\Adverbs\Traits\HasVerbsState;
7+
use ArtisanBuild\Hallway\Members\Models\Member;
8+
use ArtisanBuild\Hallway\Members\Traits\HasHallwayMembership;
59
use ArtisanBuild\Till\Traits\Tillable;
610
use ArtisanBuild\Verbstream\Traits\HasProfilePhoto;
711
use ArtisanBuild\Verbstream\Traits\HasTeams;
@@ -70,18 +74,25 @@
7074
* @method static Builder<static>|User whereTwoFactorSecret($value)
7175
* @method static Builder<static>|User whereUpdatedAt($value)
7276
*
77+
* @property-read Collection<int, Member> $hallway_members
78+
* @property-read int|null $hallway_members_count
79+
*
7380
* @mixin Eloquent
7481
*/
7582
class User extends Authenticatable implements MustVerifyEmail
7683
{
7784
use HasApiTokens;
7885
use HasFactory;
86+
use HasHallwayMembership;
7987
use HasProfilePhoto;
8088
use HasTeams;
89+
use HasVerbsState;
8190
use Notifiable;
8291
use Tillable;
8392
use TwoFactorAuthenticatable;
8493

94+
protected string $state_class = UserState::class;
95+
8596
protected $fillable = [
8697
'name',
8798
'email',

composer.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
"artisan-build/fat-enums": "*",
1818
"artisan-build/flux-themes": "*",
1919
"artisan-build/gh": "*",
20+
"artisan-build/hallway-core": "*",
21+
"artisan-build/hallway-flux": "*",
2022
"artisan-build/kibble": "*",
2123
"artisan-build/marketing": "*",
2224
"artisan-build/marketing-mailcoach": "*",
@@ -27,7 +29,7 @@
2729
"artisan-build/verbs-flux": "^0.1.0",
2830
"artisan-build/verbstream": "*",
2931
"internachi/modular": "^2.2",
30-
"laravel/framework": "^11.31",
32+
"laravel/framework": "11.42.0",
3133
"laravel/sanctum": "^4.0",
3234
"laravel/tinker": "^2.9",
3335
"livewire/livewire": "^3.0"

0 commit comments

Comments
 (0)