Compare commits
No commits in common. "be34c4c77e436f19ff8f94b5949e96762471d5fd" and "2323810b06ad57771c05341a199158d5ebaf9a10" have entirely different histories.
be34c4c77e
...
2323810b06
20 changed files with 177 additions and 1174 deletions
|
@ -1,61 +0,0 @@
|
||||||
<component name="ProjectCodeStyleConfiguration">
|
|
||||||
<code_scheme name="Project" version="173">
|
|
||||||
<HTMLCodeStyleSettings>
|
|
||||||
<option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
|
|
||||||
</HTMLCodeStyleSettings>
|
|
||||||
<JSCodeStyleSettings version="0">
|
|
||||||
<option name="FORCE_SEMICOLON_STYLE" value="true" />
|
|
||||||
<option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
|
|
||||||
<option name="FORCE_QUOTE_STYlE" value="true" />
|
|
||||||
<option name="ENFORCE_TRAILING_COMMA" value="Remove" />
|
|
||||||
<option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
|
|
||||||
<option name="SPACES_WITHIN_IMPORTS" value="true" />
|
|
||||||
</JSCodeStyleSettings>
|
|
||||||
<TypeScriptCodeStyleSettings version="0">
|
|
||||||
<option name="FORCE_SEMICOLON_STYLE" value="true" />
|
|
||||||
<option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
|
|
||||||
<option name="FORCE_QUOTE_STYlE" value="true" />
|
|
||||||
<option name="ENFORCE_TRAILING_COMMA" value="Remove" />
|
|
||||||
<option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
|
|
||||||
<option name="SPACES_WITHIN_IMPORTS" value="true" />
|
|
||||||
</TypeScriptCodeStyleSettings>
|
|
||||||
<VueCodeStyleSettings>
|
|
||||||
<option name="INTERPOLATION_NEW_LINE_AFTER_START_DELIMITER" value="false" />
|
|
||||||
<option name="INTERPOLATION_NEW_LINE_BEFORE_END_DELIMITER" value="false" />
|
|
||||||
</VueCodeStyleSettings>
|
|
||||||
<codeStyleSettings language="HTML">
|
|
||||||
<option name="SOFT_MARGINS" value="100" />
|
|
||||||
<indentOptions>
|
|
||||||
<option name="INDENT_SIZE" value="2" />
|
|
||||||
<option name="CONTINUATION_INDENT_SIZE" value="2" />
|
|
||||||
<option name="TAB_SIZE" value="2" />
|
|
||||||
<option name="USE_TAB_CHARACTER" value="true" />
|
|
||||||
</indentOptions>
|
|
||||||
</codeStyleSettings>
|
|
||||||
<codeStyleSettings language="JavaScript">
|
|
||||||
<option name="SOFT_MARGINS" value="100" />
|
|
||||||
<indentOptions>
|
|
||||||
<option name="INDENT_SIZE" value="2" />
|
|
||||||
<option name="CONTINUATION_INDENT_SIZE" value="2" />
|
|
||||||
<option name="TAB_SIZE" value="2" />
|
|
||||||
<option name="USE_TAB_CHARACTER" value="true" />
|
|
||||||
</indentOptions>
|
|
||||||
</codeStyleSettings>
|
|
||||||
<codeStyleSettings language="TypeScript">
|
|
||||||
<option name="SOFT_MARGINS" value="100" />
|
|
||||||
<indentOptions>
|
|
||||||
<option name="INDENT_SIZE" value="2" />
|
|
||||||
<option name="CONTINUATION_INDENT_SIZE" value="2" />
|
|
||||||
<option name="TAB_SIZE" value="2" />
|
|
||||||
<option name="USE_TAB_CHARACTER" value="true" />
|
|
||||||
</indentOptions>
|
|
||||||
</codeStyleSettings>
|
|
||||||
<codeStyleSettings language="Vue">
|
|
||||||
<option name="SOFT_MARGINS" value="100" />
|
|
||||||
<indentOptions>
|
|
||||||
<option name="CONTINUATION_INDENT_SIZE" value="2" />
|
|
||||||
<option name="USE_TAB_CHARACTER" value="true" />
|
|
||||||
</indentOptions>
|
|
||||||
</codeStyleSettings>
|
|
||||||
</code_scheme>
|
|
||||||
</component>
|
|
|
@ -121,7 +121,6 @@ public static class WebApplicationExtensions
|
||||||
|
|
||||||
public static async Task Initialize(this WebApplication app, string[] args)
|
public static async Task Initialize(this WebApplication app, string[] args)
|
||||||
{
|
{
|
||||||
// Read version information from .version in the repository root
|
|
||||||
await BuildInfo.ReadBuildInfo();
|
await BuildInfo.ReadBuildInfo();
|
||||||
|
|
||||||
app.Services.ConfigureQueue().LogQueuedTaskProgress(app.Services.GetRequiredService<ILogger<IQueue>>());
|
app.Services.ConfigureQueue().LogQueuedTaskProgress(app.Services.GetRequiredService<ILogger<IQueue>>());
|
||||||
|
|
|
@ -9,6 +9,9 @@ using Newtonsoft.Json.Serialization;
|
||||||
using Prometheus;
|
using Prometheus;
|
||||||
using Sentry.Extensibility;
|
using Sentry.Extensibility;
|
||||||
|
|
||||||
|
// Read version information from .version in the repository root
|
||||||
|
await BuildInfo.ReadBuildInfo();
|
||||||
|
|
||||||
var builder = WebApplication.CreateBuilder(args);
|
var builder = WebApplication.CreateBuilder(args);
|
||||||
|
|
||||||
var config = builder.AddConfiguration();
|
var config = builder.AddConfiguration();
|
||||||
|
|
|
@ -81,11 +81,11 @@ public class AuthService(IClock clock, DatabaseContext db, ISnowflakeGenerator s
|
||||||
var user = await db.Users.FirstOrDefaultAsync(u =>
|
var user = await db.Users.FirstOrDefaultAsync(u =>
|
||||||
u.AuthMethods.Any(a => a.AuthType == AuthType.Email && a.RemoteId == email), ct);
|
u.AuthMethods.Any(a => a.AuthType == AuthType.Email && a.RemoteId == email), ct);
|
||||||
if (user == null)
|
if (user == null)
|
||||||
throw new ApiError.NotFound("No user with that email address found, or password is incorrect", ErrorCode.UserNotFound);
|
throw new ApiError.NotFound("No user with that email address found, or password is incorrect");
|
||||||
|
|
||||||
var pwResult = await Task.Run(() => _passwordHasher.VerifyHashedPassword(user, user.Password!, password), ct);
|
var pwResult = await Task.Run(() => _passwordHasher.VerifyHashedPassword(user, user.Password!, password), ct);
|
||||||
if (pwResult == PasswordVerificationResult.Failed) // TODO: this seems to fail on some valid passwords?
|
if (pwResult == PasswordVerificationResult.Failed)
|
||||||
throw new ApiError.NotFound("No user with that email address found, or password is incorrect", ErrorCode.UserNotFound);
|
throw new ApiError.NotFound("No user with that email address found, or password is incorrect");
|
||||||
if (pwResult == PasswordVerificationResult.SuccessRehashNeeded)
|
if (pwResult == PasswordVerificationResult.SuccessRehashNeeded)
|
||||||
{
|
{
|
||||||
user.Password = await Task.Run(() => _passwordHasher.HashPassword(user, password), ct);
|
user.Password = await Task.Run(() => _passwordHasher.HashPassword(user, password), ct);
|
||||||
|
|
|
@ -7,7 +7,6 @@ import Nav from "react-bootstrap/Nav";
|
||||||
import Navbar from "react-bootstrap/Navbar";
|
import Navbar from "react-bootstrap/Navbar";
|
||||||
import NavDropdown from "react-bootstrap/NavDropdown";
|
import NavDropdown from "react-bootstrap/NavDropdown";
|
||||||
import { BrightnessHigh, BrightnessHighFill, MoonFill } from "react-bootstrap-icons";
|
import { BrightnessHigh, BrightnessHighFill, MoonFill } from "react-bootstrap-icons";
|
||||||
import { useTranslation } from "react-i18next";
|
|
||||||
|
|
||||||
export default function MainNavbar({
|
export default function MainNavbar({
|
||||||
user,
|
user,
|
||||||
|
@ -18,26 +17,23 @@ export default function MainNavbar({
|
||||||
settings: UserSettings;
|
settings: UserSettings;
|
||||||
}) {
|
}) {
|
||||||
const fetcher = useFetcher();
|
const fetcher = useFetcher();
|
||||||
const { t } = useTranslation();
|
|
||||||
|
|
||||||
const userMenu = user ? (
|
const userMenu = user ? (
|
||||||
<NavDropdown title={<>@{user.username}</>} align="end">
|
<NavDropdown title={<>@{user.username}</>} align="end">
|
||||||
<NavDropdown.Item as={Link} to={`/@${user.username}`}>
|
<NavDropdown.Item as={Link} to={`/@${user.username}`}>
|
||||||
{t("navbar.view-profile")}
|
View profile
|
||||||
</NavDropdown.Item>
|
</NavDropdown.Item>
|
||||||
<NavDropdown.Item as={Link} to="/settings">
|
<NavDropdown.Item as={Link} to="/settings">
|
||||||
{t("navbar.settings")}
|
Settings
|
||||||
</NavDropdown.Item>
|
</NavDropdown.Item>
|
||||||
<NavDropdown.Divider />
|
<NavDropdown.Divider />
|
||||||
<fetcher.Form method="POST" action="/auth/log-out">
|
<NavDropdown.Item as={Link} to="/auth/logout">
|
||||||
<NavDropdown.Item as="button" type="submit">
|
Log out
|
||||||
{t("navbar.log-out")}
|
|
||||||
</NavDropdown.Item>
|
</NavDropdown.Item>
|
||||||
</fetcher.Form>
|
|
||||||
</NavDropdown>
|
</NavDropdown>
|
||||||
) : (
|
) : (
|
||||||
<Nav.Link to="/auth/log-in" as={Link}>
|
<Nav.Link to="/auth/login" as={Link}>
|
||||||
{t("navbar.log-in")}
|
Log in or sign up
|
||||||
</Nav.Link>
|
</Nav.Link>
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -63,19 +59,19 @@ export default function MainNavbar({
|
||||||
<NavDropdown
|
<NavDropdown
|
||||||
title={
|
title={
|
||||||
<>
|
<>
|
||||||
<ThemeIcon /> {t("navbar.theme")}
|
<ThemeIcon /> Theme
|
||||||
</>
|
</>
|
||||||
}
|
}
|
||||||
align="end"
|
align="end"
|
||||||
>
|
>
|
||||||
<NavDropdown.Item as="button" name="theme" value="auto" type="submit">
|
<NavDropdown.Item as="button" name="theme" value="auto" type="submit">
|
||||||
{t("navbar.theme-auto")}
|
Automatic
|
||||||
</NavDropdown.Item>
|
</NavDropdown.Item>
|
||||||
<NavDropdown.Item as="button" name="theme" value="dark" type="submit">
|
<NavDropdown.Item as="button" name="theme" value="dark" type="submit">
|
||||||
{t("navbar.theme-dark")}
|
Dark mode
|
||||||
</NavDropdown.Item>
|
</NavDropdown.Item>
|
||||||
<NavDropdown.Item as="button" name="theme" value="light" type="submit">
|
<NavDropdown.Item as="button" name="theme" value="light" type="submit">
|
||||||
{t("navbar.theme-light")}
|
Light mode
|
||||||
</NavDropdown.Item>
|
</NavDropdown.Item>
|
||||||
</NavDropdown>
|
</NavDropdown>
|
||||||
</fetcher.Form>
|
</fetcher.Form>
|
||||||
|
|
|
@ -1,50 +1,18 @@
|
||||||
|
/**
|
||||||
|
* By default, Remix will handle hydrating your app on the client for you.
|
||||||
|
* You are free to delete this file if you'd like to, but if you ever want it revealed again, you can run `npx remix reveal` ✨
|
||||||
|
* For more information, see https://remix.run/file-conventions/entry.client
|
||||||
|
*/
|
||||||
|
|
||||||
import { RemixBrowser } from "@remix-run/react";
|
import { RemixBrowser } from "@remix-run/react";
|
||||||
import { startTransition, StrictMode } from "react";
|
import { startTransition, StrictMode } from "react";
|
||||||
import { hydrateRoot } from "react-dom/client";
|
import { hydrateRoot } from "react-dom/client";
|
||||||
import i18n from "./i18n";
|
|
||||||
import i18next from "i18next";
|
|
||||||
import { I18nextProvider, initReactI18next } from "react-i18next";
|
|
||||||
import LanguageDetector from "i18next-browser-languagedetector";
|
|
||||||
import Backend from "i18next-http-backend";
|
|
||||||
import { getInitialNamespaces } from "remix-i18next/client";
|
|
||||||
|
|
||||||
async function hydrate() {
|
startTransition(() => {
|
||||||
await i18next
|
|
||||||
.use(initReactI18next) // Tell i18next to use the react-i18next plugin
|
|
||||||
.use(LanguageDetector) // Set up a client-side language detector
|
|
||||||
.use(Backend) // Setup your backend
|
|
||||||
.init({
|
|
||||||
...i18n, // spread the configuration
|
|
||||||
// This function detects the namespaces your routes rendered while SSR use
|
|
||||||
ns: getInitialNamespaces(),
|
|
||||||
backend: { loadPath: "/locales/{{lng}}.json" },
|
|
||||||
detection: {
|
|
||||||
// Here only enable htmlTag detection, we'll detect the language only
|
|
||||||
// server-side with remix-i18next, by using the `<html lang>` attribute
|
|
||||||
// we can communicate to the client the language detected server-side
|
|
||||||
order: ["htmlTag"],
|
|
||||||
// Because we only use htmlTag, there's no reason to cache the language
|
|
||||||
// on the browser, so we disable it
|
|
||||||
caches: [],
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
startTransition(() => {
|
|
||||||
hydrateRoot(
|
hydrateRoot(
|
||||||
document,
|
document,
|
||||||
<I18nextProvider i18n={i18next}>
|
|
||||||
<StrictMode>
|
<StrictMode>
|
||||||
<RemixBrowser />
|
<RemixBrowser />
|
||||||
</StrictMode>
|
</StrictMode>,
|
||||||
</I18nextProvider>,
|
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
}
|
|
||||||
|
|
||||||
if (window.requestIdleCallback) {
|
|
||||||
window.requestIdleCallback(hydrate);
|
|
||||||
} else {
|
|
||||||
// Safari doesn't support requestIdleCallback
|
|
||||||
// https://caniuse.com/requestidlecallback
|
|
||||||
window.setTimeout(hydrate, 1);
|
|
||||||
}
|
|
||||||
|
|
|
@ -1,56 +1,56 @@
|
||||||
import { PassThrough } from "stream";
|
/**
|
||||||
import { createReadableStreamFromReadable, type EntryContext } from "@remix-run/node";
|
* By default, Remix will handle generating the HTTP Response for you.
|
||||||
|
* You are free to delete this file if you'd like to, but if you ever want it revealed again, you can run `npx remix reveal` ✨
|
||||||
|
* For more information, see https://remix.run/file-conventions/entry.server
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { PassThrough } from "node:stream";
|
||||||
|
|
||||||
|
import type { AppLoadContext, EntryContext } from "@remix-run/node";
|
||||||
|
import { createReadableStreamFromReadable } from "@remix-run/node";
|
||||||
import { RemixServer } from "@remix-run/react";
|
import { RemixServer } from "@remix-run/react";
|
||||||
import { isbot } from "isbot";
|
import { isbot } from "isbot";
|
||||||
import { renderToPipeableStream } from "react-dom/server";
|
import { renderToPipeableStream } from "react-dom/server";
|
||||||
import { createInstance } from "i18next";
|
|
||||||
import i18next from "./i18next.server";
|
|
||||||
import { I18nextProvider, initReactI18next } from "react-i18next";
|
|
||||||
import Backend from "i18next-fs-backend";
|
|
||||||
import i18n from "./i18n"; // your i18n configuration file
|
|
||||||
import { resolve } from "node:path";
|
|
||||||
|
|
||||||
const ABORT_DELAY = 5000;
|
const ABORT_DELAY = 5_000;
|
||||||
|
|
||||||
export default async function handleRequest(
|
export default function handleRequest(
|
||||||
|
request: Request,
|
||||||
|
responseStatusCode: number,
|
||||||
|
responseHeaders: Headers,
|
||||||
|
remixContext: EntryContext,
|
||||||
|
// This is ignored so we can keep it in the template for visibility. Feel
|
||||||
|
// free to delete this parameter in your app if you're not using it!
|
||||||
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
||||||
|
loadContext: AppLoadContext,
|
||||||
|
) {
|
||||||
|
return isbot(request.headers.get("user-agent") || "")
|
||||||
|
? handleBotRequest(request, responseStatusCode, responseHeaders, remixContext)
|
||||||
|
: handleBrowserRequest(request, responseStatusCode, responseHeaders, remixContext);
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleBotRequest(
|
||||||
request: Request,
|
request: Request,
|
||||||
responseStatusCode: number,
|
responseStatusCode: number,
|
||||||
responseHeaders: Headers,
|
responseHeaders: Headers,
|
||||||
remixContext: EntryContext,
|
remixContext: EntryContext,
|
||||||
) {
|
) {
|
||||||
const callbackName = isbot(request.headers.get("user-agent")) ? "onAllReady" : "onShellReady";
|
|
||||||
|
|
||||||
const instance = createInstance();
|
|
||||||
const lng = await i18next.getLocale(request);
|
|
||||||
const ns = i18next.getRouteNamespaces(remixContext);
|
|
||||||
|
|
||||||
await instance
|
|
||||||
.use(initReactI18next) // Tell our instance to use react-i18next
|
|
||||||
.use(Backend) // Set up our backend
|
|
||||||
.init({
|
|
||||||
...i18n, // spread the configuration
|
|
||||||
lng, // The locale we detected above
|
|
||||||
ns, // The namespaces the routes about to render wants to use
|
|
||||||
backend: { loadPath: resolve("./public/locales/{{lng}}.json") },
|
|
||||||
});
|
|
||||||
|
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
let didError = false;
|
let shellRendered = false;
|
||||||
|
|
||||||
const { pipe, abort } = renderToPipeableStream(
|
const { pipe, abort } = renderToPipeableStream(
|
||||||
<I18nextProvider i18n={instance}>
|
<RemixServer context={remixContext} url={request.url} abortDelay={ABORT_DELAY} />,
|
||||||
<RemixServer context={remixContext} url={request.url} />
|
|
||||||
</I18nextProvider>,
|
|
||||||
{
|
{
|
||||||
[callbackName]: () => {
|
onAllReady() {
|
||||||
|
shellRendered = true;
|
||||||
const body = new PassThrough();
|
const body = new PassThrough();
|
||||||
const stream = createReadableStreamFromReadable(body);
|
const stream = createReadableStreamFromReadable(body);
|
||||||
|
|
||||||
responseHeaders.set("Content-Type", "text/html");
|
responseHeaders.set("Content-Type", "text/html");
|
||||||
|
|
||||||
resolve(
|
resolve(
|
||||||
new Response(stream, {
|
new Response(stream, {
|
||||||
headers: responseHeaders,
|
headers: responseHeaders,
|
||||||
status: didError ? 500 : responseStatusCode,
|
status: responseStatusCode,
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -60,9 +60,59 @@ export default async function handleRequest(
|
||||||
reject(error);
|
reject(error);
|
||||||
},
|
},
|
||||||
onError(error: unknown) {
|
onError(error: unknown) {
|
||||||
didError = true;
|
responseStatusCode = 500;
|
||||||
|
// Log streaming rendering errors from inside the shell. Don't log
|
||||||
|
// errors encountered during initial shell rendering since they'll
|
||||||
|
// reject and get logged in handleDocumentRequest.
|
||||||
|
if (shellRendered) {
|
||||||
console.error(error);
|
console.error(error);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
setTimeout(abort, ABORT_DELAY);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleBrowserRequest(
|
||||||
|
request: Request,
|
||||||
|
responseStatusCode: number,
|
||||||
|
responseHeaders: Headers,
|
||||||
|
remixContext: EntryContext,
|
||||||
|
) {
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
let shellRendered = false;
|
||||||
|
const { pipe, abort } = renderToPipeableStream(
|
||||||
|
<RemixServer context={remixContext} url={request.url} abortDelay={ABORT_DELAY} />,
|
||||||
|
{
|
||||||
|
onShellReady() {
|
||||||
|
shellRendered = true;
|
||||||
|
const body = new PassThrough();
|
||||||
|
const stream = createReadableStreamFromReadable(body);
|
||||||
|
|
||||||
|
responseHeaders.set("Content-Type", "text/html");
|
||||||
|
|
||||||
|
resolve(
|
||||||
|
new Response(stream, {
|
||||||
|
headers: responseHeaders,
|
||||||
|
status: responseStatusCode,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
pipe(body);
|
||||||
|
},
|
||||||
|
onShellError(error: unknown) {
|
||||||
|
reject(error);
|
||||||
|
},
|
||||||
|
onError(error: unknown) {
|
||||||
|
responseStatusCode = 500;
|
||||||
|
// Log streaming rendering errors from inside the shell. Don't log
|
||||||
|
// errors encountered during initial shell rendering since they'll
|
||||||
|
// reject and get logged in handleDocumentRequest.
|
||||||
|
if (shellRendered) {
|
||||||
|
console.error(error);
|
||||||
|
}
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
import { env } from "node:process";
|
import { env } from "node:process";
|
||||||
|
|
||||||
export const API_BASE = env.API_BASE || "https://pronouns.localhost/api";
|
export const API_BASE = env.API_BASE || "https://pronouns.localhost/api";
|
||||||
export const LANGUAGE = env.LANGUAGE || "en";
|
|
||||||
|
|
|
@ -1,5 +0,0 @@
|
||||||
export default {
|
|
||||||
supportedLngs: ["en", "en-XX"],
|
|
||||||
fallbackLng: "en",
|
|
||||||
defaultNS: "common",
|
|
||||||
};
|
|
|
@ -1,28 +0,0 @@
|
||||||
import Backend from "i18next-fs-backend";
|
|
||||||
import { resolve } from "node:path";
|
|
||||||
import { RemixI18Next } from "remix-i18next/server";
|
|
||||||
import i18n from "~/i18n";
|
|
||||||
import { LANGUAGE } from "~/env.server";
|
|
||||||
|
|
||||||
const i18next = new RemixI18Next({
|
|
||||||
detection: {
|
|
||||||
supportedLanguages: [LANGUAGE],
|
|
||||||
fallbackLanguage: LANGUAGE,
|
|
||||||
},
|
|
||||||
// This is the configuration for i18next used
|
|
||||||
// when translating messages server-side only
|
|
||||||
i18next: {
|
|
||||||
...i18n,
|
|
||||||
fallbackLng: LANGUAGE,
|
|
||||||
lng: LANGUAGE,
|
|
||||||
backend: {
|
|
||||||
loadPath: resolve("./public/locales/{{lng}}.json"),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
// The i18next plugins you want RemixI18next to use for `i18n.getFixedT` inside loaders and actions.
|
|
||||||
// E.g. The Backend plugin for loading translations from the file system
|
|
||||||
// Tip: You could pass `resources` to the `i18next` configuration and avoid a backend here
|
|
||||||
plugins: [Backend],
|
|
||||||
});
|
|
||||||
|
|
||||||
export default i18next;
|
|
|
@ -1,7 +0,0 @@
|
||||||
import { User } from "~/lib/api/user";
|
|
||||||
|
|
||||||
export type AuthResponse = {
|
|
||||||
user: User;
|
|
||||||
token: string;
|
|
||||||
expires_at: string;
|
|
||||||
};
|
|
|
@ -7,9 +7,8 @@ import {
|
||||||
ScrollRestoration,
|
ScrollRestoration,
|
||||||
useLoaderData,
|
useLoaderData,
|
||||||
} from "@remix-run/react";
|
} from "@remix-run/react";
|
||||||
import { LoaderFunctionArgs } from "@remix-run/node";
|
import { LoaderFunction } from "@remix-run/node";
|
||||||
import { useChangeLanguage } from "remix-i18next/react";
|
import SSRProvider from "react-bootstrap/SSRProvider";
|
||||||
import { useTranslation } from "react-i18next";
|
|
||||||
|
|
||||||
import serverRequest, { getCookie, writeCookie } from "./lib/request.server";
|
import serverRequest, { getCookie, writeCookie } from "./lib/request.server";
|
||||||
import Meta from "./lib/api/meta";
|
import Meta from "./lib/api/meta";
|
||||||
|
@ -19,9 +18,8 @@ import { ApiError, ErrorCode } from "./lib/api/error";
|
||||||
|
|
||||||
import "./app.scss";
|
import "./app.scss";
|
||||||
import getLocalSettings from "./lib/settings.server";
|
import getLocalSettings from "./lib/settings.server";
|
||||||
import { LANGUAGE } from "~/env.server";
|
|
||||||
|
|
||||||
export const loader = async ({ request }: LoaderFunctionArgs) => {
|
export const loader: LoaderFunction = async ({ request }) => {
|
||||||
const meta = await serverRequest<Meta>("GET", "/meta");
|
const meta = await serverRequest<Meta>("GET", "/meta");
|
||||||
|
|
||||||
const token = getCookie(request, "pronounscc-token");
|
const token = getCookie(request, "pronounscc-token");
|
||||||
|
@ -31,7 +29,8 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {
|
||||||
let settings = getLocalSettings(request);
|
let settings = getLocalSettings(request);
|
||||||
if (token) {
|
if (token) {
|
||||||
try {
|
try {
|
||||||
meUser = await serverRequest<User>("GET", "/users/@me", { token });
|
const user = await serverRequest<User>("GET", "/users/@me", { token });
|
||||||
|
meUser = user;
|
||||||
|
|
||||||
settings = await serverRequest<UserSettings>("GET", "/users/@me/settings", { token });
|
settings = await serverRequest<UserSettings>("GET", "/users/@me/settings", { token });
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
|
@ -43,7 +42,7 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {
|
||||||
}
|
}
|
||||||
|
|
||||||
return json(
|
return json(
|
||||||
{ meta, meUser, settings, locale: LANGUAGE },
|
{ meta, meUser, settings },
|
||||||
{
|
{
|
||||||
headers: { "Set-Cookie": setCookie },
|
headers: { "Set-Cookie": setCookie },
|
||||||
},
|
},
|
||||||
|
@ -51,13 +50,10 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {
|
||||||
};
|
};
|
||||||
|
|
||||||
export function Layout({ children }: { children: React.ReactNode }) {
|
export function Layout({ children }: { children: React.ReactNode }) {
|
||||||
const { settings, locale } = useLoaderData<typeof loader>();
|
const { settings } = useLoaderData<typeof loader>();
|
||||||
const { i18n } = useTranslation();
|
|
||||||
i18n.language = locale;
|
|
||||||
useChangeLanguage(locale);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<html lang={locale} data-bs-theme={settings.dark_mode ? "dark" : "light"} dir={i18n.dir()}>
|
<html lang="en" data-bs-theme={settings.dark_mode ? "dark" : "light"}>
|
||||||
<head>
|
<head>
|
||||||
<meta charSet="utf-8" />
|
<meta charSet="utf-8" />
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||||
|
@ -65,7 +61,7 @@ export function Layout({ children }: { children: React.ReactNode }) {
|
||||||
<Links />
|
<Links />
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
{children}
|
<SSRProvider>{children}</SSRProvider>
|
||||||
<ScrollRestoration />
|
<ScrollRestoration />
|
||||||
<Scripts />
|
<Scripts />
|
||||||
</body>
|
</body>
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
import { json, LoaderFunctionArgs, MetaFunction } from "@remix-run/node";
|
import { json, LoaderFunction, MetaFunction } from "@remix-run/node";
|
||||||
import { redirect, useLoaderData } from "@remix-run/react";
|
import { redirect, useLoaderData } from "@remix-run/react";
|
||||||
import { User } from "~/lib/api/user";
|
import { User } from "~/lib/api/user";
|
||||||
import serverRequest from "~/lib/request.server";
|
import serverRequest from "~/lib/request.server";
|
||||||
|
@ -9,7 +9,7 @@ export const meta: MetaFunction<typeof loader> = ({ data }) => {
|
||||||
return [{ title: `@${user.username} - pronouns.cc` }];
|
return [{ title: `@${user.username} - pronouns.cc` }];
|
||||||
};
|
};
|
||||||
|
|
||||||
export const loader = async ({ params }: LoaderFunctionArgs) => {
|
export const loader: LoaderFunction = async ({ params }) => {
|
||||||
let username = params.username!;
|
let username = params.username!;
|
||||||
if (!username.startsWith("@")) throw redirect(`/@${username}`);
|
if (!username.startsWith("@")) throw redirect(`/@${username}`);
|
||||||
username = username.substring("@".length);
|
username = username.substring("@".length);
|
||||||
|
|
|
@ -6,8 +6,40 @@ export const meta: MetaFunction = () => {
|
||||||
|
|
||||||
export default function Index() {
|
export default function Index() {
|
||||||
return (
|
return (
|
||||||
<div>
|
<div className="font-sans p-4">
|
||||||
<h1>pronouns.cc</h1>
|
<h1 className="text-3xl">Welcome to Remix</h1>
|
||||||
|
<ul className="list-disc mt-4 pl-6 space-y-2">
|
||||||
|
<li>
|
||||||
|
<a
|
||||||
|
className="text-blue-700 underline visited:text-purple-900"
|
||||||
|
target="_blank"
|
||||||
|
href="https://remix.run/start/quickstart"
|
||||||
|
rel="noreferrer"
|
||||||
|
>
|
||||||
|
5m Quick Start
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<a
|
||||||
|
className="text-blue-700 underline visited:text-purple-900"
|
||||||
|
target="_blank"
|
||||||
|
href="https://remix.run/start/tutorial"
|
||||||
|
rel="noreferrer"
|
||||||
|
>
|
||||||
|
30m Tutorial
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<a
|
||||||
|
className="text-blue-700 underline visited:text-purple-900"
|
||||||
|
target="_blank"
|
||||||
|
href="https://remix.run/docs"
|
||||||
|
rel="noreferrer"
|
||||||
|
>
|
||||||
|
Remix Docs
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,62 +0,0 @@
|
||||||
import { MetaFunction, json, LoaderFunctionArgs, ActionFunction, redirect } from "@remix-run/node";
|
|
||||||
import { Form as RemixForm } from "@remix-run/react";
|
|
||||||
import Form from "react-bootstrap/Form";
|
|
||||||
import Button from "react-bootstrap/Button";
|
|
||||||
import { useTranslation } from "react-i18next";
|
|
||||||
import i18n from "~/i18next.server";
|
|
||||||
import serverRequest, { writeCookie } from "~/lib/request.server";
|
|
||||||
import { AuthResponse } from "~/lib/api/auth";
|
|
||||||
|
|
||||||
export const meta: MetaFunction<typeof loader> = ({ data }) => {
|
|
||||||
return [{ title: `${data?.meta.title || "Log in"} - pronouns.cc` }];
|
|
||||||
};
|
|
||||||
|
|
||||||
export const loader = async ({ request }: LoaderFunctionArgs) => {
|
|
||||||
const t = await i18n.getFixedT(request);
|
|
||||||
|
|
||||||
return json({
|
|
||||||
meta: { title: t("log-in.title") },
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
export const action: ActionFunction = async ({ request }) => {
|
|
||||||
const body = await request.formData();
|
|
||||||
const email = body.get("email") as string | null;
|
|
||||||
const password = body.get("password") as string | null;
|
|
||||||
|
|
||||||
console.log(email, password);
|
|
||||||
|
|
||||||
const resp = await serverRequest<AuthResponse>("POST", "/auth/email/login", {
|
|
||||||
body: { email, password },
|
|
||||||
});
|
|
||||||
|
|
||||||
return redirect("/", {
|
|
||||||
status: 303,
|
|
||||||
headers: {
|
|
||||||
"Set-Cookie": writeCookie("pronounscc-token", resp.token),
|
|
||||||
},
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
export default function LoginPage() {
|
|
||||||
const { t } = useTranslation();
|
|
||||||
|
|
||||||
return (
|
|
||||||
<RemixForm action="/auth/log-in" method="POST">
|
|
||||||
<Form as="div">
|
|
||||||
<Form.Group className="mb-3" controlId="email">
|
|
||||||
<Form.Label>{t("log-in.email")}</Form.Label>
|
|
||||||
<Form.Control name="email" type="email" required />
|
|
||||||
</Form.Group>
|
|
||||||
<Form.Group className="mb-3" controlId="password">
|
|
||||||
<Form.Label>{t("log-in.password")}</Form.Label>
|
|
||||||
<Form.Control name="password" type="password" required />
|
|
||||||
</Form.Group>
|
|
||||||
|
|
||||||
<Button variant="primary" type="submit">
|
|
||||||
{t("log-in.log-in-button")}
|
|
||||||
</Button>
|
|
||||||
</Form>
|
|
||||||
</RemixForm>
|
|
||||||
);
|
|
||||||
}
|
|
|
@ -1,11 +0,0 @@
|
||||||
import { ActionFunction } from "@remix-run/node";
|
|
||||||
import { writeCookie } from "~/lib/request.server";
|
|
||||||
|
|
||||||
export const action: ActionFunction = async () => {
|
|
||||||
return new Response(null, {
|
|
||||||
headers: {
|
|
||||||
"Set-Cookie": writeCookie("pronounscc-token", "token", 0),
|
|
||||||
},
|
|
||||||
status: 204,
|
|
||||||
});
|
|
||||||
};
|
|
|
@ -1,3 +0,0 @@
|
||||||
export default {
|
|
||||||
locales: ["en"],
|
|
||||||
};
|
|
|
@ -9,8 +9,7 @@
|
||||||
"lint": "eslint --ignore-path .gitignore --cache --cache-location ./node_modules/.cache/eslint .",
|
"lint": "eslint --ignore-path .gitignore --cache --cache-location ./node_modules/.cache/eslint .",
|
||||||
"start": "cross-env NODE_ENV=production node ./server.js",
|
"start": "cross-env NODE_ENV=production node ./server.js",
|
||||||
"typecheck": "tsc",
|
"typecheck": "tsc",
|
||||||
"format": "prettier -w .",
|
"format": "prettier -w ."
|
||||||
"extract-translations": "i18next 'app/**/*.tsx' -o 'public/locales/$LOCALE.json'"
|
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@remix-run/express": "^2.11.2",
|
"@remix-run/express": "^2.11.2",
|
||||||
|
@ -23,18 +22,12 @@
|
||||||
"cookie": "^0.6.0",
|
"cookie": "^0.6.0",
|
||||||
"cross-env": "^7.0.3",
|
"cross-env": "^7.0.3",
|
||||||
"express": "^4.19.2",
|
"express": "^4.19.2",
|
||||||
"i18next": "^23.15.1",
|
|
||||||
"i18next-browser-languagedetector": "^8.0.0",
|
|
||||||
"i18next-fs-backend": "^2.3.2",
|
|
||||||
"i18next-http-backend": "^2.6.1",
|
|
||||||
"isbot": "^4.1.0",
|
"isbot": "^4.1.0",
|
||||||
"morgan": "^1.10.0",
|
"morgan": "^1.10.0",
|
||||||
"react": "^18.2.0",
|
"react": "^18.2.0",
|
||||||
"react-bootstrap": "^2.10.4",
|
"react-bootstrap": "^2.10.4",
|
||||||
"react-bootstrap-icons": "^1.11.4",
|
"react-bootstrap-icons": "^1.11.4",
|
||||||
"react-dom": "^18.2.0",
|
"react-dom": "^18.2.0"
|
||||||
"react-i18next": "^15.0.1",
|
|
||||||
"remix-i18next": "^6.3.0"
|
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@fontsource/firago": "^5.0.11",
|
"@fontsource/firago": "^5.0.11",
|
||||||
|
@ -53,7 +46,6 @@
|
||||||
"eslint-plugin-jsx-a11y": "^6.7.1",
|
"eslint-plugin-jsx-a11y": "^6.7.1",
|
||||||
"eslint-plugin-react": "^7.33.2",
|
"eslint-plugin-react": "^7.33.2",
|
||||||
"eslint-plugin-react-hooks": "^4.6.0",
|
"eslint-plugin-react-hooks": "^4.6.0",
|
||||||
"i18next-parser": "^9.0.2",
|
|
||||||
"prettier": "^3.3.3",
|
"prettier": "^3.3.3",
|
||||||
"sass": "^1.78.0",
|
"sass": "^1.78.0",
|
||||||
"typescript": "^5.1.6",
|
"typescript": "^5.1.6",
|
||||||
|
|
|
@ -1,18 +0,0 @@
|
||||||
{
|
|
||||||
"navbar": {
|
|
||||||
"view-profile": "View profile",
|
|
||||||
"settings": "Settings",
|
|
||||||
"log-out": "Log out",
|
|
||||||
"log-in": "Log in or sign up",
|
|
||||||
"theme": "Theme",
|
|
||||||
"theme-auto": "Automatic",
|
|
||||||
"theme-dark": "Dark",
|
|
||||||
"theme-light": "Light"
|
|
||||||
},
|
|
||||||
"log-in": {
|
|
||||||
"title": "Log in",
|
|
||||||
"email": "Email address",
|
|
||||||
"password": "Password",
|
|
||||||
"log-in-button": "Log in"
|
|
||||||
}
|
|
||||||
}
|
|
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue