Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix(admin): Admin Area Bootstrap tables (non-sortables) #1026

Merged
merged 6 commits into from
Aug 27, 2024
Merged

Fix(admin): Admin Area Bootstrap tables (non-sortables) #1026

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bf5b413
fix(admin): Sales index updated to bootstrap tables
SpeedyD Aug 23, 2024
3bebbf5
refactor: fix blade formatting
SpeedyD Aug 23, 2024
ecf0a3d
fix(admin): 7 more
SpeedyD Aug 24, 2024
61b8fde
refactor: fix blade formatting
SpeedyD Aug 24, 2024
a0d162a
fix(admin): Uneven files index columns, thanks to @moif for pointing …
SpeedyD Aug 24, 2024
eb2322d
fix(admin): Other fixes I should've done
SpeedyD Aug 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 28 additions & 20 deletions resources/views/admin/files/index.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,28 +33,36 @@
@endif

<div class="text-right mb-3"><a href="#" class="btn btn-outline-primary" id="uploadButton"><i class="fas fa-plus"></i> Upload File</a></div>
<table class="table table-sm">
<thead>
<tr>
<th>Files</th>
<th></th>
</tr>
</thead>
<tbody>
<div class="mb-4 logs-table">
<div class="logs-table-header">
<div class="row">
<div class="col-6 col-md-3">
<div class="logs-table-cell">Files</div>
</div>
<div class="col-6 col-md-3">
SpeedyD marked this conversation as resolved.
Show resolved Hide resolved
<div class="logs-table-cell"></div>
</div>
</div>
</div>
<div class="logs-table-body">
@foreach ($files as $file)
<tr>
<td>
<a href="{{ asset('files/' . ($folder ? $folder . '/' : '') . $file) }}">{{ $file }}</a>
</td>
<td class="text-right">
<a href="#" class="btn btn-outline-primary btn-sm move-file" data-name="{{ $file }}" data-folder="{{ $folder }}">Move</a>
<a href="#" class="btn btn-outline-primary btn-sm rename-file" data-name="{{ $file }}" data-folder="{{ $folder }}">Rename</a>
<a href="#" class="btn btn-outline-danger btn-sm delete-file" data-name="{{ $file }}" data-folder="{{ $folder }}">Delete</a>
</td>
</tr>
<div class="logs-table-row">
<div class="row flex-wrap">
<div class="col-6 col-md-3">
<div class="logs-table-cell"><a href="{{ asset('files/' . ($folder ? $folder . '/' : '') . $file) }}">{{ $file }}</a></div>
</div>
<div class="col-6 col-md-3">
<div class="logs-table-cell text-right">
<a href="#" class="btn btn-outline-primary btn-sm move-file" data-name="{{ $file }}" data-folder="{{ $folder }}">Move</a>
<a href="#" class="btn btn-outline-primary btn-sm rename-file" data-name="{{ $file }}" data-folder="{{ $folder }}">Rename</a>
<a href="#" class="btn btn-outline-danger btn-sm delete-file" data-name="{{ $file }}" data-folder="{{ $folder }}">Delete</a>
</div>
</div>
</div>
</div>
@endforeach
</tbody>
</table>
</div>
</div>

@if ($folder && !count($files))
<div class="modal fade" id="editFolderModal" tabindex="-1" role="dialog">
Expand Down
52 changes: 36 additions & 16 deletions resources/views/admin/logs.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,43 @@
</div>

