From 5d8af624913650443c120fe279dec7960fe94b75 Mon Sep 17 00:00:00 2001 From: Dan Anglin Date: Tue, 6 Feb 2024 12:54:25 +0000 Subject: [PATCH 1/9] checkpoint: clean slate for new website --- Dockerfile | 7 -- LICENSE | 21 ----- go.mod | 5 -- go.sum | 2 - links.go | 75 ------------------ magefiles/mage.go | 60 -------------- main.go | 144 ---------------------------------- web/html/base.tmpl.html | 31 -------- web/static/css/stylesheet.css | 33 -------- web/static/gpg/public.asc | 3 - web/static/img/favicon.ico | 3 - 11 files changed, 384 deletions(-) delete mode 100644 Dockerfile delete mode 100644 LICENSE delete mode 100644 go.mod delete mode 100644 go.sum delete mode 100644 links.go delete mode 100644 magefiles/mage.go delete mode 100644 main.go delete mode 100644 web/html/base.tmpl.html delete mode 100644 web/static/css/stylesheet.css delete mode 100644 web/static/gpg/public.asc delete mode 100644 web/static/img/favicon.ico diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index b41f1b1..0000000 --- a/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM scratch - -ADD landing /landing - -USER 65534 - -ENTRYPOINT ["/landing"] diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 21a9967..0000000 --- a/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2023 Dan Anglin - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/go.mod b/go.mod deleted file mode 100644 index a1fb0d6..0000000 --- a/go.mod +++ /dev/null @@ -1,5 +0,0 @@ -module codeflow.dananglin.me.uk/flow/landing - -go 1.21.0 - -require github.com/magefile/mage v1.15.0 diff --git a/go.sum b/go.sum deleted file mode 100644 index 4ee1b87..0000000 --- a/go.sum +++ /dev/null @@ -1,2 +0,0 @@ -github.com/magefile/mage v1.15.0 h1:BvGheCMAsG3bWUDbZ8AyXXpCNwU9u5CB6sM+HNb9HYg= -github.com/magefile/mage v1.15.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= diff --git a/links.go b/links.go deleted file mode 100644 index 309e259..0000000 --- a/links.go +++ /dev/null @@ -1,75 +0,0 @@ -package main - -import ( - "fmt" - "strings" -) - -type linkParseError struct { - msg string -} - -func (e linkParseError) Error() string { - return "link parse error: " + e.msg -} - -type link struct { - Title string - URL string - Rel string -} - -func (l link) String() string { - return fmt.Sprintf("Title: %s, URL: %s, Rel: %s", l.Title, l.URL, l.Rel) -} - -type links []link - -func (l *links) Set(value string) error { - linkAttributes := strings.Split(value, ",") - - lenLinkAttributes := len(linkAttributes) - if lenLinkAttributes != 2 && lenLinkAttributes != 3 { - return linkParseError{msg: fmt.Sprintf("unexpected number of attributes found %s, want 2 or 3, got %d", value, lenLinkAttributes)} - } - - var thisLink link - - for _, attr := range linkAttributes { - split := strings.Split(attr, "=") - switch strings.ToLower(split[0]) { - case "title": - thisLink.Title = split[1] - case "url": - thisLink.URL = split[1] - case "rel": - thisLink.Rel = split[1] - } - } - - if thisLink.Title == "" { - return linkParseError{msg: fmt.Sprintf("the title attribute is missing from %s", value)} - } - - if thisLink.URL == "" { - return linkParseError{msg: fmt.Sprintf("the URL attribute is missing from %s", value)} - } - - *l = append(*l, thisLink) - - return nil -} - -func (l *links) String() string { - if len(*l) == 0 { - return "" - } - - var builder strings.Builder - - for _, link := range *l { - fmt.Fprintln(&builder, link) - } - - return builder.String() -} diff --git a/magefiles/mage.go b/magefiles/mage.go deleted file mode 100644 index 21f22f6..0000000 --- a/magefiles/mage.go +++ /dev/null @@ -1,60 +0,0 @@ -//go:build mage -// +build mage - -package main - -import ( - "os" - - "github.com/magefile/mage/sh" -) - -var Default = Build - -var binary = "landing" - -// Test run the go tests. -// To enable verbose mode set GO_TEST_VERBOSE=1. -// To enable coverage mode set GO_TEST_COVER=1. -func Test() error { - goTest := sh.RunCmd("go", "test") - - args := []string{"./..."} - - if os.Getenv("GO_TEST_VERBOSE") == "1" { - args = append(args, "-v") - } - - if os.Getenv("GO_TEST_COVER") == "1" { - args = append(args, "-cover") - } - - return goTest(args...) -} - -// Lint runs golangci-lint against the code. -func Lint() error { - return sh.RunV("golangci-lint", "run", "--color", "always") -} - -// Build build the executable. -func Build() error { - os.Setenv("GOOS", "linux") - os.Setenv("GOARCH", "amd64") - os.Setenv("CGO_ENABLED", "0") - - return sh.Run("go", "build", "-ldflags=-s -w", "-a", "-o", binary, ".") -} - -// Clean clean the workspace. -func Clean() error { - if err := sh.Rm(binary); err != nil { - return err - } - - if err := sh.Run("go", "clean", "./..."); err != nil { - return err - } - - return nil -} diff --git a/main.go b/main.go deleted file mode 100644 index f156e5b..0000000 --- a/main.go +++ /dev/null @@ -1,144 +0,0 @@ -package main - -import ( - "embed" - "flag" - "fmt" - "html/template" - "io/fs" - "log/slog" - "net/http" - "os" - "strings" - "time" -) - -//go:embed web/static/* -var staticFS embed.FS - -//go:embed web/html/* -var htmlTemplates embed.FS - -func main() { - var ( - address string - profiles links - services links - ) - - flag.StringVar(&address, "address", "0.0.0.0:8080", "The address that the web server will listen on") - flag.Var(&services, "service", "A list of service links") - flag.Var(&profiles, "profile", "A list of profile links") - - flag.Parse() - - setupLogging() - - mux, err := routes(services, profiles) - if err != nil { - slog.Error("Unable to create the Mux", "error", err) - os.Exit(1) - } - - server := http.Server{ - Addr: address, - Handler: mux, - ReadHeaderTimeout: 1 * time.Second, - ReadTimeout: 5 * time.Second, - } - - slog.Info("Starting web application.", "address", address) - - err = server.ListenAndServe() - if err != nil { - slog.Error("Failed to run the web application", "error", err) - } -} - -func routes(services, profiles links) (*http.ServeMux, error) { - mux := http.NewServeMux() - - staticRootFS, err := fs.Sub(staticFS, "web/static") - if err != nil { - return nil, fmt.Errorf("unable to create the static root file system; %w", err) - } - - fileServer := http.FileServer(http.FS(staticRootFS)) - mux.Handle("/static/", http.StripPrefix("/static", neuter(fileServer))) - - mux.HandleFunc("/", landing(services, profiles)) - - return mux, nil -} - -func neuter(next http.Handler) http.Handler { - return http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) { - if strings.HasSuffix(request.URL.Path, "/") { - notFound(writer) - - return - } - - next.ServeHTTP(writer, request) - }) -} - -func landing(services, profiles links) func(http.ResponseWriter, *http.Request) { - return func(writer http.ResponseWriter, request *http.Request) { - if request.URL.Path != "/" { - notFound(writer) - - return - } - - if request.Method != http.MethodGet { - writer.Header().Set("Allow", http.MethodGet) - clientError(writer, http.StatusMethodNotAllowed) - - return - } - - tmpl, err := template.New("base").ParseFS(htmlTemplates, "web/html/base.tmpl.html") - if err != nil { - serverError(writer, fmt.Errorf("error parsing the HTML template; %w", err)) - - return - } - - links := struct { - Services links - Profiles links - }{ - Services: services, - Profiles: profiles, - } - - if err = tmpl.Execute(writer, &links); err != nil { - serverError(writer, fmt.Errorf("error rendering the HTML templates; %w", err)) - } - } -} - -func notFound(w http.ResponseWriter) { - clientError(w, http.StatusNotFound) -} - -func clientError(w http.ResponseWriter, status int) { - http.Error(w, http.StatusText(status), status) -} - -func serverError(w http.ResponseWriter, err error) { - slog.Error(err.Error()) - - http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError) -} - -func setupLogging() { - opts := slog.HandlerOptions{ - AddSource: false, - } - - logger := slog.New(slog.NewJSONHandler(os.Stdout, &opts)) - - slog.SetDefault(logger) -} diff --git a/web/html/base.tmpl.html b/web/html/base.tmpl.html deleted file mode 100644 index 172725e..0000000 --- a/web/html/base.tmpl.html +++ /dev/null @@ -1,31 +0,0 @@ -{{ define "base" }} - - - - - Dan Anglin | Flow Platform - - - - - -

