From 4658b40bd92f210330a980feb5e9418bd9febff3 Mon Sep 17 00:00:00 2001 From: Jan Bader Date: Sun, 7 Nov 2021 22:00:53 +0000 Subject: [PATCH] Move web files to subdir --- Earthfile | 2 +- {templates => web}/budget-new.html | 0 {templates => web}/budget.html | 0 {templates => web}/dashboard.html | 0 {templates => web}/head.html | 0 {templates => web}/index.html | 0 {templates => web}/login.html | 0 {templates => web}/register.html | 0 {static => web/static}/.htaccess | 0 {static => web/static}/404.html | 0 {static => web/static}/apple-touch-icon.png | Bin {static => web/static}/browserconfig.xml | 0 {static => web/static}/crossdomain.xml | 0 {static => web/static}/css/bootstrap-theme.css | 0 {static => web/static}/css/bootstrap-theme.css.map | 0 {static => web/static}/css/bootstrap-theme.min.css | 0 .../static}/css/bootstrap-theme.min.css.map | 0 {static => web/static}/css/bootstrap.css | 0 {static => web/static}/css/bootstrap.css.map | 0 {static => web/static}/css/bootstrap.min.css | 0 {static => web/static}/css/bootstrap.min.css.map | 0 {static => web/static}/css/main.css | 0 {static => web/static}/css/normalize.css | 0 {static => web/static}/css/normalize.min.css | 0 {static => web/static}/favicon.ico | Bin .../static}/fonts/glyphicons-halflings-regular.eot | Bin .../static}/fonts/glyphicons-halflings-regular.svg | 0 .../static}/fonts/glyphicons-halflings-regular.ttf | Bin .../static}/fonts/glyphicons-halflings-regular.woff | Bin .../fonts/glyphicons-halflings-regular.woff2 | Bin {static => web/static}/humans.txt | 0 {static => web/static}/js/bootstrap.js | 0 {static => web/static}/js/bootstrap.min.js | 0 {static => web/static}/js/main.js | 0 {static => web/static}/js/npm.js | 0 {static => web/static}/js/plugins.js | 0 .../js/vendor/html5-3.6-respond-1.4.2.min.js | 0 .../static}/js/vendor/jquery-1.11.2.min.js | 0 {static => web/static}/robots.txt | 0 {static => web/static}/tile-wide.png | Bin {static => web/static}/tile.png | Bin web/templates.go | 9 +++++++++ 42 files changed, 10 insertions(+), 1 deletion(-) rename {templates => web}/budget-new.html (100%) rename {templates => web}/budget.html (100%) rename {templates => web}/dashboard.html (100%) rename {templates => web}/head.html (100%) rename {templates => web}/index.html (100%) rename {templates => web}/login.html (100%) rename {templates => web}/register.html (100%) rename {static => web/static}/.htaccess (100%) rename {static => web/static}/404.html (100%) rename {static => web/static}/apple-touch-icon.png (100%) rename {static => web/static}/browserconfig.xml (100%) rename {static => web/static}/crossdomain.xml (100%) rename {static => web/static}/css/bootstrap-theme.css (100%) rename {static => web/static}/css/bootstrap-theme.css.map (100%) rename {static => web/static}/css/bootstrap-theme.min.css (100%) rename {static => web/static}/css/bootstrap-theme.min.css.map (100%) rename {static => web/static}/css/bootstrap.css (100%) rename {static => web/static}/css/bootstrap.css.map (100%) rename {static => web/static}/css/bootstrap.min.css (100%) rename {static => web/static}/css/bootstrap.min.css.map (100%) rename {static => web/static}/css/main.css (100%) rename {static => web/static}/css/normalize.css (100%) rename {static => web/static}/css/normalize.min.css (100%) rename {static => web/static}/favicon.ico (100%) rename {static => web/static}/fonts/glyphicons-halflings-regular.eot (100%) rename {static => web/static}/fonts/glyphicons-halflings-regular.svg (100%) rename {static => web/static}/fonts/glyphicons-halflings-regular.ttf (100%) rename {static => web/static}/fonts/glyphicons-halflings-regular.woff (100%) rename {static => web/static}/fonts/glyphicons-halflings-regular.woff2 (100%) rename {static => web/static}/humans.txt (100%) rename {static => web/static}/js/bootstrap.js (100%) rename {static => web/static}/js/bootstrap.min.js (100%) rename {static => web/static}/js/main.js (100%) rename {static => web/static}/js/npm.js (100%) rename {static => web/static}/js/plugins.js (100%) rename {static => web/static}/js/vendor/html5-3.6-respond-1.4.2.min.js (100%) rename {static => web/static}/js/vendor/jquery-1.11.2.min.js (100%) rename {static => web/static}/robots.txt (100%) rename {static => web/static}/tile-wide.png (100%) rename {static => web/static}/tile.png (100%) create mode 100644 web/templates.go diff --git a/Earthfile b/Earthfile index 24ac2f1..0048803 100644 --- a/Earthfile +++ b/Earthfile @@ -6,7 +6,7 @@ build: RUN go mod download COPY . . RUN go build -o build/budgeteer ./cmd/budgeteer - SAVE ARTIFACT build/budgeteer /src AS LOCAL build/budgeteer + SAVE ARTIFACT build/budgeteer /budgeteer AS LOCAL build/budgeteer docker: COPY +build/budgeteer . diff --git a/templates/budget-new.html b/web/budget-new.html similarity index 100% rename from templates/budget-new.html rename to web/budget-new.html diff --git a/templates/budget.html b/web/budget.html similarity index 100% rename from templates/budget.html rename to web/budget.html diff --git a/templates/dashboard.html b/web/dashboard.html similarity index 100% rename from templates/dashboard.html rename to web/dashboard.html diff --git a/templates/head.html b/web/head.html similarity index 100% rename from templates/head.html rename to web/head.html diff --git a/templates/index.html b/web/index.html similarity index 100% rename from templates/index.html rename to web/index.html diff --git a/templates/login.html b/web/login.html similarity index 100% rename from templates/login.html rename to web/login.html diff --git a/templates/register.html b/web/register.html similarity index 100% rename from templates/register.html rename to web/register.html diff --git a/static/.htaccess b/web/static/.htaccess similarity index 100% rename from static/.htaccess rename to web/static/.htaccess diff --git a/static/404.html b/web/static/404.html similarity index 100% rename from static/404.html rename to web/static/404.html diff --git a/static/apple-touch-icon.png b/web/static/apple-touch-icon.png similarity index 100% rename from static/apple-touch-icon.png rename to web/static/apple-touch-icon.png diff --git a/static/browserconfig.xml b/web/static/browserconfig.xml similarity index 100% rename from static/browserconfig.xml rename to web/static/browserconfig.xml diff --git a/static/crossdomain.xml b/web/static/crossdomain.xml similarity index 100% rename from static/crossdomain.xml rename to web/static/crossdomain.xml diff --git a/static/css/bootstrap-theme.css b/web/static/css/bootstrap-theme.css similarity index 100% rename from static/css/bootstrap-theme.css rename to web/static/css/bootstrap-theme.css diff --git a/static/css/bootstrap-theme.css.map b/web/static/css/bootstrap-theme.css.map similarity index 100% rename from static/css/bootstrap-theme.css.map rename to web/static/css/bootstrap-theme.css.map diff --git a/static/css/bootstrap-theme.min.css b/web/static/css/bootstrap-theme.min.css similarity index 100% rename from static/css/bootstrap-theme.min.css rename to web/static/css/bootstrap-theme.min.css diff --git a/static/css/bootstrap-theme.min.css.map b/web/static/css/bootstrap-theme.min.css.map similarity index 100% rename from static/css/bootstrap-theme.min.css.map rename to web/static/css/bootstrap-theme.min.css.map diff --git a/static/css/bootstrap.css b/web/static/css/bootstrap.css similarity index 100% rename from static/css/bootstrap.css rename to web/static/css/bootstrap.css diff --git a/static/css/bootstrap.css.map b/web/static/css/bootstrap.css.map similarity index 100% rename from static/css/bootstrap.css.map rename to web/static/css/bootstrap.css.map diff --git a/static/css/bootstrap.min.css b/web/static/css/bootstrap.min.css similarity index 100% rename from static/css/bootstrap.min.css rename to web/static/css/bootstrap.min.css diff --git a/static/css/bootstrap.min.css.map b/web/static/css/bootstrap.min.css.map similarity index 100% rename from static/css/bootstrap.min.css.map rename to web/static/css/bootstrap.min.css.map diff --git a/static/css/main.css b/web/static/css/main.css similarity index 100% rename from static/css/main.css rename to web/static/css/main.css diff --git a/static/css/normalize.css b/web/static/css/normalize.css similarity index 100% rename from static/css/normalize.css rename to web/static/css/normalize.css diff --git a/static/css/normalize.min.css b/web/static/css/normalize.min.css similarity index 100% rename from static/css/normalize.min.css rename to web/static/css/normalize.min.css diff --git a/static/favicon.ico b/web/static/favicon.ico similarity index 100% rename from static/favicon.ico rename to web/static/favicon.ico diff --git a/static/fonts/glyphicons-halflings-regular.eot b/web/static/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from static/fonts/glyphicons-halflings-regular.eot rename to web/static/fonts/glyphicons-halflings-regular.eot diff --git a/static/fonts/glyphicons-halflings-regular.svg b/web/static/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from static/fonts/glyphicons-halflings-regular.svg rename to web/static/fonts/glyphicons-halflings-regular.svg diff --git a/static/fonts/glyphicons-halflings-regular.ttf b/web/static/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from static/fonts/glyphicons-halflings-regular.ttf rename to web/static/fonts/glyphicons-halflings-regular.ttf diff --git a/static/fonts/glyphicons-halflings-regular.woff b/web/static/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from static/fonts/glyphicons-halflings-regular.woff rename to web/static/fonts/glyphicons-halflings-regular.woff diff --git a/static/fonts/glyphicons-halflings-regular.woff2 b/web/static/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from static/fonts/glyphicons-halflings-regular.woff2 rename to web/static/fonts/glyphicons-halflings-regular.woff2 diff --git a/static/humans.txt b/web/static/humans.txt similarity index 100% rename from static/humans.txt rename to web/static/humans.txt diff --git a/static/js/bootstrap.js b/web/static/js/bootstrap.js similarity index 100% rename from static/js/bootstrap.js rename to web/static/js/bootstrap.js diff --git a/static/js/bootstrap.min.js b/web/static/js/bootstrap.min.js similarity index 100% rename from static/js/bootstrap.min.js rename to web/static/js/bootstrap.min.js diff --git a/static/js/main.js b/web/static/js/main.js similarity index 100% rename from static/js/main.js rename to web/static/js/main.js diff --git a/static/js/npm.js b/web/static/js/npm.js similarity index 100% rename from static/js/npm.js rename to web/static/js/npm.js diff --git a/static/js/plugins.js b/web/static/js/plugins.js similarity index 100% rename from static/js/plugins.js rename to web/static/js/plugins.js diff --git a/static/js/vendor/html5-3.6-respond-1.4.2.min.js b/web/static/js/vendor/html5-3.6-respond-1.4.2.min.js similarity index 100% rename from static/js/vendor/html5-3.6-respond-1.4.2.min.js rename to web/static/js/vendor/html5-3.6-respond-1.4.2.min.js diff --git a/static/js/vendor/jquery-1.11.2.min.js b/web/static/js/vendor/jquery-1.11.2.min.js similarity index 100% rename from static/js/vendor/jquery-1.11.2.min.js rename to web/static/js/vendor/jquery-1.11.2.min.js diff --git a/static/robots.txt b/web/static/robots.txt similarity index 100% rename from static/robots.txt rename to web/static/robots.txt diff --git a/static/tile-wide.png b/web/static/tile-wide.png similarity index 100% rename from static/tile-wide.png rename to web/static/tile-wide.png diff --git a/static/tile.png b/web/static/tile.png similarity index 100% rename from static/tile.png rename to web/static/tile.png diff --git a/web/templates.go b/web/templates.go new file mode 100644 index 0000000..c3db7a7 --- /dev/null +++ b/web/templates.go @@ -0,0 +1,9 @@ +package web + +import "embed" + +//go:embed *.html +var Templates embed.FS + +//go:embed static/* +var Static embed.FS