Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port website to gohugo #21

Merged
merged 2 commits into from
May 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .envrc

This file was deleted.

22 changes: 9 additions & 13 deletions .github/workflows/pages.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Deploy Jekyll with GitHub Pages dependencies preinstalled
name: Deploy site with GitHub Pages

on:
push:
Expand All @@ -21,22 +21,18 @@ concurrency:
jobs:
# Build job
build:
runs-on: ubuntu-latest
# Hint: 'latest' == 22.04. Somebody forgot to update the alias.
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/checkout@v3
with:
python-version: '3.10'
- run: pip install -U pip
- run: pip install -r requirements.txt
- run: lektor build --output-path /tmp/lektor/
- name: Setup Pages
uses: actions/configure-pages@v1
- name: Upload artifact
uses: actions/upload-pages-artifact@v1
- run: sudo apt install hugo
- run: hugo
- uses: actions/configure-pages@v1
- uses: actions/upload-pages-artifact@v1
with:
path: /tmp/lektor/
path: public/

# Deployment job
deploy:
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
.venv
.hugo_build.lock
/public/
/resources/
/static/style.css
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# meta
Issue tracker for organizational matters and website

[![Build Status](https://travis-ci.org/pimutils/meta.svg?branch=master)](https://travis-ci.org/pimutils/meta)
Issue tracker for organizational matters and website

## pimutils.org

The pimutils website is a [Lektor](https://www.getlektor.com/) project. After installing Lektor you should be able to run the admin interface using ``lektor server``. Pushing your changes to master will automatically deploy via Travis to GitHub pages.
The pimutils website is a [hugo](https://gohugo.io/) project. After
installing hugo you should be able to run it using `hugo serve`.

The DNS is managed via Markus Unterwaditzer's (@untitaker) private accounts.
86 changes: 86 additions & 0 deletions assets/main.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
body {
font-family: "Open Sans", sans-serif;
margin: 50px 0;
}

a {
color: #33ba24;
}

a:hover {
color: #21e00d;
}

header {
background: #1e2e1c;
color: #efefef;
font-family: monospace;

h1 {
font-size: 2.7rem;
font-weight: normal;
margin: 0;
}

nav ul {
list-style: none;
margin: 0.4rem 0 0 0;
padding: 0;

li {
display: inline;
margin: 0 8px 0 0;
padding: 0;
}
}

a {
font-size: 1rem;
}
}

header,
footer {
padding: 20px 30px;
}

header,
footer,
p,
ul,
h1,
h2,
h3,
h4,
.blog-post {
max-width: 760px;
margin-left: auto;
margin-right: auto;
}

h1,
h2 {
font-weight: normal;
}

article {
h1,
h2,
h3,
h4 {
a {
color: black;
text-decoration: none;
}
a:hover {
color: black;
text-decoration: underline;
}
}
}

article {
li {
margin-left: 1rem;
}
}
49 changes: 0 additions & 49 deletions assets/static/style.css

This file was deleted.

6 changes: 0 additions & 6 deletions configs/atom.ini

This file was deleted.

5 changes: 5 additions & 0 deletions content/_index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pimutils is a suite of programs for managing contacts, calendars and tasks on the command line.

* [khal](https://github.com/pimutils/khal) is a command line interface calendar application
* [todoman](https://github.com/pimutils/todoman) is a command line interface tasks manager
* [vdirsyncer](https://github.com/pimutils/vdirsyncer) can synchronize calendar data, including data from khal and todoman
11 changes: 11 additions & 0 deletions content/blog/2017-02-20-first-post.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
layout: post
title: Hello Website
date: 2017-02-20
categories: blog
url: /blog/first-post/
params:
author: The pimutils members
---

This is an example blog post. Not much here but that's not the point :)
3 changes: 0 additions & 3 deletions content/blog/contents.lr

This file was deleted.

9 changes: 0 additions & 9 deletions content/blog/first-post/contents.lr

This file was deleted.

7 changes: 2 additions & 5 deletions content/coc/contents.lr → content/coc.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
_model: page
---
title: Code of Conduct
permalink: /coc/
---
_slug:
---
body:

### The Project Maintainers

- [Hugo Osvaldo Barrera](https://github.com/WhyNotHugo)
- [Hugo Osvaldo Barrera](https://whynothugo.nl)
- [Christian Geier](https://github.com/geier)
- [Markus Unterwaditzer](https://github.com/untitaker)

Expand Down
9 changes: 4 additions & 5 deletions content/contact/contents.lr → content/contact.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
_model: page
---
title: Contact
permalink: /contact/
---
body:

### GitHub issues
## GitHub issues

For development coordination and questions, please use the GitHub issue
trackers listed on the [home page](/).

### Email
## Email

For conversations of private and *urgent* nature (such as security issues or
violations of the [CoC](/coc/)) please write to `[email protected]`.
Expand All @@ -18,7 +17,7 @@ Geier](https://github.com/geier), [Hugo Osvaldo
Barrera](https://whynothugo.nl) and [Markus
Unterwaditzer](https://github.com/untitaker/).

### IRC
## IRC

While GitHub issues are our primary way to coordinate development, we also use
IRC for off-topic chatter, or when communication needs to happen in real-time.
Expand Down
9 changes: 0 additions & 9 deletions content/contents.lr

This file was deleted.

23 changes: 23 additions & 0 deletions content/thanks.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
---
title: Thanks
permalink: /thanks/
---

## Fastmail

![Fastmail's logo](/static/fastmail-badge.png)

**[Fastmail]** is a paid, hosted email provider with address book and calendar
functionality. They use [Cyrus IMAP] and provide us with a free account with
which we run our vdirsyncer test suite. Thanks!

[FastMail]: https://www.fastmail.com/
[Cyrus IMAP]: https://www.cyrusimap.org/

## Packagecloud

![Packagecloud's logo](/static/packagecloud-badge.png)

**[Packagecloud](https://packagecloud.io/)** is a service to host all kinds of
package repositories. We use their open source plan to host our Debian packages
for vdirsyncer. Thanks!
17 changes: 0 additions & 17 deletions content/thanks/contents.lr

This file was deleted.

7 changes: 7 additions & 0 deletions hugo.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
baseURL: 'https://pimutils.org/'
languageCode: 'en-gb'
title: 'pimutils: utilities for personal information management'

taxonomies:
author: authors
tag: tags
1 change: 1 addition & 0 deletions layouts/_default/_markup/render-heading.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<h{{ .Level }} id="{{ .Anchor | safeURL }}"><a href="#{{ .Anchor | safeURL }}">{{ .Text | safeHTML }}</a></h{{ .Level }}>
42 changes: 42 additions & 0 deletions layouts/_default/baseof.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<!doctype html>

<html lang="{{ .Site.LanguageCode }}">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />

<title>{{ partial "title.html" $ }}</title>

<link rel="canonical" href="{{ .Permalink }}" />

<!-- TODO: feed must be in feed.xml for backwards compat -->
{{ with .OutputFormats.Get "rss" -}} {{ printf `
<link rel="%s" type="%s" href="%s" title="%s" />
` .Rel .MediaType.Type .Permalink $.Site.Title | safeHTML }} {{ end -}} {{
$style := resources.Get "main.scss" | resources.ToCSS | resources.Minify |
resources.Fingerprint }}
<link rel="stylesheet" href="{{ $style.RelPermalink }}" />
</head>

<body class="{{ .Kind }}">
<header>
<h1>pimutils</h1>
<nav>
<ul>
<li><a href="/">Home</a></li>
<li><a href="/thanks/">Thanks</a></li>
<li><a href="/contact/">Contact</a></li>
<li><a href="/blog/">Blog</a></li>
<li><a href="/coc/">Code of Conduct</a></li>
</ul>
</nav>
</header>

{{ block "main" . }} Content for each page will end up here. {{ end }}

<footer>
Copyright &copy; 2017-2024
<a href="/contact/">the pimutils members</a>.
</footer>
</body>
</html>
8 changes: 8 additions & 0 deletions layouts/_default/single.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{{ define "main" }}
<h1>{{ .Title }}</h1>

<article>
{{ .Content }}
</article>

{{ end }}
Loading
Loading