Skip to content

Commit

Permalink
Merge pull request #36 from YasinDehfuli/main
Browse files Browse the repository at this point in the history
🚀 Improve ui on issue #33
  • Loading branch information
A1Gard authored Feb 6, 2024
2 parents b01b320 + 54e9d94 commit dfb6479
Show file tree
Hide file tree
Showing 24 changed files with 298 additions and 209 deletions.
132 changes: 66 additions & 66 deletions database/seeders/SettingSeeder.php

Large diffs are not rendered by default.

8 changes: 7 additions & 1 deletion resources/views/admin/attachment.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,11 @@
</div>
</div>
</form>
<table class="table table-striped table-bordered">
<table class="table table-striped table-bordered text-center mt-3">
<tr>
<th>
#
</th>
<th>
{{__("Title")}}
</th>
Expand All @@ -49,6 +52,9 @@
</tr>
@foreach($attaches as $q)
<tr>
<td>
{{$q->id}}
</td>
<td>
{{$q->title}}
</td>
Expand Down
11 changes: 8 additions & 3 deletions resources/views/admin/cat/catIndex.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
@include('starter-kit::component.err')
<form action="{{route('admin.cat.bulk')}}" method="post" class="bulk-action" >
@csrf
<table class="table table-striped table-bordered ">
<table class="table table-striped table-bordered text-center">
<thead class="thead-dark">
<tr>
<th>
<input type="checkbox" class="chkall"/>
#
</th>
<th>
{{__("Image")}}
Expand All @@ -27,13 +27,15 @@
<th>
{{__("Action")}}
</th>
<th>
<input type="checkbox" class="chkall"/>
</th>
</tr>
</thead>
<tbody>
@foreach ($cats as $cat)
<tr>
<td>
<input type="checkbox" name="id[]" value="{{$cat->id}}" class="m-2 chkbox"/>
{{$cat->id}}
</td>
<td>
Expand All @@ -60,6 +62,9 @@ class="btn btn-outline-dark translat-btn">
</a>
@endif
</td>
<td>
<input type="checkbox" name="id[]" value="{{$cat->id}}" class="m-2 chkbox"/>
</td>
</tr>
@endforeach
</tbody>
Expand Down
24 changes: 14 additions & 10 deletions resources/views/admin/customer/customerIndex.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ class="form-control">
</div>
</div>
</form>
<form action="{{route('admin.customer.bulk')}}" method="post" class="bulk-action" >
<form action="{{route('admin.customer.bulk')}}" method="post" class="bulk-action mt-3" >
@csrf
<table class="table table-striped table-bordered ">
<table class="table table-striped table-bordered text-center">
<thead class="thead-dark">
<tr>
<th>
<input type="checkbox" class="chkall"/>
#
</th>
<th>
{{__("Name")}}
Expand All @@ -62,16 +62,16 @@ class="form-control">
</th>
<th>
{{__("Action")}}
<a href="{{route('admin.customer.create')}}" class="btn btn-success float-start"><i
class="fa fa-plus"></i></a>
</th>
<th>
<input type="checkbox" class="chkall"/>
</th>
</tr>
</thead>
<tbody>
@foreach ($customers as $customer)
<tr>
<td>
<input type="checkbox" name="id[]" value="{{$customer->id}}" class="m-2 chkbox"/>
{{$customer->id}}
</td>
<td>
Expand All @@ -85,15 +85,16 @@ class="fa fa-plus"></i></a>
</td>
<td>
<a href="{{route('admin.customer.edit',$customer->id)}}" class="btn btn-primary">
<i class="fa fa-edit"></i> &nbsp;
{{__("Edit")}}
<i class="ri-edit-2-line"></i>
</a>
<a href="{{route('admin.customer.delete',$customer->id)}}"
class="btn btn-danger delete-confirm">
<i class="fa fa-times"></i> &nbsp;
{{__("Delete")}}
<i class="ri-close-line"></i>
</a>
</td>
<td>
<input type="checkbox" name="id[]" value="{{$customer->id}}" class="m-2 chkbox"/>
</td>
</tr>
@endforeach
</tbody>
Expand All @@ -103,5 +104,8 @@ class="btn btn-danger delete-confirm">
<div class="text-center pt-3">
{{$customers->appends(request()->input())->links()}}
</div>
<a class="btn-add" href="{{route('admin.customer.create')}}">
<i class="ri-add-line"></i>
</a>
</div>
@endsection
22 changes: 13 additions & 9 deletions resources/views/admin/discount/discountIndex.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
@include('starter-kit::component.err')
<form action="{{route('admin.discount.bulk')}}" method="post" class="bulk-action">
@csrf
<table class="table table-striped table-bordered ">
<table class="table table-striped table-bordered text-center">
<thead class="thead-dark">
<tr>
<th>
<input type="checkbox" class="chkall"/>
#
</th>
<th>
{{__("Type")}}
Expand All @@ -29,16 +29,16 @@
</th>
<th>
{{__("Action")}}
<a href="{{route('admin.discount.create')}}" class="btn btn-success float-start"><i
class="fa fa-plus"></i></a>
</th>
<th>
<input type="checkbox" class="chkall"/>
</th>
</tr>
</thead>
<tbody>
@foreach ($discounts as $n)
<tr>
<td>
<input type="checkbox" name="id[]" value="{{$n->id}}" class="m-2 chkbox"/>
{{$n->id}}
</td>
<td>
Expand Down Expand Up @@ -70,15 +70,16 @@ class="fa fa-plus"></i></a>
</td>
<td>
<a href="{{route('admin.discount.edit',$n->id)}}" class="btn btn-primary">
<i class="fa fa-edit"></i> &nbsp;
{{__("Edit")}}
<i class="ri-edit-2-line"></i>
</a>
<a href="{{route('admin.discount.delete',$n->id)}}"
class="btn btn-danger delete-confirm">
<i class="fa fa-times"></i> &nbsp;
{{__("Delete")}}
<i class="ri-close-line"></i>
</a>
</td>
<td>
<input type="checkbox" name="id[]" value="{{$n->id}}" class="m-2 chkbox"/>
</td>
</tr>
@endforeach
</tbody>
Expand All @@ -89,4 +90,7 @@ class="btn btn-danger delete-confirm">
{{$discounts->links()}}
</div>
</div>
<a class="btn-add" href="{{route('admin.discount.create')}}">
<i class="ri-add-line"></i>
</a>
@endsection
24 changes: 16 additions & 8 deletions resources/views/admin/invoice/invoiceIndex.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
</div>
<form action="{{route('admin.invoice.bulk')}}" method="post" class="bulk-action">
@csrf
<table class="table table-striped table-bordered ">
<table class="table table-striped table-bordered text-center">
<thead class="thead-dark">
<tr>
<th>
<input type="checkbox" class="chkall"/>
#
</th>
<th>
{{__("Customer")}}
Expand All @@ -51,13 +51,16 @@
{{-- <a href="{{route('admin.invoice.create')}}" class="btn btn-success float-start"><i--}}
{{-- class="fa fa-plus"></i></a>--}}
</th>
<th>
<input type="checkbox" class="chkall"/>
</th>
</tr>
</thead>
<tbody>
@foreach ($invoices as $invoice)
<tr>
<td>
<input type="checkbox" name="id[]" value="{{$invoice->id}}" class="m-2 chkbox"/>
{{$invoice->id}}
</td>
<td>
{{$invoice->customer->name}}
Expand Down Expand Up @@ -86,22 +89,24 @@
</td>
<td>
<a href="{{route('admin.invoice.edit',$invoice->hash)}}" class="btn btn-primary">
<i class="fa fa-edit"></i>

