From 5fc44042ce633f0cb1c5c787a109aa2bd2bea432 Mon Sep 17 00:00:00 2001
From: Diptesh Choudhuri <ignisda2001@gmail.com>
Date: Thu, 18 Jul 2024 05:07:33 +0530
Subject: [PATCH] feat(*): avoid extra DNS lookup, add note

---
 apps/frontend/app/lib/hooks.ts                 |  2 +-
 apps/frontend/app/lib/utilities.server.ts      |  3 ++-
 apps/frontend/app/routes/_dashboard._index.tsx |  9 +++++++++
 apps/frontend/app/routes/_dashboard.tsx        | 11 ++++++++---
 apps/frontend/app/routes/auth.tsx              |  4 +---
 ci/Caddyfile                                   |  6 +++---
 docs/includes/backend-config-schema.yaml       |  4 ++++
 libs/config/src/lib.rs                         |  2 ++
 8 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/apps/frontend/app/lib/hooks.ts b/apps/frontend/app/lib/hooks.ts
index 5da575fdc5..83e090f4b8 100644
--- a/apps/frontend/app/lib/hooks.ts
+++ b/apps/frontend/app/lib/hooks.ts
@@ -115,7 +115,7 @@ export const useUserMetadataDetails = (metadataId?: string | null) => {
 	return useQuery(getUserMetadataDetailsQuery(metadataId));
 };
 
