From 795b6250db5e93b59b5e9c5152d5b024f789fca8 Mon Sep 17 00:00:00 2001 From: Ole Eskild Steensen Date: Mon, 14 Mar 2022 16:32:30 +0100 Subject: [PATCH 1/6] Excalidraw data should not be treated as link --- .eleventy.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.eleventy.js b/.eleventy.js index 4dac6e9..4fab3e7 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -82,6 +82,10 @@ module.exports = function(eleventyConfig) { eleventyConfig.addTransform('link', function(str) { return str && str.replace(/\[\[(.*?)\]\]/g, function(match, p1) { + //Check if it is an embedded excalidraw drawing + if(p1.indexOf("],[") > -1){ + return match; + } const [fileName, linkTitle] = p1.split("|"); let permalink = `/notes/${slugify(fileName)}`; @@ -120,4 +124,4 @@ module.exports = function(eleventyConfig) { passthroughFileCopy: true, }; -}; \ No newline at end of file +}; From 6d39919a3f3ea232737e27b9ac8b0b2ef07272fc Mon Sep 17 00:00:00 2001 From: Ole Eskild Steensen Date: Tue, 15 Mar 2022 09:21:22 +0100 Subject: [PATCH 2/6] Add support for inline mathjax --- .eleventy.js | 6 +++--- src/site/_includes/components/pageheader.njk | 9 ++++++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.eleventy.js b/.eleventy.js index 4fab3e7..ab47ddd 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -82,8 +82,8 @@ module.exports = function(eleventyConfig) { eleventyConfig.addTransform('link', function(str) { return str && str.replace(/\[\[(.*?)\]\]/g, function(match, p1) { - //Check if it is an embedded excalidraw drawing - if(p1.indexOf("],[") > -1){ + //Check if it is an embedded excalidraw drawing or mathjax javascript + if (p1.indexOf(",") > -1) { return match; } const [fileName, linkTitle] = p1.split("|"); @@ -124,4 +124,4 @@ module.exports = function(eleventyConfig) { passthroughFileCopy: true, }; -}; +}; \ No newline at end of file diff --git a/src/site/_includes/components/pageheader.njk b/src/site/_includes/components/pageheader.njk index 7680773..f95f32a 100644 --- a/src/site/_includes/components/pageheader.njk +++ b/src/site/_includes/components/pageheader.njk @@ -10,7 +10,14 @@ - + + From 5c1164db8f20f6651ec5099b478fec3a9497984f Mon Sep 17 00:00:00 2001 From: Ole Eskild Steensen Date: Mon, 14 Mar 2022 23:48:50 +0100 Subject: [PATCH 3/6] Experimenting with themes --- src/site/_data/meta.js | 6 ++++++ src/site/_includes/components/pageheader.njk | 7 +++++++ src/site/_includes/layouts/note.njk | 2 +- src/site/index.njk | 2 +- src/site/styles/style.scss | 4 +--- 5 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 src/site/_data/meta.js diff --git a/src/site/_data/meta.js b/src/site/_data/meta.js new file mode 100644 index 0000000..1c92ff9 --- /dev/null +++ b/src/site/_data/meta.js @@ -0,0 +1,6 @@ +require("dotenv").config(); +module.exports = { + env: process.env.ELEVENTY_ENV, + theme: process.env.THEME, + baseTheme: process.env.BASE_THEME || "dark" +}; \ No newline at end of file diff --git a/src/site/_includes/components/pageheader.njk b/src/site/_includes/components/pageheader.njk index f95f32a..ddb059c 100644 --- a/src/site/_includes/components/pageheader.njk +++ b/src/site/_includes/components/pageheader.njk @@ -20,6 +20,13 @@ +{%-if meta.theme%} + +{%endif%} diff --git a/src/site/_includes/layouts/note.njk b/src/site/_includes/layouts/note.njk index 662f469..75b7a47 100644 --- a/src/site/_includes/layouts/note.njk +++ b/src/site/_includes/layouts/note.njk @@ -8,7 +8,7 @@ permalink: "notes/{{ page.fileSlug | slugify }}/" {{ page.fileSlug }} {%include "components/pageheader.njk"%} - + {%include "components/notegrowthhistory.njk"%}
diff --git a/src/site/index.njk b/src/site/index.njk index 106b447..99be893 100644 --- a/src/site/index.njk +++ b/src/site/index.njk @@ -4,7 +4,7 @@ {{ title }} {%include "components/pageheader.njk"%} - + {%include "components/notegrowthhistory.njk"%}
{%- for garden in collections.gardenEntry -%} diff --git a/src/site/styles/style.scss b/src/site/styles/style.scss index 2233b38..9a68a83 100644 --- a/src/site/styles/style.scss +++ b/src/site/styles/style.scss @@ -48,9 +48,7 @@ body { } a { - text-decoration: none; - padding-bottom: 3px; - border-bottom: 1px solid rgb(97, 186, 245); + text-decoration: underline; color: rgb(97, 186, 245); } From 845b58cf91f81c4417b2d96edd90d59eb2e8ce5a Mon Sep 17 00:00:00 2001 From: Ole Eskild Steensen Date: Mon, 14 Mar 2022 23:51:58 +0100 Subject: [PATCH 4/6] Fetch serverside --- src/site/_data/meta.js | 7 +++++++ src/site/_includes/components/pageheader.njk | 8 ++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/site/_data/meta.js b/src/site/_data/meta.js index 1c92ff9..a16ddb0 100644 --- a/src/site/_data/meta.js +++ b/src/site/_data/meta.js @@ -1,6 +1,13 @@ require("dotenv").config(); +let themeStyle = ""; +if (process.env.THEME) { + fetch(process.env.THEME).then(response => response.text()).then(text => { + themeStyle = ""; + }); +} module.exports = { env: process.env.ELEVENTY_ENV, theme: process.env.THEME, + themeStyle: themeStyle, baseTheme: process.env.BASE_THEME || "dark" }; \ No newline at end of file diff --git a/src/site/_includes/components/pageheader.njk b/src/site/_includes/components/pageheader.njk index ddb059c..eb50e0a 100644 --- a/src/site/_includes/components/pageheader.njk +++ b/src/site/_includes/components/pageheader.njk @@ -20,12 +20,8 @@ -{%-if meta.theme%} - +{%-if meta.themeStyle%} + {{meta.themeStyle}} {%endif%} From 4689824bab50c752684afd7d5ad5623d57f9c115 Mon Sep 17 00:00:00 2001 From: Ole Eskild Steensen Date: Tue, 15 Mar 2022 15:11:50 +0100 Subject: [PATCH 5/6] Added support for setting obsidiantheme --- .env | 2 + .gitignore | 1 - package-lock.json | 41 +++++++++++++------- package.json | 1 + src/site/_data/meta.js | 27 +++++++------ src/site/_includes/components/pageheader.njk | 2 +- 6 files changed, 48 insertions(+), 26 deletions(-) create mode 100644 .env diff --git a/.env b/.env new file mode 100644 index 0000000..3103bb9 --- /dev/null +++ b/.env @@ -0,0 +1,2 @@ +THEME=https://raw.githubusercontent.com/kepano/obsidian-minimal/master/Minimal.css +BASE_THEME=dark \ No newline at end of file diff --git a/.gitignore b/.gitignore index b8b0076..f06235c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ node_modules dist -**/.env* \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index dd4d9ce..8648b92 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,6 +12,7 @@ "@azure/storage-blob": "^12.8.0", "@octokit/core": "^3.5.1", "@sindresorhus/slugify": "^1.1.0", + "axios": "^0.26.1", "dotenv": "^10.0.0", "gray-matter": "^4.0.3", "markdown-it": "^12.3.2", @@ -603,12 +604,11 @@ "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" }, "node_modules/axios": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", - "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", - "dev": true, + "version": "0.26.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz", + "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==", "dependencies": { - "follow-redirects": "^1.14.0" + "follow-redirects": "^1.14.8" } }, "node_modules/babel-walk": { @@ -1583,7 +1583,6 @@ "version": "1.14.9", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz", "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==", - "dev": true, "funding": [ { "type": "individual", @@ -2467,6 +2466,15 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, + "node_modules/localtunnel/node_modules/axios": { + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", + "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", + "dev": true, + "dependencies": { + "follow-redirects": "^1.14.0" + } + }, "node_modules/localtunnel/node_modules/cliui": { "version": "7.0.4", "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", @@ -5329,12 +5337,11 @@ "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" }, "axios": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", - "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", - "dev": true, + "version": "0.26.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz", + "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==", "requires": { - "follow-redirects": "^1.14.0" + "follow-redirects": "^1.14.8" } }, "babel-walk": { @@ -6130,8 +6137,7 @@ "follow-redirects": { "version": "1.14.9", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz", - "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==", - "dev": true + "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==" }, "form-data": { "version": "4.0.0", @@ -6775,6 +6781,15 @@ "color-convert": "^2.0.1" } }, + "axios": { + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", + "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", + "dev": true, + "requires": { + "follow-redirects": "^1.14.0" + } + }, "cliui": { "version": "7.0.4", "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", diff --git a/package.json b/package.json index c7b8ca1..8bf1677 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ "@azure/storage-blob": "^12.8.0", "@octokit/core": "^3.5.1", "@sindresorhus/slugify": "^1.1.0", + "axios": "^0.26.1", "dotenv": "^10.0.0", "gray-matter": "^4.0.3", "markdown-it": "^12.3.2", diff --git a/src/site/_data/meta.js b/src/site/_data/meta.js index a16ddb0..b9e76f9 100644 --- a/src/site/_data/meta.js +++ b/src/site/_data/meta.js @@ -1,13 +1,18 @@ require("dotenv").config(); -let themeStyle = ""; -if (process.env.THEME) { - fetch(process.env.THEME).then(response => response.text()).then(text => { - themeStyle = ""; - }); -} -module.exports = { - env: process.env.ELEVENTY_ENV, - theme: process.env.THEME, - themeStyle: themeStyle, - baseTheme: process.env.BASE_THEME || "dark" +const axios = require("axios"); + + +module.exports = async() => { + let themeStyle = ""; + if (process.env.THEME) { + const res = await axios.get(process.env.THEME) + themeStyle = ``; + } + return { + env: process.env.ELEVENTY_ENV, + theme: process.env.THEME, + themeStyle: themeStyle, + baseTheme: process.env.BASE_THEME || "dark" + } + }; \ No newline at end of file diff --git a/src/site/_includes/components/pageheader.njk b/src/site/_includes/components/pageheader.njk index eb50e0a..9b9eb7b 100644 --- a/src/site/_includes/components/pageheader.njk +++ b/src/site/_includes/components/pageheader.njk @@ -21,7 +21,7 @@ {%-if meta.themeStyle%} - {{meta.themeStyle}} + {{meta.themeStyle | safe}} {%endif%} From 04d448e7aa3ab9a90a1d09077e5c02de508adf59 Mon Sep 17 00:00:00 2001 From: Ole Eskild Steensen Date: Tue, 15 Mar 2022 15:17:09 +0100 Subject: [PATCH 6/6] Slight changes --- .env | 4 ++-- src/site/styles/style.scss | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.env b/.env index 3103bb9..23f074e 100644 --- a/.env +++ b/.env @@ -1,2 +1,2 @@ -THEME=https://raw.githubusercontent.com/kepano/obsidian-minimal/master/Minimal.css -BASE_THEME=dark \ No newline at end of file +THEME=https://raw.githubusercontent.com/colineckert/obsidian-things/main/obsidian.css +BASE_THEME=light \ No newline at end of file diff --git a/src/site/styles/style.scss b/src/site/styles/style.scss index 9a68a83..1d754c7 100644 --- a/src/site/styles/style.scss +++ b/src/site/styles/style.scss @@ -41,12 +41,18 @@ h4 { text-align: center; } -body { - background-color: rgb(32, 31, 31); +.theme-dark { + background: rgb(32, 31, 31); color: white; font-family: 'Roboto', sans-serif; } +.theme-light { + background: white; + color: black; + font-family: 'Roboto', sans-serif; +} + a { text-decoration: underline; color: rgb(97, 186, 245);