]> _ Git - psq.git/commitdiff
pillboxspaces, automatic colors
authorLouis Jeckel <louis.jeckel@outlook.cm>
Mon, 10 Aug 2020 22:19:17 +0000 (00:19 +0200)
committerLouis Jeckel <louis.jeckel@outlook.cm>
Mon, 10 Aug 2020 22:19:17 +0000 (00:19 +0200)
34 files changed:
app/Http/Controllers/AdCampaignController.php
app/Http/Controllers/Admin/PillBoxSpaceController.php [new file with mode: 0644]
app/Http/Controllers/Auth/NotRegisteredYet.php
app/Http/Requests/Admin/PillBoxSpaceRequest.php [new file with mode: 0644]
app/Models/PillBoxSpace.php [new file with mode: 0644]
app/Models/Slugs/PillBoxSpaceSlug.php [new file with mode: 0644]
app/Repositories/PillBoxSpaceRepository.php [new file with mode: 0644]
app/View/Components/PillBox.php
config/translatable.php
config/twill-navigation.php
database/migrations/2020_08_06_000005_create_twill_default_settings_table.php [deleted file]
database/migrations/2020_08_10_101335_create_pill_box_spaces_tables.php [new file with mode: 0644]
public/admin/js/admin.js
public/css/app.css
public/img/nav/8-login.svg [new file with mode: 0644]
public/img/nav/8-logout.svg [new file with mode: 0644]
public/js/app.js
resources/js/components/AdCampaign/CampaignHit.vue
resources/sass/_colors.scss
resources/sass/_nav.scss
resources/sass/_pill_boxes.scss
resources/sass/app.scss
resources/views/adCampaigns/index.blade.php [deleted file]
resources/views/adCampaigns/search.blade.php [deleted file]
resources/views/admin/pillBoxSpaces/form.blade.php [new file with mode: 0644]
resources/views/com-campaigns/index.blade.php [new file with mode: 0644]
resources/views/com-campaigns/search.blade.php [new file with mode: 0644]
resources/views/components/nav.blade.php
resources/views/components/pill-box.blade.php
resources/views/home/index.blade.php
resources/views/not-registered.blade.php [deleted file]
resources/views/not-registered/index.blade.php [new file with mode: 0644]
resources/views/podcasts/index.blade.php
routes/admin.php

index 563a12a484f3c4c5097af2151ab53b6c1a10bd3b..0267fd4267e438cf8a936e102088417098f1b57f 100644 (file)
@@ -10,7 +10,7 @@ class AdCampaignController extends Controller
 
     public function search()
     {
-        return view('adCampaigns.search');
+        return view('com-campaigns.search');
     }
 
     /**
@@ -26,7 +26,7 @@ class AdCampaignController extends Controller
             ->published()
             ->get();
         \View::share('campaigns', $campaigns);
-        return view('adCampaigns.index');
+        return view('com-campaigns.index');
     }
 
 
diff --git a/app/Http/Controllers/Admin/PillBoxSpaceController.php b/app/Http/Controllers/Admin/PillBoxSpaceController.php
new file mode 100644 (file)
index 0000000..334f9bb
--- /dev/null
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use A17\Twill\Http\Controllers\Admin\ModuleController;
+
+class PillBoxSpaceController extends ModuleController
+{
+    protected $moduleName = 'pillBoxSpaces';
+}
index a15f47cb6611ffcc87a03489652156a711a584d4..ad9deae9dcd7a5e2fcd6334443d02831e35e1744 100644 (file)
@@ -10,7 +10,7 @@ class NotRegisteredYet extends Controller
 
     public function index()
     {
-        return view('not-registered');
+        return view('not-registered.index');
     }
 
 }
diff --git a/app/Http/Requests/Admin/PillBoxSpaceRequest.php b/app/Http/Requests/Admin/PillBoxSpaceRequest.php
new file mode 100644 (file)
index 0000000..6777e11
--- /dev/null
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Http\Requests\Admin;
+
+use A17\Twill\Http\Requests\Admin\Request;
+
+class PillBoxSpaceRequest extends Request
+{
+    public function rulesForCreate()
+    {
+        return [];
+    }
+
+    public function rulesForUpdate()
+    {
+        return [];
+    }
+}
diff --git a/app/Models/PillBoxSpace.php b/app/Models/PillBoxSpace.php
new file mode 100644 (file)
index 0000000..5de6418
--- /dev/null
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Models;
+
+use A17\Twill\Models\Behaviors\HasSlug;
+use A17\Twill\Models\Model;
+
+class PillBoxSpace extends Model
+{
+    use HasSlug;
+
+    protected $fillable = [
+        'published',
+        'title',
+        'box_content',
+        'box_title',
+        'box_link',
+    ];
+
+    public $slugAttributes = [
+        'title',
+    ];
+
+}
diff --git a/app/Models/Slugs/PillBoxSpaceSlug.php b/app/Models/Slugs/PillBoxSpaceSlug.php
new file mode 100644 (file)
index 0000000..a6d44d2
--- /dev/null
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Models\Slugs;
+
+use A17\Twill\Models\Model;
+
+class PillBoxSpaceSlug extends Model
+{
+    protected $table = "pill_box_space_slugs";
+}
diff --git a/app/Repositories/PillBoxSpaceRepository.php b/app/Repositories/PillBoxSpaceRepository.php
new file mode 100644 (file)
index 0000000..a50d88e
--- /dev/null
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Repositories;
+
+use A17\Twill\Repositories\Behaviors\HandleSlugs;
+use A17\Twill\Repositories\ModuleRepository;
+use App\Models\PillBoxSpace;
+
+class PillBoxSpaceRepository extends ModuleRepository
+{
+    use HandleSlugs;
+
+    public function __construct(PillBoxSpace $model)
+    {
+        $this->model = $model;
+    }
+}
index 8324190abf1d1d2449f8afe337333e0bee89fc22..7b8a5a285893f07f4e9c5bf1e4d2a259574aad16 100644 (file)
@@ -2,26 +2,51 @@
 
 namespace App\View\Components;
 
+use App\Models\PillBoxSpace;
+use App\Repositories\PillBoxSpaceRepository;
 use Illuminate\View\Component;
 
 class PillBox extends Component
 {
-    public string $title;
-    public string $link;
-    public string $class;
+    public string $title = '';
+    public string $link = '#';
+    public string $class = '';
+    public ?string $content = null;
 
     /**
      * Create a new component instance.
      *
-     * @param $title
-     * @param $link
-     * @param $color
+     * @param null|string $slug
+     * @param string $title
+     * @param string $link
      */
