publish bug fixes, flex nav

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index ed524e6d89becf72f7c979c2d04f11c9653f060f..f68480692e1c0aae727ba5b5b482d9b795c988c5 100644 (file)
--- 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 ceeb7322cc25183663756ef30845cb6cda2a3bff..cf4a77908e40782bbffa80c48b2f341050c22c32 100644 (file)
--- 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 5201bb76fbbd7595daa0acd46c43bbfa8acfdf0b..3fa2a0654c270ff3ddefd8a8610c590338fefe2f 100644 (file)
--- 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 8825c176995a3e727e11be8203c5f280ff0c1626..88020486852297610481a5b034e37905f94bf867 100644 (file)
--- 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 3d2479a87715a2de0db57332163c15e5902399ab..fbdb95fa8bdcff9e5d494a1222cd901972a7ab48 100644 (file)
--- 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 81d6d560ee9c2e0dd715c7489f475ee13db8b6e1..4212acd9490c6155494fa07a4bcad286bce29108 100644 (file)
--- 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 d4f0022283e7c570ad4bcec124d322c63be86bab..b9c7b8d21cdbf92aaf7ecbf4a1e54f700c3bbd2a 100644 (file)
--- a/resources/js/components/Publish/HeadlineRepeater.vue
+++ b/resources/js/components/Publish/HeadlineRepeater.vue
@@ -1,5 +1,8 @@
 <template>
-    <input type="text" class="form-control" placeholder="Tapez le titre ici..." v-model="headline">
+    <div>
+        <input type="text" class="form-control" placeholder="Tapez le titre ici..." v-model="headline">
+        <textarea placeholder="Description rapide" rows="4" class="form-control mt-1"></textarea>
+    </div>
 </template>
 
 <script>
@@ -23,3 +26,4 @@
 <style scoped>
 
 </style>
+

diff --git a/resources/sass/app.scss b/resources/sass/app.scss
index c3c708b3829bc0081d2f28c10c85688e952d3ac5..23d93b0c7a34f95543b393a0acbdb134d14c3ff1 100644 (file)
--- a/resources/sass/app.scss
+++ b/resources/sass/app.scss
@@ -21,6 +21,15 @@
 }
 
 