{!! $logs->render() !!}
<table class="table table-sm">
<thead>
<th>Staff</th>
<th>Action</th>
<th>Action Details</th>
<th>Date</th>
</thead>
<tbody>
<div class="mb-4 logs-table">
<div class="logs-table-header">
<div class="row">
<div class="col-6 col-md-3">
<div class="logs-table-cell">Staff</div>
</div>
<div class="col-6 col-md-3">
<div class="logs-table-cell">Action</div>
</div>
<div class="col-6 col-md-3">
<div class="logs-table-cell">Action Details</div>
</div>
<div class="col-6 col-md-3">
<div class="logs-table-cell">Date</div>
</div>
</div>
</div>
<div class="logs-table-body">
@foreach ($logs as $log)
<tr>
<td>{!! $log->user->displayName !!}</td>
<td>{!! $log->action !!}</td>
<td>{!! $log->action_details !!}</td>
<td>{!! format_date($log->created_at) !!} ({!! pretty_date($log->created_at) !!})</td>
</tr>
<div class="logs-table-row">
<div class="row flex-wrap">
<div class="col-6 col-md-3">
<div class="logs-table-cell">{!! $log->user->displayName !!}</div>
</div>
<div class="col-6 col-md-3">
<div class="logs-table-cell">{!! $log->action !!}</div>
</div>
<div class="col-6 col-md-3">
<div class="logs-table-cell">{!! $log->action_details !!}</div>
</div>
<div class="col-6 col-md-3">
<div class="logs-table-cell">{!! format_date($log->created_at) !!} ({!! pretty_date($log->created_at) !!})</div>
</div>
</div>
</div>
@endforeach
</tbody>
</table>
</div>
</div>
{!! $logs->render() !!}
@endsection
44 changes: 30 additions & 14 deletions resources/views/admin/loot_tables/_roll_loot_table.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,41 @@
<p>You rolled {{ $quantity }} time{{ $quantity != 1 ? 's' : '' }} for the following:</p>
<table class="table table-sm table-striped">
<thead>
<th>#</th>
<th>Reward</th>
<th>Quantity</th>
</thead>
<tbody>
<div class="mb-4 logs-table table-striped">
<div class="logs-table-header">
<div class="row">
<div class="col-xs-1" style="width:100px;">
<div class="logs-table-cell text-center">#</div>
</div>
<div class="col-6 col-md-3">
<div class="logs-table-cell">Reward</div>
</div>
<div class="col-5 col-md-3">
<div class="logs-table-cell">Quantity</div>
</div>
</div>
</div>
<div class="logs-table-body">
<?php $count = 1; ?>
@foreach ($results as $result)
@foreach ($result as $type)
@if (count($type))
@foreach ($type as $t)
<tr>
<td>{{ $count++ }}</td>
<td>{!! $t['asset']->displayName !!}</td>
<td>{{ $t['quantity'] }}</td>
</tr>
<div class="logs-table-row">
<div class="row flex-wrap">
<div class="col-xs-1" style="width:100px;">
<div class="logs-table-cell text-center">{{ $count++ }}</div>
</div>
<div class="col-6 col-md-3">
<div class="logs-table-cell">{!! $t['asset']->displayName !!}</div>
</div>
<div class="col-6 col-md-3">
<div class="logs-table-cell">{{ $t['quantity'] }}</div>
</div>
</div>
</div>
@endforeach
@endif
@endforeach
@endforeach
</tbody>
</table>
</div>
</div>
<p>Note: "None" results are not shown in this table.</p>
198 changes: 112 additions & 86 deletions resources/views/admin/raffle/ticket_index.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,20 +35,32 @@
<div class="card mb-3">
<div class="card-header h3">Winner(s)</div>
<div class="table-responsive">
<table class="table table-sm mb-0">
<thead>
<th class="col-xs-1 text-center" style="width:100px;">#</th>
<th>User</th>
</thead>
<tbody>
<div class="mb-4 logs-table mb-0">
<div class="logs-table-header">
<div class="row">
<div class="col-xs-1" style="max-width:100px;">
<div class="logs-table-cell text-center">#</div>
</div>
<div class="col-6 col-md-3">
<div class="logs-table-cell text-left">User</div>
</div>
</div>
</div>
<div class="logs-table-body">
@foreach ($raffle->tickets()->winners()->get() as $winner)
<tr>
<td class="text-center">{{ $winner->position }}</td>
<td class="text-left">{!! $winner->displayHolderName !!}</td>
</tr>
<div class="logs-table-row">
<div class="row flex-wrap">
<div class="col-xs-1" style="max-width:100px;">
<div class="logs-table-cell text-center">{{ $winner->position }}</div>
</div>
<div class="col-6 col-md-3">
<div class="logs-table-cell text-left">{!! $winner->displayHolderName !!}</div>
</div>
</div>
</div>
@endforeach
</tbody>
</table>
</div>
</div>
</div>
</div>
@endif
Expand All @@ -57,90 +69,104 @@

<div class="text-right">{!! $tickets->render() !!}</div>
<div class="table-responsive">
<table class="table table-sm">
<thead>
<th class="col-xs-1 text-center" style="width:100px;">#</th>
<th>User</th>
@if ($raffle->is_active < 2)
<th></th>
@endif
</thead>
<tbody>
@foreach ($tickets as $count => $ticket)
<tr>
<td class="text-center">{{ $page * 200 + $count + 1 }}</td>
<td>{!! $ticket->displayHolderName !!}</td>
@if ($raffle->is_active < 2)
<td class="text-right">{!! Form::open(['url' => 'admin/raffles/view/ticket/delete/' . $ticket->id]) !!}{!! Form::submit('Delete', ['class' => 'btn btn-danger btn-sm']) !!}{!! Form::close() !!}</td>
@endif
</tr>
@endforeach
</tbody>
</table>
</div>
<div class="text-right">{!! $tickets->render() !!}</div>

