17 Commits

Author SHA1 Message Date
Thilo Hohlt
084ab000bb Merge pull request #32 from archtika/devel
Update npm dependencies
2025-03-23 17:37:47 +01:00
thiloho
d06664931a Update npm deps hash 2025-03-23 17:27:25 +01:00
thiloho
9d06ab96cc Update npm dependencies 2025-03-23 17:17:21 +01:00
Thilo Hohlt
d8b471764c Merge pull request #31 from archtika/devel
Render line breaks in change log and add more usernames to the blacklist
2025-03-23 15:43:24 +01:00
thiloho
3f59fd4c58 Add more usernames to the blacklist 2025-03-23 14:49:13 +01:00
thiloho
20bcd84d7e Render line breaks in change lot HTML representation 2025-03-23 14:25:15 +01:00
Thilo Hohlt
09f1b1c533 Merge pull request #30 from archtika/devel
Update flake and use remote Nix module from nixpkgs
2025-03-09 17:37:05 +01:00
thiloho
f85a7b3023 Update NPM deps hash 2025-03-09 17:24:50 +01:00
thiloho
f5125e11ba Use remote Nix flake module for archtika instead of local one 2025-03-09 16:52:05 +01:00
thiloho
4afd58c24d Update flake 2025-03-09 16:37:01 +01:00
thiloho
c76c5cc0a3 Allow the postgres user to connect to the postgres database 2025-02-07 04:13:50 +01:00
thiloho
c7f912947a Restrict module postgres settings to archtika database 2025-02-07 03:55:28 +01:00
Thilo Hohlt
33acb2578c Merge pull request #29 from archtika/devel
Refactoring and small improvements
2025-01-30 00:36:47 +01:00
thiloho
c97347e760 Update Nix module 2025-01-30 00:16:50 +01:00
thiloho
fba3aef8aa Update nix module, add resizing to WebsiteEditor and make preview load without JS 2025-01-29 19:53:38 +01:00
Thilo Hohlt
2757ddb774 Merge pull request #28 from archtika/devel
Set custom domains for docs and portfolio
2025-01-12 14:37:43 +01:00
thiloho
c6111fd247 Set custom domains for docs and portfolio 2025-01-12 14:16:22 +01:00
19 changed files with 1162 additions and 1644 deletions

View File

@@ -23,7 +23,7 @@ jobs:
run: | run: |
wait_for_postgres() { wait_for_postgres() {
echo "Waiting for PostgreSQL to be ready..." echo "Waiting for PostgreSQL to be ready..."
while ! nix shell nixpkgs#postgresql_16 -c pg_isready -h 127.0.0.1 -p 15432 -U postgres; do while ! nix shell nixpkgs#postgresql -c pg_isready -h 127.0.0.1 -p 15432 -U postgres; do
sleep 1 sleep 1
done done
echo "PostgreSQL is ready." echo "PostgreSQL is ready."

6
flake.lock generated
View File

@@ -2,11 +2,11 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1735471104, "lastModified": 1741379970,
"narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -36,9 +36,9 @@
''; '';
}; };
web = pkgs.mkShell { web = pkgs.mkShell {
packages = with pkgs; [ nodejs_22 ]; packages = with pkgs; [ nodejs ];
shellHook = '' shellHook = ''
export PLAYWRIGHT_BROWSERS_PATH=${pkgs.playwright-driver.browsers} export PLAYWRIGHT_BROWSERS_PATH=${pkgs.playwright.browsers}
export PLAYWRIGHT_SKIP_VALIDATE_HOST_REQUIREMENTS=true export PLAYWRIGHT_SKIP_VALIDATE_HOST_REQUIREMENTS=true
''; '';
}; };

View File

