diff --git a/.vscode/settings.json b/.vscode/settings.json
index d236830..58d4ee8 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,5 +1,6 @@
{
"yaml.schemas": {
- "https://raw.githubusercontent.com/woodpecker-ci/woodpecker/master/pipeline/schema/schema.json": "file:///home/laura/git/lila-network-website/static/.woodpecker/deploy.yml"
+ "https://raw.githubusercontent.com/woodpecker-ci/woodpecker/master/pipeline/schema/schema.json": "file:///home/laura/git/lila-network-website/static/.woodpecker/deploy.yml",
+ "https://raw.githubusercontent.com/woodpecker-ci/woodpecker/main/pipeline/frontend/yaml/linter/schema/schema.json": "file:///Users/laura/git/lila.network/lila-website/.woodpecker/deploy.yml"
}
-}
\ No newline at end of file
+}
diff --git a/.woodpecker/deploy.yml b/.woodpecker/deploy.yml
index dea513f..9fd2a81 100644
--- a/.woodpecker/deploy.yml
+++ b/.woodpecker/deploy.yml
@@ -1,49 +1,47 @@
-# hugo.yml
-#
-# Takes a repository with Hugo source, generates the static site and
-# pushes the result to Codeberg pages
-#
-# Needs a codeberg access token (codeberg_token) as a secret in Woodpecker config
-# Also uses another secret (mail) with email address for git config
-#
-# .domains file in the repository is copied to the output branch so custom domains work
-#
-# The HUGO_OUTPUT variable must be set to the build output folder configured in Hugo
-#
-
-# Exclude page pipeline to be run on "pages" branch
-#when:
-# branch:
-# exclude: pages
-
-# Recursive cloning is used to fully clone the themes given as Git submodules
-clone:
- git:
- image: woodpeckerci/plugin-git
- settings:
- recursive: true
-
steps:
- # Build hugo static files
build:
- image: golang:1.21-bookworm
+ image: golang:1.22-bookworm
environment:
- - HUGO_VERSION=0.120.4
+ - HUGO_VERSION=0.123.4
+ - TZ=Europe/Berlin
when:
- event: push
+ - event: push
+ branch: [main, staging]
commands:
- wget https://github.com/gohugoio/hugo/releases/download/v$${HUGO_VERSION}/hugo_extended_$${HUGO_VERSION}_linux-amd64.deb && apt install ./hugo_extended_$${HUGO_VERSION}_linux-amd64.deb && rm -f hugo_extended_$${HUGO_VERSION}_linux-amd64.deb
- hugo --minify --destination ./public
-
- netlify-deploy:
- image: node:alpine
- when:
- event: push
+ upload:
+ image: alpine:latest
secrets:
- - NETLIFY_AUTH_TOKEN
- - NETLIFY_SITE_ID
+ - RSYNC_SSHKEY
+ - RSYNC_TARGET_SERVER
+ - RSYNC_TARGET_USER
+ environment:
+ - TARGET_PATH=/webroot/adora.codes
+ when:
+ - event: push
+ branch: main
commands:
- - npm install netlify-cli -g
- - cd public
- - netlify deploy --prod --dir .
\ No newline at end of file
+ - apk add --update --no-cache openssh rsync git
+ - mkdir -p $HOME/.ssh
+ - echo "$RSYNC_SSHKEY" > $HOME/.ssh/id_ed25519
+ - chmod 0600 $HOME/.ssh/id_ed25519
+ - ssh-keyscan -t ed25519 $RSYNC_TARGET_SERVER >> $HOME/.ssh/known_hosts
+ - rsync -avh --delete ./public/ $RSYNC_TARGET_USER@$RSYNC_TARGET_SERVER:$TARGET_PATH
+
+
+
+ #deploy-production:
+ # # image: node:alpine
+ # image: lauralani/netlify-cli:latest
+ # pull: true
+ # when:
+ # - event: push
+ # branch: main
+ # secrets:
+ # - NETLIFY_AUTH_TOKEN
+ # - NETLIFY_SITE_ID
+ # commands:
+ # # - npm install netlify-cli -g
+ # - netlify deploy --prod --dir ./public
diff --git a/hugo.toml b/hugo.toml
index 9708747..ba10850 100644
--- a/hugo.toml
+++ b/hugo.toml
@@ -3,23 +3,27 @@ languageCode = "en"
defaultContentLanguage = "en"
theme = "lynx"
title = "lila.network"
-copyright = "Built by [@lauralani@lila.network](https://social.lila.network/@lauralani), hosted at [Codeberg](https://codeberg.org/lila-network/website)"
+copyright = "Built by [✨ Adora ✨](https://social.lila.network/@lauralani), source code available at [code.lila.network/lila-network/website](https://code.lila.network/lila-network/website) and hosted by Netlify"
enableEmoji = true
disableKinds = [ "taxonomy", "term" ]
[author]
name = "lila.network"
-headline = "A network of awesome people"
+headline = "Services available for use by you awesome lot <3"
image = "img/purple-heart.png" # path relative to static directory
links = [
- { mastodon = { href = "https://social.lila.network", text = "Fediverse Mastodon Instance" } },
- { forgejo = { href = "https://code.lila.network", text = "Purple Forgejo Git Instance" } },
- { custom-ci = { href = "https://ci.lila.network", text = "lila.network Continuous Integration" } },
- { nextcloud = { href = "https://cloud.lila.network", text = "lila.network Nextcloud" } },
-
- { custom-status = { href = "https://status.lila.network", text = "lila.network Status Page" } },
+ { immich = { href = "https://photos.lila.network", text = "[SSO] Photo Gallery (https://photos.lila.network)"} },
+ { mealie = { href = "https://mealie.lila.network", text = "[SSO] Cookbook (https://mealie.lila.network)"} },
+ { paperless = { href = "https://paperless.lila.network", text = "[SSO] Document Store (https://paperless.lila.network)"} },
+ { grafana = { href = "https://grafana.lila.network", text = "[SSO] Monitoring System (https://grafana.lila.network)"} },
+ { games = { href = "https://games.lila.network", text = "🎮 [SSO] Game Status Page (https://games.lila.network)"} },
+ { nextcloud = { href = "https://cloud.lila.network", text = "Nextcloud (https://cloud.lila.network)"} },
+ { mastodon = { href = "https://social.lila.network", text = "Mastodon (https://social.lila.network)"} },
+ { git = { href = "https://code.lila.network", text = "Source Code Management (https://code.lila.network)"} },
+ { ci = { href = "https://ci.lila.network", text = "Continuous Integration (https://ci.lila.network)"} },
+ { status = { href = "https://status.lila.network", text = "Service Status Page (https://status.lila.network)" } },
]
[module.hugoVersion]
diff --git a/themes/lynx/assets/css/custom.css b/themes/lynx/assets/css/custom.css
index 29b555a..884aba5 100644
--- a/themes/lynx/assets/css/custom.css
+++ b/themes/lynx/assets/css/custom.css
@@ -1,14 +1,36 @@
-.link-custom-status {
- background: linear-gradient(45deg,
- rgba(131, 58, 180, 1) 25%,
- rgb(253, 29, 29) 100%);
-}
-
-.link-custom-ci {
+.link-ci {
background: green;
}
.link-nextcloud {
background: #007bc0;
-}
\ No newline at end of file
+}
+
+.link-immich {
+ background: #accbfa;
+ color: #242852;
+}
+
+.link-mealie {
+ background: #e58325;
+}
+
+.link-paperless {
+ background: #17541f;
+}
+
+.link-git {
+ background: #d40000;
+}
+
+.link-games {
+ background: #00ffff;
+ color: #0C356A;
+}
+
+.link-grafana {
+ background: linear-gradient(0deg,
+ #f05a28 25%,
+ #fabe0d 100%);
+}
diff --git a/themes/lynx/assets/icons/git.svg b/themes/lynx/assets/icons/git.svg
new file mode 100644
index 0000000..0bb6e80
--- /dev/null
+++ b/themes/lynx/assets/icons/git.svg
@@ -0,0 +1 @@
+
diff --git a/themes/lynx/assets/icons/lastfm.svg b/themes/lynx/assets/icons/lastfm.svg
index f0302e7..9c81fce 100644
--- a/themes/lynx/assets/icons/lastfm.svg
+++ b/themes/lynx/assets/icons/lastfm.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
diff --git a/themes/lynx/assets/icons/mealie.svg b/themes/lynx/assets/icons/mealie.svg
new file mode 100644
index 0000000..8703dd1
--- /dev/null
+++ b/themes/lynx/assets/icons/mealie.svg
@@ -0,0 +1 @@
+