<div class="modal fade" id="raffle-modal" tabindex="-1" role="dialog">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<span class="modal-title h5 mb-0">Add Tickets</span>
<button type="button" class="close" data-dismiss="modal">&times;</button>
</div>
<div class="modal-body">
<p>Select an on-site user or enter an off-site username, as well as the number of tickets to create for them. Any created tickets are in addition to any pre-existing tickets for the user(s).</p>
{!! Form::open(['url' => 'admin/raffles/view/ticket/' . $raffle->id]) !!}
<div id="ticketList">
</div>
<div><a href="#" class="btn btn-primary" id="add-ticket">Add Ticket</a></div>
<div class="text-right">
{!! Form::submit('Add', ['class' => 'btn btn-primary']) !!}
<div class="mb-4 logs-table">
<div class="logs-table-header">
<div class="row">
<div class="col-xs-1 text-center" style="width:100px;">
<div class="logs-table-cell">#</div>
</div>
{!! Form::close() !!}
<div class="ticket-row hide mb-2">
{!! Form::select('user_id[]', $users, null, ['class' => 'form-control mr-2 user-select', 'placeholder' => 'Select User']) !!}
{!! Form::text('alias[]', null, ['class' => 'form-control mr-2', 'placeholder' => 'OR Enter Alias']) !!}
{!! Form::number('ticket_count[]', null, ['class' => 'form-control mr-2', 'placeholder' => 'Ticket Count']) !!}
<a href="#" class="remove-ticket btn btn-danger mb-2">×</a>
<div class="col-6 col-md-3">
<div class="logs-table-cell">User</div>
</div>
@if ($raffle->is_active < 2)
<div class="col-6 col-md-3">
<div class="logs-table-cell">User</div>
</div>
@endif
</div>
<div class="logs-table-body">
@foreach ($tickets as $count => $ticket)
<div class="logs-table-row">
<div class="row flex-wrap">
<div class="col-6 col-md-3">
<div class="logs-table-cell text-center">{{ $page * 200 + $count + 1 }}</div>
<div class="col-6 col-md-3">
<div class="logs-table-cell">{!! $ticket->displayHolderName !!}</div>
</div>
@if ($raffle->is_active < 2)
<div class="col-6 col-md-3">
<div class="logs-table-cell text-right">{!! Form::open(['url' => 'admin/raffles/view/ticket/delete/' . $ticket->id]) !!}{!! Form::submit('Delete', ['class' => 'btn btn-danger btn-sm']) !!}{!! Form::close() !!}</div>
</div>
@endif
</div>
</div>
@endforeach
</div>
</div>
</div>
</div>
@endsection
@section('scripts')
@parent
<script>
$('.edit-tickets').on('click', function(e) {
e.preventDefault();
$('#raffle-modal').modal('show');
});
<div class="text-right">{!! $tickets->render() !!}</div>

$(document).ready(function() {
$('#add-ticket').on('click', function(e) {
<div class="modal fade" id="raffle-modal" tabindex="-1" role="dialog">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<span class="modal-title h5 mb-0">Add Tickets</span>
<button type="button" class="close" data-dismiss="modal">&times;</button>
</div>
<div class="modal-body">
<p>Select an on-site user or enter an off-site username, as well as the number of tickets to create for them. Any created tickets are in addition to any pre-existing tickets for the user(s).</p>
{!! Form::open(['url' => 'admin/raffles/view/ticket/' . $raffle->id]) !!}
<div id="ticketList">
</div>
<div><a href="#" class="btn btn-primary" id="add-ticket">Add Ticket</a></div>
<div class="text-right">
{!! Form::submit('Add', ['class' => 'btn btn-primary']) !!}
</div>
{!! Form::close() !!}
<div class="ticket-row hide mb-2">
{!! Form::select('user_id[]', $users, null, ['class' => 'form-control mr-2 user-select', 'placeholder' => 'Select User']) !!}
{!! Form::text('alias[]', null, ['class' => 'form-control mr-2', 'placeholder' => 'OR Enter Alias']) !!}
{!! Form::number('ticket_count[]', null, ['class' => 'form-control mr-2', 'placeholder' => 'Ticket Count']) !!}
<a href="#" class="remove-ticket btn btn-danger mb-2">×</a>
</div>
</div>
</div>
</div>
</div>
@endsection
@section('scripts')
@parent
<script>
$('.edit-tickets').on('click', function(e) {
e.preventDefault();
addTicketRow();
$('#raffle-modal').modal('show');
});
$('.remove-ticket').on('click', function(e) {
e.preventDefault();
removeTicketRow($(this));
})

function addTicketRow() {
var $clone = $('.ticket-row').clone();
$('#ticketList').append($clone);
$clone.removeClass('hide ticket-row');
$clone.addClass('d-flex');
$clone.find('.remove-ticket').on('click', function(e) {
$(document).ready(function() {
$('#add-ticket').on('click', function(e) {
e.preventDefault();
addTicketRow();
});
$('.remove-ticket').on('click', function(e) {
e.preventDefault();
removeTicketRow($(this));
})
$clone.find('.user-select').selectize();
}

function removeTicketRow($trigger) {
$trigger.parent().remove();
}
});
</script>
@endsection
function addTicketRow() {
var $clone = $('.ticket-row').clone();
$('#ticketList').append($clone);
$clone.removeClass('hide ticket-row');
$clone.addClass('d-flex');
$clone.find('.remove-ticket').on('click', function(e) {
e.preventDefault();
removeTicketRow($(this));
})
$clone.find('.user-select').selectize();
}

function removeTicketRow($trigger) {
$trigger.parent().remove();
}
});
</script>
@endsection
Loading