@@ -1,12 +1,13 @@
{ pkgs, localArchtikaPackage, ... }: { pkgs, localArchtikaPackage, ... }:
let let
domain = "demo.archtika.com"; domain = "demo.archtika.com";
docsSubdomain = "docs.archtika.com";
portfolioDomain = "thilohohlt.com";
in in
{ {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
../shared.nix ../shared.nix
../../module.nix
]; ];
networking.hostName = "archtika-demo"; networking.hostName = "archtika-demo";
@@ -25,10 +26,37 @@ in
defaults.email = "thilo.hohlt@tutanota.com"; defaults.email = "thilo.hohlt@tutanota.com";
certs."${domain}" = { certs."${domain}" = {
inherit domain; inherit domain;
extraDomainNames = [ "*.${domain}" ]; extraDomainNames = [
"*.${domain}"
docsSubdomain
];
dnsProvider = "porkbun"; dnsProvider = "porkbun";
environmentFile = /var/lib/porkbun.env; environmentFile = /var/lib/porkbun.env;
group = "nginx"; group = "nginx";
}; };
}; };
services.nginx.virtualHosts."${docsSubdomain}" = {
useACMEHost = domain;
forceSSL = true;
locations = {
"/" = {
root = "/var/www/archtika-websites/archtika/archtika-documentation";
index = "index.html";
tryFiles = "$uri $uri/ $uri.html =404";
};
};
};
services.nginx.virtualHosts."${portfolioDomain}" = {
enableACME = true;
forceSSL = true;
locations = {
"/" = {
root = "/var/www/archtika-websites/thiloho/thilo-hohlt";
index = "index.html";
tryFiles = "$uri $uri/ $uri.html =404";
};
};
};
} }

View File

@@ -6,7 +6,6 @@ in
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
../shared.nix ../shared.nix
../../module.nix
]; ];
networking.hostName = "archtika-qs"; networking.hostName = "archtika-qs";

View File

