Compare commits
151 commits
c72257132c
...
dfefe65ec0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
dfefe65ec0 | ||
|
|
04f37f87e2 | ||
|
|
db9fe90163 | ||
|
|
acb12c393a | ||
|
|
9d75c2a665 | ||
|
|
f154d42e67 | ||
|
|
37104788e7 | ||
|
|
75c9c5be34 | ||
|
|
f634285909 | ||
|
|
1641ac51a6 | ||
|
|
2eefb46e08 | ||
|
|
fd6218c0ad | ||
|
|
79a589da65 | ||
|
|
2a546dfe3d | ||
|
|
885a6ad7bf | ||
|
|
4c4a503cdc | ||
|
|
0d6e26ab39 | ||
|
|
e85ca0a93f | ||
|
|
8d6f0b1261 | ||
|
|
7dcf6bc039 | ||
|
|
d91774313d | ||
|
|
efab433d5c | ||
|
|
9441014517 | ||
|
|
fbb3fdc70d | ||
|
|
a7c6994062 | ||
|
|
62d46c475c | ||
|
|
5cad4cbd33 | ||
|
|
633c60cdf5 | ||
|
|
ca1de66033 | ||
|
|
b808500a23 | ||
|
|
b2ad889f56 | ||
|
|
a7006b3997 | ||
|
|
d2d8c02a2f | ||
|
|
02a58946f1 | ||
|
|
d736551869 | ||
|
|
e3217fc852 | ||
|
|
c244389971 | ||
|
|
a9319559e1 | ||
|
|
f54d9f8b37 | ||
|
|
062d1f70be | ||
|
|
73098499dd | ||
|
|
6da0fcb7be | ||
|
|
62c53a6b4d | ||
|
|
11def45666 | ||
|
|
ca22f54c89 | ||
|
|
6730b6a319 | ||
|
|
71f7de8771 | ||
|
|
5531e0bec2 | ||
|
|
6a7070a729 | ||
|
|
9acf73a4d9 | ||
|
|
5ebd42d8f9 | ||
|
|
7d85ff0b08 | ||
|
|
afa8b5d2cc | ||
|
|
28abc92e74 | ||
|
|
400b9b36ba | ||
|
|
2c635b5c75 | ||
|
|
30389de16f | ||
|
|
0e204428b6 | ||
|
|
0783709b3c | ||
|
|
a122851717 | ||
|
|
114ed8444c | ||
|
|
f6a96e2025 | ||
|
|
15739cc82e | ||
|
|
e8952e964c | ||
|
|
b1c47426d9 | ||
|
|
97cd9d0fee | ||
|
|
c2b6928fb4 | ||
|
|
5af18e2473 | ||
|
|
81c65fcc30 | ||
|
|
3df20c01a7 | ||
|
|
0879aaf21d | ||
|
|
ba96445704 | ||
|
|
42c7957bf4 | ||
|
|
44da53d99f | ||
|
|
6a3f4b5ff2 | ||
|
|
68b850c87b | ||
|
|
4867b9bab8 | ||
|
|
7eae6309fd | ||
|
|
3026ec218e | ||
|
|
f688bff1d2 | ||
|
|
575bf805e2 | ||
|
|
1f42ce7db8 | ||
|
|
d875747e31 | ||
|
|
fec8698526 | ||
|
|
6d3dfe2531 | ||
|
|
842ddbdc9d | ||
|
|
4f776b76b3 | ||
|
|
96799be6ec | ||
|
|
859925bc45 | ||
|
|
911793ec61 | ||
|
|
19315b894e | ||
|
|
5b73526436 | ||
|
|
baa65ebbfa | ||
|
|
4527d3d2e5 | ||
|
|
2ac7604b43 | ||
|
|
713d3818bb | ||
|
|
26e4d4d16a | ||
|
|
0f800ec3e1 | ||
|
|
c2f1df1a83 | ||
|
|
8c5582f720 | ||
|
|
72ce41c828 | ||
|
|
1018d82d13 | ||
|
|
434d7b44b0 | ||
|
|
d85159c4f0 | ||
|
|
152e2e1037 | ||
|
|
44ab335cf5 | ||
|
|
936e6c9b18 | ||
|
|
55d51c70b8 | ||
|
|
9f6fe5f0b7 | ||
|
|
7f1e057ea2 | ||
|
|
12a177a215 | ||
|
|
c52544caf0 | ||
|
|
fb55c3453b | ||
|
|
0cc95d4c64 | ||
|
|
9f1ed2e5f5 | ||
|
|
8d2a6d9b7a | ||
|
|
aab3c04473 | ||
|
|
8fa6ebb8cf | ||
|
|
acebcf0ba0 | ||
|
|
cd1887124e | ||
|
|
0ca3c2b701 | ||
|
|
5c51b72757 | ||
|
|
8b1bc9b99e | ||
|
|
089c4d7ee1 | ||
|
|
51e44a57a1 | ||
|
|
944a4d941a | ||
|
|
c6a50b3bbf | ||
|
|
83cdbc4395 | ||
|
|
726556e973 | ||
|
|
156e578dd0 | ||
|
|
c43f62a570 | ||
|
|
a82ed9c6d0 | ||
|
|
6546418052 | ||
|
|
7a1a01d43e | ||
|
|
107f2e3262 | ||
|
|
cd4cc1693c | ||
|
|
cb43e08183 | ||
|
|
b269e7d264 | ||
|
|
e0a65ca007 | ||
|
|
09c6df7f52 | ||
|
|
10c0a23c0a | ||
|
|
a6e99058f4 | ||
|
|
c31f30ba5c | ||
|
|
6ec7118c3d | ||
|
|
eda79b6982 | ||
|
|
c391be9e4d | ||
|
|
2ece37eb9c | ||
|
|
328c1a3367 | ||
|
|
182ddc9f52 | ||
|
|
17185bee70 | ||
|
|
a6e131119a |
112 changed files with 1536 additions and 359 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -3,4 +3,4 @@ dbs
|
|||
uploads
|
||||
tmp
|
||||
tailwindcss
|
||||
daisyui*.env
|
||||
daisyui*
|
||||
19
Dockerfile
19
Dockerfile
|
|
@ -1,19 +0,0 @@
|
|||
# Stage 1: Build the Go binary
|
||||
FROM golang:1.26-alpine AS builder
|
||||
RUN apk add --no-cache gcc musl-dev # for go-sqlite3 (CGO)
|
||||
WORKDIR /build
|
||||
COPY go.mod go.sum ./
|
||||
RUN go mod download
|
||||
COPY . .
|
||||
RUN CGO_ENABLED=1 go build -o /app/server ./cmd/web
|
||||
|
||||
# Stage 2: Minimal runtime image
|
||||
FROM alpine:latest
|
||||
RUN apk --no-cache add ca-certificates tzdata
|
||||
WORKDIR /app
|
||||
COPY --from=builder /app/server /app/server
|
||||
COPY --from=builder /build/config /app/config
|
||||
COPY --from=builder /build/public /app/public
|
||||
RUN mkdir -p /app/dbs /app/uploads
|
||||
EXPOSE 8000
|
||||
CMD ["/app/server"]
|
||||
|
|
@ -6,8 +6,8 @@ import (
|
|||
"fmt"
|
||||
"os"
|
||||
|
||||
"github.com/camzawacki/personal-site/pkg/log"
|
||||
"github.com/camzawacki/personal-site/pkg/services"
|
||||
"github.com/mikestefanello/pagoda/pkg/log"
|
||||
"github.com/mikestefanello/pagoda/pkg/services"
|
||||
)
|
||||
|
||||
// main creates a new admin user with the email passed in via the flag.
|
||||
|
|
|
|||
|
|
@ -9,10 +9,10 @@ import (
|
|||
"os"
|
||||
"os/signal"
|
||||
|
||||
"github.com/camzawacki/personal-site/pkg/handlers"
|
||||
"github.com/camzawacki/personal-site/pkg/log"
|
||||
"github.com/camzawacki/personal-site/pkg/services"
|
||||
"github.com/camzawacki/personal-site/pkg/tasks"
|
||||
"github.com/mikestefanello/pagoda/pkg/handlers"
|
||||
"github.com/mikestefanello/pagoda/pkg/log"
|
||||
"github.com/mikestefanello/pagoda/pkg/services"
|
||||
"github.com/mikestefanello/pagoda/pkg/tasks"
|
||||
)
|
||||
|
||||
func main() {
|
||||
|
|
|
|||
|
|
@ -1,24 +0,0 @@
|
|||
services:
|
||||
app:
|
||||
build: .
|
||||
container_name: personal-site
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
- PAGODA_APP_ENVIRONMENT=production
|
||||
- PAGODA_APP_HOST=camzalewski.com
|
||||
- PAGODA_HTTP_HOSTNAME=0.0.0.0
|
||||
- PAGODA_HTTP_PORT=8000
|
||||
- PAGODA_APP_ENCRYPTIONKEY=${ENCRYPTION_KEY}
|
||||
volumes:
|
||||
- sqlite_data:/app/dbs
|
||||
- uploads:/app/uploads
|
||||
networks:
|
||||
- web
|
||||
|
||||
volumes:
|
||||
sqlite_data:
|
||||
uploads:
|
||||
|
||||
networks:
|
||||
web:
|
||||
external: true
|
||||
|
|
@ -10,9 +10,9 @@ import (
|
|||
"entgo.io/ent/dialect/sql"
|
||||
"github.com/labstack/echo/v4"
|
||||
|
||||
"github.com/camzawacki/personal-site/ent"
|
||||
"github.com/camzawacki/personal-site/ent/passwordtoken"
|
||||
"github.com/camzawacki/personal-site/ent/user"
|
||||
"github.com/mikestefanello/pagoda/ent"
|
||||
"github.com/mikestefanello/pagoda/ent/passwordtoken"
|
||||
"github.com/mikestefanello/pagoda/ent/user"
|
||||
)
|
||||
|
||||
const dateTimeFormat = "2006-01-02T15:04:05"
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@ import (
|
|||
"log"
|
||||
"reflect"
|
||||
|
||||
"github.com/camzawacki/personal-site/ent/migrate"
|
||||
"github.com/mikestefanello/pagoda/ent/migrate"
|
||||
|
||||
"entgo.io/ent"
|
||||
"entgo.io/ent/dialect"
|
||||
"entgo.io/ent/dialect/sql"
|
||||
"entgo.io/ent/dialect/sql/sqlgraph"
|
||||
"github.com/camzawacki/personal-site/ent/passwordtoken"
|
||||
"github.com/camzawacki/personal-site/ent/user"
|
||||
"github.com/mikestefanello/pagoda/ent/passwordtoken"
|
||||
"github.com/mikestefanello/pagoda/ent/user"
|
||||
)
|
||||
|
||||
// Client is the client that holds all ent builders.
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@ import (
|
|||
"entgo.io/ent"
|
||||
"entgo.io/ent/dialect/sql"
|
||||
"entgo.io/ent/dialect/sql/sqlgraph"
|
||||
"github.com/camzawacki/personal-site/ent/passwordtoken"
|
||||
"github.com/camzawacki/personal-site/ent/user"
|
||||
"github.com/mikestefanello/pagoda/ent/passwordtoken"
|
||||
"github.com/mikestefanello/pagoda/ent/user"
|
||||
)
|
||||
|
||||
// ent aliases to avoid import conflicts in user's code.
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ import (
|
|||
|
||||
"entgo.io/ent/entc"
|
||||
"entgo.io/ent/entc/gen"
|
||||
"github.com/camzawacki/personal-site/ent/admin"
|
||||
"github.com/mikestefanello/pagoda/ent/admin"
|
||||
)
|
||||
|
||||
func main() {
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@ package enttest
|
|||
import (
|
||||
"context"
|
||||
|
||||
"github.com/camzawacki/personal-site/ent"
|
||||
"github.com/mikestefanello/pagoda/ent"
|
||||
// required by schema hooks.
|
||||
_ "github.com/camzawacki/personal-site/ent/runtime"
|
||||
_ "github.com/mikestefanello/pagoda/ent/runtime"
|
||||
|
||||
"entgo.io/ent/dialect/sql/schema"
|
||||
"github.com/camzawacki/personal-site/ent/migrate"
|
||||
"github.com/mikestefanello/pagoda/ent/migrate"
|
||||
)
|
||||
|
||||
type (
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ import (
|
|||
"context"
|
||||
"fmt"
|
||||
|
||||
"github.com/camzawacki/personal-site/ent"
|
||||
"github.com/mikestefanello/pagoda/ent"
|
||||
)
|
||||
|
||||
// The PasswordTokenFunc type is an adapter to allow the use of ordinary
|
||||
|
|
|
|||
|
|
@ -11,9 +11,9 @@ import (
|
|||
|
||||
"entgo.io/ent"
|
||||
"entgo.io/ent/dialect/sql"
|
||||
"github.com/camzawacki/personal-site/ent/passwordtoken"
|
||||
"github.com/camzawacki/personal-site/ent/predicate"
|
||||
"github.com/camzawacki/personal-site/ent/user"
|
||||
"github.com/mikestefanello/pagoda/ent/passwordtoken"
|
||||
"github.com/mikestefanello/pagoda/ent/predicate"
|
||||
"github.com/mikestefanello/pagoda/ent/user"
|
||||
)
|
||||
|
||||
const (
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ import (
|
|||
|
||||
"entgo.io/ent"
|
||||
"entgo.io/ent/dialect/sql"
|
||||
"github.com/camzawacki/personal-site/ent/passwordtoken"
|
||||
"github.com/camzawacki/personal-site/ent/user"
|
||||
"github.com/mikestefanello/pagoda/ent/passwordtoken"
|
||||
"github.com/mikestefanello/pagoda/ent/user"
|
||||
)
|
||||
|
||||
// PasswordToken is the model entity for the PasswordToken schema.
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ func ValidColumn(column string) bool {
|
|||
// package on the initialization of the application. Therefore,
|
||||
// it should be imported in the main as follows:
|
||||
//
|
||||
// import _ "github.com/camzawacki/personal-site/ent/runtime"
|
||||
// import _ "github.com/mikestefanello/pagoda/ent/runtime"
|
||||
var (
|
||||
Hooks [1]ent.Hook
|
||||
// TokenValidator is a validator for the "token" field. It is called by the builders before save.
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ import (
|
|||
|
||||
"entgo.io/ent/dialect/sql"
|
||||
"entgo.io/ent/dialect/sql/sqlgraph"
|
||||
"github.com/camzawacki/personal-site/ent/predicate"
|
||||
"github.com/mikestefanello/pagoda/ent/predicate"
|
||||
)
|
||||
|
||||
// ID filters vertices based on their ID field.
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@ import (
|
|||
|
||||
"entgo.io/ent/dialect/sql/sqlgraph"
|
||||
"entgo.io/ent/schema/field"
|
||||
"github.com/camzawacki/personal-site/ent/passwordtoken"
|
||||
"github.com/camzawacki/personal-site/ent/user"
|
||||
"github.com/mikestefanello/pagoda/ent/passwordtoken"
|
||||
"github.com/mikestefanello/pagoda/ent/user"
|
||||
)
|
||||
|
||||
// PasswordTokenCreate is the builder for creating a PasswordToken entity.
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ import (
|
|||
"entgo.io/ent/dialect/sql"
|
||||
"entgo.io/ent/dialect/sql/sqlgraph"
|
||||
"entgo.io/ent/schema/field"
|
||||
"github.com/camzawacki/personal-site/ent/passwordtoken"
|
||||
"github.com/camzawacki/personal-site/ent/predicate"
|
||||
"github.com/mikestefanello/pagoda/ent/passwordtoken"
|
||||
"github.com/mikestefanello/pagoda/ent/predicate"
|
||||
)
|
||||
|
||||
// PasswordTokenDelete is the builder for deleting a PasswordToken entity.
|
||||
|
|
|
|||
|
|
@ -11,9 +11,9 @@ import (
|
|||
"entgo.io/ent/dialect/sql"
|
||||
"entgo.io/ent/dialect/sql/sqlgraph"
|
||||
"entgo.io/ent/schema/field"
|
||||
"github.com/camzawacki/personal-site/ent/passwordtoken"
|
||||
"github.com/camzawacki/personal-site/ent/predicate"
|
||||
"github.com/camzawacki/personal-site/ent/user"
|
||||
"github.com/mikestefanello/pagoda/ent/passwordtoken"
|
||||
"github.com/mikestefanello/pagoda/ent/predicate"
|
||||
"github.com/mikestefanello/pagoda/ent/user"
|
||||
)
|
||||
|
||||
// PasswordTokenQuery is the builder for querying PasswordToken entities.
|
||||
|
|
|
|||
|
|
@ -11,9 +11,9 @@ import (
|
|||
"entgo.io/ent/dialect/sql"
|
||||
"entgo.io/ent/dialect/sql/sqlgraph"
|
||||
"entgo.io/ent/schema/field"
|
||||
"github.com/camzawacki/personal-site/ent/passwordtoken"
|
||||
"github.com/camzawacki/personal-site/ent/predicate"
|
||||
"github.com/camzawacki/personal-site/ent/user"
|
||||
"github.com/mikestefanello/pagoda/ent/passwordtoken"
|
||||
"github.com/mikestefanello/pagoda/ent/predicate"
|
||||
"github.com/mikestefanello/pagoda/ent/user"
|
||||
)
|
||||
|
||||
// PasswordTokenUpdate is the builder for updating PasswordToken entities.
|
||||
|
|
|
|||
|
|
@ -2,4 +2,4 @@
|
|||
|
||||
package ent
|
||||
|
||||
// The schema-stitching logic is generated in github.com/camzawacki/personal-site/ent/runtime/runtime.go
|
||||
// The schema-stitching logic is generated in github.com/mikestefanello/pagoda/ent/runtime/runtime.go
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@ package runtime
|
|||
import (
|
||||
"time"
|
||||
|
||||
"github.com/camzawacki/personal-site/ent/passwordtoken"
|
||||
"github.com/camzawacki/personal-site/ent/schema"
|
||||
"github.com/camzawacki/personal-site/ent/user"
|
||||
"github.com/mikestefanello/pagoda/ent/passwordtoken"
|
||||
"github.com/mikestefanello/pagoda/ent/schema"
|
||||
"github.com/mikestefanello/pagoda/ent/user"
|
||||
)
|
||||
|
||||
// The init function reads all schema descriptors with runtime code
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ import (
|
|||
"entgo.io/ent"
|
||||
"entgo.io/ent/schema/edge"
|
||||
"entgo.io/ent/schema/field"
|
||||
ge "github.com/camzawacki/personal-site/ent"
|
||||
"github.com/camzawacki/personal-site/ent/hook"
|
||||
ge "github.com/mikestefanello/pagoda/ent"
|
||||
"github.com/mikestefanello/pagoda/ent/hook"
|
||||
"golang.org/x/crypto/bcrypt"
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ import (
|
|||
"strings"
|
||||
"time"
|
||||
|
||||
ge "github.com/camzawacki/personal-site/ent"
|
||||
"github.com/camzawacki/personal-site/ent/hook"
|
||||
ge "github.com/mikestefanello/pagoda/ent"
|
||||
"github.com/mikestefanello/pagoda/ent/hook"
|
||||
"golang.org/x/crypto/bcrypt"
|
||||
|
||||
"entgo.io/ent"
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ import (
|
|||
|
||||
"entgo.io/ent"
|
||||
"entgo.io/ent/dialect/sql"
|
||||
"github.com/camzawacki/personal-site/ent/user"
|
||||
"github.com/mikestefanello/pagoda/ent/user"
|
||||
)
|
||||
|
||||
// User is the model entity for the User schema.
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ func ValidColumn(column string) bool {
|
|||
// package on the initialization of the application. Therefore,
|
||||
// it should be imported in the main as follows:
|
||||
//
|
||||
// import _ "github.com/camzawacki/personal-site/ent/runtime"
|
||||
// import _ "github.com/mikestefanello/pagoda/ent/runtime"
|
||||
var (
|
||||
Hooks [1]ent.Hook
|
||||
// NameValidator is a validator for the "name" field. It is called by the builders before save.
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ import (
|
|||
|
||||
"entgo.io/ent/dialect/sql"
|
||||
"entgo.io/ent/dialect/sql/sqlgraph"
|
||||
"github.com/camzawacki/personal-site/ent/predicate"
|
||||
"github.com/mikestefanello/pagoda/ent/predicate"
|
||||
)
|
||||
|
||||
// ID filters vertices based on their ID field.
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@ import (
|
|||
|
||||
"entgo.io/ent/dialect/sql/sqlgraph"
|
||||
"entgo.io/ent/schema/field"
|
||||
"github.com/camzawacki/personal-site/ent/passwordtoken"
|
||||
"github.com/camzawacki/personal-site/ent/user"
|
||||
"github.com/mikestefanello/pagoda/ent/passwordtoken"
|
||||
"github.com/mikestefanello/pagoda/ent/user"
|
||||
)
|
||||
|
||||
// UserCreate is the builder for creating a User entity.
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ import (
|
|||
"entgo.io/ent/dialect/sql"
|
||||
"entgo.io/ent/dialect/sql/sqlgraph"
|
||||
"entgo.io/ent/schema/field"
|
||||
"github.com/camzawacki/personal-site/ent/predicate"
|
||||
"github.com/camzawacki/personal-site/ent/user"
|
||||
"github.com/mikestefanello/pagoda/ent/predicate"
|
||||
"github.com/mikestefanello/pagoda/ent/user"
|
||||
)
|
||||
|
||||
// UserDelete is the builder for deleting a User entity.
|
||||
|
|
|
|||
|
|
@ -12,9 +12,9 @@ import (
|
|||
"entgo.io/ent/dialect/sql"
|
||||
"entgo.io/ent/dialect/sql/sqlgraph"
|
||||
"entgo.io/ent/schema/field"
|
||||
"github.com/camzawacki/personal-site/ent/passwordtoken"
|
||||
"github.com/camzawacki/personal-site/ent/predicate"
|
||||
"github.com/camzawacki/personal-site/ent/user"
|
||||
"github.com/mikestefanello/pagoda/ent/passwordtoken"
|
||||
"github.com/mikestefanello/pagoda/ent/predicate"
|
||||
"github.com/mikestefanello/pagoda/ent/user"
|
||||
)
|
||||
|
||||
// UserQuery is the builder for querying User entities.
|
||||
|
|
|
|||
|
|
@ -10,9 +10,9 @@ import (
|
|||
"entgo.io/ent/dialect/sql"
|
||||
"entgo.io/ent/dialect/sql/sqlgraph"
|
||||
"entgo.io/ent/schema/field"
|
||||
"github.com/camzawacki/personal-site/ent/passwordtoken"
|
||||
"github.com/camzawacki/personal-site/ent/predicate"
|
||||
"github.com/camzawacki/personal-site/ent/user"
|
||||
"github.com/mikestefanello/pagoda/ent/passwordtoken"
|
||||
"github.com/mikestefanello/pagoda/ent/predicate"
|
||||
"github.com/mikestefanello/pagoda/ent/user"
|
||||
)
|
||||
|
||||
// UserUpdate is the builder for updating User entities.
|
||||
|
|
|
|||
2
go.mod
2
go.mod
|
|
@ -1,4 +1,4 @@
|
|||
module github.com/camzawacki/personal-site
|
||||
module github.com/mikestefanello/pagoda
|
||||
|
||||
go 1.24.6
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ package form
|
|||
|
||||
import (
|
||||
"github.com/labstack/echo/v4"
|
||||
"github.com/camzawacki/personal-site/pkg/context"
|
||||
"github.com/mikestefanello/pagoda/pkg/context"
|
||||
)
|
||||
|
||||
// Form represents a form that can be submitted and validated.
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ import (
|
|||
"testing"
|
||||
|
||||
"github.com/labstack/echo/v4"
|
||||
"github.com/camzawacki/personal-site/pkg/context"
|
||||
"github.com/camzawacki/personal-site/pkg/tests"
|
||||
"github.com/mikestefanello/pagoda/pkg/context"
|
||||
"github.com/mikestefanello/pagoda/pkg/tests"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import (
|
|||
"net/http"
|
||||
|
||||
"github.com/go-playground/validator/v10"
|
||||
"github.com/camzawacki/personal-site/pkg/context"
|
||||
"github.com/mikestefanello/pagoda/pkg/context"
|
||||
|
||||
"github.com/labstack/echo/v4"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ import (
|
|||
|
||||
"github.com/go-playground/validator/v10"
|
||||
"github.com/labstack/echo/v4"
|
||||
"github.com/camzawacki/personal-site/pkg/services"
|
||||
"github.com/mikestefanello/pagoda/pkg/services"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@ import (
|
|||
|
||||
"github.com/labstack/echo/v4"
|
||||
"github.com/mikestefanello/backlite/ui"
|
||||
"github.com/camzawacki/personal-site/ent"
|
||||
"github.com/camzawacki/personal-site/ent/admin"
|
||||
"github.com/camzawacki/personal-site/pkg/context"
|
||||
"github.com/camzawacki/personal-site/pkg/middleware"
|
||||
"github.com/camzawacki/personal-site/pkg/msg"
|
||||
"github.com/camzawacki/personal-site/pkg/pager"
|
||||
"github.com/camzawacki/personal-site/pkg/redirect"
|
||||
"github.com/camzawacki/personal-site/pkg/routenames"
|
||||
"github.com/camzawacki/personal-site/pkg/services"
|
||||
"github.com/camzawacki/personal-site/pkg/ui/pages"
|
||||
"github.com/mikestefanello/pagoda/ent"
|
||||
"github.com/mikestefanello/pagoda/ent/admin"
|
||||
"github.com/mikestefanello/pagoda/pkg/context"
|
||||
"github.com/mikestefanello/pagoda/pkg/middleware"
|
||||
"github.com/mikestefanello/pagoda/pkg/msg"
|
||||
"github.com/mikestefanello/pagoda/pkg/pager"
|
||||
"github.com/mikestefanello/pagoda/pkg/redirect"
|
||||
"github.com/mikestefanello/pagoda/pkg/routenames"
|
||||
"github.com/mikestefanello/pagoda/pkg/services"
|
||||
"github.com/mikestefanello/pagoda/pkg/ui/pages"
|
||||
)
|
||||
|
||||
type Admin struct {
|
||||
|
|
|
|||
|
|
@ -6,20 +6,20 @@ import (
|
|||
|
||||
"github.com/go-playground/validator/v10"
|
||||
"github.com/labstack/echo/v4"
|
||||
"github.com/camzawacki/personal-site/config"
|
||||
"github.com/camzawacki/personal-site/ent"
|
||||
"github.com/camzawacki/personal-site/ent/user"
|
||||
"github.com/camzawacki/personal-site/pkg/context"
|
||||
"github.com/camzawacki/personal-site/pkg/form"
|
||||
"github.com/camzawacki/personal-site/pkg/log"
|
||||
"github.com/camzawacki/personal-site/pkg/middleware"
|
||||
"github.com/camzawacki/personal-site/pkg/msg"
|
||||
"github.com/camzawacki/personal-site/pkg/redirect"
|
||||
"github.com/camzawacki/personal-site/pkg/routenames"
|
||||
"github.com/camzawacki/personal-site/pkg/services"
|
||||
"github.com/camzawacki/personal-site/pkg/ui/emails"
|
||||
"github.com/camzawacki/personal-site/pkg/ui/forms"
|
||||
"github.com/camzawacki/personal-site/pkg/ui/pages"
|
||||
"github.com/mikestefanello/pagoda/config"
|
||||
"github.com/mikestefanello/pagoda/ent"
|
||||
"github.com/mikestefanello/pagoda/ent/user"
|
||||
"github.com/mikestefanello/pagoda/pkg/context"
|
||||
"github.com/mikestefanello/pagoda/pkg/form"
|
||||
"github.com/mikestefanello/pagoda/pkg/log"
|
||||
"github.com/mikestefanello/pagoda/pkg/middleware"
|
||||
"github.com/mikestefanello/pagoda/pkg/msg"
|
||||
"github.com/mikestefanello/pagoda/pkg/redirect"
|
||||
"github.com/mikestefanello/pagoda/pkg/routenames"
|
||||
"github.com/mikestefanello/pagoda/pkg/services"
|
||||
"github.com/mikestefanello/pagoda/pkg/ui/emails"
|
||||
"github.com/mikestefanello/pagoda/pkg/ui/forms"
|
||||
"github.com/mikestefanello/pagoda/pkg/ui/pages"
|
||||
)
|
||||
|
||||
type Auth struct {
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@ import (
|
|||
"time"
|
||||
|
||||
"github.com/labstack/echo/v4"
|
||||
"github.com/camzawacki/personal-site/pkg/form"
|
||||
"github.com/camzawacki/personal-site/pkg/routenames"
|
||||
"github.com/camzawacki/personal-site/pkg/services"
|
||||
"github.com/camzawacki/personal-site/pkg/ui/forms"
|
||||
"github.com/camzawacki/personal-site/pkg/ui/pages"
|
||||
"github.com/mikestefanello/pagoda/pkg/form"
|
||||
"github.com/mikestefanello/pagoda/pkg/routenames"
|
||||
"github.com/mikestefanello/pagoda/pkg/services"
|
||||
"github.com/mikestefanello/pagoda/pkg/ui/forms"
|
||||
"github.com/mikestefanello/pagoda/pkg/ui/pages"
|
||||
)
|
||||
|
||||
type Cache struct {
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@ import (
|
|||
|
||||
"github.com/go-playground/validator/v10"
|
||||
"github.com/labstack/echo/v4"
|
||||
"github.com/camzawacki/personal-site/pkg/form"
|
||||
"github.com/camzawacki/personal-site/pkg/routenames"
|
||||
"github.com/camzawacki/personal-site/pkg/services"
|
||||
"github.com/camzawacki/personal-site/pkg/ui/forms"
|
||||
"github.com/camzawacki/personal-site/pkg/ui/pages"
|
||||
"github.com/mikestefanello/pagoda/pkg/form"
|
||||
"github.com/mikestefanello/pagoda/pkg/routenames"
|
||||
"github.com/mikestefanello/pagoda/pkg/services"
|
||||
"github.com/mikestefanello/pagoda/pkg/ui/forms"
|
||||
"github.com/mikestefanello/pagoda/pkg/ui/pages"
|
||||
)
|
||||
|
||||
type Contact struct {
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@ import (
|
|||
"net/http"
|
||||
|
||||
"github.com/labstack/echo/v4"
|
||||
"github.com/camzawacki/personal-site/pkg/context"
|
||||
"github.com/camzawacki/personal-site/pkg/log"
|
||||
"github.com/camzawacki/personal-site/pkg/ui/pages"
|
||||
"github.com/mikestefanello/pagoda/pkg/context"
|
||||
"github.com/mikestefanello/pagoda/pkg/log"
|
||||
"github.com/mikestefanello/pagoda/pkg/ui/pages"
|
||||
)
|
||||
|
||||
type Error struct{}
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@ import (
|
|||
"time"
|
||||
|
||||
"github.com/labstack/echo/v4"
|
||||
"github.com/camzawacki/personal-site/pkg/msg"
|
||||
"github.com/camzawacki/personal-site/pkg/routenames"
|
||||
"github.com/camzawacki/personal-site/pkg/services"
|
||||
"github.com/camzawacki/personal-site/pkg/ui/models"
|
||||
"github.com/camzawacki/personal-site/pkg/ui/pages"
|
||||
"github.com/mikestefanello/pagoda/pkg/msg"
|
||||
"github.com/mikestefanello/pagoda/pkg/routenames"
|
||||
"github.com/mikestefanello/pagoda/pkg/services"
|
||||
"github.com/mikestefanello/pagoda/pkg/ui/models"
|
||||
"github.com/mikestefanello/pagoda/pkg/ui/pages"
|
||||
"github.com/spf13/afero"
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import (
|
|||
"net/http"
|
||||
|
||||
"github.com/labstack/echo/v4"
|
||||
"github.com/camzawacki/personal-site/pkg/services"
|
||||
"github.com/mikestefanello/pagoda/pkg/services"
|
||||
)
|
||||
|
||||
var handlers []Handler
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@ import (
|
|||
"fmt"
|
||||
|
||||
"github.com/labstack/echo/v4"
|
||||
"github.com/camzawacki/personal-site/pkg/pager"
|
||||
"github.com/camzawacki/personal-site/pkg/routenames"
|
||||
"github.com/camzawacki/personal-site/pkg/services"
|
||||
"github.com/camzawacki/personal-site/pkg/ui/models"
|
||||
"github.com/camzawacki/personal-site/pkg/ui/pages"
|
||||
"github.com/mikestefanello/pagoda/pkg/pager"
|
||||
"github.com/mikestefanello/pagoda/pkg/routenames"
|
||||
"github.com/mikestefanello/pagoda/pkg/services"
|
||||
"github.com/mikestefanello/pagoda/pkg/ui/models"
|
||||
"github.com/mikestefanello/pagoda/pkg/ui/pages"
|
||||
)
|
||||
|
||||
type Pages struct{}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import (
|
|||
"net/http"
|
||||
"testing"
|
||||
|
||||
"github.com/camzawacki/personal-site/pkg/routenames"
|
||||
"github.com/mikestefanello/pagoda/pkg/routenames"
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -7,10 +7,10 @@ import (
|
|||
"github.com/gorilla/sessions"
|
||||
"github.com/labstack/echo/v4"
|
||||
echomw "github.com/labstack/echo/v4/middleware"
|
||||
"github.com/camzawacki/personal-site/pkg/context"
|
||||
"github.com/camzawacki/personal-site/pkg/middleware"
|
||||
"github.com/camzawacki/personal-site/pkg/services"
|
||||
files "github.com/camzawacki/personal-site/public"
|
||||
"github.com/mikestefanello/pagoda/pkg/context"
|
||||
"github.com/mikestefanello/pagoda/pkg/middleware"
|
||||
"github.com/mikestefanello/pagoda/pkg/services"
|
||||
files "github.com/mikestefanello/pagoda/public"
|
||||
)
|
||||
|
||||
// BuildRouter builds the router.
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ import (
|
|||
"os"
|
||||
"testing"
|
||||
|
||||
"github.com/camzawacki/personal-site/config"
|
||||
"github.com/camzawacki/personal-site/pkg/services"
|
||||
"github.com/mikestefanello/pagoda/config"
|
||||
"github.com/mikestefanello/pagoda/pkg/services"
|
||||
|
||||
"github.com/PuerkitoBio/goquery"
|
||||
"github.com/stretchr/testify/assert"
|
||||
|
|
|
|||
|
|
@ -5,10 +5,10 @@ import (
|
|||
"math/rand"
|
||||
|
||||
"github.com/labstack/echo/v4"
|
||||
"github.com/camzawacki/personal-site/pkg/routenames"
|
||||
"github.com/camzawacki/personal-site/pkg/services"
|
||||
"github.com/camzawacki/personal-site/pkg/ui/models"
|
||||
"github.com/camzawacki/personal-site/pkg/ui/pages"
|
||||
"github.com/mikestefanello/pagoda/pkg/routenames"
|
||||
"github.com/mikestefanello/pagoda/pkg/services"
|
||||
"github.com/mikestefanello/pagoda/pkg/ui/models"
|
||||
"github.com/mikestefanello/pagoda/pkg/ui/pages"
|
||||
)
|
||||
|
||||
type Search struct{}
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@ import (
|
|||
"time"
|
||||
|
||||
"github.com/mikestefanello/backlite"
|
||||
"github.com/camzawacki/personal-site/pkg/msg"
|
||||
"github.com/camzawacki/personal-site/pkg/routenames"
|
||||
"github.com/camzawacki/personal-site/pkg/ui/forms"
|
||||
"github.com/camzawacki/personal-site/pkg/ui/pages"
|
||||
"github.com/mikestefanello/pagoda/pkg/msg"
|
||||
"github.com/mikestefanello/pagoda/pkg/routenames"
|
||||
"github.com/mikestefanello/pagoda/pkg/ui/forms"
|
||||
"github.com/mikestefanello/pagoda/pkg/ui/pages"
|
||||
|
||||
"github.com/go-playground/validator/v10"
|
||||
"github.com/labstack/echo/v4"
|
||||
"github.com/camzawacki/personal-site/pkg/form"
|
||||
"github.com/camzawacki/personal-site/pkg/services"
|
||||
"github.com/camzawacki/personal-site/pkg/tasks"
|
||||
"github.com/mikestefanello/pagoda/pkg/form"
|
||||
"github.com/mikestefanello/pagoda/pkg/services"
|
||||
"github.com/mikestefanello/pagoda/pkg/tasks"
|
||||
)
|
||||
|
||||
type Task struct {
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import (
|
|||
"net/http"
|
||||
|
||||
"github.com/labstack/echo/v4"
|
||||
"github.com/camzawacki/personal-site/pkg/context"
|
||||
"github.com/mikestefanello/pagoda/pkg/context"
|
||||
)
|
||||
|
||||
// Request headers: https://htmx.org/docs/#request-headers
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ import (
|
|||
"net/http"
|
||||
"testing"
|
||||
|
||||
"github.com/camzawacki/personal-site/pkg/context"
|
||||
"github.com/camzawacki/personal-site/pkg/tests"
|
||||
"github.com/mikestefanello/pagoda/pkg/context"
|
||||
"github.com/mikestefanello/pagoda/pkg/tests"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import (
|
|||
"log/slog"
|
||||
|
||||
"github.com/labstack/echo/v4"
|
||||
"github.com/camzawacki/personal-site/pkg/context"
|
||||
"github.com/mikestefanello/pagoda/pkg/context"
|
||||
)
|
||||
|
||||
// Set sets a logger in the context.
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import (
|
|||
"testing"
|
||||
|
||||
"github.com/labstack/echo/v4"
|
||||
"github.com/camzawacki/personal-site/pkg/tests"
|
||||
"github.com/mikestefanello/pagoda/pkg/tests"
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -5,12 +5,12 @@ import (
|
|||
"net/http"
|
||||
"strconv"
|
||||
|
||||
"github.com/camzawacki/personal-site/ent"
|
||||
"github.com/camzawacki/personal-site/pkg/context"
|
||||
"github.com/camzawacki/personal-site/pkg/log"
|
||||
"github.com/camzawacki/personal-site/pkg/msg"
|
||||
"github.com/camzawacki/personal-site/pkg/routenames"
|
||||
"github.com/camzawacki/personal-site/pkg/services"
|
||||
"github.com/mikestefanello/pagoda/ent"
|
||||
"github.com/mikestefanello/pagoda/pkg/context"
|
||||
"github.com/mikestefanello/pagoda/pkg/log"
|
||||
"github.com/mikestefanello/pagoda/pkg/msg"
|
||||
"github.com/mikestefanello/pagoda/pkg/routenames"
|
||||
"github.com/mikestefanello/pagoda/pkg/services"
|
||||
|
||||
"github.com/labstack/echo/v4"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@ import (
|
|||
"net/http"
|
||||
"testing"
|
||||
|
||||
"github.com/camzawacki/personal-site/ent"
|
||||
"github.com/camzawacki/personal-site/pkg/context"
|
||||
"github.com/camzawacki/personal-site/pkg/tests"
|
||||
"github.com/mikestefanello/pagoda/ent"
|
||||
"github.com/mikestefanello/pagoda/pkg/context"
|
||||
"github.com/mikestefanello/pagoda/pkg/tests"
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import (
|
|||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/camzawacki/personal-site/pkg/tests"
|
||||
"github.com/mikestefanello/pagoda/pkg/tests"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@ package middleware
|
|||
|
||||
import (
|
||||
"github.com/labstack/echo/v4"
|
||||
"github.com/camzawacki/personal-site/config"
|
||||
"github.com/camzawacki/personal-site/pkg/context"
|
||||
"github.com/mikestefanello/pagoda/config"
|
||||
"github.com/mikestefanello/pagoda/pkg/context"
|
||||
)
|
||||
|
||||
// Config stores the configuration in the request so it can be accessed by the ui.
|
||||
|
|
|
|||
|
|
@ -3,9 +3,9 @@ package middleware
|
|||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/camzawacki/personal-site/config"
|
||||
"github.com/camzawacki/personal-site/pkg/context"
|
||||
"github.com/camzawacki/personal-site/pkg/tests"
|
||||
"github.com/mikestefanello/pagoda/config"
|
||||
"github.com/mikestefanello/pagoda/pkg/context"
|
||||
"github.com/mikestefanello/pagoda/pkg/tests"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@ import (
|
|||
"net/http"
|
||||
"strconv"
|
||||
|
||||
"github.com/camzawacki/personal-site/ent"
|
||||
"github.com/camzawacki/personal-site/ent/user"
|
||||
"github.com/camzawacki/personal-site/pkg/context"
|
||||
"github.com/mikestefanello/pagoda/ent"
|
||||
"github.com/mikestefanello/pagoda/ent/user"
|
||||
"github.com/mikestefanello/pagoda/pkg/context"
|
||||
|
||||
"github.com/labstack/echo/v4"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@ import (
|
|||
"fmt"
|
||||
"testing"
|
||||
|
||||
"github.com/camzawacki/personal-site/ent"
|
||||
"github.com/camzawacki/personal-site/pkg/context"
|
||||
"github.com/camzawacki/personal-site/pkg/tests"
|
||||
"github.com/mikestefanello/pagoda/ent"
|
||||
"github.com/mikestefanello/pagoda/pkg/context"
|
||||
"github.com/mikestefanello/pagoda/pkg/tests"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ import (
|
|||
"time"
|
||||
|
||||
"github.com/labstack/echo/v4"
|
||||
"github.com/camzawacki/personal-site/pkg/log"
|
||||
"github.com/mikestefanello/pagoda/pkg/log"
|
||||
)
|
||||
|
||||
// SetLogger initializes a logger for the current request and stores it in the context.
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ import (
|
|||
|
||||
"github.com/labstack/echo/v4"
|
||||
echomw "github.com/labstack/echo/v4/middleware"
|
||||
"github.com/camzawacki/personal-site/pkg/log"
|
||||
"github.com/camzawacki/personal-site/pkg/tests"
|
||||
"github.com/mikestefanello/pagoda/pkg/log"
|
||||
"github.com/mikestefanello/pagoda/pkg/tests"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
|
|
|
|||
|
|
@ -4,10 +4,10 @@ import (
|
|||
"os"
|
||||
"testing"
|
||||
|
||||
"github.com/camzawacki/personal-site/config"
|
||||
"github.com/camzawacki/personal-site/ent"
|
||||
"github.com/camzawacki/personal-site/pkg/services"
|
||||
"github.com/camzawacki/personal-site/pkg/tests"
|
||||
"github.com/mikestefanello/pagoda/config"
|
||||
"github.com/mikestefanello/pagoda/ent"
|
||||
"github.com/mikestefanello/pagoda/pkg/services"
|
||||
"github.com/mikestefanello/pagoda/pkg/tests"
|
||||
)
|
||||
|
||||
var (
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import (
|
|||
"github.com/gorilla/context"
|
||||
"github.com/gorilla/sessions"
|
||||
"github.com/labstack/echo/v4"
|
||||
"github.com/camzawacki/personal-site/pkg/session"
|
||||
"github.com/mikestefanello/pagoda/pkg/session"
|
||||
)
|
||||
|
||||
// Session sets the session storage in the request context
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ import (
|
|||
"testing"
|
||||
|
||||
"github.com/gorilla/sessions"
|
||||
"github.com/camzawacki/personal-site/pkg/session"
|
||||
"github.com/camzawacki/personal-site/pkg/tests"
|
||||
"github.com/mikestefanello/pagoda/pkg/session"
|
||||
"github.com/mikestefanello/pagoda/pkg/tests"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@ package msg
|
|||
import (
|
||||
"github.com/gorilla/sessions"
|
||||
"github.com/labstack/echo/v4"
|
||||
"github.com/camzawacki/personal-site/pkg/log"
|
||||
"github.com/camzawacki/personal-site/pkg/session"
|
||||
"github.com/mikestefanello/pagoda/pkg/log"
|
||||
"github.com/mikestefanello/pagoda/pkg/session"
|
||||
)
|
||||
|
||||
// Type is a message type.
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ package msg
|
|||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/camzawacki/personal-site/pkg/tests"
|
||||
"github.com/mikestefanello/pagoda/pkg/tests"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import (
|
|||
"testing"
|
||||
|
||||
"github.com/labstack/echo/v4"
|
||||
"github.com/camzawacki/personal-site/pkg/tests"
|
||||
"github.com/mikestefanello/pagoda/pkg/tests"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ import (
|
|||
"net/url"
|
||||
|
||||
"github.com/labstack/echo/v4"
|
||||
"github.com/camzawacki/personal-site/pkg/htmx"
|
||||
"github.com/mikestefanello/pagoda/pkg/htmx"
|
||||
)
|
||||
|
||||
// Redirect is a helper to perform HTTP redirects.
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ import (
|
|||
"testing"
|
||||
|
||||
"github.com/labstack/echo/v4"
|
||||
"github.com/camzawacki/personal-site/pkg/htmx"
|
||||
"github.com/camzawacki/personal-site/pkg/tests"
|
||||
"github.com/mikestefanello/pagoda/pkg/htmx"
|
||||
"github.com/mikestefanello/pagoda/pkg/tests"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@ import (
|
|||
"time"
|
||||
|
||||
"github.com/golang-jwt/jwt/v5"
|
||||
"github.com/camzawacki/personal-site/config"
|
||||
"github.com/camzawacki/personal-site/ent"
|
||||
"github.com/camzawacki/personal-site/ent/passwordtoken"
|
||||
"github.com/camzawacki/personal-site/ent/user"
|
||||
"github.com/camzawacki/personal-site/pkg/context"
|
||||
"github.com/camzawacki/personal-site/pkg/session"
|
||||
"github.com/mikestefanello/pagoda/config"
|
||||
"github.com/mikestefanello/pagoda/ent"
|
||||
"github.com/mikestefanello/pagoda/ent/passwordtoken"
|
||||
"github.com/mikestefanello/pagoda/ent/user"
|
||||
"github.com/mikestefanello/pagoda/pkg/context"
|
||||
"github.com/mikestefanello/pagoda/pkg/session"
|
||||
|
||||
"github.com/labstack/echo/v4"
|
||||
"golang.org/x/crypto/bcrypt"
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ import (
|
|||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/camzawacki/personal-site/ent/passwordtoken"
|
||||
"github.com/camzawacki/personal-site/ent/user"
|
||||
"github.com/mikestefanello/pagoda/ent/passwordtoken"
|
||||
"github.com/mikestefanello/pagoda/ent/user"
|
||||
"golang.org/x/crypto/bcrypt"
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@ import (
|
|||
"github.com/labstack/echo/v4"
|
||||
_ "github.com/mattn/go-sqlite3"
|
||||
"github.com/mikestefanello/backlite"
|
||||
"github.com/camzawacki/personal-site/config"
|
||||
"github.com/camzawacki/personal-site/ent"
|
||||
"github.com/camzawacki/personal-site/pkg/log"
|
||||
"github.com/mikestefanello/pagoda/config"
|
||||
"github.com/mikestefanello/pagoda/ent"
|
||||
"github.com/mikestefanello/pagoda/pkg/log"
|
||||
"github.com/spf13/afero"
|
||||
|
||||
// Required by ent.
|
||||
_ "github.com/camzawacki/personal-site/ent/runtime"
|
||||
_ "github.com/mikestefanello/pagoda/ent/runtime"
|
||||
)
|
||||
|
||||
// Container contains all services used by the application and provides an easy way to handle dependency
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ import (
|
|||
"bytes"
|
||||
"errors"
|
||||
|
||||
"github.com/camzawacki/personal-site/config"
|
||||
"github.com/camzawacki/personal-site/pkg/log"
|
||||
"github.com/mikestefanello/pagoda/config"
|
||||
"github.com/mikestefanello/pagoda/pkg/log"
|
||||
"maragu.dev/gomponents"
|
||||
|
||||
"github.com/labstack/echo/v4"
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@ import (
|
|||
"os"
|
||||
"testing"
|
||||
|
||||
"github.com/camzawacki/personal-site/config"
|
||||
"github.com/camzawacki/personal-site/ent"
|
||||
"github.com/camzawacki/personal-site/pkg/tests"
|
||||
"github.com/mikestefanello/pagoda/config"
|
||||
"github.com/mikestefanello/pagoda/ent"
|
||||
"github.com/mikestefanello/pagoda/pkg/tests"
|
||||
|
||||
"github.com/labstack/echo/v4"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import (
|
|||
|
||||
"github.com/gorilla/sessions"
|
||||
"github.com/labstack/echo/v4"
|
||||
"github.com/camzawacki/personal-site/pkg/context"
|
||||
"github.com/mikestefanello/pagoda/pkg/context"
|
||||
)
|
||||
|
||||
// ErrStoreNotFound indicates that the session store was not present in the context
|
||||
|
|
|
|||
|
|
@ -5,10 +5,10 @@ import (
|
|||
"time"
|
||||
|
||||
"github.com/mikestefanello/backlite"
|
||||
"github.com/camzawacki/personal-site/pkg/routenames"
|
||||
"github.com/mikestefanello/pagoda/pkg/routenames"
|
||||
|
||||
"github.com/camzawacki/personal-site/pkg/log"
|
||||
"github.com/camzawacki/personal-site/pkg/services"
|
||||
"github.com/mikestefanello/pagoda/pkg/log"
|
||||
"github.com/mikestefanello/pagoda/pkg/services"
|
||||
)
|
||||
|
||||
// ExampleTask is an example implementation of backlite.Task.
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
package tasks
|
||||
|
||||
import (
|
||||
"github.com/camzawacki/personal-site/pkg/services"
|
||||
"github.com/mikestefanello/pagoda/pkg/services"
|
||||
)
|
||||
|
||||
// Register registers all task queues with the task client.
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@ import (
|
|||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/camzawacki/personal-site/ent"
|
||||
"github.com/camzawacki/personal-site/pkg/session"
|
||||
"github.com/mikestefanello/pagoda/ent"
|
||||
"github.com/mikestefanello/pagoda/pkg/session"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
|
|
|||
2
pkg/ui/cache/cache.go
vendored
2
pkg/ui/cache/cache.go
vendored
|
|
@ -4,7 +4,7 @@ import (
|
|||
"bytes"
|
||||
"sync"
|
||||
|
||||
"github.com/camzawacki/personal-site/pkg/log"
|
||||
"github.com/mikestefanello/pagoda/pkg/log"
|
||||
"maragu.dev/gomponents"
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
package components
|
||||
|
||||
import (
|
||||
"github.com/camzawacki/personal-site/pkg/msg"
|
||||
"github.com/camzawacki/personal-site/pkg/ui"
|
||||
"github.com/camzawacki/personal-site/pkg/ui/icons"
|
||||
"github.com/mikestefanello/pagoda/pkg/msg"
|
||||
"github.com/mikestefanello/pagoda/pkg/ui"
|
||||
"github.com/mikestefanello/pagoda/pkg/ui/icons"
|
||||
. "maragu.dev/gomponents"
|
||||
. "maragu.dev/gomponents/html"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
package components
|
||||
|
||||
import (
|
||||
"github.com/camzawacki/personal-site/pkg/form"
|
||||
"github.com/camzawacki/personal-site/pkg/ui"
|
||||
"github.com/mikestefanello/pagoda/pkg/form"
|
||||
"github.com/mikestefanello/pagoda/pkg/ui"
|
||||
. "maragu.dev/gomponents"
|
||||
. "maragu.dev/gomponents/html"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ package components
|
|||
import (
|
||||
"strings"
|
||||
|
||||
"github.com/camzawacki/personal-site/pkg/ui"
|
||||
"github.com/mikestefanello/pagoda/pkg/ui"
|
||||
. "maragu.dev/gomponents"
|
||||
. "maragu.dev/gomponents/html"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ package components
|
|||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/camzawacki/personal-site/pkg/ui"
|
||||
"github.com/mikestefanello/pagoda/pkg/ui"
|
||||
. "maragu.dev/gomponents"
|
||||
. "maragu.dev/gomponents/html"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@ package components
|
|||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/camzawacki/personal-site/pkg/pager"
|
||||
"github.com/camzawacki/personal-site/pkg/ui"
|
||||
"github.com/mikestefanello/pagoda/pkg/pager"
|
||||
"github.com/mikestefanello/pagoda/pkg/ui"
|
||||
. "maragu.dev/gomponents"
|
||||
. "maragu.dev/gomponents/components"
|
||||
. "maragu.dev/gomponents/html"
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@ package emails
|
|||
|
||||
import (
|
||||
"github.com/labstack/echo/v4"
|
||||
"github.com/camzawacki/personal-site/pkg/routenames"
|
||||
"github.com/camzawacki/personal-site/pkg/ui"
|
||||
"github.com/mikestefanello/pagoda/pkg/routenames"
|
||||
"github.com/mikestefanello/pagoda/pkg/ui"
|
||||
. "maragu.dev/gomponents"
|
||||
. "maragu.dev/gomponents/html"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -5,10 +5,10 @@ import (
|
|||
"net/url"
|
||||
|
||||
"entgo.io/ent/schema/field"
|
||||
"github.com/camzawacki/personal-site/ent/admin"
|
||||
"github.com/camzawacki/personal-site/pkg/routenames"
|
||||
"github.com/camzawacki/personal-site/pkg/ui"
|
||||
. "github.com/camzawacki/personal-site/pkg/ui/components"
|
||||
"github.com/mikestefanello/pagoda/ent/admin"
|
||||
"github.com/mikestefanello/pagoda/pkg/routenames"
|
||||
"github.com/mikestefanello/pagoda/pkg/ui"
|
||||
. "github.com/mikestefanello/pagoda/pkg/ui/components"
|
||||
. "maragu.dev/gomponents"
|
||||
. "maragu.dev/gomponents/html"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -3,10 +3,10 @@ package forms
|
|||
import (
|
||||
"net/http"
|
||||
|
||||
"github.com/camzawacki/personal-site/ent/admin"
|
||||
"github.com/camzawacki/personal-site/pkg/routenames"
|
||||
"github.com/camzawacki/personal-site/pkg/ui"
|
||||
. "github.com/camzawacki/personal-site/pkg/ui/components"
|
||||
"github.com/mikestefanello/pagoda/ent/admin"
|
||||
"github.com/mikestefanello/pagoda/pkg/routenames"
|
||||
"github.com/mikestefanello/pagoda/pkg/ui"
|
||||
. "github.com/mikestefanello/pagoda/pkg/ui/components"
|
||||
. "maragu.dev/gomponents"
|
||||
. "maragu.dev/gomponents/html"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -3,10 +3,10 @@ package forms
|
|||
import (
|
||||
"net/http"
|
||||
|
||||
"github.com/camzawacki/personal-site/pkg/form"
|
||||
"github.com/camzawacki/personal-site/pkg/routenames"
|
||||
"github.com/camzawacki/personal-site/pkg/ui"
|
||||
. "github.com/camzawacki/personal-site/pkg/ui/components"
|
||||
"github.com/mikestefanello/pagoda/pkg/form"
|
||||
"github.com/mikestefanello/pagoda/pkg/routenames"
|
||||
"github.com/mikestefanello/pagoda/pkg/ui"
|
||||
. "github.com/mikestefanello/pagoda/pkg/ui/components"
|
||||
. "maragu.dev/gomponents"
|
||||
. "maragu.dev/gomponents/html"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -3,10 +3,10 @@ package forms
|
|||
import (
|
||||
"net/http"
|
||||
|
||||
"github.com/camzawacki/personal-site/pkg/form"
|
||||
"github.com/camzawacki/personal-site/pkg/routenames"
|
||||
"github.com/camzawacki/personal-site/pkg/ui"
|
||||
. "github.com/camzawacki/personal-site/pkg/ui/components"
|
||||
"github.com/mikestefanello/pagoda/pkg/form"
|
||||
"github.com/mikestefanello/pagoda/pkg/routenames"
|
||||
"github.com/mikestefanello/pagoda/pkg/ui"
|
||||
. "github.com/mikestefanello/pagoda/pkg/ui/components"
|
||||
. "maragu.dev/gomponents"
|
||||
. "maragu.dev/gomponents/html"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -3,9 +3,9 @@ package forms
|
|||
import (
|
||||
"net/http"
|
||||
|
||||
"github.com/camzawacki/personal-site/pkg/routenames"
|
||||
"github.com/camzawacki/personal-site/pkg/ui"
|
||||
. "github.com/camzawacki/personal-site/pkg/ui/components"
|
||||
"github.com/mikestefanello/pagoda/pkg/routenames"
|
||||
"github.com/mikestefanello/pagoda/pkg/ui"
|
||||
. "github.com/mikestefanello/pagoda/pkg/ui/components"
|
||||
. "maragu.dev/gomponents"
|
||||
. "maragu.dev/gomponents/html"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -3,10 +3,10 @@ package forms
|
|||
import (
|
||||
"net/http"
|
||||
|
||||
"github.com/camzawacki/personal-site/pkg/form"
|
||||
"github.com/camzawacki/personal-site/pkg/routenames"
|
||||
"github.com/camzawacki/personal-site/pkg/ui"
|
||||
. "github.com/camzawacki/personal-site/pkg/ui/components"
|
||||
"github.com/mikestefanello/pagoda/pkg/form"
|
||||
"github.com/mikestefanello/pagoda/pkg/routenames"
|
||||
"github.com/mikestefanello/pagoda/pkg/ui"
|
||||
. "github.com/mikestefanello/pagoda/pkg/ui/components"
|
||||
. "maragu.dev/gomponents"
|
||||
. "maragu.dev/gomponents/html"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -3,10 +3,10 @@ package forms
|
|||
import (
|
||||
"net/http"
|
||||
|
||||
"github.com/camzawacki/personal-site/pkg/form"
|
||||
"github.com/camzawacki/personal-site/pkg/routenames"
|
||||
"github.com/camzawacki/personal-site/pkg/ui"
|
||||
. "github.com/camzawacki/personal-site/pkg/ui/components"
|
||||
"github.com/mikestefanello/pagoda/pkg/form"
|
||||
"github.com/mikestefanello/pagoda/pkg/routenames"
|
||||
"github.com/mikestefanello/pagoda/pkg/ui"
|
||||
. "github.com/mikestefanello/pagoda/pkg/ui/components"
|
||||
. "maragu.dev/gomponents"
|
||||
. "maragu.dev/gomponents/html"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -3,10 +3,10 @@ package forms
|
|||
import (
|
||||
"net/http"
|
||||
|
||||
"github.com/camzawacki/personal-site/pkg/form"
|
||||
"github.com/camzawacki/personal-site/pkg/routenames"
|
||||
"github.com/camzawacki/personal-site/pkg/ui"
|
||||
. "github.com/camzawacki/personal-site/pkg/ui/components"
|
||||
"github.com/mikestefanello/pagoda/pkg/form"
|
||||
"github.com/mikestefanello/pagoda/pkg/routenames"
|
||||
"github.com/mikestefanello/pagoda/pkg/ui"
|
||||
. "github.com/mikestefanello/pagoda/pkg/ui/components"
|
||||
. "maragu.dev/gomponents"
|
||||
. "maragu.dev/gomponents/html"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -3,9 +3,9 @@ package forms
|
|||
import (
|
||||
"net/http"
|
||||
|
||||
"github.com/camzawacki/personal-site/pkg/form"
|
||||
"github.com/camzawacki/personal-site/pkg/ui"
|
||||
. "github.com/camzawacki/personal-site/pkg/ui/components"
|
||||
"github.com/mikestefanello/pagoda/pkg/form"
|
||||
"github.com/mikestefanello/pagoda/pkg/ui"
|
||||
. "github.com/mikestefanello/pagoda/pkg/ui/components"
|
||||
. "maragu.dev/gomponents"
|
||||
. "maragu.dev/gomponents/html"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -4,10 +4,10 @@ import (
|
|||
"fmt"
|
||||
"net/http"
|
||||
|
||||
"github.com/camzawacki/personal-site/pkg/form"
|
||||
"github.com/camzawacki/personal-site/pkg/routenames"
|
||||
"github.com/camzawacki/personal-site/pkg/ui"
|
||||
. "github.com/camzawacki/personal-site/pkg/ui/components"
|
||||
"github.com/mikestefanello/pagoda/pkg/form"
|
||||
"github.com/mikestefanello/pagoda/pkg/routenames"
|
||||
"github.com/mikestefanello/pagoda/pkg/ui"
|
||||
. "github.com/mikestefanello/pagoda/pkg/ui/components"
|
||||
. "maragu.dev/gomponents"
|
||||
. "maragu.dev/gomponents/html"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ package icons
|
|||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/camzawacki/personal-site/pkg/ui/cache"
|
||||
"github.com/mikestefanello/pagoda/pkg/ui/cache"
|
||||
. "maragu.dev/gomponents"
|
||||
. "maragu.dev/gomponents/html"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
package layouts
|
||||
|
||||
import (
|
||||
"github.com/camzawacki/personal-site/pkg/ui"
|
||||
. "github.com/camzawacki/personal-site/pkg/ui/components"
|
||||
"github.com/mikestefanello/pagoda/pkg/ui"
|
||||
. "github.com/mikestefanello/pagoda/pkg/ui/components"
|
||||
. "maragu.dev/gomponents"
|
||||
. "maragu.dev/gomponents/html"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
package layouts
|
||||
|
||||
import (
|
||||
"github.com/camzawacki/personal-site/ent/admin"
|
||||
"github.com/camzawacki/personal-site/pkg/routenames"
|
||||
"github.com/camzawacki/personal-site/pkg/ui"
|
||||
"github.com/camzawacki/personal-site/pkg/ui/cache"
|
||||
. "github.com/camzawacki/personal-site/pkg/ui/components"
|
||||
"github.com/camzawacki/personal-site/pkg/ui/icons"
|
||||
"github.com/mikestefanello/pagoda/ent/admin"
|
||||
"github.com/mikestefanello/pagoda/pkg/routenames"
|
||||
"github.com/mikestefanello/pagoda/pkg/ui"
|
||||
"github.com/mikestefanello/pagoda/pkg/ui/cache"
|
||||
. "github.com/mikestefanello/pagoda/pkg/ui/components"
|
||||
"github.com/mikestefanello/pagoda/pkg/ui/icons"
|
||||
. "maragu.dev/gomponents"
|
||||
. "maragu.dev/gomponents/html"
|
||||
)
|
||||
|
|
|
|||
|
|
@ -3,9 +3,9 @@ package models
|
|||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/camzawacki/personal-site/pkg/pager"
|
||||
"github.com/camzawacki/personal-site/pkg/ui"
|
||||
. "github.com/camzawacki/personal-site/pkg/ui/components"
|
||||
"github.com/mikestefanello/pagoda/pkg/pager"
|
||||
"github.com/mikestefanello/pagoda/pkg/ui"
|
||||
. "github.com/mikestefanello/pagoda/pkg/ui/components"
|
||||
. "maragu.dev/gomponents"
|
||||
. "maragu.dev/gomponents/html"
|
||||
)
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue