mirror/UNIT3D-Community-Edition
1
0
Fork 0
mirror of https://github.com/HDInnovations/UNIT3D-Community-Edition.git synced 2026-04-29 23:09:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

(Update) Invites System

Browse Source 
- Master Invites Log and User Invite Tree are now fluid, paginated and
show user group, color and icon.
This commit is contained in:
HDVinnie
2018-08-21 12:59:15 -04:00
parent b7b4572447
commit acc65a4fb7
3 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/InviteController.php
+2 -2
View File
@@ -129,10 +129,10 @@ class InviteController extends Controller
{
if (auth()->user()->group->is_modo) {
$user = User::findOrFail($id);
$records = Invite::with('sender')->where('user_id', $user->id)->latest()->get();
$records = Invite::with('sender', 'receiver')->where('user_id', $user->id)->latest()->paginate(25);
} else {
$user = auth()->user();
$records = Invite::with('sender')->where('user_id', $user->id)->latest()->get();
$records = Invite::with('sender', 'receiver')->where('user_id', $user->id)->latest()->paginate(25);
}
return view('user.invitetree', ['user' => $user, 'records' => $records]);
}
resources/views/Staff/invites/index.blade.php
+12 -8
View File
@@ -22,7 +22,7 @@
@endsection
@section('content')
<div class="container">
<div class="container-fluid">
<div class="block">
<h2>Invites Log</h2>
<hr>
@@ -50,9 +50,11 @@
@foreach($invites as $invite)
<tr>
<td>
<a class="view-user" data-id="{{ $invite->sender->id }}"
data-slug="{{ $invite->sender->username }}"
href="{{ route('profile', ['username' => $invite->sender->username, 'id' => $invite->sender->id]) }}">{{ $invite->sender->username }}</a>
<a href="{{ route('profile', ['username' => $invite->sender->username, 'id' => $invite->sender->id]) }}">
<span class="text-bold" style="color: {{ $invite->sender->group->color }}">
<i class="{{ $invite->sender->group->icon }}"></i> {{ $invite->sender->username }}
</span>
</a>
</td>
<td>
{{ $invite->email }}
@@ -67,10 +69,12 @@
{{ $invite->expires_on }}
</td>
<td>
@if($invite->accepted_by != null)
<a class="view-user" data-id="{{ $invite->receiver->id }}"
data-slug="{{ $invite->receiver->username }}"
href="{{ route('profile', ['username' => $invite->receiver->username, 'id' => $invite->receiver->id]) }}">{{ $invite->receiver->username }}</a>
@if($invite->accepted_by != null && $invite->accepted_by != 1)
<a href="{{ route('profile', ['username' => $invite->receiver->username, 'id' => $invite->receiver->id]) }}">
<span class="text-bold" style="color: {{ $invite->receiver->group->color }}">
<i class="{{ $invite->receiver->group->icon }}"></i> {{ $invite->receiver->username }}
</span>
</a>
@else
N/A
@endif
resources/views/user/invitetree.blade.php
+15 -8
View File
@@ -13,7 +13,7 @@
@endsection
@section('content')
<div class="container">
<div class="container-fluid">
<div class="block">
<h2><a class="view-user" data-id="{{ $user->id }}" data-slug="{{ $user->username }}"
href="{{ route('profile', ['username' => $user->username, 'id' => $user->id]) }}">{{ $user->username }}</a>
@@ -42,9 +42,11 @@
@foreach($records as $record)
<tr>
<td>
<a class="view-user" data-id="{{ $record->sender->id }}"
data-slug="{{ $record->sender->username }}"
href="{{ route('profile', ['username' => $record->sender->username, 'id' => $record->sender->id]) }}">{{ $record->sender->username }}</a>
<a href="{{ route('profile', ['username' => $record->sender->username, 'id' => $record->sender->id]) }}">
<span class="text-bold" style="color: {{ $record->sender->group->color }}">
<i class="{{ $record->sender->group->icon }}"></i> {{ $record->sender->username }}
</span>
</a>
</td>
<td>
{{ $record->email }}
@@ -59,10 +61,12 @@
{{ $record->expires_on }}
</td>
<td>
@if($record->accepted_by != null)
<a class="view-user" data-id="{{ $record->receiver->id }}"
data-slug="{{ $record->receiver->username }}"
href="{{ route('profile', ['username' => $record->receiver->username, 'id' => $record->receiver->id]) }}">{{ $record->receiver->username }}</a>
@if($record->accepted_by != null && $record->accepted_by != 1)
<a href="{{ route('profile', ['username' => $record->receiver->username, 'id' => $record->receiver->id]) }}">
<span class="text-bold" style="color: {{ $record->receiver->group->color }}">
<i class="{{ $record->receiver->group->icon }}"></i> {{ $record->receiver->username }}
</span>
</a>
@else
N/A
@endif
@@ -79,6 +83,9 @@
@endif
</tbody>
</table>
<div class="text-center">
{{ $records->links() }}
</div>
</div>
</div>
</div>