Fix generated pathing for page subgen

larsonjj · Aug 5, 2019 · 39edf7f · 39edf7f
1 parent cdecd62
commit 39edf7f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/generators/page/index.js b/generators/page/index.js
@@ -25,8 +25,12 @@ module.exports = class extends Generator {
     });
 
     this.name = 'no-name';
+    this.urlPath = '';
     if (this.arguments[0]) {
       this.name = this.arguments[0];
+      this.urlPath = this.name.split('/').reduce((acc, ele, i) => {
+        return acc + '../';
+      }, '');
     }
 
     this.layout = 'base';
@@ -54,6 +58,7 @@ module.exports = class extends Generator {
     const templateData = {
       _: _,
       name: this.name,
+      urlPath: this.urlPath,
       layout: this.layout,
       layoutDir: this.layoutDir
     };

diff --git a/generators/page/templates/page.nunjucks b/generators/page/templates/page.nunjucks
@@ -2,7 +2,7 @@
 
 {% block config %}
   {# Correct base url pathing for this page #}
-  {% set baseUrl = '../' %}
+  {% set baseUrl = '<%= urlPath %>' %}
 {% endblock %}
 
 {% block content %}

diff --git a/generators/page/templates/page.pug b/generators/page/templates/page.pug
@@ -1,8 +1,8 @@
-extends ../<%= layoutDir %>/<%= layout %>
+extends <%= urlPath %><%= layoutDir %>/<%= layout %>
 
 block config
   //- Correct base url pathing for this page
-  - var baseUrl = '../'
+  - var baseUrl = '<%= urlPath %>'
 
 block content
   p <%= name.toLowerCase() %> page