From: Vincent Vanwaelscappel Date: Tue, 19 Feb 2019 14:14:50 +0000 (+0100) Subject: wip #2562 @ X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=6f614872a19c29ded88e242573067ec742b16dfc;p=pmi.git wip #2562 @ --- diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index a3d8c48..348665a 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -19,6 +19,7 @@ class Kernel extends HttpKernel \App\Http\Middleware\TrimStrings::class, \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class, \App\Http\Middleware\TrustProxies::class, + \Spatie\MissingPageRedirector\RedirectsMissingPages::class, ]; /** diff --git a/composer.json b/composer.json index 6f8bf06..4f89bb2 100644 --- a/composer.json +++ b/composer.json @@ -24,6 +24,7 @@ "predis/predis": "^1.1", "spatie/laravel-analytics": "^3.6", "spatie/laravel-googletagmanager": "^2.6", + "spatie/laravel-missing-page-redirector": "^2.3", "spatie/laravel-sitemap": "^5.2" }, "require-dev": { diff --git a/composer.lock b/composer.lock index 414b586..98b2ec5 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "cbac4995deb7e09b4f49966aca57cb05", + "content-hash": "721d680850502e49c5b71cc2e5d37926", "packages": [ { "name": "almasaeed2010/adminlte", @@ -4513,6 +4513,62 @@ ], "time": "2018-10-29T10:21:45+00:00" }, + { + "name": "spatie/laravel-missing-page-redirector", + "version": "2.3.3", + "source": { + "type": "git", + "url": "https://github.com/spatie/laravel-missing-page-redirector.git", + "reference": "909987996ed175443aeed441efa2fa29d63b8c3e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spatie/laravel-missing-page-redirector/zipball/909987996ed175443aeed441efa2fa29d63b8c3e", + "reference": "909987996ed175443aeed441efa2fa29d63b8c3e", + "shasum": "" + }, + "require": { + "laravel/framework": "~5.5.0|~5.6.0|~5.7.0", + "php": "^7.0", + "spatie/url": "^1.0" + }, + "require-dev": { + "orchestra/testbench": "~3.5.0|~3.6.0|~3.7.0", + "phpunit/phpunit": "^6.3|^7.0" + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "Spatie\\MissingPageRedirector\\MissingPageRedirectorServiceProvider" + ] + } + }, + "autoload": { + "psr-4": { + "Spatie\\MissingPageRedirector\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Freek Van der Herten", + "email": "freek@spatie.be", + "homepage": "https://spatie.be", + "role": "Developer" + } + ], + "description": "Redirect missing pages in your Laravel application", + "homepage": "https://github.com/spatie/laravel-missing-page-redirector", + "keywords": [ + "laravel-missing-page-redirector", + "spatie" + ], + "time": "2018-12-29T21:43:18+00:00" + }, { "name": "spatie/laravel-permission", "version": "2.28.2", @@ -4637,6 +4693,52 @@ ], "time": "2019-02-11T07:41:55+00:00" }, + { + "name": "spatie/macroable", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/spatie/macroable.git", + "reference": "74b0d189ce75142f1706aad834d5a428dfc7c3c3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spatie/macroable/zipball/74b0d189ce75142f1706aad834d5a428dfc7c3c3", + "reference": "74b0d189ce75142f1706aad834d5a428dfc7c3c3", + "shasum": "" + }, + "require": { + "php": "^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.3" + }, + "type": "library", + "autoload": { + "psr-4": { + "Spatie\\Macroable\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Freek Van der Herten", + "email": "freek@spatie.be", + "homepage": "https://spatie.be", + "role": "Developer" + } + ], + "description": "A trait to dynamically add methods to a class", + "homepage": "https://github.com/spatie/macroable", + "keywords": [ + "macroable", + "spatie" + ], + "time": "2017-09-18T09:51:20+00:00" + }, { "name": "spatie/robots-txt", "version": "1.0.2", @@ -4730,6 +4832,54 @@ ], "time": "2018-04-12T09:34:43+00:00" }, + { + "name": "spatie/url", + "version": "1.3.0", + "source": { + "type": "git", + "url": "https://github.com/spatie/url.git", + "reference": "d57c19baf1586d335f30c126681a9487da01809b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spatie/url/zipball/d57c19baf1586d335f30c126681a9487da01809b", + "reference": "d57c19baf1586d335f30c126681a9487da01809b", + "shasum": "" + }, + "require": { + "php": "^7.0", + "psr/http-message": "^1.0", + "spatie/macroable": "^1.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.4" + }, + "type": "library", + "autoload": { + "psr-4": { + "Spatie\\Url\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Sebastian De Deyne", + "email": "sebastian@spatie.be", + "homepage": "https://spatie.be", + "role": "Developer" + } + ], + "description": "Parse, build and manipulate URL's", + "homepage": "https://github.com/spatie/url", + "keywords": [ + "spatie", + "url" + ], + "time": "2018-01-02T20:50:05+00:00" + }, { "name": "studio-42/elfinder", "version": "2.1.46", diff --git a/config/backpack/base.php b/config/backpack/base.php index 0ece3ee..c8b8f4d 100644 --- a/config/backpack/base.php +++ b/config/backpack/base.php @@ -12,23 +12,23 @@ return [ */ // Project name. Shown in the breadcrumbs and a few other places. - 'project_name' => 'Backpack', + 'project_name' => 'PMI', // Menu logos - 'logo_lg' => 'Backpack', - 'logo_mini' => 'Bp', + 'logo_lg' => 'PM Instrumentation', + 'logo_mini' => 'PMI', // Developer or company name. Shown in footer. - 'developer_name' => 'Cristian Tabacitu', + 'developer_name' => 'Cubedesigners', // Developer website. Link in footer. - 'developer_link' => 'http://tabacitu.ro', + 'developer_link' => 'https://www.cubedesigners.fr', // Show powered by Laravel Backpack in the footer? - 'show_powered_by' => true, + 'show_powered_by' => false, // The AdminLTE skin. Affects menu color and primary/secondary colors used throughout the application. - 'skin' => 'skin-purple', + 'skin' => 'skin-blue', // Options: skin-black, skin-blue, skin-purple, skin-red, skin-yellow, skin-green, skin-blue-light, skin-black-light, skin-purple-light, skin-green-light, skin-red-light, skin-yellow-light // Date & Datetime Format Syntax: https://github.com/jenssegers/date#usage diff --git a/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php b/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php index 6f49dcd..daa8a5d 100644 --- a/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php +++ b/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php @@ -1,6 +1,17 @@
  • {{ trans('backpack::base.dashboard') }}
    • +
  • Menu
    • +
  • Pages
    • +
  • + News + +
  • {{ trans('backpack::crud.file_manager') }}
    • +
  • Settings
  • Users, Roles, Permissions
    • -
  • Backups
  • Logs
    • -
  • Settings
    • -
  • Pages
    • -
  • Menu
    • -
  • - News - -