Commit 114caa06 authored by Viral Solani's avatar Viral Solani

Merge branch 'master' of https://github.com/viralsolani/laravel-adminpanel into test-cases

parents b0c717fe df471b87
...@@ -12,6 +12,7 @@ use App\Events\Backend\Access\User\UserRestored; ...@@ -12,6 +12,7 @@ use App\Events\Backend\Access\User\UserRestored;
use App\Events\Backend\Access\User\UserUpdated; use App\Events\Backend\Access\User\UserUpdated;
use App\Exceptions\GeneralException; use App\Exceptions\GeneralException;
use App\Models\Access\User\User; use App\Models\Access\User\User;
use App\Notifications\Frontend\Auth\UserNeedsConfirmation;
use App\Repositories\Backend\Access\Role\RoleRepository; use App\Repositories\Backend\Access\Role\RoleRepository;
use App\Repositories\BaseRepository; use App\Repositories\BaseRepository;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "2bdbd3cc26be3712c0b8e3d5c01f0681", "content-hash": "35bd90d8d234415b1df889e0e8134318",
"packages": [ "packages": [
{ {
"name": "arcanedev/log-viewer", "name": "arcanedev/log-viewer",
...@@ -1367,16 +1367,16 @@ ...@@ -1367,16 +1367,16 @@
}, },
{ {
"name": "laravel/framework", "name": "laravel/framework",
"version": "v5.5.25", "version": "v5.5.26",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/framework.git", "url": "https://github.com/laravel/framework.git",
"reference": "0a5b6112f325c56ae5a6679c08a0a10723153fe0" "reference": "d7e6a7aab600c5cfae595ea22074ac3c536cbc28"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/0a5b6112f325c56ae5a6679c08a0a10723153fe0", "url": "https://api.github.com/repos/laravel/framework/zipball/d7e6a7aab600c5cfae595ea22074ac3c536cbc28",
"reference": "0a5b6112f325c56ae5a6679c08a0a10723153fe0", "reference": "d7e6a7aab600c5cfae595ea22074ac3c536cbc28",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1497,7 +1497,7 @@ ...@@ -1497,7 +1497,7 @@
"framework", "framework",
"laravel" "laravel"
], ],
"time": "2017-12-11T14:59:28+00:00" "time": "2017-12-18T14:15:59+00:00"
}, },
{ {
"name": "laravel/socialite", "name": "laravel/socialite",
...@@ -1563,16 +1563,16 @@ ...@@ -1563,16 +1563,16 @@
}, },
{ {
"name": "laravel/tinker", "name": "laravel/tinker",
"version": "v1.0.2", "version": "v1.0.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/tinker.git", "url": "https://github.com/laravel/tinker.git",
"reference": "203978fd67f118902acff95925847e70b72e3daf" "reference": "852c2abe0b0991555a403f1c0583e64de6acb4a6"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/tinker/zipball/203978fd67f118902acff95925847e70b72e3daf", "url": "https://api.github.com/repos/laravel/tinker/zipball/852c2abe0b0991555a403f1c0583e64de6acb4a6",
"reference": "203978fd67f118902acff95925847e70b72e3daf", "reference": "852c2abe0b0991555a403f1c0583e64de6acb4a6",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1581,7 +1581,7 @@ ...@@ -1581,7 +1581,7 @@
"illuminate/support": "~5.1", "illuminate/support": "~5.1",
"php": ">=5.5.9", "php": ">=5.5.9",
"psy/psysh": "0.7.*|0.8.*", "psy/psysh": "0.7.*|0.8.*",
"symfony/var-dumper": "~3.0" "symfony/var-dumper": "~3.0|~4.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "~4.0|~5.0" "phpunit/phpunit": "~4.0|~5.0"
...@@ -1622,7 +1622,7 @@ ...@@ -1622,7 +1622,7 @@
"laravel", "laravel",
"psysh" "psysh"
], ],
"time": "2017-07-13T13:11:05+00:00" "time": "2017-12-18T16:25:11+00:00"
}, },
{ {
"name": "laravelcollective/html", "name": "laravelcollective/html",
...@@ -3884,16 +3884,16 @@ ...@@ -3884,16 +3884,16 @@
}, },
{ {
"name": "bvipul/generator", "name": "bvipul/generator",
"version": "0.9.2", "version": "0.9.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/bvipul/generator.git", "url": "https://github.com/bvipul/generator.git",
"reference": "70f90f6e45dc2604e8648bc663b2683e43864ada" "reference": "9aa7d1aa9c2c748fa3890ab25628ea2cd7042103"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/bvipul/generator/zipball/70f90f6e45dc2604e8648bc663b2683e43864ada", "url": "https://api.github.com/repos/bvipul/generator/zipball/9aa7d1aa9c2c748fa3890ab25628ea2cd7042103",
"reference": "70f90f6e45dc2604e8648bc663b2683e43864ada", "reference": "9aa7d1aa9c2c748fa3890ab25628ea2cd7042103",
"shasum": "" "shasum": ""
}, },
"type": "package", "type": "package",
...@@ -3913,7 +3913,7 @@ ...@@ -3913,7 +3913,7 @@
} }
], ],
"description": "To create a whole module with all related files like model, controller, repository, routes, views etc with a simple GUI.", "description": "To create a whole module with all related files like model, controller, repository, routes, views etc with a simple GUI.",
"time": "2017-12-15T18:43:36+00:00" "time": "2017-12-16T18:48:20+00:00"
}, },
{ {
"name": "doctrine/instantiator", "name": "doctrine/instantiator",
...@@ -4912,16 +4912,16 @@ ...@@ -4912,16 +4912,16 @@
}, },
{ {
"name": "phpunit/phpunit", "name": "phpunit/phpunit",
"version": "6.5.4", "version": "6.5.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git", "url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "1b2f933d5775f9237369deaa2d2bfbf9d652be4c" "reference": "83d27937a310f2984fd575686138597147bdc7df"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/1b2f933d5775f9237369deaa2d2bfbf9d652be4c", "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/83d27937a310f2984fd575686138597147bdc7df",
"reference": "1b2f933d5775f9237369deaa2d2bfbf9d652be4c", "reference": "83d27937a310f2984fd575686138597147bdc7df",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -4992,7 +4992,7 @@ ...@@ -4992,7 +4992,7 @@
"testing", "testing",
"xunit" "xunit"
], ],
"time": "2017-12-10T08:06:19+00:00" "time": "2017-12-17T06:31:19+00:00"
}, },
{ {
"name": "phpunit/phpunit-mock-objects", "name": "phpunit/phpunit-mock-objects",
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
@section('content') @section('content')
{{ Form::open(['route' => 'admin.dummy_small_plural_model.store', 'class' => 'form-horizontal', 'role' => 'form', 'method' => 'post', 'id' => 'create-dummy_small_model']) }} {{ Form::open(['route' => 'admin.dummy_small_plural_model.store', 'class' => 'form-horizontal', 'role' => 'form', 'method' => 'post', 'id' => 'create-dummy_small_model']) }}
<div class="box box-success"> <div class="box box-info">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ trans('labels.backend.dummy_small_plural_model.create') }}</h3> <h3 class="box-title">{{ trans('labels.backend.dummy_small_plural_model.create') }}</h3>
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
@section('content') @section('content')
{{ Form::model($dummy_small_model, ['route' => ['admin.dummy_small_plural_model.update', $dummy_small_model], 'class' => 'form-horizontal', 'role' => 'form', 'method' => 'PATCH', 'id' => 'edit-dummy_small_model']) }} {{ Form::model($dummy_small_model, ['route' => ['admin.dummy_small_plural_model.update', $dummy_small_model], 'class' => 'form-horizontal', 'role' => 'form', 'method' => 'PATCH', 'id' => 'edit-dummy_small_model']) }}
<div class="box box-success"> <div class="box box-info">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ trans('labels.backend.dummy_small_plural_model.edit') }}</h3> <h3 class="box-title">{{ trans('labels.backend.dummy_small_plural_model.edit') }}</h3>
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
@endsection @endsection
@section('content') @section('content')
<div class="box box-success"> <div class="box box-info">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ trans('labels.backend.dummy_small_plural_model.management') }}</h3> <h3 class="box-title">{{ trans('labels.backend.dummy_small_plural_model.management') }}</h3>
......
...@@ -3,14 +3,16 @@ ...@@ -3,14 +3,16 @@
* DummyModuleName * DummyModuleName
* *
*/ */
@startNamespace Route::group(['namespace' => 'route_namespace', 'prefix' => 'admin', 'as' => 'admin.', 'middleware' => 'admin'], function () {
Route::group( ['namespace' => 'DummyModel'], function () { @startNamespace
Route::group( ['namespace' => 'DummyModel'], function () {
Route::resource('dummy_name', 'DummyController');
//For Datatable
Route::post('dummy_name/get', 'DummyTableController')->name('dummy_name.get');
});
@endNamespace@startWithoutNamespace
Route::resource('dummy_name', 'DummyController'); Route::resource('dummy_name', 'DummyController');
//For Datatable //For Datatable
Route::post('dummy_name/get', 'DummyTableController')->name('dummy_name.get'); Route::post('dummy_name/get', 'DummyTableController')->name('dummy_name.get');
}); @endWithoutNamespace
@endNamespace@startWithoutNamespace });
Route::resource('dummy_name', 'DummyController'); \ No newline at end of file
//For Datatable
Route::post('dummy_name/get', 'DummyTableController')->name('dummy_name.get');
@endWithoutNamespace
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment