From 5c658db34e46a40d79903cb4f3b953d2d34496d4 Mon Sep 17 00:00:00 2001 From: Arthur Lu Date: Thu, 22 Oct 2026 20:54:23 +0000 Subject: [PATCH] use GODEBUG=embedfollowsymlinks=1 to support symlinked web src files --- Makefile | 14 +++++++------- app/app.go | 4 +++- {web => app/web}/css/form.css | 0 {web => app/web}/css/nav.css | 0 {web => app/web}/css/style.css | 0 {web => app/web}/embed.go | 1 + {web => app/web}/html/account.html | 0 {web => app/web}/html/backups-backups.go.tmpl | 0 {web => app/web}/html/backups.html | 0 {web => app/web}/html/config-boot.go.tmpl | 0 {web => app/web}/html/config-devices.go.tmpl | 0 {web => app/web}/html/config-nets.go.tmpl | 0 {web => app/web}/html/config-volumes.go.tmpl | 0 {web => app/web}/html/config.html | 0 {web => app/web}/html/index-instances.go.tmpl | 0 {web => app/web}/html/index.html | 0 {web => app/web}/html/login.html | 0 {web => app/web}/html/settings.html | 0 .../web}/images/actions/backups/config.svg | 0 .../web}/images/actions/backups/delete-active.svg | 0 .../web}/images/actions/backups/restore.svg | 0 {web => app/web}/images/actions/device/add.svg | 0 {web => app/web}/images/actions/device/config.svg | 0 .../web}/images/actions/device/delete-active.svg | 0 .../images/actions/device/delete-inactive.svg | 0 {web => app/web}/images/actions/disk/add-cd.svg | 0 {web => app/web}/images/actions/disk/add-disk.svg | 0 {web => app/web}/images/actions/disk/attach.svg | 0 .../web}/images/actions/disk/delete-active.svg | 0 .../web}/images/actions/disk/delete-inactive.svg | 0 {web => app/web}/images/actions/disk/detach.svg | 0 .../actions/disk/detach_attach-inactive.svg | 0 .../web}/images/actions/disk/move-active.svg | 0 .../web}/images/actions/disk/move-inactive.svg | 0 .../web}/images/actions/disk/resize-active.svg | 0 .../web}/images/actions/disk/resize-inactive.svg | 0 {web => app/web}/images/actions/drag.svg | 0 {web => app/web}/images/actions/instance/add.svg | 0 .../images/actions/instance/backup-active.svg | 0 .../images/actions/instance/backup-inactive.svg | 0 .../images/actions/instance/config-active.svg | 0 .../images/actions/instance/config-inactive.svg | 0 .../images/actions/instance/console-active.svg | 0 .../images/actions/instance/console-inactive.svg | 0 .../images/actions/instance/delete-active.svg | 0 .../images/actions/instance/delete-inactive.svg | 0 .../web}/images/actions/instance/start.svg | 0 {web => app/web}/images/actions/instance/stop.svg | 0 {web => app/web}/images/actions/network/add.svg | 0 .../web}/images/actions/network/config.svg | 0 .../web}/images/actions/network/delete-active.svg | 0 .../images/actions/network/delete-inactive.svg | 0 {web => app/web}/images/common/add.svg | 0 {web => app/web}/images/common/blank.png | Bin {web => app/web}/images/common/blank.svg | 0 .../web}/images/common/config-inactive.svg | 0 {web => app/web}/images/common/config.svg | 0 {web => app/web}/images/common/delete-active.svg | 0 .../web}/images/common/delete-inactive.svg | 0 {web => app/web}/images/common/search.svg | 0 {web => app/web}/images/favicon.svg | 0 {web => app/web}/images/resources/cpu.svg | 0 {web => app/web}/images/resources/device.svg | 0 {web => app/web}/images/resources/disk.svg | 0 {web => app/web}/images/resources/drive.svg | 0 {web => app/web}/images/resources/network.svg | 0 {web => app/web}/images/resources/ram.svg | 0 {web => app/web}/images/resources/swap.svg | 0 {web => app/web}/images/status/active.svg | 0 {web => app/web}/images/status/inactive.svg | 0 {web => app/web}/images/status/loading.svg | 0 {web => app/web}/modules/Sortable.min.js | 0 {web => app/web}/modules/w3.css | 0 {web => app/web}/modules/wfa.js | 0 {web => app/web}/modules/wfa.wasm.gz | Bin {web => app/web}/scripts/account.js | 0 {web => app/web}/scripts/backups.js | 0 {web => app/web}/scripts/clientsync.js | 0 {web => app/web}/scripts/config.js | 0 {web => app/web}/scripts/dialog.js | 0 {web => app/web}/scripts/draggable.js | 0 {web => app/web}/scripts/index.js | 0 {web => app/web}/scripts/login.js | 0 {web => app/web}/scripts/settings.js | 0 {web => app/web}/scripts/utils.js | 0 {web => app/web}/templates/backups.go.tmpl | 0 {web => app/web}/templates/base.go.tmpl | 0 {web => app/web}/templates/config.go.tmpl | 0 {web => app/web}/templates/instance-card.go.tmpl | 0 {web => app/web}/templates/pool-resources.go.tmpl | 0 {web => app/web}/templates/resource-chart.go.tmpl | 0 {web => app/web}/templates/select.go.tmpl | 0 go.mod | 3 --- web/go.mod | 3 --- 94 files changed, 11 insertions(+), 14 deletions(-) rename {web => app/web}/css/form.css (100%) rename {web => app/web}/css/nav.css (100%) rename {web => app/web}/css/style.css (100%) rename {web => app/web}/embed.go (89%) rename {web => app/web}/html/account.html (100%) rename {web => app/web}/html/backups-backups.go.tmpl (100%) rename {web => app/web}/html/backups.html (100%) rename {web => app/web}/html/config-boot.go.tmpl (100%) rename {web => app/web}/html/config-devices.go.tmpl (100%) rename {web => app/web}/html/config-nets.go.tmpl (100%) rename {web => app/web}/html/config-volumes.go.tmpl (100%) rename {web => app/web}/html/config.html (100%) rename {web => app/web}/html/index-instances.go.tmpl (100%) rename {web => app/web}/html/index.html (100%) rename {web => app/web}/html/login.html (100%) rename {web => app/web}/html/settings.html (100%) rename {web => app/web}/images/actions/backups/config.svg (100%) rename {web => app/web}/images/actions/backups/delete-active.svg (100%) rename {web => app/web}/images/actions/backups/restore.svg (100%) rename {web => app/web}/images/actions/device/add.svg (100%) rename {web => app/web}/images/actions/device/config.svg (100%) rename {web => app/web}/images/actions/device/delete-active.svg (100%) rename {web => app/web}/images/actions/device/delete-inactive.svg (100%) rename {web => app/web}/images/actions/disk/add-cd.svg (100%) rename {web => app/web}/images/actions/disk/add-disk.svg (100%) rename {web => app/web}/images/actions/disk/attach.svg (100%) rename {web => app/web}/images/actions/disk/delete-active.svg (100%) rename {web => app/web}/images/actions/disk/delete-inactive.svg (100%) rename {web => app/web}/images/actions/disk/detach.svg (100%) rename {web => app/web}/images/actions/disk/detach_attach-inactive.svg (100%) rename {web => app/web}/images/actions/disk/move-active.svg (100%) rename {web => app/web}/images/actions/disk/move-inactive.svg (100%) rename {web => app/web}/images/actions/disk/resize-active.svg (100%) rename {web => app/web}/images/actions/disk/resize-inactive.svg (100%) rename {web => app/web}/images/actions/drag.svg (100%) rename {web => app/web}/images/actions/instance/add.svg (100%) rename {web => app/web}/images/actions/instance/backup-active.svg (100%) rename {web => app/web}/images/actions/instance/backup-inactive.svg (100%) rename {web => app/web}/images/actions/instance/config-active.svg (100%) rename {web => app/web}/images/actions/instance/config-inactive.svg (100%) rename {web => app/web}/images/actions/instance/console-active.svg (100%) rename {web => app/web}/images/actions/instance/console-inactive.svg (100%) rename {web => app/web}/images/actions/instance/delete-active.svg (100%) rename {web => app/web}/images/actions/instance/delete-inactive.svg (100%) rename {web => app/web}/images/actions/instance/start.svg (100%) rename {web => app/web}/images/actions/instance/stop.svg (100%) rename {web => app/web}/images/actions/network/add.svg (100%) rename {web => app/web}/images/actions/network/config.svg (100%) rename {web => app/web}/images/actions/network/delete-active.svg (100%) rename {web => app/web}/images/actions/network/delete-inactive.svg (100%) rename {web => app/web}/images/common/add.svg (100%) rename {web => app/web}/images/common/blank.png (100%) rename {web => app/web}/images/common/blank.svg (100%) rename {web => app/web}/images/common/config-inactive.svg (100%) rename {web => app/web}/images/common/config.svg (100%) rename {web => app/web}/images/common/delete-active.svg (100%) rename {web => app/web}/images/common/delete-inactive.svg (100%) rename {web => app/web}/images/common/search.svg (100%) rename {web => app/web}/images/favicon.svg (100%) rename {web => app/web}/images/resources/cpu.svg (100%) rename {web => app/web}/images/resources/device.svg (100%) rename {web => app/web}/images/resources/disk.svg (100%) rename {web => app/web}/images/resources/drive.svg (100%) rename {web => app/web}/images/resources/network.svg (100%) rename {web => app/web}/images/resources/ram.svg (100%) rename {web => app/web}/images/resources/swap.svg (100%) rename {web => app/web}/images/status/active.svg (100%) rename {web => app/web}/images/status/inactive.svg (100%) rename {web => app/web}/images/status/loading.svg (100%) rename {web => app/web}/modules/Sortable.min.js (100%) rename {web => app/web}/modules/w3.css (100%) rename {web => app/web}/modules/wfa.js (100%) rename {web => app/web}/modules/wfa.wasm.gz (100%) rename {web => app/web}/scripts/account.js (100%) rename {web => app/web}/scripts/backups.js (100%) rename {web => app/web}/scripts/clientsync.js (100%) rename {web => app/web}/scripts/config.js (100%) rename {web => app/web}/scripts/dialog.js (100%) rename {web => app/web}/scripts/draggable.js (100%) rename {web => app/web}/scripts/index.js (100%) rename {web => app/web}/scripts/login.js (100%) rename {web => app/web}/scripts/settings.js (100%) rename {web => app/web}/scripts/utils.js (100%) rename {web => app/web}/templates/backups.go.tmpl (100%) rename {web => app/web}/templates/base.go.tmpl (100%) rename {web => app/web}/templates/config.go.tmpl (100%) rename {web => app/web}/templates/instance-card.go.tmpl (100%) rename {web => app/web}/templates/pool-resources.go.tmpl (100%) rename {web => app/web}/templates/resource-chart.go.tmpl (100%) rename {web => app/web}/templates/select.go.tmpl (100%) delete mode 100644 web/go.mod diff --git a/Makefile b/Makefile index 5e7ce76..33732e8 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,12 @@ -.PHONY: build build-web build-wfa clean clean-wfa clean-web +.PHONY: test build build-wfa clean clean-wfa clean-web -build: clean ensure-dist build-wfa build-web +build: clean ensure-dist build-wfa @echo "======================== Building Binary =======================" # resolve symbolic links in web by copying it into dist/web/ - CGO_ENABLED=0 go build -tags release -ldflags="-s -w" -v -o dist/ . + GODEBUG=embedfollowsymlinks=1 CGO_ENABLED=0 go build -tags release -ldflags="-s -w" -v -o dist/ . + +test: + GODEBUG=embedfollowsymlinks=1 CGO_ENABLED=0 go run . clean: clean-wfa clean-web @echo "======================== Cleaning Project ======================" @@ -13,14 +16,11 @@ clean: clean-wfa clean-web ensure-dist: mkdir -p dist -build-web: ensure-dist - cp -rL web/ dist/web/ - clean-web: build-wfa: $(MAKE) -C WFA-JS - cp -f WFA-JS/dist/* web/modules + cp -f WFA-JS/dist/* app/web/modules clean-wfa: $(MAKE) clean -C WFA-JS \ No newline at end of file diff --git a/app/app.go b/app/app.go index ecf9d45..c59db99 100644 --- a/app/app.go +++ b/app/app.go @@ -7,7 +7,9 @@ import ( "net/http" "proxmoxaas-dashboard/app/common" "proxmoxaas-dashboard/app/routes" - "web" // go will complain here until the first build + "proxmoxaas-dashboard/app/web" + + //"web" // go will complain here until the first build "github.com/tdewolff/minify/v2" ) diff --git a/web/css/form.css b/app/web/css/form.css similarity index 100% rename from web/css/form.css rename to app/web/css/form.css diff --git a/web/css/nav.css b/app/web/css/nav.css similarity index 100% rename from web/css/nav.css rename to app/web/css/nav.css diff --git a/web/css/style.css b/app/web/css/style.css similarity index 100% rename from web/css/style.css rename to app/web/css/style.css diff --git a/web/embed.go b/app/web/embed.go similarity index 89% rename from web/embed.go rename to app/web/embed.go index 99be8f9..a642979 100644 --- a/web/embed.go +++ b/app/web/embed.go @@ -6,6 +6,7 @@ import ( //go:embed css/* //go:embed images/* +//go:embed images/*/*/* //go:embed modules/* //go:embed scripts/* var Static embed.FS diff --git a/web/html/account.html b/app/web/html/account.html similarity index 100% rename from web/html/account.html rename to app/web/html/account.html diff --git a/web/html/backups-backups.go.tmpl b/app/web/html/backups-backups.go.tmpl similarity index 100% rename from web/html/backups-backups.go.tmpl rename to app/web/html/backups-backups.go.tmpl diff --git a/web/html/backups.html b/app/web/html/backups.html similarity index 100% rename from web/html/backups.html rename to app/web/html/backups.html diff --git a/web/html/config-boot.go.tmpl b/app/web/html/config-boot.go.tmpl similarity index 100% rename from web/html/config-boot.go.tmpl rename to app/web/html/config-boot.go.tmpl diff --git a/web/html/config-devices.go.tmpl b/app/web/html/config-devices.go.tmpl similarity index 100% rename from web/html/config-devices.go.tmpl rename to app/web/html/config-devices.go.tmpl diff --git a/web/html/config-nets.go.tmpl b/app/web/html/config-nets.go.tmpl similarity index 100% rename from web/html/config-nets.go.tmpl rename to app/web/html/config-nets.go.tmpl diff --git a/web/html/config-volumes.go.tmpl b/app/web/html/config-volumes.go.tmpl similarity index 100% rename from web/html/config-volumes.go.tmpl rename to app/web/html/config-volumes.go.tmpl diff --git a/web/html/config.html b/app/web/html/config.html similarity index 100% rename from web/html/config.html rename to app/web/html/config.html diff --git a/web/html/index-instances.go.tmpl b/app/web/html/index-instances.go.tmpl similarity index 100% rename from web/html/index-instances.go.tmpl rename to app/web/html/index-instances.go.tmpl diff --git a/web/html/index.html b/app/web/html/index.html similarity index 100% rename from web/html/index.html rename to app/web/html/index.html diff --git a/web/html/login.html b/app/web/html/login.html similarity index 100% rename from web/html/login.html rename to app/web/html/login.html diff --git a/web/html/settings.html b/app/web/html/settings.html similarity index 100% rename from web/html/settings.html rename to app/web/html/settings.html diff --git a/web/images/actions/backups/config.svg b/app/web/images/actions/backups/config.svg similarity index 100% rename from web/images/actions/backups/config.svg rename to app/web/images/actions/backups/config.svg diff --git a/web/images/actions/backups/delete-active.svg b/app/web/images/actions/backups/delete-active.svg similarity index 100% rename from web/images/actions/backups/delete-active.svg rename to app/web/images/actions/backups/delete-active.svg diff --git a/web/images/actions/backups/restore.svg b/app/web/images/actions/backups/restore.svg similarity index 100% rename from web/images/actions/backups/restore.svg rename to app/web/images/actions/backups/restore.svg diff --git a/web/images/actions/device/add.svg b/app/web/images/actions/device/add.svg similarity index 100% rename from web/images/actions/device/add.svg rename to app/web/images/actions/device/add.svg diff --git a/web/images/actions/device/config.svg b/app/web/images/actions/device/config.svg similarity index 100% rename from web/images/actions/device/config.svg rename to app/web/images/actions/device/config.svg diff --git a/web/images/actions/device/delete-active.svg b/app/web/images/actions/device/delete-active.svg similarity index 100% rename from web/images/actions/device/delete-active.svg rename to app/web/images/actions/device/delete-active.svg diff --git a/web/images/actions/device/delete-inactive.svg b/app/web/images/actions/device/delete-inactive.svg similarity index 100% rename from web/images/actions/device/delete-inactive.svg rename to app/web/images/actions/device/delete-inactive.svg diff --git a/web/images/actions/disk/add-cd.svg b/app/web/images/actions/disk/add-cd.svg similarity index 100% rename from web/images/actions/disk/add-cd.svg rename to app/web/images/actions/disk/add-cd.svg diff --git a/web/images/actions/disk/add-disk.svg b/app/web/images/actions/disk/add-disk.svg similarity index 100% rename from web/images/actions/disk/add-disk.svg rename to app/web/images/actions/disk/add-disk.svg diff --git a/web/images/actions/disk/attach.svg b/app/web/images/actions/disk/attach.svg similarity index 100% rename from web/images/actions/disk/attach.svg rename to app/web/images/actions/disk/attach.svg diff --git a/web/images/actions/disk/delete-active.svg b/app/web/images/actions/disk/delete-active.svg similarity index 100% rename from web/images/actions/disk/delete-active.svg rename to app/web/images/actions/disk/delete-active.svg diff --git a/web/images/actions/disk/delete-inactive.svg b/app/web/images/actions/disk/delete-inactive.svg similarity index 100% rename from web/images/actions/disk/delete-inactive.svg rename to app/web/images/actions/disk/delete-inactive.svg diff --git a/web/images/actions/disk/detach.svg b/app/web/images/actions/disk/detach.svg similarity index 100% rename from web/images/actions/disk/detach.svg rename to app/web/images/actions/disk/detach.svg diff --git a/web/images/actions/disk/detach_attach-inactive.svg b/app/web/images/actions/disk/detach_attach-inactive.svg similarity index 100% rename from web/images/actions/disk/detach_attach-inactive.svg rename to app/web/images/actions/disk/detach_attach-inactive.svg diff --git a/web/images/actions/disk/move-active.svg b/app/web/images/actions/disk/move-active.svg similarity index 100% rename from web/images/actions/disk/move-active.svg rename to app/web/images/actions/disk/move-active.svg diff --git a/web/images/actions/disk/move-inactive.svg b/app/web/images/actions/disk/move-inactive.svg similarity index 100% rename from web/images/actions/disk/move-inactive.svg rename to app/web/images/actions/disk/move-inactive.svg diff --git a/web/images/actions/disk/resize-active.svg b/app/web/images/actions/disk/resize-active.svg similarity index 100% rename from web/images/actions/disk/resize-active.svg rename to app/web/images/actions/disk/resize-active.svg diff --git a/web/images/actions/disk/resize-inactive.svg b/app/web/images/actions/disk/resize-inactive.svg similarity index 100% rename from web/images/actions/disk/resize-inactive.svg rename to app/web/images/actions/disk/resize-inactive.svg diff --git a/web/images/actions/drag.svg b/app/web/images/actions/drag.svg similarity index 100% rename from web/images/actions/drag.svg rename to app/web/images/actions/drag.svg diff --git a/web/images/actions/instance/add.svg b/app/web/images/actions/instance/add.svg similarity index 100% rename from web/images/actions/instance/add.svg rename to app/web/images/actions/instance/add.svg diff --git a/web/images/actions/instance/backup-active.svg b/app/web/images/actions/instance/backup-active.svg similarity index 100% rename from web/images/actions/instance/backup-active.svg rename to app/web/images/actions/instance/backup-active.svg diff --git a/web/images/actions/instance/backup-inactive.svg b/app/web/images/actions/instance/backup-inactive.svg similarity index 100% rename from web/images/actions/instance/backup-inactive.svg rename to app/web/images/actions/instance/backup-inactive.svg diff --git a/web/images/actions/instance/config-active.svg b/app/web/images/actions/instance/config-active.svg similarity index 100% rename from web/images/actions/instance/config-active.svg rename to app/web/images/actions/instance/config-active.svg diff --git a/web/images/actions/instance/config-inactive.svg b/app/web/images/actions/instance/config-inactive.svg similarity index 100% rename from web/images/actions/instance/config-inactive.svg rename to app/web/images/actions/instance/config-inactive.svg diff --git a/web/images/actions/instance/console-active.svg b/app/web/images/actions/instance/console-active.svg similarity index 100% rename from web/images/actions/instance/console-active.svg rename to app/web/images/actions/instance/console-active.svg diff --git a/web/images/actions/instance/console-inactive.svg b/app/web/images/actions/instance/console-inactive.svg similarity index 100% rename from web/images/actions/instance/console-inactive.svg rename to app/web/images/actions/instance/console-inactive.svg diff --git a/web/images/actions/instance/delete-active.svg b/app/web/images/actions/instance/delete-active.svg similarity index 100% rename from web/images/actions/instance/delete-active.svg rename to app/web/images/actions/instance/delete-active.svg diff --git a/web/images/actions/instance/delete-inactive.svg b/app/web/images/actions/instance/delete-inactive.svg similarity index 100% rename from web/images/actions/instance/delete-inactive.svg rename to app/web/images/actions/instance/delete-inactive.svg diff --git a/web/images/actions/instance/start.svg b/app/web/images/actions/instance/start.svg similarity index 100% rename from web/images/actions/instance/start.svg rename to app/web/images/actions/instance/start.svg diff --git a/web/images/actions/instance/stop.svg b/app/web/images/actions/instance/stop.svg similarity index 100% rename from web/images/actions/instance/stop.svg rename to app/web/images/actions/instance/stop.svg diff --git a/web/images/actions/network/add.svg b/app/web/images/actions/network/add.svg similarity index 100% rename from web/images/actions/network/add.svg rename to app/web/images/actions/network/add.svg diff --git a/web/images/actions/network/config.svg b/app/web/images/actions/network/config.svg similarity index 100% rename from web/images/actions/network/config.svg rename to app/web/images/actions/network/config.svg diff --git a/web/images/actions/network/delete-active.svg b/app/web/images/actions/network/delete-active.svg similarity index 100% rename from web/images/actions/network/delete-active.svg rename to app/web/images/actions/network/delete-active.svg diff --git a/web/images/actions/network/delete-inactive.svg b/app/web/images/actions/network/delete-inactive.svg similarity index 100% rename from web/images/actions/network/delete-inactive.svg rename to app/web/images/actions/network/delete-inactive.svg diff --git a/web/images/common/add.svg b/app/web/images/common/add.svg similarity index 100% rename from web/images/common/add.svg rename to app/web/images/common/add.svg diff --git a/web/images/common/blank.png b/app/web/images/common/blank.png similarity index 100% rename from web/images/common/blank.png rename to app/web/images/common/blank.png diff --git a/web/images/common/blank.svg b/app/web/images/common/blank.svg similarity index 100% rename from web/images/common/blank.svg rename to app/web/images/common/blank.svg diff --git a/web/images/common/config-inactive.svg b/app/web/images/common/config-inactive.svg similarity index 100% rename from web/images/common/config-inactive.svg rename to app/web/images/common/config-inactive.svg diff --git a/web/images/common/config.svg b/app/web/images/common/config.svg similarity index 100% rename from web/images/common/config.svg rename to app/web/images/common/config.svg diff --git a/web/images/common/delete-active.svg b/app/web/images/common/delete-active.svg similarity index 100% rename from web/images/common/delete-active.svg rename to app/web/images/common/delete-active.svg diff --git a/web/images/common/delete-inactive.svg b/app/web/images/common/delete-inactive.svg similarity index 100% rename from web/images/common/delete-inactive.svg rename to app/web/images/common/delete-inactive.svg diff --git a/web/images/common/search.svg b/app/web/images/common/search.svg similarity index 100% rename from web/images/common/search.svg rename to app/web/images/common/search.svg diff --git a/web/images/favicon.svg b/app/web/images/favicon.svg similarity index 100% rename from web/images/favicon.svg rename to app/web/images/favicon.svg diff --git a/web/images/resources/cpu.svg b/app/web/images/resources/cpu.svg similarity index 100% rename from web/images/resources/cpu.svg rename to app/web/images/resources/cpu.svg diff --git a/web/images/resources/device.svg b/app/web/images/resources/device.svg similarity index 100% rename from web/images/resources/device.svg rename to app/web/images/resources/device.svg diff --git a/web/images/resources/disk.svg b/app/web/images/resources/disk.svg similarity index 100% rename from web/images/resources/disk.svg rename to app/web/images/resources/disk.svg diff --git a/web/images/resources/drive.svg b/app/web/images/resources/drive.svg similarity index 100% rename from web/images/resources/drive.svg rename to app/web/images/resources/drive.svg diff --git a/web/images/resources/network.svg b/app/web/images/resources/network.svg similarity index 100% rename from web/images/resources/network.svg rename to app/web/images/resources/network.svg diff --git a/web/images/resources/ram.svg b/app/web/images/resources/ram.svg similarity index 100% rename from web/images/resources/ram.svg rename to app/web/images/resources/ram.svg diff --git a/web/images/resources/swap.svg b/app/web/images/resources/swap.svg similarity index 100% rename from web/images/resources/swap.svg rename to app/web/images/resources/swap.svg diff --git a/web/images/status/active.svg b/app/web/images/status/active.svg similarity index 100% rename from web/images/status/active.svg rename to app/web/images/status/active.svg diff --git a/web/images/status/inactive.svg b/app/web/images/status/inactive.svg similarity index 100% rename from web/images/status/inactive.svg rename to app/web/images/status/inactive.svg diff --git a/web/images/status/loading.svg b/app/web/images/status/loading.svg similarity index 100% rename from web/images/status/loading.svg rename to app/web/images/status/loading.svg diff --git a/web/modules/Sortable.min.js b/app/web/modules/Sortable.min.js similarity index 100% rename from web/modules/Sortable.min.js rename to app/web/modules/Sortable.min.js diff --git a/web/modules/w3.css b/app/web/modules/w3.css similarity index 100% rename from web/modules/w3.css rename to app/web/modules/w3.css diff --git a/web/modules/wfa.js b/app/web/modules/wfa.js similarity index 100% rename from web/modules/wfa.js rename to app/web/modules/wfa.js diff --git a/web/modules/wfa.wasm.gz b/app/web/modules/wfa.wasm.gz similarity index 100% rename from web/modules/wfa.wasm.gz rename to app/web/modules/wfa.wasm.gz diff --git a/web/scripts/account.js b/app/web/scripts/account.js similarity index 100% rename from web/scripts/account.js rename to app/web/scripts/account.js diff --git a/web/scripts/backups.js b/app/web/scripts/backups.js similarity index 100% rename from web/scripts/backups.js rename to app/web/scripts/backups.js diff --git a/web/scripts/clientsync.js b/app/web/scripts/clientsync.js similarity index 100% rename from web/scripts/clientsync.js rename to app/web/scripts/clientsync.js diff --git a/web/scripts/config.js b/app/web/scripts/config.js similarity index 100% rename from web/scripts/config.js rename to app/web/scripts/config.js diff --git a/web/scripts/dialog.js b/app/web/scripts/dialog.js similarity index 100% rename from web/scripts/dialog.js rename to app/web/scripts/dialog.js diff --git a/web/scripts/draggable.js b/app/web/scripts/draggable.js similarity index 100% rename from web/scripts/draggable.js rename to app/web/scripts/draggable.js diff --git a/web/scripts/index.js b/app/web/scripts/index.js similarity index 100% rename from web/scripts/index.js rename to app/web/scripts/index.js diff --git a/web/scripts/login.js b/app/web/scripts/login.js similarity index 100% rename from web/scripts/login.js rename to app/web/scripts/login.js diff --git a/web/scripts/settings.js b/app/web/scripts/settings.js similarity index 100% rename from web/scripts/settings.js rename to app/web/scripts/settings.js diff --git a/web/scripts/utils.js b/app/web/scripts/utils.js similarity index 100% rename from web/scripts/utils.js rename to app/web/scripts/utils.js diff --git a/web/templates/backups.go.tmpl b/app/web/templates/backups.go.tmpl similarity index 100% rename from web/templates/backups.go.tmpl rename to app/web/templates/backups.go.tmpl diff --git a/web/templates/base.go.tmpl b/app/web/templates/base.go.tmpl similarity index 100% rename from web/templates/base.go.tmpl rename to app/web/templates/base.go.tmpl diff --git a/web/templates/config.go.tmpl b/app/web/templates/config.go.tmpl similarity index 100% rename from web/templates/config.go.tmpl rename to app/web/templates/config.go.tmpl diff --git a/web/templates/instance-card.go.tmpl b/app/web/templates/instance-card.go.tmpl similarity index 100% rename from web/templates/instance-card.go.tmpl rename to app/web/templates/instance-card.go.tmpl diff --git a/web/templates/pool-resources.go.tmpl b/app/web/templates/pool-resources.go.tmpl similarity index 100% rename from web/templates/pool-resources.go.tmpl rename to app/web/templates/pool-resources.go.tmpl diff --git a/web/templates/resource-chart.go.tmpl b/app/web/templates/resource-chart.go.tmpl similarity index 100% rename from web/templates/resource-chart.go.tmpl rename to app/web/templates/resource-chart.go.tmpl diff --git a/web/templates/select.go.tmpl b/app/web/templates/select.go.tmpl similarity index 100% rename from web/templates/select.go.tmpl rename to app/web/templates/select.go.tmpl diff --git a/go.mod b/go.mod index f4a77e5..0103903 100644 --- a/go.mod +++ b/go.mod @@ -7,11 +7,8 @@ require ( github.com/go-viper/mapstructure/v2 v2.5.0 github.com/tdewolff/minify/v2 v2.24.17 proxmoxaas-common-lib v0.0.0 - web v0.0.0 ) replace proxmoxaas-common-lib => ./proxmoxaas-common-lib -replace web => ./dist/web - require github.com/tdewolff/parse/v2 v2.8.16 // indirect diff --git a/web/go.mod b/web/go.mod deleted file mode 100644 index 32b9c93..0000000 --- a/web/go.mod +++ /dev/null @@ -1,3 +0,0 @@ -module web - -go 1.26.0