refactor: refactoring static assets (#65)

infinilabs · Jan 22, 2025 · 838f279 · 838f279
1 parent cdeb07c
commit 838f279
Show file tree

Hide file tree

Showing 38 changed files with 10 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -5,8 +5,8 @@ APP_NAME := coco
 APP_VERSION := 1.0.0_SNAPSHOT
 APP_CONFIG := $(APP_NAME).yml
 APP_EOLDate ?= "2025-12-31T10:10:10Z"
-APP_STATIC_FOLDER := assets
-APP_STATIC_PACKAGE := assets
+APP_STATIC_FOLDER := .public
+APP_STATIC_PACKAGE := public
 APP_UI_FOLDER := ui
 APP_PLUGIN_FOLDER := plugins
 PREFER_MANAGED_VENDOR=fase

diff --git a/assets/connector/google_drive/audio.png b/assets/connector/google_drive/audio.png
diff --git a/assets/connector/google_drive/document.png b/assets/connector/google_drive/document.png
diff --git a/assets/connector/google_drive/drawing.png b/assets/connector/google_drive/drawing.png
diff --git a/assets/connector/google_drive/folder.png b/assets/connector/google_drive/folder.png
diff --git a/assets/connector/google_drive/form.png b/assets/connector/google_drive/form.png
diff --git a/assets/connector/google_drive/fusiontable.png b/assets/connector/google_drive/fusiontable.png
diff --git a/assets/connector/google_drive/icon.png b/assets/connector/google_drive/icon.png
diff --git a/assets/connector/google_drive/jam.png b/assets/connector/google_drive/jam.png
diff --git a/assets/connector/google_drive/map.png b/assets/connector/google_drive/map.png
diff --git a/assets/connector/google_drive/ms_excel.png b/assets/connector/google_drive/ms_excel.png
diff --git a/assets/connector/google_drive/ms_powerpoint.png b/assets/connector/google_drive/ms_powerpoint.png
diff --git a/assets/connector/google_drive/ms_word.png b/assets/connector/google_drive/ms_word.png
diff --git a/assets/connector/google_drive/pdf.png b/assets/connector/google_drive/pdf.png
diff --git a/assets/connector/google_drive/photo.png b/assets/connector/google_drive/photo.png
diff --git a/assets/connector/google_drive/presentation.png b/assets/connector/google_drive/presentation.png
diff --git a/assets/connector/google_drive/script.png b/assets/connector/google_drive/script.png
diff --git a/assets/connector/google_drive/site.png b/assets/connector/google_drive/site.png
diff --git a/assets/connector/google_drive/spreadsheet.png b/assets/connector/google_drive/spreadsheet.png
diff --git a/assets/connector/google_drive/video.png b/assets/connector/google_drive/video.png
diff --git a/assets/connector/google_drive/zip.png b/assets/connector/google_drive/zip.png
diff --git a/assets/connector/hugo_site/blog.png b/assets/connector/hugo_site/blog.png
diff --git a/assets/connector/hugo_site/icon.png b/assets/connector/hugo_site/icon.png
diff --git a/assets/connector/hugo_site/news.png b/assets/connector/hugo_site/news.png
diff --git a/assets/connector/hugo_site/web.png b/assets/connector/hugo_site/web.png
diff --git a/assets/connector/hugo_site/web_page.png b/assets/connector/hugo_site/web_page.png
diff --git a/assets/connector/notion/database.png b/assets/connector/notion/database.png
diff --git a/assets/connector/notion/icon.png b/assets/connector/notion/icon.png
diff --git a/assets/connector/notion/page.png b/assets/connector/notion/page.png
diff --git a/assets/connector/yuque/board.png b/assets/connector/yuque/board.png
diff --git a/assets/connector/yuque/book.png b/assets/connector/yuque/book.png
diff --git a/assets/connector/yuque/directory.png b/assets/connector/yuque/directory.png
diff --git a/assets/connector/yuque/doc.png b/assets/connector/yuque/doc.png
diff --git a/assets/connector/yuque/folder.png b/assets/connector/yuque/folder.png
diff --git a/assets/connector/yuque/icon.png b/assets/connector/yuque/icon.png
diff --git a/assets/connector/yuque/sheet.png b/assets/connector/yuque/sheet.png
diff --git a/assets/connector/yuque/table.png b/assets/connector/yuque/table.png
diff --git a/main.go b/main.go
@@ -5,13 +5,14 @@
 package main
 
 import (
-	"infini.sh/coco/assets"
+	public "infini.sh/coco/.public"
 	"infini.sh/coco/config"
 	"infini.sh/coco/modules"
 	_ "infini.sh/coco/modules"
 	_ "infini.sh/coco/plugins"
 	"infini.sh/framework"
 	api1 "infini.sh/framework/core/api"
+	"infini.sh/framework/core/global"
 	"infini.sh/framework/core/module"
 	"infini.sh/framework/core/vfs"
 	"infini.sh/framework/modules/api"
@@ -46,10 +47,12 @@ func main() {
 	app.IgnoreMainConfigMissing()
 	app.Init(nil)
 
-	//register vfs, eg: /assets/connector/google_drive.png
-	urlPath := "/assets/"
-	vfs.RegisterFS(assets.StaticFS{StaticFolder: "assets", TrimLeftPath: urlPath, CheckLocalFirst: true, SkipVFS: false})
-	api1.HandleUI(urlPath, vfs.FileServer(vfs.VFS()))
+	vfs.RegisterFS(public.StaticFS{StaticFolder: global.Env().SystemConfig.WebAppConfig.UI.LocalPath,
+		TrimLeftPath:    global.Env().SystemConfig.WebAppConfig.UI.LocalPath,
+		CheckLocalFirst: global.Env().SystemConfig.WebAppConfig.UI.LocalEnabled,
+		SkipVFS:         !global.Env().SystemConfig.WebAppConfig.UI.VFSEnabled})
+
+	api1.HandleUI("/", vfs.FileServer(vfs.VFS()))
 
 	defer app.Shutdown()