@@ -1,315 +0,0 @@
{
config,
lib,
pkgs,
...
}:
let
inherit (lib)
mkEnableOption
mkOption
mkIf
mkPackageOption
types
;
cfg = config.services.archtika;
in
{
options.services.archtika = {
enable = mkEnableOption "Whether to enable the archtika service";
package = mkPackageOption pkgs "archtika" { };
user = mkOption {
type = types.str;
default = "archtika";
description = "User account under which archtika runs.";
};
group = mkOption {
type = types.str;
default = "archtika";
description = "Group under which archtika runs.";
};
databaseName = mkOption {
type = types.str;
default = "archtika";
description = "Name of the PostgreSQL database for archtika.";
};
apiPort = mkOption {
type = types.port;
default = 5000;
description = "Port on which the API runs.";
};
apiAdminPort = mkOption {
type = types.port;
default = 7500;
description = "Port on which the API admin server runs.";
};
webAppPort = mkOption {
type = types.port;
default = 10000;
description = "Port on which the web application runs.";
};
domain = mkOption {
type = types.str;
description = "Domain to use for the application.";
};
settings = mkOption {
description = "Settings for the running archtika application.";
type = types.submodule {
options = {
disableRegistration = mkOption {
type = types.bool;
default = false;
description = "By default any user can create an account. That behavior can be disabled by using this option.";
};
maxUserWebsites = mkOption {
type = types.ints.positive;
default = 2;
description = "Maximum number of websites allowed per user by default.";
};
maxWebsiteStorageSize = mkOption {
type = types.ints.positive;
default = 50;
description = "Maximum amount of disk space in MB allowed per user website by default.";
};
};
};
};
};
config = mkIf cfg.enable (
let
baseHardenedSystemdOptions = {
CapabilityBoundingSet = "";
LockPersonality = true;
NoNewPrivileges = true;
PrivateDevices = true;
PrivateTmp = true;
ProtectClock = true;
ProtectControlGroups = true;
ProtectHome = true;
ProtectHostname = true;
ProtectKernelLogs = true;
ProtectKernelModules = true;
ProtectKernelTunables = true;
ProtectSystem = "strict";
RemoveIPC = true;
RestrictNamespaces = true;
RestrictRealtime = true;
RestrictSUIDSGID = true;
SystemCallArchitectures = "native";
SystemCallFilter = [
"@system-service"
"~@privileged"
"~@resources"
];
ReadWritePaths = [ "/var/www/archtika-websites" ];
};
in
{
users.users.${cfg.user} = {
isSystemUser = true;
group = cfg.group;
};
users.groups.${cfg.group} = {
members = [
"nginx"
"postgres"
];
};
systemd.tmpfiles.settings = {
"10-archtika" = {
"/var/www" = {
d = {
mode = "0755";
user = "root";
group = "root";
};
};
"/var/www/archtika-websites" = {
d = {
mode = "0770";
user = cfg.user;
group = cfg.group;
};
};
};
};
systemd.services.archtika-api = {
description = "archtika API service";
wantedBy = [ "multi-user.target" ];
after = [
"network.target"
"postgresql.service"
];
path = [ config.services.postgresql.package ];
serviceConfig = baseHardenedSystemdOptions // {
User = cfg.user;
Group = cfg.group;
Restart = "always";
WorkingDirectory = "${cfg.package}/rest-api";
RestrictAddressFamilies = [
"AF_INET"
"AF_INET6"
"AF_UNIX"
];
};
script =
let
dbUrl =
user:
"postgres://${user}@127.0.0.1:${toString config.services.postgresql.settings.port}/${cfg.databaseName}";
in
''
JWT_SECRET=$(tr -dc 'A-Za-z0-9' < /dev/urandom | head -c64)
psql ${dbUrl "postgres"} \
-c "ALTER DATABASE ${cfg.databaseName} SET \"app.jwt_secret\" TO '$JWT_SECRET'" \
-c "ALTER DATABASE ${cfg.databaseName} SET \"app.website_max_storage_size\" TO ${toString cfg.settings.maxWebsiteStorageSize}" \
-c "ALTER DATABASE ${cfg.databaseName} SET \"app.website_max_number_user\" TO ${toString cfg.settings.maxUserWebsites}"
${pkgs.dbmate}/bin/dbmate --url ${dbUrl "postgres"}?sslmode=disable --migrations-dir ${cfg.package}/rest-api/db/migrations up
PGRST_SERVER_CORS_ALLOWED_ORIGINS="https://${cfg.domain}" \
PGRST_ADMIN_SERVER_PORT=${toString cfg.apiAdminPort} \
PGRST_SERVER_PORT=${toString cfg.apiPort} \
PGRST_DB_SCHEMAS="api" \
PGRST_DB_ANON_ROLE="anon" \
PGRST_OPENAPI_MODE="ignore-privileges" \
PGRST_DB_URI=${dbUrl "authenticator"} \
PGRST_JWT_SECRET="$JWT_SECRET" \
${pkgs.postgrest}/bin/postgrest
'';
};
systemd.services.archtika-web = {
description = "archtika Web App service";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
serviceConfig = baseHardenedSystemdOptions // {
User = cfg.user;
Group = cfg.group;
Restart = "always";
WorkingDirectory = "${cfg.package}/web-app";
RestrictAddressFamilies = [
"AF_INET"
"AF_INET6"
];
};
environment = {
REGISTRATION_IS_DISABLED = toString cfg.settings.disableRegistration;
BODY_SIZE_LIMIT = "10M";
ORIGIN = "https://${cfg.domain}";
PORT = toString cfg.webAppPort;
};
script = "${pkgs.nodejs_22}/bin/node ${cfg.package}/web-app";
};
services.postgresql = {
enable = true;
ensureDatabases = [ cfg.databaseName ];
authentication = lib.mkOverride 51 ''
host all all 127.0.0.1/32 trust
host all all ::1/128 trust
local all all trust
'';
extensions = ps: with ps; [ pgjwt ];
};
systemd.services.postgresql = {
path = builtins.attrValues {
inherit (pkgs) gnutar gzip;
};
serviceConfig = {
ReadWritePaths = [ "/var/www/archtika-websites" ];
SystemCallFilter = [ "@system-service" ];
};
};
services.nginx = {
enable = true;
recommendedProxySettings = true;
recommendedTlsSettings = true;
recommendedZstdSettings = true;
recommendedOptimisation = true;
appendHttpConfig = ''
add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always;
add_header X-Frame-Options "SAMEORIGIN" always;
add_header X-Content-Type-Options "nosniff" always;
add_header Referrer-Policy "strict-origin-when-cross-origin" always;
add_header Permissions-Policy "accelerometer=(),autoplay=(),camera=(),cross-origin-isolated=(),display-capture=(),encrypted-media=(),fullscreen=(self),geolocation=(),gyroscope=(),keyboard-map=(),magnetometer=(),microphone=(),midi=(),payment=(),picture-in-picture=(self),publickey-credentials-get=(),screen-wake-lock=(),sync-xhr=(self),usb=(),xr-spatial-tracking=(),clipboard-read=(self),clipboard-write=(self),gamepad=(),hid=(),idle-detection=(),interest-cohort=(),serial=(),unload=()" always;
map $http_cookie $auth_header {
default "";
"~*session_token=([^;]+)" "Bearer $1";
}
'';
virtualHosts = {
"${cfg.domain}" = {
useACMEHost = cfg.domain;
forceSSL = true;
locations = {
"/" = {
proxyPass = "http://127.0.0.1:${toString cfg.webAppPort}";
};
"/previews/" = {
alias = "/var/www/archtika-websites/previews/";
index = "index.html";
tryFiles = "$uri $uri/ $uri.html =404";
};
"/api/rpc/export_articles_zip" = {
proxyPass = "http://127.0.0.1:${toString cfg.apiPort}/rpc/export_articles_zip";
extraConfig = ''
default_type application/json;
proxy_set_header Authorization $auth_header;
'';
};
"/api/" = {
proxyPass = "http://127.0.0.1:${toString cfg.apiPort}/";
extraConfig = ''
default_type application/json;
'';
};
"/api/rpc/register" = mkIf cfg.settings.disableRegistration {
extraConfig = ''
deny all;
'';
};
};
};
"~^(?<subdomain>.+)\\.${cfg.domain}$" = {
useACMEHost = cfg.domain;
forceSSL = true;
locations = {
"/" = {
root = "/var/www/archtika-websites/$subdomain";
index = "index.html";
tryFiles = "$uri $uri/ $uri.html =404";
};
};
};
};
};
}
);
}

