Skip to content
This repository was archived by the owner on Nov 26, 2024. It is now read-only.

Commit 2ccbad4

Browse files
committed
FIx User Management
1 parent 55d6e64 commit 2ccbad4

File tree

9 files changed

+36
-24
lines changed

9 files changed

+36
-24
lines changed

resources/views/components/card.blade.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
<div class="card border-0">
22
@isset($card_title)
33
<div class="card-header {{ $card_title_classes or 'font-weight-bold text-dark bg-white border-0' }}">
4-
{{ $card_title }}
4+
<div class="container">
5+
<div class="row">
6+
<div class="col">
7+
{{ $card_title }}
8+
</div>
9+
</div>
10+
</div>
511
<hr>
612
</div>
713
@endisset

resources/views/components/forms/input.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<div class="form-group row">
22
<label for="{{ snake_case($input_label) }}"
3-
class="{{ $input_label_class or 'col-sm-4 col-form-label text-md-right' }}">
3+
class="{{ $input_label_class or 'col col-form-label' }}">
44
{{ __($input_label) }}
55
</label>
66

7-
<div class="{{ $input_container_class or 'col-md-6' }}">
7+
<div class="{{ $input_container_class or 'col' }}">
88
<input
99
type="{{ $type or 'text' }}"
1010
class="form-control{{ $errors->has(snake_case($input_label)) ? ' is-invalid' : '' }}"

resources/views/components/forms/select-multiple.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<div class="form-group row">
22
<label for="{{ snake_case($input_label) }}"
3-
class="{{ $input_label_class or 'col-sm-4 col-form-label text-md-right' }}">
3+
class="{{ $input_label_class or 'col col-form-label' }}">
44
{{ __($input_label) }}
55
</label>
6-
<div class="{{ $input_container_class or 'col-md-6' }}">
6+
<div class="{{ $input_container_class or 'col' }}">
77
{{
88
html()->select()
99
->class('select2 w-100 form-control ' . ($errors->has(snake_case($input_label)) ? ' is-invalid' : ''))

resources/views/components/forms/select.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<div class="form-group row">
22
<label for="{{ snake_case($input_label) }}"
3-
class="{{ $input_label_class or 'col-sm-4 col-form-label text-md-right' }}">
3+
class="{{ $input_label_class or 'col col-form-label' }}">
44
{{ __($input_label) }}
55
</label>
66

7-
<div class="{{ $input_container_class or 'col-md-6' }}">
7+
<div class="{{ $input_container_class or 'col' }}">
88
{{
99
html()->select()
1010
->class('select2 form-control ' . ($errors->has(snake_case($input_label)) ? ' is-invalid' : ''))
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<button type="button" class="btn btn-sm btn-primary {{ $modal_btn_classes or '' }}"
1+
<div class="btn btn-primary {{ $modal_btn_classes or '' }}"
22
@include('components.tooltip', ['tooltip' => __($label)])
33
@isset($id) data-toggle="modal" data-target="#{{ $id }}" @endisset>
44
@isset($icon) <i class="{{ $icon }}"></i> @endisset
55
@isset($label) {{ __($label) }} @endisset
6-
</button>
6+
</div>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<h1 class="page-title pb-4">{{ __($title) }}</h1>

resources/views/manage/users/index.blade.php

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,11 @@
3333
<div class="col">
3434
@component('components.card')
3535
@slot('card_title')
36-
<h4>
37-
{{ __('User Management') }}
38-
<div class="float-right">
39-
@include('components.modals.button', [
40-
'modal_btn_classes' => 'create-action-btn',
41-
'label' => __('New User'),
42-
'icon' => 'fa fa-plus'
43-
])
44-
</div>
45-
</h4>
36+
@include('components.modals.button', [
37+
'modal_btn_classes' => 'create-action-btn float-right',
38+
'label' => __('New User'),
39+
'icon' => 'fe fe-plus'
40+
])
4641
@endslot
4742
@slot('card_body')
4843
@component('components.datatable',

resources/views/manage/users/partials/modals/form.blade.php

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,20 @@
44
'modal_title' => __('User'),
55
])
66
@slot('modal_body')
7-
{{ html()->form('POST', '#')->id('user-form')->open() }}
8-
@method('POST')
9-
@include('manage.users.partials.forms.create')
10-
{{ html()->form()->close() }}
7+
<div class="row">
8+
<div class="col-md-3 col-lg-3 col-xl-3">
9+
10+
</div>
11+
<div class="col-md-6 col-lg-6 col-xl-6">
12+
{{ html()->form('POST', '#')->id('user-form')->open() }}
13+
@method('POST')
14+
@include('manage.users.partials.forms.create')
15+
{{ html()->form()->close() }}
16+
</div>
17+
<div class="col-md-3 col-lg-3 col-xl-3">
18+
19+
</div>
20+
</div>
1121
@endslot
1222
@slot('modal_footer')
1323
<button class="btn btn-success form-btn">{{ __('Save') }}</button>

resources/views/manage/users/partials/modals/show.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<a href="#" id="edit-user-link"
1010
@include('components.tooltip', ['tooltip' => 'Edit'])
1111
class="float-right btn btn-primary">
12-
<i class="fas fa-edit"></i> Edit
12+
<i class="fe fe-edit"></i> Edit
1313
</a>
1414
@endslot
1515
@endcomponent

0 commit comments

Comments
 (0)