diff --git a/src/stubs/resources/views/simple/forms-bs3.stub b/src/stubs/resources/views/simple/forms-bs3.stub new file mode 100644 index 0000000..74b622a --- /dev/null +++ b/src/stubs/resources/views/simple/forms-bs3.stub @@ -0,0 +1,69 @@ +@if (Request::get('action') == 'create') +@can('create', new fullMstr) +
+ {{ csrf_field() }} +
+ + + {!! $errors->first('name', ':message') !!} +
+
+ + + {!! $errors->first('description', ':message') !!} +
+ + {{ __('app.cancel') }} +
+@endcan +@endif +@if (Request::get('action') == 'edit' && $editableMaster) +@can('update', $editableMaster) +
+ {{ csrf_field() }} {{ method_field('patch') }} +
+ + + {!! $errors->first('name', ':message') !!} +
+
+ + + {!! $errors->first('description', ':message') !!} +
+ + + + {{ __('app.cancel') }} + @can('delete', $editableMaster) + {{ __('app.delete') }} + @endcan +
+@endcan +@endif +@if (Request::get('action') == 'delete' && $editableMaster) +@can('delete', $editableMaster) +
+

{{ __('master.delete') }}

+
+ +

{{ $editableMaster->name }}

+ +

{{ $editableMaster->description }}

+ {!! $errors->first('master_id', ':message') !!} +
+
+
{{ __('master.delete_confirm') }}
+
+
+ {{ csrf_field() }} {{ method_field('delete') }} + + + + +
+ {{ __('app.cancel') }} +
+
+@endcan +@endif diff --git a/src/stubs/resources/views/simple/forms.stub b/src/stubs/resources/views/simple/forms.stub index 74b622a..4104eb7 100644 --- a/src/stubs/resources/views/simple/forms.stub +++ b/src/stubs/resources/views/simple/forms.stub @@ -2,18 +2,18 @@ @can('create', new fullMstr)
{{ csrf_field() }} -
+
- - {!! $errors->first('name', ':message') !!} + + {!! $errors->first('name', ':message') !!}
-
+
- - {!! $errors->first('description', ':message') !!} + + {!! $errors->first('description', ':message') !!}
- {{ __('app.cancel') }} + {{ __('app.cancel') }} @endcan @endif @@ -21,20 +21,20 @@ @can('update', $editableMaster)
{{ csrf_field() }} {{ method_field('patch') }} -
+
- - {!! $errors->first('name', ':message') !!} + + {!! $errors->first('name', ':message') !!}
-
+
- - {!! $errors->first('description', ':message') !!} + + {!! $errors->first('description', ':message') !!}
- {{ __('app.cancel') }} + {{ __('app.cancel') }} @can('delete', $editableMaster) {{ __('app.delete') }} @endcan @@ -43,18 +43,18 @@ @endif @if (Request::get('action') == 'delete' && $editableMaster) @can('delete', $editableMaster) -
-

{{ __('master.delete') }}

-
- +
+
{{ __('master.delete') }}
+
+

{{ $editableMaster->name }}

- +

{{ $editableMaster->description }}

- {!! $errors->first('master_id', ':message') !!} + {!! $errors->first('master_id', ':message') !!}
-
{{ __('master.delete_confirm') }}
-
+
{{ __('master.delete_confirm') }}
+
{{ csrf_field() }} {{ method_field('delete') }} @@ -62,7 +62,7 @@ - {{ __('app.cancel') }} + {{ __('app.cancel') }}
@endcan diff --git a/src/stubs/resources/views/simple/index-bs3.stub b/src/stubs/resources/views/simple/index-bs3.stub new file mode 100644 index 0000000..724aa38 --- /dev/null +++ b/src/stubs/resources/views/simple/index-bs3.stub @@ -0,0 +1,61 @@ +@extends('layouts.app') + +@section('title', __('master.list')) + +@section('content') +

+
+ @can('create', new fullMstr) + {{ __('master.create') }} + @endcan +
+ {{ __('master.list') }} + {{ __('app.total') }} : {{ $mstrCollections->total() }} {{ __('master.master') }} +

+
+
+
+
+
+
+ + +
+ + {{ __('app.reset') }} +
+
+ + + + + + + + + + + @foreach($mstrCollections as $key => $singleMstr) + + + + + + + @endforeach + +
{{ __('app.table_no') }}{{ __('master.name') }}{{ __('master.description') }}{{ __('app.action') }}
{{ $mstrCollections->firstItem() + $key }}{{ $singleMstr->name }}{{ $singleMstr->description }} + @can('update', $singleMstr) + {{ __('app.edit') }} + @endcan +
+
{{ $mstrCollections->appends(Request::except('page'))->render() }}
+
+
+
+ @if(Request::has('action')) + @include('masters.forms') + @endif +
+
+@endsection diff --git a/src/stubs/resources/views/simple/index.stub b/src/stubs/resources/views/simple/index.stub index 724aa38..3d76bdb 100644 --- a/src/stubs/resources/views/simple/index.stub +++ b/src/stubs/resources/views/simple/index.stub @@ -3,8 +3,8 @@ @section('title', __('master.list')) @section('content') -

-
+

+
@can('create', new fullMstr) {{ __('master.create') }} @endcan @@ -14,18 +14,18 @@