View File

@@ -10,7 +10,7 @@ let
web = buildNpmPackage { web = buildNpmPackage {
name = "web-app"; name = "web-app";
src = ../web-app; src = ../web-app;
npmDepsHash = "sha256-RTyo7K/Hr1hBGtcBKynrziUInl91JqZl84NkJg16ufA="; npmDepsHash = "sha256-2udi8vLLvdoZxIyRKLOCfEpEMsooxsIrM1wiua1QPAI=";
npmFlags = [ "--legacy-peer-deps" ]; npmFlags = [ "--legacy-peer-deps" ];
installPhase = '' installPhase = ''
mkdir -p $out/web-app mkdir -p $out/web-app

View File

@@ -0,0 +1,13 @@
-- migrate:up
ALTER TABLE internal.user
DROP CONSTRAINT username_not_blocked;
ALTER TABLE internal.user
ADD CONSTRAINT username_not_blocked CHECK (LOWER(username) NOT IN ('admin', 'administrator', 'api', 'auth', 'blog', 'cdn', 'docs', 'help', 'login', 'logout', 'profile', 'preview', 'previews', 'register', 'settings', 'setup', 'signin', 'signup', 'support', 'test', 'www'));
-- migrate:down
ALTER TABLE internal.user
DROP CONSTRAINT username_not_blocked;
ALTER TABLE internal.user
ADD CONSTRAINT username_not_blocked CHECK (LOWER(username) NOT IN ('admin', 'administrator', 'api', 'auth', 'blog', 'cdn', 'docs', 'help', 'login', 'logout', 'profile', 'register', 'settings', 'setup', 'signin', 'signup', 'support', 'test', 'www'));

2338
web-app/package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -14,35 +14,35 @@
"gents": "pg-to-ts generate -c postgres://postgres@127.0.0.1:15432/archtika -o src/lib/db-schema.ts -s internal --datesAsStrings" "gents": "pg-to-ts generate -c postgres://postgres@127.0.0.1:15432/archtika -o src/lib/db-schema.ts -s internal --datesAsStrings"
}, },
"devDependencies": { "devDependencies": {
"@playwright/test": "1.47.0", "@playwright/test": "1.50.1",
"@sveltejs/adapter-auto": "3.2.5", "@sveltejs/adapter-auto": "5.0.0",
"@sveltejs/adapter-node": "5.2.3", "@sveltejs/adapter-node": "5.2.12",
"@sveltejs/kit": "2.5.28", "@sveltejs/kit": "2.20.2",
"@sveltejs/vite-plugin-svelte": "4.0.0-next.6", "@sveltejs/vite-plugin-svelte": "5.0.3",
"@types/diff-match-patch": "1.0.36", "@types/diff-match-patch": "1.0.36",
"@types/eslint": "9.6.1", "@types/eslint": "9.6.1",
"@types/eslint__js": "8.42.3", "@types/eslint__js": "9.14.0",
"@types/eslint-config-prettier": "6.11.3", "@types/eslint-config-prettier": "6.11.3",
"@types/node": "22.5.5", "@types/node": "22.13.11",
"eslint": "9.15.0", "eslint": "9.23.0",
"eslint-config-prettier": "9.1.0", "eslint-config-prettier": "10.1.1",
"eslint-plugin-svelte": "2.44.0", "eslint-plugin-svelte": "3.3.3",
"globals": "15.9.0", "globals": "16.0.0",
"pg-to-ts": "4.1.1", "pg-to-ts": "4.1.1",
"prettier": "3.3.3", "prettier": "3.5.3",
"prettier-plugin-svelte": "3.2.6", "prettier-plugin-svelte": "3.3.3",
"svelte": "5.0.0-next.253", "svelte": "5.25.3",
"svelte-check": "4.0.2", "svelte-check": "4.1.5",
"typescript": "5.6.2", "typescript": "5.8.2",
"typescript-eslint": "8.6.0", "typescript-eslint": "8.27.0",
"vite": "5.4.6" "vite": "6.2.2"
}, },
"dependencies": { "dependencies": {
"diff-match-patch": "1.0.5", "diff-match-patch": "1.0.5",
"highlight.js": "11.10.0", "highlight.js": "11.11.1",
"isomorphic-dompurify": "2.15.0", "isomorphic-dompurify": "2.22.0",
"marked": "14.1.2", "marked": "15.0.7",
"marked-highlight": "2.1.4" "marked-highlight": "2.2.1"
}, },
"overrides": { "overrides": {
"cookie": "0.7.0" "cookie": "0.7.0"

View File

@@ -8,7 +8,7 @@
<div class="pagination"> <div class="pagination">
{#snippet commonFilterInputs()} {#snippet commonFilterInputs()}
{#each commonFilters as filter} {#each commonFilters as filter (filter)}
<input type="hidden" name={filter} value={$page.url.searchParams.get(filter)} /> <input type="hidden" name={filter} value={$page.url.searchParams.get(filter)} />
{/each} {/each}
{/snippet} {/snippet}

View File

@@ -3,6 +3,7 @@
import { md } from "$lib/utils"; import { md } from "$lib/utils";
import { page } from "$app/stores"; import { page } from "$app/stores";
import { previewContent, textareaScrollTop } from "$lib/runes.svelte"; import { previewContent, textareaScrollTop } from "$lib/runes.svelte";
import { browser } from "$app/environment";
const { const {
id, id,
@@ -38,7 +39,7 @@
<nav class="operations__nav"> <nav class="operations__nav">
<ul class="unpadded"> <ul class="unpadded">
{#each tabs.filter((tab) => (tab !== "categories" && contentType === "Blog") || contentType === "Docs") as tab} {#each tabs.filter((tab) => (tab !== "categories" && contentType === "Blog") || contentType === "Docs") as tab (tab)}
<li> <li>
<a <a
href="/website/{id}{tab === 'settings' ? '' : `/${tab}`}" href="/website/{id}{tab === 'settings' ? '' : `/${tab}`}"
@@ -57,14 +58,14 @@
<div class="preview" bind:this={previewElement}> <div class="preview" bind:this={previewElement}>
{#if fullPreview} {#if fullPreview}
{#if !iframeLoaded} {#if !iframeLoaded && browser}
<p>Loading preview...</p> <p>Loading preview...</p>
{/if} {/if}
<iframe <iframe
src={previewContent.value} src={previewContent.value}
title="Preview" title="Preview"
onload={() => (iframeLoaded = true)} onload={() => (iframeLoaded = true)}
style:display={iframeLoaded ? "block" : "none"} style:display={!browser || iframeLoaded ? "block" : "none"}
></iframe> ></iframe>
{:else} {:else}
{@html md( {@html md(
@@ -131,6 +132,9 @@
.operations { .operations {
padding-block-start: var(--space-s); padding-block-start: var(--space-s);
resize: horizontal;
min-inline-size: 100%;
max-inline-size: calc(1536px - 320px);
} }
.preview { .preview {

View File

@@ -16,6 +16,7 @@ export const apiRequest = async (
method: "HEAD" | "GET" | "POST" | "PATCH" | "DELETE", method: "HEAD" | "GET" | "POST" | "PATCH" | "DELETE",
options: { options: {
headers?: Record<string, string>; headers?: Record<string, string>;
// eslint-disable-next-line @typescript-eslint/no-explicit-any
body?: any; body?: any;
successMessage?: string; successMessage?: string;
returnData?: boolean; returnData?: boolean;

View File

@@ -54,18 +54,18 @@
</h2> </h2>
<ul class="unpadded"> <ul class="unpadded">
{#each sortedArticles as article} {#each sortedArticles as { id, publication_date, slug, title, meta_description } (id)}
<li> <li>
{#if article.publication_date} {#if publication_date}
<p>{article.publication_date}</p> <p>{publication_date}</p>
{/if} {/if}
<p> <p>
<strong> <strong>
<a href="./articles/{article.slug}">{article.title}</a> <a href="./articles/{slug}">{title}</a>
</strong> </strong>
</p> </p>
{#if article.meta_description} {#if meta_description}
<p>{article.meta_description}</p> <p>{meta_description}</p>
{/if} {/if}
</li> </li>
{/each} {/each}

View File

@@ -55,11 +55,11 @@
<section id="docs-navigation" class="docs-navigation"> <section id="docs-navigation" class="docs-navigation">
<ul> <ul>
{#each Object.keys(categorizedArticles) as key} {#each Object.keys(categorizedArticles) as key (key)}
<li> <li>
<strong>{key}</strong> <strong>{key}</strong>
<ul> <ul>
{#each categorizedArticles[key] as { title, slug }} {#each categorizedArticles[key] as { title, slug } (slug)}
<li> <li>
<a href="{isIndexPage ? './articles' : '.'}/{slug}">{title}</a> <a href="{isIndexPage ? './articles' : '.'}/{slug}">{title}</a>
</li> </li>

View File

@@ -39,7 +39,7 @@
<a href="#storage">Storage</a> <a href="#storage">Storage</a>
</h2> </h2>
<ul class="unpadded storage-grid"> <ul class="unpadded storage-grid">
{#each data.storageSizes.data as { website_title, storage_size_bytes, max_storage_bytes, max_storage_pretty, diff_storage_pretty }} {#each data.storageSizes.data as { website_id, website_title, storage_size_bytes, max_storage_bytes, max_storage_pretty, diff_storage_pretty } (website_id)}
<li> <li>
<strong>{website_title}</strong> <strong>{website_title}</strong>
<label> <label>

View File

@@ -48,7 +48,7 @@
<label> <label>
Category: Category:
<select name="category"> <select name="category">
{#each data.categories as { id, category_name }} {#each data.categories as { id, category_name } (id)}
<option value={id} selected={id === data.article.category}>{category_name}</option> <option value={id} selected={id === data.article.category}>{category_name}</option>
{/each} {/each}
</select> </select>

View File

@@ -63,7 +63,7 @@
/> />
<datalist id="users-{data.website.id}"> <datalist id="users-{data.website.id}">
<option value={data.website.user.username}></option> <option value={data.website.user.username}></option>
{#each data.collaborators as { user: { username } }} {#each data.collaborators as { user: { username } } (username)}
<option value={username}></option> <option value={username}></option>
{/each} {/each}
</datalist> </datalist>
@@ -72,7 +72,7 @@
Resource: Resource:
<select name="resource"> <select name="resource">
<option value="all">Show all</option> <option value="all">Show all</option>
{#each Object.keys(resources) as resource} {#each Object.keys(resources) as resource (resource)}
<option <option
value={resource} value={resource}
selected={resource === $page.url.searchParams.get("resource")}>{resource}</option selected={resource === $page.url.searchParams.get("resource")}>{resource}</option
@@ -141,9 +141,13 @@
<button type="submit">Compute diff</button> <button type="submit">Compute diff</button>
</form> </form>
{#if form?.logId === id && form?.currentDiff} {#if form?.logId === id && form?.currentDiff}
<pre>{@html DOMPurify.sanitize(form.currentDiff, { <pre>{@html DOMPurify.sanitize(
ALLOWED_TAGS: ["ins", "del"] // .replace takes escaped text representations of line breaks and converts them to real line breaks that render correctly in HTML
})}</pre> form.currentDiff.replace(/\\r\\n|\\n|\\r/g, "\n"),
{
ALLOWED_TAGS: ["ins", "del"]
}
)}</pre>
{/if} {/if}
{/if} {/if}

View File

@@ -17,7 +17,7 @@
<p class="mt-2 text-xl text-neutral-700 sm:text-2xl">FLOSS, modern, performant, lightweight and self&#8209;hosted CMS</p> <p class="mt-2 text-xl text-neutral-700 sm:text-2xl">FLOSS, modern, performant, lightweight and self&#8209;hosted CMS</p>
<div class="mt-8 flex flex-wrap gap-6 sm:justify-end"> <div class="mt-8 flex flex-wrap gap-6 sm:justify-end">
<a href="https://github.com/archtika/archtika" class="text-neutral-900 rounded-full bg-neutral-200 px-4 py-2 outline outline-1 outline-offset-4 outline-neutral-300 hover:bg-neutral-300 hover:underline focus:outline-2 focus:outline-neutral-900">GitHub</a> <a href="https://github.com/archtika/archtika" class="text-neutral-900 rounded-full bg-neutral-200 px-4 py-2 outline outline-1 outline-offset-4 outline-neutral-300 hover:bg-neutral-300 hover:underline focus:outline-2 focus:outline-neutral-900">GitHub</a>
<a href="https://archtika.demo.archtika.com/archtika-documentation" class="text-neutral-900 rounded-full bg-neutral-200 px-4 py-2 outline outline-1 outline-offset-4 outline-neutral-300 hover:bg-neutral-300 hover:underline focus:outline-2 focus:outline-neutral-900">Documentation</a> <a href="https://docs.archtika.com" class="text-neutral-900 rounded-full bg-neutral-200 px-4 py-2 outline outline-1 outline-offset-4 outline-neutral-300 hover:bg-neutral-300 hover:underline focus:outline-2 focus:outline-neutral-900">Documentation</a>
</div> </div>
</div> </div>
</body> </body>