Commit f9e3f5fa authored by Viral Solani's avatar Viral Solani

Upgrade to Laravel 5.5

parent f78f34b8
File mode changed from 100644 to 100755
......@@ -59,7 +59,7 @@ class ResetPasswordController extends Controller
*/
protected function credentials(ResetPasswordRequest $request)
{
return $request->only(
return $request->all(
'email', 'password', 'password_confirmation', 'token'
);
}
......
......@@ -4,7 +4,7 @@ namespace DummyNamespace;
use Carbon\Carbon;
use App\Http\Controllers\Controller;
use Yajra\Datatables\Facades\Datatables;
use Yajra\DataTables\Facades\DataTables;
use DummyRepositoryNamespace;
use DummyManageRequestNamespace;
......
......@@ -4,7 +4,7 @@ namespace App\Http\Controllers\Backend\Access\Permission;
use App\Models\Access\Permission\Permission;
use App\Http\Controllers\Controller;
use Yajra\Datatables\Facades\Datatables;
use Yajra\DataTables\Facades\DataTables;
use App\Repositories\Backend\Access\Permission\PermissionRepository;
use App\Http\Requests\Backend\Access\Permission\StorePermissionRequest;
use App\Http\Requests\Backend\Access\Permission\ManagePermissionRequest;
......
......@@ -3,7 +3,7 @@
namespace App\Http\Controllers\Backend\Access\Permission;
use App\Http\Controllers\Controller;
use Yajra\Datatables\Facades\Datatables;
use Yajra\DataTables\Facades\DataTables;
use App\Repositories\Backend\Access\Permission\PermissionRepository;
use App\Http\Requests\Backend\Access\Permission\ManagePermissionRequest;
......
......@@ -3,7 +3,7 @@
namespace App\Http\Controllers\Backend\Access\Role;
use App\Http\Controllers\Controller;
use Yajra\Datatables\Facades\Datatables;
use Yajra\DataTables\Facades\DataTables;
use App\Repositories\Backend\Access\Role\RoleRepository;
use App\Http\Requests\Backend\Access\Role\ManageRoleRequest;
......
......@@ -68,7 +68,7 @@ class UserController extends Controller
*/
public function store(StoreUserRequest $request)
{
$this->users->create(['data' => $request->except('assignees_roles'), 'roles' => $request->only('assignees_roles')]);
$this->users->create(['data' => $request->except('assignees_roles'), 'roles' => $request->all('assignees_roles')]);
return redirect()->route('admin.access.user.index')->withFlashSuccess(trans('alerts.backend.users.created'));
}
......@@ -112,7 +112,7 @@ class UserController extends Controller
*/
public function update(User $user, UpdateUserRequest $request)
{
$this->users->update($user, ['data' => $request->except('assignees_roles'), 'roles' => $request->only('assignees_roles')]);
$this->users->update($user, ['data' => $request->except('assignees_roles'), 'roles' => $request->all('assignees_roles')]);
return redirect()->route('admin.access.user.index')->withFlashSuccess(trans('alerts.backend.users.updated'));
}
......
......@@ -3,7 +3,7 @@
namespace App\Http\Controllers\Backend\Access\User;
use App\Http\Controllers\Controller;
use Yajra\Datatables\Facades\Datatables;
use Yajra\DataTables\Facades\DataTables;
use App\Repositories\Backend\Access\User\UserRepository;
use App\Http\Requests\Backend\Access\User\ManageUserRequest;
use Carbon\Carbon;
......@@ -33,7 +33,7 @@ class UserTableController extends Controller
*/
public function __invoke(ManageUserRequest $request)
{
return Datatables::of($this->users->getForDataTable($request->get('status'), $request->get('trashed')))
return Datatables::make($this->users->getForDataTable($request->get('status'), $request->get('trashed')))
->escapeColumns(['first_name', 'email'])
->editColumn('confirmed', function ($user) {
return $user->confirmed_label;
......@@ -50,7 +50,6 @@ class UserTableController extends Controller
->addColumn('actions', function ($user) {
return $user->action_buttons;
})
->withTrashed()
->make(true);
}
}
......@@ -4,7 +4,7 @@ namespace App\Http\Controllers\Backend\BlogCategories;
use App\Models\BlogCategories\BlogCategory;
use App\Http\Controllers\Controller;
use Yajra\Datatables\Facades\Datatables;
use Yajra\DataTables\Facades\DataTables;
use App\Repositories\Backend\BlogCategories\BlogCategoriesRepository;
use App\Http\Requests\Backend\BlogCategories\StoreBlogCategoriesRequest;
use App\Http\Requests\Backend\BlogCategories\ManageBlogCategoriesRequest;
......
......@@ -3,7 +3,7 @@
namespace App\Http\Controllers\Backend\BlogCategories;
use App\Http\Controllers\Controller;
use Yajra\Datatables\Facades\Datatables;
use Yajra\DataTables\Facades\DataTables;
use App\Repositories\Backend\BlogCategories\BlogCategoriesRepository;
use App\Http\Requests\Backend\BlogCategories\ManageBlogCategoriesRequest;
use Carbon\Carbon;
......
......@@ -4,7 +4,7 @@ namespace App\Http\Controllers\Backend\BlogTags;
use App\Models\BlogTags\BlogTag;
use App\Http\Controllers\Controller;
use Yajra\Datatables\Facades\Datatables;
use Yajra\DataTables\Facades\DataTables;
use App\Repositories\Backend\BlogTags\BlogTagsRepository;
use App\Http\Requests\Backend\BlogTags\StoreBlogTagsRequest;
use App\Http\Requests\Backend\BlogTags\ManageBlogTagsRequest;
......
......@@ -3,7 +3,7 @@
namespace App\Http\Controllers\Backend\BlogTags;
use App\Http\Controllers\Controller;
use Yajra\Datatables\Facades\Datatables;
use Yajra\DataTables\Facades\DataTables;
use App\Repositories\Backend\BlogTags\BlogTagsRepository;
use App\Http\Requests\Backend\BlogTags\ManageBlogTagsRequest;
use Carbon\Carbon;
......
......@@ -6,7 +6,7 @@ use App\Models\Blogs\Blog;
use App\Models\BlogTags\BlogTag;
use App\Models\BlogCategories\BlogCategory;
use App\Http\Controllers\Controller;
use Yajra\Datatables\Facades\Datatables;
use Yajra\DataTables\Facades\DataTables;
use App\Repositories\Backend\Blogs\BlogsRepository;
use App\Http\Requests\Backend\Blogs\StoreBlogsRequest;
use App\Http\Requests\Backend\Blogs\ManageBlogsRequest;
......@@ -38,9 +38,9 @@ class BlogsController extends Controller
public function index(ManageBlogsRequest $request)
{
$status = [
"Published" => "Published",
"Draft" => "Draft",
"Inactive" => "Inactive",
"Published" => "Published",
"Draft" => "Draft",
"Inactive" => "Inactive",
"Scheduled" => "Scheduled"
];
......@@ -57,9 +57,9 @@ class BlogsController extends Controller
$blogCategories = BlogCategory::where('status', 1)->pluck('name', 'id');
$blogTags = BlogTag::where('status', 1)->pluck('name', 'id');
$status = [
"Published" => "Published",
"Draft" => "Draft",
"Inactive" => "Inactive",
"Published" => "Published",
"Draft" => "Draft",
"Inactive" => "Inactive",
"Scheduled" => "Scheduled"
];
......@@ -92,17 +92,17 @@ class BlogsController extends Controller
$blogCategories = BlogCategory::where('status', 1)->pluck('name', 'id');
$blogTags = BlogTag::where('status', 1)->pluck('name', 'id');
$status = [
"Published" => "Published",
"Draft" => "Draft",
"InActive" => "InActive",
"Published" => "Published",
"Draft" => "Draft",
"InActive" => "InActive",
"Scheduled" => "Scheduled"
];
$selectedCategories = $blog->categories->pluck('id')->toArray();
$selectedtags = $blog->tags->pluck('id')->toArray();
return view('backend.blogs.edit', compact(
"blogCategories",
"blogTags",
"blogCategories",
"blogTags",
"status",
"selectedCategories",
"selectedtags")
......
......@@ -3,7 +3,7 @@
namespace App\Http\Controllers\Backend\Blogs;
use App\Http\Controllers\Controller;
use Yajra\Datatables\Facades\Datatables;
use Yajra\DataTables\Facades\DataTables;
use App\Repositories\Backend\Blogs\BlogsRepository;
use App\Http\Requests\Backend\Blogs\ManageBlogsRequest;
use Carbon\Carbon;
......
......@@ -4,7 +4,7 @@ namespace App\Http\Controllers\Backend\CMSPages;
use App\Models\CMSPages\CMSPage;
use App\Http\Controllers\Controller;
use Yajra\Datatables\Facades\Datatables;
use Yajra\DataTables\Facades\DataTables;
use App\Repositories\Backend\CMSPages\CMSPagesRepository;
use App\Http\Requests\Backend\CMSPages\StoreCMSPagesRequest;
use App\Http\Requests\Backend\CMSPages\ManageCMSPagesRequest;
......
......@@ -3,7 +3,7 @@
namespace App\Http\Controllers\Backend\CMSPages;
use App\Http\Controllers\Controller;
use Yajra\Datatables\Facades\Datatables;
use Yajra\DataTables\Facades\DataTables;
use App\Repositories\Backend\CMSPages\CMSPagesRepository;
use App\Http\Requests\Backend\CMSPages\ManageCMSPagesRequest;
use Carbon\Carbon;
......
......@@ -6,7 +6,7 @@ use App\Models\EmailTemplates\EmailTemplate;
use App\Models\EmailTemplateTypes\EmailTemplateType;
use App\Models\EmailTemplatePlaceholders\EmailTemplatePlaceholder;
use App\Http\Controllers\Controller;
use Yajra\Datatables\Facades\Datatables;
use Yajra\DataTables\Facades\DataTables;
use App\Repositories\Backend\EmailTemplates\EmailTemplatesRepository;
use App\Http\Requests\Backend\EmailTemplates\ManageEmailTemplatesRequest;
use App\Http\Requests\Backend\EmailTemplates\EditEmailTemplatesRequest;
......@@ -34,7 +34,7 @@ class EmailTemplatesController extends Controller
}
/**
* Use to load index view of EmailTmplates
* Use to load index view of EmailTmplates
*
* @param ManageEmailTemplatesRequest $request
*
......@@ -53,7 +53,7 @@ class EmailTemplatesController extends Controller
*
* @return mixed
*/
public function edit(EmailTemplate $emailtemplate, EditEmailTemplatesRequest
public function edit(EmailTemplate $emailtemplate, EditEmailTemplatesRequest
$request)
{
$emailtemplateTypes = EmailTemplateType::pluck('name', 'id');
......@@ -72,7 +72,7 @@ class EmailTemplatesController extends Controller
*
* @return mixed
*/
public function update(EmailTemplate $emailtemplate, UpdateEmailTemplatesRequest
public function update(EmailTemplate $emailtemplate, UpdateEmailTemplatesRequest
$request)
{
$this->emailtemplates->update($emailtemplate, $request->all());
......@@ -88,7 +88,7 @@ class EmailTemplatesController extends Controller
*
* @return mixed
*/
public function destroy(EmailTemplate $emailtemplate, DeleteEmailTemplatesRequest
public function destroy(EmailTemplate $emailtemplate, DeleteEmailTemplatesRequest
$request)
{
$this->emailtemplates->delete($emailtemplate);
......
......@@ -3,7 +3,7 @@
namespace App\Http\Controllers\Backend\EmailTemplates;
use App\Http\Controllers\Controller;
use Yajra\Datatables\Facades\Datatables;
use Yajra\DataTables\Facades\DataTables;
use App\Repositories\Backend\EmailTemplates\EmailTemplatesRepository;
use App\Http\Requests\Backend\EmailTemplates\ManageEmailTemplatesRequest;
use Carbon\Carbon;
......
......@@ -4,7 +4,7 @@ namespace App\Http\Controllers\Backend\Faqs;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use Yajra\Datatables\Facades\Datatables;
use Yajra\DataTables\Facades\DataTables;
use App\Repositories\Backend\Faqs\FaqsRepository;
use App\Http\Requests\Backend\Faqs\ManageFaqsRequest;
use Carbon\Carbon;
......
......@@ -4,7 +4,7 @@ namespace App\Http\Controllers\Backend\Menu;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use Yajra\Datatables\Facades\Datatables;
use Yajra\DataTables\Facades\DataTables;
use App\Repositories\Backend\Menu\MenuRepository;
use App\Http\Requests\Backend\Menu\ManageMenuRequest;
use Carbon\Carbon;
......
......@@ -4,7 +4,7 @@ namespace App\Http\Controllers\Backend\Module;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use Yajra\Datatables\Facades\Datatables;
use Yajra\DataTables\Facades\DataTables;
use App\Repositories\Backend\Module\ModuleRepository;
use App\Http\Requests\Backend\Modules\ManageModuleRequest;
......
......@@ -17,7 +17,7 @@ class SearchController extends Controller
*/
public function index(Request $request)
{
if (! $request->has('q')) {
if (! $request->filled('q')) {
return redirect()
->route('admin.dashboard')
->withFlashDanger(trans('strings.backend.search.empty'));
......
......@@ -9,27 +9,29 @@
"license": "MIT",
"type": "project",
"require": {
"php": ">=5.6.4",
"arcanedev/log-viewer": "~4.0",
"arcanedev/no-captcha": "~3.0",
"php": ">=7.0.0",
"arcanedev/log-viewer": "^4.4",
"arcanedev/no-captcha": "^5.0",
"creativeorange/gravatar": "~1.0",
"davejamesmiller/laravel-breadcrumbs": "^3.0",
"dingo/api": "1.0.x@dev",
"doctrine/dbal": "^2.5",
"hieu-le/active": "~3.0",
"laravel/framework": "5.4.*",
"davejamesmiller/laravel-breadcrumbs": "^4.1",
"fideloper/proxy": "~3.3",
"hieu-le/active": "^3.5",
"laravel/framework": "5.5.*",
"laravel/socialite": "^3.0",
"laravel/tinker": "~1.0",
"laravelcollective/html": "5.4.*",
"tymon/jwt-auth": "^0.5.11",
"yajra/laravel-datatables-oracle": "^7.0"
"laravelcollective/html": "^5.5.0",
"doctrine/dbal": "^2.5",
"tymon/jwt-auth": "0.5.12",
"yajra/laravel-datatables-oracle":"~8.0",
"dingo/api":"v1.0.0-beta8"
},
"require-dev": {
"fzaninotto/faker": "~1.4",
"mockery/mockery": "0.9.*",
"phpunit/phpunit": "~5.7",
"barryvdh/laravel-debugbar": "^2.1",
"laravel/browser-kit-testing": "^1.0"
"phpunit/phpunit": "~6.0",
"barryvdh/laravel-debugbar": "^3.0",
"laravel/browser-kit-testing": "^1.0",
"filp/whoops":"~2.0"
},
"autoload": {
"classmap": [
......@@ -65,6 +67,10 @@
"post-update-cmd": [
"Illuminate\\Foundation\\ComposerScripts::postUpdate",
"php artisan optimize"
],
"post-autoload-dump": [
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
"@php artisan package:discover"
]
},
"config": {
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -12,7 +12,7 @@ return [
| any other location as required by the application or its packages.
*/
'name' => env('APP_NAME', 'Laravel 5 Boilerplate'),
'name' => env('APP_NAME', 'Laravel AdminPanel'),
/*
|--------------------------------------------------------------------------
......@@ -181,11 +181,11 @@ return [
Arcanedev\NoCaptcha\NoCaptchaServiceProvider::class,
Collective\Html\HtmlServiceProvider::class,
Creativeorange\Gravatar\GravatarServiceProvider::class,
DaveJamesMiller\Breadcrumbs\ServiceProvider::class,
#DaveJamesMiller\Breadcrumbs\ServiceProvider::class,
HieuLe\Active\ActiveServiceProvider::class,
Laravel\Socialite\SocialiteServiceProvider::class,
Laravel\Tinker\TinkerServiceProvider::class,
Yajra\Datatables\DatatablesServiceProvider::class,
Yajra\DataTables\DataTablesServiceProvider::class,
/*
* Application Service Providers...
......@@ -262,7 +262,8 @@ return [
'Gravatar' => Creativeorange\Gravatar\Facades\Gravatar::class,
'Html' => Collective\Html\HtmlFacade::class,
'Socialite' => Laravel\Socialite\Facades\Socialite::class,
'JWTAuth' => Tymon\JWTAuth\Facades\JWTAuth::class,
'JWTAuth' => Tymon\JWTAuth\Facades\JWTAuth::class,
#'Datatables' => Yajra\DataTables\Facades\DataTables::class
],
......
<?php
return [
/*
/**
* DataTables search options.
*/
'search' => [
/*
/**
* Smart search will enclose search keyword with wildcard string "%keyword%".
* SQL: column LIKE "%keyword%"
*/
'smart' => true,
/*
/**
* Multi-term search will explode search keyword using spaces resulting into multiple term search.
*/
'multi_term' => true,
/**
* Case insensitive will search the keyword in lower case format.
* SQL: LOWER(column) LIKE LOWER(keyword)
*/
'case_insensitive' => true,
/*
/**
* Wild card will add "%" in between every characters of the keyword.
* SQL: column LIKE "%k%e%y%w%o%r%d%"
*/
'use_wildcards' => false,
],
/*
/**
* DataTables internal index id response column name.
*/
'index_column' => 'DT_Row_Index',
/*
* DataTables fractal configurations.
*/
'fractal' => [
/*
* Request key name to parse includes on fractal.
*/
'includes' => 'include',
/*
* Default fractal serializer.
*/
'serializer' => League\Fractal\Serializer\DataArraySerializer::class,
],
/*
* Datatables list of available engines.
* This is where you can register your custom datatables engine.
/**
* List of available builders for DataTables.
* This is where you can register your custom dataTables builder.
*/
'engines' => [
'eloquent' => Yajra\Datatables\Engines\EloquentEngine::class,
'query' => Yajra\Datatables\Engines\QueryBuilderEngine::class,
'collection' => Yajra\Datatables\Engines\CollectionEngine::class,
'eloquent' => \Yajra\DataTables\EloquentDataTable::class,
'query' => \Yajra\DataTables\QueryDataTable::class,
'collection' => \Yajra\DataTables\CollectionDataTable::class,
],
/*
* Datatables accepted builder to engine mapping.
/**
* DataTables accepted builder to engine mapping.
*/
'builders' => [
Illuminate\Database\Eloquent\Relations\Relation::class => 'eloquent',
......@@ -64,9 +54,60 @@ return [
Illuminate\Support\Collection::class => 'collection',
],
/*
/**
* Nulls last sql pattern for Posgresql & Oracle.
* For MySQL, use '-%s %s'
*/
'nulls_last_sql' => '%s %s NULLS LAST',
/**
* User friendly message to be displayed on user if error occurs.
* Possible values:
* null - The exception message will be used on error response.
* 'throw' - Throws a \Yajra\DataTables\Exceptions\Exception. Use your custom error handler if needed.
* 'custom message' - Any friendly message to be displayed to the user. You can also use translation key.
*/
'error' => env('DATATABLES_ERROR', null),
/**
* Default columns definition of dataTable utility functions.
*/
'columns' => [
/**
* List of columns hidden/removed on json response.
*/
'excess' => ['rn', 'row_num'],
/**
* List of columns to be escaped. If set to *, all columns are escape.
* Note: You can set the value to empty array to disable XSS protection.
*/
'escape' => '*',
/**
* List of columns that are allowed to display html content.
* Note: Adding columns to list will make us available to XSS attacks.
*/
'raw' => ['action'],
/**
* List of columns are are forbidden from being searched/sorted.
*/
'blacklist' => ['password', 'remember_token'],
/**
* List of columns that are only allowed fo search/sort.
* If set to *, all columns are allowed.
*/
'whitelist' => '*',
],
/*
* JsonResponse header and options config.
*/
'json' => [
'header' => [],
'options' => 0,
],
];
......@@ -30,7 +30,7 @@ return [
'general' => [
'all_rights_reserved' => 'جميع الحقوق محفوظة.',
'are_you_sure' => 'هل أنت متأكد؟',
'boilerplate_link' => 'Laravel 5 Boilerplate',
'boilerplate_link' => 'Laravel AdminPanel',
'continue' => 'متابعة',
'member_since' => 'عضو منذ',
'minutes' => ' minutes',
......@@ -69,7 +69,7 @@ return [
<p>أتمنى أن تستمع بالمجهود الذي بذلته في هذا العمل. الرجاء زيارة صفحة <a href="https://github.com/rappasoft/laravel-5-boilerplate" target="_blank">GitHub</a> للمزيد من المعلومات أو <a href="https://github.com/rappasoft/Laravel-5-Boilerplate/issues" target="_blank">الإبلاغ عن الأخطاء أو المشاكل</a>.</p>
<p><strong>هذا المشروع من الصعب عليه جدا مواكبة المعدل الذي يتغير عليه فرع Laravel الرئيسي، لذلك أي مساعدة سوف تكون محل تقدير.</strong></p>
<p>- أنتوني ربّا</p>
<p>- Anthony Rappa</p>',
<p>- Viral Solani</p>',
],
'emails' => [
......
......@@ -30,7 +30,7 @@ return [
'general' => [
'all_rights_reserved' => 'Alle rettigheder forbeholdes.',
'are_you_sure' => 'Er du sikker?',
'boilerplate_link' => 'Laravel 5 Boilerplate',
'boilerplate_link' => 'Laravel AdminPanel',
'continue' => 'Fortsæt',
'member_since' => 'Medlem siden',
'minutes' => ' minutter',
......@@ -67,7 +67,7 @@ return [
<p>Vær opmærksom på at dette er et videregående projekt og der kan derfor forekomme fejl eller andre problemer, som jeg ikke er stødt på endnu. Jeg vil gøre mit bedste for at rette dem når jeg modtager dem.</p>
<p>Håber at du er glad for indsatsen jeg har givet dette projekt. Du er velkommen til at besøge os på <a href="https://github.com/rappasoft/laravel-5-boilerplate" target="_blank">GitHub</a> for mere information og du kan samtidig med indberette <a href="https://github.com/rappasoft/Laravel-5-Boilerplate/issues" target="_blank">fejl her</a>.</p>
<p><strong>Dette projekt er rimelig omfattende at vedligeholde med de mange opdateringer Laravel indfører i deres master branch, så alle former for hjælp er værdsat.</strong></p>
<p>- Anthony Rappa</p>',
<p>- Viral Solani</p>',
],
'emails' => [
'auth' => [
......
......@@ -30,7 +30,7 @@ return [
'general' => [
'all_rights_reserved' => 'Alle Rechte vorbehalten.',
'are_you_sure' => 'Bist du dir sicher?',
'boilerplate_link' => 'Laravel 5 Boilerplate',
'boilerplate_link' => 'Laravel AdminPanel',
'continue' => 'Forsetzen',
'member_since' => 'Mitglied seit',
'minutes' => ' minutes',
......@@ -67,7 +67,7 @@ return [
<p>Denken Sie daran, es ist \'work in progress\' und möglicherweise gibt es Fehler oder andere Probleme die ich noch nicht gesehen habe. Ich werde mein Bestes tun, um sie zu beheben, wie sie gemeldet werden.</p>
<p>Hoffentlich genießen Sie die Arbeit, die ich hier reingesteckt habe. Bitte besuche die <a href="https://github.com/rappasoft/laravel-5-boilerplate" target="_blank">GitHub</a> Seite für weitere Informationen und meldet alle <a href="https://github.com/rappasoft/Laravel-5-Boilerplate/issues" target="_blank">Fehler hier</a>.</p>
<p><strong>This project is very demanding to keep up with given the rate at which the master Laravel branch changes, so any help is appreciated.</strong></p>
<p>- Anthony Rappa</p>',
<p>- Viral Solani</p>',
],
'emails' => [
......
......@@ -30,7 +30,7 @@ return [
'general' => [
'all_rights_reserved' => 'All Rights Reserved.',
'are_you_sure' => 'Are you sure?',
'boilerplate_link' => 'Laravel 5 Boilerplate',
'boilerplate_link' => 'Laravel AdminPanel',
'continue' => 'Continue',
'member_since' => 'Member since',
'minutes' => ' minutes',
......@@ -67,7 +67,7 @@ return [
<p>Keep in mind it is a work in progress and their may be bugs or other issues I have not come across. I will do my best to fix them as I receive them.</p>
<p>Hope you enjoy all of the work I have put into this. Please visit the <a href="https://github.com/rappasoft/laravel-5-boilerplate" target="_blank">GitHub</a> page for more information and report any <a href="https://github.com/rappasoft/Laravel-5-Boilerplate/issues" target="_blank">issues here</a>.</p>
<p><strong>This project is very demanding to keep up with given the rate at which the master Laravel branch changes, so any help is appreciated.</strong></p>
<p>- Anthony Rappa</p>',
<p>- Viral Solani</p>',
],
'emails' => [
......
......@@ -30,7 +30,7 @@ return [
'general' => [
'all_rights_reserved' => 'All Rights Reserved.',
'are_you_sure' => 'Are you sure you want to do this?',
'boilerplate_link' => 'Laravel 5 Boilerplate',
'boilerplate_link' => 'Laravel AdminPanel',
'continue' => 'Continue',
'member_since' => 'Member since',
'minutes' => ' minutes',
......@@ -67,7 +67,7 @@ return [
<p>Keep in mind it is a work in progress and their may be bugs or other issues I have not come across. I will do my best to fix them as I receive them.</p>
<p>Hope you enjoy all of the work I have put into this. Please visit the <a href="https://github.com/rappasoft/laravel-5-boilerplate" target="_blank">GitHub</a> page for more information and report any <a href="https://github.com/rappasoft/Laravel-5-Boilerplate/issues" target="_blank">issues here</a>.</p>
<p><strong>This project is very demanding to keep up with given the rate at which the master Laravel branch changes, so any help is appreciated.</strong></p>
<p>- Anthony Rappa</p>',
<p>- Viral Solani</p>',
],
'emails' => [
......
......@@ -30,7 +30,7 @@ return [
'general' => [
'all_rights_reserved' => 'Todos los derechos reservados.',
'are_you_sure' => 'Está seguro?',
'boilerplate_link' => 'Laravel 5 Boilerplate',
'boilerplate_link' => 'Laravel AdminPanel',
'continue' => 'Continuar',
'member_since' => 'Miembro desde',
'minutes' => ' minutos',
......@@ -67,7 +67,7 @@ return [
<p>Tenga presente que esta plantilla sigue estando en desarrollo y puene contener errores. Hare lo que este en mis manos para enmendarlos.</p>
<p>Espero que disfrute y aprecie el trabajo depositado en este proyecto. Por favor, visite <a href="https://github.com/rappasoft/laravel-5-boilerplate" target="_blank">GitHub</a> para mas información o reportar error <a href="https://github.com/rappasoft/Laravel-5-Boilerplate/issues" target="_blank">aquí</a>.</p>
<p><strong>Este proyecto es muy demandante para mantenerse al día con la frecuencia en que el master branch de laravel va cambiando, por tanto cualquier ayuda será apreciada.</strong></p>
<p>- Anthony Rappa</p>',
<p>- Viral Solani</p>',
],
'emails' => [
......
......@@ -30,7 +30,7 @@ return [
'general' => [
'all_rights_reserved' => 'Tous droits réservés.',
'are_you_sure' => 'Etes-vous sûr?',
'boilerplate_link' => 'Laravel 5 Boilerplate',
'boilerplate_link' => 'Laravel AdminPanel',
'continue' => 'Continuer',
'member_since' => 'Membre depuis',
'minutes' => ' minutes',
......@@ -67,7 +67,7 @@ return [
<p>Gardez à l\'esprit que c\'est un travail en cours et qu\'il peut subsister quelques anomalies ou bugs qui n\'ont pas été corrigés. Je ferai de mon mieux pour y remédier.</p>
<p>J\'espère que vous apprécierez le travail que j\'ai mis dans ce projet. Visitez la page <a href="https://github.com/rappasoft/laravel-5-boilerplate" target="_blank">GitHub</a> pour plus d\'informations et enregistrez les <a href="https://github.com/rappasoft/Laravel-5-Boilerplate/issues" target="_blank">anomalies ici</a>.</p>
<p><strong>Ce projet demande beaucoup d\'efforts au vu du rythme soutenu des changements apportés à la branche master de Laravel, toute aide est bienvenue.</strong></p>
<p>- Anthony Rappa</p>',
<p>- Viral Solani</p>',
],
'emails' => [
......
......@@ -30,7 +30,7 @@ return [
'general' => [
'all_rights_reserved' => 'Hak Cipta Dilindungi.',
'are_you_sure' => 'Anda yakin?',
'boilerplate_link' => 'Laravel 5 Boilerplate',
'boilerplate_link' => 'Laravel AdminPanel',
'continue' => 'Lanjutjan',
'member_since' => 'Anggota sejak',
'minutes' => ' menit',
......@@ -67,7 +67,7 @@ return [
<p>Perlu diingat ini adalah sebuah pekerjaan yang sedang berjalan dan mungkin ada bug atau masalah lain yang saya belum temukan. Saya akan melakukan yang terbaik untuk memperbaikinya saat saya menemukannya.</p>
<p>Harap Anda menikmati semua pekerjaan yang saya telah lakukan disini. Silakan kunjungi ke halaman <a href="https://github.com/rappasoft/laravel-5-boilerplate" target="_blank">GitHub</a> untuk informasi lebih lanjut dan melaporkan masalah apapun <a href="https://github.com/rappasoft/Laravel-5-Boilerplate/issues" target="_blank">di sini</a>.</p>
<p><strong>Proyek ini sangat menuntut untuk menjaga kelangsungan dengan perubahan yang diberikan branch master Laravel, sehingga bantuan dihargai.</strong></p>
<p>- Anthony Rappa</p>',
<p>- Viral Solani</p>',
],
'emails' => [
......
......@@ -30,7 +30,7 @@ return [
'general' => [
'all_rights_reserved' => 'Tutti i diritti riservati.',
'are_you_sure' => 'Sei sicuro?',
'boilerplate_link' => 'Laravel 5 Boilerplate',
'boilerplate_link' => 'Laravel AdminPanel',
'continue' => 'Continua',
'member_since' => 'Membro dal',
'minutes' => ' minutes',
......@@ -73,7 +73,7 @@ return [
Per cortesia vai su <a href="https://github.com/rappasoft/laravel-5-boilerplate" target="_blank">GitHub</a>
per ulteriori informazioni e per segnalare qualsiasi <a href="https://github.com/rappasoft/Laravel-5-Boilerplate/issues" target="_blank">problema</a>.</p>
<p><strong>This project is very demanding to keep up with given the rate at which the master Laravel branch changes, so any help is appreciated.</strong></p>
<p>- Anthony Rappa</p>',
<p>- Viral Solani</p>',
],
'emails' => [
......
......@@ -30,7 +30,7 @@ return [
'general' => [
'all_rights_reserved' => 'Alle Rechten Voorbehouden.',
'are_you_sure' => 'Zeker?',
'boilerplate_link' => 'Laravel 5 Boilerplate',
'boilerplate_link' => 'Laravel AdminPanel',
'continue' => 'Doorgaan',
'member_since' => 'Lid sinds',
'minutes' => ' minuten',
......@@ -67,7 +67,7 @@ return [
<p>Bedenk wel dat dit werk in uitvoering is en dat er fouten of andere problemen kunnen zijn die ik niet ben tegengekomen. Ik zal mijn best doen om deze te repareren wanneer ik deze ontvang.</p>
<p>Hopelijk geniet je van alle werk dat ik hierin heb gestopt. Bezoek de <a href="https://github.com/rappasoft/laravel-5-boilerplate" target="_blank">GitHub</a> pagina voor meer informatie en om <a href="https://github.com/rappasoft/Laravel-5-Boilerplate/issues" target="_blank">problemen</a> te rapporteren.</p>
<p><strong> Dit project is zeer veeleisend om bij te houden gegeven de snelheid waarmee de master Laravel branch verandert, dus elke vorm van hulp wordt gewaardeert.</strong></p>
<p>- Anthony Rappa</p>',
<p>- Viral Solani</p>',
],
'emails' => [
'auth' => [
......
......@@ -28,7 +28,7 @@ return [
'general' => [
'all_rights_reserved' => 'Todos os direitos reservados.',
'are_you_sure' => 'Tem certeza?',
'boilerplate_link' => 'Laravel 5 Boilerplate',
'boilerplate_link' => 'Laravel AdminPanel',
'continue' => 'Continuar',
'member_since' => 'Membro desde',
'minutes' => ' minutos',
......@@ -61,7 +61,7 @@ return [
<p>Tenha em mente que este é um trabalho em andamento e podem existir <i>bugs</i> ou outros problemas pelos quais não passei. Farei o meu melhor para corrigí-los à medida em que os recebo.</p>
<p>Espero que você aproveite todo o trabalho que coloquei nisto. Por favor, visite a página do <a href="https://github.com/rappasoft/laravel-5-boilerplate" target="_blank">GitHub</a> para maiores informações e reporte quaisquer <a href="https://github.com/rappasoft/Laravel-5-Boilerplate/issues" target="_blank">problemas aqui</a>.</p>
<p><strong>This project is very demanding to keep up with given the rate at which the master Laravel branch changes, so any help is appreciated.</strong></p>
<p>- Anthony Rappa</p>',
<p>- Viral Solani</p>',
],
'emails' => [
'auth' => [
......
......@@ -29,7 +29,7 @@ return [
'general' => [
'all_rights_reserved' => 'Все права защищены.',
'are_you_sure' => 'Вы уверены?',
'boilerplate_link' => 'Laravel 5 Boilerplate',
'boilerplate_link' => 'Laravel AdminPanel',
'continue' => 'Продолжить',
'member_since' => 'Пользователь с',
'minutes' => 'минут',
......@@ -57,14 +57,14 @@ return [
'title' => 'Результаты поиска',
],
'welcome' => <<<'TEXT'
<p>В этой системе управления <strong>"Laravel 5 Boilerplate"</strong>, использована тема оформления <strong>AdminLTE</strong> с минимальным набором стилей и скриптов из этой темы, для полноценной работы этого приложения на данном примере.</p>
<p>В этой системе управления <strong>"Laravel AdminPanel"</strong>, использована тема оформления <strong>AdminLTE</strong> с минимальным набором стилей и скриптов из этой темы, для полноценной работы этого приложения на данном примере.</p>
<p>Вы можете скачать полную версию <strong>AdminLTE</strong> шаблона по адресу <a href="https://almsaeedstudio.com/" target="_blank">https://almsaeedstudio.com/</a>, и добавить в это приложение необходимые вам компоненты на ваше усмотрение.</p>
<p>Это приложение поставляется с <strong>полнофункциональной библиотекой управления пользователями, и с разграничением пользователей на основе ролей и разрешений.</strong></p>
<p>Имейте в виду, что это приложение постоянно совершенствуется мною и может иметь ошибки, с которыми я еще не сталкивался, и я делаю все возможное, чтобы исправить их, как только я буду знать о них.</p>
<p>Надеюсь, что Вам понравится мой труд, который я вложил в это приложение.</p>
<p>Пожалуйста, посетите <a href="https://github.com/rappasoft/laravel-5-boilerplate" target="_blank">GitHub</a> страницу, для получения дополнительной информации, и оставить любые вопросы и предложения.</p>
<p><strong>Этот проект является востребованным, и чтобы не отставать от очень быстро развивающегося Фреймворка laravel, любая помощь приветствуется.</strong></p>
<p>- Anthony Rappa</p>
<p>- Viral Solani</p>
TEXT
,
],
......
......@@ -30,7 +30,7 @@ return [
'general' => [
'all_rights_reserved' => 'Alla rättigheter förbehålls.',
'are_you_sure' => 'Är du säker?',
'boilerplate_link' => 'Laravel 5 Boilerplate',
'boilerplate_link' => 'Laravel AdminPanel',
'continue' => 'Fortsätt',
'member_since' => 'Registrerad',
'minutes' => ' minutes',
......@@ -70,7 +70,7 @@ Denna boilerplate kommer med fullt funktionerande <em>Access Control Library</em
<p>Tänk på att detta repo fortfarande utvecklas och att det kan förekomma buggar och fel som ännu inte upptäckts. Jag ska göra mitt bästa för att förebygga detta.</p>
<p>Hoppas att du tycker om detta projekt som jag lagt ner så mycket tid i. Besök repots <a href="https://github.com/rappasoft/laravel-5-boilerplate" target="_blank">GitHub</a> för att få mer information och rapportera gärna dina tankar/fel som <a href="https://github.com/rappasoft/Laravel-5-Boilerplate/issues" target="_blank">"issues" här</a>.</p>
<p><strong>This project is very demanding to keep up with given the rate at which the master Laravel branch changes, so any help is appreciated.</strong></p>
<p>- Anthony Rappa</p>',
<p>- Viral Solani</p>',
],
'emails' => [
'auth' => [
......
......@@ -30,7 +30,7 @@ return [
'general' => [
'all_rights_reserved' => 'ขอสงวนสิทธิ์',
'are_you_sure' => 'คุณแน่ใจหรือ?',
'boilerplate_link' => 'Laravel 5 Boilerplate',
'boilerplate_link' => 'Laravel AdminPanel',
'continue' => 'ทำต่อ',
'member_since' => 'เป็นสมาชิกตั้งแต่',
'minutes' => ' นาที',
......@@ -63,11 +63,11 @@ return [
],
'welcome' => '<p>นี่คือธีม AdminLTE โดย <a href="https://almsaeedstudio.com/" target="_blank">https://almsaeedstudio.com/</a> ซึ่งเป็นเวอร์ชั่นตัดทอน เหลือสไตล์ชีทและสคริปต์ที่จำเป็น คุณสามารถดาวน์โหลดเวอร์ชั่นเต็มเพิ่มเติม เพื่อเพิ่มคอมโพเนนท์ให้กับแผงควบคุม</p>
<p>การทำงานทั้งหมดเป็นเพียงตัวอย่าง ยกเว้น<strong>การจัดการผู้ใช้</strong>ทางด้านซ้าย Laravel 5 Boilerplate มาพร้อมกับไลบรารี่เต็มรูปแบบเพื่อควบคุมและจัดการ ผู้ใช้/บทบาท/สิทธิ์</p>
<p>การทำงานทั้งหมดเป็นเพียงตัวอย่าง ยกเว้น<strong>การจัดการผู้ใช้</strong>ทางด้านซ้าย Laravel AdminPanel มาพร้อมกับไลบรารี่เต็มรูปแบบเพื่อควบคุมและจัดการ ผู้ใช้/บทบาท/สิทธิ์</p>
<p>โปรดระลึกว่านี่เป็นงานที่อยู่ระหว่างการพัฒนา และอาจเกิดบั๊กหรือข้อผิดพลาดอื่นๆที่ยังไม่ถูกค้นพบ เมื่อรับทราบ ทางทีมงานจะทำเต็มที่เพื่อแก้ไขปัญหาที่เกิดขึ้น</p>
<p>หวังว่าคุณจะได้รับประโยชน์จากผลงานทั้งหมดนี้ที่ทางทีมงานทุ่มเทสร้างขึ้น กรุณาเยี่ยมชมหน้าของ <a href="https://github.com/rappasoft/laravel-5-boilerplate" target="_blank">GitHub</a> เพื่อข้อมูลเพิ่มเติมและ <a href="https://github.com/rappasoft/Laravel-5-Boilerplate/issues" target="_blank">รายงานข้อผิดพลาด</a> ได้ที่นี่</p>
<p><strong>โปรเจคนี้ต้องการการดูแลอัพเดทอย่างสม่ำเสมอ เนื่องด้วยการเปลี่ยนแปลงและพัฒนาของ master branch ของ Laravel Framework ดังนั้นทางทีมงานยินดีอย่างยิ่ง หากได้รับการช่วยเหลือ</strong></p>
<p>- Anthony Rappa</p>',
<p>- Viral Solani</p>',
],
'emails' => [
......
......@@ -8,7 +8,9 @@
<!-- logo for regular state and mobile devices -->
<span class="logo-lg">
@php $settings = settings(); @endphp
@php
$settings = settings();
@endphp
@if($settings->logo)
<img height="48" width="226" class="navbar-brand" src="{{route('frontend.index')}}/img/site_logo/{{$settings->logo}}">
@else
......
......@@ -10,7 +10,7 @@
<!-- Meta -->
<meta name="description" content="@yield('meta_description', 'Default Description')">
<meta name="author" content="@yield('meta_author', 'Anthony Rappa')">
<meta name="author" content="@yield('meta_author', 'Viral Solani')">
<!--Lato Fonts Included-->
<link href="https://fonts.googleapis.com/css?family=Lato:300,300i,400,400i,700,700i,900,900i" rel="stylesheet">
@yield('meta')
......@@ -60,7 +60,7 @@
@yield('page-header')
{{-- Change to Breadcrumbs::render() if you want it to error to remind you to create the breadcrumbs for the given route --}}
{!! Breadcrumbs::renderIfExists() !!}
{{-- {!! Breadcrumbs::render() !!} --}}
</section>
<!-- Main content -->
......
......@@ -48,7 +48,7 @@
{{ Form::close() }}
<div class="row text-center">
{!! $socialite_links !!}
</div>
</div><!-- panel body -->
......
......@@ -12,8 +12,8 @@
<title>@yield('title', app_name())</title>
<!-- Meta -->
<meta name="description" content="@yield('meta_description', 'Laravel 5 Boilerplate')">
<meta name="author" content="@yield('meta_author', 'Anthony Rappa')">
<meta name="description" content="@yield('meta_description', 'Laravel AdminPanel')">
<meta name="author" content="@yield('meta_author', 'Viral Solani')">
@yield('meta')
<!-- Styles -->
......@@ -59,6 +59,7 @@
{{ Html::script('js/jquerysession.js') }}
{{ Html::script('js/frontend/frontend.js') }}
{!! Html::script('js/select2/select2.js') !!}
<script type="text/javascript">
if("{{Route::currentRouteName()}}" !== "frontend.user.account")
{
......
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