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

Lotusdocs #146

Merged
merged 27 commits into from
Aug 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
138a281
feat(theme): switch to lotusdocs theme
Apr 2, 2024
18275ec
fix(config): use correct path for menu links
noxilixon Aug 7, 2024
df2cfe1
feat(img): use next gen image formats
noxilixon Aug 7, 2024
f53d9f6
chore(head): remove unused inports
noxilixon Aug 7, 2024
de8a266
fix(theme): add spacingf for mobile navbar
noxilixon Aug 7, 2024
6236fd3
fix(img): add sizes to prevent layout shifts
noxilixon Aug 7, 2024
2bcb132
feat(style): minimize css and optimize load
noxilixon Aug 8, 2024
960f112
fix(img): convert all images to new gen formats
noxilixon Aug 8, 2024
836ece6
fix(workflow): remove whitespace and config js linter
noxilixon Aug 8, 2024
e5eee47
fix(postcss): add missing classes to safelist
noxilixon Aug 8, 2024
108caa4
feat(head): fill title and description dynamically
noxilixon Aug 8, 2024
c79860d
fix(linting): add ignores to eslint
noxilixon Aug 8, 2024
e46350a
fix(link): add missing slash to home link
noxilixon Aug 8, 2024
e0cc351
feat(favico): add favicon in ico format
noxilixon Aug 8, 2024
2a088f7
fix(link): set correct link to home in nav
noxilixon Aug 8, 2024
4aa88da
fix(link): add missing lash to links in nav
noxilixon Aug 8, 2024
8528627
feat(img): optimize image loading priority
noxilixon Aug 8, 2024
221d344
fix(link): reenable underlines for accessibility
noxilixon Aug 8, 2024
245dade
feat(colors): make theme colores customizable
noxilixon Aug 8, 2024
79b795c
fix(workflow): disable linting for the theme scss files
noxilixon Aug 8, 2024
5009f36
fix(pwa): set empty webmanifest to overwrite theme defaults
noxilixon Aug 8, 2024
1c2a92a
fix(text): reduce line length for readability
noxilixon Aug 9, 2024
d7e47b9
fix(nav): set correct wiki link
noxilixon Aug 10, 2024
3b621be
fix(layout): minimize contet width
noxilixon Aug 13, 2024
cab495f
fix(head): readd descriptions
noxilixon Aug 13, 2024
ccee73f
fix(header): remove color and reduce contrast from header image
noxilixon Aug 16, 2024
8bc7370
feat(head): add canonical self reference
noxilixon Aug 16, 2024
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
6 changes: 5 additions & 1 deletion .github/linters/.eslintrc.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
---
ignorePatterns: ["layouts/page/single.json"]
ignorePatterns: ["layouts/page/single.json", "package.json", "package-lock.json", "assets/js/bootstrap.js"]
parserOptions:
ecmaVersion: latest
env:
es6: true
12 changes: 11 additions & 1 deletion .github/workflows/deploy-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,21 @@ jobs:
fetch-depth: 0

- name: Setup Hugo
uses: peaceiris/actions-hugo@v2
uses: peaceiris/actions-hugo@v3
with:
hugo-version: '0.121.2'
extended: true

- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: '20'
cache: 'npm'
cache-dependency-path: '**/package-lock.json'

- name: Prepare npm
run: npm ci

- name: Build
env:
HUGO_ENV: production
Expand Down
10 changes: 10 additions & 0 deletions .github/workflows/deploy-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,16 @@ jobs:
hugo-version: '0.121.2'
extended: true

- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: '20'
cache: 'npm'
cache-dependency-path: '**/package-lock.json'

- name: Prepare npm
run: npm ci

- name: Build
env:
HUGO_ENV: production
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ jobs:
# Disable some other linters
VALIDATE_HTML: false
VALIDATE_NATURAL_LANGUAGE: false
VALIDATE_CSS: false
# Change to 'main' if your main branch differs
DEFAULT_BRANCH: main
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@ public/
resources/_gen/
www/
www-dev/
assets/jsconfig.json
node_modules
hugo_stats.json
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "themes/ananke"]
path = themes/ananke
url = https://github.com/theNewDynamic/gohugo-theme-ananke.git
[submodule "themes/lotusdocs"]
path = themes/lotusdocs
url = https://github.com/colinwilson/lotusdocs
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ The website is built using the static website generator Hugo.

