diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 7802c80..a85c18f 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -11,5 +11,5 @@ jobs: steps: - name: Check out repository code uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 - - run: docker build . -t me-fit-test - - run: docker rmi me-fit-test + - run: docker build . -t web-app-template-test + - run: docker rmi web-app-template-test diff --git a/.gitea/workflows/buildAndPush.yaml b/.gitea/workflows/buildAndPush.yaml index e7bd90d..1c8467a 100644 --- a/.gitea/workflows/buildAndPush.yaml +++ b/.gitea/workflows/buildAndPush.yaml @@ -11,8 +11,8 @@ jobs: - name: Check out repository code uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 - run: docker login git.wundenbergs.de -u tim -p ${{ secrets.DOCKER_GITEA_TOKEN }} - - run: docker build . -t git.wundenbergs.de/x/me-fit:latest -t git.wundenbergs.de/x/me-fit:$GITHUB_SHA - - run: docker push git.wundenbergs.de/x/me-fit:latest - - run: docker push git.wundenbergs.de/x/me-fit:$GITHUB_SHA - - run: docker rmi git.wundenbergs.de/x/me-fit:latest git.wundenbergs.de/x/me-fit:$GITHUB_SHA + - run: docker build . -t git.wundenbergs.de/x/web-app-template:latest -t git.wundenbergs.de/x/web-app-template:$GITHUB_SHA + - run: docker push git.wundenbergs.de/x/web-app-template:latest + - run: docker push git.wundenbergs.de/x/web-app-template:$GITHUB_SHA + - run: docker rmi git.wundenbergs.de/x/web-app-template:latest git.wundenbergs.de/x/web-app-template:$GITHUB_SHA diff --git a/.mockery.yaml b/.mockery.yaml index 21ac98f..3680fca 100644 --- a/.mockery.yaml +++ b/.mockery.yaml @@ -3,11 +3,11 @@ dir: mocks/ outpkg: mocks issue-845-fix: True packages: - me-fit/service: + web-app-template/service: interfaces: Random: Clock: Mail: - me-fit/db: + web-app-template/db: interfaces: Auth: diff --git a/Dockerfile b/Dockerfile index 17fafa7..ec9856e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM golang:1.23.4@sha256:7ea4c9dcb2b97ff8ee80a67db3d44f98c8ffa0d191399197007d8459c1453041 AS builder_go -WORKDIR /me-fit +WORKDIR /web-app-template RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.62.2 RUN go install github.com/a-h/templ/cmd/templ@latest RUN go install github.com/vektra/mockery/v2@latest @@ -10,11 +10,11 @@ RUN templ generate RUN mockery --log-level warn RUN go test ./... RUN golangci-lint run ./... -RUN go build -o /me-fit/me-fit . +RUN go build -o /web-app-template/web-app-template . FROM node:22.12.0@sha256:0e910f435308c36ea60b4cfd7b80208044d77a074d16b768a81901ce938a62dc AS builder_node -WORKDIR /me-fit +WORKDIR /web-app-template COPY package.json package-lock.json ./ RUN npm clean-install COPY . ./ @@ -22,11 +22,11 @@ RUN npm run build FROM debian:12.8@sha256:b877a1a3fdf02469440f1768cf69c9771338a875b7add5e80c45b756c92ac20a -WORKDIR /me-fit +WORKDIR /web-app-template RUN apt-get update && apt-get install -y ca-certificates && echo "" > .env COPY migration ./migration -COPY --from=builder_go /me-fit/me-fit ./me-fit -COPY --from=builder_node /me-fit/static ./static +COPY --from=builder_go /web-app-template/web-app-template ./web-app-template +COPY --from=builder_node /web-app-template/static ./static EXPOSE 8080 -ENTRYPOINT ["/me-fit/me-fit"] +ENTRYPOINT ["/web-app-template/web-app-template"] diff --git a/db/auth.go b/db/auth.go index 0098661..8a2e469 100644 --- a/db/auth.go +++ b/db/auth.go @@ -1,8 +1,8 @@ package db import ( - "me-fit/log" - "me-fit/types" + "web-app-template/log" + "web-app-template/types" "database/sql" "errors" diff --git a/db/auth_test.go b/db/auth_test.go index d243290..f3cbc12 100644 --- a/db/auth_test.go +++ b/db/auth_test.go @@ -2,7 +2,7 @@ package db import ( "database/sql" - "me-fit/types" + "web-app-template/types" "testing" "time" diff --git a/db/default.go b/db/default.go index bfd9b43..355af0c 100644 --- a/db/default.go +++ b/db/default.go @@ -1,8 +1,8 @@ package db import ( - "me-fit/log" - "me-fit/types" + "web-app-template/log" + "web-app-template/types" "database/sql" "errors" diff --git a/db/workout.go b/db/workout.go index f743953..692e1e7 100644 --- a/db/workout.go +++ b/db/workout.go @@ -1,8 +1,8 @@ package db import ( - "me-fit/log" - "me-fit/types" + "web-app-template/log" + "web-app-template/types" "database/sql" "errors" diff --git a/go.mod b/go.mod index d9b2609..5e05e84 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module me-fit +module web-app-template go 1.22.5 diff --git a/handler/auth.go b/handler/auth.go index ccf9e52..6d7d306 100644 --- a/handler/auth.go +++ b/handler/auth.go @@ -1,12 +1,12 @@ package handler import ( - "me-fit/handler/middleware" - "me-fit/log" - "me-fit/service" - "me-fit/template/auth" - "me-fit/types" - "me-fit/utils" + "web-app-template/handler/middleware" + "web-app-template/log" + "web-app-template/service" + "web-app-template/template/auth" + "web-app-template/types" + "web-app-template/utils" "errors" "net/http" diff --git a/handler/index_and_404.go b/handler/index_and_404.go index 8490cf6..2c55bea 100644 --- a/handler/index_and_404.go +++ b/handler/index_and_404.go @@ -1,9 +1,9 @@ package handler import ( - "me-fit/handler/middleware" - "me-fit/service" - "me-fit/template" + "web-app-template/handler/middleware" + "web-app-template/service" + "web-app-template/template" "net/http" diff --git a/handler/middleware/authenticate.go b/handler/middleware/authenticate.go index 83bda5d..113d87d 100644 --- a/handler/middleware/authenticate.go +++ b/handler/middleware/authenticate.go @@ -4,8 +4,8 @@ import ( "context" "net/http" - "me-fit/service" - "me-fit/types" + "web-app-template/service" + "web-app-template/types" ) type ContextKey string diff --git a/handler/middleware/cross_site_request_forgery.go b/handler/middleware/cross_site_request_forgery.go index b80684d..a0dc88b 100644 --- a/handler/middleware/cross_site_request_forgery.go +++ b/handler/middleware/cross_site_request_forgery.go @@ -5,10 +5,10 @@ import ( "net/http" "strings" - "me-fit/log" - "me-fit/service" - "me-fit/types" - "me-fit/utils" + "web-app-template/log" + "web-app-template/service" + "web-app-template/types" + "web-app-template/utils" ) type csrfResponseWriter struct { diff --git a/handler/middleware/logger.go b/handler/middleware/logger.go index 63d6eb4..09dcc8c 100644 --- a/handler/middleware/logger.go +++ b/handler/middleware/logger.go @@ -5,7 +5,7 @@ import ( "strconv" "time" - "me-fit/log" + "web-app-template/log" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" diff --git a/handler/middleware/security_headers.go b/handler/middleware/security_headers.go index 7a5a2a5..c8da51b 100644 --- a/handler/middleware/security_headers.go +++ b/handler/middleware/security_headers.go @@ -3,7 +3,7 @@ package middleware import ( "net/http" - "me-fit/types" + "web-app-template/types" ) func SecurityHeaders(serverSettings *types.Settings) func(http.Handler) http.Handler { diff --git a/handler/render.go b/handler/render.go index 717170c..7a7d672 100644 --- a/handler/render.go +++ b/handler/render.go @@ -1,10 +1,10 @@ package handler import ( - "me-fit/log" - "me-fit/template" - "me-fit/template/auth" - "me-fit/types" + "web-app-template/log" + "web-app-template/template" + "web-app-template/template/auth" + "web-app-template/types" "net/http" diff --git a/handler/workout.go b/handler/workout.go index e0c2ecc..2d99f22 100644 --- a/handler/workout.go +++ b/handler/workout.go @@ -1,10 +1,10 @@ package handler import ( - "me-fit/handler/middleware" - "me-fit/service" - "me-fit/template/workout" - "me-fit/utils" + "web-app-template/handler/middleware" + "web-app-template/service" + "web-app-template/template/workout" + "web-app-template/utils" "net/http" "strconv" diff --git a/main.go b/main.go index 92c4ffe..010f588 100644 --- a/main.go +++ b/main.go @@ -1,12 +1,12 @@ package main import ( - "me-fit/db" - "me-fit/handler" - "me-fit/handler/middleware" - "me-fit/log" - "me-fit/service" - "me-fit/types" + "web-app-template/db" + "web-app-template/handler" + "web-app-template/handler/middleware" + "web-app-template/log" + "web-app-template/service" + "web-app-template/types" "context" "database/sql" diff --git a/main_test.go b/main_test.go index b7f3f19..3e6b509 100644 --- a/main_test.go +++ b/main_test.go @@ -11,8 +11,8 @@ import ( "testing" "time" - "me-fit/service" - "me-fit/types" + "web-app-template/service" + "web-app-template/types" "github.com/google/uuid" "github.com/stretchr/testify/assert" diff --git a/package-lock.json b/package-lock.json index 7620f7b..1b9b175 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { - "name": "me-fit", + "name": "web-app-template", "version": "1.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "me-fit", + "name": "web-app-template", "version": "1.0.0", "license": "ISC", "devDependencies": { diff --git a/package.json b/package.json index 7aabefe..02acfa3 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "me-fit", + "name": "web-app-template", "version": "1.0.0", "description": "Your (almost) independent tech stack to host on a VPC.", "main": "index.js", diff --git a/service/auth.go b/service/auth.go index b5e6b51..f347789 100644 --- a/service/auth.go +++ b/service/auth.go @@ -8,10 +8,10 @@ import ( "strings" "time" - "me-fit/db" - "me-fit/log" - mailTemplate "me-fit/template/mail" - "me-fit/types" + "web-app-template/db" + "web-app-template/log" + mailTemplate "web-app-template/template/mail" + "web-app-template/types" "github.com/google/uuid" "golang.org/x/crypto/argon2" diff --git a/service/auth_test.go b/service/auth_test.go index ab8db76..8b72c2a 100644 --- a/service/auth_test.go +++ b/service/auth_test.go @@ -1,9 +1,9 @@ package service import ( - "me-fit/db" - "me-fit/mocks" - "me-fit/types" + "web-app-template/db" + "web-app-template/mocks" + "web-app-template/types" "strings" "testing" diff --git a/service/mail.go b/service/mail.go index 1b98c83..1b4e071 100644 --- a/service/mail.go +++ b/service/mail.go @@ -1,8 +1,8 @@ package service import ( - "me-fit/log" - "me-fit/types" + "web-app-template/log" + "web-app-template/types" "fmt" "net/smtp" diff --git a/service/random_generator.go b/service/random_generator.go index d004a76..3d5deda 100644 --- a/service/random_generator.go +++ b/service/random_generator.go @@ -1,8 +1,8 @@ package service import ( - "me-fit/log" - "me-fit/types" + "web-app-template/log" + "web-app-template/types" "crypto/rand" "encoding/base64" diff --git a/service/workout.go b/service/workout.go index e5f60aa..9903371 100644 --- a/service/workout.go +++ b/service/workout.go @@ -1,8 +1,8 @@ package service import ( - "me-fit/db" - "me-fit/types" + "web-app-template/db" + "web-app-template/types" "errors" "strconv" diff --git a/types/settings.go b/types/settings.go index b8fead1..94a3b5a 100644 --- a/types/settings.go +++ b/types/settings.go @@ -1,7 +1,7 @@ package types import ( - "me-fit/log" + "web-app-template/log" ) type Settings struct { diff --git a/utils/http.go b/utils/http.go index f2f63fe..accc164 100644 --- a/utils/http.go +++ b/utils/http.go @@ -5,7 +5,7 @@ import ( "net/http" "time" - "me-fit/log" + "web-app-template/log" ) func TriggerToast(w http.ResponseWriter, r *http.Request, class string, message string, statusCode int) {