diff --git a/.gitignore b/.gitignore index 0697bb9..62cdd4b 100644 --- a/.gitignore +++ b/.gitignore @@ -23,7 +23,7 @@ vspd-harness/ cov.out *cpu.out *mem.out -webapi/test.db +internal/webapi/test.db database/test.db # Go workspace diff --git a/cmd/vspd/vspd.go b/cmd/vspd/vspd.go index 43f3924..bf74b78 100644 --- a/cmd/vspd/vspd.go +++ b/cmd/vspd/vspd.go @@ -16,9 +16,9 @@ import ( "github.com/decred/dcrd/wire" "github.com/decred/slog" "github.com/decred/vspd/database" + "github.com/decred/vspd/internal/webapi" "github.com/decred/vspd/rpc" "github.com/decred/vspd/version" - "github.com/decred/vspd/webapi" "github.com/jrick/wsrpc/v2" ) diff --git a/webapi/addressgenerator.go b/internal/webapi/addressgenerator.go similarity index 100% rename from webapi/addressgenerator.go rename to internal/webapi/addressgenerator.go diff --git a/webapi/admin.go b/internal/webapi/admin.go similarity index 100% rename from webapi/admin.go rename to internal/webapi/admin.go diff --git a/webapi/cache.go b/internal/webapi/cache.go similarity index 100% rename from webapi/cache.go rename to internal/webapi/cache.go diff --git a/webapi/formatting.go b/internal/webapi/formatting.go similarity index 100% rename from webapi/formatting.go rename to internal/webapi/formatting.go diff --git a/webapi/formatting_test.go b/internal/webapi/formatting_test.go similarity index 100% rename from webapi/formatting_test.go rename to internal/webapi/formatting_test.go diff --git a/webapi/getfeeaddress.go b/internal/webapi/getfeeaddress.go similarity index 100% rename from webapi/getfeeaddress.go rename to internal/webapi/getfeeaddress.go diff --git a/webapi/helpers.go b/internal/webapi/helpers.go similarity index 100% rename from webapi/helpers.go rename to internal/webapi/helpers.go diff --git a/webapi/helpers_test.go b/internal/webapi/helpers_test.go similarity index 100% rename from webapi/helpers_test.go rename to internal/webapi/helpers_test.go diff --git a/webapi/homepage.go b/internal/webapi/homepage.go similarity index 100% rename from webapi/homepage.go rename to internal/webapi/homepage.go diff --git a/webapi/middleware.go b/internal/webapi/middleware.go similarity index 100% rename from webapi/middleware.go rename to internal/webapi/middleware.go diff --git a/webapi/middleware_test.go b/internal/webapi/middleware_test.go similarity index 100% rename from webapi/middleware_test.go rename to internal/webapi/middleware_test.go diff --git a/webapi/payfee.go b/internal/webapi/payfee.go similarity index 100% rename from webapi/payfee.go rename to internal/webapi/payfee.go diff --git a/webapi/public/css/fonts.css b/internal/webapi/public/css/fonts.css similarity index 100% rename from webapi/public/css/fonts.css rename to internal/webapi/public/css/fonts.css diff --git a/webapi/public/css/fonts/SourceCodePro-Regular/SourceCodePro-Regular.eot b/internal/webapi/public/css/fonts/SourceCodePro-Regular/SourceCodePro-Regular.eot similarity index 100% rename from webapi/public/css/fonts/SourceCodePro-Regular/SourceCodePro-Regular.eot rename to internal/webapi/public/css/fonts/SourceCodePro-Regular/SourceCodePro-Regular.eot diff --git a/webapi/public/css/fonts/SourceCodePro-Regular/SourceCodePro-Regular.ttf b/internal/webapi/public/css/fonts/SourceCodePro-Regular/SourceCodePro-Regular.ttf similarity index 100% rename from webapi/public/css/fonts/SourceCodePro-Regular/SourceCodePro-Regular.ttf rename to internal/webapi/public/css/fonts/SourceCodePro-Regular/SourceCodePro-Regular.ttf diff --git a/webapi/public/css/fonts/SourceCodePro-Regular/SourceCodePro-Regular.ttf.woff b/internal/webapi/public/css/fonts/SourceCodePro-Regular/SourceCodePro-Regular.ttf.woff similarity index 100% rename from webapi/public/css/fonts/SourceCodePro-Regular/SourceCodePro-Regular.ttf.woff rename to internal/webapi/public/css/fonts/SourceCodePro-Regular/SourceCodePro-Regular.ttf.woff diff --git a/webapi/public/css/fonts/SourceCodePro-Regular/SourceCodePro-Regular.ttf.woff2 b/internal/webapi/public/css/fonts/SourceCodePro-Regular/SourceCodePro-Regular.ttf.woff2 similarity index 100% rename from webapi/public/css/fonts/SourceCodePro-Regular/SourceCodePro-Regular.ttf.woff2 rename to internal/webapi/public/css/fonts/SourceCodePro-Regular/SourceCodePro-Regular.ttf.woff2 diff --git a/webapi/public/css/fonts/SourceSansPro-It/SourceSansPro-It.eot b/internal/webapi/public/css/fonts/SourceSansPro-It/SourceSansPro-It.eot similarity index 100% rename from webapi/public/css/fonts/SourceSansPro-It/SourceSansPro-It.eot rename to internal/webapi/public/css/fonts/SourceSansPro-It/SourceSansPro-It.eot diff --git a/webapi/public/css/fonts/SourceSansPro-It/SourceSansPro-It.ttf b/internal/webapi/public/css/fonts/SourceSansPro-It/SourceSansPro-It.ttf similarity index 100% rename from webapi/public/css/fonts/SourceSansPro-It/SourceSansPro-It.ttf rename to internal/webapi/public/css/fonts/SourceSansPro-It/SourceSansPro-It.ttf diff --git a/webapi/public/css/fonts/SourceSansPro-It/SourceSansPro-It.ttf.woff b/internal/webapi/public/css/fonts/SourceSansPro-It/SourceSansPro-It.ttf.woff similarity index 100% rename from webapi/public/css/fonts/SourceSansPro-It/SourceSansPro-It.ttf.woff rename to internal/webapi/public/css/fonts/SourceSansPro-It/SourceSansPro-It.ttf.woff diff --git a/webapi/public/css/fonts/SourceSansPro-It/SourceSansPro-It.ttf.woff2 b/internal/webapi/public/css/fonts/SourceSansPro-It/SourceSansPro-It.ttf.woff2 similarity index 100% rename from webapi/public/css/fonts/SourceSansPro-It/SourceSansPro-It.ttf.woff2 rename to internal/webapi/public/css/fonts/SourceSansPro-It/SourceSansPro-It.ttf.woff2 diff --git a/webapi/public/css/fonts/SourceSansPro-Regular/SourceSansPro-Regular.eot b/internal/webapi/public/css/fonts/SourceSansPro-Regular/SourceSansPro-Regular.eot similarity index 100% rename from webapi/public/css/fonts/SourceSansPro-Regular/SourceSansPro-Regular.eot rename to internal/webapi/public/css/fonts/SourceSansPro-Regular/SourceSansPro-Regular.eot diff --git a/webapi/public/css/fonts/SourceSansPro-Regular/SourceSansPro-Regular.ttf b/internal/webapi/public/css/fonts/SourceSansPro-Regular/SourceSansPro-Regular.ttf similarity index 100% rename from webapi/public/css/fonts/SourceSansPro-Regular/SourceSansPro-Regular.ttf rename to internal/webapi/public/css/fonts/SourceSansPro-Regular/SourceSansPro-Regular.ttf diff --git a/webapi/public/css/fonts/SourceSansPro-Regular/SourceSansPro-Regular.ttf.woff b/internal/webapi/public/css/fonts/SourceSansPro-Regular/SourceSansPro-Regular.ttf.woff similarity index 100% rename from webapi/public/css/fonts/SourceSansPro-Regular/SourceSansPro-Regular.ttf.woff rename to internal/webapi/public/css/fonts/SourceSansPro-Regular/SourceSansPro-Regular.ttf.woff diff --git a/webapi/public/css/fonts/SourceSansPro-Regular/SourceSansPro-Regular.ttf.woff2 b/internal/webapi/public/css/fonts/SourceSansPro-Regular/SourceSansPro-Regular.ttf.woff2 similarity index 100% rename from webapi/public/css/fonts/SourceSansPro-Regular/SourceSansPro-Regular.ttf.woff2 rename to internal/webapi/public/css/fonts/SourceSansPro-Regular/SourceSansPro-Regular.ttf.woff2 diff --git a/webapi/public/css/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.eot b/internal/webapi/public/css/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.eot similarity index 100% rename from webapi/public/css/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.eot rename to internal/webapi/public/css/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.eot diff --git a/webapi/public/css/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.ttf b/internal/webapi/public/css/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.ttf similarity index 100% rename from webapi/public/css/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.ttf rename to internal/webapi/public/css/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.ttf diff --git a/webapi/public/css/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.ttf.woff b/internal/webapi/public/css/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.ttf.woff similarity index 100% rename from webapi/public/css/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.ttf.woff rename to internal/webapi/public/css/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.ttf.woff diff --git a/webapi/public/css/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.ttf.woff2 b/internal/webapi/public/css/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.ttf.woff2 similarity index 100% rename from webapi/public/css/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.ttf.woff2 rename to internal/webapi/public/css/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.ttf.woff2 diff --git a/webapi/public/css/fonts/SourceSansPro-SemiboldIt/SourceSansPro-SemiboldIt.eot b/internal/webapi/public/css/fonts/SourceSansPro-SemiboldIt/SourceSansPro-SemiboldIt.eot similarity index 100% rename from webapi/public/css/fonts/SourceSansPro-SemiboldIt/SourceSansPro-SemiboldIt.eot rename to internal/webapi/public/css/fonts/SourceSansPro-SemiboldIt/SourceSansPro-SemiboldIt.eot diff --git a/webapi/public/css/fonts/SourceSansPro-SemiboldIt/SourceSansPro-SemiboldIt.ttf b/internal/webapi/public/css/fonts/SourceSansPro-SemiboldIt/SourceSansPro-SemiboldIt.ttf similarity index 100% rename from webapi/public/css/fonts/SourceSansPro-SemiboldIt/SourceSansPro-SemiboldIt.ttf rename to internal/webapi/public/css/fonts/SourceSansPro-SemiboldIt/SourceSansPro-SemiboldIt.ttf diff --git a/webapi/public/css/fonts/SourceSansPro-SemiboldIt/SourceSansPro-SemiboldIt.ttf.woff b/internal/webapi/public/css/fonts/SourceSansPro-SemiboldIt/SourceSansPro-SemiboldIt.ttf.woff similarity index 100% rename from webapi/public/css/fonts/SourceSansPro-SemiboldIt/SourceSansPro-SemiboldIt.ttf.woff rename to internal/webapi/public/css/fonts/SourceSansPro-SemiboldIt/SourceSansPro-SemiboldIt.ttf.woff diff --git a/webapi/public/css/fonts/SourceSansPro-SemiboldIt/SourceSansPro-SemiboldIt.ttf.woff2 b/internal/webapi/public/css/fonts/SourceSansPro-SemiboldIt/SourceSansPro-SemiboldIt.ttf.woff2 similarity index 100% rename from webapi/public/css/fonts/SourceSansPro-SemiboldIt/SourceSansPro-SemiboldIt.ttf.woff2 rename to internal/webapi/public/css/fonts/SourceSansPro-SemiboldIt/SourceSansPro-SemiboldIt.ttf.woff2 diff --git a/webapi/public/css/vendor/bootstrap-4.5.0.min.css b/internal/webapi/public/css/vendor/bootstrap-4.5.0.min.css similarity index 100% rename from webapi/public/css/vendor/bootstrap-4.5.0.min.css rename to internal/webapi/public/css/vendor/bootstrap-4.5.0.min.css diff --git a/webapi/public/css/vendor/bootstrap-4.5.0.min.css.map b/internal/webapi/public/css/vendor/bootstrap-4.5.0.min.css.map similarity index 100% rename from webapi/public/css/vendor/bootstrap-4.5.0.min.css.map rename to internal/webapi/public/css/vendor/bootstrap-4.5.0.min.css.map diff --git a/webapi/public/css/vspd.css b/internal/webapi/public/css/vspd.css similarity index 100% rename from webapi/public/css/vspd.css rename to internal/webapi/public/css/vspd.css diff --git a/webapi/public/images/error-icon.svg b/internal/webapi/public/images/error-icon.svg similarity index 100% rename from webapi/public/images/error-icon.svg rename to internal/webapi/public/images/error-icon.svg diff --git a/webapi/public/images/favicon/apple-touch-icon-114x114.png b/internal/webapi/public/images/favicon/apple-touch-icon-114x114.png similarity index 100% rename from webapi/public/images/favicon/apple-touch-icon-114x114.png rename to internal/webapi/public/images/favicon/apple-touch-icon-114x114.png diff --git a/webapi/public/images/favicon/apple-touch-icon-120x120.png b/internal/webapi/public/images/favicon/apple-touch-icon-120x120.png similarity index 100% rename from webapi/public/images/favicon/apple-touch-icon-120x120.png rename to internal/webapi/public/images/favicon/apple-touch-icon-120x120.png diff --git a/webapi/public/images/favicon/apple-touch-icon-144x144.png b/internal/webapi/public/images/favicon/apple-touch-icon-144x144.png similarity index 100% rename from webapi/public/images/favicon/apple-touch-icon-144x144.png rename to internal/webapi/public/images/favicon/apple-touch-icon-144x144.png diff --git a/webapi/public/images/favicon/apple-touch-icon-152x152.png b/internal/webapi/public/images/favicon/apple-touch-icon-152x152.png similarity index 100% rename from webapi/public/images/favicon/apple-touch-icon-152x152.png rename to internal/webapi/public/images/favicon/apple-touch-icon-152x152.png diff --git a/webapi/public/images/favicon/apple-touch-icon-180x180.png b/internal/webapi/public/images/favicon/apple-touch-icon-180x180.png similarity index 100% rename from webapi/public/images/favicon/apple-touch-icon-180x180.png rename to internal/webapi/public/images/favicon/apple-touch-icon-180x180.png diff --git a/webapi/public/images/favicon/apple-touch-icon-57x57.png b/internal/webapi/public/images/favicon/apple-touch-icon-57x57.png similarity index 100% rename from webapi/public/images/favicon/apple-touch-icon-57x57.png rename to internal/webapi/public/images/favicon/apple-touch-icon-57x57.png diff --git a/webapi/public/images/favicon/apple-touch-icon-60x60.png b/internal/webapi/public/images/favicon/apple-touch-icon-60x60.png similarity index 100% rename from webapi/public/images/favicon/apple-touch-icon-60x60.png rename to internal/webapi/public/images/favicon/apple-touch-icon-60x60.png diff --git a/webapi/public/images/favicon/apple-touch-icon-72x72.png b/internal/webapi/public/images/favicon/apple-touch-icon-72x72.png similarity index 100% rename from webapi/public/images/favicon/apple-touch-icon-72x72.png rename to internal/webapi/public/images/favicon/apple-touch-icon-72x72.png diff --git a/webapi/public/images/favicon/apple-touch-icon-76x76.png b/internal/webapi/public/images/favicon/apple-touch-icon-76x76.png similarity index 100% rename from webapi/public/images/favicon/apple-touch-icon-76x76.png rename to internal/webapi/public/images/favicon/apple-touch-icon-76x76.png diff --git a/webapi/public/images/favicon/browserconfig.xml b/internal/webapi/public/images/favicon/browserconfig.xml similarity index 100% rename from webapi/public/images/favicon/browserconfig.xml rename to internal/webapi/public/images/favicon/browserconfig.xml diff --git a/webapi/public/images/favicon/favicon-16x16.png b/internal/webapi/public/images/favicon/favicon-16x16.png similarity index 100% rename from webapi/public/images/favicon/favicon-16x16.png rename to internal/webapi/public/images/favicon/favicon-16x16.png diff --git a/webapi/public/images/favicon/favicon-32x32.png b/internal/webapi/public/images/favicon/favicon-32x32.png similarity index 100% rename from webapi/public/images/favicon/favicon-32x32.png rename to internal/webapi/public/images/favicon/favicon-32x32.png diff --git a/webapi/public/images/favicon/favicon.ico b/internal/webapi/public/images/favicon/favicon.ico similarity index 100% rename from webapi/public/images/favicon/favicon.ico rename to internal/webapi/public/images/favicon/favicon.ico diff --git a/webapi/public/images/favicon/ic_launcher_hdpi.png b/internal/webapi/public/images/favicon/ic_launcher_hdpi.png similarity index 100% rename from webapi/public/images/favicon/ic_launcher_hdpi.png rename to internal/webapi/public/images/favicon/ic_launcher_hdpi.png diff --git a/webapi/public/images/favicon/ic_launcher_mdpi.png b/internal/webapi/public/images/favicon/ic_launcher_mdpi.png similarity index 100% rename from webapi/public/images/favicon/ic_launcher_mdpi.png rename to internal/webapi/public/images/favicon/ic_launcher_mdpi.png diff --git a/webapi/public/images/favicon/ic_launcher_xhdpi.png b/internal/webapi/public/images/favicon/ic_launcher_xhdpi.png similarity index 100% rename from webapi/public/images/favicon/ic_launcher_xhdpi.png rename to internal/webapi/public/images/favicon/ic_launcher_xhdpi.png diff --git a/webapi/public/images/favicon/ic_launcher_xxhdpi.png b/internal/webapi/public/images/favicon/ic_launcher_xxhdpi.png similarity index 100% rename from webapi/public/images/favicon/ic_launcher_xxhdpi.png rename to internal/webapi/public/images/favicon/ic_launcher_xxhdpi.png diff --git a/webapi/public/images/favicon/ic_launcher_xxxhdpi.png b/internal/webapi/public/images/favicon/ic_launcher_xxxhdpi.png similarity index 100% rename from webapi/public/images/favicon/ic_launcher_xxxhdpi.png rename to internal/webapi/public/images/favicon/ic_launcher_xxxhdpi.png diff --git a/webapi/public/images/favicon/manifest.json b/internal/webapi/public/images/favicon/manifest.json similarity index 100% rename from webapi/public/images/favicon/manifest.json rename to internal/webapi/public/images/favicon/manifest.json diff --git a/webapi/public/images/favicon/mstile-144x144.png b/internal/webapi/public/images/favicon/mstile-144x144.png similarity index 100% rename from webapi/public/images/favicon/mstile-144x144.png rename to internal/webapi/public/images/favicon/mstile-144x144.png diff --git a/webapi/public/images/favicon/mstile-150x150.png b/internal/webapi/public/images/favicon/mstile-150x150.png similarity index 100% rename from webapi/public/images/favicon/mstile-150x150.png rename to internal/webapi/public/images/favicon/mstile-150x150.png diff --git a/webapi/public/images/favicon/mstile-310x150.png b/internal/webapi/public/images/favicon/mstile-310x150.png similarity index 100% rename from webapi/public/images/favicon/mstile-310x150.png rename to internal/webapi/public/images/favicon/mstile-310x150.png diff --git a/webapi/public/images/favicon/mstile-310x310.png b/internal/webapi/public/images/favicon/mstile-310x310.png similarity index 100% rename from webapi/public/images/favicon/mstile-310x310.png rename to internal/webapi/public/images/favicon/mstile-310x310.png diff --git a/webapi/public/images/favicon/mstile-70x70.png b/internal/webapi/public/images/favicon/mstile-70x70.png similarity index 100% rename from webapi/public/images/favicon/mstile-70x70.png rename to internal/webapi/public/images/favicon/mstile-70x70.png diff --git a/webapi/public/images/favicon/safari-pinned-tab.svg b/internal/webapi/public/images/favicon/safari-pinned-tab.svg similarity index 100% rename from webapi/public/images/favicon/safari-pinned-tab.svg rename to internal/webapi/public/images/favicon/safari-pinned-tab.svg diff --git a/webapi/public/images/success-icon.svg b/internal/webapi/public/images/success-icon.svg similarity index 100% rename from webapi/public/images/success-icon.svg rename to internal/webapi/public/images/success-icon.svg diff --git a/webapi/recovery.go b/internal/webapi/recovery.go similarity index 100% rename from webapi/recovery.go rename to internal/webapi/recovery.go diff --git a/webapi/setaltsignaddr.go b/internal/webapi/setaltsignaddr.go similarity index 100% rename from webapi/setaltsignaddr.go rename to internal/webapi/setaltsignaddr.go diff --git a/webapi/setaltsignaddr_test.go b/internal/webapi/setaltsignaddr_test.go similarity index 100% rename from webapi/setaltsignaddr_test.go rename to internal/webapi/setaltsignaddr_test.go diff --git a/webapi/setvotechoices.go b/internal/webapi/setvotechoices.go similarity index 100% rename from webapi/setvotechoices.go rename to internal/webapi/setvotechoices.go diff --git a/webapi/templates/admin.html b/internal/webapi/templates/admin.html similarity index 100% rename from webapi/templates/admin.html rename to internal/webapi/templates/admin.html diff --git a/webapi/templates/footer.html b/internal/webapi/templates/footer.html similarity index 100% rename from webapi/templates/footer.html rename to internal/webapi/templates/footer.html diff --git a/webapi/templates/header.html b/internal/webapi/templates/header.html similarity index 100% rename from webapi/templates/header.html rename to internal/webapi/templates/header.html diff --git a/webapi/templates/homepage.html b/internal/webapi/templates/homepage.html similarity index 100% rename from webapi/templates/homepage.html rename to internal/webapi/templates/homepage.html diff --git a/webapi/templates/login.html b/internal/webapi/templates/login.html similarity index 100% rename from webapi/templates/login.html rename to internal/webapi/templates/login.html diff --git a/webapi/templates/ticket-search-result.html b/internal/webapi/templates/ticket-search-result.html similarity index 100% rename from webapi/templates/ticket-search-result.html rename to internal/webapi/templates/ticket-search-result.html diff --git a/webapi/templates/vsp-stats.html b/internal/webapi/templates/vsp-stats.html similarity index 100% rename from webapi/templates/vsp-stats.html rename to internal/webapi/templates/vsp-stats.html diff --git a/webapi/ticketstatus.go b/internal/webapi/ticketstatus.go similarity index 100% rename from webapi/ticketstatus.go rename to internal/webapi/ticketstatus.go diff --git a/webapi/vspinfo.go b/internal/webapi/vspinfo.go similarity index 100% rename from webapi/vspinfo.go rename to internal/webapi/vspinfo.go diff --git a/webapi/webapi.go b/internal/webapi/webapi.go similarity index 98% rename from webapi/webapi.go rename to internal/webapi/webapi.go index e460abb..3741e16 100644 --- a/webapi/webapi.go +++ b/internal/webapi/webapi.go @@ -213,7 +213,7 @@ func (s *Server) router(cookieSecret []byte, dcrd rpc.DcrdConnect, wallets rpc.W "comma": humanize.Comma, }) - router.LoadHTMLGlob("webapi/templates/*.html") + router.LoadHTMLGlob("internal/webapi/templates/*.html") // Recovery middleware handles any go panics generated while processing web // requests. Ensures a 500 response is sent to the client rather than @@ -227,7 +227,7 @@ func (s *Server) router(cookieSecret []byte, dcrd rpc.DcrdConnect, wallets rpc.W } // Serve static web resources - router.Static("/public", "webapi/public/") + router.Static("/public", "internal/webapi/public/") // Create a cookie store for persisting admin session information. cookieStore := sessions.NewCookieStore(cookieSecret)