Compare commits

..

No commits in common. "main" and "main" have entirely different histories.
main ... main

19 changed files with 115 additions and 62 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1,41 +1,34 @@
@font-face {
font-family: 'Manrope XLight';
src: url('/assets/Manrope/Manrope-ExtraLight.woff2') format('woff2'),
url('/assets/Manrope/Manrope-ExtraLight.ttf') format('truetype');
src: url('/assets/Manrope/Manrope-ExtraLight.ttf');
}
@font-face {
font-family: 'Manrope Light';
src: url('/assets/Manrope/Manrope-Light.woff2') format('woff2'),
url('/assets/Manrope/Manrope-Light.ttf') format('truetype');
src: url('/assets/Manrope/Manrope-Light.ttf');
}
@font-face {
font-family: 'Manrope Regular';
src: url('/assets/Manrope/Manrope-Regular.woff2') format('woff2'),
url('/assets/Manrope/Manrope-Regular.ttf') format('truetype');
src: url('/assets/Manrope/Manrope-Regular.ttf');
}
@font-face {
font-family: 'Manrope Medium';
src: url('/assets/Manrope/Manrope-Medium.woff2') format('woff2'),
url('/assets/Manrope/Manrope-Medium.ttf') format('truetype');
src: url('/assets/Manrope/Manrope-Medium.ttf');
}
@font-face {
font-family: 'Manrope SemiBold';
src: url('/assets/Manrope/Manrope-SemiBold.woff2') format('woff2'),
url('/assets/Manrope/Manrope-SemiBold.ttf') format('truetype');
src: url('/assets/Manrope/Manrope-SemiBold.ttf');
}
@font-face {
font-family: 'Manrope Bold';
src: url('/assets/Manrope/Manrope-Bold.woff2') format('woff2'),
url('/assets/Manrope/Manrope-Bold.ttf') format('truetype');
src: url('/assets/Manrope/Manrope-Bold.ttf');
}
@font-face {
font-family: 'Manrope XBold';
src: url('/assets/Manrope/Manrope-ExtraBold.woff2') format('woff2'),
url('/assets/Manrope/Manrope-ExtraBold.ttf') format('truetype');
src: url('/assets/Manrope/Manrope-ExtraBold.ttf');
}

51
assets/misc/pgp/furo.txt Normal file
View File

@ -0,0 +1,51 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
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
kKfOoosCQaJJaA9n4ho=
=xu1D
-----END PGP PUBLIC KEY BLOCK-----

View File

@ -8,3 +8,13 @@ c0daeef1 2d9d3f23 af11e067 bceba7c5 c4a2de4c d51c8d39 a6f55a95 5a795b62
Gajim (Laptop)
7c67362d 62209cba 032f8db1 8b36270f 5ca4002d f64b5c3f 63bfe3de acdbc50d
- - - *** *** *** *** - - -
- - - furo@qwik.space - - -
Blabber (Phone)
61df76d4 4b02e525 c8b3a965 1990ac82 9ce64ee4 ca2521ba 2e49c367 da56be01
Dino (Computer)
c18a3079 eba2f940 e778db00 0c4dfec5 df8fb7ad 36bef249 b0c0751c d893a124
- - - *** *** *** *** - - -

View File

@ -1,9 +1,8 @@
<!DOCTYPE html>
<html lang="en">
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.w3.org/MarkUp/SCHEMA/xhtml11.xsd" xml:lang="en">
<head>
{% include "templates/defaultTags.njk" %}
<link rel="stylesheet" type="text/css" href="/assets/css/sitemap.css">
<link rel="stylesheet" type="text/css" href="/assets/css/sitemap.css" />
<title>Site Map</title>
</head>
<body>

View File

@ -3,7 +3,7 @@
{% import "components/color.njk" as color with context %}
{% block head %}
<link rel="stylesheet" type="text/css" href="/assets/css/graphical-profile.css">
<link rel="stylesheet" type="text/css" href="/assets/css/graphical-profile.css" />
<title>qwik - colours</title>
{% endblock %}

View File

@ -1,14 +1,13 @@
<!DOCTYPE html>
<html lang="en">
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.w3.org/MarkUp/SCHEMA/xhtml11.xsd" xml:lang="en">
<head>
{% include "templates/defaultTags.njk" %}
<link rel="stylesheet" type="text/css" href="/assets/css/landing.css">
<link rel="stylesheet" type="text/css" href="/assets/css/landing.css" />
<title>qwik</title>
</head>
<body>
<div id="header">
<img class="logo" src="/assets/images/logo.svg" alt="qwik logo">
<img class="logo" src="/assets/images/logo.svg" alt="qwik logo" />
<h1>
Welcome to <span style="color: var(--primary)">qwik</span><span style="color: var(--accent)">.</span><span style="color: var(--primary)">space</span>!
</h1>
@ -154,7 +153,13 @@
<div class="contact-options">
<p class="contact-type">XMPP</p>
<p>furo@qwik.space</p>
<p>furo@qwik.space (<a href="/assets/misc/xmpp-omemo-fingerprints.txt">Fingerprints</a>)</p>
<p class="contact-type">I2P Mail</p>
<p>furo@mail.i2p</p>
<p class="contact-type">Email</p>
<p>furo@i2pmail.org (<a href="/assets/misc/pgp/furo.txt">PGP</a>)</p>
</div>
</div>
</div>
@ -223,4 +228,4 @@ git: i4kemzfhct7rki53w5mqtrnb4ixgp66fefgy6752emogkbldtifa.b32.i2p
blog: 4zmuywwjpnmighhtu2tz33iitsbotfzhqbtbdmrkc5uxujcrj5qa.b32.i2p
#}
#}