<i class="ri-edit-2-line"></i>
</a>
<a href="{{route('admin.invoice.delete',$invoice->hash)}}"
class="btn btn-danger delete-confirm">
<i class="fa fa-times"></i>
<i class="ri-close-line"></i>
</a>
<a href="{{route('admin.invoice.show',$invoice->hash)}}"
class="btn btn-secondary">
<i class="fa fa-eye"></i>
<i class="ri-eye-fill"></i>
</a>
<a href="{{route('invoice.pdf',$invoice->hash)}}"
class="btn btn-dark" target="_blank">
<i class="fa fa-file-pdf"></i>
<i class="ri-file-pdf-2-fill"></i>
</a>
</td>
<td>
<input type="checkbox" name="id[]" value="{{$invoice->id}}" class="m-2 chkbox"/>
</td>
</tr>
@endforeach
</tbody>
Expand All @@ -119,4 +124,7 @@ class="btn btn-dark" target="_blank">
{{$invoices->links()}}
</div>
</div>
<a class="btn-add" href="{{route('admin.invoice.create')}}">
<i class="ri-add-line"></i>
</a>
@endsection
10 changes: 7 additions & 3 deletions resources/views/admin/langs/langIndex.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@
<thead class="thead-dark">
<tr>
<th>
<input type="checkbox" class="chkall"/>
#
</th>
<th>

