From: Louis Jeckel Date: Sun, 16 Aug 2020 10:30:04 +0000 (+0200) Subject: mag page + design and poll adjustments X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=779185e34699e7a50b998cccaea3a603cdc508d8;p=psq.git mag page + design and poll adjustments --- diff --git a/app/Http/Controllers/Admin/PollController.php b/app/Http/Controllers/Admin/PollController.php index cf27b1e..0d6370f 100644 --- a/app/Http/Controllers/Admin/PollController.php +++ b/app/Http/Controllers/Admin/PollController.php @@ -35,7 +35,7 @@ class PollController extends ModuleController $ans = $answers->flatMap(function($ans) use($question){ - return Arr::wrap($ans->answers[$question['slug']]); + return Arr::wrap($ans->answers[$question['slug']] ?? ['[no-answer]']); }); $ansCountBy = $ans->countBy()->toArray(); diff --git a/app/Http/Controllers/MagController.php b/app/Http/Controllers/MagController.php new file mode 100644 index 0000000..6169564 --- /dev/null +++ b/app/Http/Controllers/MagController.php @@ -0,0 +1,13 @@ +
- +
Lire ici diff --git a/resources/js/components/PollAnswers/PollAnswers.vue b/resources/js/components/PollAnswers/PollAnswers.vue index 966de00..7b0dd5d 100644 --- a/resources/js/components/PollAnswers/PollAnswers.vue +++ b/resources/js/components/PollAnswers/PollAnswers.vue @@ -34,19 +34,19 @@
- - +
+ - - + + - - - - + + + +
RéponseOccurencesPourcentageOccurencesPourcentage
{{answer.value}}{{answer.count}}{{answer.percentage}}%
{{answer.count}}{{answer.percentage}}%
diff --git a/resources/sass/_colors.scss b/resources/sass/_colors.scss index 50fd279..bf50c20 100644 --- a/resources/sass/_colors.scss +++ b/resources/sass/_colors.scss @@ -10,6 +10,7 @@ $psq_orange: #e79817; $psq_grey: #546983; $psq_denim: #0c2c50; $psq_green: #41BD53; +$psq_mag_blue: #2a6ba3; // BOOTSTRAP VARS @@ -30,7 +31,8 @@ $psq_colors: ( "orange" : $psq_orange, "grey" : $psq_grey, "denim" : $psq_denim, - "green" : $psq_green + "green" : $psq_green, + "mag-blue" : $psq_mag_blue, ); $psq_pages: ( diff --git a/resources/sass/_fonts.scss b/resources/sass/_fonts.scss index 09b231e..f854203 100644 --- a/resources/sass/_fonts.scss +++ b/resources/sass/_fonts.scss @@ -142,3 +142,6 @@ font-display: swap; } +.font-medium { + font-weight: 500; +} diff --git a/resources/sass/_pill_boxes.scss b/resources/sass/_pill_boxes.scss index 6c5f4b3..7130d3e 100644 --- a/resources/sass/_pill_boxes.scss +++ b/resources/sass/_pill_boxes.scss @@ -1,7 +1,7 @@ div.pill-box { position: relative; - background-color: white; + //background-color: white; img { @@ -15,6 +15,7 @@ div.pill-box { div { //background-color: rgba(208, 77, 74, 0.2); @extend .box; + background-color: initial !important; border-radius: 5px; padding: 0 5px 5px; //border: 1px solid $psq_red; diff --git a/resources/sass/app.scss b/resources/sass/app.scss index 1a68f3b..f99da3b 100644 --- a/resources/sass/app.scss +++ b/resources/sass/app.scss @@ -141,6 +141,6 @@ article { margin: auto; } -.mw-40{ - max-width: 40%; +.mh-campaign{ + max-height: 120px; } diff --git a/resources/views/actu-labos/show.blade.php b/resources/views/actu-labos/show.blade.php index 12f4142..2e6ba8b 100644 --- a/resources/views/actu-labos/show.blade.php +++ b/resources/views/actu-labos/show.blade.php @@ -3,7 +3,7 @@ @section('content')
-

L'actu des labos

+{{--

L'actu des labos

--}}
diff --git a/resources/views/com-campaigns/index.blade.php b/resources/views/com-campaigns/index.blade.php index 5f9a484..ba8c7ed 100644 --- a/resources/views/com-campaigns/index.blade.php +++ b/resources/views/com-campaigns/index.blade.php @@ -5,28 +5,26 @@

marketing & com : les campagnes de la semaine

-
+
- +
-
-
+
- +
-
-
+
- +
diff --git a/resources/views/components/nav.blade.php b/resources/views/components/nav.blade.php index 122fa82..6ed9e68 100644 --- a/resources/views/components/nav.blade.php +++ b/resources/views/components/nav.blade.php @@ -20,7 +20,7 @@
- + Pill Icon

Le Magazine

 diff --git a/resources/views/mag/index.blade.php b/resources/views/mag/index.blade.php new file mode 100644 index 0000000..8124e85 --- /dev/null +++ b/resources/views/mag/index.blade.php @@ -0,0 +1,40 @@ +@extends('layouts.app') + +@section('content') + +
+{{--

Le magazine

--}} +
+
+

+ ACTEURS DE LA PHARMA : +

+

+ Et si, enfin, on parlait de vous autrement ? +

+

+ Tous les trois mois, un véritable Magazine dédié au Médicament, son économie, ses acteurs, sa communication et son histoire +

+

+ Plus de 120 pages diffusées à 5000 décideurs, politiques, relais d’opinion et à ceux qui font le médicament au quotidien. +

+

+ LE 20 SEPTEMBRE PROCHAIN : MISE EN LIGNE DU SOMMAIRE COMPLET DE CE PREMIER NUMÉRO +

+

+ N°1 : LE 25 OCTOBRE 2020 +

+

+ + POUR ACCOMPAGNER PUBLICITAIREMENT CET ÉVÉNEMENT CLIQUEZ ICI + +

+ +
+ +
+ +
+
+
+@endsection diff --git a/resources/views/not-registered/index.blade.php b/resources/views/not-registered/index.blade.php index 7eb7786..43e3045 100644 --- a/resources/views/not-registered/index.blade.php +++ b/resources/views/not-registered/index.blade.php @@ -9,7 +9,7 @@
Image pas encore abonné
-
+
{!! $settings->byKey('not_registered_text') !!}
diff --git a/routes/web.php b/routes/web.php index 143f3f2..95282d7 100644 --- a/routes/web.php +++ b/routes/web.php @@ -74,6 +74,8 @@ Route::domain(env('CLIENT_DOMAIN_NAME'))->group(function() { Route::post('{slug}', 'PollController@submit')->name('poll.submit'); }); + Route::get('le-mag', 'MagController@index')->name('mag.index'); + /** Metadata */ Route::prefix('/files/{file:slug}')->group(function () { Route::get('/cover', 'FileController@cover');