From 37ba49a4f7a31881ba4f32a6ea7ef36b2c5a98eb Mon Sep 17 00:00:00 2001 From: thiloho <123883702+thiloho@users.noreply.github.com> Date: Tue, 8 Apr 2025 12:36:39 +0200 Subject: [PATCH 1/2] Use english catelog for Postgres full-text search and fix logo scaling on mobile devices --- nix/deploy/prod/default.nix | 2 ++ nix/deploy/qs/default.nix | 2 ++ .../db/migrations/20250323134405_username_blocklist.sql | 3 ++- .../routes/(authenticated)/website/[websiteId]/+page.svelte | 2 +- web-app/template-styles/blog-styles.css | 6 ------ web-app/template-styles/docs-styles.css | 6 ------ 6 files changed, 7 insertions(+), 14 deletions(-) diff --git a/nix/deploy/prod/default.nix b/nix/deploy/prod/default.nix index f6da764..5709cc2 100644 --- a/nix/deploy/prod/default.nix +++ b/nix/deploy/prod/default.nix @@ -59,4 +59,6 @@ in }; }; }; + + services.postgresql.settings.default_text_search_config = "pg_catalog.english"; } diff --git a/nix/deploy/qs/default.nix b/nix/deploy/qs/default.nix index f295ec4..de0429d 100644 --- a/nix/deploy/qs/default.nix +++ b/nix/deploy/qs/default.nix @@ -30,4 +30,6 @@ in group = "nginx"; }; }; + + services.postgresql.settings.default_text_search_config = "pg_catalog.english"; } diff --git a/rest-api/db/migrations/20250323134405_username_blocklist.sql b/rest-api/db/migrations/20250323134405_username_blocklist.sql index 8b89932..c1cd202 100644 --- a/rest-api/db/migrations/20250323134405_username_blocklist.sql +++ b/rest-api/db/migrations/20250323134405_username_blocklist.sql @@ -10,4 +10,5 @@ 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')); \ No newline at end of file + 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')); + diff --git a/web-app/src/routes/(authenticated)/website/[websiteId]/+page.svelte b/web-app/src/routes/(authenticated)/website/[websiteId]/+page.svelte index 01e3a1d..87132a3 100644 --- a/web-app/src/routes/(authenticated)/website/[websiteId]/+page.svelte +++ b/web-app/src/routes/(authenticated)/website/[websiteId]/+page.svelte @@ -136,7 +136,7 @@
{#if data.header.logo_image} diff --git a/web-app/template-styles/blog-styles.css b/web-app/template-styles/blog-styles.css index d55e871..9413f91 100644 --- a/web-app/template-styles/blog-styles.css +++ b/web-app/template-styles/blog-styles.css @@ -33,7 +33,6 @@ header img { object-position: center; } -nav, header, main { padding-block: var(--space-s); @@ -71,11 +70,6 @@ section { scroll-margin-block-start: var(--space-xl); } -.top-nav-logo { - max-block-size: var(--space-xl); - padding-block: var(--space-xs); -} - @media (min-width: 1525px) { #table-of-contents { position: fixed; diff --git a/web-app/template-styles/docs-styles.css b/web-app/template-styles/docs-styles.css index cf91317..c8756b3 100644 --- a/web-app/template-styles/docs-styles.css +++ b/web-app/template-styles/docs-styles.css @@ -26,7 +26,6 @@ header > .container { gap: var(--space-s); } -nav, header, main { padding-block: var(--space-s); @@ -49,11 +48,6 @@ section { scroll-margin-block-start: var(--space-xl); } -.top-nav-logo { - max-block-size: var(--space-xl); - padding-block: var(--space-xs); -} - .docs-navigation { display: none; position: fixed; From 1d8f5251aa1121fca2999b4dbe818d7eb767536b Mon Sep 17 00:00:00 2001 From: thiloho <123883702+thiloho@users.noreply.github.com> Date: Tue, 8 Apr 2025 12:59:18 +0200 Subject: [PATCH 2/2] Use regular expression for logo image test --- web-app/tests/settings.spec.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web-app/tests/settings.spec.ts b/web-app/tests/settings.spec.ts index 1c332f1..2e701a4 100644 --- a/web-app/tests/settings.spec.ts +++ b/web-app/tests/settings.spec.ts @@ -50,9 +50,9 @@ test.describe("Website owner", () => { await page.getByLabel("Logo text:").click(); await page.getByLabel("Logo text:").press("ControlOrMeta+a"); await page.getByLabel("Logo text:").fill("Logo text"); - await page.getByLabel("Logo image:").click(); + await page.getByLabel(/Logo image/).click(); await page - .getByLabel("Logo image") + .getByLabel(/Logo image/) .setInputFiles(join(__dirname, "sample-files", "archtika-logo-512x512.png")); await page.getByRole("button", { name: "Update header" }).click(); await expect(page.getByText("Successfully updated header")).toBeVisible(); @@ -122,9 +122,9 @@ for (const permissionLevel of permissionLevels) { await page.getByLabel("Logo text:").click(); await page.getByLabel("Logo text:").press("ControlOrMeta+a"); await page.getByLabel("Logo text:").fill("Logo text"); - await page.getByLabel("Logo image:").click(); + await page.getByLabel(/Logo image/).click(); await page - .getByLabel("Logo image") + .getByLabel(/Logo image/) .setInputFiles(join(__dirname, "sample-files", "archtika-logo-512x512.png")); await page .getByRole("button", { name: "Update header" })