added default theme files

gloriajs · Dec 27, 2022 · 3fc0b64 · 3fc0b64
1 parent 6450664
commit 3fc0b64
Show file tree

Hide file tree

Showing 9 changed files with 56 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -86,3 +86,5 @@ Refer to our [Contributing page](CONTRIBUTING.md) and local installation instruc
 ## Troubleshooting
 
 Try upgrading your version of node and run `yarn` again. Or open an [issue](https://github.com/gloriajs/gloria/issues) describing your problem. Go for a walk and check whether that's what you want to be doing today.
+
+**Slava Ukraini**
diff --git a/_config.yml b/_config.yml
@@ -6,7 +6,8 @@ baseurl: 'https://gloriajs.github.io'
 author: 'daveed silva'
 description: 'Documentation for the tool gloriajs'
 dest: build
-theme: architect
+theme:
+    - layouts/tailwind
 css: tailwind
 include:
     - docs

diff --git a/layouts/tailwind/templates/default.template.md b/layouts/tailwind/templates/default.template.md
@@ -0,0 +1,31 @@
+---
+name: tailwind
+---
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <!-- @TODO: replace with tailwind cli because this is bringing in too much kbs - but this is faster for now -->
+  <script src="https://cdn.tailwindcss.com"></script>
+  <title>{{ > page.title }}</title>
+  {{ > site.head }}
+  {{ > page.head}}
+</head>
+
+<body>
+  <header class="container">
+    <div class="page-header">
+      <h1 class="text-3xl font-bold underline">
+        <a href="/">Gloria</a> <small>static site generator</small>
+      </h1>
+    </div>
+    <nav>
+      <a href="/blog">Blog</a>
+    </nav>
+  </header>
+  {{{page.content}}}
+</body>
+
+</html>
diff --git a/layouts/tailwind/templates/pages/blog.page.md b/layouts/tailwind/templates/pages/blog.page.md
diff --git a/layouts/tailwind/templates/pages/index.page.md b/layouts/tailwind/templates/pages/index.page.md
@@ -0,0 +1,4 @@
+---
+title: Welcome!
+description:
+---
diff --git a/lib/bin/commands/collect.js b/lib/bin/commands/collect.js
@@ -27,6 +27,8 @@ const collect = (argv) => {
                 fs.writeFileSync(dest, ztring);
             }
 
+            logger.log(project.collected);
+
             return project;
         });
 };

diff --git a/lib/commands/collect.js b/lib/commands/collect.js
@@ -36,6 +36,7 @@ const run = (project) => {
         include: [],
         copy: [],
         styles: [],
+        theme: [],
     };
 
     project.config.include.map((path) => {
@@ -46,6 +47,11 @@ const run = (project) => {
         promiseArray.push(_klaw(path, items.copy, project.config));
     });
 
+    project.config.theme.map((path) => {
+        promiseArray.push(_klaw(path, items.theme, project.config));
+    });
+
+
     return $q.all(promiseArray).then(() => {
         project.collected = items;
         console.log({ items });

diff --git a/lib/commands/extract.js b/lib/commands/extract.js
@@ -61,12 +61,17 @@ const run = (project) => {
 
         const items = {
             include: [],
+            theme: [],
         };
 
         project.collected.include.map((c) => {
             extract(c, items.include);
         });
 
+        project.collected.theme.map((c) => {
+            extract(c, items.theme);
+        });
+
         project.extracted = items;
         return resolve(project);
     });

diff --git a/lib/core/project.config.js b/lib/core/project.config.js
@@ -37,7 +37,11 @@ const get = () => {
         exclude: [
             '.draft.md',
         ],
+        theme: [
+            'layouts/tailwind',
+        ],
         css: 'tailwind',
+        engine: 'default',
         version: '2.0.4',
     };
Original file line number	Diff line number	Diff line change
Expand Up		@@ -86,3 +86,5 @@ Refer to our [Contributing page](CONTRIBUTING.md) and local installation instruc
		## Troubleshooting

		Try upgrading your version of node and run `yarn` again. Or open an [issue](https://github.com/gloriajs/gloria/issues) describing your problem. Go for a walk and check whether that's what you want to be doing today.

		Slava Ukraini
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,6 +27,8 @@ const collect = (argv) => { @@
                     fs.writeFileSync(dest, ztring);
                 }
+                logger.log(project.collected);
                 return project;
             });
     };
@@ Expand Down @@