fix: fix urls in templates

qiwi · Jan 3, 2022 · 9f55802 · 9f55802
1 parent f28d805
commit 9f55802
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/src/main/js/generator/.eleventy.cjs b/src/main/js/generator/.eleventy.cjs
@@ -1,6 +1,7 @@
 const htmlmin = require('html-minifier')
 const terser = require('terser')
 const path = require('path')
+const util = require('util')
 
 module.exports = (config) => {
  const {temp, prefix, output } = config.extra
@@ -9,6 +10,10 @@ module.exports = (config) => {
  // [assetsPath]: '/',
  // })
 
+ config.addFilter('console', function(value) {
+ return util.inspect(value);
+ })
+
  // NOTE It's cached by template renderer, so we need to pass extra options through settings injection
  config.addShortcode('makeBootScript', (settings, collections) => {
  const { title, prefix, date } = settings.extra

diff --git a/src/main/js/generator/index.js b/src/main/js/generator/index.js
@@ -33,6 +33,7 @@ export const genSettings = async ({
  prefix,
  date,
  output,
+ basePrefix
 }) => {
  const quadrants = [
  { name: document.quadrantTitles.q1 || 'Q1', id: 'q1' },
@@ -41,7 +42,7 @@ export const genSettings = async ({
  { name: document.quadrantTitles.q4 || 'Q4', id: 'q4' },
  ]
 
- const extra = { output, title, prefix, temp, date }
+ const extra = { output, title, prefix, temp, date, basePrefix }
  const settings = { ...defaultSettings, extra, quadrants }
  const settingsPath = path.join(temp, '_data/settings.json')
 

diff --git a/src/main/js/index.js b/src/main/js/index.js
@@ -81,6 +81,7 @@ const renderRadars = async ({ radars, ctx, temp, basePrefix, output }) => {
  radar.target = path.join(radar.scope, radar.date)
  radar.output = path.join(output, radar.target)
  radar.prefix = path.join(basePrefix, radar.target)
+ radar.basePrefix = basePrefix
 
  await genEleventy(radar)
  }),

diff --git a/src/main/tpl/_layouts/page.njk b/src/main/tpl/_layouts/page.njk
@@ -6,8 +6,8 @@
  {{ title or page.fileSlug }}
  </title>
  <meta name="viewport" content="width=device-width, initial-scale=1">
- <link rel="stylesheet" href="{{ '/radar.css' | url }}">
- <link rel="shortcut icon" href="{{ '/favicon.ico' | url }}" type="image/x-icon">
+ <link rel="stylesheet" href="{{ '/' + settings.extra.basePrefix + '/radar.css' }}">
+ <link rel="shortcut icon" href="{{ '/' + settings.extra.basePrefix + '/favicon.ico' }}" type="image/x-icon">
 </head>
 <body class="page__body">
  {{ content | safe }}

diff --git a/src/main/tpl/index.njk b/src/main/tpl/index.njk
@@ -9,7 +9,7 @@ layout: page.njk
 <svg id="radar"></svg>
 
 <script src="https://d3js.org/d3.v4.min.js"></script>
-<script src="{{ './radar.js' | url }}"></script>
+<script src="{{ '/' + settings.extra.basePrefix + '/radar.js' }}"></script>
 <script>
  {{ bootScript | jsmin | safe }}
 </script>