From e5ddede0c70890e68050bda38d250ac7f0bb047b Mon Sep 17 00:00:00 2001 From: Tom Wiesing Date: Wed, 19 Oct 2022 11:31:21 +0200 Subject: [PATCH] internal/dis/componeont/control: Move paths --- Makefile | 4 ++-- internal/dis/component/{ => control}/home/home.go | 0 internal/dis/component/{ => control}/home/home.html | 0 internal/dis/component/{ => control}/home/public.go | 2 +- internal/dis/component/{ => control}/home/redirect.go | 0 internal/dis/component/{ => control}/info/html/index.html | 0 .../dis/component/{ => control}/info/html/instance.html | 0 internal/dis/component/{ => control}/info/index.go | 2 +- internal/dis/component/{ => control}/info/info.go | 0 internal/dis/component/{ => control}/info/instance.go | 2 +- internal/dis/component/{ => control}/info/socket.go | 0 internal/dis/component/{ => control}/static/assets.go | 0 internal/dis/component/{ => control}/static/assets_dist.go | 0 internal/dis/component/{ => control}/static/build.mjs | 0 .../{ => control}/static/dist/ControlIndex.613b02c2.js | 0 .../{ => control}/static/dist/ControlIndex.6d2ae968.css | 0 .../{ => control}/static/dist/ControlIndex.6d59e220.css | 0 .../{ => control}/static/dist/ControlIndex.cfbf936d.js | 0 .../{ => control}/static/dist/ControlInstance.38d394c2.css | 0 .../{ => control}/static/dist/ControlInstance.66b95713.js | 0 .../{ => control}/static/dist/ControlInstance.9cc7166d.js | 0 .../{ => control}/static/dist/HomeHome.38d394c2.css | 0 .../{ => control}/static/dist/HomeHome.38d394c2.js | 0 .../{ => control}/static/dist/HomeHome.a75f04fa.css | 0 internal/dis/component/{ => control}/static/package.json | 0 .../dis/component/{ => control}/static/src/base/index.css | 0 .../dis/component/{ => control}/static/src/base/index.ts | 0 .../{ => control}/static/src/entry/ControlIndex/index.css | 0 .../{ => control}/static/src/entry/ControlIndex/index.ts | 0 .../static/src/entry/ControlInstance/index.css | 0 .../{ => control}/static/src/entry/ControlInstance/index.ts | 0 .../{ => control}/static/src/entry/HomeHome/index.css | 0 .../{ => control}/static/src/entry/HomeHome/index.ts | 0 .../{ => control}/static/src/lib/autolink/index.css | 0 .../{ => control}/static/src/lib/autolink/index.ts | 0 .../{ => control}/static/src/lib/highlight/index.ts | 0 .../component/{ => control}/static/src/lib/remote/index.css | 0 .../component/{ => control}/static/src/lib/remote/index.ts | 0 .../component/{ => control}/static/src/lib/remote/socket.ts | 0 internal/dis/component/{ => control}/static/static.go | 0 internal/dis/component/{ => control}/static/tsconfig.json | 0 internal/dis/component/{ => control}/static/yarn.lock | 0 internal/dis/distillery.go | 6 +++--- 43 files changed, 8 insertions(+), 8 deletions(-) rename internal/dis/component/{ => control}/home/home.go (100%) rename internal/dis/component/{ => control}/home/home.html (100%) rename internal/dis/component/{ => control}/home/public.go (96%) rename internal/dis/component/{ => control}/home/redirect.go (100%) rename internal/dis/component/{ => control}/info/html/index.html (100%) rename internal/dis/component/{ => control}/info/html/instance.html (100%) rename internal/dis/component/{ => control}/info/index.go (95%) rename internal/dis/component/{ => control}/info/info.go (100%) rename internal/dis/component/{ => control}/info/instance.go (93%) rename internal/dis/component/{ => control}/info/socket.go (100%) rename internal/dis/component/{ => control}/static/assets.go (100%) rename internal/dis/component/{ => control}/static/assets_dist.go (100%) rename internal/dis/component/{ => control}/static/build.mjs (100%) rename internal/dis/component/{ => control}/static/dist/ControlIndex.613b02c2.js (100%) rename internal/dis/component/{ => control}/static/dist/ControlIndex.6d2ae968.css (100%) rename internal/dis/component/{ => control}/static/dist/ControlIndex.6d59e220.css (100%) rename internal/dis/component/{ => control}/static/dist/ControlIndex.cfbf936d.js (100%) rename internal/dis/component/{ => control}/static/dist/ControlInstance.38d394c2.css (100%) rename internal/dis/component/{ => control}/static/dist/ControlInstance.66b95713.js (100%) rename internal/dis/component/{ => control}/static/dist/ControlInstance.9cc7166d.js (100%) rename internal/dis/component/{ => control}/static/dist/HomeHome.38d394c2.css (100%) rename internal/dis/component/{ => control}/static/dist/HomeHome.38d394c2.js (100%) rename internal/dis/component/{ => control}/static/dist/HomeHome.a75f04fa.css (100%) rename internal/dis/component/{ => control}/static/package.json (100%) rename internal/dis/component/{ => control}/static/src/base/index.css (100%) rename internal/dis/component/{ => control}/static/src/base/index.ts (100%) rename internal/dis/component/{ => control}/static/src/entry/ControlIndex/index.css (100%) rename internal/dis/component/{ => control}/static/src/entry/ControlIndex/index.ts (100%) rename internal/dis/component/{ => control}/static/src/entry/ControlInstance/index.css (100%) rename internal/dis/component/{ => control}/static/src/entry/ControlInstance/index.ts (100%) rename internal/dis/component/{ => control}/static/src/entry/HomeHome/index.css (100%) rename internal/dis/component/{ => control}/static/src/entry/HomeHome/index.ts (100%) rename internal/dis/component/{ => control}/static/src/lib/autolink/index.css (100%) rename internal/dis/component/{ => control}/static/src/lib/autolink/index.ts (100%) rename internal/dis/component/{ => control}/static/src/lib/highlight/index.ts (100%) rename internal/dis/component/{ => control}/static/src/lib/remote/index.css (100%) rename internal/dis/component/{ => control}/static/src/lib/remote/index.ts (100%) rename internal/dis/component/{ => control}/static/src/lib/remote/socket.ts (100%) rename internal/dis/component/{ => control}/static/static.go (100%) rename internal/dis/component/{ => control}/static/tsconfig.json (100%) rename internal/dis/component/{ => control}/static/yarn.lock (100%) diff --git a/Makefile b/Makefile index f20d89d..cb06e2d 100644 --- a/Makefile +++ b/Makefile @@ -3,11 +3,11 @@ all: wdcli wdcli: - go generate ./internal/dis/component/static/ + go generate ./internal/dis/component/control/static/ go build -o ./wdcli ./cmd/wdcli deps: - cd internal/component/static/ && yarn install + cd internal/dis/component/control/static/ && yarn install clean: rm wdcli \ No newline at end of file diff --git a/internal/dis/component/home/home.go b/internal/dis/component/control/home/home.go similarity index 100% rename from internal/dis/component/home/home.go rename to internal/dis/component/control/home/home.go diff --git a/internal/dis/component/home/home.html b/internal/dis/component/control/home/home.html similarity index 100% rename from internal/dis/component/home/home.html rename to internal/dis/component/control/home/home.html diff --git a/internal/dis/component/home/public.go b/internal/dis/component/control/home/public.go similarity index 96% rename from internal/dis/component/home/public.go rename to internal/dis/component/control/home/public.go index 4c46379..fbacbca 100644 --- a/internal/dis/component/home/public.go +++ b/internal/dis/component/control/home/public.go @@ -7,7 +7,7 @@ import ( _ "embed" - "github.com/FAU-CDI/wisski-distillery/internal/dis/component/static" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/control/static" "github.com/FAU-CDI/wisski-distillery/internal/wisski/ingredient/info" "github.com/FAU-CDI/wisski-distillery/pkg/timex" "github.com/tkw1536/goprogram/stream" diff --git a/internal/dis/component/home/redirect.go b/internal/dis/component/control/home/redirect.go similarity index 100% rename from internal/dis/component/home/redirect.go rename to internal/dis/component/control/home/redirect.go diff --git a/internal/dis/component/info/html/index.html b/internal/dis/component/control/info/html/index.html similarity index 100% rename from internal/dis/component/info/html/index.html rename to internal/dis/component/control/info/html/index.html diff --git a/internal/dis/component/info/html/instance.html b/internal/dis/component/control/info/html/instance.html similarity index 100% rename from internal/dis/component/info/html/instance.html rename to internal/dis/component/control/info/html/instance.html diff --git a/internal/dis/component/info/index.go b/internal/dis/component/control/info/index.go similarity index 95% rename from internal/dis/component/info/index.go rename to internal/dis/component/control/info/index.go index 1785c5c..c9f2b1d 100644 --- a/internal/dis/component/info/index.go +++ b/internal/dis/component/control/info/index.go @@ -7,7 +7,7 @@ import ( _ "embed" "github.com/FAU-CDI/wisski-distillery/internal/config" - "github.com/FAU-CDI/wisski-distillery/internal/dis/component/static" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/control/static" "github.com/FAU-CDI/wisski-distillery/internal/models" "github.com/FAU-CDI/wisski-distillery/internal/wisski/ingredient/info" "golang.org/x/sync/errgroup" diff --git a/internal/dis/component/info/info.go b/internal/dis/component/control/info/info.go similarity index 100% rename from internal/dis/component/info/info.go rename to internal/dis/component/control/info/info.go diff --git a/internal/dis/component/info/instance.go b/internal/dis/component/control/info/instance.go similarity index 93% rename from internal/dis/component/info/instance.go rename to internal/dis/component/control/info/instance.go index c418dda..8a8f2f0 100644 --- a/internal/dis/component/info/instance.go +++ b/internal/dis/component/control/info/instance.go @@ -6,8 +6,8 @@ import ( "strings" "time" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/control/static" "github.com/FAU-CDI/wisski-distillery/internal/dis/component/instances" - "github.com/FAU-CDI/wisski-distillery/internal/dis/component/static" "github.com/FAU-CDI/wisski-distillery/internal/models" "github.com/FAU-CDI/wisski-distillery/internal/wisski/ingredient/info" "github.com/FAU-CDI/wisski-distillery/pkg/httpx" diff --git a/internal/dis/component/info/socket.go b/internal/dis/component/control/info/socket.go similarity index 100% rename from internal/dis/component/info/socket.go rename to internal/dis/component/control/info/socket.go diff --git a/internal/dis/component/static/assets.go b/internal/dis/component/control/static/assets.go similarity index 100% rename from internal/dis/component/static/assets.go rename to internal/dis/component/control/static/assets.go diff --git a/internal/dis/component/static/assets_dist.go b/internal/dis/component/control/static/assets_dist.go similarity index 100% rename from internal/dis/component/static/assets_dist.go rename to internal/dis/component/control/static/assets_dist.go diff --git a/internal/dis/component/static/build.mjs b/internal/dis/component/control/static/build.mjs similarity index 100% rename from internal/dis/component/static/build.mjs rename to internal/dis/component/control/static/build.mjs diff --git a/internal/dis/component/static/dist/ControlIndex.613b02c2.js b/internal/dis/component/control/static/dist/ControlIndex.613b02c2.js similarity index 100% rename from internal/dis/component/static/dist/ControlIndex.613b02c2.js rename to internal/dis/component/control/static/dist/ControlIndex.613b02c2.js diff --git a/internal/dis/component/static/dist/ControlIndex.6d2ae968.css b/internal/dis/component/control/static/dist/ControlIndex.6d2ae968.css similarity index 100% rename from internal/dis/component/static/dist/ControlIndex.6d2ae968.css rename to internal/dis/component/control/static/dist/ControlIndex.6d2ae968.css diff --git a/internal/dis/component/static/dist/ControlIndex.6d59e220.css b/internal/dis/component/control/static/dist/ControlIndex.6d59e220.css similarity index 100% rename from internal/dis/component/static/dist/ControlIndex.6d59e220.css rename to internal/dis/component/control/static/dist/ControlIndex.6d59e220.css diff --git a/internal/dis/component/static/dist/ControlIndex.cfbf936d.js b/internal/dis/component/control/static/dist/ControlIndex.cfbf936d.js similarity index 100% rename from internal/dis/component/static/dist/ControlIndex.cfbf936d.js rename to internal/dis/component/control/static/dist/ControlIndex.cfbf936d.js diff --git a/internal/dis/component/static/dist/ControlInstance.38d394c2.css b/internal/dis/component/control/static/dist/ControlInstance.38d394c2.css similarity index 100% rename from internal/dis/component/static/dist/ControlInstance.38d394c2.css rename to internal/dis/component/control/static/dist/ControlInstance.38d394c2.css diff --git a/internal/dis/component/static/dist/ControlInstance.66b95713.js b/internal/dis/component/control/static/dist/ControlInstance.66b95713.js similarity index 100% rename from internal/dis/component/static/dist/ControlInstance.66b95713.js rename to internal/dis/component/control/static/dist/ControlInstance.66b95713.js diff --git a/internal/dis/component/static/dist/ControlInstance.9cc7166d.js b/internal/dis/component/control/static/dist/ControlInstance.9cc7166d.js similarity index 100% rename from internal/dis/component/static/dist/ControlInstance.9cc7166d.js rename to internal/dis/component/control/static/dist/ControlInstance.9cc7166d.js diff --git a/internal/dis/component/static/dist/HomeHome.38d394c2.css b/internal/dis/component/control/static/dist/HomeHome.38d394c2.css similarity index 100% rename from internal/dis/component/static/dist/HomeHome.38d394c2.css rename to internal/dis/component/control/static/dist/HomeHome.38d394c2.css diff --git a/internal/dis/component/static/dist/HomeHome.38d394c2.js b/internal/dis/component/control/static/dist/HomeHome.38d394c2.js similarity index 100% rename from internal/dis/component/static/dist/HomeHome.38d394c2.js rename to internal/dis/component/control/static/dist/HomeHome.38d394c2.js diff --git a/internal/dis/component/static/dist/HomeHome.a75f04fa.css b/internal/dis/component/control/static/dist/HomeHome.a75f04fa.css similarity index 100% rename from internal/dis/component/static/dist/HomeHome.a75f04fa.css rename to internal/dis/component/control/static/dist/HomeHome.a75f04fa.css diff --git a/internal/dis/component/static/package.json b/internal/dis/component/control/static/package.json similarity index 100% rename from internal/dis/component/static/package.json rename to internal/dis/component/control/static/package.json diff --git a/internal/dis/component/static/src/base/index.css b/internal/dis/component/control/static/src/base/index.css similarity index 100% rename from internal/dis/component/static/src/base/index.css rename to internal/dis/component/control/static/src/base/index.css diff --git a/internal/dis/component/static/src/base/index.ts b/internal/dis/component/control/static/src/base/index.ts similarity index 100% rename from internal/dis/component/static/src/base/index.ts rename to internal/dis/component/control/static/src/base/index.ts diff --git a/internal/dis/component/static/src/entry/ControlIndex/index.css b/internal/dis/component/control/static/src/entry/ControlIndex/index.css similarity index 100% rename from internal/dis/component/static/src/entry/ControlIndex/index.css rename to internal/dis/component/control/static/src/entry/ControlIndex/index.css diff --git a/internal/dis/component/static/src/entry/ControlIndex/index.ts b/internal/dis/component/control/static/src/entry/ControlIndex/index.ts similarity index 100% rename from internal/dis/component/static/src/entry/ControlIndex/index.ts rename to internal/dis/component/control/static/src/entry/ControlIndex/index.ts diff --git a/internal/dis/component/static/src/entry/ControlInstance/index.css b/internal/dis/component/control/static/src/entry/ControlInstance/index.css similarity index 100% rename from internal/dis/component/static/src/entry/ControlInstance/index.css rename to internal/dis/component/control/static/src/entry/ControlInstance/index.css diff --git a/internal/dis/component/static/src/entry/ControlInstance/index.ts b/internal/dis/component/control/static/src/entry/ControlInstance/index.ts similarity index 100% rename from internal/dis/component/static/src/entry/ControlInstance/index.ts rename to internal/dis/component/control/static/src/entry/ControlInstance/index.ts diff --git a/internal/dis/component/static/src/entry/HomeHome/index.css b/internal/dis/component/control/static/src/entry/HomeHome/index.css similarity index 100% rename from internal/dis/component/static/src/entry/HomeHome/index.css rename to internal/dis/component/control/static/src/entry/HomeHome/index.css diff --git a/internal/dis/component/static/src/entry/HomeHome/index.ts b/internal/dis/component/control/static/src/entry/HomeHome/index.ts similarity index 100% rename from internal/dis/component/static/src/entry/HomeHome/index.ts rename to internal/dis/component/control/static/src/entry/HomeHome/index.ts diff --git a/internal/dis/component/static/src/lib/autolink/index.css b/internal/dis/component/control/static/src/lib/autolink/index.css similarity index 100% rename from internal/dis/component/static/src/lib/autolink/index.css rename to internal/dis/component/control/static/src/lib/autolink/index.css diff --git a/internal/dis/component/static/src/lib/autolink/index.ts b/internal/dis/component/control/static/src/lib/autolink/index.ts similarity index 100% rename from internal/dis/component/static/src/lib/autolink/index.ts rename to internal/dis/component/control/static/src/lib/autolink/index.ts diff --git a/internal/dis/component/static/src/lib/highlight/index.ts b/internal/dis/component/control/static/src/lib/highlight/index.ts similarity index 100% rename from internal/dis/component/static/src/lib/highlight/index.ts rename to internal/dis/component/control/static/src/lib/highlight/index.ts diff --git a/internal/dis/component/static/src/lib/remote/index.css b/internal/dis/component/control/static/src/lib/remote/index.css similarity index 100% rename from internal/dis/component/static/src/lib/remote/index.css rename to internal/dis/component/control/static/src/lib/remote/index.css diff --git a/internal/dis/component/static/src/lib/remote/index.ts b/internal/dis/component/control/static/src/lib/remote/index.ts similarity index 100% rename from internal/dis/component/static/src/lib/remote/index.ts rename to internal/dis/component/control/static/src/lib/remote/index.ts diff --git a/internal/dis/component/static/src/lib/remote/socket.ts b/internal/dis/component/control/static/src/lib/remote/socket.ts similarity index 100% rename from internal/dis/component/static/src/lib/remote/socket.ts rename to internal/dis/component/control/static/src/lib/remote/socket.ts diff --git a/internal/dis/component/static/static.go b/internal/dis/component/control/static/static.go similarity index 100% rename from internal/dis/component/static/static.go rename to internal/dis/component/control/static/static.go diff --git a/internal/dis/component/static/tsconfig.json b/internal/dis/component/control/static/tsconfig.json similarity index 100% rename from internal/dis/component/static/tsconfig.json rename to internal/dis/component/control/static/tsconfig.json diff --git a/internal/dis/component/static/yarn.lock b/internal/dis/component/control/static/yarn.lock similarity index 100% rename from internal/dis/component/static/yarn.lock rename to internal/dis/component/control/static/yarn.lock diff --git a/internal/dis/distillery.go b/internal/dis/distillery.go index 51e0076..a9974ea 100644 --- a/internal/dis/distillery.go +++ b/internal/dis/distillery.go @@ -8,17 +8,17 @@ import ( "github.com/FAU-CDI/wisski-distillery/internal/dis/component" "github.com/FAU-CDI/wisski-distillery/internal/dis/component/control" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/control/home" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/control/info" + "github.com/FAU-CDI/wisski-distillery/internal/dis/component/control/static" "github.com/FAU-CDI/wisski-distillery/internal/dis/component/exporter" "github.com/FAU-CDI/wisski-distillery/internal/dis/component/exporter/logger" - "github.com/FAU-CDI/wisski-distillery/internal/dis/component/home" - "github.com/FAU-CDI/wisski-distillery/internal/dis/component/info" "github.com/FAU-CDI/wisski-distillery/internal/dis/component/instances" "github.com/FAU-CDI/wisski-distillery/internal/dis/component/instances/malt" "github.com/FAU-CDI/wisski-distillery/internal/dis/component/meta" "github.com/FAU-CDI/wisski-distillery/internal/dis/component/resolver" "github.com/FAU-CDI/wisski-distillery/internal/dis/component/sql" "github.com/FAU-CDI/wisski-distillery/internal/dis/component/ssh" - "github.com/FAU-CDI/wisski-distillery/internal/dis/component/static" "github.com/FAU-CDI/wisski-distillery/internal/dis/component/triplestore" "github.com/FAU-CDI/wisski-distillery/internal/dis/component/web" "github.com/FAU-CDI/wisski-distillery/pkg/lazy"