View File

@ -1,10 +1,9 @@
<!DOCTYPE html>
<html lang="en">
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.w3.org/MarkUp/SCHEMA/xhtml11.xsd" xml:lang="en">
<head>
{% include "./defaultTags.njk" %}
<link rel="stylesheet" href="/assets/css/article.css">
<link rel="stylesheet" href="/assets/css/syntax.css">
<link rel="stylesheet" href="/assets/css/article.css" />
<link rel="stylesheet" href="/assets/css/syntax.css" />
{% block head %}
<title>{{ serverName }}</title>
{% endblock %}

View File

@ -1,10 +1,9 @@
<!DOCTYPE html>
<html lang="en">
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.w3.org/MarkUp/SCHEMA/xhtml11.xsd" xml:lang="en">
<head>
{% include "./defaultTags.njk" %}
<link rel="stylesheet" href="/assets/css/article.css">
<link rel="stylesheet" href="/assets/css/syntax.css">
<link rel="stylesheet" href="/assets/css/article.css" />
<link rel="stylesheet" href="/assets/css/syntax.css" />
{% block head %}
<title>{{ serverName }}</title>
{% endblock %}

View File

@ -1,17 +1,17 @@
<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="Content-Type" content="application/xhtml+xml;charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="apple-touch-icon" sizes="180x180" href="/assets/favicons/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/assets/favicons/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/assets/favicons/favicon-16x16.png">
<link rel="manifest" href="/assets/favicons/site.webmanifest">
<link rel="mask-icon" href="/assets/favicons/safari-pinned-tab.svg" color="#3ddf89">
<link rel="shortcut icon" href="/assets/favicons/favicon.ico">
<meta name="msapplication-TileColor" content="#181833">
<meta name="msapplication-config" content="/assets/favicons/browserconfig.xml">
<meta name="theme-color" content="#3ddf89">
<link rel="apple-touch-icon" sizes="180x180" href="/assets/favicons/apple-touch-icon.png" />
<link rel="icon" type="image/png" sizes="32x32" href="/assets/favicons/favicon-32x32.png" />
<link rel="icon" type="image/png" sizes="16x16" href="/assets/favicons/favicon-16x16.png" />
<link rel="manifest" href="/assets/favicons/site.webmanifest" />
<link rel="mask-icon" href="/assets/favicons/safari-pinned-tab.svg" color="#3ddf89" />
<link rel="shortcut icon" href="/assets/favicons/favicon.ico" />
<meta name="msapplication-TileColor" content="#181833" />
<meta name="msapplication-config" content="/assets/favicons/browserconfig.xml" />
<meta name="theme-color" content="#3ddf89" />
<link rel="stylesheet" type="text/css" href="/assets/css/scaling.css">
<link rel="stylesheet" type="text/css" href="/assets/css/colors.css">
<link rel="stylesheet" type="text/css" href="/assets/css/fonts.css">
<link rel="stylesheet" type="text/css" href="/assets/css/theme.css">
<link rel="stylesheet" type="text/css" href="/assets/css/scaling.css" />
<link rel="stylesheet" type="text/css" href="/assets/css/colors.css" />
<link rel="stylesheet" type="text/css" href="/assets/css/fonts.css" />
<link rel="stylesheet" type="text/css" href="/assets/css/theme.css" />

View File

@ -1,10 +1,9 @@
<!DOCTYPE html>
<html lang="en">
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.w3.org/MarkUp/SCHEMA/xhtml11.xsd" xml:lang="en">
<head>
{% include "templates/defaultTags.njk" %}
<link rel="stylesheet" href="/assets/css/article.css">
<link rel="stylesheet" href="/assets/css/syntax.css">
<link rel="stylesheet" href="/assets/css/article.css" />
<link rel="stylesheet" href="/assets/css/syntax.css" />
<title>{{ externalMeta.title if externalMeta.title else serverName }}</title>
</head>
<body>

View File

@ -1,5 +1,5 @@
import njkMarkdown from 'nunjucks-markdown'
import { marked } from 'marked'
import marked from 'marked'
import { markedRenderer } from './markedRenderer.js'
import { utils } from './utils/utils.js'
@ -24,9 +24,7 @@ export function nunjacksConfig(njk, express, Config) {
marked.use({
gfm: true, // Use GitHub formatting?
renderer: markedRenderer, // Use my own custom rendering for som tags
mangle: false, // Remove deprecated warning
headerIds: false, // Remove deprecated warning
headerPrefix: false // Remove deprecated warning
xhtml: true // Use XHTML for extra GAINZ!
})
// Let nunjucks use markdown.

View File

@ -9,7 +9,7 @@
},
"repository": {
"type": "git",
"url": "https://git.qwik.space/qwik/qwik-cms"
"url": "https://git.qwik.space/BurnyLlama/qwik-cms"
},
"keywords": [
"cms"
@ -21,7 +21,7 @@
"express": "^4.17.1",
"highlight.js": "^11.2.0",
"jsdom": "^16.7.0",
"marked": "^6.0.0",
"marked": "^2.1.3",
"nunjucks": "^3.2.3",
"nunjucks-markdown": "^2.0.1"
}