From a2485367894f52793227b0470d8e2e966b47b406 Mon Sep 17 00:00:00 2001 From: sam Date: Fri, 28 Feb 2025 16:47:21 +0100 Subject: [PATCH 1/2] fix typo in DOCKER.md --- DOCKER.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DOCKER.md b/DOCKER.md index b485eb7..a007aab 100644 --- a/DOCKER.md +++ b/DOCKER.md @@ -2,7 +2,7 @@ 1. Copy `docker/config.example.ini` to `docker/config.ini`, and change the settings to your liking. 2. Copy `docker/proxy-config.example.json` to `docker/proxy-config.json`, and do the same. -3. Copy `docker/frontend.example.env` to `docker/frontend.env`, and do th esame. +3. Copy `docker/frontend.example.env` to `docker/frontend.env`, and do the same. 4. Build with `docker compose build` 5. Run with `docker compose up` From 7d6d4631b81168bf67df25c34d4d8cf2750a9942 Mon Sep 17 00:00:00 2001 From: sam Date: Fri, 28 Feb 2025 16:50:57 +0100 Subject: [PATCH 2/2] fix(frontend): don't reference email auth in text if it's disabled --- Foxnouns.Frontend/src/lib/i18n/locales/en.json | 3 ++- Foxnouns.Frontend/src/routes/auth/log-in/+page.svelte | 9 +++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Foxnouns.Frontend/src/lib/i18n/locales/en.json b/Foxnouns.Frontend/src/lib/i18n/locales/en.json index 7145181..fe10b04 100644 --- a/Foxnouns.Frontend/src/lib/i18n/locales/en.json +++ b/Foxnouns.Frontend/src/lib/i18n/locales/en.json @@ -86,7 +86,8 @@ "unlink-discord-header": "Unlink Discord account", "unlink-confirmation-1": "Are you sure you want to unlink {{username}} from your account?", "unlink-confirmation-2": "You will no longer be able to use this account to log in. Please make sure at least one of your other linked accounts is accessible before continuing.", - "unlink-button": "Unlink account" + "unlink-button": "Unlink account", + "log-in-3rd-party-desc-no-email": "You can use any of the following services to log in. You can add or remove others at any time." }, "error": { "bad-request-header": "Something was wrong with your input", diff --git a/Foxnouns.Frontend/src/routes/auth/log-in/+page.svelte b/Foxnouns.Frontend/src/routes/auth/log-in/+page.svelte index ee4d040..3efbfa0 100644 --- a/Foxnouns.Frontend/src/routes/auth/log-in/+page.svelte +++ b/Foxnouns.Frontend/src/routes/auth/log-in/+page.svelte @@ -50,8 +50,13 @@
{/if}
-

{$t("auth.log-in-3rd-party-header")}

-

{$t("auth.log-in-3rd-party-desc")}

+ {#if data.urls.email_enabled} +

{$t("auth.log-in-3rd-party-header")}

+

{$t("auth.log-in-3rd-party-desc")}

+ {:else} +

{$t("title.log-in")}

+

{$t("auth.log-in-3rd-party-desc-no-email")}

+ {/if}
{#if data.urls.discord}