Flow Platform

- {{ if gt (len .Services) 0 }} -

Services

-
- {{- range .Services }} -

{{ .Title }}

- {{ end }} -
- {{ end }} - {{ if gt (len .Profiles) 0 }} -

My Profiles

-
- {{- range .Profiles }} -

{{ .Title }}

- {{ end }} -
- {{ end }} - - -{{ end }} diff --git a/web/static/css/stylesheet.css b/web/static/css/stylesheet.css deleted file mode 100644 index bbd6778..0000000 --- a/web/static/css/stylesheet.css +++ /dev/null @@ -1,33 +0,0 @@ -body { - background-color: #1e1c31; - text-align: center; - font-family: sans-serif; - font-weight: 600; -} - -h1, h2{ - color: white; -} - -body .links { - max-width: 500px; - margin: auto; - text-align: center; -} - -body .links p a { - display: block; - background-color: #296ae2; - color: Thistle; - text-decoration: none; - padding: 15px; - margin-bottom: 10px; - transition: 0.5s; - border-radius: 5px; -} - -body .links p a:hover, a:active { - background-color: #719dee; - color: White; - transition: 0.5s; -} diff --git a/web/static/gpg/public.asc b/web/static/gpg/public.asc deleted file mode 100644 index e26f5ab..0000000 --- a/web/static/gpg/public.asc +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6a3ceeed919889fa8e8d970370e36b9d59684205121df7d986b1dff2bad28912 -size 3618 diff --git a/web/static/img/favicon.ico b/web/static/img/favicon.ico deleted file mode 100644 index 6dc9d90..0000000 --- a/web/static/img/favicon.ico +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1738be5eb5b9fd0ea8ed0f396d987829d618d25de10c48dcc245653fc96a771b -size 1150 -- 2.45.2 From 614243f05a56d622ab860e6dd6c5628a38eb6524 Mon Sep 17 00:00:00 2001 From: Dan Anglin Date: Tue, 6 Feb 2024 12:55:49 +0000 Subject: [PATCH 2/9] remove .gitattributes and .gitignore --- .gitattributes | 2 -- .gitignore | 1 - 2 files changed, 3 deletions(-) delete mode 100644 .gitattributes delete mode 100644 .gitignore diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 57b7444..0000000 --- a/.gitattributes +++ /dev/null @@ -1,2 +0,0 @@ -web/static/gpg/public.asc filter=lfs diff=lfs merge=lfs -text -web/static/img/favicon.ico filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 83f32f9..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/landing -- 2.45.2 From e5c02da377012729ab7a2a54c6491e4f297f5ce0 Mon Sep 17 00:00:00 2001 From: Dan Anglin Date: Tue, 6 Feb 2024 13:00:48 +0000 Subject: [PATCH 3/9] checkpoint: new site built with Nanoc --- .gitattributes | 1 + .gitignore | 5 + Dockerfile | 35 +++++ LICENSE | 21 +++ flow/Gemfile | 12 ++ flow/Gemfile.lock | 113 ++++++++++++++ flow/Rules | 18 +++ flow/content/css/stylesheet.css | 127 ++++++++++++++++ flow/content/index.asciidoc | 13 ++ flow/layouts/default.html | 26 ++++ flow/layouts/partials/head.html | 7 + flow/layouts/partials/navigation.html | 6 + flow/layouts/projects.html | 17 +++ flow/lib/helpers.rb | 1 + flow/nanoc.yaml | 38 +++++ go.mod | 36 +++++ go.sum | 164 +++++++++++++++++++++ magefiles/main.go | 13 ++ magefiles/projects.go | 203 ++++++++++++++++++++++++++ main.go | 66 +++++++++ 20 files changed, 922 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 Dockerfile create mode 100644 LICENSE create mode 100644 flow/Gemfile create mode 100644 flow/Gemfile.lock create mode 100644 flow/Rules create mode 100644 flow/content/css/stylesheet.css create mode 100644 flow/content/index.asciidoc create mode 100644 flow/layouts/default.html create mode 100644 flow/layouts/partials/head.html create mode 100644 flow/layouts/partials/navigation.html create mode 100644 flow/layouts/projects.html create mode 100644 flow/lib/helpers.rb create mode 100644 flow/nanoc.yaml create mode 100644 go.mod create mode 100644 go.sum create mode 100644 magefiles/main.go create mode 100644 magefiles/projects.go create mode 100644 main.go diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..86b6568 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +flow/content/favicon.ico filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..bae8a5b --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +/flow/output/ +/flow/tmp/ +/flow/crash.log +/flow/content/projects/ +!/flow/content/projects/index.asciidoc diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..55e7dc9 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,35 @@ +# syntax=docker/dockerfile:1 + +# Build the nanoc site +FROM ruby:3.3 AS site-builder + +ARG ENVIRONMENT + +COPY flow/ /workspace + +WORKDIR /workspace + +RUN bundle install \ + && bundle exec nanoc compile --env=${ENVIRONMENT} + +# Build the web server +FROM golang:1.21-alpine AS server-builder + +COPY go.mod /workspace/go.mod +COPY main.go /workspace/main.go +COPY --from=site-builder /workspace/output/ /workspace/flow/output/ + +WORKDIR /workspace + +RUN go build -ldflags="-s -w" -a -v -o website . + +# Create the final image +FROM scratch + +COPY --from=server-builder /workspace/website /website + +USER 65534 + +ENTRYPOINT ["/website"] + +HEALTHCHECK NONE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..2b6602f --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2024 Dan Anglin + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/flow/Gemfile b/flow/Gemfile new file mode 100644 index 0000000..086d59b --- /dev/null +++ b/flow/Gemfile @@ -0,0 +1,12 @@ +# frozen_string_literal: true + +source 'https://rubygems.org' + +gem 'asciidoctor', '= 2.0.20' +gem 'nanoc', '= 4.12.19' + +group 'nanoc' do + gem 'base64', '= 0.2.0' + gem 'nanoc-live', '= 1.0.0' + gem 'webrick', '= 1.8.1' +end diff --git a/flow/Gemfile.lock b/flow/Gemfile.lock new file mode 100644 index 0000000..40d1f9d --- /dev/null +++ b/flow/Gemfile.lock @@ -0,0 +1,113 @@ +GEM + remote: https://rubygems.org/ + specs: + addressable (2.8.6) + public_suffix (>= 2.0.2, < 6.0) + adsf (1.4.6) + rack (>= 1.0.0, < 3.0.0) + adsf-live (1.5.0) + adsf (~> 1.3) + em-websocket (~> 0.5) + eventmachine (~> 1.2) + listen (~> 3.0) + rack-livereload (~> 0.3) + asciidoctor (2.0.20) + base64 (0.2.0) + colored (1.2) + concurrent-ruby (1.2.3) + cri (2.15.11) + ddmetrics (1.1.0) + ddplugin (1.0.3) + diff-lcs (1.5.1) + em-websocket (0.5.3) + eventmachine (>= 0.12.9) + http_parser.rb (~> 0) + eventmachine (1.2.7) + ffi (1.16.3) + http_parser.rb (0.8.0) + immutable-ruby (0.1.0) + concurrent-ruby (~> 1.1) + sorted_set (~> 1.0) + json_schema (0.21.0) + listen (3.8.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + memo_wise (1.8.0) + nanoc (4.12.19) + addressable (~> 2.5) + colored (~> 1.2) + nanoc-checking (~> 1.0, >= 1.0.2) + nanoc-cli (= 4.12.19) + nanoc-core (= 4.12.19) + nanoc-deploying (~> 1.0) + parallel (~> 1.12) + tty-command (~> 0.8) + tty-which (~> 0.4) + nanoc-checking (1.0.2) + nanoc-cli (~> 4.12, >= 4.12.4) + nanoc-core (~> 4.12, >= 4.12.4) + nanoc-cli (4.12.19) + cri (~> 2.15) + diff-lcs (~> 1.3) + nanoc-core (= 4.12.19) + zeitwerk (~> 2.1) + nanoc-core (4.12.19) + concurrent-ruby (~> 1.1) + ddmetrics (~> 1.0) + ddplugin (~> 1.0) + immutable-ruby (~> 0.1) + json_schema (~> 0.19) + memo_wise (~> 1.5) + psych (>= 4.0, < 6.0) + slow_enumerator_tools (~> 1.0) + tty-platform (~> 0.2) + zeitwerk (~> 2.1) + nanoc-deploying (1.0.2) + nanoc-checking (~> 1.0) + nanoc-cli (~> 4.11, >= 4.11.15) + nanoc-core (~> 4.11, >= 4.11.15) + nanoc-live (1.0.0) + adsf-live (~> 1.4) + listen (~> 3.0) + nanoc-cli (~> 4.11, >= 4.11.14) + nanoc-core (~> 4.11, >= 4.11.14) + parallel (1.24.0) + pastel (0.8.0) + tty-color (~> 0.5) + psych (5.1.2) + stringio + public_suffix (5.0.4) + rack (2.2.8) + rack-livereload (0.5.2) + rack (< 3) + rb-fsevent (0.11.2) + rb-inotify (0.10.1) + ffi (~> 1.0) + rbtree (0.4.6) + set (1.1.0) + slow_enumerator_tools (1.1.0) + sorted_set (1.0.3) + rbtree + set (~> 1.0) + stringio (3.1.0) + tty-color (0.6.0) + tty-command (0.10.1) + pastel (~> 0.8) + tty-platform (0.3.0) + tty-which (0.5.0) + webrick (1.8.1) + zeitwerk (2.6.12) + +PLATFORMS + ruby + x86_64-linux + +DEPENDENCIES + asciidoctor (= 2.0.20) + base64 (= 0.2.0) + nanoc (= 4.12.19) + nanoc-live (= 1.0.0) + webrick (= 1.8.1) + +BUNDLED WITH + 2.5.5 diff --git a/flow/Rules b/flow/Rules new file mode 100644 index 0000000..e6f6fdb --- /dev/null +++ b/flow/Rules @@ -0,0 +1,18 @@ +#!/usr/bin/env ruby + +compile '/index.asciidoc' do + filter :asciidoctor, attributes: 'showtitle=true' + layout '/default.html' + write item.identifier.without_ext + '.html' +end + +compile '/projects/**/*.asciidoc' do + filter :asciidoctor, attributes: 'showtitle=true' + layout '/projects.html' + write item.identifier.without_ext + '.html' +end + +passthrough '/favicon.ico' +passthrough '/css/*.css' + +layout '/**/*', :erb diff --git a/flow/content/css/stylesheet.css b/flow/content/css/stylesheet.css new file mode 100644 index 0000000..c56d152 --- /dev/null +++ b/flow/content/css/stylesheet.css @@ -0,0 +1,127 @@ +* { + margin: 0; + padding: 0; + + font-family: Georgia, Palatino, serif; +} + +body { + background: #fff; +} + +a { + text-decoration: none; +} + +a:link, +a:visited { + color: #f30; +} + +a:hover { + color: #f90; +} + +#main { + position: absolute; + + top: 40px; + left: 280px; + + width: 500px; +} + +#main h1 { + font-size: 40px; + font-weight: normal; + + line-height: 40px; + + letter-spacing: -1px; +} + +#main p { + margin: 20px 0; + + font-size: 15px; + + line-height: 20px; +} + +#main ul, #main ol { + margin: 20px; +} + +#main li { + font-size: 15px; + + line-height: 20px; +} + +#main ul li { + list-style-type: square; +} + +#sidebar { + position: absolute; + + top: 40px; + left: 20px; + width: 200px; + + padding: 20px 20px 0 0; + + border-right: 1px solid #ccc; + + text-align: right; +} + +#sidebar h2 { + text-transform: uppercase; + + font-size: 13px; + + color: #333; + + letter-spacing: 1px; + + line-height: 20px; +} + +#sidebar ul { + list-style-type: none; + + margin: 20px 0; +} + +#sidebar li { + font-size: 14px; + + line-height: 20px; +} + +#navigation ul { + list-style-type: none; + margin: 0; + padding: 0; + overflow: hidden; + background-color: #333; + position: fixed; + top: 0; + width: 100%; +} + +#navigation li { + float: left; + border-right: 1px solid #bbb; +} + +#navigation li:last-child { + border-right: none; +} + +#navigation a { + float: left; + text-align: center; + padding: 5px 10px; +} diff --git a/flow/content/index.asciidoc b/flow/content/index.asciidoc new file mode 100644 index 0000000..b5602c4 --- /dev/null +++ b/flow/content/index.asciidoc @@ -0,0 +1,13 @@ +--- +title: About Flow +--- + += Flow + +My new Flow website. + +== To Do + +- The main body of this page is a short summary of myself, the platform and projects (maybe). +- Create a good theme. +- Figure out a strategy to build and host the website. diff --git a/flow/layouts/default.html b/flow/layouts/default.html new file mode 100644 index 0000000..789f94f --- /dev/null +++ b/flow/layouts/default.html @@ -0,0 +1,26 @@ + + + <%= render '/partials/head.html' %> + + <%= render '/partials/navigation.html' %> +
+ <%= yield %> +
+ + + diff --git a/flow/layouts/partials/head.html b/flow/layouts/partials/head.html new file mode 100644 index 0000000..139185b --- /dev/null +++ b/flow/layouts/partials/head.html @@ -0,0 +1,7 @@ + + + Flow | <%= @item[:title] %> + + + + diff --git a/flow/layouts/partials/navigation.html b/flow/layouts/partials/navigation.html new file mode 100644 index 0000000..cd690b8 --- /dev/null +++ b/flow/layouts/partials/navigation.html @@ -0,0 +1,6 @@ + diff --git a/flow/layouts/projects.html b/flow/layouts/projects.html new file mode 100644 index 0000000..7e550c1 --- /dev/null +++ b/flow/layouts/projects.html @@ -0,0 +1,17 @@ + + + <%= render '/partials/head.html' %> + + <%= render '/partials/navigation.html' %> +
+ <%= yield %> +
+ + + diff --git a/flow/lib/helpers.rb b/flow/lib/helpers.rb new file mode 100644 index 0000000..4136164 --- /dev/null +++ b/flow/lib/helpers.rb @@ -0,0 +1 @@ +use_helper Nanoc::Helpers::Rendering diff --git a/flow/nanoc.yaml b/flow/nanoc.yaml new file mode 100644 index 0000000..78c0c26 --- /dev/null +++ b/flow/nanoc.yaml @@ -0,0 +1,38 @@ +# A list of file extensions that Nanoc will consider to be textual rather than +# binary. If an item with an extension not in this list is found, the file +# will be considered as binary. +text_extensions: +- 'adoc' +- 'asciidoc' +- 'css' +- 'erb' +- 'html' +- 'rb' + +prune: + auto_prune: true + +data_sources: +- type: filesystem + encoding: utf-8 + +environments: + default: + site_name: Flow (Local) + base_url: http://localhost:3000 + development: + site_name: Flow (Dev) + base_url: https://dan.anglin + production: + site_name: Flow + base_url: https://dananglin.me.uk + +projects: + pelican: + repository_url: https://codeflow.dananglin.me.uk/apollo/pelican.git + branch: flow-website-support + documentation_root: docs + spruce: + repository_url: https://codeflow.dananglin.me.uk/apollo/spruce.git + branch: flow-website-support + documentation_root: docs diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..59d4786 --- /dev/null +++ b/go.mod @@ -0,0 +1,36 @@ +module codeflow.dananglin.me.uk/flow/website + +go 1.21.6 + +require ( + github.com/go-git/go-git/v5 v5.11.0 + github.com/goccy/go-yaml v1.11.3 +) + +require ( + dario.cat/mergo v1.0.0 // indirect + github.com/Microsoft/go-winio v0.6.1 // indirect + github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect + github.com/cloudflare/circl v1.3.3 // indirect + github.com/cyphar/filepath-securejoin v0.2.4 // indirect + github.com/emirpasic/gods v1.18.1 // indirect + github.com/fatih/color v1.10.0 // indirect + github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect + github.com/go-git/go-billy/v5 v5.5.0 // indirect + github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect + github.com/kevinburke/ssh_config v1.2.0 // indirect + github.com/mattn/go-colorable v0.1.8 // indirect + github.com/mattn/go-isatty v0.0.12 // indirect + github.com/pjbgf/sha1cd v0.3.0 // indirect + github.com/sergi/go-diff v1.1.0 // indirect + github.com/skeema/knownhosts v1.2.1 // indirect + github.com/xanzy/ssh-agent v0.3.3 // indirect + golang.org/x/crypto v0.16.0 // indirect + golang.org/x/mod v0.12.0 // indirect + golang.org/x/net v0.19.0 // indirect + golang.org/x/sys v0.15.0 // indirect + golang.org/x/tools v0.13.0 // indirect + golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect + gopkg.in/warnings.v0 v0.1.2 // indirect +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..4e86ccd --- /dev/null +++ b/go.sum @@ -0,0 +1,164 @@ +dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= +dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= +github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= +github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= +github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= +github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 h1:kkhsdkhsCvIsutKu5zLMgWtgh9YxGCNAw8Ad8hjwfYg= +github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0= +github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8= +github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= +github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= +github.com/cloudflare/circl v1.3.3 h1:fE/Qz0QdIGqeWfnwq0RE0R7MI51s0M2E4Ga9kq5AEMs= +github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA= +github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg= +github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a h1:mATvB/9r/3gvcejNsXKSkQ6lcIaNec2nyfOdlTBR2lU= +github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM= +github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= +github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= +github.com/fatih/color v1.10.0 h1:s36xzo75JdqLaaWoiEHk767eHiwo0598uUxyfiPkDsg= +github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= +github.com/gliderlabs/ssh v0.3.5 h1:OcaySEmAQJgyYcArR+gGGTHCyE7nvhEMTlYY+Dp8CpY= +github.com/gliderlabs/ssh v0.3.5/go.mod h1:8XB4KraRrX39qHhT6yxPsHedjA08I/uBVwj4xC+/+z4= +github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI= +github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic= +github.com/go-git/go-billy/v5 v5.5.0 h1:yEY4yhzCDuMGSv83oGxiBotRzhwhNr8VZyphhiu+mTU= +github.com/go-git/go-billy/v5 v5.5.0/go.mod h1:hmexnoNsr2SJU1Ju67OaNz5ASJY3+sHgFRpCtpDCKow= +github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4= +github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII= +github.com/go-git/go-git/v5 v5.11.0 h1:XIZc1p+8YzypNr34itUfSvYJcv+eYdTnTvOZ2vD3cA4= +github.com/go-git/go-git/v5 v5.11.0/go.mod h1:6GFcX2P3NM7FPBfpePbpLd21XxsgdAt+lKqXmCUiUCY= +github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q= +github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= +github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no= +github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= +github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7aM3F26W0hOn+GE= +github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4= +github.com/goccy/go-yaml v1.11.3 h1:B3W9IdWbvrUu2OYQGwvU1nZtvMQJPBKgBUuweJjLj6I= +github.com/goccy/go-yaml v1.11.3/go.mod h1:wKnAMd44+9JAAnGQpWVEgBzGt3YuTaQ4uXoHvE4m7WU= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= +github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= +github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= +github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y= +github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= +github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8= +github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= +github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI= +github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M= +github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4= +github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= +github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= +github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= +github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= +github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/skeema/knownhosts v1.2.1 h1:SHWdIUa82uGZz+F+47k8SY4QhhI291cXCpopT1lK2AQ= +github.com/skeema/knownhosts v1.2.1/go.mod h1:xYbVRSPxqBZFrdmDyMmsOs+uX1UZC3nTN3ThzgDxUwo= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM= +github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= +golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= +golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY= +golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc= +golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= +golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= +golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= +golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= +golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4= +golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ= +golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= +gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/magefiles/main.go b/magefiles/main.go new file mode 100644 index 0000000..8883df9 --- /dev/null +++ b/magefiles/main.go @@ -0,0 +1,13 @@ +//go:build ignore + +package main + +import ( + "os" + + "github.com/magefile/mage/mage" +) + +func main() { + os.Exit(mage.Main()) +} diff --git a/magefiles/projects.go b/magefiles/projects.go new file mode 100644 index 0000000..cb47602 --- /dev/null +++ b/magefiles/projects.go @@ -0,0 +1,203 @@ +//go:build mage + +package main + +import ( + "fmt" + "io" + "log/slog" + "os" + "path/filepath" + "strings" + + "github.com/go-git/go-git/v5" + "github.com/go-git/go-git/v5/plumbing" + "github.com/goccy/go-yaml" +) + +type projectsConfig struct { + Projects map[string]project `yaml:"projects"` +} + +type project struct { + RepositoryURL string `yaml:"repository_url"` + Commit string `yaml:"commit"` + Tag string `yaml:"tag"` + Branch string `yaml:"branch"` + GitReference string `yaml:"git_reference"` + DocumentationRoot string `yaml:"documentation_root"` +} + +var ( + configFile = "./flow/nanoc.yaml" + projectsDirectory = "./flow/content/projects" +) + +func Projects() error { + logger := slog.New(slog.NewTextHandler(os.Stdout, nil)) + slog.SetDefault(logger) + + projects, err := parseProjectsConfig() + if err != nil { + return fmt.Errorf("unable to parse the projects configuration; %w", err) + } + + for name, details := range projects.Projects { + clonedDirectory, err := cloneProject(name, details) + if err != nil { + return fmt.Errorf("unable to clone %q; %w", name, err) + } + + documentationDir := filepath.Join(clonedDirectory, details.DocumentationRoot) + + if err := copyDocumentation(documentationDir, name); err != nil { + return fmt.Errorf("unable to copy the documentation from %q; %w", name, err) + } + } + + return nil +} + +func parseProjectsConfig() (projectsConfig, error) { + slog.Info("Parsing configuration.", "config file", configFile) + + var config projectsConfig + + data, err := os.ReadFile(configFile) + if err != nil { + return config, fmt.Errorf("unable to read %q; %w", configFile, err) + } + + if err := yaml.Unmarshal(data, &config); err != nil { + return config, fmt.Errorf("unable to Unmarshal the configuration; %w", err) + } + + slog.Info("Configuration parsed successfully.") + + return config, nil +} + +func cloneProject(projectName string, projectDetails project) (string, error) { + slog.Info("Cloning the project repository.", "repository", projectDetails.RepositoryURL) + var ( + reference plumbing.ReferenceName + singleBranch bool + depth int + ) + + if projectDetails.Tag != "" { + reference = plumbing.NewTagReferenceName(projectDetails.Tag) + singleBranch = false + depth = 1 + } else if projectDetails.Branch != "" { + reference = plumbing.NewBranchReferenceName(projectDetails.Branch) + singleBranch = true + depth = 1 + } else { + reference = plumbing.Main + singleBranch = false + depth = 0 + } + + cloneDir, err := os.MkdirTemp("", projectName) + if err != nil { + return "", fmt.Errorf("unable to create the temporary clone directory; %w", err) + } + + options := git.CloneOptions{ + URL: projectDetails.RepositoryURL, + Progress: nil, + ReferenceName: reference, + SingleBranch: singleBranch, + Depth: depth, + } + + repository, err := git.PlainClone(cloneDir, false, &options) + if err != nil { + return "", fmt.Errorf("unable to clone the repository; %w", err) + } + + if projectDetails.Commit == "" { + return cloneDir, nil + } + + worktree, err := repository.Worktree() + if err != nil { + return "", fmt.Errorf("unable to retrieve the work tree; %w", err) + } + + checkoutOptions := git.CheckoutOptions{ + Hash: plumbing.NewHash(projectDetails.Commit), + Create: false, + } + + if err := worktree.Checkout(&checkoutOptions); err != nil { + return "", fmt.Errorf("unable to checkout %q; %w", projectDetails.Commit, err) + } + + slog.Info("Project cloned successfully.") + + return cloneDir, nil +} + +func copyDocumentation(inputDirectory, projectName string) error { + slog.Info("Copying documentation.", "project", projectName, "directory", inputDirectory) + + defer os.RemoveAll(inputDirectory) + + files, err := os.ReadDir(inputDirectory) + if err != nil { + return fmt.Errorf("unable to read files from %q; %w", inputDirectory, err) + } + + if len(files) == 0 { + return nil + } + + outputDirectory := filepath.Join(projectsDirectory, projectName) + + if err := os.MkdirAll(outputDirectory, 0o750); err != nil { + return fmt.Errorf("unable to create %q; %w", outputDirectory, err) + } + + for _, file := range files { + if file.IsDir() || !strings.HasSuffix(file.Name(), ".asciidoc") { + continue + } + + inputPath := filepath.Join(inputDirectory, file.Name()) + outputPath := filepath.Join(projectsDirectory, projectName, file.Name()) + + err := func() error { + inputFile, err := os.Open(inputPath) + if err != nil { + return fmt.Errorf("unable to open %q; %w", inputPath, err) + } + defer inputFile.Close() + + outputFile, err := os.Create(outputPath) + if err != nil { + return fmt.Errorf("unable to create %q; %w", outputPath, err) + } + defer outputFile.Close() + + if _, err := io.Copy(outputFile, inputFile); err != nil { + return fmt.Errorf( + "unable to copy the contents from %q to %q; %w", + inputPath, + outputPath, + err, + ) + } + + return nil + }() + if err != nil { + return err + } + } + + slog.Info("Documentation copied successfully.") + + return nil +} diff --git a/main.go b/main.go new file mode 100644 index 0000000..668c339 --- /dev/null +++ b/main.go @@ -0,0 +1,66 @@ +package main + +import ( + "embed" + "flag" + "fmt" + "io/fs" + "log/slog" + "net/http" + "os" + "time" +) + +//go:embed flow/output/* +var webFS embed.FS + +func main() { + var address string + + flag.StringVar(&address, "address", "0.0.0.0:8080", "The address that the web server will listen on") + flag.Parse() + + setupLogging() + + mux, err := routes() + if err != nil { + slog.Error("Unable to create the Mux", "error", err) + } + + server := http.Server{ + Addr: address, + Handler: mux, + ReadHeaderTimeout: 1 * time.Second, + ReadTimeout: 5 * time.Second, + } + + slog.Info("Starting the Flow website.", "address", address) + + if err := server.ListenAndServe(); err != nil { + slog.Error("Failed to run the website", "error", err) + } +} + +func routes() (*http.ServeMux, error) { + mux := http.NewServeMux() + + rootFS, err := fs.Sub(webFS, "flow/output") + if err != nil { + return nil, fmt.Errorf("unable to create the static root file system; %w", err) + } + + fileserver := http.FileServer(http.FS(rootFS)) + mux.Handle("/", fileserver) + + return mux, nil +} + +func setupLogging() { + opts := slog.HandlerOptions{ + AddSource: false, + } + + logger := slog.New(slog.NewTextHandler(os.Stdout, &opts)) + + slog.SetDefault(logger) +} -- 2.45.2 From 0ac6d7bca9789d2b1390f0366203dbe60a0cb30a Mon Sep 17 00:00:00 2001 From: Dan Anglin Date: Tue, 6 Feb 2024 13:01:04 +0000 Subject: [PATCH 4/9] checkpoint: add favicon --- flow/content/favicon.ico | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 flow/content/favicon.ico diff --git a/flow/content/favicon.ico b/flow/content/favicon.ico new file mode 100644 index 0000000..6dc9d90 --- /dev/null +++ b/flow/content/favicon.ico @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1738be5eb5b9fd0ea8ed0f396d987829d618d25de10c48dcc245653fc96a771b +size 1150 -- 2.45.2 From d7397c505b08ef1c0572af522e72b63a59641c28 Mon Sep 17 00:00:00 2001 From: Dan Anglin Date: Tue, 6 Feb 2024 14:58:17 +0000 Subject: [PATCH 5/9] generate the project list from config --- flow/layouts/projects.html | 3 +-- flow/lib/project_list.rb | 9 ++++++++ flow/nanoc.yaml | 16 +++++++-------- magefiles/projects.go | 42 ++++++++++++++++++++------------------ 4 files changed, 40 insertions(+), 30 deletions(-) create mode 100644 flow/lib/project_list.rb diff --git a/flow/layouts/projects.html b/flow/layouts/projects.html index 7e550c1..ef78f46 100644 --- a/flow/layouts/projects.html +++ b/flow/layouts/projects.html @@ -9,8 +9,7 @@ diff --git a/flow/lib/project_list.rb b/flow/lib/project_list.rb new file mode 100644 index 0000000..8a3b4e4 --- /dev/null +++ b/flow/lib/project_list.rb @@ -0,0 +1,9 @@ +def project_list + out = +'' + + @config[:projects].each do |project| + out << "
  • #{project[:name]}
    • \n" + end + + out +end diff --git a/flow/nanoc.yaml b/flow/nanoc.yaml index 78c0c26..48af89d 100644 --- a/flow/nanoc.yaml +++ b/flow/nanoc.yaml @@ -28,11 +28,11 @@ environments: base_url: https://dananglin.me.uk projects: - pelican: - repository_url: https://codeflow.dananglin.me.uk/apollo/pelican.git - branch: flow-website-support - documentation_root: docs - spruce: - repository_url: https://codeflow.dananglin.me.uk/apollo/spruce.git - branch: flow-website-support - documentation_root: docs +- name: pelican + repository_url: https://codeflow.dananglin.me.uk/apollo/pelican.git + branch: flow-website-support + documentation_root: docs +- name: spruce + repository_url: https://codeflow.dananglin.me.uk/apollo/spruce.git + branch: flow-website-support + documentation_root: docs diff --git a/magefiles/projects.go b/magefiles/projects.go index cb47602..9784909 100644 --- a/magefiles/projects.go +++ b/magefiles/projects.go @@ -16,10 +16,11 @@ import ( ) type projectsConfig struct { - Projects map[string]project `yaml:"projects"` + Projects []project `yaml:"projects"` } type project struct { + Name string `yaml:"name"` RepositoryURL string `yaml:"repository_url"` Commit string `yaml:"commit"` Tag string `yaml:"tag"` @@ -42,16 +43,16 @@ func Projects() error { return fmt.Errorf("unable to parse the projects configuration; %w", err) } - for name, details := range projects.Projects { - clonedDirectory, err := cloneProject(name, details) + for _, project := range projects.Projects { + clonedDirectory, err := cloneProject(project) if err != nil { - return fmt.Errorf("unable to clone %q; %w", name, err) + return fmt.Errorf("unable to clone %q; %w", project.Name, err) } - documentationDir := filepath.Join(clonedDirectory, details.DocumentationRoot) + documentationDir := filepath.Join(clonedDirectory, project.DocumentationRoot) - if err := copyDocumentation(documentationDir, name); err != nil { - return fmt.Errorf("unable to copy the documentation from %q; %w", name, err) + if err := copyDocumentation(documentationDir, project.Name); err != nil { + return fmt.Errorf("unable to copy the documentation from %q; %w", project.Name, err) } } @@ -77,20 +78,20 @@ func parseProjectsConfig() (projectsConfig, error) { return config, nil } -func cloneProject(projectName string, projectDetails project) (string, error) { - slog.Info("Cloning the project repository.", "repository", projectDetails.RepositoryURL) +func cloneProject(p project) (string, error) { + slog.Info("Cloning the project repository.", "repository", p.RepositoryURL) var ( reference plumbing.ReferenceName singleBranch bool depth int ) - if projectDetails.Tag != "" { - reference = plumbing.NewTagReferenceName(projectDetails.Tag) + if p.Tag != "" { + reference = plumbing.NewTagReferenceName(p.Tag) singleBranch = false depth = 1 - } else if projectDetails.Branch != "" { - reference = plumbing.NewBranchReferenceName(projectDetails.Branch) + } else if p.Branch != "" { + reference = plumbing.NewBranchReferenceName(p.Branch) singleBranch = true depth = 1 } else { @@ -99,13 +100,13 @@ func cloneProject(projectName string, projectDetails project) (string, error) { depth = 0 } - cloneDir, err := os.MkdirTemp("", projectName) + cloneDir, err := os.MkdirTemp("", p.Name) if err != nil { return "", fmt.Errorf("unable to create the temporary clone directory; %w", err) } options := git.CloneOptions{ - URL: projectDetails.RepositoryURL, + URL: p.RepositoryURL, Progress: nil, ReferenceName: reference, SingleBranch: singleBranch, @@ -117,7 +118,7 @@ func cloneProject(projectName string, projectDetails project) (string, error) { return "", fmt.Errorf("unable to clone the repository; %w", err) } - if projectDetails.Commit == "" { + if p.Commit == "" { return cloneDir, nil } @@ -127,12 +128,12 @@ func cloneProject(projectName string, projectDetails project) (string, error) { } checkoutOptions := git.CheckoutOptions{ - Hash: plumbing.NewHash(projectDetails.Commit), + Hash: plumbing.NewHash(p.Commit), Create: false, } if err := worktree.Checkout(&checkoutOptions); err != nil { - return "", fmt.Errorf("unable to checkout %q; %w", projectDetails.Commit, err) + return "", fmt.Errorf("unable to checkout %q; %w", p.Commit, err) } slog.Info("Project cloned successfully.") @@ -141,7 +142,9 @@ func cloneProject(projectName string, projectDetails project) (string, error) { } func copyDocumentation(inputDirectory, projectName string) error { - slog.Info("Copying documentation.", "project", projectName, "directory", inputDirectory) + outputDirectory := filepath.Join(projectsDirectory, projectName) + + slog.Info("Copying documentation.", "project", projectName, "source", inputDirectory, "destination", outputDirectory) defer os.RemoveAll(inputDirectory) @@ -154,7 +157,6 @@ func copyDocumentation(inputDirectory, projectName string) error { return nil } - outputDirectory := filepath.Join(projectsDirectory, projectName) if err := os.MkdirAll(outputDirectory, 0o750); err != nil { return fmt.Errorf("unable to create %q; %w", outputDirectory, err) -- 2.45.2 From ac7d73f013b7f6637bad2c6d7a90fd5583b8f55a Mon Sep 17 00:00:00 2001 From: Dan Anglin Date: Wed, 7 Feb 2024 15:51:29 +0000 Subject: [PATCH 6/9] checkpoint: update - added profiles and services to nanoc.yaml - created an internal module for the build code so that those dependencies are not included in the main module. - upgraded Go to v1.22 and specified that only the GET method is valid for the root path. --- .gitignore | 1 + flow/layouts/projects.html | 2 +- flow/lib/project_list.rb | 2 +- flow/nanoc.yaml | 20 +++ go.mod | 35 +--- go.sum | 164 ------------------ internal/build/go.mod | 36 ++++ internal/build/go.sum | 164 ++++++++++++++++++ .../build/magefiles}/main.go | 0 internal/build/magefiles/projectroot.go | 16 ++ .../build/magefiles}/projects.go | 4 + mage | 8 + main.go | 2 +- 13 files changed, 253 insertions(+), 201 deletions(-) create mode 100644 internal/build/go.mod create mode 100644 internal/build/go.sum rename {magefiles => internal/build/magefiles}/main.go (100%) create mode 100644 internal/build/magefiles/projectroot.go rename {magefiles => internal/build/magefiles}/projects.go (97%) create mode 100755 mage diff --git a/.gitignore b/.gitignore index bae8a5b..e9990d7 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /flow/crash.log /flow/content/projects/ !/flow/content/projects/index.asciidoc +/website diff --git a/flow/layouts/projects.html b/flow/layouts/projects.html index ef78f46..aa998b7 100644 --- a/flow/layouts/projects.html +++ b/flow/layouts/projects.html @@ -9,7 +9,7 @@ diff --git a/flow/lib/project_list.rb b/flow/lib/project_list.rb index 8a3b4e4..cbc762d 100644 --- a/flow/lib/project_list.rb +++ b/flow/lib/project_list.rb @@ -1,4 +1,4 @@ -def project_list +def projects out = +'' @config[:projects].each do |project| diff --git a/flow/nanoc.yaml b/flow/nanoc.yaml index 48af89d..42edd9e 100644 --- a/flow/nanoc.yaml +++ b/flow/nanoc.yaml @@ -27,6 +27,20 @@ environments: site_name: Flow base_url: https://dananglin.me.uk +profiles: +- name: Fediverse + url: https://freeflow.dananglin.me.uk/@dan +- name: Code Flow + url: https://codeflow.dananglin.me.uk/dananglin +- name: Codeberg + url: https://codeberg.org/dananglin +- name: GitHub + url: https://github.com/dananglin +- name: GitLab + url: https://gitlab.com/dananglin +- name: Keyoxide + url: https://keyoxide.org/3A8B819A5E8795D75FDFF360B135D610070D4526 + projects: - name: pelican repository_url: https://codeflow.dananglin.me.uk/apollo/pelican.git @@ -36,3 +50,9 @@ projects: repository_url: https://codeflow.dananglin.me.uk/apollo/spruce.git branch: flow-website-support documentation_root: docs + +services: +- name: "Code Flow" + url: https://codeflow.dananglin.me.uk +- name: "Free Flow" + url: https://freeflow.dananglin.me.uk diff --git a/go.mod b/go.mod index 59d4786..bbe66f6 100644 --- a/go.mod +++ b/go.mod @@ -1,36 +1,3 @@ module codeflow.dananglin.me.uk/flow/website -go 1.21.6 - -require ( - github.com/go-git/go-git/v5 v5.11.0 - github.com/goccy/go-yaml v1.11.3 -) - -require ( - dario.cat/mergo v1.0.0 // indirect - github.com/Microsoft/go-winio v0.6.1 // indirect - github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect - github.com/cloudflare/circl v1.3.3 // indirect - github.com/cyphar/filepath-securejoin v0.2.4 // indirect - github.com/emirpasic/gods v1.18.1 // indirect - github.com/fatih/color v1.10.0 // indirect - github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect - github.com/go-git/go-billy/v5 v5.5.0 // indirect - github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect - github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect - github.com/kevinburke/ssh_config v1.2.0 // indirect - github.com/mattn/go-colorable v0.1.8 // indirect - github.com/mattn/go-isatty v0.0.12 // indirect - github.com/pjbgf/sha1cd v0.3.0 // indirect - github.com/sergi/go-diff v1.1.0 // indirect - github.com/skeema/knownhosts v1.2.1 // indirect - github.com/xanzy/ssh-agent v0.3.3 // indirect - golang.org/x/crypto v0.16.0 // indirect - golang.org/x/mod v0.12.0 // indirect - golang.org/x/net v0.19.0 // indirect - golang.org/x/sys v0.15.0 // indirect - golang.org/x/tools v0.13.0 // indirect - golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect - gopkg.in/warnings.v0 v0.1.2 // indirect -) +go 1.22 diff --git a/go.sum b/go.sum index 4e86ccd..e69de29 100644 --- a/go.sum +++ b/go.sum @@ -1,164 +0,0 @@ -dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= -dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= -github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= -github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= -github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= -github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 h1:kkhsdkhsCvIsutKu5zLMgWtgh9YxGCNAw8Ad8hjwfYg= -github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0= -github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8= -github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4= -github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= -github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= -github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= -github.com/cloudflare/circl v1.3.3 h1:fE/Qz0QdIGqeWfnwq0RE0R7MI51s0M2E4Ga9kq5AEMs= -github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA= -github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg= -github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a h1:mATvB/9r/3gvcejNsXKSkQ6lcIaNec2nyfOdlTBR2lU= -github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM= -github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= -github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= -github.com/fatih/color v1.10.0 h1:s36xzo75JdqLaaWoiEHk767eHiwo0598uUxyfiPkDsg= -github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= -github.com/gliderlabs/ssh v0.3.5 h1:OcaySEmAQJgyYcArR+gGGTHCyE7nvhEMTlYY+Dp8CpY= -github.com/gliderlabs/ssh v0.3.5/go.mod h1:8XB4KraRrX39qHhT6yxPsHedjA08I/uBVwj4xC+/+z4= -github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI= -github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic= -github.com/go-git/go-billy/v5 v5.5.0 h1:yEY4yhzCDuMGSv83oGxiBotRzhwhNr8VZyphhiu+mTU= -github.com/go-git/go-billy/v5 v5.5.0/go.mod h1:hmexnoNsr2SJU1Ju67OaNz5ASJY3+sHgFRpCtpDCKow= -github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4= -github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII= -github.com/go-git/go-git/v5 v5.11.0 h1:XIZc1p+8YzypNr34itUfSvYJcv+eYdTnTvOZ2vD3cA4= -github.com/go-git/go-git/v5 v5.11.0/go.mod h1:6GFcX2P3NM7FPBfpePbpLd21XxsgdAt+lKqXmCUiUCY= -github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q= -github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= -github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no= -github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= -github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7aM3F26W0hOn+GE= -github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4= -github.com/goccy/go-yaml v1.11.3 h1:B3W9IdWbvrUu2OYQGwvU1nZtvMQJPBKgBUuweJjLj6I= -github.com/goccy/go-yaml v1.11.3/go.mod h1:wKnAMd44+9JAAnGQpWVEgBzGt3YuTaQ4uXoHvE4m7WU= -github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= -github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= -github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= -github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= -github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= -github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= -github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= -github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y= -github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= -github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8= -github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= -github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= -github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI= -github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M= -github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4= -github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI= -github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= -github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= -github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= -github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= -github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= -github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/skeema/knownhosts v1.2.1 h1:SHWdIUa82uGZz+F+47k8SY4QhhI291cXCpopT1lK2AQ= -github.com/skeema/knownhosts v1.2.1/go.mod h1:xYbVRSPxqBZFrdmDyMmsOs+uX1UZC3nTN3ThzgDxUwo= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM= -github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw= -github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= -golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= -golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY= -golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc= -golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= -golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= -golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= -golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= -golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= -golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= -golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4= -golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ= -golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= -gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/internal/build/go.mod b/internal/build/go.mod new file mode 100644 index 0000000..58eeeda --- /dev/null +++ b/internal/build/go.mod @@ -0,0 +1,36 @@ +module flow-website-build + +go 1.22.0 + +require ( + github.com/go-git/go-git/v5 v5.11.0 + github.com/goccy/go-yaml v1.11.3 +) + +require ( + dario.cat/mergo v1.0.0 // indirect + github.com/Microsoft/go-winio v0.6.1 // indirect + github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect + github.com/cloudflare/circl v1.3.3 // indirect + github.com/cyphar/filepath-securejoin v0.2.4 // indirect + github.com/emirpasic/gods v1.18.1 // indirect + github.com/fatih/color v1.10.0 // indirect + github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect + github.com/go-git/go-billy/v5 v5.5.0 // indirect + github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect + github.com/kevinburke/ssh_config v1.2.0 // indirect + github.com/mattn/go-colorable v0.1.8 // indirect + github.com/mattn/go-isatty v0.0.12 // indirect + github.com/pjbgf/sha1cd v0.3.0 // indirect + github.com/sergi/go-diff v1.1.0 // indirect + github.com/skeema/knownhosts v1.2.1 // indirect + github.com/xanzy/ssh-agent v0.3.3 // indirect + golang.org/x/crypto v0.16.0 // indirect + golang.org/x/mod v0.12.0 // indirect + golang.org/x/net v0.19.0 // indirect + golang.org/x/sys v0.15.0 // indirect + golang.org/x/tools v0.13.0 // indirect + golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect + gopkg.in/warnings.v0 v0.1.2 // indirect +) diff --git a/internal/build/go.sum b/internal/build/go.sum new file mode 100644 index 0000000..4e86ccd --- /dev/null +++ b/internal/build/go.sum @@ -0,0 +1,164 @@ +dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= +dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= +github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= +github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= +github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= +github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 h1:kkhsdkhsCvIsutKu5zLMgWtgh9YxGCNAw8Ad8hjwfYg= +github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0= +github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8= +github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= +github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= +github.com/cloudflare/circl v1.3.3 h1:fE/Qz0QdIGqeWfnwq0RE0R7MI51s0M2E4Ga9kq5AEMs= +github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA= +github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg= +github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a h1:mATvB/9r/3gvcejNsXKSkQ6lcIaNec2nyfOdlTBR2lU= +github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM= +github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= +github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= +github.com/fatih/color v1.10.0 h1:s36xzo75JdqLaaWoiEHk767eHiwo0598uUxyfiPkDsg= +github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= +github.com/gliderlabs/ssh v0.3.5 h1:OcaySEmAQJgyYcArR+gGGTHCyE7nvhEMTlYY+Dp8CpY= +github.com/gliderlabs/ssh v0.3.5/go.mod h1:8XB4KraRrX39qHhT6yxPsHedjA08I/uBVwj4xC+/+z4= +github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI= +github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic= +github.com/go-git/go-billy/v5 v5.5.0 h1:yEY4yhzCDuMGSv83oGxiBotRzhwhNr8VZyphhiu+mTU= +github.com/go-git/go-billy/v5 v5.5.0/go.mod h1:hmexnoNsr2SJU1Ju67OaNz5ASJY3+sHgFRpCtpDCKow= +github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4= +github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII= +github.com/go-git/go-git/v5 v5.11.0 h1:XIZc1p+8YzypNr34itUfSvYJcv+eYdTnTvOZ2vD3cA4= +github.com/go-git/go-git/v5 v5.11.0/go.mod h1:6GFcX2P3NM7FPBfpePbpLd21XxsgdAt+lKqXmCUiUCY= +github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q= +github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= +github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no= +github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= +github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7aM3F26W0hOn+GE= +github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4= +github.com/goccy/go-yaml v1.11.3 h1:B3W9IdWbvrUu2OYQGwvU1nZtvMQJPBKgBUuweJjLj6I= +github.com/goccy/go-yaml v1.11.3/go.mod h1:wKnAMd44+9JAAnGQpWVEgBzGt3YuTaQ4uXoHvE4m7WU= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= +github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= +github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= +github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y= +github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= +github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8= +github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= +github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI= +github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M= +github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4= +github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= +github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= +github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= +github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= +github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/skeema/knownhosts v1.2.1 h1:SHWdIUa82uGZz+F+47k8SY4QhhI291cXCpopT1lK2AQ= +github.com/skeema/knownhosts v1.2.1/go.mod h1:xYbVRSPxqBZFrdmDyMmsOs+uX1UZC3nTN3ThzgDxUwo= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM= +github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= +golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= +golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY= +golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc= +golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= +golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= +golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= +golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= +golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4= +golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ= +golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= +gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/magefiles/main.go b/internal/build/magefiles/main.go similarity index 100% rename from magefiles/main.go rename to internal/build/magefiles/main.go diff --git a/internal/build/magefiles/projectroot.go b/internal/build/magefiles/projectroot.go new file mode 100644 index 0000000..2fe4357 --- /dev/null +++ b/internal/build/magefiles/projectroot.go @@ -0,0 +1,16 @@ +//go:build mage + +package main + +import ( + "fmt" + "os" +) + +func changeToProjectRoot() error { + if err := os.Chdir("../.."); err != nil { + return fmt.Errorf("unable to change directory; %w", err) + } + + return nil +} diff --git a/magefiles/projects.go b/internal/build/magefiles/projects.go similarity index 97% rename from magefiles/projects.go rename to internal/build/magefiles/projects.go index 9784909..d20820b 100644 --- a/magefiles/projects.go +++ b/internal/build/magefiles/projects.go @@ -38,6 +38,10 @@ func Projects() error { logger := slog.New(slog.NewTextHandler(os.Stdout, nil)) slog.SetDefault(logger) + if err := changeToProjectRoot(); err != nil { + return fmt.Errorf("unable to change to the project's root directory; %w", err) + } + projects, err := parseProjectsConfig() if err != nil { return fmt.Errorf("unable to parse the projects configuration; %w", err) diff --git a/mage b/mage new file mode 100755 index 0000000..7364e02 --- /dev/null +++ b/mage @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +set -o errexit +set -o nounset +set -o pipefail + +cd ./internal/build +mage $@ diff --git a/main.go b/main.go index 668c339..f24be5b 100644 --- a/main.go +++ b/main.go @@ -50,7 +50,7 @@ func routes() (*http.ServeMux, error) { } fileserver := http.FileServer(http.FS(rootFS)) - mux.Handle("/", fileserver) + mux.Handle(http.MethodGet + " /", fileserver) return mux, nil } -- 2.45.2 From 3fa47e9feb27af6e72cb955601cd3c32db4e020b Mon Sep 17 00:00:00 2001 From: Dan Anglin Date: Thu, 8 Feb 2024 15:20:58 +0000 Subject: [PATCH 7/9] checkpoint: website update - Use default Sans Serif font for now - Increase the width of the main section - Generate links to profiles and services from the config --- flow/Rules | 2 +- flow/content/css/stylesheet.css | 22 ++----------------- flow/layouts/default.html | 26 ----------------------- flow/layouts/home.html | 20 +++++++++++++++++ flow/lib/profiles.rb | 9 ++++++++ flow/lib/{project_list.rb => projects.rb} | 0 flow/lib/services.rb | 9 ++++++++ 7 files changed, 41 insertions(+), 47 deletions(-) delete mode 100644 flow/layouts/default.html create mode 100644 flow/layouts/home.html create mode 100644 flow/lib/profiles.rb rename flow/lib/{project_list.rb => projects.rb} (100%) create mode 100644 flow/lib/services.rb diff --git a/flow/Rules b/flow/Rules index e6f6fdb..847741c 100644 --- a/flow/Rules +++ b/flow/Rules @@ -2,7 +2,7 @@ compile '/index.asciidoc' do filter :asciidoctor, attributes: 'showtitle=true' - layout '/default.html' + layout '/home.html' write item.identifier.without_ext + '.html' end diff --git a/flow/content/css/stylesheet.css b/flow/content/css/stylesheet.css index c56d152..376fa19 100644 --- a/flow/content/css/stylesheet.css +++ b/flow/content/css/stylesheet.css @@ -1,8 +1,7 @@ * { margin: 0; padding: 0; - - font-family: Georgia, Palatino, serif; + font-family: sans-serif; } body { @@ -24,27 +23,21 @@ a:hover { #main { position: absolute; - top: 40px; left: 280px; - - width: 500px; + width: 800px; } #main h1 { font-size: 40px; font-weight: normal; - line-height: 40px; - letter-spacing: -1px; } #main p { margin: 20px 0; - font-size: 15px; - line-height: 20px; } @@ -54,7 +47,6 @@ a:hover { #main li { font-size: 15px; - line-height: 20px; } @@ -64,39 +56,29 @@ a:hover { #sidebar { position: absolute; - top: 40px; left: 20px; width: 200px; - padding: 20px 20px 0 0; - border-right: 1px solid #ccc; - text-align: right; } #sidebar h2 { text-transform: uppercase; - font-size: 13px; - color: #333; - letter-spacing: 1px; - line-height: 20px; } #sidebar ul { list-style-type: none; - margin: 20px 0; } #sidebar li { font-size: 14px; - line-height: 20px; } diff --git a/flow/layouts/default.html b/flow/layouts/default.html deleted file mode 100644 index 789f94f..0000000 --- a/flow/layouts/default.html +++ /dev/null @@ -1,26 +0,0 @@ - - - <%= render '/partials/head.html' %> - - <%= render '/partials/navigation.html' %> -
    - <%= yield %> -
    - - - diff --git a/flow/layouts/home.html b/flow/layouts/home.html new file mode 100644 index 0000000..d3b9297 --- /dev/null +++ b/flow/layouts/home.html @@ -0,0 +1,20 @@ + + + <%= render '/partials/head.html' %> + + <%= render '/partials/navigation.html' %> +
    + <%= yield %> +
    + + + diff --git a/flow/lib/profiles.rb b/flow/lib/profiles.rb new file mode 100644 index 0000000..2119af2 --- /dev/null +++ b/flow/lib/profiles.rb @@ -0,0 +1,9 @@ +def profiles + out = +'' + + @config[:profiles].each do |profile| + out << "
  • #{profile[:name]}
    • \n" + end + + out +end diff --git a/flow/lib/project_list.rb b/flow/lib/projects.rb similarity index 100% rename from flow/lib/project_list.rb rename to flow/lib/projects.rb diff --git a/flow/lib/services.rb b/flow/lib/services.rb new file mode 100644 index 0000000..2b83232 --- /dev/null +++ b/flow/lib/services.rb @@ -0,0 +1,9 @@ +def services + out = +'' + + @config[:services].each do |service| + out << "
  • #{service[:name]}
    • \n" + end + + out +end -- 2.45.2 From 9f2fb7a9e0d4dd40330f03ae694f2462321c48d8 Mon Sep 17 00:00:00 2001 From: Dan Anglin Date: Thu, 8 Feb 2024 17:08:28 +0000 Subject: [PATCH 8/9] checkpoint: update CSS stylesheet - Add some tokyonight colours - Update background - Update sidebar, ensure that the sidebar occupies 100% of the screen's height --- flow/content/css/stylesheet.css | 34 +++++++++++++++++++++------------ flow/layouts/projects.html | 2 +- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/flow/content/css/stylesheet.css b/flow/content/css/stylesheet.css index 376fa19..9cd1cbe 100644 --- a/flow/content/css/stylesheet.css +++ b/flow/content/css/stylesheet.css @@ -1,3 +1,11 @@ +:root { + --background: #1a1b26; + --background-dark: #16161e; + --foreground: #a9b1d6; + --link: #7aa2f7; + --link-hover: #bb9af7; +} + * { margin: 0; padding: 0; @@ -5,20 +13,20 @@ } body { - background: #fff; + background: var(--background); + color: var(--foreground); } a { text-decoration: none; } -a:link, -a:visited { - color: #f30; +a:link, a:visited { + color: var(--link); } a:hover { - color: #f90; + color: var(--link-hover); } #main { @@ -55,19 +63,20 @@ a:hover { } #sidebar { - position: absolute; - top: 40px; - left: 20px; + background: var(--background-dark); + position: fixed; + top: 0px; + left: 0px; width: 200px; - padding: 20px 20px 0 0; - border-right: 1px solid #ccc; + height: 100%; + padding: 30px 20px 0 0; + #border-right: 1px solid #ccc; text-align: right; } #sidebar h2 { text-transform: uppercase; font-size: 13px; - color: #333; letter-spacing: 1px; line-height: 20px; } @@ -87,9 +96,10 @@ a:hover { margin: 0; padding: 0; overflow: hidden; - background-color: #333; + background-color: var(--background-dark); position: fixed; top: 0; + left: 220px; width: 100%; } diff --git a/flow/layouts/projects.html b/flow/layouts/projects.html index aa998b7..0b6fc20 100644 --- a/flow/layouts/projects.html +++ b/flow/layouts/projects.html @@ -7,7 +7,7 @@ <%= yield %>