+//nav
+
+nav {
+    display: flex;
+    justify-content: space-around;
+
+}
+
+
 //COLORS
 .highlight-purple {
     color: white;

diff --git a/resources/views/components/spotlight-news.blade.php b/resources/views/components/spotlight-news.blade.php
index b469070b6f1ba9f118317c2d8b4612e5ad5b5bd5..5a41e0147a786e188c775f5671096b113fb2313d 100644 (file)
--- a/resources/views/components/spotlight-news.blade.php
+++ b/resources/views/components/spotlight-news.blade.php
@@ -1,4 +1,4 @@
-<div class="spotlight-news">
+<div {{$attributes->merge(['class' => 'spotlight-news'])}}>
     <h2>{{$title}}</h2>
     <div>
         {{$slot}}

diff --git a/resources/views/home/index.blade.php b/resources/views/home/index.blade.php
index af058c603b2118ad7a76b185cf8596e3c4ca6c7d..1fc70cb58eb410d7b91611b9b308bb96881d3085 100644 (file)
--- a/resources/views/home/index.blade.php
+++ b/resources/views/home/index.blade.php
@@ -12,6 +12,18 @@
 
             <x-cover :pdf="$last_pdf->first()" type="3">
             </x-cover>
+
+            @foreach([1, 2, 3] as $i)
+
+                <x-spotlight-news title="À SEULEMENT J+1 DAVID LOEW NOUVEAU" class="mt-3">
+                    <ul>
+                        <li>Nouveau Boss d’IPSEN face à la presse</li>
+                        <li>Lorem ipsum dolor sit amet, consectetuer adipiscing elit</li>
+                    </ul>
+                </x-spotlight-news>
+
+            @endforeach
+
         </div>
 
 
@@ -20,7 +32,7 @@
                 <li><span>Nos précédentes éditions</span></li>
             </ul>
 
-            <div class="row">
+            <div class="row mb-3">
                 @foreach($last_pdf->slice(1, 3) as $pdf)
                     <div class="col-sm-4">
                         <x-cover :pdf="$pdf" type="2">
@@ -30,20 +42,6 @@
                 @endforeach
             </div>
 
-        </div>
-
-    </div>
-    <div class="row justify-content-center pt-5">
-        <div class="col-sm-4">
-            <x-spotlight-news title="À SEULEMENT J+1 DAVID LOEW NOUVEAU">
-                <ul>
-                    <li>Nouveau Boss d’IPSEN face à la presse</li>
-                    <li>Lorem ipsum dolor sit amet, consectetuer adipiscing elit</li>
-                </ul>
-            </x-spotlight-news>
-
-        </div>
-        <div class="col-sm-8">
             <x-pill-box title="Consultez ici notre page agenda">
                 À ne pas manquer aujourd’hui sur la page agenda, le rendez-vous des acteurs de la santé
 et du médicament
@@ -59,6 +57,18 @@ et du médicament
                     </div>
                 @endforeach
             </div>
+
+
+
+        </div>
+
+    </div>
+    <div class="row justify-content-center pt-5">
+        <div class="col-sm-4">
+
+        </div>
+        <div class="col-sm-8">
+
         </div>
 
     </div>

diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 34377a6313c2f124ac894831fe717b93a62d1333..ba3f0069291fac9071c2c0889b1a51e353aabf7b 100644 (file)
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -28,7 +28,34 @@
         @if(!isset($hideNav))
             <img src="{{ asset('img/logo_top.svg') }}" class="header-logo" alt="">
 
-            <nav>
+
+            <nav class="container">
+                <div>
+                    <img src="{{asset('img/pill-icon.svg')}}" alt="Pill Icon">
+                    <p>Lorem Ipsum</p>
+
+                </div>
+                <div>
+                    <img src="{{asset('img/pill-icon.svg')}}" alt="Pill Icon">
+                    <p>Lorem Ipsum</p>
+
+                </div>
+                <div>
+                    <img src="{{asset('img/pill-icon.svg')}}" alt="Pill Icon">
+                    <p>Lorem Ipsum</p>
+
+                </div>
+                <div>
+                    <img src="{{asset('img/pill-icon.svg')}}" alt="Pill Icon">
+                    <p>Lorem Ipsum</p>
+
+                </div>
+                <div>
+                    <img src="{{asset('img/pill-icon.svg')}}" alt="Pill Icon">
+                    <p>Lorem Ipsum</p>
+
+                </div>
+
 
             </nav>
 

diff --git a/resources/views/vendor/twill/partials/footer.blade.php b/resources/views/vendor/twill/partials/footer.blade.php
index 1ff79a6586384fe64814798849e873fd86567cea..e0ebccfd62dd249406b94c532d915b23e8549a95 100644 (file)
--- a/resources/views/vendor/twill/partials/footer.blade.php
+++ b/resources/views/vendor/twill/partials/footer.blade.php
@@ -1,7 +1,7 @@
 @include('twill::partials.toaster')
 <footer class="footer">
     <div class="container">
-        <span class="footer__copyright">Made by Louis Jeckel for Julia Editing</span>
+        <span class="footer__copyright">Made by Louis Jeckel for OPRA Editing</span>
         <span class="footer__version">Version {{config('app.version')}}</span>
     </div>
 </footer>

diff --git a/routes/admin.php b/routes/admin.php
index c74346fdfae81853a22960756e4290da0e4eb2b5..f9ee98c6484c0b31ec6e21cfd17111a87449fd8c 100644 (file)
--- a/routes/admin.php
+++ b/routes/admin.php
@@ -30,4 +30,4 @@ Route::group(['prefix' => 'content'], function() {
 
     });
 
-    Route::get('/preview/{file:slug}', 'FlowpaperController@preview')->name('preview');
+    Route::namespace('')->get('/preview/{file:slug}', '\\App\\Http\\Controllers\\FlowpaperController@preview')->name('preview');