Merge branch 'main' of https://github.com/Thomasluigi07/MORBLOX-WEBSITE
This commit is contained in:
Thomas G
commit
ff367c2cfa
|
|
@ -433,9 +433,24 @@ br {
|
|||
border-radius: 50%;
|
||||
margin: -8px;
|
||||
}
|
||||
.NewPanel .hidden-info{
|
||||
.NewPanel .info-hidden {
|
||||
font-style: italic;
|
||||
}
|
||||
.NewPanel .info-error {
|
||||
color: #ff3300;
|
||||
font-style: italic;
|
||||
cursor: not-allowed;
|
||||
-webkit-touch-callout: none;
|
||||
-webkit-user-select: none;
|
||||
-khtml-user-select: none;
|
||||
-moz-user-select: none;
|
||||
-ms-user-select: none;
|
||||
user-select: none;
|
||||
}
|
||||
.NewPanel .info-email {
|
||||
color: #c9c9c9;
|
||||
}
|
||||
|
||||
/*Heavily based off of the roblox developer tree list (because it looks cool)*/
|
||||
.NewPanel .SearchTree {
|
||||
width: 260px;
|
||||
|
|
|
|||
|
|
@ -48,13 +48,19 @@
|
|||
<div class="text-secondary">
|
||||
Username:
|
||||
</div>
|
||||
<a href="@if (!empty($user->id)) {{ route('profile', $user->id) }} @else # @endif" title="@if (!empty($user->name)) {{ $user->name }}'s profile @else N/A @endif" class="AuthenticatedUserName">
|
||||
@if (!empty($user->id))
|
||||
<a href="{{ route('profile', $user->id) }}" title="{{ $user->name }}'s profile" class="AuthenticatedUserName">
|
||||
@if (!empty($user->name)) {{ $user->name }} @else N/A @endif
|
||||
</a>
|
||||
@unless (request()->query('q'))
|
||||
<a href="/admin/users?q=@if (!empty($user->id)) {{ $user->id }}@else N/A @endif&searchBy=id" title="@if (!empty($user->name)) {{ $user->name }}@else N/A @endif's Details" class="AuthenticatedUserName userInfo"></a>
|
||||
<a href="/admin/users?q={{ $user->id }}&searchBy=id" title="{{ $user->name }}'s Details" class="AuthenticatedUserName userInfo"></a>
|
||||
@endunless
|
||||
<a href="/admin/tree?q=@if (!empty($user->id)) {{ $user->id }}@else N/A @endif&searchBy=id" title="@if (!empty($user->name)) {{ $user->name }}@else N/A @endif's Invite Tree" class="forwardArrow AuthenticatedUserName"></a>
|
||||
<a href="/admin/tree?q={{ $user->id }}&searchBy=id" title="{{ $user->name }}'s Invite Tree" class="forwardArrow AuthenticatedUserName"></a>
|
||||
@else
|
||||
<a title="N/A" class="info-error">
|
||||
N/A
|
||||
</a>
|
||||
@endif
|
||||
</div>
|
||||
@if ($user->settings->changed_name)
|
||||
<div class="Row">
|
||||
|
|
@ -70,18 +76,28 @@
|
|||
<div class="text-secondary">
|
||||
ID:
|
||||
</div>
|
||||
@if (!empty($user->id))
|
||||
<div class="text-secondary">
|
||||
@if (!empty($user->id)) {{ $user->id }}@else N/A @endif
|
||||
{{ $user->id }}
|
||||
</div>
|
||||
@else
|
||||
<div class="info-error">
|
||||
N/A
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
<div class="Row">
|
||||
<div class="text-secondary">
|
||||
Email:
|
||||
</div>
|
||||
@if ($user->admin)
|
||||
<div class="text-secondary hidden-info">[Hidden]</div>
|
||||
<div class="text-secondary info-hidden">[Hidden]</div>
|
||||
@else
|
||||
@if (!empty($user->email)) {{ $user->email }}@else N/A @endif
|
||||
@if (!empty($user->email))
|
||||
<div class="text-secondary info-email">{{ $user->email }}</div>
|
||||
@else
|
||||
<div class="text-secondary info-error">N/A</div>
|
||||
@endif
|
||||
@endif
|
||||
</div>
|
||||
<div class="Row">
|
||||
|
|
@ -89,13 +105,17 @@
|
|||
DOB:
|
||||
</div>
|
||||
@if ($user->admin)
|
||||
<div class="text-secondary hidden-info">[Hidden]</div>
|
||||
<div class="text-secondary info-hidden">[Hidden]</div>
|
||||
@else
|
||||
@if (!empty($user->dob))
|
||||
@guest
|
||||
@if (!empty($user->dob)) <div class="text-secondary">{{ Carbon\Carbon::parse($user->dob)->format('d/m/Y') }}</div> @else N/A @endif
|
||||
<div class="text-secondary">{{ Carbon\Carbon::parse($user->dob)->format('d/m/Y') }}</div>
|
||||
@else
|
||||
@if (!empty($user->dob)) <div class="text-secondary">{{ Carbon\Carbon::parse($user->dob)->format(Auth::user()->settings->date_preference) }}</div> @else N/A @endif
|
||||
<div class="text-secondary">{{ Carbon\Carbon::parse($user->dob)->format(Auth::user()->settings->date_preference) }}</div>
|
||||
@endguest
|
||||
@else
|
||||
<div class="info-error">N/A</div>
|
||||
@endif
|
||||
@endif
|
||||
</div>
|
||||
<div class="Row">
|
||||
|
|
@ -114,9 +134,15 @@
|
|||
<div class="text-secondary">
|
||||
Bio :
|
||||
</div>
|
||||
@if (!empty($user->blurb))
|
||||
<div class="text-secondary">
|
||||
@if (!empty($user->blurb)) {!! nl2br(e($user->blurb)) !!} @else N/A @endif
|
||||
{!! nl2br(e($user->blurb)) !!}
|
||||
</div>
|
||||
@else
|
||||
<div class="info-error">
|
||||
N/A
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
<div class="Row">
|
||||
<div class="text-secondary">
|
||||
|
|
@ -150,48 +176,51 @@
|
|||
{{ sizeof($user->badges) }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="Row hidden">
|
||||
<div class="text-secondary">
|
||||
Place Visits:
|
||||
</div>
|
||||
<div class="text-secondary">
|
||||
TODO
|
||||
</div>
|
||||
</div>
|
||||
<div class="Row">
|
||||
<div class="text-secondary">
|
||||
Join Date:
|
||||
</div>
|
||||
@if (!empty($user->created_at))
|
||||
<div class="text-secondary">
|
||||
@guest
|
||||
@if (!empty($user->created_at)) {{ $user->created_at->format('d/m/Y') }} @else N/A @endif
|
||||
{{ $user->created_at->format('d/m/Y') }}
|
||||
@else
|
||||
@if (!empty($user->created_at)) {{ $user->created_at->format(Auth::user()->settings->date_preference) }} @else N/A @endif
|
||||
{{ $user->created_at->format(Auth::user()->settings->date_preference) }}
|
||||
@endguest
|
||||
</div>
|
||||
@else
|
||||
<div class="info-error">
|
||||
N/A
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
@unless (Cache::has('is_online_' . $user->id))
|
||||
<div class="Row">
|
||||
@unless (Cache::has('is_online_' . $user->id))
|
||||
<div class="text-secondary">
|
||||
Last Seen:
|
||||
</div>
|
||||
<div class="text-secondary">
|
||||
{{ Carbon\Carbon::parse($user->last_seen)->diffForHumans() }}
|
||||
</div>
|
||||
@endunless
|
||||
</div>
|
||||
@endunless
|
||||
<div class="Row">
|
||||
<!-- Note to Tersis/Conkley, please revert this change sooner or later. I'm tired and might fix the !empty issue later. -->
|
||||
<div class="text-secondary">
|
||||
Invited By
|
||||
</div>
|
||||
<a href="#" class="AuthenticatedUserName">
|
||||
N/A
|
||||
@if (!empty($user->id))
|
||||
<a href="{{ route('profile', App\Models\User::where('id', $user->invited_by)->first()->id) }}" title="{{ App\Models\User::where('id', $user->invited_by)->first()->name }}'s Profile" class="AuthenticatedUserName">
|
||||
{{ App\Models\User::where('id', $user->invited_by)->first()->name }}
|
||||
</a>
|
||||
@unless (request()->query('q'))
|
||||
<a href="/admin/users?q=1&searchBy=id" title="N/A" class="AuthenticatedUserName userInfo"></a>
|
||||
<a href="/admin/users?q={{ App\Models\User::where('id', $user->invited_by)->first()->id }}&searchBy=id" title="View {{ App\Models\User::where('id', $user->invited_by)->first()->name }}'s Details" class="AuthenticatedUserName userInfo"></a>
|
||||
@endunless
|
||||
<a href="/admin/tree?q=1&searchBy=id" title="N/A" class="forwardArrow AuthenticatedUserName"></a>
|
||||
<a href="/admin/tree?q={{ App\Models\User::where('id', $user->invited_by)->first()->id }}&searchBy=id" title="{{ App\Models\User::where('id', $user->invited_by)->first()->name }}'s Invite Tree" class="forwardArrow AuthenticatedUserName"></a>
|
||||
@else
|
||||
<div class="info-error">
|
||||
N/A
|
||||
</a>
|
||||
@endif
|
||||
</div>
|
||||
<div class="Row">
|
||||
<div class="text-secondary">
|
||||
|
|
|
|||
Loading…
Reference in New Issue