-
-
+
+
- - + +
- {{ __('app.reset') }} + {{ __('app.reset') }}
- +
@@ -49,7 +49,7 @@ @endforeach
{{ __('app.table_no') }}
-
{{ $mstrCollections->appends(Request::except('page'))->render() }}
+
{{ $mstrCollections->appends(Request::except('page'))->render() }}
diff --git a/tests/Generators/Simple/ViewsGeneratorTest.php b/tests/Generators/Simple/ViewsGeneratorTest.php index c31f68b..aeb0b8c 100644 --- a/tests/Generators/Simple/ViewsGeneratorTest.php +++ b/tests/Generators/Simple/ViewsGeneratorTest.php @@ -19,8 +19,8 @@ class ViewsGeneratorTest extends TestCase @section('title', __('{$this->lang_name}.list')) @section('content') -

-
+

+
@can('create', new {$this->full_model_name}) table_name}.index', ['action' => 'create']) }}\" class=\"btn btn-success\">{{ __('{$this->lang_name}.create') }} @endcan @@ -30,18 +30,18 @@ class ViewsGeneratorTest extends TestCase

-
-
+
+
- - lang_name}.search_text') }}\" name=\"q\" type=\"text\" id=\"q\" class=\"form-control input-sm\" value=\"{{ request('q') }}\"> + + lang_name}.search_text') }}\" name=\"q\" type=\"text\" id=\"q\" class=\"form-control form-control-sm mr-sm-2\" value=\"{{ request('q') }}\">
lang_name}.search') }}\" class=\"btn btn-sm\"> - table_name}.index') }}\">{{ __('app.reset') }} + table_name}.index') }}\" class=\"btn btn-link btn-sm\">{{ __('app.reset') }}
- +
@@ -65,7 +65,7 @@ class ViewsGeneratorTest extends TestCase @endforeach
{{ __('app.table_no') }}
-
{{ \${$this->collection_model_var_name}->appends(Request::except('page'))->render() }}
+
{{ \${$this->collection_model_var_name}->appends(Request::except('page'))->render() }}
@@ -90,18 +90,18 @@ class ViewsGeneratorTest extends TestCase @can('create', new {$this->full_model_name})
table_name}.store') }}\" accept-charset=\"UTF-8\"> {{ csrf_field() }} -
has('name') ? ' has-error' : '' }}\"> +
- - {!! \$errors->first('name', ':message') !!} + has('name') ? ' is-invalid' : '' }}\" name=\"name\" value=\"{{ old('name') }}\" required> + {!! \$errors->first('name', ':message') !!}
-
has('description') ? ' has-error' : '' }}\"> +
- - {!! \$errors->first('description', ':message') !!} + + {!! \$errors->first('description', ':message') !!}
lang_name}.create') }}\" class=\"btn btn-success\"> - table_name}.index') }}\" class=\"btn btn-default\">{{ __('app.cancel') }} + table_name}.index') }}\" class=\"btn btn-link\">{{ __('app.cancel') }} @endcan @endif @@ -109,20 +109,20 @@ class ViewsGeneratorTest extends TestCase @can('update', \$editable{$this->model_name})
table_name}.update', \$editable{$this->model_name}) }}\" accept-charset=\"UTF-8\"> {{ csrf_field() }} {{ method_field('patch') }} -
has('name') ? ' has-error' : '' }}\"> +
- model_name}->name) }}\" required> - {!! \$errors->first('name', ':message') !!} + has('name') ? ' is-invalid' : '' }}\" name=\"name\" value=\"{{ old('name', \$editable{$this->model_name}->name) }}\" required> + {!! \$errors->first('name', ':message') !!}
-
has('description') ? ' has-error' : '' }}\"> +
- - {!! \$errors->first('description', ':message') !!} + + {!! \$errors->first('description', ':message') !!}
lang_name}.update') }}\" class=\"btn btn-success\"> - table_name}.index', Request::only('q', 'page')) }}\" class=\"btn btn-default\">{{ __('app.cancel') }} + table_name}.index', Request::only('q', 'page')) }}\" class=\"btn btn-link\">{{ __('app.cancel') }} @can('delete', \$editable{$this->model_name}) table_name}.index', ['action' => 'delete', 'id' => \$editable{$this->model_name}->id] + Request::only('page', 'q')) }}\" id=\"del-{$this->lang_name}-{{ \$editable{$this->model_name}->id }}\" class=\"btn btn-danger pull-right\">{{ __('app.delete') }} @endcan @@ -131,18 +131,18 @@ class ViewsGeneratorTest extends TestCase @endif @if (Request::get('action') == 'delete' && \$editable{$this->model_name}) @can('delete', \$editable{$this->model_name}) -
-

{{ __('{$this->lang_name}.delete') }}

-
- +
+
{{ __('{$this->lang_name}.delete') }}
+
+

{{ \$editable{$this->model_name}->name }}

- +

{{ \$editable{$this->model_name}->description }}

- {!! \$errors->first('{$this->lang_name}_id', ':message') !!} + {!! \$errors->first('{$this->lang_name}_id', ':message') !!}
-
{{ __('{$this->lang_name}.delete_confirm') }}
-
+
{{ __('{$this->lang_name}.delete_confirm') }}
+
table_name}.destroy', \$editable{$this->model_name}) }}\" accept-charset=\"UTF-8\" onsubmit=\"return confirm("Are you sure to delete this?")\" class=\"del-form pull-right\" style=\"display: inline;\"> {{ csrf_field() }} {{ method_field('delete') }} lang_name}_id\" type=\"hidden\" value=\"{{ \$editable{$this->model_name}->id }}\"> @@ -150,7 +150,7 @@ class ViewsGeneratorTest extends TestCase - table_name}.index', Request::only('q', 'page')) }}\" class=\"btn btn-default\">{{ __('app.cancel') }} + table_name}.index', Request::only('q', 'page')) }}\" class=\"btn btn-link\">{{ __('app.cancel') }}
@endcan