embed site files / form tweaks

main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	_ "beszel/migrations"
+	"beszel/site"
 	"bytes"
 	"crypto/ed25519"
 	"encoding/json"
@@ -83,8 +84,10 @@ func main() {
 			e.Router.Any("/*", echo.WrapHandler(proxy))
 			e.Router.Any("/", echo.WrapHandler(proxy))
 		default:
-			e.Router.GET("/icons/*", apis.StaticDirectoryHandler(os.DirFS("./site/dist/icons"), false))
+			assets, _ := site.Assets()
-			e.Router.Any("/*", apis.StaticDirectoryHandler(os.DirFS("./site/dist"), true))
+			icons, _ := site.Icons()
+			e.Router.GET("/icons/*", apis.StaticDirectoryHandler(icons, false))
+			e.Router.Any("/*", apis.StaticDirectoryHandler(assets, true))
 		}
 		return nil
 	})

site/embed.go

@@ -0,0 +1,17 @@
+package site
+
+import (
+	"embed"
+	"io/fs"
+)
+
+//go:embed all:dist
+var assets embed.FS
+
+func Assets() (fs.FS, error) {
+	return fs.Sub(assets, "dist")
+}
+
+func Icons() (fs.FS, error) {
+	return fs.Sub(assets, "dist/icons")
+}

site/src/components/login/auth-form.tsx

@@ -306,7 +306,7 @@ export function UserAuthForm({
 				</Dialog>
 			)}
 
-			{authMethods.emailPassword && (
+			{authMethods.emailPassword && !isFirstRun && (
 				<Link
 					href="/forgot-password"
 					className="text-sm mx-auto hover:text-brand underline underline-offset-4 opacity-70 hover:opacity-100 transition-opacity"

site/src/components/login/forgot-pass-form.tsx

@@ -87,7 +87,7 @@ export default function ForgotPassword() {
 						<DialogTitle>Command line instructions</DialogTitle>
 					</DialogHeader>
 					<p className="text-primary/70 text-[0.95em]">
-						If you don't have an SMTP server configured, you can use the following command to reset
+						Use the following command to reset
 						your password:
 					</p>
 					<code className="bg-muted rounded-sm py-0.5 px-2.5 mr-auto text-sm">