From e673bed74e8a1ca28fa162bb7b610cf0e4280a18 Mon Sep 17 00:00:00 2001 From: Steven Thate Date: Mon, 10 Jun 2019 11:45:55 -0500 Subject: [PATCH 1/2] Add base layout and fix csrf call --- CHANGELOG.md | 6 ++++++ templates/index.twig | 38 +++++++----------------------------- templates/layouts/_base.twig | 33 +++++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 31 deletions(-) create mode 100644 templates/layouts/_base.twig diff --git a/CHANGELOG.md b/CHANGELOG.md index 9de096d..14ab79d 100644 --- 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/templates/index.twig b/templates/index.twig index 72d4fda..d401f41 100644 --- a/templates/index.twig +++ b/templates/index.twig @@ -1,40 +1,16 @@ - - - - - - - {{ siteName }} +{% 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 - } %} - - - -
- +{% block content %} + {% set info = { craftVersion: craft.app.getVersion(), environment: getenv('ENVIRONMENT') } %} - - - {{ getenv('DB_DATABASE') }} - -
- {{ craft.twigpack.includeSafariNomoduleFix() }} - {{ craft.twigpack.includeJsModule("app.js", true) }} - {{ craft.twigpack.includeJsModule("chunk-vendors.js", true) }} + + {{ getenv('DB_DATABASE') }} + - - +{% endblock %} \ No newline at end of file diff --git a/templates/layouts/_base.twig b/templates/layouts/_base.twig new file mode 100644 index 0000000..7449da2 --- /dev/null +++ b/templates/layouts/_base.twig @@ -0,0 +1,33 @@ + + + + + + + {{ siteName }} + + {{ craft.twigpack.includeCssModule("app.css", true) }} + + {% set jsCraft = { + baseUrl: alias('@web'), + csrfTokenName: craft.app.config.general.csrfTokenName, + csrfToken: craft.app.request.csrfToken + } %} + + + + +
+ + {% block content %}{% endblock %} + +
+ +{{ craft.twigpack.includeSafariNomoduleFix() }} +{{ craft.twigpack.includeJsModule("app.js", true) }} +{{ craft.twigpack.includeJsModule("chunk-vendors.js", true) }} + + + From deeb5b40182a5f872e6db098b9aebc99bb7b2a3c Mon Sep 17 00:00:00 2001 From: Steven Thate Date: Mon, 10 Jun 2019 11:46:36 -0500 Subject: [PATCH 2/2] 3.0.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 991ead7..aae01c6 100644 --- 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",