From fa7119ed33b5231f1318ce3f8c770a2f4bf56304 Mon Sep 17 00:00:00 2001 From: Tim Wundenberg Date: Mon, 31 Mar 2025 21:50:59 +0200 Subject: [PATCH] rename template --- .gitea/workflows/build.yaml | 4 ++-- .gitea/workflows/buildAndPush.yaml | 8 ++++---- .mockery.yaml | 4 ++-- Dockerfile | 14 +++++++------- db/auth.go | 4 ++-- db/auth_test.go | 2 +- db/default.go | 4 ++-- db/workout.go | 4 ++-- go.mod | 2 +- handler/auth.go | 12 ++++++------ handler/index_and_404.go | 6 +++--- handler/middleware/authenticate.go | 4 ++-- handler/middleware/cross_site_request_forgery.go | 8 ++++---- handler/middleware/logger.go | 2 +- handler/middleware/security_headers.go | 2 +- handler/render.go | 8 ++++---- handler/workout.go | 8 ++++---- main.go | 12 ++++++------ main_test.go | 4 ++-- package-lock.json | 4 ++-- package.json | 2 +- service/auth.go | 10 +++++----- service/auth_test.go | 8 ++++---- service/mail.go | 4 ++-- service/random_generator.go | 4 ++-- service/workout.go | 4 ++-- template/index.templ | 2 +- template/layout.templ | 6 +++--- types/settings.go | 2 +- utils/http.go | 2 +- 30 files changed, 80 insertions(+), 80 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index a85c18f..5eabb7d 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 web-app-template-test - - run: docker rmi web-app-template-test + - run: docker build . -t spend-sparrow-test + - run: docker rmi spend-sparrow-test diff --git a/.gitea/workflows/buildAndPush.yaml b/.gitea/workflows/buildAndPush.yaml index 1c8467a..fd136d2 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/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 + - run: docker build . -t git.wundenbergs.de/x/spend-sparrow:latest -t git.wundenbergs.de/x/spend-sparrow:$GITHUB_SHA + - run: docker push git.wundenbergs.de/x/spend-sparrow:latest + - run: docker push git.wundenbergs.de/x/spend-sparrow:$GITHUB_SHA + - run: docker rmi git.wundenbergs.de/x/spend-sparrow:latest git.wundenbergs.de/x/spend-sparrow:$GITHUB_SHA diff --git a/.mockery.yaml b/.mockery.yaml index 3680fca..3b0170e 100644 --- a/.mockery.yaml +++ b/.mockery.yaml @@ -3,11 +3,11 @@ dir: mocks/ outpkg: mocks issue-845-fix: True packages: - web-app-template/service: + spend-sparrow/service: interfaces: Random: Clock: Mail: - web-app-template/db: + spend-sparrow/db: interfaces: Auth: diff --git a/Dockerfile b/Dockerfile index 535b78e..cc31a67 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM golang:1.24.1@sha256:52ff1b35ff8de185bf9fd26c70077190cd0bed1e9f16a2d498ce907e5c421268 AS builder_go -WORKDIR /web-app-template +WORKDIR /spend-sparrow RUN go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest 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 /web-app-template/web-app-template . +RUN go build -o /spend-sparrow/spend-sparrow . FROM node:22.14.0@sha256:c7fd844945a76eeaa83cb372e4d289b4a30b478a1c80e16c685b62c54156285b AS builder_node -WORKDIR /web-app-template +WORKDIR /spend-sparrow COPY package.json package-lock.json ./ RUN npm clean-install COPY . ./ @@ -22,11 +22,11 @@ RUN npm run build FROM debian:12.10@sha256:18023f131f52fc3ea21973cabffe0b216c60b417fd2478e94d9d59981ebba6af -WORKDIR /web-app-template +WORKDIR /spend-sparrow RUN apt-get update && apt-get install -y ca-certificates && echo "" > .env COPY migration ./migration -COPY --from=builder_go /web-app-template/web-app-template ./web-app-template -COPY --from=builder_node /web-app-template/static ./static +COPY --from=builder_go /spend-sparrow/spend-sparrow ./spend-sparrow +COPY --from=builder_node /spend-sparrow/static ./static EXPOSE 8080 -ENTRYPOINT ["/web-app-template/web-app-template"] +ENTRYPOINT ["/spend-sparrow/spend-sparrow"] diff --git a/db/auth.go b/db/auth.go index 8a2e469..2497f9c 100644 --- a/db/auth.go +++ b/db/auth.go @@ -1,8 +1,8 @@ package db import ( - "web-app-template/log" - "web-app-template/types" + "spend-sparrow/log" + "spend-sparrow/types" "database/sql" "errors" diff --git a/db/auth_test.go b/db/auth_test.go index f3cbc12..98c472e 100644 --- a/db/auth_test.go +++ b/db/auth_test.go @@ -2,7 +2,7 @@ package db import ( "database/sql" - "web-app-template/types" + "spend-sparrow/types" "testing" "time" diff --git a/db/default.go b/db/default.go index 355af0c..b8da06c 100644 --- a/db/default.go +++ b/db/default.go @@ -1,8 +1,8 @@ package db import ( - "web-app-template/log" - "web-app-template/types" + "spend-sparrow/log" + "spend-sparrow/types" "database/sql" "errors" diff --git a/db/workout.go b/db/workout.go index 692e1e7..a36e52e 100644 --- a/db/workout.go +++ b/db/workout.go @@ -1,8 +1,8 @@ package db import ( - "web-app-template/log" - "web-app-template/types" + "spend-sparrow/log" + "spend-sparrow/types" "database/sql" "errors" diff --git a/go.mod b/go.mod index 355640a..f58a0b0 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module web-app-template +module spend-sparrow go 1.23.0 diff --git a/handler/auth.go b/handler/auth.go index 6d7d306..962002d 100644 --- a/handler/auth.go +++ b/handler/auth.go @@ -1,12 +1,12 @@ package handler import ( - "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" + "spend-sparrow/handler/middleware" + "spend-sparrow/log" + "spend-sparrow/service" + "spend-sparrow/template/auth" + "spend-sparrow/types" + "spend-sparrow/utils" "errors" "net/http" diff --git a/handler/index_and_404.go b/handler/index_and_404.go index 2c55bea..82245a4 100644 --- a/handler/index_and_404.go +++ b/handler/index_and_404.go @@ -1,9 +1,9 @@ package handler import ( - "web-app-template/handler/middleware" - "web-app-template/service" - "web-app-template/template" + "spend-sparrow/handler/middleware" + "spend-sparrow/service" + "spend-sparrow/template" "net/http" diff --git a/handler/middleware/authenticate.go b/handler/middleware/authenticate.go index 113d87d..48cb934 100644 --- a/handler/middleware/authenticate.go +++ b/handler/middleware/authenticate.go @@ -4,8 +4,8 @@ import ( "context" "net/http" - "web-app-template/service" - "web-app-template/types" + "spend-sparrow/service" + "spend-sparrow/types" ) type ContextKey string diff --git a/handler/middleware/cross_site_request_forgery.go b/handler/middleware/cross_site_request_forgery.go index a0dc88b..1c0da74 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" - "web-app-template/log" - "web-app-template/service" - "web-app-template/types" - "web-app-template/utils" + "spend-sparrow/log" + "spend-sparrow/service" + "spend-sparrow/types" + "spend-sparrow/utils" ) type csrfResponseWriter struct { diff --git a/handler/middleware/logger.go b/handler/middleware/logger.go index 09dcc8c..126d38e 100644 --- a/handler/middleware/logger.go +++ b/handler/middleware/logger.go @@ -5,7 +5,7 @@ import ( "strconv" "time" - "web-app-template/log" + "spend-sparrow/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 c8da51b..5011bfa 100644 --- a/handler/middleware/security_headers.go +++ b/handler/middleware/security_headers.go @@ -3,7 +3,7 @@ package middleware import ( "net/http" - "web-app-template/types" + "spend-sparrow/types" ) func SecurityHeaders(serverSettings *types.Settings) func(http.Handler) http.Handler { diff --git a/handler/render.go b/handler/render.go index 7a7d672..21e062d 100644 --- a/handler/render.go +++ b/handler/render.go @@ -1,10 +1,10 @@ package handler import ( - "web-app-template/log" - "web-app-template/template" - "web-app-template/template/auth" - "web-app-template/types" + "spend-sparrow/log" + "spend-sparrow/template" + "spend-sparrow/template/auth" + "spend-sparrow/types" "net/http" diff --git a/handler/workout.go b/handler/workout.go index 2d99f22..1fb8c2f 100644 --- a/handler/workout.go +++ b/handler/workout.go @@ -1,10 +1,10 @@ package handler import ( - "web-app-template/handler/middleware" - "web-app-template/service" - "web-app-template/template/workout" - "web-app-template/utils" + "spend-sparrow/handler/middleware" + "spend-sparrow/service" + "spend-sparrow/template/workout" + "spend-sparrow/utils" "net/http" "strconv" diff --git a/main.go b/main.go index 010f588..ede9ff5 100644 --- a/main.go +++ b/main.go @@ -1,12 +1,12 @@ package main import ( - "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" + "spend-sparrow/db" + "spend-sparrow/handler" + "spend-sparrow/handler/middleware" + "spend-sparrow/log" + "spend-sparrow/service" + "spend-sparrow/types" "context" "database/sql" diff --git a/main_test.go b/main_test.go index e996fde..dec027b 100644 --- a/main_test.go +++ b/main_test.go @@ -11,8 +11,8 @@ import ( "testing" "time" - "web-app-template/service" - "web-app-template/types" + "spend-sparrow/service" + "spend-sparrow/types" "github.com/google/uuid" "github.com/stretchr/testify/assert" diff --git a/package-lock.json b/package-lock.json index a1fee88..50957dd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { - "name": "web-app-template", + "name": "spend-sparrow", "version": "1.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "web-app-template", + "name": "spend-sparrow", "version": "1.0.0", "license": "ISC", "devDependencies": { diff --git a/package.json b/package.json index 0bd97cd..7f1f964 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "web-app-template", + "name": "spend-sparrow", "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 e616b9e..61afe13 100644 --- a/service/auth.go +++ b/service/auth.go @@ -8,10 +8,10 @@ import ( "strings" "time" - "web-app-template/db" - "web-app-template/log" - mailTemplate "web-app-template/template/mail" - "web-app-template/types" + "spend-sparrow/db" + "spend-sparrow/log" + mailTemplate "spend-sparrow/template/mail" + "spend-sparrow/types" "github.com/google/uuid" "golang.org/x/crypto/argon2" @@ -249,7 +249,7 @@ func (service AuthImpl) SendVerificationMail(userId uuid.UUID, email string) { return } - service.mail.SendMail(email, "Welcome to web-app-template", w.String()) + service.mail.SendMail(email, "Welcome to spend-sparrow", w.String()) } func (service AuthImpl) VerifyUserEmail(tokenStr string) error { diff --git a/service/auth_test.go b/service/auth_test.go index 4dc7ff1..2e0f967 100644 --- a/service/auth_test.go +++ b/service/auth_test.go @@ -1,9 +1,9 @@ package service import ( - "web-app-template/db" - "web-app-template/mocks" - "web-app-template/types" + "spend-sparrow/db" + "spend-sparrow/mocks" + "spend-sparrow/types" "strings" "testing" @@ -127,7 +127,7 @@ func TestSendVerificationMail(t *testing.T) { mockAuthDb.EXPECT().GetTokensByUserIdAndType(userId, types.TokenTypeEmailVerify).Return(tokens, nil) - mockMail.EXPECT().SendMail(email, "Welcome to web-app-template", mock.MatchedBy(func(message string) bool { + mockMail.EXPECT().SendMail(email, "Welcome to spend-sparrow", mock.MatchedBy(func(message string) bool { return strings.Contains(message, token.Token) })).Return() diff --git a/service/mail.go b/service/mail.go index 1b4e071..fb11c79 100644 --- a/service/mail.go +++ b/service/mail.go @@ -1,8 +1,8 @@ package service import ( - "web-app-template/log" - "web-app-template/types" + "spend-sparrow/log" + "spend-sparrow/types" "fmt" "net/smtp" diff --git a/service/random_generator.go b/service/random_generator.go index 3d5deda..e564b60 100644 --- a/service/random_generator.go +++ b/service/random_generator.go @@ -1,8 +1,8 @@ package service import ( - "web-app-template/log" - "web-app-template/types" + "spend-sparrow/log" + "spend-sparrow/types" "crypto/rand" "encoding/base64" diff --git a/service/workout.go b/service/workout.go index 9903371..8f741af 100644 --- a/service/workout.go +++ b/service/workout.go @@ -1,8 +1,8 @@ package service import ( - "web-app-template/db" - "web-app-template/types" + "spend-sparrow/db" + "spend-sparrow/types" "errors" "strconv" diff --git a/template/index.templ b/template/index.templ index 77fb5f9..e737a50 100644 --- a/template/index.templ +++ b/template/index.templ @@ -6,7 +6,7 @@ templ Index() {

Next Level Workout Tracker

- Ever wanted to track your workouts and see your progress over time? web-app-template is the perfect + Ever wanted to track your workouts and see your progress over time? spend-sparrow is the perfect solution for you.

Get Started diff --git a/template/layout.templ b/template/layout.templ index f485160..e43cfa4 100644 --- a/template/layout.templ +++ b/template/layout.templ @@ -5,7 +5,7 @@ templ Layout(slot templ.Component, user templ.Component) { - web-app-template + spend-sparrow @@ -24,8 +24,8 @@ templ Layout(slot templ.Component, user templ.Component) {
- web-app-template logo - web-app-template + spend-sparrow logo + spend-sparrow @user
diff --git a/types/settings.go b/types/settings.go index 94a3b5a..386c66b 100644 --- a/types/settings.go +++ b/types/settings.go @@ -1,7 +1,7 @@ package types import ( - "web-app-template/log" + "spend-sparrow/log" ) type Settings struct { diff --git a/utils/http.go b/utils/http.go index accc164..a9b4090 100644 --- a/utils/http.go +++ b/utils/http.go @@ -5,7 +5,7 @@ import ( "net/http" "time" - "web-app-template/log" + "spend-sparrow/log" ) func TriggerToast(w http.ResponseWriter, r *http.Request, class string, message string, statusCode int) {