Merge pull request #37 from fraunhoferfokus/development

* improved progress
fraunhoferfokus · Jun 11, 2024 · b67a92d · b67a92d
2 parents 34182f5 + a9d82ea
commit b67a92d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/core/version b/core/version
@@ -1 +1 @@
-0.2.26
+0.2.27
diff --git a/generator/frontend.go b/generator/frontend.go
@@ -77,7 +77,7 @@ func generateFrontend(spec *openapi3.T, conf GeneratorConfig) {
 
 	// files in pages directory
 	fs.CopyWebFile("web/pages", restPath, "render.go", true)
-	fs.CopyWebFile("web/pages", restPath, "progress.go", true)
+	createFileFromTemplate(filepath.Join(restPath, "progress.go"), "templates/web/pages/progress.go.tmpl", conf)
 	createFileFromTemplate(filepath.Join(pagesPath, "localize.go"), "templates/web/pages/localize.go.tmpl", conf)
 	if _, err := os.Stat(filepath.Join(pagesPath, "languages.templ")); errors.Is(err, os.ErrNotExist) {
 		createFileFromTemplate(filepath.Join(pagesPath, "languages.templ"), "templates/web/pages/languages.templ.tmpl", conf)

diff --git a/templates/core/config.go.tmpl b/templates/core/config.go.tmpl
@@ -37,7 +37,8 @@ type Config struct {
 	Tracing             bool     `default:"false"`
 	Language            string   `default:"de"`
 	Languages           []string `default:"en,de"`
-	UseSse              bool     `default:"false"`
+	UseSse              bool     `default:"false" split_words:"true"`
+	ProgressDuration    int      `default:"100" split_words:"true"`
 	ConfigExt
 }
 

diff --git a/templates/web/pages/index.templ.tmpl b/templates/web/pages/index.templ.tmpl
@@ -20,6 +20,7 @@ templ Index(lzr *i18n.Localizer) {
 			<script src="/js/bootstrap.bundle.min.js"></script>
 			<script src="/js/htmx.min.js"></script>
 			<script src="/js/hyperscript.js"></script>
+			<script src="js/sse.js"></script>
 		</head>
 		<body>
 			@Content(lzr)

diff --git a/templates/web/pages/progress.go → templates/web/pages/progress.go.tmpl b/templates/web/pages/progress.go → templates/web/pages/progress.go.tmpl
@@ -6,10 +6,13 @@ import (
 	"time"
 
 	"github.com/r3labs/sse/v2"
+
+	"{{ lcfirst ( camelcase .ModuleName ) }}/core"
 )
 
 // learn medium duration
-var durationSum int = 100 // 10 Seconds as initial duration
+// ToDo: use a map for more than one progress case
+var durationSum int = core.AppConfig.ProgressDuration // initial duration in deciseconds
 var durationNb int = 1
 
 const picoNull = `<progress value="0" max="100" />`