From d48d295bf055260e0d6f040f85352d724bce20ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20Nicou=C3=A9?= <contact@paulnicoue.com>
Date: Mon, 5 Sep 2022 15:24:24 +0200
Subject: [PATCH] Edit folder structure and webpack configuration

---
 {public/assets => assets}/css/main.scss             |   0
 {public/assets => assets}/css/panel.scss            |   0
 .../assets => assets}/css/partials/animations.scss  |   0
 {public/assets => assets}/css/partials/fonts.scss   |   0
 .../assets => assets}/css/partials/variables.scss   |   0
 {public/assets => assets}/css/utils/minireset.css   |   0
 {public/assets => assets}/js/app.js                 |   0
 public/{assets => }/build/app.js                    |   0
 public/{assets => }/build/app.js.LICENSE.txt        |   0
 public/{assets => }/build/entrypoints.json          |   0
 public/{assets => }/build/main.css                  |   0
 public/{assets => }/build/manifest.json             |   0
 public/{assets => }/build/panel.css                 |   0
 .../favicon/julien-monnerie-apple-touch-icon.png    | Bin
 .../favicon/julien-monnerie-favicon-192px.png       | Bin
 .../favicon/julien-monnerie-favicon-512px.png       | Bin
 .../favicon/julien-monnerie-favicon.ico             | Bin
 .../favicon/julien-monnerie-favicon.svg             |   0
 .../favicon/julien-monnerie.webmanifest             |   0
 site/config/config.php                              |   2 +-
 site/snippets/favicon.twig                          |   8 ++++----
 site/snippets/metadata.twig                         |   5 ++---
 site/templates/base.twig                            |   4 ++--
 webpack.config.js                                   |  10 +++++-----
 24 files changed, 14 insertions(+), 15 deletions(-)
 rename {public/assets => assets}/css/main.scss (100%)
 rename {public/assets => assets}/css/panel.scss (100%)
 rename {public/assets => assets}/css/partials/animations.scss (100%)
 rename {public/assets => assets}/css/partials/fonts.scss (100%)
 rename {public/assets => assets}/css/partials/variables.scss (100%)
 rename {public/assets => assets}/css/utils/minireset.css (100%)
 rename {public/assets => assets}/js/app.js (100%)
 rename public/{assets => }/build/app.js (100%)
 rename public/{assets => }/build/app.js.LICENSE.txt (100%)
 rename public/{assets => }/build/entrypoints.json (100%)
 rename public/{assets => }/build/main.css (100%)
 rename public/{assets => }/build/manifest.json (100%)
 rename public/{assets => }/build/panel.css (100%)
 rename public/{assets => }/favicon/julien-monnerie-apple-touch-icon.png (100%)
 rename public/{assets => }/favicon/julien-monnerie-favicon-192px.png (100%)
 rename public/{assets => }/favicon/julien-monnerie-favicon-512px.png (100%)
 rename public/{assets => }/favicon/julien-monnerie-favicon.ico (100%)
 rename public/{assets => }/favicon/julien-monnerie-favicon.svg (100%)
 rename public/{assets => }/favicon/julien-monnerie.webmanifest (100%)

