Edit folder structure and webpack configuration

public/assets/build/app.js.LICENSE.txt

@@ -1,7 +0,0 @@
-/*!
- * circletype 2.3.0
- * A JavaScript library that lets you curve type on the web.
- * Copyright © 2014-2018 Peter Hrynkow
- * Licensed MIT
- * https://github.com/peterhry/CircleType#readme
- */

public/assets/build/manifest.json

@@ -1,14 +0,0 @@
-{
-  "assets/build/app.js": "/assets/build/app.js",
-  "assets/build/main.css": "/assets/build/main.css",
-  "assets/build/panel.css": "/assets/build/panel.css",
-  "assets/build/fonts/Nunito-MediumItalic.ttf": "/assets/build/fonts/Nunito-MediumItalic.57991510.ttf",
-  "assets/build/fonts/Nunito-Italic.ttf": "/assets/build/fonts/Nunito-Italic.18662850.ttf",
-  "assets/build/fonts/Nunito-SemiBoldItalic.ttf": "/assets/build/fonts/Nunito-SemiBoldItalic.e0d50cda.ttf",
-  "assets/build/fonts/Nunito-BoldItalic.ttf": "/assets/build/fonts/Nunito-BoldItalic.bf268a33.ttf",
-  "assets/build/fonts/Nunito-Medium.ttf": "/assets/build/fonts/Nunito-Medium.6cf31fae.ttf",
-  "assets/build/fonts/Nunito-Regular.ttf": "/assets/build/fonts/Nunito-Regular.fd0c54f3.ttf",
-  "assets/build/fonts/Nunito-SemiBold.ttf": "/assets/build/fonts/Nunito-SemiBold.56124591.ttf",
-  "assets/build/fonts/Nunito-Bold.ttf": "/assets/build/fonts/Nunito-Bold.bb33ef1f.ttf",
-  "assets/build/fonts/GloriaHallelujah-Regular.ttf": "/assets/build/fonts/GloriaHallelujah-Regular.c9da976c.ttf"
-}

public/assets/build/panel.css

@@ -1 +0,0 @@
-.k-textarea-field .k-toolbar .k-dropdown .k-button:nth-of-type(2),.k-textarea-field .k-toolbar .k-dropdown .k-button:nth-of-type(3),.kirby-imagecrop-field .k-column:nth-of-type(2){display:none}

public/build/entrypoints.json

@@ -2,17 +2,17 @@
   "entrypoints": {
     "app": {
       "js": [
-        "/assets/build/app.js"
+        "/build/app.js"
       ]
     },
     "main": {
       "css": [
-        "/assets/build/main.css"
+        "/build/main.css"
       ]
     },
     "panel": {
       "css": [
-        "/assets/build/panel.css"
+        "/build/panel.css"
       ]
     }
   }

public/build/manifest.json

@@ -0,0 +1,14 @@
+{
+  "build/app.js": "/build/app.js",
+  "build/main.css": "/build/main.css",
+  "build/panel.css": "/build/panel.css",
+  "build/fonts/Nunito-MediumItalic.ttf": "/build/fonts/Nunito-MediumItalic.57991510.ttf",
+  "build/fonts/Nunito-Italic.ttf": "/build/fonts/Nunito-Italic.18662850.ttf",
+  "build/fonts/Nunito-SemiBoldItalic.ttf": "/build/fonts/Nunito-SemiBoldItalic.e0d50cda.ttf",
+  "build/fonts/Nunito-BoldItalic.ttf": "/build/fonts/Nunito-BoldItalic.bf268a33.ttf",
+  "build/fonts/Nunito-Medium.ttf": "/build/fonts/Nunito-Medium.6cf31fae.ttf",
+  "build/fonts/Nunito-Regular.ttf": "/build/fonts/Nunito-Regular.fd0c54f3.ttf",
+  "build/fonts/Nunito-SemiBold.ttf": "/build/fonts/Nunito-SemiBold.56124591.ttf",
+  "build/fonts/Nunito-Bold.ttf": "/build/fonts/Nunito-Bold.bb33ef1f.ttf",
+  "build/fonts/GloriaHallelujah-Regular.ttf": "/build/fonts/GloriaHallelujah-Regular.c9da976c.ttf"
+}

public/build/panel.css

