From e8557f2a0187be9d78df288f905490b5d79d7934 Mon Sep 17 00:00:00 2001 From: Dave Collins Date: Tue, 12 Sep 2023 16:08:57 -0500 Subject: [PATCH] gui: Move package to internal. dcrpool is an application and thus all of its package not intended for external consumers should not be publicly visible. To that end, this moves the gui package to an internal package meaning that it is no longer a part of the exported main module. --- README.md | 9 +++++---- dcrpool.go | 2 +- harness.sh | 2 +- {gui => internal/gui}/account.go | 0 {gui => internal/gui}/admin.go | 0 {gui => internal/gui}/assets/public/css/dcrpool.css | 0 {gui => internal/gui}/assets/public/css/fonts.css | 0 .../SourceCodePro-Regular/SourceCodePro-Regular.eot | Bin .../SourceCodePro-Regular/SourceCodePro-Regular.ttf | Bin .../SourceCodePro-Regular.ttf.woff | Bin .../SourceCodePro-Regular.ttf.woff2 | Bin .../css/fonts/SourceSansPro-It/SourceSansPro-It.eot | Bin .../css/fonts/SourceSansPro-It/SourceSansPro-It.ttf | Bin .../SourceSansPro-It/SourceSansPro-It.ttf.woff | Bin .../SourceSansPro-It/SourceSansPro-It.ttf.woff2 | Bin .../SourceSansPro-Regular/SourceSansPro-Regular.eot | Bin .../SourceSansPro-Regular/SourceSansPro-Regular.ttf | Bin .../SourceSansPro-Regular.ttf.woff | Bin .../SourceSansPro-Regular.ttf.woff2 | Bin .../SourceSansPro-Semibold.eot | Bin .../SourceSansPro-Semibold.ttf | Bin .../SourceSansPro-Semibold.ttf.woff | Bin .../SourceSansPro-Semibold.ttf.woff2 | Bin .../SourceSansPro-SemiboldIt.eot | Bin .../SourceSansPro-SemiboldIt.ttf | Bin .../SourceSansPro-SemiboldIt.ttf.woff | Bin .../SourceSansPro-SemiboldIt.ttf.woff2 | Bin .../gui}/assets/public/css/pagination.css | 0 .../public/css/vendor/bootstrap-4.4.1.min.css | 0 .../gui}/assets/public/images/arrow-next.svg | 0 .../gui}/assets/public/images/arrow-prev.svg | 0 .../gui}/assets/public/images/carousel_1.svg | 0 .../gui}/assets/public/images/carousel_2.svg | 0 .../gui}/assets/public/images/carousel_3.svg | 0 .../gui}/assets/public/images/dropdown.svg | 0 .../images/favicon/apple-touch-icon-114x114.png | Bin .../images/favicon/apple-touch-icon-120x120.png | Bin .../images/favicon/apple-touch-icon-144x144.png | Bin .../images/favicon/apple-touch-icon-152x152.png | Bin .../images/favicon/apple-touch-icon-180x180.png | Bin .../images/favicon/apple-touch-icon-57x57.png | Bin .../images/favicon/apple-touch-icon-60x60.png | Bin .../images/favicon/apple-touch-icon-72x72.png | Bin .../images/favicon/apple-touch-icon-76x76.png | Bin .../assets/public/images/favicon/browserconfig.xml | 0 .../assets/public/images/favicon/favicon-16x16.png | Bin .../assets/public/images/favicon/favicon-32x32.png | Bin .../gui}/assets/public/images/favicon/favicon.ico | Bin .../public/images/favicon/ic_launcher_hdpi.png | Bin .../public/images/favicon/ic_launcher_mdpi.png | Bin .../public/images/favicon/ic_launcher_xhdpi.png | Bin .../public/images/favicon/ic_launcher_xxhdpi.png | Bin .../public/images/favicon/ic_launcher_xxxhdpi.png | Bin .../gui}/assets/public/images/favicon/manifest.json | 0 .../assets/public/images/favicon/mstile-144x144.png | Bin .../assets/public/images/favicon/mstile-150x150.png | Bin .../assets/public/images/favicon/mstile-310x150.png | Bin .../assets/public/images/favicon/mstile-310x310.png | Bin .../assets/public/images/favicon/mstile-70x70.png | Bin .../public/images/favicon/safari-pinned-tab.svg | 0 .../gui}/assets/public/images/indicator-failed.svg | 0 .../assets/public/images/indicator-finished.svg | 0 .../assets/public/images/indicator-in-progress.svg | 0 .../assets/public/images/indicator-upcoming.svg | 0 .../gui}/assets/public/images/left_arrow.svg | 0 .../gui}/assets/public/images/right_arrow.svg | 0 .../gui}/assets/public/images/warning-sign.svg | 0 .../gui}/assets/public/js/admin-pagination.js | 0 {gui => internal/gui}/assets/public/js/carousel.js | 0 {gui => internal/gui}/assets/public/js/modal.js | 0 .../gui}/assets/public/js/pagination.js | 0 {gui => internal/gui}/assets/public/js/socket.js | 0 .../assets/public/js/vendor/bootstrap-4.4.1.min.js | 0 .../assets/public/js/vendor/flickity.pkgd.min.js | 0 .../assets/public/js/vendor/jquery-3.4.1.min.js | 0 .../assets/public/js/vendor/pagination-2.1.5.min.js | 0 .../assets/public/js/vendor/popper-1.16.0.min.js | 0 {gui => internal/gui}/assets/templates/account.html | 0 {gui => internal/gui}/assets/templates/admin.html | 0 {gui => internal/gui}/assets/templates/header.html | 0 {gui => internal/gui}/assets/templates/index.html | 0 .../gui}/assets/templates/payments.html | 0 .../gui}/assets/templates/pool-stats.html | 0 {gui => internal/gui}/cache.go | 0 {gui => internal/gui}/formatting.go | 0 {gui => internal/gui}/gui.go | 0 {gui => internal/gui}/index.go | 0 {gui => internal/gui}/log.go | 0 {gui => internal/gui}/middleware.go | 0 {gui => internal/gui}/pagination.go | 0 {gui => internal/gui}/websocket.go | 0 log.go | 2 +- 92 files changed, 8 insertions(+), 7 deletions(-) rename {gui => internal/gui}/account.go (100%) rename {gui => internal/gui}/admin.go (100%) rename {gui => internal/gui}/assets/public/css/dcrpool.css (100%) rename {gui => internal/gui}/assets/public/css/fonts.css (100%) rename {gui => internal/gui}/assets/public/css/fonts/SourceCodePro-Regular/SourceCodePro-Regular.eot (100%) rename {gui => internal/gui}/assets/public/css/fonts/SourceCodePro-Regular/SourceCodePro-Regular.ttf (100%) rename {gui => internal/gui}/assets/public/css/fonts/SourceCodePro-Regular/SourceCodePro-Regular.ttf.woff (100%) rename {gui => internal/gui}/assets/public/css/fonts/SourceCodePro-Regular/SourceCodePro-Regular.ttf.woff2 (100%) rename {gui => internal/gui}/assets/public/css/fonts/SourceSansPro-It/SourceSansPro-It.eot (100%) rename {gui => internal/gui}/assets/public/css/fonts/SourceSansPro-It/SourceSansPro-It.ttf (100%) rename {gui => internal/gui}/assets/public/css/fonts/SourceSansPro-It/SourceSansPro-It.ttf.woff (100%) rename {gui => internal/gui}/assets/public/css/fonts/SourceSansPro-It/SourceSansPro-It.ttf.woff2 (100%) rename {gui => internal/gui}/assets/public/css/fonts/SourceSansPro-Regular/SourceSansPro-Regular.eot (100%) rename {gui => internal/gui}/assets/public/css/fonts/SourceSansPro-Regular/SourceSansPro-Regular.ttf (100%) rename {gui => internal/gui}/assets/public/css/fonts/SourceSansPro-Regular/SourceSansPro-Regular.ttf.woff (100%) rename {gui => internal/gui}/assets/public/css/fonts/SourceSansPro-Regular/SourceSansPro-Regular.ttf.woff2 (100%) rename {gui => internal/gui}/assets/public/css/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.eot (100%) rename {gui => internal/gui}/assets/public/css/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.ttf (100%) rename {gui => internal/gui}/assets/public/css/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.ttf.woff (100%) rename {gui => internal/gui}/assets/public/css/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.ttf.woff2 (100%) rename {gui => internal/gui}/assets/public/css/fonts/SourceSansPro-SemiboldIt/SourceSansPro-SemiboldIt.eot (100%) rename {gui => internal/gui}/assets/public/css/fonts/SourceSansPro-SemiboldIt/SourceSansPro-SemiboldIt.ttf (100%) rename {gui => internal/gui}/assets/public/css/fonts/SourceSansPro-SemiboldIt/SourceSansPro-SemiboldIt.ttf.woff (100%) rename {gui => internal/gui}/assets/public/css/fonts/SourceSansPro-SemiboldIt/SourceSansPro-SemiboldIt.ttf.woff2 (100%) rename {gui => internal/gui}/assets/public/css/pagination.css (100%) rename {gui => internal/gui}/assets/public/css/vendor/bootstrap-4.4.1.min.css (100%) rename {gui => internal/gui}/assets/public/images/arrow-next.svg (100%) rename {gui => internal/gui}/assets/public/images/arrow-prev.svg (100%) rename {gui => internal/gui}/assets/public/images/carousel_1.svg (100%) rename {gui => internal/gui}/assets/public/images/carousel_2.svg (100%) rename {gui => internal/gui}/assets/public/images/carousel_3.svg (100%) rename {gui => internal/gui}/assets/public/images/dropdown.svg (100%) rename {gui => internal/gui}/assets/public/images/favicon/apple-touch-icon-114x114.png (100%) rename {gui => internal/gui}/assets/public/images/favicon/apple-touch-icon-120x120.png (100%) rename {gui => internal/gui}/assets/public/images/favicon/apple-touch-icon-144x144.png (100%) rename {gui => internal/gui}/assets/public/images/favicon/apple-touch-icon-152x152.png (100%) rename {gui => internal/gui}/assets/public/images/favicon/apple-touch-icon-180x180.png (100%) rename {gui => internal/gui}/assets/public/images/favicon/apple-touch-icon-57x57.png (100%) rename {gui => internal/gui}/assets/public/images/favicon/apple-touch-icon-60x60.png (100%) rename {gui => internal/gui}/assets/public/images/favicon/apple-touch-icon-72x72.png (100%) rename {gui => internal/gui}/assets/public/images/favicon/apple-touch-icon-76x76.png (100%) rename {gui => internal/gui}/assets/public/images/favicon/browserconfig.xml (100%) rename {gui => internal/gui}/assets/public/images/favicon/favicon-16x16.png (100%) rename {gui => internal/gui}/assets/public/images/favicon/favicon-32x32.png (100%) rename {gui => internal/gui}/assets/public/images/favicon/favicon.ico (100%) rename {gui => internal/gui}/assets/public/images/favicon/ic_launcher_hdpi.png (100%) rename {gui => internal/gui}/assets/public/images/favicon/ic_launcher_mdpi.png (100%) rename {gui => internal/gui}/assets/public/images/favicon/ic_launcher_xhdpi.png (100%) rename {gui => internal/gui}/assets/public/images/favicon/ic_launcher_xxhdpi.png (100%) rename {gui => internal/gui}/assets/public/images/favicon/ic_launcher_xxxhdpi.png (100%) rename {gui => internal/gui}/assets/public/images/favicon/manifest.json (100%) rename {gui => internal/gui}/assets/public/images/favicon/mstile-144x144.png (100%) rename {gui => internal/gui}/assets/public/images/favicon/mstile-150x150.png (100%) rename {gui => internal/gui}/assets/public/images/favicon/mstile-310x150.png (100%) rename {gui => internal/gui}/assets/public/images/favicon/mstile-310x310.png (100%) rename {gui => internal/gui}/assets/public/images/favicon/mstile-70x70.png (100%) rename {gui => internal/gui}/assets/public/images/favicon/safari-pinned-tab.svg (100%) rename {gui => internal/gui}/assets/public/images/indicator-failed.svg (100%) rename {gui => internal/gui}/assets/public/images/indicator-finished.svg (100%) rename {gui => internal/gui}/assets/public/images/indicator-in-progress.svg (100%) rename {gui => internal/gui}/assets/public/images/indicator-upcoming.svg (100%) rename {gui => internal/gui}/assets/public/images/left_arrow.svg (100%) rename {gui => internal/gui}/assets/public/images/right_arrow.svg (100%) rename {gui => internal/gui}/assets/public/images/warning-sign.svg (100%) rename {gui => internal/gui}/assets/public/js/admin-pagination.js (100%) rename {gui => internal/gui}/assets/public/js/carousel.js (100%) rename {gui => internal/gui}/assets/public/js/modal.js (100%) rename {gui => internal/gui}/assets/public/js/pagination.js (100%) rename {gui => internal/gui}/assets/public/js/socket.js (100%) rename {gui => internal/gui}/assets/public/js/vendor/bootstrap-4.4.1.min.js (100%) rename {gui => internal/gui}/assets/public/js/vendor/flickity.pkgd.min.js (100%) rename {gui => internal/gui}/assets/public/js/vendor/jquery-3.4.1.min.js (100%) rename {gui => internal/gui}/assets/public/js/vendor/pagination-2.1.5.min.js (100%) rename {gui => internal/gui}/assets/public/js/vendor/popper-1.16.0.min.js (100%) rename {gui => internal/gui}/assets/templates/account.html (100%) rename {gui => internal/gui}/assets/templates/admin.html (100%) rename {gui => internal/gui}/assets/templates/header.html (100%) rename {gui => internal/gui}/assets/templates/index.html (100%) rename {gui => internal/gui}/assets/templates/payments.html (100%) rename {gui => internal/gui}/assets/templates/pool-stats.html (100%) rename {gui => internal/gui}/cache.go (100%) rename {gui => internal/gui}/formatting.go (100%) rename {gui => internal/gui}/gui.go (100%) rename {gui => internal/gui}/index.go (100%) rename {gui => internal/gui}/log.go (100%) rename {gui => internal/gui}/middleware.go (100%) rename {gui => internal/gui}/pagination.go (100%) rename {gui => internal/gui}/websocket.go (100%) diff --git a/README.md b/README.md index 831776a2..14317eb6 100644 --- a/README.md +++ b/README.md @@ -92,10 +92,11 @@ dcrpool --configfile=path/to/config.conf ## Configuration dcrpool requires [dcrd](https://github.com/decred/dcrd) and [dcrwallet](https://github.com/decred/dcrwallet) when configured as a mining pool, it only requires dcrd when configured as a solo pool. -Deploying the user interface requires copying the `dcrpool/gui/assets` folder from -source to a reachable location and updating the gui directory (`--guidir`) of -the configuration. Currently only single instance deployments are supported, -support for distributed deployments will be implemented in the future. +Deploying the user interface requires copying the `dcrpool/internal/gui/assets` +folder from source to a reachable location and updating the gui directory +(`--guidir`) of the configuration. Currently only single instance deployments +are supported, support for distributed deployments will be implemented in the +future. ### Example of a solo pool configuration diff --git a/dcrpool.go b/dcrpool.go index 431b00fe..9c358a96 100644 --- a/dcrpool.go +++ b/dcrpool.go @@ -19,7 +19,7 @@ import ( "strings" "github.com/decred/dcrd/rpcclient/v8" - "github.com/decred/dcrpool/gui" + "github.com/decred/dcrpool/internal/gui" "github.com/decred/dcrpool/pool" ) diff --git a/harness.sh b/harness.sh index 17ed57c1..d0d83dc0 100755 --- a/harness.sh +++ b/harness.sh @@ -89,7 +89,7 @@ mkdir -p "${HARNESS_ROOT}/vwallet" mkdir -p "${HARNESS_ROOT}/pool" mkdir -p "${HARNESS_ROOT}/gui" -cp -r gui/assets ${GUI_DIR}/assets +cp -r internal/gui/assets ${GUI_DIR}/assets for ((i = 0; i < $NUMBER_OF_CLIENTS; i++)); do PROFILE_PORT=$(($i + 6061)) diff --git a/gui/account.go b/internal/gui/account.go similarity index 100% rename from gui/account.go rename to internal/gui/account.go diff --git a/gui/admin.go b/internal/gui/admin.go similarity index 100% rename from gui/admin.go rename to internal/gui/admin.go diff --git a/gui/assets/public/css/dcrpool.css b/internal/gui/assets/public/css/dcrpool.css similarity index 100% rename from gui/assets/public/css/dcrpool.css rename to internal/gui/assets/public/css/dcrpool.css diff --git a/gui/assets/public/css/fonts.css b/internal/gui/assets/public/css/fonts.css similarity index 100% rename from gui/assets/public/css/fonts.css rename to internal/gui/assets/public/css/fonts.css diff --git a/gui/assets/public/css/fonts/SourceCodePro-Regular/SourceCodePro-Regular.eot b/internal/gui/assets/public/css/fonts/SourceCodePro-Regular/SourceCodePro-Regular.eot similarity index 100% rename from gui/assets/public/css/fonts/SourceCodePro-Regular/SourceCodePro-Regular.eot rename to internal/gui/assets/public/css/fonts/SourceCodePro-Regular/SourceCodePro-Regular.eot diff --git a/gui/assets/public/css/fonts/SourceCodePro-Regular/SourceCodePro-Regular.ttf b/internal/gui/assets/public/css/fonts/SourceCodePro-Regular/SourceCodePro-Regular.ttf similarity index 100% rename from gui/assets/public/css/fonts/SourceCodePro-Regular/SourceCodePro-Regular.ttf rename to internal/gui/assets/public/css/fonts/SourceCodePro-Regular/SourceCodePro-Regular.ttf diff --git a/gui/assets/public/css/fonts/SourceCodePro-Regular/SourceCodePro-Regular.ttf.woff b/internal/gui/assets/public/css/fonts/SourceCodePro-Regular/SourceCodePro-Regular.ttf.woff similarity index 100% rename from gui/assets/public/css/fonts/SourceCodePro-Regular/SourceCodePro-Regular.ttf.woff rename to internal/gui/assets/public/css/fonts/SourceCodePro-Regular/SourceCodePro-Regular.ttf.woff diff --git a/gui/assets/public/css/fonts/SourceCodePro-Regular/SourceCodePro-Regular.ttf.woff2 b/internal/gui/assets/public/css/fonts/SourceCodePro-Regular/SourceCodePro-Regular.ttf.woff2 similarity index 100% rename from gui/assets/public/css/fonts/SourceCodePro-Regular/SourceCodePro-Regular.ttf.woff2 rename to internal/gui/assets/public/css/fonts/SourceCodePro-Regular/SourceCodePro-Regular.ttf.woff2 diff --git a/gui/assets/public/css/fonts/SourceSansPro-It/SourceSansPro-It.eot b/internal/gui/assets/public/css/fonts/SourceSansPro-It/SourceSansPro-It.eot similarity index 100% rename from gui/assets/public/css/fonts/SourceSansPro-It/SourceSansPro-It.eot rename to internal/gui/assets/public/css/fonts/SourceSansPro-It/SourceSansPro-It.eot diff --git a/gui/assets/public/css/fonts/SourceSansPro-It/SourceSansPro-It.ttf b/internal/gui/assets/public/css/fonts/SourceSansPro-It/SourceSansPro-It.ttf similarity index 100% rename from gui/assets/public/css/fonts/SourceSansPro-It/SourceSansPro-It.ttf rename to internal/gui/assets/public/css/fonts/SourceSansPro-It/SourceSansPro-It.ttf diff --git a/gui/assets/public/css/fonts/SourceSansPro-It/SourceSansPro-It.ttf.woff b/internal/gui/assets/public/css/fonts/SourceSansPro-It/SourceSansPro-It.ttf.woff similarity index 100% rename from gui/assets/public/css/fonts/SourceSansPro-It/SourceSansPro-It.ttf.woff rename to internal/gui/assets/public/css/fonts/SourceSansPro-It/SourceSansPro-It.ttf.woff diff --git a/gui/assets/public/css/fonts/SourceSansPro-It/SourceSansPro-It.ttf.woff2 b/internal/gui/assets/public/css/fonts/SourceSansPro-It/SourceSansPro-It.ttf.woff2 similarity index 100% rename from gui/assets/public/css/fonts/SourceSansPro-It/SourceSansPro-It.ttf.woff2 rename to internal/gui/assets/public/css/fonts/SourceSansPro-It/SourceSansPro-It.ttf.woff2 diff --git a/gui/assets/public/css/fonts/SourceSansPro-Regular/SourceSansPro-Regular.eot b/internal/gui/assets/public/css/fonts/SourceSansPro-Regular/SourceSansPro-Regular.eot similarity index 100% rename from gui/assets/public/css/fonts/SourceSansPro-Regular/SourceSansPro-Regular.eot rename to internal/gui/assets/public/css/fonts/SourceSansPro-Regular/SourceSansPro-Regular.eot diff --git a/gui/assets/public/css/fonts/SourceSansPro-Regular/SourceSansPro-Regular.ttf b/internal/gui/assets/public/css/fonts/SourceSansPro-Regular/SourceSansPro-Regular.ttf similarity index 100% rename from gui/assets/public/css/fonts/SourceSansPro-Regular/SourceSansPro-Regular.ttf rename to internal/gui/assets/public/css/fonts/SourceSansPro-Regular/SourceSansPro-Regular.ttf diff --git a/gui/assets/public/css/fonts/SourceSansPro-Regular/SourceSansPro-Regular.ttf.woff b/internal/gui/assets/public/css/fonts/SourceSansPro-Regular/SourceSansPro-Regular.ttf.woff similarity index 100% rename from gui/assets/public/css/fonts/SourceSansPro-Regular/SourceSansPro-Regular.ttf.woff rename to internal/gui/assets/public/css/fonts/SourceSansPro-Regular/SourceSansPro-Regular.ttf.woff diff --git a/gui/assets/public/css/fonts/SourceSansPro-Regular/SourceSansPro-Regular.ttf.woff2 b/internal/gui/assets/public/css/fonts/SourceSansPro-Regular/SourceSansPro-Regular.ttf.woff2 similarity index 100% rename from gui/assets/public/css/fonts/SourceSansPro-Regular/SourceSansPro-Regular.ttf.woff2 rename to internal/gui/assets/public/css/fonts/SourceSansPro-Regular/SourceSansPro-Regular.ttf.woff2 diff --git a/gui/assets/public/css/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.eot b/internal/gui/assets/public/css/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.eot similarity index 100% rename from gui/assets/public/css/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.eot rename to internal/gui/assets/public/css/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.eot diff --git a/gui/assets/public/css/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.ttf b/internal/gui/assets/public/css/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.ttf similarity index 100% rename from gui/assets/public/css/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.ttf rename to internal/gui/assets/public/css/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.ttf diff --git a/gui/assets/public/css/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.ttf.woff b/internal/gui/assets/public/css/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.ttf.woff similarity index 100% rename from gui/assets/public/css/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.ttf.woff rename to internal/gui/assets/public/css/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.ttf.woff diff --git a/gui/assets/public/css/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.ttf.woff2 b/internal/gui/assets/public/css/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.ttf.woff2 similarity index 100% rename from gui/assets/public/css/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.ttf.woff2 rename to internal/gui/assets/public/css/fonts/SourceSansPro-Semibold/SourceSansPro-Semibold.ttf.woff2 diff --git a/gui/assets/public/css/fonts/SourceSansPro-SemiboldIt/SourceSansPro-SemiboldIt.eot b/internal/gui/assets/public/css/fonts/SourceSansPro-SemiboldIt/SourceSansPro-SemiboldIt.eot similarity index 100% rename from gui/assets/public/css/fonts/SourceSansPro-SemiboldIt/SourceSansPro-SemiboldIt.eot rename to internal/gui/assets/public/css/fonts/SourceSansPro-SemiboldIt/SourceSansPro-SemiboldIt.eot diff --git a/gui/assets/public/css/fonts/SourceSansPro-SemiboldIt/SourceSansPro-SemiboldIt.ttf b/internal/gui/assets/public/css/fonts/SourceSansPro-SemiboldIt/SourceSansPro-SemiboldIt.ttf similarity index 100% rename from gui/assets/public/css/fonts/SourceSansPro-SemiboldIt/SourceSansPro-SemiboldIt.ttf rename to internal/gui/assets/public/css/fonts/SourceSansPro-SemiboldIt/SourceSansPro-SemiboldIt.ttf diff --git a/gui/assets/public/css/fonts/SourceSansPro-SemiboldIt/SourceSansPro-SemiboldIt.ttf.woff b/internal/gui/assets/public/css/fonts/SourceSansPro-SemiboldIt/SourceSansPro-SemiboldIt.ttf.woff similarity index 100% rename from gui/assets/public/css/fonts/SourceSansPro-SemiboldIt/SourceSansPro-SemiboldIt.ttf.woff rename to internal/gui/assets/public/css/fonts/SourceSansPro-SemiboldIt/SourceSansPro-SemiboldIt.ttf.woff diff --git a/gui/assets/public/css/fonts/SourceSansPro-SemiboldIt/SourceSansPro-SemiboldIt.ttf.woff2 b/internal/gui/assets/public/css/fonts/SourceSansPro-SemiboldIt/SourceSansPro-SemiboldIt.ttf.woff2 similarity index 100% rename from gui/assets/public/css/fonts/SourceSansPro-SemiboldIt/SourceSansPro-SemiboldIt.ttf.woff2 rename to internal/gui/assets/public/css/fonts/SourceSansPro-SemiboldIt/SourceSansPro-SemiboldIt.ttf.woff2 diff --git a/gui/assets/public/css/pagination.css b/internal/gui/assets/public/css/pagination.css similarity index 100% rename from gui/assets/public/css/pagination.css rename to internal/gui/assets/public/css/pagination.css diff --git a/gui/assets/public/css/vendor/bootstrap-4.4.1.min.css b/internal/gui/assets/public/css/vendor/bootstrap-4.4.1.min.css similarity index 100% rename from gui/assets/public/css/vendor/bootstrap-4.4.1.min.css rename to internal/gui/assets/public/css/vendor/bootstrap-4.4.1.min.css diff --git a/gui/assets/public/images/arrow-next.svg b/internal/gui/assets/public/images/arrow-next.svg similarity index 100% rename from gui/assets/public/images/arrow-next.svg rename to internal/gui/assets/public/images/arrow-next.svg diff --git a/gui/assets/public/images/arrow-prev.svg b/internal/gui/assets/public/images/arrow-prev.svg similarity index 100% rename from gui/assets/public/images/arrow-prev.svg rename to internal/gui/assets/public/images/arrow-prev.svg diff --git a/gui/assets/public/images/carousel_1.svg b/internal/gui/assets/public/images/carousel_1.svg similarity index 100% rename from gui/assets/public/images/carousel_1.svg rename to internal/gui/assets/public/images/carousel_1.svg diff --git a/gui/assets/public/images/carousel_2.svg b/internal/gui/assets/public/images/carousel_2.svg similarity index 100% rename from gui/assets/public/images/carousel_2.svg rename to internal/gui/assets/public/images/carousel_2.svg diff --git a/gui/assets/public/images/carousel_3.svg b/internal/gui/assets/public/images/carousel_3.svg similarity index 100% rename from gui/assets/public/images/carousel_3.svg rename to internal/gui/assets/public/images/carousel_3.svg diff --git a/gui/assets/public/images/dropdown.svg b/internal/gui/assets/public/images/dropdown.svg similarity index 100% rename from gui/assets/public/images/dropdown.svg rename to internal/gui/assets/public/images/dropdown.svg diff --git a/gui/assets/public/images/favicon/apple-touch-icon-114x114.png b/internal/gui/assets/public/images/favicon/apple-touch-icon-114x114.png similarity index 100% rename from gui/assets/public/images/favicon/apple-touch-icon-114x114.png rename to internal/gui/assets/public/images/favicon/apple-touch-icon-114x114.png diff --git a/gui/assets/public/images/favicon/apple-touch-icon-120x120.png b/internal/gui/assets/public/images/favicon/apple-touch-icon-120x120.png similarity index 100% rename from gui/assets/public/images/favicon/apple-touch-icon-120x120.png rename to internal/gui/assets/public/images/favicon/apple-touch-icon-120x120.png diff --git a/gui/assets/public/images/favicon/apple-touch-icon-144x144.png b/internal/gui/assets/public/images/favicon/apple-touch-icon-144x144.png similarity index 100% rename from gui/assets/public/images/favicon/apple-touch-icon-144x144.png rename to internal/gui/assets/public/images/favicon/apple-touch-icon-144x144.png diff --git a/gui/assets/public/images/favicon/apple-touch-icon-152x152.png b/internal/gui/assets/public/images/favicon/apple-touch-icon-152x152.png similarity index 100% rename from gui/assets/public/images/favicon/apple-touch-icon-152x152.png rename to internal/gui/assets/public/images/favicon/apple-touch-icon-152x152.png diff --git a/gui/assets/public/images/favicon/apple-touch-icon-180x180.png b/internal/gui/assets/public/images/favicon/apple-touch-icon-180x180.png similarity index 100% rename from gui/assets/public/images/favicon/apple-touch-icon-180x180.png rename to internal/gui/assets/public/images/favicon/apple-touch-icon-180x180.png diff --git a/gui/assets/public/images/favicon/apple-touch-icon-57x57.png b/internal/gui/assets/public/images/favicon/apple-touch-icon-57x57.png similarity index 100% rename from gui/assets/public/images/favicon/apple-touch-icon-57x57.png rename to internal/gui/assets/public/images/favicon/apple-touch-icon-57x57.png diff --git a/gui/assets/public/images/favicon/apple-touch-icon-60x60.png b/internal/gui/assets/public/images/favicon/apple-touch-icon-60x60.png similarity index 100% rename from gui/assets/public/images/favicon/apple-touch-icon-60x60.png rename to internal/gui/assets/public/images/favicon/apple-touch-icon-60x60.png diff --git a/gui/assets/public/images/favicon/apple-touch-icon-72x72.png b/internal/gui/assets/public/images/favicon/apple-touch-icon-72x72.png similarity index 100% rename from gui/assets/public/images/favicon/apple-touch-icon-72x72.png rename to internal/gui/assets/public/images/favicon/apple-touch-icon-72x72.png diff --git a/gui/assets/public/images/favicon/apple-touch-icon-76x76.png b/internal/gui/assets/public/images/favicon/apple-touch-icon-76x76.png similarity index 100% rename from gui/assets/public/images/favicon/apple-touch-icon-76x76.png rename to internal/gui/assets/public/images/favicon/apple-touch-icon-76x76.png diff --git a/gui/assets/public/images/favicon/browserconfig.xml b/internal/gui/assets/public/images/favicon/browserconfig.xml similarity index 100% rename from gui/assets/public/images/favicon/browserconfig.xml rename to internal/gui/assets/public/images/favicon/browserconfig.xml diff --git a/gui/assets/public/images/favicon/favicon-16x16.png b/internal/gui/assets/public/images/favicon/favicon-16x16.png similarity index 100% rename from gui/assets/public/images/favicon/favicon-16x16.png rename to internal/gui/assets/public/images/favicon/favicon-16x16.png diff --git a/gui/assets/public/images/favicon/favicon-32x32.png b/internal/gui/assets/public/images/favicon/favicon-32x32.png similarity index 100% rename from gui/assets/public/images/favicon/favicon-32x32.png rename to internal/gui/assets/public/images/favicon/favicon-32x32.png diff --git a/gui/assets/public/images/favicon/favicon.ico b/internal/gui/assets/public/images/favicon/favicon.ico similarity index 100% rename from gui/assets/public/images/favicon/favicon.ico rename to internal/gui/assets/public/images/favicon/favicon.ico diff --git a/gui/assets/public/images/favicon/ic_launcher_hdpi.png b/internal/gui/assets/public/images/favicon/ic_launcher_hdpi.png similarity index 100% rename from gui/assets/public/images/favicon/ic_launcher_hdpi.png rename to internal/gui/assets/public/images/favicon/ic_launcher_hdpi.png diff --git a/gui/assets/public/images/favicon/ic_launcher_mdpi.png b/internal/gui/assets/public/images/favicon/ic_launcher_mdpi.png similarity index 100% rename from gui/assets/public/images/favicon/ic_launcher_mdpi.png rename to internal/gui/assets/public/images/favicon/ic_launcher_mdpi.png diff --git a/gui/assets/public/images/favicon/ic_launcher_xhdpi.png b/internal/gui/assets/public/images/favicon/ic_launcher_xhdpi.png similarity index 100% rename from gui/assets/public/images/favicon/ic_launcher_xhdpi.png rename to internal/gui/assets/public/images/favicon/ic_launcher_xhdpi.png diff --git a/gui/assets/public/images/favicon/ic_launcher_xxhdpi.png b/internal/gui/assets/public/images/favicon/ic_launcher_xxhdpi.png similarity index 100% rename from gui/assets/public/images/favicon/ic_launcher_xxhdpi.png rename to internal/gui/assets/public/images/favicon/ic_launcher_xxhdpi.png diff --git a/gui/assets/public/images/favicon/ic_launcher_xxxhdpi.png b/internal/gui/assets/public/images/favicon/ic_launcher_xxxhdpi.png similarity index 100% rename from gui/assets/public/images/favicon/ic_launcher_xxxhdpi.png rename to internal/gui/assets/public/images/favicon/ic_launcher_xxxhdpi.png diff --git a/gui/assets/public/images/favicon/manifest.json b/internal/gui/assets/public/images/favicon/manifest.json similarity index 100% rename from gui/assets/public/images/favicon/manifest.json rename to internal/gui/assets/public/images/favicon/manifest.json diff --git a/gui/assets/public/images/favicon/mstile-144x144.png b/internal/gui/assets/public/images/favicon/mstile-144x144.png similarity index 100% rename from gui/assets/public/images/favicon/mstile-144x144.png rename to internal/gui/assets/public/images/favicon/mstile-144x144.png diff --git a/gui/assets/public/images/favicon/mstile-150x150.png b/internal/gui/assets/public/images/favicon/mstile-150x150.png similarity index 100% rename from gui/assets/public/images/favicon/mstile-150x150.png rename to internal/gui/assets/public/images/favicon/mstile-150x150.png diff --git a/gui/assets/public/images/favicon/mstile-310x150.png b/internal/gui/assets/public/images/favicon/mstile-310x150.png similarity index 100% rename from gui/assets/public/images/favicon/mstile-310x150.png rename to internal/gui/assets/public/images/favicon/mstile-310x150.png diff --git a/gui/assets/public/images/favicon/mstile-310x310.png b/internal/gui/assets/public/images/favicon/mstile-310x310.png similarity index 100% rename from gui/assets/public/images/favicon/mstile-310x310.png rename to internal/gui/assets/public/images/favicon/mstile-310x310.png diff --git a/gui/assets/public/images/favicon/mstile-70x70.png b/internal/gui/assets/public/images/favicon/mstile-70x70.png similarity index 100% rename from gui/assets/public/images/favicon/mstile-70x70.png rename to internal/gui/assets/public/images/favicon/mstile-70x70.png diff --git a/gui/assets/public/images/favicon/safari-pinned-tab.svg b/internal/gui/assets/public/images/favicon/safari-pinned-tab.svg similarity index 100% rename from gui/assets/public/images/favicon/safari-pinned-tab.svg rename to internal/gui/assets/public/images/favicon/safari-pinned-tab.svg diff --git a/gui/assets/public/images/indicator-failed.svg b/internal/gui/assets/public/images/indicator-failed.svg similarity index 100% rename from gui/assets/public/images/indicator-failed.svg rename to internal/gui/assets/public/images/indicator-failed.svg diff --git a/gui/assets/public/images/indicator-finished.svg b/internal/gui/assets/public/images/indicator-finished.svg similarity index 100% rename from gui/assets/public/images/indicator-finished.svg rename to internal/gui/assets/public/images/indicator-finished.svg diff --git a/gui/assets/public/images/indicator-in-progress.svg b/internal/gui/assets/public/images/indicator-in-progress.svg similarity index 100% rename from gui/assets/public/images/indicator-in-progress.svg rename to internal/gui/assets/public/images/indicator-in-progress.svg diff --git a/gui/assets/public/images/indicator-upcoming.svg b/internal/gui/assets/public/images/indicator-upcoming.svg similarity index 100% rename from gui/assets/public/images/indicator-upcoming.svg rename to internal/gui/assets/public/images/indicator-upcoming.svg diff --git a/gui/assets/public/images/left_arrow.svg b/internal/gui/assets/public/images/left_arrow.svg similarity index 100% rename from gui/assets/public/images/left_arrow.svg rename to internal/gui/assets/public/images/left_arrow.svg diff --git a/gui/assets/public/images/right_arrow.svg b/internal/gui/assets/public/images/right_arrow.svg similarity index 100% rename from gui/assets/public/images/right_arrow.svg rename to internal/gui/assets/public/images/right_arrow.svg diff --git a/gui/assets/public/images/warning-sign.svg b/internal/gui/assets/public/images/warning-sign.svg similarity index 100% rename from gui/assets/public/images/warning-sign.svg rename to internal/gui/assets/public/images/warning-sign.svg diff --git a/gui/assets/public/js/admin-pagination.js b/internal/gui/assets/public/js/admin-pagination.js similarity index 100% rename from gui/assets/public/js/admin-pagination.js rename to internal/gui/assets/public/js/admin-pagination.js diff --git a/gui/assets/public/js/carousel.js b/internal/gui/assets/public/js/carousel.js similarity index 100% rename from gui/assets/public/js/carousel.js rename to internal/gui/assets/public/js/carousel.js diff --git a/gui/assets/public/js/modal.js b/internal/gui/assets/public/js/modal.js similarity index 100% rename from gui/assets/public/js/modal.js rename to internal/gui/assets/public/js/modal.js diff --git a/gui/assets/public/js/pagination.js b/internal/gui/assets/public/js/pagination.js similarity index 100% rename from gui/assets/public/js/pagination.js rename to internal/gui/assets/public/js/pagination.js diff --git a/gui/assets/public/js/socket.js b/internal/gui/assets/public/js/socket.js similarity index 100% rename from gui/assets/public/js/socket.js rename to internal/gui/assets/public/js/socket.js diff --git a/gui/assets/public/js/vendor/bootstrap-4.4.1.min.js b/internal/gui/assets/public/js/vendor/bootstrap-4.4.1.min.js similarity index 100% rename from gui/assets/public/js/vendor/bootstrap-4.4.1.min.js rename to internal/gui/assets/public/js/vendor/bootstrap-4.4.1.min.js diff --git a/gui/assets/public/js/vendor/flickity.pkgd.min.js b/internal/gui/assets/public/js/vendor/flickity.pkgd.min.js similarity index 100% rename from gui/assets/public/js/vendor/flickity.pkgd.min.js rename to internal/gui/assets/public/js/vendor/flickity.pkgd.min.js diff --git a/gui/assets/public/js/vendor/jquery-3.4.1.min.js b/internal/gui/assets/public/js/vendor/jquery-3.4.1.min.js similarity index 100% rename from gui/assets/public/js/vendor/jquery-3.4.1.min.js rename to internal/gui/assets/public/js/vendor/jquery-3.4.1.min.js diff --git a/gui/assets/public/js/vendor/pagination-2.1.5.min.js b/internal/gui/assets/public/js/vendor/pagination-2.1.5.min.js similarity index 100% rename from gui/assets/public/js/vendor/pagination-2.1.5.min.js rename to internal/gui/assets/public/js/vendor/pagination-2.1.5.min.js diff --git a/gui/assets/public/js/vendor/popper-1.16.0.min.js b/internal/gui/assets/public/js/vendor/popper-1.16.0.min.js similarity index 100% rename from gui/assets/public/js/vendor/popper-1.16.0.min.js rename to internal/gui/assets/public/js/vendor/popper-1.16.0.min.js diff --git a/gui/assets/templates/account.html b/internal/gui/assets/templates/account.html similarity index 100% rename from gui/assets/templates/account.html rename to internal/gui/assets/templates/account.html diff --git a/gui/assets/templates/admin.html b/internal/gui/assets/templates/admin.html similarity index 100% rename from gui/assets/templates/admin.html rename to internal/gui/assets/templates/admin.html diff --git a/gui/assets/templates/header.html b/internal/gui/assets/templates/header.html similarity index 100% rename from gui/assets/templates/header.html rename to internal/gui/assets/templates/header.html diff --git a/gui/assets/templates/index.html b/internal/gui/assets/templates/index.html similarity index 100% rename from gui/assets/templates/index.html rename to internal/gui/assets/templates/index.html diff --git a/gui/assets/templates/payments.html b/internal/gui/assets/templates/payments.html similarity index 100% rename from gui/assets/templates/payments.html rename to internal/gui/assets/templates/payments.html diff --git a/gui/assets/templates/pool-stats.html b/internal/gui/assets/templates/pool-stats.html similarity index 100% rename from gui/assets/templates/pool-stats.html rename to internal/gui/assets/templates/pool-stats.html diff --git a/gui/cache.go b/internal/gui/cache.go similarity index 100% rename from gui/cache.go rename to internal/gui/cache.go diff --git a/gui/formatting.go b/internal/gui/formatting.go similarity index 100% rename from gui/formatting.go rename to internal/gui/formatting.go diff --git a/gui/gui.go b/internal/gui/gui.go similarity index 100% rename from gui/gui.go rename to internal/gui/gui.go diff --git a/gui/index.go b/internal/gui/index.go similarity index 100% rename from gui/index.go rename to internal/gui/index.go diff --git a/gui/log.go b/internal/gui/log.go similarity index 100% rename from gui/log.go rename to internal/gui/log.go diff --git a/gui/middleware.go b/internal/gui/middleware.go similarity index 100% rename from gui/middleware.go rename to internal/gui/middleware.go diff --git a/gui/pagination.go b/internal/gui/pagination.go similarity index 100% rename from gui/pagination.go rename to internal/gui/pagination.go diff --git a/gui/websocket.go b/internal/gui/websocket.go similarity index 100% rename from gui/websocket.go rename to internal/gui/websocket.go diff --git a/log.go b/log.go index 11c8fd8c..f1e67f5f 100644 --- a/log.go +++ b/log.go @@ -13,7 +13,7 @@ import ( "github.com/decred/slog" "github.com/jrick/logrotate/rotator" - "github.com/decred/dcrpool/gui" + "github.com/decred/dcrpool/internal/gui" "github.com/decred/dcrpool/pool" )