rename template
All checks were successful
Build Docker Image / Build-Docker-Image (push) Successful in 7m40s
Build and Push Docker Image / Build-And-Push-Docker-Image (push) Successful in 3m55s

This commit was merged in pull request #1.
This commit is contained in:
2025-03-31 21:50:59 +02:00
parent 1f52a959f2
commit fa7119ed33
30 changed files with 80 additions and 80 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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:

View File

@@ -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"]

View File

@@ -1,8 +1,8 @@
package db
import (
"web-app-template/log"
"web-app-template/types"
"spend-sparrow/log"
"spend-sparrow/types"
"database/sql"
"errors"

View File

@@ -2,7 +2,7 @@ package db
import (
"database/sql"
"web-app-template/types"
"spend-sparrow/types"
"testing"
"time"

View File

@@ -1,8 +1,8 @@
package db
import (
"web-app-template/log"
"web-app-template/types"
"spend-sparrow/log"
"spend-sparrow/types"
"database/sql"
"errors"

View File

@@ -1,8 +1,8 @@
package db
import (
"web-app-template/log"
"web-app-template/types"
"spend-sparrow/log"
"spend-sparrow/types"
"database/sql"
"errors"

2
go.mod
View File

@@ -1,4 +1,4 @@
module web-app-template
module spend-sparrow
go 1.23.0

View File

@@ -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"

View File

@@ -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"

View File

@@ -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

View File

@@ -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 {

View File

@@ -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"

View File

@@ -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 {

View File

@@ -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"

View File

@@ -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"

12
main.go
View File

@@ -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"

View File

@@ -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"

4
package-lock.json generated
View File

@@ -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": {

View File

@@ -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",

View File

@@ -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 {

View File

@@ -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()

View File

@@ -1,8 +1,8 @@
package service
import (
"web-app-template/log"
"web-app-template/types"
"spend-sparrow/log"
"spend-sparrow/types"
"fmt"
"net/smtp"

View File

@@ -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"

View File

@@ -1,8 +1,8 @@
package service
import (
"web-app-template/db"
"web-app-template/types"
"spend-sparrow/db"
"spend-sparrow/types"
"errors"
"strconv"

View File

@@ -6,7 +6,7 @@ templ Index() {
<div class="max-w-md">
<h1 class="text-5xl font-bold">Next Level Workout Tracker</h1>
<p class="py-6">
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.
</p>
<a href="/workout" class="">Get Started</a>

View File

@@ -5,7 +5,7 @@ templ Layout(slot templ.Component, user templ.Component) {
<html lang="en">
<head>
<meta charset="utf-8"/>
<title>web-app-template</title>
<title>spend-sparrow</title>
<link rel="icon" href="/static/favicon.svg"/>
<link rel="stylesheet" href="/static/css/tailwind.css"/>
<meta name="viewport" content="width=device-width, initial-scale=1"/>
@@ -24,8 +24,8 @@ templ Layout(slot templ.Component, user templ.Component) {
<div class="h-screen flex flex-col">
<div class="flex justify-end items-center gap-2 py-1 px-2 h-12 md:gap-10 md:px-10 md:py-2 shadow-sm">
<a href="/" class="flex-1 flex gap-2">
<img src="/static/favicon.svg" alt="web-app-template logo"/>
<span>web-app-template</span>
<img src="/static/favicon.svg" alt="spend-sparrow logo"/>
<span>spend-sparrow</span>
</a>
@user
</div>

View File

@@ -1,7 +1,7 @@
package types
import (
"web-app-template/log"
"spend-sparrow/log"
)
type Settings struct {

View File

@@ -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) {