{{__("Name")}}
</th>
<th>
Expand All @@ -29,13 +28,15 @@
{{__("Action")}}

</th>
<th>
<input type="checkbox" class="chkall"/>
</th>
</tr>
</thead>
<tbody>
@foreach ($langs as $n)
<tr>
<td>
<input type="checkbox" name="id[]" value="{{$n->id}}" class="m-2 chkbox"/>
{{$n->id}}
</td>
<td>
Expand All @@ -62,6 +63,9 @@ class="btn btn-danger delete-confirm btn-sm">
<i class="ri-close-line"></i>
</a>
</td>
<td>
<input type="checkbox" name="id[]" value="{{$n->id}}" class="m-2 chkbox"/>
</td>
</tr>
@endforeach
</tbody>
Expand Down
12 changes: 8 additions & 4 deletions resources/views/admin/product/productIndex.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@
</div>
<form action="{{route('admin.product.bulk')}}" method="post" class="bulk-action">
@csrf
<table class="table table-striped table-bordered ">
<table class="table table-striped table-bordered text-center">
<thead class="thead-dark">
<tr>
<th>
<input type="checkbox" class="chkall"/>
#
</th>
<th>
{{__("Image")}}
Expand All @@ -52,13 +52,15 @@
<th>
{{__("Action")}}
</th>
<th>
<input type="checkbox" class="chkall"/>
</th>
</tr>
</thead>
<tbody>
@foreach ($products as $n)
<tr>
<td>
<input type="checkbox" name="id[]" value="{{$n->id}}" class="m-2 chkbox"/>
{{$n->id}}
</td>
<td>
Expand Down Expand Up @@ -96,7 +98,9 @@ class="btn btn-success">
{{__("Restore")}}
</a>
@endif

</td>
<td>
<input type="checkbox" name="id[]" value="{{$n->id}}" class="m-2 chkbox"/>
</td>
</tr>
@endforeach
Expand Down
4 changes: 2 additions & 2 deletions resources/views/admin/props/propIndex.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</h5>

<div class="table-responsive">
<table class="table">
<table class="table table-striped table-bordered text-center">
<thead>
<tr>
<th>#</th>
Expand Down Expand Up @@ -45,7 +45,7 @@
<div class="btn-group"
role="group">
<a title="Edit"
class="btn btn-secondary ad-accept-btn"
class="btn btn-primary ad-accept-btn"
href="{{route('admin.props.edit',$p->id)}}">
<i class="ri-edit-2-line"></i>
</a>
Expand Down
8 changes: 7 additions & 1 deletion resources/views/admin/question.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@
@endsection
@section('content')
@include('starter-kit::component.err')
<table class="table table-striped table-bordered">
<table class="table table-striped table-bordered text-center">
<tr>
<th>
#
</th>
<th>
{{__("Question / Answer")}}
</th>
Expand All @@ -19,6 +22,9 @@
</tr>
@foreach($qs as $q)
<tr>
<td>
{{$q->id}}
</td>
<td>
{{$q->body}}
<hr>
Expand Down
Loading

0 comments on commit dfb6479

Please sign in to comment.