diff --git a/app/Http/Controllers/Fo/ContactController.php b/app/Http/Controllers/Fo/ContactController.php
index 5fdb700..1d391bd 100644
--- a/app/Http/Controllers/Fo/ContactController.php
+++ b/app/Http/Controllers/Fo/ContactController.php
@@ -6,6 +6,7 @@ use App\Enums\StaticPageType;
use App\Http\Controllers\Controller;
use App\Http\Requests\Fo\ContactFormRequest;
use App\Models\Customer\Contact;
+use App\Models\Shop\Shop;
use App\Models\Site\StaticPage;
use Illuminate\Support\Facades\DB;
@@ -20,7 +21,9 @@ class ContactController extends Controller
{
$content = StaticPage::getPageOfType(StaticPageType::contact());
- return view('theme::pages.contact', compact('content'));
+ $firstShop = Shop::firstOrFail();
+
+ return view('theme::pages.contact', compact('content', 'firstShop'));
}
/**
diff --git a/app/Http/Controllers/Fo/TagController.php b/app/Http/Controllers/Fo/TagController.php
index ab2f6ea..675740c 100644
--- a/app/Http/Controllers/Fo/TagController.php
+++ b/app/Http/Controllers/Fo/TagController.php
@@ -31,7 +31,9 @@ class TagController extends Controller
*/
public function tag(Tag $tag)
{
- $products = Product::query()->where('status', 1)
+ $products = Product::query()
+ ->where('status', true)
+ ->with(['discount'])
->whereHas('tags', function ($q) use ($tag) {
$q->where('id', $tag->id);
})->paginate(12);
diff --git a/app/Models/Merchandise/Product.php b/app/Models/Merchandise/Product.php
index 3ebb503..d9847d2 100644
--- a/app/Models/Merchandise/Product.php
+++ b/app/Models/Merchandise/Product.php
@@ -142,6 +142,8 @@ class Product extends Model implements Buyable
});
static::created(function (self $model) {
$model->flashMessages();
+ // Tag cache need to be refreshed to display the correct number of related products.
+ Tag::removeCached();
});
static::updating(function (self $model) {
// * ASSERTIONS
@@ -171,6 +173,8 @@ class Product extends Model implements Buyable
FileStorageHelper::removeOldModelFilesFromHtml($model->description, $model->getOriginal('description'));
$model->flashMessages();
$model->minicrudUpdated();
+ // Tag cache need to be refreshed to display the correct number of related products.
+ Tag::removeCached();
});
static::deleted(function (self $model) {
$model->oldSlugs()->delete();
diff --git a/config/image-resizer.php b/config/image-resizer.php
index e807d13..b9131e0 100644
--- a/config/image-resizer.php
+++ b/config/image-resizer.php
@@ -77,8 +77,8 @@ return [
'trim' => true
],
'foBoutiqueLogo' => [
- 'height' => 100,
- 'width' => 100,
+ 'height' => 350,
+ 'width' => 350,
'format' => 'png',
'inCanvas' => true,
'resize' => true,
diff --git a/public/apple-touch-icon-bo.png b/public/apple-touch-icon-bo.png
deleted file mode 100644
index a0bc800..0000000
Binary files a/public/apple-touch-icon-bo.png and /dev/null differ
diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png
deleted file mode 100644
index 39cc55a..0000000
Binary files a/public/apple-touch-icon.png and /dev/null differ
diff --git a/public/favicon-16x16.png b/public/favicon-16x16.png
deleted file mode 100644
index 343acf8..0000000
Binary files a/public/favicon-16x16.png and /dev/null differ
diff --git a/public/favicon-32x32.png b/public/favicon-32x32.png
deleted file mode 100644
index ccbde4f..0000000
Binary files a/public/favicon-32x32.png and /dev/null differ
diff --git a/public/favicon-bo-16x16.png b/public/favicon-bo-16x16.png
deleted file mode 100644
index df34ba0..0000000
Binary files a/public/favicon-bo-16x16.png and /dev/null differ
diff --git a/public/favicon-bo-32x32.png b/public/favicon-bo-32x32.png
deleted file mode 100644
index a7c8421..0000000
Binary files a/public/favicon-bo-32x32.png and /dev/null differ
diff --git a/public/favicon-bo.ico b/public/favicon-bo.ico
deleted file mode 100644
index d9a0cec..0000000
Binary files a/public/favicon-bo.ico and /dev/null differ
diff --git a/public/favicon.ico b/public/favicon.ico
deleted file mode 100644
index 83b304e..0000000
Binary files a/public/favicon.ico and /dev/null differ
diff --git a/public/safari-pinned-tab.svg b/public/safari-pinned-tab.svg
deleted file mode 100644
index 1b0cad9..0000000
--- a/public/safari-pinned-tab.svg
+++ /dev/null
@@ -1,134 +0,0 @@
-
-
-
diff --git a/public/site.webmanifest b/public/site.webmanifest
deleted file mode 100644
index 559a1d4..0000000
--- a/public/site.webmanifest
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "name": "Boutique Mairet",
- "short_name": "Boutique Mairet",
- "icons": [
- {
- "src": "/android-chrome-192x192.png",
- "sizes": "192x192",
- "type": "image/png"
- },
- {
- "src": "/android-chrome-256x256.png",
- "sizes": "256x256",
- "type": "image/png"
- }
- ],
- "theme_color": "#f9ddc7",
- "background_color": "#f9ddc7",
- "display": "standalone"
-}
diff --git a/resources/views/layouts/head.blade.php b/resources/views/layouts/head.blade.php
index 27e218a..4dae1ce 100644
--- a/resources/views/layouts/head.blade.php
+++ b/resources/views/layouts/head.blade.php
@@ -8,14 +8,14 @@
{{-- GENERER favicon avec un outil https://realfavicongenerator.net/ --}}
-
-
-
-
+
+
+
+
-
-
-
+
+
+
@include('back::modules.breadcrumb.breadcrumb-head')
diff --git a/webpack.mix.js b/webpack.mix.js
index 3afc81b..17d2f4c 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -1,4 +1,6 @@
const path = require("path");
+const fs = require("fs");
+const glob = require("glob");
const mix = require("laravel-mix");
require("laravel-mix-artisan-publish");
@@ -18,7 +20,6 @@ const polyfill = {
mix.setPublicPath(path.normalize('public/build'));
mix.setResourceRoot('/build');
-
mix.webpackConfig({
resolve: {
extensions: ["*",".js", ".vue", ".ts"],
@@ -74,10 +75,10 @@ mix.clean({
// * COMMON
mix.vue({
- runtimeOnly: true,
- extractStyles: "css/v-extract.css",
- globalStyles: false,
-})
+ runtimeOnly: true,
+ extractStyles: "css/v-extract.css",
+ globalStyles: false,
+ })
.eslint({
fix: true,
extensions: ["js", "ts"],
@@ -115,3 +116,11 @@ mix.copyDirectory("resources/assets/images", `public/build/assets/images`)
// * Copy FRONT resources
mix.copyDirectory("resources/theme/assets/images", `public/build/assets/images`)
.copyDirectory("resources/theme/assets/fonts", `public/build/assets/fonts`);
+// * Copy FAVICON resources
+mix.then(() => {
+ glob.sync(path.normalize('resources/theme/favicon/*')).forEach(filePath => {
+ if (fs.statSync(path.normalize(filePath)).isFile) {
+ fs.cpSync(path.normalize(filePath), path.resolve('public/' + path.basename(filePath)));
+ }
+ });
+});