From 4d5a0d6f099800f5788f79b0fc7fa05b43c34aae Mon Sep 17 00:00:00 2001 From: Logan McGrath Date: Mon, 12 Jul 2021 17:22:39 -0700 Subject: [PATCH] Fixing template inheritance and git footer --- .gitignore | 1 + commands.sh | 10 +- config.ini | 4 +- green.cabal | 13 +- package.yaml | 10 +- .../open-source-in-the-age-of-github.md | 16 ++ site/_layouts/default.html | 11 +- site/_layouts/skeleton.html | 22 +- ...chronicle-for-application-configuration.md | 26 ++- ...application-configuration-with-perforce.md | 4 +- site/_templates/code.md | 2 - site/code/LICENSE.md | 25 +++ site/code/app-config/stack_configuration.json | 23 +-- site/css/_variables.scss | 14 +- .../_open-source-in-the-age-of-github.scss | 3 + site/css/elements/_asides.scss | 2 +- site/css/elements/_code.scss | 93 +++++---- site/css/elements/_default.scss | 10 +- site/css/elements/_headers.scss | 4 +- site/css/main.scss | 1 + site/js/main.js | 30 --- src/Green/Common.hs | 6 +- src/Green/Compiler/Layout.hs | 191 +++++++++++------- src/Green/Config.hs | 2 +- src/Green/Context.hs | 30 +-- src/Green/Context/DateFields.hs | 2 +- src/Green/Context/GitCommits.hs | 92 +++++---- src/Green/Lens.hs | 16 ++ src/Green/Rule.hs | 43 ++-- src/Green/Rule/Blog.hs | 8 +- src/Green/Rule/Index.hs | 16 +- src/Green/Rule/Page.hs | 6 +- src/Green/Util.hs | 29 +-- 33 files changed, 437 insertions(+), 328 deletions(-) create mode 100644 site/_drafts/open-source-in-the-age-of-github.md create mode 100644 site/code/LICENSE.md create mode 100644 site/css/blog/_open-source-in-the-age-of-github.scss create mode 100644 src/Green/Lens.hs diff --git a/.gitignore b/.gitignore index dfce9c4..33989e7 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ project/ target/ _site/ _test/ +gh-pages/ diff --git a/commands.sh b/commands.sh index eb6534d..1fb3496 100644 --- a/commands.sh +++ b/commands.sh @@ -1,7 +1,11 @@ #!/usr/bin/env bash set -e -new_make_path="/usr/local/opt/make/libexec/gnubin" +ARGS=() + +if [ -n "$VERBOSE" ]; then + ARGS+=("--verbose") +fi init () { git config core.hooksPath .githooks @@ -24,7 +28,7 @@ build () { fi stack build - stack exec site build + stack exec site build -- ${ARGS[@]} } clean () { @@ -55,7 +59,7 @@ rebuild_all () { watch () { build - stack exec site watch + stack exec site watch -- ${ARGS[@]} } publish () { diff --git a/config.ini b/config.ini index f8c40e4..af73762 100644 --- a/config.ini +++ b/config.ini @@ -3,9 +3,9 @@ title = This Field Was Green description = "" root = https://thisfieldwas.green authorName = Logan McGrath -authorEmail = blog@thisfieldwas.green +authorEmail = website@thisfieldwas.green linkedInProfile = https://www.linkedin.com/in/loganmcgrath -gitWebUrl = https://bitsof.thisfieldwas.green/ThisFieldWasGreen/thisfieldwas.green +gitWebUrl = https://bitsof.thisfieldwas.green/keywordsalad/thisfieldwas.green [DisplayFormats] dateShortFormat = %B %e, %Y diff --git a/green.cabal b/green.cabal index 0bcd557..ca6c834 100644 --- a/green.cabal +++ b/green.cabal @@ -6,20 +6,18 @@ cabal-version: 1.12 name: green version: 0.1.0.0 -description: Please see the README at -homepage: https://github.com/ThisFieldWasGreen/thisfieldwasgreen.github.io#readme -bug-reports: https://github.com/ThisFieldWasGreen/thisfieldwasgreen.github.io/issues +description: Please see the README at author: Logan McGrath -maintainer: site@thisfieldwas.green -copyright: 2012 Logan McGrath -license: MIT +maintainer: website@thisfieldwas.green +copyright: Copyright (C) 2012-2021 Logan McGrath +license: bsd-3-clause build-type: Simple extra-source-files: README.md source-repository head type: git - location: https://github.com/ThisFieldWasGreen/thisfieldwasgreen.github.io + location: https://bitsof.thisfieldwas.green/keywordsalad/thisfieldwas.green library exposed-modules: @@ -34,6 +32,7 @@ library Green.Context.DateFields Green.Context.FieldError Green.Context.GitCommits + Green.Lens Green.Lens.Hakyll Green.Lens.TH Green.Route diff --git a/package.yaml b/package.yaml index eca6de7..70a7ca6 100644 --- a/package.yaml +++ b/package.yaml @@ -1,15 +1,15 @@ name: green version: 0.1.0.0 -github: ThisFieldWasGreen/thisfieldwasgreen.github.io -license: MIT +git: https://bitsof.thisfieldwas.green/keywordsalad/thisfieldwas.green +license: bsd-3-clause author: Logan McGrath -maintainer: "site@thisfieldwas.green" -copyright: "2012 Logan McGrath" +maintainer: "website@thisfieldwas.green" +copyright: "Copyright (C) 2012-2021 Logan McGrath" extra-source-files: - README.md -description: Please see the README at +description: Please see the README at dependencies: - base >= 4.7 && < 5 diff --git a/site/_drafts/open-source-in-the-age-of-github.md b/site/_drafts/open-source-in-the-age-of-github.md new file mode 100644 index 0000000..f7cf40c --- /dev/null +++ b/site/_drafts/open-source-in-the-age-of-github.md @@ -0,0 +1,16 @@ +--- +title: "Open Source in the Age of GitHub" +author: "Logan McGrath" +date: 2021-06-18T18:02:00-07:00 +comments: false +published: false +layout: post +body-class: open-source-in-the-age-of-github +tags: + - Open Source + - Software Licenses +--- + +```{.markdown} +$getCode("LICENSE.md")$ +``` diff --git a/site/_layouts/default.html b/site/_layouts/default.html index a2423f3..94dea9b 100644 --- a/site/_layouts/default.html +++ b/site/_layouts/default.html @@ -22,17 +22,18 @@ layout: skeleton