-    public function __construct($title, $link = '#', $color = 'red')
+    public function __construct($slug = null, $title = '', $link = '#')
     {
-        $this->title = $title;
-        $this->link = $link;
-        $this->class = "border-$color";
+        /** @var PillBoxSpaceRepository $repository */
+        $repository = resolve(PillBoxSpaceRepository::class);
+
+
+        if($slug === null) {
+            $this->title = $title;
+            $this->link = $link;
+
+        } else if($pillBoxes = $repository->forSlug($slug)){
+            /** @var PillBoxSpace $pillBoxSpace */
+            $pillBoxSpace = $pillBoxes->first();
+
+            $this->title = $pillBoxSpace->box_title;
+            $this->link = $pillBoxSpace->box_link;
+            $this->content = $pillBoxSpace->box_content;
+
+        } else {
+            $this->class = 'd-none';
+
+        }
+
+
+
+
+//        $this->class = "border-$color";
     }
 
     /**
index 6c668d6c133154f7fabca88ae304ec24cd60c5ad..fb3f93854dd9f29553717a764d254cdc49ebbc19 100644 (file)
@@ -11,7 +11,7 @@ return [
     |
      */
     'locales' => [
-        'en',
+        'fr',
     ],
 
     /*
@@ -61,7 +61,7 @@ return [
     | locale. Note that 'use_fallback' must be enabled.
     |
      */