- Clone this repository
- Load submodule with `git submodule init` and `git submodule update`
- Install [Hugo](https://gohugo.io/installation/)
- Install [Hugo](https://gohugo.io/installation/) (>=0.120.0)
- Install [Node](https://nodejs.org/en/download/package-manager/current) (>=20)
- Load js dependencies with `npm install`

## Run for development

Expand Down
4 changes: 2 additions & 2 deletions apache/dev.website.conf
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

DocumentRoot /var/www/berlin.freifunk.net/www-dev

Header set Content-Security-Policy "script-src dev.berlin.freifunk.net"
Header set Strict-Transport-Security "max-age=63072000; includeSubDomains"
Header set Content-Security-Policy "script-src 'self' 'unsafe-hashes' 'sha256-NPQiAFHfOX//546/pLtrKoVL9QjRuPsCI+6doZczyyI=' 'sha256-Q0IcZn6UWrfGL+BOcG44ffINe7v5Wq/gTHBbunlNOJQ='"
Header set Strict-Transport-Security "max-age=63072000; includeSubDomains"

<Directory "/var/www/berlin.freifunk.net/www-dev">
Options FollowSymLinks
Expand Down
14 changes: 7 additions & 7 deletions apache/website.conf
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
</VirtualHost>

<VirtualHost *:443>
ServerName www.berlin.freifunk.net
ServerName www.berlin.freifunk.net
ServerAdmin "info@berlin.freifunk.net"
SSLEngine on
SSLEngine on
SSLCertificateFile /etc/letsencrypt/live/www.berlin.freifunk.net/cert.pem
SSLCertificateChainFile /etc/letsencrypt/live/www.berlin.freifunk.net/chain.pem
SSLCertificateKeyFile /etc/letsencrypt/live/www.berlin.freifunk.net/privkey.pem
Expand Down Expand Up @@ -57,7 +57,7 @@
</VirtualHost>

<VirtualHost *:80>
ServerName www.berlin.freifunk.net
ServerName www.berlin.freifunk.net
ServerAdmin "info@berlin.freifunk.net"

RewriteEngine On
Expand All @@ -75,7 +75,7 @@
<VirtualHost *:443>
ServerName berlin.freifunk.net
ServerAdmin "info@berlin.freifunk.net"
SSLEngine on
SSLEngine on
SSLCertificateFile /etc/letsencrypt/live/berlin.freifunk.net/cert.pem
SSLCertificateChainFile /etc/letsencrypt/live/berlin.freifunk.net/chain.pem
SSLCertificateKeyFile /etc/letsencrypt/live/berlin.freifunk.net/privkey.pem
Expand All @@ -102,8 +102,8 @@
Header always merge Vary "Accept-Language"
</LocationMatch>

Header set Content-Security-Policy "script-src berlin.freifunk.net"
Header set Strict-Transport-Security "max-age=63072000; includeSubDomains"
Header set Content-Security-Policy "script-src berlin.freifunk.net"
Header set Strict-Transport-Security "max-age=63072000; includeSubDomains"

<Directory "/var/www/berlin.freifunk.net/www">
Options FollowSymLinks
Expand All @@ -113,4 +113,4 @@

ErrorLog "/var/log/apache2/berlin.freifunk.net-error.log"
CustomLog "/var/log/apache2/berlin.freifunk.net-access.log" combined
</VirtualHost>
</VirtualHost>
Binary file added assets/images/header.webp
Binary file not shown.
30 changes: 30 additions & 0 deletions assets/images/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions assets/js/bootstrap.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
//
// Overwriting the theme file to activate component
//

// Import the Bootstrap components we want to use.
// See https://github.com/twbs/bootstrap/blob/main/js/index.umd.js
// eslint-disable-next-line import/no-absolute-path
import Tab from '/js/bootstrap/src/tab'
// eslint-disable-next-line import/no-absolute-path
import Dropdown from '/js/bootstrap/src/dropdown'

export default {
Tab,
Dropdown
}
Loading
Loading