diff --git a/Makefile b/Makefile index 72f7bb6..73746e2 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ dev-server: # run air to detect any go file changes to re-build and re-run the server. @go run github.com/air-verse/air@v1.52.3 \ - --build.cmd "templ generate && go build -ldflags \"-X main.Version=$(VERSION)\" --tags dev -o tmp/bin/main ./server/" --build.bin "tmp/bin/main" --build.delay "100" \ + --build.cmd "templ generate && go build -ldflags \"-X main.Version=$(VERSION)\" --tags dev -o tmp/bin/main ./cmd/soarca-gui/" --build.bin "tmp/bin/main" --build.delay "100" \ --build.exclude_dir "node_modules" \ --build.exclude_regex ".*_templ.go" \ --build.include_ext "go,templ" \ @@ -65,7 +65,7 @@ build: build-templ build-tailwind build-server build-server: echo "Compiling for every OS and Platform" - CGO_ENABLED=0 go build -o build/${BINARY_NAME} $(GOFLAGS) ./server/main.go + CGO_ENABLED=0 go build -o build/${BINARY_NAME} $(GOFLAGS) ./cmd/soarca-gui/main.go @@ -76,7 +76,7 @@ build-templ: @templ generate build-tailwind: - @npx tailwindcss -m -i ./views/assets/app.css -o ./public/public/styles.css $(ARGS) + @npx tailwindcss -m -i ./pkg/views/assets/app.css -o ./pkg/public/public/styles.css $(ARGS) lint: build-templ GOFLAGS=-buildvcs=false golangci-lint run --timeout 5m0s -v @@ -98,11 +98,11 @@ test: build-templ # release compile: build-templ build-tailwind - CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o bin/${BINARY_NAME}-${VERSION}-linux-amd64 $(GOFLAGS) server/main.go - CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -o bin/${BINARY_NAME}-${VERSION}-darwin-arm64 $(GOFLAGS) server/main.go - CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -o bin/${BINARY_NAME}-${VERSION}-windows-amd64 $(GOFLAGS) server/main.go + CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o bin/${BINARY_NAME}-${VERSION}-linux-amd64 $(GOFLAGS) cmd/soarca-gui/main.go + CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -o bin/${BINARY_NAME}-${VERSION}-darwin-arm64 $(GOFLAGS) cmd/soarca-gui/main.go + CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -o bin/${BINARY_NAME}-${VERSION}-windows-amd64 $(GOFLAGS) cmd/soarca-gui/main.go sbom: build-templ compile - CGO_ENABLED=0 GOOS=linux GOARCH=amd64 cyclonedx-gomod app -main server -json -licenses -output bin/${BINARY_NAME}-${VERSION}-linux-amd64.bom.json - CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 cyclonedx-gomod app -main server -json -licenses -output bin/${BINARY_NAME}-${VERSION}-darwin-amd64.bom.json - CGO_ENABLED=0 GOOS=windows GOARCH=amd64 cyclonedx-gomod app -main server -json -licenses -output bin/${BINARY_NAME}-${VERSION}-windows-amd64.bom.json \ No newline at end of file + CGO_ENABLED=0 GOOS=linux GOARCH=amd64 cyclonedx-gomod app -main cmd/soarca-gui -json -licenses -output bin/${BINARY_NAME}-${VERSION}-linux-amd64.bom.json + CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 cyclonedx-gomod app -main cmd/soarca-gui -json -licenses -output bin/${BINARY_NAME}-${VERSION}-darwin-amd64.bom.json + CGO_ENABLED=0 GOOS=windows GOARCH=amd64 cyclonedx-gomod app -main cmd/soarca-gui -json -licenses -output bin/${BINARY_NAME}-${VERSION}-windows-amd64.bom.json \ No newline at end of file diff --git a/README.md b/README.md index 00dff40..b318a2b 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@
- +
diff --git a/img/dashboard1.PNG b/assets/dashboard1.PNG similarity index 100% rename from img/dashboard1.PNG rename to assets/dashboard1.PNG diff --git a/img/dashboard2.PNG b/assets/dashboard2.PNG similarity index 100% rename from img/dashboard2.PNG rename to assets/dashboard2.PNG diff --git a/img/soarca-logo.svg b/assets/soarca-logo.svg similarity index 100% rename from img/soarca-logo.svg rename to assets/soarca-logo.svg diff --git a/server/main.go b/cmd/soarca-gui/main.go similarity index 94% rename from server/main.go rename to cmd/soarca-gui/main.go index 7048af8..4c4a610 100644 --- a/server/main.go +++ b/cmd/soarca-gui/main.go @@ -3,8 +3,8 @@ package main import ( "fmt" "soarca-gui/internal/status" - "soarca-gui/routes" - "soarca-gui/utils" + "soarca-gui/pkg/routes" + "soarca-gui/pkg/utils" "github.com/gin-gonic/gin" "github.com/joho/godotenv" diff --git a/internal/status/status.go b/internal/status/status.go index 965a08a..5ef7da7 100644 --- a/internal/status/status.go +++ b/internal/status/status.go @@ -2,8 +2,8 @@ package status import ( "runtime" - "soarca-gui/models/status" - "soarca-gui/utils" + "soarca-gui/pkg/models/status" + "soarca-gui/pkg/utils" "time" ) diff --git a/backend/backend.go b/pkg/backend/backend.go similarity index 87% rename from backend/backend.go rename to pkg/backend/backend.go index 4ae2925..310abf2 100644 --- a/backend/backend.go +++ b/pkg/backend/backend.go @@ -1,6 +1,6 @@ package backend -import "soarca-gui/models/reporter" +import "soarca-gui/pkg/models/reporter" type Report interface { GetReports(bearerToken string) ([]reporter.PlaybookExecutionReport, error) diff --git a/backend/soarca/helper.go b/pkg/backend/soarca/helper.go similarity index 100% rename from backend/soarca/helper.go rename to pkg/backend/soarca/helper.go diff --git a/backend/soarca/helper_test.go b/pkg/backend/soarca/helper_test.go similarity index 100% rename from backend/soarca/helper_test.go rename to pkg/backend/soarca/helper_test.go diff --git a/backend/soarca/report.go b/pkg/backend/soarca/report.go similarity index 97% rename from backend/soarca/report.go rename to pkg/backend/soarca/report.go index e17dfc5..e4c4de6 100644 --- a/backend/soarca/report.go +++ b/pkg/backend/soarca/report.go @@ -3,7 +3,7 @@ package soarca import ( "fmt" "net/http" - "soarca-gui/models/reporter" + "soarca-gui/pkg/models/reporter" ) const ( diff --git a/backend/soarca/status.go b/pkg/backend/soarca/status.go similarity index 100% rename from backend/soarca/status.go rename to pkg/backend/soarca/status.go diff --git a/handlers/auth.go b/pkg/handlers/auth.go similarity index 95% rename from handlers/auth.go rename to pkg/handlers/auth.go index 9210058..f62eb28 100644 --- a/handlers/auth.go +++ b/pkg/handlers/auth.go @@ -3,10 +3,10 @@ package handlers import ( "errors" "net/http" - "soarca-gui/utils" + "soarca-gui/pkg/utils" "strings" - authviews "soarca-gui/views/auth" + authviews "soarca-gui/pkg/views/auth" "github.com/gin-gonic/gin" ) diff --git a/handlers/dashboard.go b/pkg/handlers/dashboard.go similarity index 87% rename from handlers/dashboard.go rename to pkg/handlers/dashboard.go index 45dde7a..23c3715 100644 --- a/handlers/dashboard.go +++ b/pkg/handlers/dashboard.go @@ -2,9 +2,9 @@ package handlers import ( "net/http" - "soarca-gui/utils" - "soarca-gui/views/dashboards/home" - "soarca-gui/views/layouts" + "soarca-gui/pkg/utils" + "soarca-gui/pkg/views/dashboards/home" + "soarca-gui/pkg/views/layouts" auth_context "github.com/COSSAS/gauth/context" "github.com/gin-gonic/gin" diff --git a/handlers/oidc_handler.go b/pkg/handlers/oidc_handler.go similarity index 93% rename from handlers/oidc_handler.go rename to pkg/handlers/oidc_handler.go index def2856..d55d5ce 100644 --- a/handlers/oidc_handler.go +++ b/pkg/handlers/oidc_handler.go @@ -2,9 +2,9 @@ package handlers import ( "net/http" - "soarca-gui/utils" + "soarca-gui/pkg/utils" - authviews "soarca-gui/views/auth" + authviews "soarca-gui/pkg/views/auth" "github.com/COSSAS/gauth" "github.com/gin-gonic/gin" diff --git a/handlers/reporting.go b/pkg/handlers/reporting.go similarity index 94% rename from handlers/reporting.go rename to pkg/handlers/reporting.go index ffb3ee9..468b074 100644 --- a/handlers/reporting.go +++ b/pkg/handlers/reporting.go @@ -3,12 +3,12 @@ package handlers import ( "errors" "net/http" - "soarca-gui/backend" - "soarca-gui/models/reporter" - "soarca-gui/utils" - "soarca-gui/views/components/cards" - "soarca-gui/views/components/table" - reporting_dashboard "soarca-gui/views/dashboards/reporting" + "soarca-gui/pkg/backend" + "soarca-gui/pkg/models/reporter" + "soarca-gui/pkg/utils" + "soarca-gui/pkg/views/components/cards" + "soarca-gui/pkg/views/components/table" + reporting_dashboard "soarca-gui/pkg/views/dashboards/reporting" gauth_context "github.com/COSSAS/gauth/context" "github.com/gin-gonic/gin" diff --git a/handlers/settings.go b/pkg/handlers/settings.go similarity index 77% rename from handlers/settings.go rename to pkg/handlers/settings.go index a6ddd3e..26d8ac3 100644 --- a/handlers/settings.go +++ b/pkg/handlers/settings.go @@ -3,8 +3,8 @@ package handlers import ( "net/http" - "soarca-gui/utils" - "soarca-gui/views/dashboards/settings" + "soarca-gui/pkg/utils" + "soarca-gui/pkg/views/dashboards/settings" "github.com/gin-gonic/gin" ) diff --git a/handlers/status.go b/pkg/handlers/status.go similarity index 92% rename from handlers/status.go rename to pkg/handlers/status.go index 2dbaee2..5f4f253 100644 --- a/handlers/status.go +++ b/pkg/handlers/status.go @@ -2,9 +2,9 @@ package handlers import ( "net/http" - "soarca-gui/backend" - "soarca-gui/utils" - "soarca-gui/views/components/indicators" + "soarca-gui/pkg/backend" + "soarca-gui/pkg/utils" + "soarca-gui/pkg/views/components/indicators" gauth_context "github.com/COSSAS/gauth/context" "github.com/gin-gonic/gin" diff --git a/models/cacao/cacao.go b/pkg/models/cacao/cacao.go similarity index 100% rename from models/cacao/cacao.go rename to pkg/models/cacao/cacao.go diff --git a/models/reporter/reporter.go b/pkg/models/reporter/reporter.go similarity index 98% rename from models/reporter/reporter.go rename to pkg/models/reporter/reporter.go index 5aeabe7..707377e 100644 --- a/models/reporter/reporter.go +++ b/pkg/models/reporter/reporter.go @@ -3,7 +3,7 @@ package reporter import ( "time" - "soarca-gui/models/cacao" + "soarca-gui/pkg/models/cacao" ) type PlaybookExecutionReport struct { diff --git a/models/status/status.go b/pkg/models/status/status.go similarity index 100% rename from models/status/status.go rename to pkg/models/status/status.go diff --git a/public/public.go b/pkg/public/public.go similarity index 100% rename from public/public.go rename to pkg/public/public.go diff --git a/public/public/assets/favicons/android-chrome-192x192.png b/pkg/public/public/assets/favicons/android-chrome-192x192.png similarity index 100% rename from public/public/assets/favicons/android-chrome-192x192.png rename to pkg/public/public/assets/favicons/android-chrome-192x192.png diff --git a/public/public/assets/favicons/android-chrome-512x512.png b/pkg/public/public/assets/favicons/android-chrome-512x512.png similarity index 100% rename from public/public/assets/favicons/android-chrome-512x512.png rename to pkg/public/public/assets/favicons/android-chrome-512x512.png diff --git a/public/public/assets/favicons/apple-touch-icon.png b/pkg/public/public/assets/favicons/apple-touch-icon.png similarity index 100% rename from public/public/assets/favicons/apple-touch-icon.png rename to pkg/public/public/assets/favicons/apple-touch-icon.png diff --git a/public/public/assets/favicons/browserconfig.xml b/pkg/public/public/assets/favicons/browserconfig.xml similarity index 100% rename from public/public/assets/favicons/browserconfig.xml rename to pkg/public/public/assets/favicons/browserconfig.xml diff --git a/public/public/assets/favicons/favicon-16x16.png b/pkg/public/public/assets/favicons/favicon-16x16.png similarity index 100% rename from public/public/assets/favicons/favicon-16x16.png rename to pkg/public/public/assets/favicons/favicon-16x16.png diff --git a/public/public/assets/favicons/favicon-32x32.png b/pkg/public/public/assets/favicons/favicon-32x32.png similarity index 100% rename from public/public/assets/favicons/favicon-32x32.png rename to pkg/public/public/assets/favicons/favicon-32x32.png diff --git a/public/public/assets/favicons/favicon.ico b/pkg/public/public/assets/favicons/favicon.ico similarity index 100% rename from public/public/assets/favicons/favicon.ico rename to pkg/public/public/assets/favicons/favicon.ico diff --git a/public/public/assets/favicons/mstile-150x150.png b/pkg/public/public/assets/favicons/mstile-150x150.png similarity index 100% rename from public/public/assets/favicons/mstile-150x150.png rename to pkg/public/public/assets/favicons/mstile-150x150.png diff --git a/public/public/assets/favicons/safari-pinned-tab.svg b/pkg/public/public/assets/favicons/safari-pinned-tab.svg similarity index 100% rename from public/public/assets/favicons/safari-pinned-tab.svg rename to pkg/public/public/assets/favicons/safari-pinned-tab.svg diff --git a/public/public/assets/favicons/site.webmanifest b/pkg/public/public/assets/favicons/site.webmanifest similarity index 100% rename from public/public/assets/favicons/site.webmanifest rename to pkg/public/public/assets/favicons/site.webmanifest diff --git a/public/public/assets/icons/soarca-logo.svg b/pkg/public/public/assets/icons/soarca-logo.svg similarity index 100% rename from public/public/assets/icons/soarca-logo.svg rename to pkg/public/public/assets/icons/soarca-logo.svg diff --git a/public/public/fonts/Inter-italic.ttf b/pkg/public/public/fonts/Inter-italic.ttf similarity index 100% rename from public/public/fonts/Inter-italic.ttf rename to pkg/public/public/fonts/Inter-italic.ttf diff --git a/public/public/fonts/Inter-regular.ttf b/pkg/public/public/fonts/Inter-regular.ttf similarity index 100% rename from public/public/fonts/Inter-regular.ttf rename to pkg/public/public/fonts/Inter-regular.ttf diff --git a/public/public/vendor/htmx@2.0.2.js b/pkg/public/public/vendor/htmx@2.0.2.js similarity index 100% rename from public/public/vendor/htmx@2.0.2.js rename to pkg/public/public/vendor/htmx@2.0.2.js diff --git a/public/public/vendor/prism.css b/pkg/public/public/vendor/prism.css similarity index 100% rename from public/public/vendor/prism.css rename to pkg/public/public/vendor/prism.css diff --git a/public/public/vendor/prism.js b/pkg/public/public/vendor/prism.js similarity index 100% rename from public/public/vendor/prism.js rename to pkg/public/public/vendor/prism.js diff --git a/routes/routes.go b/pkg/routes/routes.go similarity index 95% rename from routes/routes.go rename to pkg/routes/routes.go index 9e95898..c887f34 100644 --- a/routes/routes.go +++ b/pkg/routes/routes.go @@ -3,11 +3,11 @@ package routes import ( "log" "net/http" - "soarca-gui/backend" - "soarca-gui/backend/soarca" - "soarca-gui/handlers" - "soarca-gui/public" - "soarca-gui/utils" + "soarca-gui/pkg/backend" + "soarca-gui/pkg/backend/soarca" + "soarca-gui/pkg/handlers" + "soarca-gui/pkg/public" + "soarca-gui/pkg/utils" "strconv" "github.com/COSSAS/gauth" diff --git a/utils/env_reader.go b/pkg/utils/env_reader.go similarity index 100% rename from utils/env_reader.go rename to pkg/utils/env_reader.go diff --git a/utils/errors.go b/pkg/utils/errors.go similarity index 100% rename from utils/errors.go rename to pkg/utils/errors.go diff --git a/utils/http.go b/pkg/utils/http.go similarity index 100% rename from utils/http.go rename to pkg/utils/http.go diff --git a/utils/http_test.go b/pkg/utils/http_test.go similarity index 98% rename from utils/http_test.go rename to pkg/utils/http_test.go index c2ca49c..ac58647 100644 --- a/utils/http_test.go +++ b/pkg/utils/http_test.go @@ -6,7 +6,7 @@ import ( "net/http/httptest" "testing" - "soarca-gui/utils" + "soarca-gui/pkg/utils" ) type RequestBody struct { diff --git a/utils/render.go b/pkg/utils/render.go similarity index 100% rename from utils/render.go rename to pkg/utils/render.go diff --git a/utils/view.go b/pkg/utils/view.go similarity index 100% rename from utils/view.go rename to pkg/utils/view.go diff --git a/views/assets/app.css b/pkg/views/assets/app.css similarity index 100% rename from views/assets/app.css rename to pkg/views/assets/app.css diff --git a/views/auth/login.templ b/pkg/views/auth/login.templ similarity index 96% rename from views/auth/login.templ rename to pkg/views/auth/login.templ index 259520f..0a57e0e 100644 --- a/views/auth/login.templ +++ b/pkg/views/auth/login.templ @@ -1,8 +1,8 @@ package authviews import ( - "soarca-gui/views/components/notifications" - "soarca-gui/views/layouts" + "soarca-gui/pkg/views/components/notifications" + "soarca-gui/pkg/views/layouts" ) const ( diff --git a/views/auth/oidc_login.templ b/pkg/views/auth/oidc_login.templ similarity index 98% rename from views/auth/oidc_login.templ rename to pkg/views/auth/oidc_login.templ index 5a13b8f..7db5981 100644 --- a/views/auth/oidc_login.templ +++ b/pkg/views/auth/oidc_login.templ @@ -1,7 +1,7 @@ package authviews import ( - "soarca-gui/views/layouts" + "soarca-gui/pkg/views/layouts" ) diff --git a/views/components/alerts/alerts.templ b/pkg/views/components/alerts/alerts.templ similarity index 99% rename from views/components/alerts/alerts.templ rename to pkg/views/components/alerts/alerts.templ index 9eb66b4..b6cfd6d 100644 --- a/views/components/alerts/alerts.templ +++ b/pkg/views/components/alerts/alerts.templ @@ -1,6 +1,6 @@ package alerts -import "soarca-gui/utils" +import "soarca-gui/pkg/utils" const ( baseClassWarning = "flex w-full max-w-sm overflow-hidden bg-white rounded-lg shadow-md dark:bg-gray-800" diff --git a/views/components/cards/card.templ b/pkg/views/components/cards/card.templ similarity index 97% rename from views/components/cards/card.templ rename to pkg/views/components/cards/card.templ index 9ac2336..2c32b5f 100644 --- a/views/components/cards/card.templ +++ b/pkg/views/components/cards/card.templ @@ -1,6 +1,6 @@ package cards -import "soarca-gui/utils" +import "soarca-gui/pkg/utils" const cardBaseCSS = "p-2 m-2 rounded-lg bg-white border-gray-100 shadow-md dark:bg-c-dark-slate-navbar-background dark:border-2 dark:border-c-dark-slate-border" diff --git a/views/components/cards/reporting_card.templ b/pkg/views/components/cards/reporting_card.templ similarity index 99% rename from views/components/cards/reporting_card.templ rename to pkg/views/components/cards/reporting_card.templ index 1ac882b..06b858f 100644 --- a/views/components/cards/reporting_card.templ +++ b/pkg/views/components/cards/reporting_card.templ @@ -2,7 +2,7 @@ package cards import ( "fmt" - "soarca-gui/views/components/icons" + "soarca-gui/pkg/views/components/icons" ) const ( diff --git a/views/components/cards/settings_cards.templ b/pkg/views/components/cards/settings_cards.templ similarity index 100% rename from views/components/cards/settings_cards.templ rename to pkg/views/components/cards/settings_cards.templ diff --git a/views/components/headbar/headbar.templ b/pkg/views/components/headbar/headbar.templ similarity index 94% rename from views/components/headbar/headbar.templ rename to pkg/views/components/headbar/headbar.templ index e4e6db1..331d8a9 100644 --- a/views/components/headbar/headbar.templ +++ b/pkg/views/components/headbar/headbar.templ @@ -1,9 +1,9 @@ package headbar import ( - "soarca-gui/utils" - "soarca-gui/views/components/icons" - "soarca-gui/views/components/indicators" + "soarca-gui/pkg/utils" + "soarca-gui/pkg/views/components/icons" + "soarca-gui/pkg/views/components/indicators" ) templ themeButton() { diff --git a/views/components/icons/icons.templ b/pkg/views/components/icons/icons.templ similarity index 96% rename from views/components/icons/icons.templ rename to pkg/views/components/icons/icons.templ index 43079e1..d01f10e 100644 --- a/views/components/icons/icons.templ +++ b/pkg/views/components/icons/icons.templ @@ -1,6 +1,6 @@ package icons -import "soarca-gui/utils" +import "soarca-gui/pkg/utils" type Icon struct { iconName string diff --git a/views/components/indicators/health_indicator.templ b/pkg/views/components/indicators/health_indicator.templ similarity index 100% rename from views/components/indicators/health_indicator.templ rename to pkg/views/components/indicators/health_indicator.templ diff --git a/views/components/indicators/reporting_indicator.templ b/pkg/views/components/indicators/reporting_indicator.templ similarity index 100% rename from views/components/indicators/reporting_indicator.templ rename to pkg/views/components/indicators/reporting_indicator.templ diff --git a/views/components/indicators/tags.templ b/pkg/views/components/indicators/tags.templ similarity index 96% rename from views/components/indicators/tags.templ rename to pkg/views/components/indicators/tags.templ index 8b6ca90..9c78017 100644 --- a/views/components/indicators/tags.templ +++ b/pkg/views/components/indicators/tags.templ @@ -1,8 +1,8 @@ package indicators import ( - "soarca-gui/utils" - "soarca-gui/views/components/icons" + "soarca-gui/pkg/utils" + "soarca-gui/pkg/views/components/icons" ) const baseClassTag = "inline-flex items-center px-3 py-1 rounded-full gap-x-2" diff --git a/views/components/modals/modal.templ b/pkg/views/components/modals/modal.templ similarity index 100% rename from views/components/modals/modal.templ rename to pkg/views/components/modals/modal.templ diff --git a/views/components/modals/reporting_modal.templ b/pkg/views/components/modals/reporting_modal.templ similarity index 100% rename from views/components/modals/reporting_modal.templ rename to pkg/views/components/modals/reporting_modal.templ diff --git a/views/components/navbar/navbar.templ b/pkg/views/components/navbar/navbar.templ similarity index 95% rename from views/components/navbar/navbar.templ rename to pkg/views/components/navbar/navbar.templ index c6e5a26..029fe99 100644 --- a/views/components/navbar/navbar.templ +++ b/pkg/views/components/navbar/navbar.templ @@ -2,7 +2,7 @@ package navbar import ( "soarca-gui/internal/status" - "soarca-gui/views/components/icons" + "soarca-gui/pkg/views/components/icons" ) const ( diff --git a/views/components/notifications/notications.templ b/pkg/views/components/notifications/notications.templ similarity index 100% rename from views/components/notifications/notications.templ rename to pkg/views/components/notifications/notications.templ diff --git a/views/components/table/reporting_table.templ b/pkg/views/components/table/reporting_table.templ similarity index 96% rename from views/components/table/reporting_table.templ rename to pkg/views/components/table/reporting_table.templ index 5b6c425..df752b8 100644 --- a/views/components/table/reporting_table.templ +++ b/pkg/views/components/table/reporting_table.templ @@ -2,11 +2,11 @@ package table import ( "fmt" - "soarca-gui/utils" + "soarca-gui/pkg/utils" "time" - "soarca-gui/views/components/cards" - "soarca-gui/views/components/indicators" + "soarca-gui/pkg/views/components/cards" + "soarca-gui/pkg/views/components/indicators" ) const ( diff --git a/views/components/table/table.templ b/pkg/views/components/table/table.templ similarity index 97% rename from views/components/table/table.templ rename to pkg/views/components/table/table.templ index 52f00aa..27fb113 100644 --- a/views/components/table/table.templ +++ b/pkg/views/components/table/table.templ @@ -1,6 +1,6 @@ package table -import "soarca-gui/utils" +import "soarca-gui/pkg/utils" const ( tMainClass = "w-full text-left text-sm text-slate-700 dark:text-slate-300" diff --git a/views/dashboards/home/home.templ b/pkg/views/dashboards/home/home.templ similarity index 98% rename from views/dashboards/home/home.templ rename to pkg/views/dashboards/home/home.templ index 404f9d6..0143d2f 100644 --- a/views/dashboards/home/home.templ +++ b/pkg/views/dashboards/home/home.templ @@ -1,11 +1,11 @@ package home import ( - "soarca-gui/utils" - "soarca-gui/views/components/cards" - card "soarca-gui/views/components/cards" - "soarca-gui/views/components/icons" - "soarca-gui/views/layouts" + "soarca-gui/pkg/utils" + "soarca-gui/pkg/views/components/cards" + card "soarca-gui/pkg/views/components/cards" + "soarca-gui/pkg/views/components/icons" + "soarca-gui/pkg/views/layouts" ) const ( diff --git a/views/dashboards/reporting/reporting.templ b/pkg/views/dashboards/reporting/reporting.templ similarity index 88% rename from views/dashboards/reporting/reporting.templ rename to pkg/views/dashboards/reporting/reporting.templ index cd5d45b..0a9dae0 100644 --- a/views/dashboards/reporting/reporting.templ +++ b/pkg/views/dashboards/reporting/reporting.templ @@ -1,10 +1,10 @@ package reporting import ( - "soarca-gui/utils" - "soarca-gui/views/components/cards" - "soarca-gui/views/components/table" - "soarca-gui/views/layouts" + "soarca-gui/pkg/utils" + "soarca-gui/pkg/views/components/cards" + "soarca-gui/pkg/views/components/table" + "soarca-gui/pkg/views/layouts" ) templ ReportingIndex() { diff --git a/views/dashboards/reporting/reporting_detailed.templ b/pkg/views/dashboards/reporting/reporting_detailed.templ similarity index 97% rename from views/dashboards/reporting/reporting_detailed.templ rename to pkg/views/dashboards/reporting/reporting_detailed.templ index f6a8e85..ba1485d 100644 --- a/views/dashboards/reporting/reporting_detailed.templ +++ b/pkg/views/dashboards/reporting/reporting_detailed.templ @@ -3,14 +3,14 @@ package reporting import ( "encoding/json" "fmt" - "soarca-gui/models/cacao" - "soarca-gui/models/reporter" - "soarca-gui/utils" - "soarca-gui/views/components/alerts" - "soarca-gui/views/components/cards" - "soarca-gui/views/components/icons" - "soarca-gui/views/components/indicators" - "soarca-gui/views/layouts" + "soarca-gui/pkg/models/cacao" + "soarca-gui/pkg/models/reporter" + "soarca-gui/pkg/utils" + "soarca-gui/pkg/views/components/alerts" + "soarca-gui/pkg/views/components/cards" + "soarca-gui/pkg/views/components/icons" + "soarca-gui/pkg/views/components/indicators" + "soarca-gui/pkg/views/layouts" "time" ) diff --git a/views/dashboards/settings/settings.templ b/pkg/views/dashboards/settings/settings.templ similarity index 97% rename from views/dashboards/settings/settings.templ rename to pkg/views/dashboards/settings/settings.templ index ff6b31b..944bc40 100644 --- a/views/dashboards/settings/settings.templ +++ b/pkg/views/dashboards/settings/settings.templ @@ -1,8 +1,8 @@ package settings import ( - "soarca-gui/views/components/cards" - "soarca-gui/views/layouts" + "soarca-gui/pkg/views/components/cards" + "soarca-gui/pkg/views/layouts" ) const ( diff --git a/views/layouts/404.templ b/pkg/views/layouts/404.templ similarity index 100% rename from views/layouts/404.templ rename to pkg/views/layouts/404.templ diff --git a/views/layouts/base_layout.templ b/pkg/views/layouts/base_layout.templ similarity index 100% rename from views/layouts/base_layout.templ rename to pkg/views/layouts/base_layout.templ diff --git a/views/layouts/dashboard_layout.templ b/pkg/views/layouts/dashboard_layout.templ similarity index 96% rename from views/layouts/dashboard_layout.templ rename to pkg/views/layouts/dashboard_layout.templ index 6519fb5..59dd59d 100644 --- a/views/layouts/dashboard_layout.templ +++ b/pkg/views/layouts/dashboard_layout.templ @@ -1,10 +1,10 @@ package layouts import ( - "soarca-gui/utils" - "soarca-gui/views/components/headbar" - "soarca-gui/views/components/icons" - "soarca-gui/views/components/navbar" + "soarca-gui/pkg/utils" + "soarca-gui/pkg/views/components/headbar" + "soarca-gui/pkg/views/components/icons" + "soarca-gui/pkg/views/components/navbar" ) const (