Merge branch 'release/3.0.2'

swthate · Jun 10, 2019 · 6f7af1c · 6f7af1c
2 parents cf564e1 + deeb5b4
commit 6f7af1c
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 32 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 3.0.2 - 2019-06-10
+### Added
+- Moved most of `index.twig` to `layouts/_base.twig` and now `index.twig` extends that base layout.
+### Fixed
+- Was using the wrong method to get the site's CSRF Token and add it to the window for JS to use. Changed `craft.app.config.general.csrfToken` to `craft.app.request.csrfToken`.
+
 ## 3.0.1 - 2019-06-10
 ### Fixed
 - `composer.json` had an autoload.psr-4 invalid value: `"modules\\sitemodule"` needs to end with a namespace separator, i.e. `"modules\\sitemodule\\"`.

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "craft-workbench",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",

diff --git a/templates/index.twig b/templates/index.twig
@@ -1,40 +1,16 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <meta http-equiv="X-UA-Compatible" content="ie=edge">
-  <title>{{ siteName }}</title>
+{% extends 'layouts/_base.twig' %}
 
-  {{ craft.twigpack.includeCssModule("app.css", true) }}
 
-  {% set jsCraft = {
-    baseUrl: alias('@web'),
-    csrfTokenName: craft.app.config.general.csrfTokenName,
-    csrfToken: craft.app.config.general.csrfToken
-  } %}
-  <script type="text/javascript">
-    window.Craft = {{ jsCraft|json_encode|raw }}
-    console.log(window.Craft);
-  </script>
-</head>
 
-<body class="bg-gray-700">
-  <div id="app">
-
+{% block content %}
+
     {% set info = {
       craftVersion: craft.app.getVersion(),
       environment: getenv('ENVIRONMENT')
     } %}
-
-    <hello-world :info="{{ info|json_encode }}">
-      {{ getenv('DB_DATABASE') }}
-    </hello-world>
-  </div>
 
-  {{ craft.twigpack.includeSafariNomoduleFix() }}
-  {{ craft.twigpack.includeJsModule("app.js", true) }}
-  {{ craft.twigpack.includeJsModule("chunk-vendors.js", true) }}
+  <hello-world :info="{{ info|json_encode }}">
+    {{ getenv('DB_DATABASE') }}
+  </hello-world>
 
-</body>
-</html>
+{% endblock %}
diff --git a/templates/layouts/_base.twig b/templates/layouts/_base.twig
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>{{ siteName }}</title>
+
+    {{ craft.twigpack.includeCssModule("app.css", true) }}
+
+    {% set jsCraft = {
+        baseUrl: alias('@web'),
+        csrfTokenName: craft.app.config.general.csrfTokenName,
+        csrfToken: craft.app.request.csrfToken
+    } %}
+    <script type="text/javascript">
+      window.Craft = {{ jsCraft|json_encode|raw }}
+    </script>
+</head>
+
+<body class="bg-gray-700">
+<div id="app">
+
+    {% block content %}{% endblock %}
+
+</div>
+
+{{ craft.twigpack.includeSafariNomoduleFix() }}
+{{ craft.twigpack.includeJsModule("app.js", true) }}
+{{ craft.twigpack.includeJsModule("chunk-vendors.js", true) }}
+
+</body>
+</html>