diff --git a/app/Enums/GeneralConfigType.php b/app/Enums/GeneralConfigType.php index 0f2e01dd..71ce913b 100644 --- a/app/Enums/GeneralConfigType.php +++ b/app/Enums/GeneralConfigType.php @@ -6,20 +6,23 @@ use Kwaadpepper\Enum\BaseEnumRoutable; /** * @method static self actu() + * @method static self rsm() */ final class GeneralConfigType extends BaseEnumRoutable { protected static function values(): array { return [ - 'actu' => 1 + 'actu' => 1, + 'rsm' => 2 ]; } protected static function labels(): array { return [ - 'actu' => __('Actualité') + 'actu' => __('Actualité'), + 'rsm' => __('RSM Block') ]; } } diff --git a/app/Http/Controllers/Bo/ProductsController.php b/app/Http/Controllers/Bo/ProductsController.php index c1dfc24a..93b41195 100644 --- a/app/Http/Controllers/Bo/ProductsController.php +++ b/app/Http/Controllers/Bo/ProductsController.php @@ -466,6 +466,13 @@ class ProductsController extends Controller return redirect()->route('bo.products.index'); } + public function showRsm(Products $product) + { + $product->show_rsm = !$product->show_rsm; + $product->saveOrFail(); + return redirect()->back(); + } + public function setXmlInco(SetProductXmlInco $request, Products $product) { $xmlInco = XmlInco::where('id', $request->xml_inco)->firstOrFail(); diff --git a/app/Http/Controllers/ProductsController.php b/app/Http/Controllers/ProductsController.php index 411542ea..4fcfd11f 100644 --- a/app/Http/Controllers/ProductsController.php +++ b/app/Http/Controllers/ProductsController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers; +use App\Enums\GeneralConfigType; use App\Models\BalancedMenus; use App\Models\ConsumptionTimes; use App\Models\ProductSliderPictures; @@ -112,9 +113,11 @@ class ProductsController extends Controller $ids[] = $r->id; } $ids = array_unique($ids); + $generalConfig = app()->view->getShared()['GeneralConfigGlobal'] ?? null; + $generalConfig = $generalConfig ? $generalConfig->where('type', GeneralConfigType::rsm())->first() : null; $recipes = Recipes::whereIn('id', $ids)->where('status', true)->get(); - return view('front.products.product', compact('product', 'recipes', 'recipeVideo')); + return view('front.products.product', compact('product', 'recipes', 'recipeVideo', 'generalConfig')); } public function indexMenusAjax(Request $request) diff --git a/config/image-resizer.php b/config/image-resizer.php index 98f19efe..b71e48ce 100644 --- a/config/image-resizer.php +++ b/config/image-resizer.php @@ -102,6 +102,9 @@ return [ ], 'actuWebp' => [ 'format' => 'webp' - ] + ], + 'productRSMWEBP' => [ + 'format' => 'webp' + ], ] ]; diff --git a/database/migrations/2021_09_22_130440_add_title_column_general_config.php b/database/migrations/2021_09_22_130440_add_title_column_general_config.php new file mode 100644 index 00000000..b6949170 --- /dev/null +++ b/database/migrations/2021_09_22_130440_add_title_column_general_config.php @@ -0,0 +1,39 @@ +string('title')->before('type')->default('Titre'); + }); + $config = GeneralConfig::where('type', GeneralConfigType::actu())->first(); + if ($config) { + $config->title = 'Configuration actualités'; + $config->saveOrFail(); + } + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('general_configs', function (Blueprint $table) { + $table->dropColumn('title'); + }); + } +} diff --git a/database/migrations/2021_09_22_130656_create_general_config_rsm_block.php b/database/migrations/2021_09_22_130656_create_general_config_rsm_block.php new file mode 100644 index 00000000..69ab4060 --- /dev/null +++ b/database/migrations/2021_09_22_130656_create_general_config_rsm_block.php @@ -0,0 +1,66 @@ +title = 'Configuration RSM'; + $config->type = GeneralConfigType::rsm(); + $config->data = [ + 'img_rsm_header' => [ + 'dimensions' => 'largeur 200,hauteur 184', + 'label' => 'Image d\'entête RSM', + 'inputType' => InputType::image(), + 'alt' => 'Image d\'entête RSM', + 'value' => '/assets/images/onsengage/logo-onsengage.png' + ], + 'img_rsm_title' => [ + 'label' => 'Titre (h6)', + 'inputType' => InputType::string(), + 'value' => '100 %' + ], + 'img_rsm_sub_title' => [ + 'label' => 'Sous-Titre (h6)', + 'inputType' => InputType::string(), + 'value' => 'Français' + ], + 'img_rsm_sub_text' => [ + 'label' => 'Sous-Titre (h6)', + 'inputType' => InputType::text(), + // phpcs:ignore Generic.Files.LineLength.TooLong + 'value' => 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras ante ipsum, consectetur a lectus.', + 'validate' => 'string|min:10|max:100' + ], + 'img_rsm_sub_link' => [ + 'text' => 'En savoir +', + 'label' => 'Lien du bouton en savoir +', + 'inputType' => InputType::url(), + 'status' => true, + 'newtab' => false, + 'value' => '' + ] + ]; + $config->saveOrFail(); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + GeneralConfig::where('type', GeneralConfigType::rsm())->delete(); + } +} diff --git a/database/migrations/2021_09_22_141353_add_show_rsm_on_products.php b/database/migrations/2021_09_22_141353_add_show_rsm_on_products.php new file mode 100644 index 00000000..e7179491 --- /dev/null +++ b/database/migrations/2021_09_22_141353_add_show_rsm_on_products.php @@ -0,0 +1,32 @@ +boolean('show_rsm')->after('star')->default(false); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('products', function (Blueprint $table) { + $table->dropColumn('show_rsm'); + }); + } +} diff --git a/resources/assets/images/produit/produit_fond_bois.jpg b/resources/assets/images/produit/produit_fond_bois.jpg new file mode 100644 index 00000000..a436d844 Binary files /dev/null and b/resources/assets/images/produit/produit_fond_bois.jpg differ diff --git a/resources/js/pages/products/show.js b/resources/js/pages/products/show.js index fcc1600b..d002b6b3 100644 --- a/resources/js/pages/products/show.js +++ b/resources/js/pages/products/show.js @@ -25,11 +25,14 @@ if (document.querySelector('.content.product')) { } }; - // Listen for new scroll events, here we debounce our `storeScroll` function - document.addEventListener('scroll', __Gaul.debounce(storeScroll), { passive: true }); + // handle rsm + if (!document.getElementsByClassName('rsm').length) { + // Listen for new scroll events, here we debounce our `storeScroll` function + document.addEventListener('scroll', __Gaul.debounce(storeScroll), { passive: true }); - // Update scroll position for first time - storeScroll(); + // Update scroll position for first time + storeScroll(); + } let buttons = document.getElementsByClassName('product_block_active'); for (let i = 0; i < buttons.length; i++) { diff --git a/resources/sass/front/pages/products/_product.scss b/resources/sass/front/pages/products/_product.scss index 852f40e2..3031d90e 100644 --- a/resources/sass/front/pages/products/_product.scss +++ b/resources/sass/front/pages/products/_product.scss @@ -1,4 +1,5 @@ .content.product { + position: relative; background-color: #fbf8f5; margin-right: 0 !important; max-width: inherit !important; @@ -40,6 +41,66 @@ padding-right: 0; } + & .rsm { + background-image: url('~@/images/produit/produit_fond_bois.jpg'); + background-size: cover; + padding: 2.133rem 2.666rem; + position: absolute; + display: flex; + flex-direction: column; + // compenser avec -23.93rem, gutter avec - 10.06rem + margin-left: -23.93rem - 10.06rem; + width: 23.93rem; + min-height: 38.329rem; + + & picture { + text-align: center; + } + + & .header { + margin-top: 2.666rem; + font-family: 'Veneer'; + color: $engagementDarkGreen; + text-align: center; + & .title { + font-size: 8rem; + line-height: 6.5rem; + } + & .subtitle { + font-size: 3.333rem; + } + } + & .content { + margin-top: 1.066rem; + font-size: 'Catamaran-Regular'; + color: $engagementDarkerGreen; + font-size: 1.199rem; + text-align: center; + } + & .link { + margin-top: 2.666rem; + text-align: center; + & a { + background-color: #006633; + color: #FFF; + display: inline-block; + min-height: 2.867rem; + font-family: "Catamaran-Bold"; + font-size: 1.066rem; + font-weight: bold; + padding: 0.6rem 1rem; + border-radius: 2rem; + text-transform: uppercase; + line-height: 1.733rem; + &:hover { + background-color: #082014 !important; + text-decoration: underline !important; + cursor: pointer; + } + } + } + } + & .general { & p { font-family: 'CreamyScriptRegular'; diff --git a/resources/views/bo/general-configs/edit.blade.php b/resources/views/bo/general-configs/edit.blade.php index 01d148b0..0347c3cc 100644 --- a/resources/views/bo/general-configs/edit.blade.php +++ b/resources/views/bo/general-configs/edit.blade.php @@ -3,7 +3,7 @@ @section('content')