-const useDashboardLayoutData = () => {
+export const useDashboardLayoutData = () => {
 	const loaderData =
 		useRouteLoaderData<typeof dashboardLoader>("routes/_dashboard");
 	return loaderData;
diff --git a/apps/frontend/app/lib/utilities.server.ts b/apps/frontend/app/lib/utilities.server.ts
index 91965049fd..355f29c70b 100644
--- a/apps/frontend/app/lib/utilities.server.ts
+++ b/apps/frontend/app/lib/utilities.server.ts
@@ -41,7 +41,7 @@ import {
 	toastKey,
 } from "~/lib/generals";
 
-export const API_URL = process.env.API_URL || "http://localhost:8000/backend";
+export const API_URL = process.env.API_URL || "http://127.0.0.1:8000/backend";
 
 class AuthenticatedGraphQLClient extends GraphQLClient {
 	async authenticatedRequest<T, V extends Variables = Variables>(
@@ -130,6 +130,7 @@ const expectedServerVariables = z.object({
 	FRONTEND_OIDC_BUTTON_LABEL: z
 		.string()
 		.default("Continue with OpenID Connect"),
+	FRONTEND_DASHBOARD_MESSAGE: z.string().optional(),
 });
 
 /**
diff --git a/apps/frontend/app/routes/_dashboard._index.tsx b/apps/frontend/app/routes/_dashboard._index.tsx
index 41449fade3..4961dc2fbd 100644
--- a/apps/frontend/app/routes/_dashboard._index.tsx
+++ b/apps/frontend/app/routes/_dashboard._index.tsx
@@ -1,5 +1,6 @@
 import { $path } from "@ignisda/remix-routes";
 import {
+	Alert,
 	Box,
 	Center,
 	Container,
@@ -28,6 +29,7 @@ import { humanizeDuration, isNumber } from "@ryot/ts-utils";
 import {
 	IconBarbell,
 	IconFriends,
+	IconInfoCircle,
 	IconScaleOutline,
 	IconServer,
 } from "@tabler/icons-react";
@@ -42,6 +44,7 @@ import {
 } from "~/components/media";
 import { dayjsLib, getLot, getMetadataIcon } from "~/lib/generals";
 import {
+	useDashboardLayoutData,
 	useGetMantineColor,
 	useUserPreferences,
 	useUserUnitSystem,
@@ -108,11 +111,17 @@ export default function Page() {
 	const userPreferences = useUserPreferences();
 	const unitSystem = useUserUnitSystem();
 	const theme = useMantineTheme();
+	const dashboardLayoutData = useDashboardLayoutData();
 	const latestUserSummary = loaderData.latestUserSummary.data;
 
 	return (
 		<Container>
 			<Stack gap={32}>
+				{dashboardLayoutData.envData.FRONTEND_DASHBOARD_MESSAGE ? (
+					<Alert variant="default" icon={<IconInfoCircle />}>
+						{dashboardLayoutData.envData.FRONTEND_DASHBOARD_MESSAGE}
+					</Alert>
+				) : null}
 				{userPreferences.general.dashboard.map((de) =>
 					match([de.section, de.hidden])
 						.with([DashboardElementLot.Upcoming, false], () =>
diff --git a/apps/frontend/app/routes/_dashboard.tsx b/apps/frontend/app/routes/_dashboard.tsx
index bf4cdc3bd5..1cdfc12046 100644
--- a/apps/frontend/app/routes/_dashboard.tsx
+++ b/apps/frontend/app/routes/_dashboard.tsx
@@ -259,6 +259,9 @@ export const loader = unstable_defineLoader(async ({ request }) => {
 
 export function ErrorBoundary() {
 	const error = useRouteError() as Error;
+	const message = isRouteErrorResponse(error)
+		? error.data.message
+		: error.message;
 
 	return (
 		<Container size="sm" py={{ base: 100, md: 200 }}>
@@ -266,9 +269,11 @@ export function ErrorBoundary() {
 				<Text c="red" fz={{ base: 30, md: 40 }}>
 					We encountered an error
 				</Text>
-				<Code mah={100} c="pink">
-					{isRouteErrorResponse(error) ? error.data.message : error.message}
-				</Code>
+				{message ? (
+					<Code mah={100} c="pink">
+						{message}
+					</Code>
+				) : null}
 				<Group wrap="nowrap">
 					<Button
 						fullWidth
diff --git a/apps/frontend/app/routes/auth.tsx b/apps/frontend/app/routes/auth.tsx
index 3a01a73091..ad82024d59 100644
--- a/apps/frontend/app/routes/auth.tsx
+++ b/apps/frontend/app/routes/auth.tsx
@@ -84,9 +84,7 @@ export const loader = unstable_defineLoader(async ({ request }) => {
 					closeAfter: dayjsLib.duration(10, "second").asMilliseconds(),
 				},
 			);
-		throw await redirectWithToast($path("/"), {
-			message: "You were already logged in",
-		});
+		throw redirect($path("/"));
 	}
 	const [enabledFeatures, { coreDetails }] = await Promise.all([
 		getCoreEnabledFeatures(),
diff --git a/ci/Caddyfile b/ci/Caddyfile
index 972289c12b..774e268bcc 100644
--- a/ci/Caddyfile
+++ b/ci/Caddyfile
@@ -6,10 +6,10 @@
 :{$PORT:8000} {
 	handle_path /_i/* {
 		rewrite * /webhooks/integrations{path}
-		reverse_proxy localhost:5000
+		reverse_proxy 127.0.0.1:5000
 	}
 	handle_path /backend* {
-		reverse_proxy localhost:5000
+		reverse_proxy 127.0.0.1:5000
 	}
 	handle /health {
 		header Content-Type text/plain
@@ -19,5 +19,5 @@
 			{{ httpInclude "/backend/config" }}
 		TXT
 	}
-	reverse_proxy localhost:3000
+	reverse_proxy 127.0.0.1:3000
 }
diff --git a/docs/includes/backend-config-schema.yaml b/docs/includes/backend-config-schema.yaml
index 9daf90815f..af789a3468 100644
--- a/docs/includes/backend-config-schema.yaml
+++ b/docs/includes/backend-config-schema.yaml
@@ -77,6 +77,10 @@ file_storage:
 
 # Settings related to frontend storage.
 frontend:
+  # A message to be displayed on the dashboard.
+  # @envvar FRONTEND_DASHBOARD_MESSAGE
+  dashboard_message: ""
+
   # The button label for OIDC authentication.
   # @envvar FRONTEND_OIDC_BUTTON_LABEL
   oidc_button_label: "Continue with OpenID Connect"
diff --git a/libs/config/src/lib.rs b/libs/config/src/lib.rs
index 098b24ebb0..b99cdcddf0 100644
--- a/libs/config/src/lib.rs
+++ b/libs/config/src/lib.rs
@@ -296,6 +296,8 @@ pub struct FrontendConfig {
     /// The button label for OIDC authentication.
     #[setting(default = "Continue with OpenID Connect")]
     pub oidc_button_label: String,
+    /// A message to be displayed on the dashboard.
+    pub dashboard_message: String,
     /// Settings related to Umami analytics.
     #[setting(nested)]
     pub umami: FrontendUmamiConfig,