-    'use_property_fallback' => true,
+    'use_property_fallback' => false,
 
     /*
     |--------------------------------------------------------------------------
index 9e2c4aaae4c2512ecca7269d1297e60e61062e22..4eda29ffea55a344249385db7e9240535ffbe48c 100644 (file)
@@ -35,6 +35,7 @@ return [
                     'title' => 'Podcasts',
                     'module' => true
                 ],
+
         ],
     ],
     'settings' => [
@@ -52,10 +53,16 @@ return [
                 'title' => 'Podcasts',
                 'route' => 'admin.settings',
                 'params' => ['section' => 'podcasts'],
-
-            ]
+            ],
+            'pillBoxSpaces' => [
+                    'title' => 'Emplacement encadrés',
+                    'module' => true
+             ]
         ]
-    ]
+    ],
+
+
+
 
 
 
diff --git a/database/migrations/2020_08_06_000005_create_twill_default_settings_table.php b/database/migrations/2020_08_06_000005_create_twill_default_settings_table.php
deleted file mode 100644 (file)
index 3b13040..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Support\Str;
-
-class CreateTwillDefaultSettingsTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        $twillSettingsTable = config('twill.settings_table', 'twill_settings');
-
-        if (!Schema::hasTable($twillSettingsTable)) {
-            Schema::create($twillSettingsTable, function (Blueprint $table) {
-                $table->{twillIncrementsMethod()}('id');
-                $table->timestamps();
-                $table->softDeletes();
-                $table->string('key')->nullable()->index();
-                $table->string('section')->nullable()->index();
-            });
-        }
-
-        if (!Schema::hasTable(Str::singular($twillSettingsTable) . '_translations')) {
-            Schema::create(Str::singular($twillSettingsTable) . '_translations', function (Blueprint $table) use ($twillSettingsTable) {
-                createDefaultTranslationsTableFields($table, Str::singular($twillSettingsTable));
-                $table->text('value')->nullable();
-            });
-        }
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        $twillSettingsTable = config('twill.settings_table', 'twill_settings');
-
-        Schema::dropIfExists(Str::singular($twillSettingsTable) . '_translations');
-        Schema::dropIfExists($twillSettingsTable);
-    }
-}
diff --git a/database/migrations/2020_08_10_101335_create_pill_box_spaces_tables.php b/database/migrations/2020_08_10_101335_create_pill_box_spaces_tables.php
new file mode 100644 (file)
index 0000000..a2709b1
--- /dev/null
@@ -0,0 +1,40 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+
+class CreatePillBoxSpacesTables extends Migration
+{
+    public function up()
+    {
+        Schema::create('pill_box_spaces', function (Blueprint $table) {
+            // this will create an id, a "published" column, and soft delete and timestamps columns
+            createDefaultTableFields($table);
+
+            // feel free to modify the name of this column, but title is supported by default (you would need to specify the name of the column Twill should consider as your "title" column in your module controller if you change it)
+            $table->string('title', 200)->nullable();
+
+            // your generated model and form include a description field, to get you started, but feel free to get rid of it if you don't need it
+            $table->string('box_title')->nullable();
+            $table->string('box_link')->nullable();
+            $table->text('box_content')->nullable();
+
+            // add those 2 columns to enable publication timeframe fields (you can use publish_start_date only if you don't need to provide the ability to specify an end date)
+            // $table->timestamp('publish_start_date')->nullable();
+            // $table->timestamp('publish_end_date')->nullable();
+        });
+
+        Schema::create('pill_box_space_slugs', function (Blueprint $table) {
+            createDefaultSlugsTableFields($table, 'pill_box_space');
+        });
+
+
+    }
+
+    public function down()
+    {
+
+        Schema::dropIfExists('pill_box_space_slugs');
+        Schema::dropIfExists('pill_box_spaces');
+    }
+}
index 73bfec697605e10970c7f1b0988b3024b78e676f..bbcb562d3c86603a92b43e564c8ccfc886c9e93a 100644 (file)
@@ -49691,12 +49691,19 @@ var render = function() {
           ]),
           _vm._v(" "),
           _c("div", { class: { "col-sm-6": true, "order-1": _vm.flip } }, [
-            _c("p", { domProps: { innerHTML: _vm._s(_vm.hit.description) } }),
+            _c("div", {
+              staticClass: "pb-2",
+              domProps: { innerHTML: _vm._s(_vm.hit.description) }
+            }),
             _vm._v(" "),
             _c(
               "a",
               {
-                staticClass: "click-here",
+                class: {
+                  "click-here": true,
+                  "bottom-right": !_vm.flip,
+                  "bottom-left": _vm.flip
+                },
                 attrs: { href: _vm.hit.url, target: "_blank" }
               },
               [_vm._v("Lire ici")]
index 79d08c6010f3d85e23dcdeff011a98488717d411..be4bfd6cc34a47af3514aed76bfe2584efe22f81 100644 (file)
@@ -11099,6 +11099,143 @@ h1 {
   border: 1px solid #288ed7;
 }
 
+.magenta {
+  color: #ce317c;
+}
+
+.highlight-magenta {
+  color: white;
+  background-color: #ce317c;
+}
+
+.border-magenta {
+  border: 1px solid #ce317c;
+}
+
+.orange {
+  color: #e79817;
+}
+
+.highlight-orange {
+  color: white;
+  background-color: #e79817;
+}
+
+.border-orange {
+  border: 1px solid #e79817;
+}
+
+.grey {
+  color: #546983;
+}
+
+.highlight-grey {
+  color: white;
+  background-color: #546983;
+}
+
+.border-grey {
+  border: 1px solid #546983;
+}
+
+.denim {
+  color: #0c2c50;
+}
+
+.highlight-denim {
+  color: white;
+  background-color: #0c2c50;
+}
+
+.border-denim {
+  border: 1px solid #0c2c50;
+}
+
+.green {
+  color: #41BD53;
+}
+
+.highlight-green {
+  color: white;
+  background-color: #41BD53;
+}
+
+.border-green {
+  border: 1px solid #41BD53;
+}
+
+.psq-actu h1 {
+  color: white;
+  background-color: #d04d4a;
+}
+
+.psq-actu .pill-box > div {
+  border: 1px solid #d04d4a;
+}
+
+.psq-com-campaign h1 {
+  color: white;
+  background-color: #AD5ED3;
+}
+
+.psq-com-campaign .pill-box > div {
+  border: 1px solid #AD5ED3;
+}
+
+.psq-plus h1 {
+  color: white;
+  background-color: #41BD53;
+}
+
+.psq-plus .pill-box > div {
+  border: 1px solid #41BD53;
+}
+
+.psq-mag h1 {
+  color: white;
+  background-color: #ce317c;
+}
+
+.psq-mag .pill-box > div {
+  border: 1px solid #ce317c;
+}
+
+.psq-podcasts h1 {
+  color: white;
+  background-color: #288ed7;
+}
+
+.psq-podcasts .pill-box > div {
+  border: 1px solid #288ed7;
+}
+
+.psq-labos h1 {
+  color: white;
+  background-color: #546983;
+}
+
+.psq-labos .pill-box > div {
+  border: 1px solid #546983;
+}
+
+.psq-not-registered h1 {
+  color: white;
+  background-color: #e79817;
+}
+
+.psq-not-registered .pill-box > div {
+  border: 1px solid #e79817;
+}
+
+.psq-login-logout h1 {
+  color: white;
+  background-color: #0c2c50;
+}
+
+.psq-login-logout .pill-box > div {
+  border: 1px solid #0c2c50;
+}
+
 nav {
   margin-bottom: 0.5rem;
   display: flex;
@@ -11126,6 +11263,22 @@ nav p {
   word-break: break-word;
 }
 
+nav .pill-bigger {
+  flex-grow: 1.25;
+}
+
+nav .pill-bigger img {
+  max-width: 125px;
+}
+
+nav .pill-smaller {
+  flex-grow: 1;
+}
+
+nav .pill-smaller img {
+  max-width: 50px;
+}
+
 h1 {
   text-transform: uppercase;
   margin: auto auto 1rem;
@@ -11213,6 +11366,7 @@ div.cover .cover-title p {
 
 div.pill-box {
   position: relative;
+  background-color: white;
 }
 
 div.pill-box img {
@@ -11282,6 +11436,7 @@ ul.leaders span + span {
 .box,
 div.pill-box div {
   box-shadow: 0 2px 0 rgba(90, 97, 105, 0.11), 0 4px 8px rgba(90, 97, 105, 0.12), 0 10px 10px rgba(90, 97, 105, 0.06), 0 7px 70px rgba(90, 97, 105, 0.1);
+  background-color: white;
 }
 
 .header-logo {
@@ -11293,7 +11448,6 @@ div.pill-box div {
 
 a {
   color: #074e9c !important;
-  text-transform: uppercase;
 }
 
 .click-here,
@@ -11302,6 +11456,21 @@ div.pill-box div > a {
   font-weight: bold;
   margin-bottom: 0;
   display: block;
+  text-transform: uppercase;
+}
+
+.click-here.bottom-left,
+div.pill-box div > a.bottom-left {
+  left: 25px;
+  position: absolute;
+  bottom: 0;
+}
+
+.click-here.bottom-right,
+div.pill-box div > a.bottom-right {
+  right: 25px;
+  position: absolute;
+  bottom: 0;
 }
 
 .small-text {
@@ -11310,7 +11479,6 @@ div.pill-box div > a {
 }
 
 .spotlight-news {
-  background-color: rgba(7, 78, 156, 0.25);
   padding: 0.5rem;
   margin-bottom: 1rem;
 }
diff --git a/public/img/nav/8-login.svg b/public/img/nav/8-login.svg
new file mode 100644 (file)
index 0000000..804ede4
--- /dev/null
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 158.67 123.92"><defs><style>.cls-1{fill:none;}.cls-2{isolation:isolate;}.cls-3{fill:#0c2c50;}.cls-4{fill:#cfd1d3;}.cls-5{opacity:0.15;}.cls-6{fill:#221e20;mix-blend-mode:multiply;}.cls-7,.cls-9{fill:#fff;}.cls-7{opacity:0.45;}.cls-8{clip-path:url(#clip-path);}</style><clipPath id="clip-path" transform="translate(0 -0.62)"><rect class="cls-1" x="65.25" y="11.73" width="73.27" height="73.27" transform="translate(-10.87 45.62) rotate(-24)"/></clipPath></defs><g class="cls-2"><g id="Calque_2" data-name="Calque 2"><g id="Calque_1_-_copie" data-name="Calque 1 - copie"><g id="ROUGE_EXPORT_DEF" data-name="ROUGE EXPORT DEF"><path class="cls-3" d="M100.55,4.28A41.17,41.17,0,0,1,155,24.85h0a41.17,41.17,0,0,1-20.56,54.46L68.28,109.2l-33.89-75Z" transform="translate(0 -0.62)"/><path class="cls-4" d="M25.09,104.28q4.62,10.13,9.22,20.27l34-15.35-33.89-75L0,49.69l0,0Q12.69,76.94,25.09,104.28Z" transform="translate(0 -0.62)"/><g class="cls-5"><path class="cls-6" d="M152.19,19.64A43.32,43.32,0,0,1,155,24.85h0a41.17,41.17,0,0,1-20.56,54.46L68.28,109.2,63.42,98.43l66.16-29.89A41.17,41.17,0,0,0,152.19,19.64Z" transform="translate(0 -0.62)"/><path class="cls-6" d="M34.31,124.55l34-15.35L63.42,98.43l-34,15.36Z" transform="translate(0 -0.62)"/></g><path class="cls-7" d="M118.94,20.66h0A11.41,11.41,0,0,0,103.83,15L4.67,59.76q4.8,10.35,9.55,20.74l99-44.73A11.43,11.43,0,0,0,118.94,20.66Z" transform="translate(0 -0.62)"/></g><g id="icone_connection" data-name="icone connection"><g class="cls-8"><path class="cls-9" d="M120,39.81a3.38,3.38,0,0,0-.24-.41,5.62,5.62,0,0,0-.44-.53c-.09-.1-.16-.21-.25-.3s-.4-.32-.6-.48l-.26-.2a6.31,6.31,0,0,0-.73-.38c-.09,0-.17-.1-.27-.14h0L92.43,27.85a5.65,5.65,0,1,0-4.05,10.54l12,4.62L75.85,53.94v0a5.64,5.64,0,0,0,4.58,10.29v0L105,53.33l-4.62,12a5.65,5.65,0,0,0,10.55,4l9.53-24.82h0c0-.09,0-.18.07-.27a8,8,0,0,0,.21-.81c0-.1,0-.21,0-.31a5.24,5.24,0,0,0,0-.79c0-.12,0-.24,0-.37s0-.47-.1-.7a4,4,0,0,0-.15-.45,3.27,3.27,0,0,0-.48-1.08Z" transform="translate(0 -0.62)"/><path class="cls-9" d="M109.57,18.94c2.35-1.05,5.28-3,7.92-2.26,1.82.55,2.46,2.67,3.15,4.21l7.11,16,7.1,16c.76,1.71,1.61,3.18,1,5.16-.72,2.41-4.94,3.47-7,4.38-3.64,1.62-1.12,7.26,2.52,5.64,3.26-1.45,6.3-2.57,8.78-5.23s2.54-7.44,1.09-10.71l-7.89-17.71L125.5,16.62a10.64,10.64,0,0,0-8.68-6.35c-3.34-.46-6.83,1.72-9.77,3C103.41,14.91,105.93,20.56,109.57,18.94Z" transform="translate(0 -0.62)"/></g></g></g></g></g></svg>
\ No newline at end of file
diff --git a/public/img/nav/8-logout.svg b/public/img/nav/8-logout.svg
new file mode 100644 (file)
index 0000000..fbe1b2c
--- /dev/null
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 158.67 123.92"><defs><style>.cls-1{fill:none;}.cls-2{isolation:isolate;}.cls-3{fill:#0c2c50;}.cls-4{fill:#cfd1d3;}.cls-5{opacity:0.15;}.cls-6{fill:#221e20;mix-blend-mode:multiply;}.cls-7,.cls-9{fill:#fff;}.cls-7{opacity:0.45;}.cls-8{clip-path:url(#clip-path);}</style><clipPath id="clip-path" transform="translate(0 -0.62)"><rect class="cls-1" x="65.25" y="11.73" width="73.27" height="73.27" transform="translate(-10.87 45.62) rotate(-24)"/></clipPath></defs><g class="cls-2"><g id="Calque_2" data-name="Calque 2"><g id="Calque_1_-_copie" data-name="Calque 1 - copie"><g id="ROUGE_EXPORT_DEF" data-name="ROUGE EXPORT DEF"><path class="cls-3" d="M100.55,4.28A41.17,41.17,0,0,1,155,24.85h0a41.17,41.17,0,0,1-20.56,54.46L68.28,109.2l-33.89-75Z" transform="translate(0 -0.62)"/><path class="cls-4" d="M25.09,104.28q4.62,10.13,9.22,20.27l34-15.35-33.89-75L0,49.69l0,0Q12.69,76.94,25.09,104.28Z" transform="translate(0 -0.62)"/><g class="cls-5"><path class="cls-6" d="M152.19,19.64A43.32,43.32,0,0,1,155,24.85h0a41.17,41.17,0,0,1-20.56,54.46L68.28,109.2,63.42,98.43l66.16-29.89A41.17,41.17,0,0,0,152.19,19.64Z" transform="translate(0 -0.62)"/><path class="cls-6" d="M34.31,124.55l34-15.35L63.42,98.43l-34,15.36Z" transform="translate(0 -0.62)"/></g><path class="cls-7" d="M118.94,20.66h0A11.41,11.41,0,0,0,103.83,15L4.67,59.76q4.8,10.35,9.55,20.74l99-44.73A11.43,11.43,0,0,0,118.94,20.66Z" transform="translate(0 -0.62)"/></g><g id="icone_deconnection" data-name="icone deconnection"><g class="cls-8"><path class="cls-9" d="M133,33.81a3.38,3.38,0,0,0-.24-.41,5.62,5.62,0,0,0-.44-.53c-.09-.1-.16-.21-.25-.3s-.4-.32-.6-.48l-.26-.2a6.31,6.31,0,0,0-.73-.38c-.09,0-.17-.1-.27-.14h0l-24.82-9.52a5.65,5.65,0,1,0-4.05,10.54l12,4.62L88.85,47.94v0a5.64,5.64,0,0,0,4.58,10.29v0L118,47.33l-4.62,12a5.65,5.65,0,0,0,10.55,4l9.53-24.82h0c0-.09,0-.18.07-.27a8,8,0,0,0,.21-.81c0-.1,0-.21,0-.31a5.24,5.24,0,0,0,0-.79c0-.12,0-.24,0-.37s-.05-.47-.1-.7a4,4,0,0,0-.15-.45,3.27,3.27,0,0,0-.48-1.08Z" transform="translate(0 -0.62)"/><path class="cls-9" d="M96.91,76.55c-2.35,1-5.28,3-7.93,2.25-1.81-.54-2.46-2.66-3.14-4.2l-7.11-16-7.1-16c-.77-1.71-1.62-3.18-1-5.16.71-2.41,4.94-3.47,7-4.38,3.64-1.62,1.13-7.26-2.51-5.64-3.26,1.45-6.3,2.57-8.78,5.23s-2.55,7.44-1.09,10.71l7.89,17.71L81,78.87a10.66,10.66,0,0,0,8.69,6.35c3.34.46,6.83-1.72,9.76-3C103.06,80.57,100.55,74.93,96.91,76.55Z" transform="translate(0 -0.62)"/></g></g></g></g></g></svg>
\ No newline at end of file
index 1e7d54d07f841f4389c4322820628985bd559992..cf83dd667e9db53c28c5edf82afbff0890c97aef 100644 (file)
@@ -79171,12 +79171,19 @@ var render = function() {
           ]),
           _vm._v(" "),
           _c("div", { class: { "col-sm-6": true, "order-1": _vm.flip } }, [
-            _c("p", { domProps: { innerHTML: _vm._s(_vm.hit.description) } }),
+            _c("div", {
+              staticClass: "pb-2",
+              domProps: { innerHTML: _vm._s(_vm.hit.description) }
+            }),
             _vm._v(" "),
             _c(
               "a",
               {
-                staticClass: "click-here",
+                class: {
+                  "click-here": true,
+                  "bottom-right": !_vm.flip,
+                  "bottom-left": _vm.flip
+                },
                 attrs: { href: _vm.hit.url, target: "_blank" }
               },
               [_vm._v("Lire ici")]
index aad4840df0a8ac18e5380a4e37b246c5188c6596..a3401dd9c47df595f8d3a8306445aaf16c0d5f89 100644 (file)
@@ -13,8 +13,8 @@
                 <img class="w-100" :src="hit.image" alt="">
             </div>
             <div :class="{'col-sm-6': true, 'order-1' : flip}">
-                <p v-html="hit.description"></p>
-                <a :href="hit.url" target="_blank" class="click-here">Lire ici</a>
+                <div v-html="hit.description" class="pb-2"></div>
+                <a :href="hit.url" target="_blank" :class="{'click-here': true,  'bottom-right': !flip, 'bottom-left': flip}">Lire ici</a>
             </div>
         </div>
 
index c3498bf01d5069ce63adb5dc642bc97eb4a2ed7d..8937831d989174ad607c2f807475f61baec764c3 100644 (file)
@@ -5,6 +5,11 @@ $psq_blue: #074e9c;
 $psq_light_blue: #cddceb; //$psq_blue, opacity 0.3 white bg
 $psq_purple: #AD5ED3;
 $psq_cyan: #288ed7;
+$psq_magenta: #ce317c;
+$psq_orange: #e79817;
+$psq_grey: #546983;
+$psq_denim: #0c2c50;
+$psq_green: #41BD53;
 
 
 // BOOTSTRAP VARS
@@ -16,9 +21,28 @@ $enable-shadows: true;
 
 //CLASS HELPERS
 
-$psq_colors: ("blue" : $psq_blue, "purple" : $psq_purple, "red" : $psq_red, "cyan" : $psq_cyan);
-
+$psq_colors: (
+    "blue" : $psq_blue,
+    "purple" : $psq_purple,
+    "red" : $psq_red,
+    "cyan" : $psq_cyan,
+    "magenta" : $psq_magenta,
+    "orange" : $psq_orange,
+    "grey" : $psq_grey,
+    "denim" : $psq_denim,
+    "green" : $psq_green
+);
 
+$psq_pages: (
+    "psq-actu" : $psq_red,
+    "psq-com-campaign" : $psq_purple,
+    "psq-plus" : $psq_green,
+    "psq-mag" : $psq_magenta,
+    "psq-podcasts" : $psq_cyan,
+    "psq-labos" : $psq_grey,
+    "psq-not-registered" : $psq_orange,
+    "psq-login-logout" : $psq_denim,
+);
 
 @each $name, $color in $psq_colors {
     .#{$name} {
@@ -34,26 +58,15 @@ $psq_colors: ("blue" : $psq_blue, "purple" : $psq_purple, "red" : $psq_red, "cya
     }
 }
 
-//
-//.highlight-purple {
-//    color: white;
-//    background-color: $psq_purple;
-//}
-//
-//.purple {
-//    color: $psq_purple;
-//}
-//
-//.highlight-red {
-//    color: white;
-//    background-color: $psq_red;
-//}
-//
-//.red {
-//    color: $psq_red;
-//}
-//
-//.cyan {
-//    $color: $psq_cyan;
-//}
-//
+
+@each $class, $color in $psq_pages {
+    .#{$class} {
+        h1 {
+            color: white;
+            background-color: $color;
+        }
+        .pill-box > div {
+            border: 1px solid $color;
+        }
+    }
+}
index 4ae2868b058dee03c9b7b7695b8ec0df218c8978..063cd6a0164faf8252aa1aafbef29f86ecf507bb 100644 (file)
@@ -1,3 +1,5 @@
+$pill-max-width: 100px;
+
 nav {
     margin-bottom: .5rem;
     display: flex;
@@ -12,7 +14,7 @@ nav {
     }
 
     img {
-        max-width: 100px;
+        max-width: $pill-max-width;
         margin-bottom: 1rem;
     }
 
@@ -26,4 +28,19 @@ nav {
         word-break: break-word;
     }
 
+    .pill-bigger {
+        flex-grow: 1.25;
+
+        img {
+            max-width: $pill-max-width * 1.25;
+        }
+    }
+    .pill-smaller {
+        flex-grow: 1;
+
+        img {
+            max-width: $pill-max-width * 0.5;
+        }
+    }
+
 }
index 87c1542f0533c59110001400cfb71c471987bfdc..9627d56c129fd959bbd3a7663e38ca48766e7126 100644 (file)
@@ -1,6 +1,7 @@
 
 div.pill-box {
     position: relative;
+    background-color: white;
 
 
     img {
index 0c8fcae45240c2d6a3cdbc507d9371486200965f..cd5bbf893c87f299ac9c9b7d7303a4b52947215c 100644 (file)
@@ -16,6 +16,7 @@
     0 4px 8px rgba(90, 97, 105, 0.12),
     0 10px 10px rgba(90, 97, 105, 0.06),
     0 7px 70px rgba(90, 97, 105, 0.1);
+    background-color: white;
 }
 
 .header-logo {
@@ -27,7 +28,7 @@
 
 a {
     color: $psq_blue !important;
-    text-transform: uppercase;
+    //text-transform: uppercase;
 
 }
 
@@ -36,6 +37,22 @@ a {
     font-weight: bold;
     margin-bottom: 0;
     display: block;
+    text-transform: uppercase;
+
+    &.bottom {
+        &-left {
+            left:25px;
+            position: absolute;
+            bottom: 0;
+        }
+
+        &-right {
+            right:25px;
+            position: absolute;
+            bottom: 0;
+        }
+}
+
 }
 
 .small-text {
@@ -48,7 +65,7 @@ a {
 
 .spotlight-news {
 
-    background-color: rgba($psq_blue, 0.25);
+    //background-color: rgba($psq_blue, 0.25);
     padding: 0.5rem;
     margin-bottom: 1rem;
 
diff --git a/resources/views/adCampaigns/index.blade.php b/resources/views/adCampaigns/index.blade.php
deleted file mode 100644 (file)
index b98a9de..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-@extends('layouts.app')
-@section('content')
-
-<div class="container campaign">
-    <h1 class="highlight-purple">marketing & com : les campagnes de la semaine</h1>
-
-
-    <div class="row">
-        <div class="col-md-8 mb-4">
-            <campaign-hit :hit='@json($campaigns->pop())'></campaign-hit>
-        </div>
-        <div class="col-md-4 mb-4">
-            <x-pill-box title="Consultez ici notre page agenda" color="purple">
-                Haec dum oriens diu perferret, caeli reserato tepore Constantius consulatu suo septies et Caesaris ter egressus Arelate Valentiam petit, in Gundomadum et Vadomarium fratres Alamannorum reges arma moturus, quorum crebris excursibus vastabantur confines limitibus terrae Gallorum.
-            </x-pill-box>
-
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-md-4 mb-4">
-            <x-pill-box title="Consultez ici notre page agenda" color="purple">
-                Haec dum oriens diu perferret, caeli reserato tepore Constantius consulatu suo septies et Caesaris ter egressus Arelate Valentiam petit, in Gundomadum et Vadomarium fratres Alamannorum reges arma moturus, quorum crebris excursibus vastabantur confines limitibus terrae Gallorum.
-            </x-pill-box>
-        </div>
-        <div class="col-md-8 mb-4">
-            <campaign-hit :hit='@json($campaigns->pop())' :flip="true"></campaign-hit>
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-md-12">
-            <campaign-hit :hit='@json($campaigns->pop())'></campaign-hit>
-        </div>
-    </div>
-
-
-</div>
-@endsection
diff --git a/resources/views/adCampaigns/search.blade.php b/resources/views/adCampaigns/search.blade.php
deleted file mode 100644 (file)
index b48dc87..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-@extends('layouts.app')
-
-@section('content')
-<div class="container">
-    <h1 class="highlight-purple">ARCHIVES : CAMPAGNES & COMMUNICATION DES ACTEURS DE LA SANTÉ</h1>
-
-
-    <campaign-instant-search></campaign-instant-search>
-</div>
-@endsection
diff --git a/resources/views/admin/pillBoxSpaces/form.blade.php b/resources/views/admin/pillBoxSpaces/form.blade.php
new file mode 100644 (file)
index 0000000..6fe50fb
--- /dev/null
@@ -0,0 +1,22 @@
+@extends('twill::layouts.form')
+
+@section('contentFields')
+
+    @formField('input', [
+        'name' => 'box_title',
+        'label' => "Titre de l'encadré",
+        'maxlength' => 100
+    ])
+    @formField('input', [
+        'name' => 'box_link',
+        'label' => "Lien de l'encadré",
+        'maxlength' => 250
+    ])
+    @formField('wysiwyg', [
+        'name' => 'box_content',
+        'label' => "Contenu de l'encadré",
+        'maxlength' => 750,
+        'toolbarOptions' => [ 'bold', 'italic', 'underline', 'strike', 'link' ],
+
+    ])
+@stop
diff --git a/resources/views/com-campaigns/index.blade.php b/resources/views/com-campaigns/index.blade.php
new file mode 100644 (file)
index 0000000..bfd698b
--- /dev/null
@@ -0,0 +1,35 @@
+@extends('layouts.app')
+@section('content')
+
+<div class="container psq-com-campaign">
+    <h1>marketing & com : les campagnes de la semaine</h1>
+
+
+    <div class="row">
+        <div class="col-md-8 mb-4">
+            <campaign-hit :hit='@json($campaigns->pop())'></campaign-hit>
+        </div>
+        <div class="col-md-4 mb-4">
+            <x-pill-box slug="campagnes-et-com-1">
+            </x-pill-box>
+
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-4 mb-4">
+            <x-pill-box slug="campagnes-et-com-2">
+            </x-pill-box>
+        </div>
+        <div class="col-md-8 mb-4">
+            <campaign-hit :hit='@json($campaigns->pop())' :flip="true"></campaign-hit>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-12">
+            <campaign-hit :hit='@json($campaigns->pop())'></campaign-hit>
+        </div>
+    </div>
+
+
+</div>
+@endsection
diff --git a/resources/views/com-campaigns/search.blade.php b/resources/views/com-campaigns/search.blade.php
new file mode 100644 (file)
index 0000000..5589f8d
--- /dev/null
@@ -0,0 +1,10 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container psq-com-campaign">
+    <h1 class="highlight-purple">ARCHIVES : CAMPAGNES & COMMUNICATION DES ACTEURS DE LA SANTÉ</h1>
+
+
+    <campaign-instant-search></campaign-instant-search>
+</div>
+@endsection
index 1d99c314204fa9941886232432a1ac42473d6d7b..b31afcf70fe60efcf43723ee9eeadd9e7f6aa57b 100644 (file)
@@ -1,6 +1,6 @@
 <nav class="container">
     <div>
-        <a href="#">
+        <a href="/">
             <img src="{{asset('img/nav/1-lactu.svg')}}" alt="Pill Icon">
             <p>à la une de notre quotidien</p>
         </a>
 
     @guest
         <div>
-            <a class="" href="{{ route('login') }}">
+            <a class="" href="{{ action('Auth\NotRegisteredYet@index') }}">
                 <img src="{{asset('img/nav/7-pasabonne.svg')}}" alt="Pill Icon">
+                <p>
+                    COMMENT VOUS ABONNER À NOTRE QUOTIDIEN
+                </p>
+            </a>
+        </div>
+
+        <div>
+            <a class="" href="{{ route('login') }}">
+                <img src="{{asset('img/nav/8-login.svg')}}" alt="Pill Icon">
                 <p>
                     {{ __('Login') }}
                 </p>
@@ -58,7 +67,7 @@
             <a class="" href="{{ route('logout') }}"
                onclick="event.preventDefault();
                                          document.getElementById('logout-form').submit();">
-                <img src="{{asset('img/nav/7-pasabonne.svg')}}" alt="Pill Icon">
+                <img src="{{asset('img/nav/8-logout.svg')}}" alt="Pill Icon">
                 <p>
                     {{ __('Logout') }}
                 </p>
index 5c5c7977077a522b08a7a8e5e0bd930dbba1164f..e066e285941f090ff1702c907b2ef848bc61ea86 100644 (file)
@@ -1,9 +1,9 @@
-<div {{$attributes->merge(['class' => "pill-box"])}}>
+<div {{$attributes->merge(['class' => "pill-box ".$class])}}>
 
     <img src="{{asset('img/blue-pill-box.svg')}}" alt="Pill Icon" class="pill-icon">
-    <div class="{{$class}}">
+    <div>
         <h2 class="bold">{{$title}}</h2>
-        <p>{{$slot}}</p>
+        {!! $content ?? $slot !!}
         <a href="{{$link}}">Cliquez-ici</a>
     </div>
 
index 12e13a8d18267cbb1744ed053c8a8f7d21c738b4..c7e6f6cea0bbd11dae11561a2b735e26f04ecdb9 100644 (file)
@@ -1,7 +1,7 @@
 @extends('layouts.app')
 
 @section('content')
-<div class="container">
+<div class="container psq-actu">
 
     <h1>L'actualité à la une de notre quotidien</h1>
     <div class="row justify-content-center pt-3">
                 @endforeach
             </div>
 
-            <x-pill-box class="my-5" 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
-
+            <x-pill-box class="my-5" slug="page-daccueil">
             </x-pill-box>
 
             <div class="row mt-3">
diff --git a/resources/views/not-registered.blade.php b/resources/views/not-registered.blade.php
deleted file mode 100644 (file)
index d19b497..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-@extends('layouts.app')
-@inject('settings', \A17\Twill\Repositories\SettingRepository)
-
-@section('content')
-<div class="container">
-    <h1>Pas encore abonné ?</h1>
-
-    <div class="row align-items-center">
-        <div class="col-sm-6">
-            <img src="{{asset('img/not-registered.jpg')}}" alt="Image pas encore abonné" class="w-100">
-        </div>
-        <div class="col-sm-6 pt-3">
-            {!! $settings->byKey('not_registered_text') !!}
-        </div>
-
-    </div>
-</div>
-
-
-@endsection
diff --git a/resources/views/not-registered/index.blade.php b/resources/views/not-registered/index.blade.php
new file mode 100644 (file)
index 0000000..82c0f25
--- /dev/null
@@ -0,0 +1,20 @@
+@extends('layouts.app')
+@inject('settings', \A17\Twill\Repositories\SettingRepository)
+
+@section('content')
+<div class="container psq-not-registered">
+    <h1>Pas encore abonné ?</h1>
+
+    <div class="row align-items-center">
+        <div class="col-sm-6">
+            <img src="{{asset('img/not-registered.jpg')}}" alt="Image pas encore abonné" class="w-100">
+        </div>
+        <div class="col-sm-6 pt-3">
+            {!! $settings->byKey('not_registered_text') !!}
+        </div>
+
+    </div>
+</div>
+
+
+@endsection
index 8217bd9a7c208f9541f1d4d781ca4ed20d6e5b2a..71cccacff4ef606ad236aee7a81371486e03dc20 100644 (file)
@@ -2,8 +2,8 @@
 @inject('settings', App\Repositories\SettingRepository)
 
 @section('content')
-<div class="container">
-    <h1 class="highlight-cyan">LA SEULE ÉMISSION « ON AIR » DÉDIÉE À LA COMMUNICATION DES ACTEURS DE LA SANTÉ</h1>
+<div class="container psq-podcasts">
+    <h1>LA SEULE ÉMISSION « ON AIR » DÉDIÉE À LA COMMUNICATION DES ACTEURS DE LA SANTÉ</h1>
 
 
     <div class="row mt-5">
index 098d857ff69e524d7c093b1b439517c7159210df..e4cd783b3dd8f780b0884351453f8f61a16419c3 100644 (file)
@@ -9,9 +9,12 @@ Route::prefix('content')->group(function() {
     Route::module('adCampaigns');
     Route::module('events');
     Route::module('podcasts');
-    Route::module('guests');
+    Route::module('guests'); //podcast guests
 });
 
+Route::prefix('settings')->group(function() {
+    Route::module('pillBoxSpaces');
+});
 
 
 /** Publishing and mass sending process */