From 8e0a66247d5739de903def9720ad955088456207 Mon Sep 17 00:00:00 2001 From: Graphictoria Date: Sat, 30 Jul 2022 21:09:47 -0400 Subject: [PATCH] Going to start working on friends, almost done with the catalog. --- web/app/Models/AssetVersion.php | 5 +++ web/app/Models/User.php | 11 +++++- web/app/Models/asset.php | 2 +- web/resources/js/components/Comments.js | 1 + web/resources/views/layouts/nav.blade.php | 41 +++++++++++++++++++---- 5 files changed, 51 insertions(+), 9 deletions(-) diff --git a/web/app/Models/AssetVersion.php b/web/app/Models/AssetVersion.php index 7cd36cf..3e23fa1 100644 --- a/web/app/Models/AssetVersion.php +++ b/web/app/Models/AssetVersion.php @@ -8,4 +8,9 @@ use Illuminate\Database\Eloquent\Model; class AssetVersion extends Model { use HasFactory; + + public function asset() + { + return $this->belongsTo(Asset::class, 'parentAsset'); + } } diff --git a/web/app/Models/User.php b/web/app/Models/User.php index 02c9b56..1fad0da 100644 --- a/web/app/Models/User.php +++ b/web/app/Models/User.php @@ -6,9 +6,12 @@ use Illuminate\Contracts\Auth\MustVerifyEmail; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Notifications\Notifiable; -use App\Notifications\ResetPasswordNotification; +use Illuminate\Support\Facades\Auth; use Laravel\Sanctum\HasApiTokens; +use App\Notifications\ResetPasswordNotification; +use App\Models\Friend; + class User extends Authenticatable implements MustVerifyEmail { use HasApiTokens, HasFactory, Notifiable; @@ -56,4 +59,10 @@ class User extends Authenticatable implements MustVerifyEmail $this->notify(new ResetPasswordNotification($url, $this)); } + + public function getFriendRequests() + { + return Friend::where('receiver_id', Auth::user()->id) + ->where('accepted', false); + } } diff --git a/web/app/Models/asset.php b/web/app/Models/asset.php index e7c2242..97475cf 100644 --- a/web/app/Models/asset.php +++ b/web/app/Models/asset.php @@ -155,7 +155,7 @@ class Asset extends Model public function getContent($version = 0) { if($version === 0) - return $this->latestVersion()->contentURL; + return $this->latestVersion->contentURL; $assetVersion = AssetVersion::where('parentAsset', $this->id) ->where('localVersion', $version) diff --git a/web/resources/js/components/Comments.js b/web/resources/js/components/Comments.js index 779b320..6824b46 100644 --- a/web/resources/js/components/Comments.js +++ b/web/resources/js/components/Comments.js @@ -14,6 +14,7 @@ class Comments extends Component { return ( <>

Comments

+ { /* TODO: XlXi: Hide comment input when logged out*/ }
diff --git a/web/resources/views/layouts/nav.blade.php b/web/resources/views/layouts/nav.blade.php index bd3cfdb..a504409 100644 --- a/web/resources/views/layouts/nav.blade.php +++ b/web/resources/views/layouts/nav.blade.php @@ -1,6 +1,7 @@ @php - // TODO: load from website configuration? - $routes = [ + // TODO: XlXi: load from website configuration? + + $routes = [ [ "label" => "Games", "location" => "games" @@ -13,7 +14,7 @@ "label" => "Forum", "location" => "forum" ] - ] + ]; @endphp
@@ -39,7 +40,6 @@ @live @foreach($routes as $route) @php - // HACK $route = (object)$route; @endphp
  • @@ -49,8 +49,14 @@
  • More
    • @else @@ -62,22 +68,43 @@ @live @auth -
    + +

    {{ \App\Helpers\NumberHelper::Abbreviate(Auth::user()->tokens) }}

    - +

    {{ Auth::user()->username }}