@@ -0,0 +1,13 @@
+/*!*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** css ./node_modules/css-loader/dist/cjs.js??ruleSet[1].rules[4].oneOf[1].use[1]!./node_modules/postcss-loader/dist/cjs.js??ruleSet[1].rules[4].oneOf[1].use[2]!./node_modules/resolve-url-loader/index.js??ruleSet[1].rules[4].oneOf[1].use[3]!./node_modules/sass-loader/dist/cjs.js??ruleSet[1].rules[4].oneOf[1].use[4]!./assets/css/panel.scss ***!
+  \*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+.k-textarea-field .k-toolbar .k-dropdown .k-button:nth-of-type(2),
+.k-textarea-field .k-toolbar .k-dropdown .k-button:nth-of-type(3) {
+  display: none;
+}
+
+.kirby-imagecrop-field .k-column:nth-of-type(2) {
+  display: none;
+}
+
+/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGFuZWwuY3NzIiwibWFwcGluZ3MiOiI7OztBQVlHOztFQUVDO0FDWEo7O0FEcUJDO0VBQ0M7QUNsQkYsQyIsInNvdXJjZXMiOlsid2VicGFjazovLy8uL2Fzc2V0cy9jc3MvcGFuZWwuc2NzcyIsIndlYnBhY2s6Ly8vLi4vLi4vLi4vLi4vRG9ubiVDMyVBOWVzL1Byb2dyYW1tYXRpb24vUHJvamV0cy94aWFvd2FuZy9hc3NldHMvY3NzL3BhbmVsLnNjc3MiXSwic291cmNlc0NvbnRlbnQiOlsiLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuLy8gS0lSQlkgUEFORUwgQ1VTVE9NSVpBVElPTlxuLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLVxuXG4vLyBUZXh0YXJlYSBoZWFkbGluZSBidXR0b25zXG5cbi5rLXRleHRhcmVhLWZpZWxkIHtcblxuXHQuay10b29sYmFyIHtcblxuXHRcdC5rLWRyb3Bkb3duIHtcblxuXHRcdFx0LmstYnV0dG9uOm50aC1vZi10eXBlKDIpLFxuXHRcdFx0LmstYnV0dG9uOm50aC1vZi10eXBlKDMpIHtcblx0XHRcdFx0ZGlzcGxheTogbm9uZTtcblx0XHRcdH1cblx0XHR9XG5cdH1cbn1cblxuLy8gVmlzdWFsIGltYWdlIGNyb3AgZmllbGQgcHJvcGVydGllc1xuXG4ua2lyYnktaW1hZ2Vjcm9wLWZpZWxkIHtcblxuXHQuay1jb2x1bW46bnRoLW9mLXR5cGUoMikge1xuXHRcdGRpc3BsYXk6IG5vbmU7XG5cdH1cbn1cbiIsIi5rLXRleHRhcmVhLWZpZWxkIC5rLXRvb2xiYXIgLmstZHJvcGRvd24gLmstYnV0dG9uOm50aC1vZi10eXBlKDIpLFxuLmstdGV4dGFyZWEtZmllbGQgLmstdG9vbGJhciAuay1kcm9wZG93biAuay1idXR0b246bnRoLW9mLXR5cGUoMykge1xuICBkaXNwbGF5OiBub25lO1xufVxuXG4ua2lyYnktaW1hZ2Vjcm9wLWZpZWxkIC5rLWNvbHVtbjpudGgtb2YtdHlwZSgyKSB7XG4gIGRpc3BsYXk6IG5vbmU7XG59Il0sIm5hbWVzIjpbXSwic291cmNlUm9vdCI6IiJ9*/

site/config/config.php

@@ -6,7 +6,7 @@ return [
 	'error' => 'erreur',
 	'panel' => [
 		'language' => 'fr',
-		'css' => 'assets/build/panel.css'
+		'css' => 'build/panel.css'
 	],
 	// Sitemapper plugin options
 	'kirbyzone.sitemapper' => [

site/snippets/favicon.twig

@@ -1,4 +1,4 @@
-<link rel="icon" sizes="any" href="assets/favicon/xiao-wang-favicon.ico">
+<link rel="icon" sizes="any" href="favicon/xiao-wang-favicon.ico">
-<link rel="icon" type="image/svg+xml" href="assets/favicon/xiao-wang-favicon.svg">
+<link rel="icon" type="image/svg+xml" href="favicon/xiao-wang-favicon.svg">
-<link rel="apple-touch-icon" href="assets/favicon/xiao-wang-apple-touch-icon.png">
+<link rel="apple-touch-icon" href="favicon/xiao-wang-apple-touch-icon.png">
-<link rel="manifest" href="assets/favicon/xiao-wang.webmanifest">
+<link rel="manifest" href="favicon/xiao-wang.webmanifest">

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' %}

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 #}
@@ -24,11 +24,11 @@
 		_paq.push(['trackPageView']);
 		_paq.push(['enableLinkTracking']);
 		(function() {
-		var u="//matomo.paulnicoue.com/";
+			var u="//matomo.paulnicoue.com/";
-		_paq.push(['setTrackerUrl', u+'matomo.php']);
+			_paq.push(['setTrackerUrl', u+'matomo.php']);
-		_paq.push(['setSiteId', '2']);
+			_paq.push(['setSiteId', '2']);
-		var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+			var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-		g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+			g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
 		})();
 	</script>
 

webpack.config.js

@@ -10,16 +10,16 @@ Encore
 	// PATHS
 	// ----------------------------------------------------------------------------
 
-	.setOutputPath('public/assets/build/')
+	.setOutputPath('public/build/')
-	.setPublicPath('/assets/build')
+	.setPublicPath('/build')
 
 	// ----------------------------------------------------------------------------
 	// ENTRIES
 	// ----------------------------------------------------------------------------
 
-	.addEntry('app', './public/assets/js/app.js')
+	.addEntry('app', './assets/js/app.js')
-	.addStyleEntry('main', './public/assets/css/main.scss')
+	.addStyleEntry('main', './assets/css/main.scss')
-	.addStyleEntry('panel', './public/assets/css/panel.scss')
+	.addStyleEntry('panel', './assets/css/panel.scss')
 
 	// ----------------------------------------------------------------------------
 	// FEATURES