From 540a4a6a00a2de2c5aea449d90b3300d5d1a9be9 Mon Sep 17 00:00:00 2001
From: Egor Aristov <ef@efprojects.com>
Date: Thu, 6 Feb 2025 01:35:23 +0300
Subject: [PATCH] embed fs

---
 cmd/webserver/webserver.go                   | 6 ++++--
 frontend/wizard-vue/embed.go                 | 8 ++++++++
 frontend/wizard-vue/src/components/Field.vue | 2 +-
 internal/{delivery => api}/http/handler.go   | 0
 4 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 frontend/wizard-vue/embed.go
 rename internal/{delivery => api}/http/handler.go (100%)

diff --git a/cmd/webserver/webserver.go b/cmd/webserver/webserver.go
index b0ae30c..e132acd 100644
--- a/cmd/webserver/webserver.go
+++ b/cmd/webserver/webserver.go
@@ -2,9 +2,10 @@ package main
 
 import (
 	"context"
+	wizard_vue "github.com/egor3f/rssalchemy/frontend/wizard-vue"
 	"github.com/egor3f/rssalchemy/internal/adapters/natsadapter"
+	httpApi "github.com/egor3f/rssalchemy/internal/api/http"
 	"github.com/egor3f/rssalchemy/internal/config"
-	httpApi "github.com/egor3f/rssalchemy/internal/delivery/http"
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
 	"github.com/labstack/gommon/log"
@@ -47,7 +48,8 @@ func main() {
 	e := echo.New()
 	e.Use(middleware.Logger())
 	e.Use(middleware.Recover())
-	e.Static("/", "frontend/wizard")
+
+	e.StaticFS("/", echo.MustSubFS(wizard_vue.EmbedFS, wizard_vue.FSPrefix))
 
 	apiHandler := httpApi.New(cq)
 	apiHandler.SetupRoutes(e.Group("/api/v1"))
diff --git a/frontend/wizard-vue/embed.go b/frontend/wizard-vue/embed.go
new file mode 100644
index 0000000..5181ef6
--- /dev/null
+++ b/frontend/wizard-vue/embed.go
@@ -0,0 +1,8 @@
+package wizard_vue
+
+import "embed"
+
+//go:embed dist
+var EmbedFS embed.FS
+
+const FSPrefix = "dist"
diff --git a/frontend/wizard-vue/src/components/Field.vue b/frontend/wizard-vue/src/components/Field.vue
index 474bea4..202e944 100644
--- a/frontend/wizard-vue/src/components/Field.vue
+++ b/frontend/wizard-vue/src/components/Field.vue
@@ -4,7 +4,7 @@ import {getCurrentInstance, onMounted, useTemplateRef} from "vue";
 
 const {field, focused} = defineProps<{
   field: Field,
-  focused: boolean,
+  focused?: boolean,
 }>();
 const id = 'field' + getCurrentInstance()?.uid;
 const model = defineModel();
diff --git a/internal/delivery/http/handler.go b/internal/api/http/handler.go
similarity index 100%
rename from internal/delivery/http/handler.go
rename to internal/api/http/handler.go