From f291aa2f8cb324df6a24368eca8d9547b9f7119f Mon Sep 17 00:00:00 2001 From: Jan Eitzinger Date: Thu, 23 Jun 2022 18:27:42 +0200 Subject: [PATCH] Fix paths. Adapt gitignore --- .gitignore | 5 +++-- cmd/cc-backend/main.go | 2 +- startDemo.sh | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index c98c504..6340afc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ -# executable: -cc-backend +/cc-backend /var/job-archive /var/*.db @@ -8,3 +7,5 @@ cc-backend /.env /config.json +/web/frontend/public/build +/web/frontend/node_modules diff --git a/cmd/cc-backend/main.go b/cmd/cc-backend/main.go index 58e2e59..f635961 100644 --- a/cmd/cc-backend/main.go +++ b/cmd/cc-backend/main.go @@ -100,7 +100,7 @@ type ProgramConfig struct { var programConfig ProgramConfig = ProgramConfig{ Addr: ":8080", DisableAuthentication: false, - StaticFiles: "./frontend/public", + StaticFiles: "./web/frontend/public", DBDriver: "sqlite3", DB: "./var/job.db", JobArchive: "./var/job-archive", diff --git a/startDemo.sh b/startDemo.sh index 5fe3c6e..6e3cf7b 100755 --- a/startDemo.sh +++ b/startDemo.sh @@ -13,8 +13,8 @@ yarn install yarn build cd ../.. +cp ./configs/env-template.txt .env go get -go build cmd/cc-backend +go build ./cmd/cc-backend -./cc-backend --init-db --add-user demo:admin:AdminDev --no-server -./cc-backend +./cc-backend --init-db --add-user demo:admin:AdminDev