diff --git a/README.md b/README.md index 4e44afab5844ebf1d979005d5cfa3f0c7015c518..a3eeb30e5504b00e8351eecd37212719391389db 100644 --- a/README.md +++ b/README.md @@ -38,3 +38,16 @@ This project (excluding post content itself) is released under the Apache Licens ** FIREBASE_PRIVATE_KEY ** FIREBASE_CLIENT_EMAIL ** NEXT_PUBLIC_FIREBASE_PROJECT_ID +* Modify /layouts/partials/top_list_* to represent the section titles you want to use. +* Update package.json +** Update name field +** update description field +* Update manifest.json +** name +** short_name +** description +* Update robots.txt to point to the full URL of this site +* Modify vercel.json +** Find the line where source is set to "/flear" and update it to point to your apUser name (all lowercase even if variable has case). + +The above steps might be reduced by using template processing on otherwise unprocessed files (normally not part of hugo). See the following for more info https://vercel.com/docs/functions/serverless-functions/runtimes/node-js diff --git a/config/_default/hugo.toml b/config/_default/hugo.toml index 8f824e3166e93ddcd9c2d50bc10138669490d189..3beb4bfd5e5fdb724fdf238438b5627676642239 100644 --- a/config/_default/hugo.toml +++ b/config/_default/hugo.toml @@ -1,4 +1,4 @@ -Copyright = "FLEAR 2023" +Copyright = "Jeffrey Phillips Freeman 2023 - present" paginate = 20 pygmentsCodeFences = true diff --git a/hugo.toml b/hugo.toml index bd64187dc3e2d8312b91cc0bfb84b7b404983c0d..7a264db6bb22f421ce1d2cda7453ae700f103668 100644 --- a/hugo.toml +++ b/hugo.toml @@ -23,4 +23,8 @@ twitterUser="FLEAR_radio" siteDescription="FLEAR is an open-source and open-standards incubator for Ham Radio" # this is the user name of the ActivityPub account. It will be the first part of your handle as @apUSer@domain apUser="FLEAR" +secondaryApHost="https://qoto.org" +secondaryApUser="FLEAR" repoUrl="https://git.qoto.org/flear" +siteRepoUrl="https://git.qoto.org/flear/flear-site" +siteEmail="flear@flear.org" diff --git a/layouts/index.activity_outbox.ajson b/layouts/index.activity_outbox.ajson index 9e7a4602bb8020ea371ac13c726a92a429d354f9..baa9b54f42541e77e6e811f3fb078d8943b455c6 100644 --- a/layouts/index.activity_outbox.ajson +++ b/layouts/index.activity_outbox.ajson @@ -25,13 +25,13 @@ "@context": "https://www.w3.org/ns/activitystreams", "id": "{{.Permalink}}-create", "type": "Create", - "actor": "https://flear.org/flear", + "actor": "{{ .Site.BaseURL }}{{ site.Params.apUser | lower}}", "object": { "id": "{{ .Permalink }}", "type": "Note", "content": "{{.Title}}<br><a href='{{.Permalink}}'>{{.Permalink}}</a>", "url": "{{.Permalink}}", - "attributedTo": "https://flear.org/flear", + "attributedTo": "{{ .Site.BaseURL }}{{ site.Params.apUser | lower}}", "to": "https://www.w3.org/ns/activitystreams#Public", "published": {{ dateFormat "2006-01-02T15:04:05-07:00" .Date | jsonify }} } diff --git a/layouts/partials/article_footer.html b/layouts/partials/article_footer.html index 38da5e103f755d51b38c5bdbfcc3d57bbb96e19b..fad1ff3a075847604ca8bc5092fe5874d68d2714 100644 --- a/layouts/partials/article_footer.html +++ b/layouts/partials/article_footer.html @@ -10,9 +10,9 @@ </div> {{ end }} <div class="widgets source"> -<a href="https://git.qoto.org/flear/flear-site/tree/master/content/{{.File.LogicalName}}" rel="nofollow">View Source</a> +<a href="{{ site.Params.siteRepoUrl }}/tree/master/content/{{.File.LogicalName}}" rel="nofollow">View Source</a> | -<a href="https://git.qoto.org/flear/flear-site/edit/master/content/{{.File.LogicalName}}" rel="nofollow">Make a correction</a> +<a href="{{ site.Params.siteRepoUrl }}/edit/master/content/{{.File.LogicalName}}" rel="nofollow">Make a correction</a> | -<a href="https://git.qoto.org/flear/flear-site/commits/master/content/{{.File.LogicalName}}" rel="nofollow">Correction history</a> +<a href="{{ site.Params.siteRepoUrl }}/commits/master/content/{{.File.LogicalName}}" rel="nofollow">Correction history</a> </div> diff --git a/layouts/partials/draft.html b/layouts/partials/draft.html index 13d709e0a4658037ef07c1e91ccf04d490e8137f..52f5a586c2f24baf8d232bc41a4c0df72c6ad73f 100644 --- a/layouts/partials/draft.html +++ b/layouts/partials/draft.html @@ -6,6 +6,6 @@ <p>There are many errors including and not limited to: spelling, grammatical, lack of ecosystem awareness understanding and plain ignorance.</p> <p>I am making it public to get feedback. You might completely disagree, you might agree violently. Either - way, teach me. I want to hear from you: (<a href="mailto:flear@flear.org">Email</a>, <a - href="https://twitter.com/@FLEAR_radio/">@FLEAR_radio</a>.)</p> + way, teach me. I want to hear from you: (<a href="mailto:{{ site.Params.siteEmail }}">Email</a>, <a + href="https://twitter.com/@{{ site.Params.twitterUser }}/">@{{ site.Params.twitterUser }}</a>.)</p> </div> diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html index 2d038c8fc157fbca03964fa6c03b102bf323d514..260d9e6b1e05ae9c9d5481567026e922b813a5ac 100644 --- a/layouts/partials/menu.html +++ b/layouts/partials/menu.html @@ -2,8 +2,8 @@ <div class="navbar__inner"> <div class="navbar__items navbar__items--left navbarItems_1xGM"> <a aria-current="page" class="navbar__brand active" href="/"> - <img class="navbar__logo logo--light" src="/images/logo-header-light.png" alt="FLEAR"> - <img class="navbar__logo logo--dark" src="/images/logo-header-dark.png" alt="FLEAR"> + <img class="navbar__logo logo--light" src="/images/logo-header-light.png" alt="{{ site.Params.siteName }}"> + <img class="navbar__logo logo--dark" src="/images/logo-header-dark.png" alt="{{ site.Params.siteName }}"> </a> <div aria-label="Navigation bar toggle" class="navbar__toggle" role="button" tabindex="0"> <svg xmlns="http://www.w3.org/2000/svg" width="30" height="30" viewBox="0 0 30 30" role="img" focusable="false"> diff --git a/layouts/partials/microblog.html b/layouts/partials/microblog.html index 8607a2e545918e9346352d1bf08daf1364b82e24..3ece7ebaf26c720267f8594bbf62f606eaa8c6dc 100644 --- a/layouts/partials/microblog.html +++ b/layouts/partials/microblog.html @@ -1,8 +1,8 @@ <div class='menu microblog'> <span class='menu-heading'> Microblog </span> - <iframe allowfullscreen sandbox="allow-top-navigation allow-scripts allow-popups allow-popups-to-escape-sandbox" style='border-width: 0' width='100%' height="800" src="https://www.mastofeed.com/apiv2/feed?userurl=https%3A%2F%2Fqoto.org%2Fusers%2FFLEAR&theme=light&size=80&header=false&replies=false&boosts=false"></iframe> + <iframe allowfullscreen sandbox="allow-top-navigation allow-scripts allow-popups allow-popups-to-escape-sandbox" style='border-width: 0' width='100%' height="800" src="https://www.mastofeed.com/apiv2/feed?userurl=https%3A%2F%2F{{ (urls.Parse site.Params.secondaryApHost).Hostname }}%2Fusers%2F{{ site.Params.secondaryApUser }}&theme=light&size=80&header=false&replies=false&boosts=false"></iframe> <div class="fill-vert"></div> <div class="more"> - <a class='btn btn-default btn-m pull-right' href='https://qoto.org/@FLEAR/' style='align:right;text-align: right;align-content: right;'>More ... </a> + <a class='btn btn-default btn-m pull-right' href='{{ site.Params.secondaryApHost }}/@{{ site.Params.secondaryApUser }}/' style='align:right;text-align: right;align-content: right;'>More ... </a> </div> </div> diff --git a/layouts/shortcodes/list.html b/layouts/shortcodes/list.html deleted file mode 100644 index e25001f13b253a275dae9d149ad4df6edef76d78..0000000000000000000000000000000000000000 --- a/layouts/shortcodes/list.html +++ /dev/null @@ -1,56 +0,0 @@ -{{ partial "head.html" . }} - -<body class="list"> - <header class="me"> - <div> - <img src="/images/logo.png" alt="A dashing picture of FLEAR."> - <h1>Hello.</h1> - <h2>I am FLEAR.</h2> - <h3>Lead and Manager for Chrome Developer Relations.</h3> - <p>I love the web. The web should allow anyone to access any experience that they need without the need for native install or content walled garden.</p> - </div> - </header> - <div> - <main> -{{ $paginator := .Paginate (where .Site.Pages "Type" "page") }} -{{ range $index, $element := $paginator.Pages }} - <div class="post"> - <header class="{{ if .Params.image_header }}with-background{{end}}" style="{{ if .Params.image_header }}background-image: url('{{ .Params.image_header }}'); {{end}}"> - <h3><a href="{{ .Permalink }}">{{ .Title}}</a></h3> - </header> - <div class="description"> - <div class="author"> - <div> - <strong>FLEAR</strong> - <span><time pubdate>{{ .Date.Format "January 2 2006" }}</time></span> - </div> - </div> - <p>{{ if .Description }}{{ .Description | html }}{{ else }}{{ .Summary }}{{ end }}</p> - <div style="text-align: right;"> - <a class="read-more" href="{{ .Permalink }}"> - Read More - </a> - </div> - </div> - </div> - {{ if eq $index 0 }} - - {{end}} -{{ end }} - - <nav style="text-align: center"> - <div> - {{ if .Paginator.HasPrev }} - <a href="{{ .Paginator.Prev.URL }}">Previous</a> - {{ end }} - | - {{ if .Paginator.HasNext }} - <a href="{{ .Paginator.Next.URL }}">More</a> - {{ end }} - </div> - </nav> - </main> - </div> - - </body> - </html> \ No newline at end of file diff --git a/static/manifest.json b/static/manifest.json index 9a66d08909905268b42965b3b497f653e9f8d184..4e941666f124d2f08d34e3d520b664bbb4165f1b 100644 --- a/static/manifest.json +++ b/static/manifest.json @@ -1,6 +1,6 @@ { "name": "FLEAR - Free & Libre Engineers for Amateur Radio", - "short_name": "Modern Web Dev with PK", + "short_name": FLEAR", "description": "The website of FLEAR, Free & Libre Engineers for Amateur Radio.", "start_url": "/?homescreen=1", "theme_color": "#000000",