From b4ff103781f4b5c62ae2807ee767053cd7efdb12 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Wed, 4 Mar 2020 13:02:57 +0100 Subject: [PATCH] wip #3461 @1 --- .../Admin/LocaleCrudController.php | 2 +- .../Controllers/Admin/PageCrudController.php | 2 +- .../Admin/QuizTranslationCrudController.php | 14 ++++ .../Admin/SettingsCrudController.php | 2 +- app/Models/QuizTranslation.php | 35 ++++++++++ composer.lock | 68 ++++++++++--------- .../base/inc/sidebar_content.blade.php | 13 +++- routes/backpack/custom.php | 1 + 8 files changed, 101 insertions(+), 36 deletions(-) create mode 100644 app/Http/Controllers/Admin/QuizTranslationCrudController.php create mode 100644 app/Models/QuizTranslation.php diff --git a/app/Http/Controllers/Admin/LocaleCrudController.php b/app/Http/Controllers/Admin/LocaleCrudController.php index 983f8c03d..0ec4b3e23 100644 --- a/app/Http/Controllers/Admin/LocaleCrudController.php +++ b/app/Http/Controllers/Admin/LocaleCrudController.php @@ -2,7 +2,7 @@ namespace App\Http\Controllers\Admin; -class LocaleCrudController extends Cubist\Backpack\app\Magic\Controllers\CubistMagicController +class LocaleCrudController extends \Cubist\Backpack\app\Magic\Controllers\CubistMagicController { protected $_modelNamespace = 'App\Models\Locale'; protected $_routeURL = 'locale'; diff --git a/app/Http/Controllers/Admin/PageCrudController.php b/app/Http/Controllers/Admin/PageCrudController.php index ab99f3822..09ea83ca2 100644 --- a/app/Http/Controllers/Admin/PageCrudController.php +++ b/app/Http/Controllers/Admin/PageCrudController.php @@ -2,7 +2,7 @@ namespace App\Http\Controllers\Admin; -class PageCrudController extends Cubist\Backpack\app\Magic\Controllers\CubistMagicNestedController +class PageCrudController extends \Cubist\Backpack\app\Magic\Controllers\CubistMagicNestedController { protected $_modelNamespace = 'App\Models\Page'; protected $_routeURL = 'page'; diff --git a/app/Http/Controllers/Admin/QuizTranslationCrudController.php b/app/Http/Controllers/Admin/QuizTranslationCrudController.php new file mode 100644 index 000000000..1d115a147 --- /dev/null +++ b/app/Http/Controllers/Admin/QuizTranslationCrudController.php @@ -0,0 +1,14 @@ + 'quiztranslation', + 'singular' => 'quiz translation', + 'plural' => 'quiz translations']; + + public function setFields() + { + parent::setFields(); + + $texts = ['validateAnswer' => 'Validate answers', + 'reviewAnswer' => 'Review answers', + 'question' => 'Question %d:', + 'totalQuestions' => 'Total questions:', + 'correctAnswers' => 'Correct answers:']; + + $this->addField(['name' => 'locale', + 'label' => 'Language', + 'type' => 'Locale', + 'column' => true]); + + foreach ($texts as $name => $default) { + $this->addField(['name' => $name, + 'label' => 'Translation of « ' . $default . ' »', + 'type' => 'Text']); + } + } +} diff --git a/composer.lock b/composer.lock index e9376c876..b651a2554 100644 --- a/composer.lock +++ b/composer.lock @@ -71,16 +71,16 @@ }, { "name": "backpack/crud", - "version": "4.0.42", + "version": "4.0.43", "source": { "type": "git", "url": "https://github.com/Laravel-Backpack/CRUD.git", - "reference": "6a87fb746dcadd21c8959bbd80422673ed9e7e1d" + "reference": "a42a1bac0c993fb362bbc5f7ebb74516ef99611a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Laravel-Backpack/CRUD/zipball/6a87fb746dcadd21c8959bbd80422673ed9e7e1d", - "reference": "6a87fb746dcadd21c8959bbd80422673ed9e7e1d", + "url": "https://api.github.com/repos/Laravel-Backpack/CRUD/zipball/a42a1bac0c993fb362bbc5f7ebb74516ef99611a", + "reference": "a42a1bac0c993fb362bbc5f7ebb74516ef99611a", "shasum": "" }, "require": { @@ -88,19 +88,18 @@ "doctrine/dbal": "^2.5", "guzzlehttp/guzzle": "^6.3", "intervention/image": "^2.3", - "laravel/framework": "^6.0|5.8.*", + "laravel/framework": "^7.0|^6.0|5.8.*", "laravel/helpers": "^1.1", - "nesbot/carbon": "^2.14.0", + "nesbot/carbon": "^2.14", "ocramius/package-versions": "^1.4", - "prologue/alerts": "^0.4.1", - "venturecraft/revisionable": "1.*" + "prologue/alerts": "^0.4.1" }, "require-dev": { - "orchestra/database": "3.8.x-dev", - "orchestra/testbench": "^3.0", - "phpunit/phpunit": "~7.0", - "scrutinizer/ocular": "~1.1", - "spatie/laravel-translatable": "^3.1.3" + "orchestra/database": "^5.0@dev|3.8.x-dev", + "orchestra/testbench": "^5.0|^3.0", + "phpunit/phpunit": "~8.0|~7.0", + "scrutinizer/ocular": "~1.7|~1.1", + "spatie/laravel-translatable": "^4.0|^3.1.3" }, "type": "library", "extra": { @@ -154,7 +153,7 @@ "read", "update" ], - "time": "2020-03-01T08:42:43+00:00" + "time": "2020-03-04T06:46:54+00:00" }, { "name": "backpack/logmanager", @@ -920,13 +919,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/cubist_cms-back.git", - "reference": "5c2f53be9b1bd5f2a967635d6845e316fef25e1e" + "reference": "460bfd45c1b7020e0a986158225c5ec4c9d09401" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-354fa1.tar", - "reference": "5c2f53be9b1bd5f2a967635d6845e316fef25e1e", - "shasum": "ea57becaf3fe74393c29012c4e4b790ee2ba5f9a" + "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-master-76f470.tar", + "reference": "460bfd45c1b7020e0a986158225c5ec4c9d09401", + "shasum": "509d782e101b6a8ffddc7d7e6bb33b0187d1c232" }, "require": { "backpack/backupmanager": "^2.0", @@ -997,7 +996,7 @@ } ], "description": "Cubist Backpack extension", - "time": "2020-03-03T18:55:26+00:00" + "time": "2020-03-03T19:12:14+00:00" }, { "name": "cubist/cms-front", @@ -4916,16 +4915,16 @@ }, { "name": "spatie/laravel-permission", - "version": "3.10.1", + "version": "3.11.0", "source": { "type": "git", "url": "https://github.com/spatie/laravel-permission.git", - "reference": "b0861793b5942eeaaa27cd38787fba7666c10d3c" + "reference": "e90ed6242a8fa29735529160b9c21cb77b233e7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-permission/zipball/b0861793b5942eeaaa27cd38787fba7666c10d3c", - "reference": "b0861793b5942eeaaa27cd38787fba7666c10d3c", + "url": "https://api.github.com/repos/spatie/laravel-permission/zipball/e90ed6242a8fa29735529160b9c21cb77b233e7f", + "reference": "e90ed6242a8fa29735529160b9c21cb77b233e7f", "shasum": "" }, "require": { @@ -4980,7 +4979,7 @@ "security", "spatie" ], - "time": "2020-03-03T17:38:17+00:00" + "time": "2020-03-03T21:31:02+00:00" }, { "name": "spatie/laravel-sitemap", @@ -7075,27 +7074,34 @@ }, { "name": "venturecraft/revisionable", - "version": "1.33.0", + "version": "1.34.0", "source": { "type": "git", "url": "https://github.com/VentureCraft/revisionable.git", - "reference": "31034cf307808eae0bf776e9c13793495d7f19f3" + "reference": "151336f0cd51921a00a1ac249afdbcbedb3bc8b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/VentureCraft/revisionable/zipball/31034cf307808eae0bf776e9c13793495d7f19f3", - "reference": "31034cf307808eae0bf776e9c13793495d7f19f3", + "url": "https://api.github.com/repos/VentureCraft/revisionable/zipball/151336f0cd51921a00a1ac249afdbcbedb3bc8b3", + "reference": "151336f0cd51921a00a1ac249afdbcbedb3bc8b3", "shasum": "" }, "require": { - "illuminate/support": "~4.0|~5.0|~5.1|^6.0", - "laravel/framework": "~5.4|^6.0", + "illuminate/support": "~4.0|~5.0|~5.1|^6.0|^7.0", + "laravel/framework": "~5.4|^6.0|^7.0", "php": ">=5.4.0" }, "require-dev": { "orchestra/testbench": "~3.0" }, "type": "library", + "extra": { + "laravel": { + "providers": [ + "Venturecraft\\Revisionable\\RevisionableServiceProvider" + ] + } + }, "autoload": { "classmap": [ "src/migrations" @@ -7124,7 +7130,7 @@ "model", "revision" ], - "time": "2019-10-27T06:37:42+00:00" + "time": "2020-03-03T22:35:12+00:00" }, { "name": "vlucas/phpdotenv", 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 72b37a8eb..66bf1a78f 100644 --- a/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php +++ b/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php @@ -1,8 +1,17 @@
  • {{ trans('backpack::base.dashboard') }}
    • -
  • Quizzes
    • + +
  • Quiz + +
    • +
  • Maintenance