diff --git a/.gitignore b/.gitignore index 415cc9590..98652599e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ _site .jekyll-cache +node_modules/ pages/.DS_Store pages/tags.md _notes/.obsidian diff --git a/Dockerfile b/Dockerfile index 26613bb6d..bf2874208 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ruby:3.1.1-alpine3.15 -RUN apk add --no-cache build-base nodejs-current +RUN apk add --no-cache build-base nodejs-current npm RUN gem install bundler @@ -10,6 +10,8 @@ COPY . /usr/src/app RUN bundle install +RUN npm install + CMD ["bundle", "exec", "jekyll", "serve", "--host", "0.0.0.0"] EXPOSE 4000 diff --git a/Gemfile b/Gemfile index 867613d85..650ae529e 100644 --- a/Gemfile +++ b/Gemfile @@ -32,4 +32,5 @@ gem "wdm", "~> 0.1.1", :install_if => Gem.win_platform? gem 'jekyll-sitemap' gem 'kramdown-math-katex' -gem "webrick", "~> 1.7" \ No newline at end of file +gem "webrick", "~> 1.7" +gem 'jekyll-postcss' diff --git a/Gemfile.lock b/Gemfile.lock index 61c0803b5..2352484bd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,20 +4,20 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) colorator (1.1.0) - concurrent-ruby (1.1.9) - em-websocket (0.5.2) + concurrent-ruby (1.1.10) + em-websocket (0.5.3) eventmachine (>= 0.12.9) - http_parser.rb (~> 0.6.0) + http_parser.rb (~> 0) eventmachine (1.2.7) eventmachine (1.2.7-x64-mingw32) execjs (2.8.1) - ffi (1.15.1) - ffi (1.15.1-x64-mingw32) + ffi (1.15.5) + ffi (1.15.5-x64-mingw32) forwardable-extended (2.6.0) - htmlbeautifier (1.3.1) + htmlbeautifier (1.4.2) htmlcompressor (0.4.0) - http_parser.rb (0.6.0) - i18n (1.8.10) + http_parser.rb (0.8.0) + i18n (1.12.0) concurrent-ruby (~> 1.0) jekyll (4.0.1) addressable (~> 2.4) @@ -34,24 +34,22 @@ GEM rouge (~> 3.0) safe_yaml (~> 1.0) terminal-table (~> 1.8) - jekyll-feed (0.15.1) + jekyll-feed (0.16.0) jekyll (>= 3.7, < 5.0) - jekyll-sass-converter (2.1.0) + jekyll-postcss (0.5.0) + jekyll-sass-converter (2.2.0) sassc (> 2.0.1, < 3.0) jekyll-sitemap (1.4.0) jekyll (>= 3.7, < 5.0) - jekyll-target-blank (2.0.0) - jekyll (>= 3.0, < 5.0) - nokogiri (~> 1.10) jekyll-tidy (0.2.2) htmlbeautifier htmlcompressor jekyll jekyll-watch (2.2.1) listen (~> 3.0) - katex (0.8.0) + katex (0.9.0) execjs (~> 2.7) - kramdown (2.3.1) + kramdown (2.4.0) rexml kramdown-math-katex (1.0.1) katex (~> 0.4) @@ -59,25 +57,18 @@ GEM kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) liquid (4.0.3) - listen (3.5.1) + listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.3.6) - nokogiri (1.13.3-x64-mingw32) - racc (~> 1.4) - nokogiri (1.13.3-x86_64-darwin) - racc (~> 1.4) - nokogiri (1.13.3-x86_64-linux) - racc (~> 1.4) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (4.0.6) - racc (1.6.0) - rb-fsevent (0.11.0) + public_suffix (4.0.7) + rb-fsevent (0.11.1) rb-inotify (0.10.1) ffi (~> 1.0) rexml (3.2.5) - rouge (3.26.0) + rouge (3.29.0) safe_yaml (1.0.5) sassc (2.4.0) ffi (~> 1.9) @@ -86,15 +77,17 @@ GEM terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) thread_safe (0.3.6) - tzinfo (1.2.9) + tzinfo (1.2.10) thread_safe (~> 0.1) - tzinfo-data (1.2021.1) + tzinfo-data (1.2022.1) tzinfo (>= 1.0.0) - unicode-display_width (1.7.0) + unicode-display_width (1.8.0) wdm (0.1.1) webrick (1.7.0) PLATFORMS + universal-darwin-21 + universal-darwin-22 x64-mingw32 x86_64-darwin-19 x86_64-linux @@ -102,8 +95,8 @@ PLATFORMS DEPENDENCIES jekyll (~> 4.0.0) jekyll-feed (~> 0.12) + jekyll-postcss jekyll-sitemap - jekyll-target-blank jekyll-tidy kramdown-math-katex tzinfo (~> 1.2) @@ -112,4 +105,4 @@ DEPENDENCIES webrick (~> 1.7) BUNDLED WITH - 2.2.32 + 2.3.18 diff --git a/_config.yml b/_config.yml index 0e65e8aaf..99f6074a5 100644 --- a/_config.yml +++ b/_config.yml @@ -8,7 +8,7 @@ # For technical reasons, this file is *NOT* reloaded automatically when you use # 'bundle exec jekyll serve'. If you change this file, please restart the server process. # -# If you need help with YAML syntax, here are some quick references for you: +# If you need help with YAML syntax, here are some quick references for you: # https://learn-the-web.algonquindesign.ca/topics/markdown-yaml-cheat-sheet/#yaml # https://learnxinyminutes.com/docs/yaml/ # @@ -21,17 +21,17 @@ # URL is the base hostname with protocol for your site, eg http://example.com url: "" # the base hostname & protocol for your site, e.g. http://example.com -# If you want to install this jekyll in a subpath (eg /digitalgarden) set it here. +# If you want to install this jekyll in a subpath (eg /digitalgarden) set it here. # Else keep it Empty (DON'T PUT /; Keep it empty) baseurl: "" -# Website Header, Description, Footer year and text. -# If you are deleting this, make sure you remove it from HTML files too -heading: Jekyll Garden # Change this +# Website Header, Description, Footer year and text. +# If you are deleting this, make sure you remove it from HTML files too +heading: Jekyll Garden # Change this content: Obsidian ready Jekyll Theme -copyright: +copyright: year: © 2022 - msg: Contents under CC-BY-NC + msg: Contents under CC-BY-NC # Set title and content for private & broken link tooltop privatelinks: @@ -43,15 +43,15 @@ privatelinks: preferences: search: enabled: true - wiki_style_link: + wiki_style_link: enabled: true - pagepreview: + pagepreview: enabled: true backlinks: enabled: true -# To enable a homepage, change the value to true and add content to _includes/Homepage.html -# If enable : false, notes feed will be as homepage. - homepage: + # To enable a homepage, change the value to true and add content to _includes/Homepage.html + # If enable : false, notes feed will be as homepage. + homepage: enabled: true ##If you need a homepage, change this to true and edit _includes/Homepage.html encoding: utf-8 @@ -59,16 +59,20 @@ encoding: utf-8 # Build settings theme: null plugins: - - jekyll-feed - - jekyll-sitemap + - jekyll-postcss + - jekyll-feed + - jekyll-sitemap - jekyll-tidy - + +postcss: + cache: false + ## Enable Collections ## Suggested collects are "notes" "lists" and "blog" collections: - notes: - output: true - permalink: /note/:title + notes: + output: true + permalink: /note/:title markdown: kramdown @@ -78,7 +82,7 @@ kramdown: math_engine: katex smart_quotes: ["apos", "apos", "quot", "quot"] syntax_highlighter: rouge - + sass: style: compressed @@ -97,7 +101,6 @@ defaults: layout: Post content-type: notes - # Exclude from processing. # The following items will not be processed, by default. # Any item listed under the `exclude:` key here will be automatically added to @@ -119,4 +122,4 @@ exclude: # - vendor/bundle/ # - vendor/cache/ # - vendor/gems/ -# - vendor/ruby/ \ No newline at end of file +# - vendor/ruby/ diff --git a/_includes/Collections.html b/_includes/Collections.html new file mode 100644 index 000000000..70008d432 --- /dev/null +++ b/_includes/Collections.html @@ -0,0 +1,88 @@ +
+
+
+ Collections +
+
+ Collections / Map of Concept are notes, which might work as a starting + point +
+
+
+
+
+
+ Movies +
+
+
+
+
+
+ Coffee +
+
+
+
+
+
+ Knowledge +
+
+
+
+
+
+ Tools +
+
+
+
+
+
+ Web Founds +
+
+
+
+
+ \ No newline at end of file diff --git a/_includes/Footer.html b/_includes/Footer.html index d1f16c58c..b4174f3ca 100644 --- a/_includes/Footer.html +++ b/_includes/Footer.html @@ -29,8 +29,11 @@ {%- endcomment -%} {%- if site.copyright.msg != nil and site.copyright.msg != empty and site.copyright.msg != null -%} - {%- endif -%} \ No newline at end of file diff --git a/_includes/Homepage.html b/_includes/Homepage.html index ca1c63125..ad9f7c58d 100644 --- a/_includes/Homepage.html +++ b/_includes/Homepage.html @@ -1,8 +1,9 @@ -
-
{{site.heading}}
-

- Jekyll Garden is a markdown friendly theme lets you publish your Obsidian vault (or a subset of it) as a Jekyll static website. - Check out the demo , features and how to. -

+ +
+
{{site.heading}}
+
+ Jekyll Garden is a markdown friendly theme lets you publish your Obsidian vault (or a subset of it) as a Jekyll static website. + Check out the demo , features and how to.
+ diff --git a/_includes/Nav.html b/_includes/Nav.html index 22cb9be82..e99da08db 100644 --- a/_includes/Nav.html +++ b/_includes/Nav.html @@ -29,12 +29,13 @@ * {%- endcomment -%} -