diff --git a/public/assets/css/main.scss b/assets/css/main.scss
similarity index 100%
rename from public/assets/css/main.scss
rename to assets/css/main.scss
diff --git a/public/assets/css/panel.scss b/assets/css/panel.scss
similarity index 100%
rename from public/assets/css/panel.scss
rename to assets/css/panel.scss
diff --git a/public/assets/css/partials/animations.scss b/assets/css/partials/animations.scss
similarity index 100%
rename from public/assets/css/partials/animations.scss
rename to assets/css/partials/animations.scss
diff --git a/public/assets/css/partials/fonts.scss b/assets/css/partials/fonts.scss
similarity index 100%
rename from public/assets/css/partials/fonts.scss
rename to assets/css/partials/fonts.scss
diff --git a/public/assets/css/partials/variables.scss b/assets/css/partials/variables.scss
similarity index 100%
rename from public/assets/css/partials/variables.scss
rename to assets/css/partials/variables.scss
diff --git a/public/assets/css/utils/minireset.css b/assets/css/utils/minireset.css
similarity index 100%
rename from public/assets/css/utils/minireset.css
rename to assets/css/utils/minireset.css
diff --git a/public/assets/js/app.js b/assets/js/app.js
similarity index 100%
rename from public/assets/js/app.js
rename to assets/js/app.js
diff --git a/public/assets/build/app.js b/public/build/app.js
similarity index 100%
rename from public/assets/build/app.js
rename to public/build/app.js
diff --git a/public/assets/build/app.js.LICENSE.txt b/public/build/app.js.LICENSE.txt
similarity index 100%
rename from public/assets/build/app.js.LICENSE.txt
rename to public/build/app.js.LICENSE.txt
diff --git a/public/assets/build/entrypoints.json b/public/build/entrypoints.json
similarity index 100%
rename from public/assets/build/entrypoints.json
rename to public/build/entrypoints.json
diff --git a/public/assets/build/main.css b/public/build/main.css
similarity index 100%
rename from public/assets/build/main.css
rename to public/build/main.css
diff --git a/public/assets/build/manifest.json b/public/build/manifest.json
similarity index 100%
rename from public/assets/build/manifest.json
rename to public/build/manifest.json
diff --git a/public/assets/build/panel.css b/public/build/panel.css
similarity index 100%
rename from public/assets/build/panel.css
rename to public/build/panel.css
diff --git a/public/assets/favicon/julien-monnerie-apple-touch-icon.png b/public/favicon/julien-monnerie-apple-touch-icon.png
similarity index 100%
rename from public/assets/favicon/julien-monnerie-apple-touch-icon.png
rename to public/favicon/julien-monnerie-apple-touch-icon.png
diff --git a/public/assets/favicon/julien-monnerie-favicon-192px.png b/public/favicon/julien-monnerie-favicon-192px.png
similarity index 100%
rename from public/assets/favicon/julien-monnerie-favicon-192px.png
rename to public/favicon/julien-monnerie-favicon-192px.png
diff --git a/public/assets/favicon/julien-monnerie-favicon-512px.png b/public/favicon/julien-monnerie-favicon-512px.png
similarity index 100%
rename from public/assets/favicon/julien-monnerie-favicon-512px.png
rename to public/favicon/julien-monnerie-favicon-512px.png
diff --git a/public/assets/favicon/julien-monnerie-favicon.ico b/public/favicon/julien-monnerie-favicon.ico
similarity index 100%
rename from public/assets/favicon/julien-monnerie-favicon.ico
rename to public/favicon/julien-monnerie-favicon.ico
diff --git a/public/assets/favicon/julien-monnerie-favicon.svg b/public/favicon/julien-monnerie-favicon.svg
similarity index 100%
rename from public/assets/favicon/julien-monnerie-favicon.svg
rename to public/favicon/julien-monnerie-favicon.svg
diff --git a/public/assets/favicon/julien-monnerie.webmanifest b/public/favicon/julien-monnerie.webmanifest
similarity index 100%
rename from public/assets/favicon/julien-monnerie.webmanifest
rename to public/favicon/julien-monnerie.webmanifest
diff --git a/site/config/config.php b/site/config/config.php
index 4dcf0cf..0963eb8 100644
--- a/site/config/config.php
+++ b/site/config/config.php
@@ -5,7 +5,7 @@ return [
 	'home' => 'gallery',
 	'panel' => [
 		'language' => 'fr',
-		'css' => 'assets/build/panel.css'
+		'css' => 'build/panel.css'
 	],
 	// Sitemapper plugin options
 	'kirbyzone.sitemapper' => [
diff --git a/site/snippets/favicon.twig b/site/snippets/favicon.twig
index b5610e0..406a128 100644
--- a/site/snippets/favicon.twig
+++ b/site/snippets/favicon.twig
@@ -1,4 +1,4 @@
-<link rel="icon" sizes="any" href="assets/favicon/julien-monnerie-favicon.ico'">
-<link rel="icon" type="image/svg+xml" href="assets/favicon/julien-monnerie-favicon.svg">
-<link rel="apple-touch-icon" href="assets/favicon/julien-monnerie-apple-touch-icon.png">
-<link rel="manifest" href="assets/favicon/julien-monnerie.webmanifest">
+<link rel="icon" sizes="any" href="favicon/julien-monnerie-favicon.ico'">
+<link rel="icon" type="image/svg+xml" href="favicon/julien-monnerie-favicon.svg">
+<link rel="apple-touch-icon" href="favicon/julien-monnerie-apple-touch-icon.png">
+<link rel="manifest" href="favicon/julien-monnerie.webmanifest">
diff --git a/site/snippets/metadata.twig b/site/snippets/metadata.twig
index d098d12..810799f 100644
--- a/site/snippets/metadata.twig
+++ b/site/snippets/metadata.twig
@@ -1,7 +1,6 @@
 {# Basic metadata #}
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width">
-<html lang="fr">
 
 {# Schema #}
 <style itemscope itemtype="https://schema.org/WebSite" itemref="schema_name schema_description schema_image"></style>
@@ -30,9 +29,9 @@
 
 {# Image #}
 {% if page.meta_image is not empty %}
-<meta id="schema_image" itemprop="image" content="{{ page.meta_image.toImage.url }}">
+	<meta id="schema_image" itemprop="image" content="{{ page.meta_image.toImage.url }}">
 {% elseif site.homePage.meta_image is not empty %}
-<meta id="schema_image" itemprop="image" content="{{ site.homePage.meta_image.toImage.url }}">
+	<meta id="schema_image" itemprop="image" content="{{ site.homePage.meta_image.toImage.url }}">
 {% endif %}
 
 {% if page.template != 'error' %}
diff --git a/site/templates/base.twig b/site/templates/base.twig
index 9124f6b..f3f03ee 100644
--- a/site/templates/base.twig
+++ b/site/templates/base.twig
@@ -9,12 +9,12 @@
 
 	{# CSS #}
 	{% block stylesheets %}
-		<link rel="stylesheet" href="{{ asset('assets/build/main.css') }}">
+		<link rel="stylesheet" href="build/main.css">
 	{% endblock %}
 
 	{# JavaScript #}
 	{% block scripts %}
-		<script src="{{ asset('assets/build/app.js') }}" defer></script>
+		<script src="build/app.js" defer></script>
 	{% endblock %}
 
 	{# Matomo #}
diff --git a/webpack.config.js b/webpack.config.js
index f6242bd..b839a93 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -10,16 +10,16 @@ Encore
 	// PATHS
 	// ----------------------------------------------------------------------------
 
-	.setOutputPath('public/assets/build/')
-	.setPublicPath('/assets/build')
+	.setOutputPath('public/build/')
+	.setPublicPath('/build')
 
 	// ----------------------------------------------------------------------------
 	// ENTRIES
 	// ----------------------------------------------------------------------------
 
-	.addEntry('app', './public/assets/js/app.js')
-	.addStyleEntry('main', './public/assets/css/main.scss')
-	.addStyleEntry('panel', './public/assets/css/panel.scss')
+	.addEntry('app', './assets/js/app.js')
+	.addStyleEntry('main', './assets/css/main.scss')
+	.addStyleEntry('panel', './assets/css/panel.scss')
 
 	// ----------------------------------------------------------------------------
 	// FEATURES