Compare commits

..

1 Commits

Author SHA1 Message Date
dbaugher 6528d10ed0 Remove user nav menu from all tablar header layout variants
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-05-01 17:22:50 -04:00
31 changed files with 81 additions and 303 deletions
-1
View File
@@ -12,4 +12,3 @@ npm-debug.log
/public/rldbadm /public/rldbadm
/stats /stats
/.well-known /.well-known
.DS_Store
+1 -5
View File
@@ -351,11 +351,7 @@ class PagesController extends Controller
public function winnersbyitem() public function winnersbyitem()
{ {
$winnersbyitem_results = WinningBids::with(['items', 'bidders']) $winnersbyitem_results = WinningBids::with(['items', 'bidders'])->get();
->join('items', 'winning_bids.winning_item_num', '=', 'items.iditems')
->orderByRaw('CAST(items.item_assigned_num AS UNSIGNED) ASC')
->select('winning_bids.*')
->get();
return view('winnersbyitem', ['winnersbyitem_results' => $winnersbyitem_results]); return view('winnersbyitem', ['winnersbyitem_results' => $winnersbyitem_results]);
} }
Binary file not shown.

Before

Width:  |  Height:  |  Size: 353 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.1 KiB

-20
View File
@@ -52,26 +52,6 @@ The Laravel framework is open-sourced software licensed under the [MIT license](
## Changelog ## Changelog
### [tablar-theme] - 2026-05-02
#### Added
- **Searchable Dropdowns:** Integrated `TomSelect` across various forms (Checkout, Reprint Receipt, etc.) for enhanced usability.
- **Self-Checkout Flow:** Added a prominent self-checkout link for bidders, integrated with North Embedded Checkout.
- **Pickup Instructions:** Added clear instructions for bidders on the checkout completion page to proceed to the Item Pickup Table.
- **North Checkout Fallback:** Restored the manual "Verify Payment Status" button and enhanced error reporting for digital wallet payments (Google Pay).
#### Fixed
- **Logo Integration:** Corrected logo sizing issues using inline styles to override theme constraints.
- **User Menu:** Restored "Admin" and "Link OIDC Account" entries to match the legacy theme.
- **Manual Checkout:** Fixed broken `/checkout` route by aligning form field names with controller expectations and restoring payment method logic.
- **Data Restoration:** Re-added bidder information and itemized winning lists to the checkout completion views.
#### Changed
- **Expanded Reports:** Standardized `bidderlist`, `showcarlist`, and `checkout_complete_list` to show full contact details (Address, City, State, Zip, Phone, Email).
- **Reporting Enhancements:** Added Year, Make, and Model to the `showcarlist` and included item numbers in the `checkout_complete_list` for improved tracking.
- **UI Cleanup:** Disabled default Tablar footers and notifications across all layout templates to maintain a focused auction interface.
- **Theme Consistency:** Updated various partials to ensure a seamless transition from the previous custom theme to Tablar.
### [bidder-facing-checkout] - 2026-04-24 ### [bidder-facing-checkout] - 2026-04-24
#### Added #### Added
+6 -14
View File
@@ -17,32 +17,24 @@
<div class="col-12"> <div class="col-12">
<div class="card"> <div class="card">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-vcenter card-table text-nowrap"> <table class="table table-vcenter card-table">
<thead> <thead>
<tr> <tr>
<th>#</th> <th>#</th>
<th>Last Name</th> <th>Name</th>
<th>First Name</th>
<th>Address</th>
<th>City</th>
<th>State</th>
<th>Zip</th>
<th>Phone</th> <th>Phone</th>
<th>Email</th> <th>Email</th>
<th>Address</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@foreach($bidderlist_results as $bidder) @foreach($bidderlist_results as $bidder)
<tr> <tr>
<td>{{ $bidder->bidder_assigned_number }}</td> <td>{{ $bidder->bidder_assigned_number }}</td>
<td>{{ $bidder->bidder_lname }}</td> <td>{{ $bidder->bidder_fname }} {{ $bidder->bidder_lname }}</td>
<td>{{ $bidder->bidder_fname }}</td> <td>{{ $bidder->bidder_phone }}</td>
<td>{{ $bidder->bidder_addr }}</td>
<td>{{ $bidder->bidder_city }}</td>
<td>{{ $bidder->bidder_state }}</td>
<td>{{ $bidder->bidder_zip }}</td>
<td>{{ \App\Helpers\PhoneHelper::format($bidder->bidder_phone) }}</td>
<td>{{ $bidder->bidder_email }}</td> <td>{{ $bidder->bidder_email }}</td>
<td>{{ $bidder->bidder_addr }}, {{ $bidder->bidder_city }}</td>
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>
+17 -67
View File
@@ -16,67 +16,33 @@
<div class="col-12"> <div class="col-12">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
@foreach($checkout_info_results as $info)
<form method="POST" action="/checkout" class="row g-3"> <form method="POST" action="/checkout" class="row g-3">
{{ csrf_field() }} {{ csrf_field() }}
<input type="hidden" name="checkoutbiddernum" value="{{ $info->idbidders }}"> <input type="hidden" name="bidder_num" value="{{ $bidder->idbidders }}">
<input type="hidden" name="winnertotal" value="{{ $info->total_cost }}">
<h3 class="mb-3">Winning Items for {{ $info->bidder_fname }} {{ $info->bidder_lname }} (Bidder #{{ $info->bidder_assigned_number }})</h3> <h3 class="mb-3">Winning Items for {{ $bidder->bidder_fname }} {{ $bidder->bidder_lname }}</h3>
<ul class="list-group mb-4">
<div class="table-responsive mb-4"> @foreach($winnings as $item)
<table class="table table-vcenter"> <li class="list-group-item d-flex justify-content-between align-items-center">
<thead> {{ $item->items->item_desc }}
<tr> <span class="badge bg-primary rounded-pill">${{ number_format($item->winning_cost, 2) }}</span>
<th>Item #</th> </li>
<th>Description</th> @endforeach
<th class="text-end">Amount</th> </ul>
</tr>
</thead>
<tbody>
@foreach($checkout_list_results as $item)
<tr>
<td>{{ $item->item_assigned_num }}</td>
<td>{{ $item->item_desc }}</td>
<td class="text-end">${{ number_format($item->winning_cost, 2) }}</td>
</tr>
@endforeach
</tbody>
<tfoot>
<tr>
<th colspan="2" class="text-end">Total Due</th>
<th class="text-end h3">${{ number_format($info->total_cost, 2) }}</th>
</tr>
</tfoot>
</table>
</div>
<div class="col-md-4"> <div class="col-md-4">
<label for="payment_method" class="form-label">Payment Method</label> <label for="payment_method" class="form-label">Payment Method</label>
<select name="checkout_payment_method" id="payment_method" class="form-select" required onchange="togglePaymentFields()"> <select name="payment_method" id="payment_method" class="form-select" required>
{!! \App\Helpers\PaymentMethodSelectList::paymentShowMethods() !!} @foreach($paymentMethods as $pm)
<option value="{{ $pm->pm_id }}">{{ $pm->pm_name }}</option>
@endforeach
</select> </select>
</div> </div>
<div id="check_fields" class="col-md-4" style="display:none;">
<label for="check_number" class="form-label">Check Number</label>
<input type="text" name="check_number" id="check_number" class="form-control">
</div>
<div id="cc_fields" class="col-md-4" style="display:none;">
<label for="cc_transaction" class="form-label">Transaction ID / Last 4</label>
<input type="text" name="cc_transaction" id="cc_transaction" class="form-control">
<input type="hidden" name="cc_amount" value="{{ $info->total_cost }}">
</div>
<div class="col-12 mt-4"> <div class="col-12">
<button type="submit" class="btn btn-success"> <button type="submit" class="btn btn-success">Complete Checkout</button>
<i class="ti ti-check me-2"></i>Complete Checkout
</button>
<a href="/checkout" class="btn btn-link">Cancel and Start Over</a>
</div> </div>
</form> </form>
@endforeach
</div> </div>
</div> </div>
</div> </div>
@@ -84,22 +50,6 @@
</div> </div>
</div> </div>
@endsection @endsection
@include('components.tomselect')
@push('js') @push('js')
<script>
function togglePaymentFields() {
const method = document.getElementById('payment_method').value;
const checkFields = document.getElementById('check_fields');
const ccFields = document.getElementById('cc_fields');
checkFields.style.display = 'none';
ccFields.style.display = 'none';
if (method === '2') { // Check
checkFields.style.display = 'block';
} else if (method === '3') { // Credit Card
ccFields.style.display = 'block';
}
}
</script>
@endpush @endpush
+6 -72
View File
@@ -14,79 +14,13 @@
<div class="container-xl"> <div class="container-xl">
<div class="row row-cards"> <div class="row row-cards">
<div class="col-12"> <div class="col-12">
<div class="card mb-3">
<div class="card-body text-center py-4">
<h2 class="text-success mb-2">Success!</h2>
<p class="text-muted">The checkout has been successfully processed.</p>
<p class="strong text-azure">Please proceed to the Item Pickup Table and show the page below or the pdf receipt on your device!</p>
<div class="mt-3">
<a href="{{ route('receiptpdf', ['checkout_id' => $checkout_result]) }}" class="btn btn-primary" target="_blank">
<i class="ti ti-printer me-2"></i>Print Receipt
</a>
<a href="{{ route('download_receipt', ['checkout_id' => $checkout_result]) }}" class="btn btn-success">
<i class="ti ti-download me-2"></i>Save PDF Receipt
</a>
<a href="/home" class="btn btn-secondary">
<i class="ti ti-dashboard me-2"></i>Back to Dashboard
</a>
</div>
</div>
</div>
@foreach($checkout_info_results as $info)
<div class="card mb-3">
<div class="card-header">
<h3 class="card-title">Bidder Information</h3>
</div>
<div class="card-body">
<div class="row">
<div class="col-md-6">
<p><strong>Name:</strong> {{ $info->bidder_fname }} {{ $info->bidder_lname }}</p>
<p><strong>Bidder Number:</strong> {{ $info->bidder_assigned_number }}</p>
</div>
<div class="col-md-6 text-md-end">
<p><strong>Total Paid:</strong> <span class="h2 text-primary">${{ number_format($info->total_cost, 2) }}</span></p>
<p><strong>Payment Method:</strong>
@if($payment_method == 1) Cash
@elseif($payment_method == 2) Check ({{ $check_number }})
@else Credit Card ({{ $cc_transaction }})
@endif
</p>
</div>
</div>
</div>
</div>
@endforeach
<div class="card"> <div class="card">
<div class="card-header"> <div class="card-body text-center">
<h3 class="card-title">Items Won</h3> <h2 class="card-title">Success!</h2>
</div> <p class="text-muted">The checkout has been successfully processed.</p>
<div class="table-responsive"> <a href="{{ route('receiptpdf', ['checkout_id' => $checkout_result]) }}" class="btn btn-primary" target="_blank">Print Receipt</a>
<table class="table table-vcenter card-table"> <a href="{{ route('download_receipt', ['checkout_id' => $checkout_result]) }}" class="btn btn-success">Save PDF Receipt</a>
<thead> <a href="/home" class="btn btn-secondary">Back to Dashboard</a>
<tr>
<th>Item #</th>
<th>Description</th>
<th class="text-end">Amount</th>
</tr>
</thead>
<tbody>
@foreach($checkout_list_results as $item)
<tr>
<td>{{ $item->item_assigned_num }}</td>
<td>{{ $item->item_desc }}</td>
<td class="text-end">${{ number_format($item->winning_cost, 2) }}</td>
</tr>
@endforeach
</tbody>
<tfoot>
<tr>
<th colspan="2" class="text-end">Total</th>
<th class="text-end">${{ number_format($info->total_cost ?? 0, 2) }}</th>
</tr>
</tfoot>
</table>
</div> </div>
</div> </div>
</div> </div>
@@ -16,47 +16,28 @@
<div class="col-12"> <div class="col-12">
<div class="card"> <div class="card">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-vcenter card-table text-nowrap"> <table class="table table-vcenter card-table">
<thead> <thead>
<tr> <tr>
<th>#</th> <th>Bidder #</th>
<th>Last Name</th> <th>Name</th>
<th>First Name</th>
<th>Address</th>
<th>City</th>
<th>State</th>
<th>Zip</th>
<th>Phone</th>
<th>Email</th>
<th>Total</th>
<th>Payment Method</th>
<th>Items Won</th> <th>Items Won</th>
<th>Total</th>
<th>Payment</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@foreach($checkout_complete_results as $c) @foreach($checkout_complete_results as $c)
<tr> <tr>
<td>{{ $c->bidder_assigned_number }}</td> <td>{{ $c->bidder_assigned_number }}</td>
<td>{{ $c->bidder_lname }}</td> <td>{{ $c->bidder_fname }} {{ $c->bidder_lname }}</td>
<td>{{ $c->bidder_fname }}</td>
<td>{{ $c->bidder_addr }}</td>
<td>{{ $c->bidder_city }}</td>
<td>{{ $c->bidder_state }}</td>
<td>{{ $c->bidder_zip }}</td>
<td>{{ \App\Helpers\PhoneHelper::format($c->bidder_phone) }}</td>
<td>{{ $c->bidder_email }}</td>
<td>${{ number_format($c->winnertotal, 2) }}</td>
<td>
@if($c->payment_method == 1) Cash
@elseif($c->payment_method == 2) Check ({{ $c->check_number }})
@else Credit ({{ $c->cc_transaction }})
@endif
</td>
<td> <td>
@foreach(\App\Models\WinningBids::with('items')->where('winning_bidder_num', $c->bidder_num)->get() as $bid) @foreach(\App\Models\WinningBids::with('items')->where('winning_bidder_num', $c->bidder_num)->get() as $bid)
<strong>#{{ $bid->items->item_assigned_num ?? '?' }}</strong> - {{ $bid->items->item_desc ?? 'N/A' }}<br> {{ $bid->items->item_desc ?? 'N/A' }}<br>
@endforeach @endforeach
</td> </td>
<td>${{ number_format($c->winnertotal, 2) }}</td>
<td>{{ $c->payment_method == 1 ? 'Cash' : ($c->payment_method == 2 ? 'Check' : 'Credit') }}</td>
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>
@@ -20,7 +20,7 @@
{{ csrf_field() }} {{ csrf_field() }}
<div class="col-md-6"> <div class="col-md-6">
<label for="bidder_num" class="form-label">Bidder</label> <label for="bidder_num" class="form-label">Bidder</label>
<select name="checkoutbiddernum" id="bidder_num" class="form-select" required> <select name="bidder_num" id="bidder_num" class="form-select" required>
@foreach($bidders as $bidder) @foreach($bidders as $bidder)
<option value="{{ $bidder->idbidders }}">{{ $bidder->bidder_assigned_number }} - {{ $bidder->bidder_fname }} {{ $bidder->bidder_lname }}</option> <option value="{{ $bidder->idbidders }}">{{ $bidder->bidder_assigned_number }} - {{ $bidder->bidder_fname }} {{ $bidder->bidder_lname }}</option>
@endforeach @endforeach
+2 -43
View File
@@ -26,7 +26,6 @@
<div class="page-body"> <div class="page-body">
<div class="container-xl"> <div class="container-xl">
<div class="card"> <div class="card">
<div id="payment-error-container"></div>
<div class="card-body"> <div class="card-body">
<div id="checkout-container"> <div id="checkout-container">
<div class="text-center"> <div class="text-center">
@@ -34,13 +33,6 @@
<div class="spinner-border" role="status"></div> <div class="spinner-border" role="status"></div>
</div> </div>
</div> </div>
<div id="fallback-container" class="mt-4 text-center" style="display: none;">
<div class="hr-text">Still here?</div>
<p class="text-muted">If you have already completed your payment but the page hasn't redirected, please click the button below.</p>
<a id="verify-button" href="#" class="btn btn-info">
<i class="ti ti-shield-check me-2"></i>Verify Payment Status
</a>
</div>
</div> </div>
</div> </div>
</div> </div>
@@ -75,52 +67,19 @@
return; return;
} }
// Set up fallback button
const verifyUrl = `/north/verify/${bidderId}?sessionToken=${sessionToken}`;
const verifyButton = document.getElementById('verify-button');
const fallbackContainer = document.getElementById('fallback-container');
verifyButton.href = verifyUrl;
// Show fallback after 5 seconds to give user a manual way out if auto-redirect fails
setTimeout(() => {
fallbackContainer.style.display = 'block';
}, 5000);
await checkout.mount(sessionToken, 'checkout-container'); await checkout.mount(sessionToken, 'checkout-container');
const handleCompletion = (result) => { const handleCompletion = (result) => {
console.log('Payment complete event received:', result); window.location.href = `/north/verify/${bidderId}?sessionToken=${sessionToken}`;
window.location.href = verifyUrl;
}; };
// Register standard completion events
checkout.onPaymentComplete(handleCompletion); checkout.onPaymentComplete(handleCompletion);
if (typeof checkout.onPaymentSuccess === 'function') { if (typeof checkout.onPaymentSuccess === 'function') {
checkout.onPaymentSuccess(handleCompletion); checkout.onPaymentSuccess(handleCompletion);
} }
// Handle errors
if (typeof checkout.onPaymentError === 'function') {
checkout.onPaymentError((error) => {
console.error('Payment Error:', error);
const errorDiv = document.createElement('div');
errorDiv.className = 'alert alert-danger alert-dismissible';
errorDiv.innerHTML = `
<div class="d-flex">
<div><i class="ti ti-alert-triangle me-2"></i></div>
<div>
<strong>Payment Error:</strong> ${error.message || 'An error occurred during payment.'}
</div>
</div>
<a class="btn-close" data-bs-dismiss="alert" aria-label="close"></a>
`;
document.getElementById('payment-error-container').prepend(errorDiv);
});
}
} catch (error) { } catch (error) {
console.error('Checkout Error:', error); console.error('Checkout Error:', error);
document.getElementById('checkout-container').innerHTML = '<div class="alert alert-danger">An error occurred while initializing checkout. Please try again.</div>'; document.getElementById('checkout-container').innerHTML = '<div class="alert alert-danger">An error occurred. Please try again.</div>';
} }
}); });
</script> </script>
+8 -22
View File
@@ -14,38 +14,24 @@
<div class="container-xl"> <div class="container-xl">
<div class="card"> <div class="card">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-vcenter card-table text-nowrap" id="showcars-table"> <table class="table table-vcenter card-table" id="showcars-table">
<thead> <thead>
<tr> <tr>
<th class="sort" data-sort="bidder-num">#</th> <th class="sort" data-sort="bidder-num">Bidder #</th>
<th class="sort" data-sort="lname">Last Name</th>
<th class="sort" data-sort="fname">First Name</th>
<th>Address</th>
<th>City</th>
<th>State</th>
<th>Zip</th>
<th>Phone</th>
<th>Email</th>
<th class="sort" data-sort="year">Year</th>
<th class="sort" data-sort="make">Make</th> <th class="sort" data-sort="make">Make</th>
<th class="sort" data-sort="model">Model</th> <th class="sort" data-sort="model">Model</th>
<th class="sort" data-sort="year">Year</th>
<th class="sort" data-sort="owner">Owner</th>
</tr> </tr>
</thead> </thead>
<tbody class="list"> <tbody class="list">
@foreach($showcarlist_results as $vehicle) @foreach($showcarlist_results as $vehicle)
<tr> <tr>
<td class="bidder-num">{{ $vehicle->bidder_assigned_number }}</td> <td class="bidder-num">{{ $vehicle->bidder_assigned_number ?? 'N/A' }}</td>
<td class="lname">{{ $vehicle->bidder_lname }}</td>
<td class="fname">{{ $vehicle->bidder_fname }}</td>
<td>{{ $vehicle->bidder_addr }}</td>
<td>{{ $vehicle->bidder_city }}</td>
<td>{{ $vehicle->bidder_state }}</td>
<td>{{ $vehicle->bidder_zip }}</td>
<td>{{ \App\Helpers\PhoneHelper::format($vehicle->bidder_phone) }}</td>
<td>{{ $vehicle->bidder_email }}</td>
<td class="year">{{ $vehicle->year }}</td>
<td class="make">{{ $vehicle->make }}</td> <td class="make">{{ $vehicle->make }}</td>
<td class="model">{{ $vehicle->model }}</td> <td class="model">{{ $vehicle->model }}</td>
<td class="year">{{ $vehicle->year }}</td>
<td class="owner">{{ $vehicle->bidder_fname }} {{ $vehicle->bidder_lname }}</td>
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>
@@ -60,7 +46,7 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/list.js/2.3.1/list.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/list.js/2.3.1/list.min.js"></script>
<script> <script>
new List('showcars-table', { new List('showcars-table', {
valueNames: ['bidder-num', 'lname', 'fname', 'year', 'make', 'model'] valueNames: ['bidder-num', 'make', 'model', 'year', 'owner']
}); });
</script> </script>
@endsection @endsection
+1 -1
View File
@@ -10,7 +10,7 @@
@endif @endif
<!-- Page Error --> <!-- Page Error -->
@include('tablar::error') @include('tablar::error')
{{-- @include('tablar::partials.footer.bottom') --}} @include('tablar::partials.footer.bottom')
</div> </div>
</div> </div>
</body> </body>
+1 -1
View File
@@ -14,7 +14,7 @@
@endif @endif
<!-- Page Error --> <!-- Page Error -->
@include('tablar::error') @include('tablar::error')
{{-- @include('tablar::partials.footer.bottom') --}} @include('tablar::partials.footer.bottom')
</div> </div>
</div> </div>
</body> </body>
+1 -1
View File
@@ -14,7 +14,7 @@
@endif @endif
<!-- Page Error --> <!-- Page Error -->
@include('tablar::error') @include('tablar::error')
{{-- @include('tablar::partials.footer.bottom') --}} @include('tablar::partials.footer.bottom')
</div> </div>
</div> </div>
</body> </body>
@@ -14,7 +14,7 @@
@endif @endif
<!-- Page Error --> <!-- Page Error -->
@include('tablar::error') @include('tablar::error')
{{-- @include('tablar::partials.footer.bottom') --}} @include('tablar::partials.footer.bottom')
</div> </div>
</div> </div>
</body> </body>
+1 -1
View File
@@ -14,7 +14,7 @@
@endif @endif
<!-- Page Error --> <!-- Page Error -->
@include('tablar::error') @include('tablar::error')
{{-- @include('tablar::partials.footer.bottom') --}} @include('tablar::partials.footer.bottom')
</div> </div>
</div> </div>
</body> </body>
+1 -1
View File
@@ -14,7 +14,7 @@
@endif @endif
<!-- Page Error --> <!-- Page Error -->
@include('tablar::error') @include('tablar::error')
{{-- @include('tablar::partials.footer.bottom') --}} @include('tablar::partials.footer.bottom')
</div> </div>
</div> </div>
</body> </body>
@@ -13,7 +13,7 @@
@endif @endif
<!-- Page Error --> <!-- Page Error -->
@include('tablar::error') @include('tablar::error')
{{-- @include('tablar::partials.footer.bottom') --}} @include('tablar::partials.footer.bottom')
</div> </div>
</div> </div>
</body> </body>
@@ -15,7 +15,7 @@
@endif @endif
<!-- Page Error --> <!-- Page Error -->
@include('tablar::error') @include('tablar::error')
{{-- @include('tablar::partials.footer.bottom') --}} @include('tablar::partials.footer.bottom')
</div> </div>
</div> </div>
</body> </body>
+1 -1
View File
@@ -14,7 +14,7 @@
@endif @endif
<!-- Page Error --> <!-- Page Error -->
@include('tablar::error') @include('tablar::error')
{{-- @include('tablar::partials.footer.bottom') --}} @include('tablar::partials.footer.bottom')
</div> </div>
</div> </div>
</body> </body>
@@ -13,7 +13,7 @@
@endif @endif
<!-- Page Error --> <!-- Page Error -->
@include('tablar::error') @include('tablar::error')
{{-- @include('tablar::partials.footer.bottom') --}} @include('tablar::partials.footer.bottom')
</div> </div>
</div> </div>
</body> </body>
@@ -13,7 +13,7 @@
@endif @endif
<!-- Page Error --> <!-- Page Error -->
@include('tablar::error') @include('tablar::error')
{{-- @include('tablar::partials.footer.bottom') --}} @include('tablar::partials.footer.bottom')
</div> </div>
</div> </div>
</body> </body>
+1 -1
View File
@@ -13,7 +13,7 @@
@endif @endif
<!-- Page Error --> <!-- Page Error -->
@include('tablar::error') @include('tablar::error')
{{-- @include('tablar::partials.footer.bottom') --}} @include('tablar::partials.footer.bottom')
</div> </div>
</div> </div>
</body> </body>
@@ -9,9 +9,8 @@
<div class="navbar-nav flex-row order-md-last"> <div class="navbar-nav flex-row order-md-last">
<div class="d-none d-md-flex"> <div class="d-none d-md-flex">
@include('tablar::partials.header.theme-mode') @include('tablar::partials.header.theme-mode')
{{-- @include('tablar::partials.header.notifications') --}} @include('tablar::partials.header.notifications')
</div> </div>
@include('tablar::partials.header.top-right')
</div> </div>
<div class="collapse navbar-collapse" id="navbar-menu"> <div class="collapse navbar-collapse" id="navbar-menu">
<div class="d-flex flex-column flex-md-row flex-fill align-items-stretch align-items-md-center"> <div class="d-flex flex-column flex-md-row flex-fill align-items-stretch align-items-md-center">
@@ -14,9 +14,8 @@
<div class="d-none d-md-flex"> <div class="d-none d-md-flex">
@include('tablar::partials.header.theme-mode') @include('tablar::partials.header.theme-mode')
{{-- @include('tablar::partials.header.notifications') --}} @include('tablar::partials.header.notifications')
</div> </div>
@include('tablar::partials.header.top-right')
</div> </div>
</div> </div>
@@ -1,5 +1,5 @@
<a href="#"> <a href="#">
<img src="{{asset('assets/auction_logo.png')}}" width="220" height="64" <img src="{{asset(config('tablar.auth_logo.img.path','assets/logo.svg'))}}" width="110" height="32"
alt="{{asset(config('tablar.title','Tablar'))}}" alt="{{asset(config('tablar.title','Tablar'))}}"
class="navbar-brand-image" style="height: 64px !important; width: 220px !important;"> class="navbar-brand-image">
</a> </a>
@@ -7,9 +7,8 @@
<div class="navbar-nav flex-row order-md-last"> <div class="navbar-nav flex-row order-md-last">
<div class="d-none d-md-flex"> <div class="d-none d-md-flex">
@include('tablar::partials.header.theme-mode') @include('tablar::partials.header.theme-mode')
{{-- @include('tablar::partials.header.notifications') --}} @include('tablar::partials.header.notifications')
</div> </div>
@include('tablar::partials.header.top-right')
</div> </div>
<div class="collapse navbar-collapse" id="navbar-menu"> <div class="collapse navbar-collapse" id="navbar-menu">
<div> <div>
@@ -2,23 +2,33 @@
<div class="nav-item dropdown"> <div class="nav-item dropdown">
<a href="#" class="nav-link d-flex lh-1 text-reset p-0" data-bs-toggle="dropdown" <a href="#" class="nav-link d-flex lh-1 text-reset p-0" data-bs-toggle="dropdown"
aria-label="Open user menu"> aria-label="Open user menu">
<span class="avatar">SE</span>
<div class="d-none d-xl-block ps-2"> <div class="d-none d-xl-block ps-2">
<div>{{Auth()->user()->name}}</div> <div>{{Auth()->user()->name}}</div>
<div class="mt-1 small text-muted">Software Engineer</div>
</div> </div>
</a> </a>
<div class="dropdown-menu dropdown-menu-end dropdown-menu-arrow"> <div class="dropdown-menu dropdown-menu-end dropdown-menu-arrow">
@php( $logout_url = View::getSection('logout_url') ?? config('tablar.logout_url', 'logout') ) @php( $logout_url = View::getSection('logout_url') ?? config('tablar.logout_url', 'logout') )
@php( $profile_url = View::getSection('profile_url') ?? config('tablar.profile_url', 'logout') )
@php( $setting_url = View::getSection('setting_url') ?? config('tablar.setting_url', 'home') )
@if (config('tablar.use_route_url', true)) @if (config('tablar.use_route_url', true))
@php( $profile_url = $profile_url ? route($profile_url) : '' )
@php( $logout_url = $logout_url ? route($logout_url) : '' ) @php( $logout_url = $logout_url ? route($logout_url) : '' )
@php( $setting_url = $setting_url ? route($setting_url) : '' )
@else @else
@php( $profile_url = $profile_url ? url($profile_url) : '' )
@php( $logout_url = $logout_url ? url($logout_url) : '' ) @php( $logout_url = $logout_url ? url($logout_url) : '' )
@php( $setting_url = $setting_url ? url($setting_url) : '' )
@endif @endif
<a href="{{ url('admin') }}" class="dropdown-item">Admin</a> <a href="#" class="dropdown-item">Status</a>
<a href="{{ url('auth/social/oidc') }}" class="dropdown-item">Link OIDC Account</a> <a href="{{$profile_url}}" class="dropdown-item">Profile</a>
<a href="#" class="dropdown-item">Feedback</a>
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
<a href="{{$setting_url}}" class="dropdown-item">Settings</a>
<a class="dropdown-item" <a class="dropdown-item"
href="#" onclick="event.preventDefault(); document.getElementById('logout-form').submit();"> href="#" onclick="event.preventDefault(); document.getElementById('logout-form').submit();">
<i class="fa fa-fw fa-power-off text-red"></i> <i class="fa fa-fw fa-power-off text-red"></i>
@@ -34,8 +44,4 @@
</div> </div>
</div> </div>
@else
<div class="nav-item">
<a class="nav-link" href="{{ route('login') }}">Login</a>
</div>
@endif @endif
@@ -17,10 +17,9 @@
<div class="d-none d-md-flex"> <div class="d-none d-md-flex">
@include('tablar::partials.header.theme-mode') @include('tablar::partials.header.theme-mode')
{{-- @include('tablar::partials.header.notifications') --}} @include('tablar::partials.header.notifications')
</div> </div>
@include('tablar::partials.header.top-right')
</div> </div>
<div class="collapse navbar-collapse" id="navbar-menu"> <div class="collapse navbar-collapse" id="navbar-menu">
@@ -19,9 +19,8 @@
</div> </div>
<div class="d-none d-lg-flex"> <div class="d-none d-lg-flex">
@include('tablar::partials.header.theme-mode') @include('tablar::partials.header.theme-mode')
{{-- @include('tablar::partials.header.notifications') --}} @include('tablar::partials.header.notifications')
</div> </div>
@include('tablar::partials.header.top-right')
</div> </div>
<div class="collapse navbar-collapse" id="sidebar-menu"> <div class="collapse navbar-collapse" id="sidebar-menu">