From 5a8745afcaba49d02d0e10d3513d03e83a7ff648 Mon Sep 17 00:00:00 2001 From: Louis Jeckel Date: Thu, 30 Jul 2020 12:49:19 +0200 Subject: [PATCH] publish bug fixes, flex nav --- app/Providers/AppServiceProvider.php | 2 +- config/app.php | 2 +- config/mail.php | 4 ++ public/admin/js/admin.js | 48 +++++++++++-------- public/css/app.css | 5 ++ public/js/app.js | 48 +++++++++++-------- .../components/Publish/HeadlineRepeater.vue | 6 ++- resources/sass/app.scss | 9 ++++ .../views/components/spotlight-news.blade.php | 2 +- resources/views/home/index.blade.php | 40 ++++++++++------ resources/views/layouts/app.blade.php | 29 ++++++++++- .../vendor/twill/partials/footer.blade.php | 2 +- routes/admin.php | 2 +- 13 files changed, 139 insertions(+), 60 deletions(-) diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index ed524e6..f684806 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -26,7 +26,7 @@ class AppServiceProvider extends ServiceProvider public function register() { $this->app->singleton(Mailgun::class, function($app) { - return Mailgun::create(env('MAILGUN_API_KEY'), 'https://api.eu.mailgun.net'); + return Mailgun::create(config('mail.mailgun.api_key'), 'https://api.eu.mailgun.net'); }); $this->app->singleton(Client::class, function($app) { diff --git a/config/app.php b/config/app.php index ceeb732..cf4a779 100644 --- a/config/app.php +++ b/config/app.php @@ -125,7 +125,7 @@ return [ 'aws_s3_url' => 'https://prescription-sante.s3.eu-west-3.amazonaws.com', - 'version' => '0.2.1', + 'version' => '0.3.0 beta 2', /* diff --git a/config/mail.php b/config/mail.php index 5201bb7..3fa2a06 100644 --- a/config/mail.php +++ b/config/mail.php @@ -106,4 +106,8 @@ return [ ], ], + 'mailgun' => [ + 'api_key' => env('MAILGUN_API_KEY') + ] + ]; diff --git a/public/admin/js/admin.js b/public/admin/js/admin.js index 8825c17..8802048 100644 --- a/public/admin/js/admin.js +++ b/public/admin/js/admin.js @@ -2532,6 +2532,9 @@ __webpack_require__.r(__webpack_exports__); // // // +// +// +// /* harmony default export */ __webpack_exports__["default"] = ({ name: "HeadlineRepeater", props: { @@ -50123,27 +50126,34 @@ var render = function() { var _vm = this var _h = _vm.$createElement var _c = _vm._self._c || _h - return _c("input", { - directives: [ - { - name: "model", - rawName: "v-model", - value: _vm.headline, - expression: "headline" - } - ], - staticClass: "form-control", - attrs: { type: "text", placeholder: "Tapez le titre ici..." }, - domProps: { value: _vm.headline }, - on: { - input: function($event) { - if ($event.target.composing) { - return + return _c("div", [ + _c("input", { + directives: [ + { + name: "model", + rawName: "v-model", + value: _vm.headline, + expression: "headline" + } + ], + staticClass: "form-control", + attrs: { type: "text", placeholder: "Tapez le titre ici..." }, + domProps: { value: _vm.headline }, + on: { + input: function($event) { + if ($event.target.composing) { + return + } + _vm.headline = $event.target.value } - _vm.headline = $event.target.value } - } - }) + }), + _vm._v(" "), + _c("textarea", { + staticClass: "form-control mt-1", + attrs: { placeholder: "Description rapide", rows: "4" } + }) + ]) } var staticRenderFns = [] render._withStripped = true diff --git a/public/css/app.css b/public/css/app.css index 3d2479a..fbdb95f 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -11109,6 +11109,11 @@ mark.mark { margin: 1em auto; } +nav { + display: flex; + justify-content: space-around; +} + .highlight-purple { color: white; background-color: #AD5ED3; diff --git a/public/js/app.js b/public/js/app.js index 81d6d56..4212acd 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -7727,6 +7727,9 @@ __webpack_require__.r(__webpack_exports__); // // // +// +// +// /* harmony default export */ __webpack_exports__["default"] = ({ name: "HeadlineRepeater", props: { @@ -79603,27 +79606,34 @@ var render = function() { var _vm = this var _h = _vm.$createElement var _c = _vm._self._c || _h - return _c("input", { - directives: [ - { - name: "model", - rawName: "v-model", - value: _vm.headline, - expression: "headline" - } - ], - staticClass: "form-control", - attrs: { type: "text", placeholder: "Tapez le titre ici..." }, - domProps: { value: _vm.headline }, - on: { - input: function($event) { - if ($event.target.composing) { - return + return _c("div", [ + _c("input", { + directives: [ + { + name: "model", + rawName: "v-model", + value: _vm.headline, + expression: "headline" + } + ], + staticClass: "form-control", + attrs: { type: "text", placeholder: "Tapez le titre ici..." }, + domProps: { value: _vm.headline }, + on: { + input: function($event) { + if ($event.target.composing) { + return + } + _vm.headline = $event.target.value } - _vm.headline = $event.target.value } - } - }) + }), + _vm._v(" "), + _c("textarea", { + staticClass: "form-control mt-1", + attrs: { placeholder: "Description rapide", rows: "4" } + }) + ]) } var staticRenderFns = [] render._withStripped = true diff --git a/resources/js/components/Publish/HeadlineRepeater.vue b/resources/js/components/Publish/HeadlineRepeater.vue index d4f0022..b9c7b8d 100644 --- a/resources/js/components/Publish/HeadlineRepeater.vue +++ b/resources/js/components/Publish/HeadlineRepeater.vue @@ -1,5 +1,8 @@