Compare commits
217 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
72c171709e | ||
|
|
5dba9d0167 | ||
|
|
6f29b307ec | ||
|
|
06f01b3d7c | ||
|
|
d555e5337f | ||
|
|
c406b5f068 | ||
|
|
c52f10f92d | ||
|
|
d9c7fb3936 | ||
|
|
66b6dfffd3 | ||
|
|
24b41a7604 | ||
|
|
0c84e42160 | ||
|
|
ca4faf103e | ||
|
|
4f537567ad | ||
|
|
0d61b12561 | ||
|
|
3f719d7011 | ||
|
|
331f4cde82 | ||
|
|
ab50eaecf4 | ||
|
|
baf10419f7 | ||
|
|
c924f63ffb | ||
|
|
ab342535d3 | ||
|
|
15655d5c02 | ||
|
|
14272d6507 | ||
|
|
d325677a1f | ||
|
|
e0bb30b976 | ||
|
|
baf5292212 | ||
|
|
9b69b25d0b | ||
|
|
495e759689 | ||
|
|
ba8c0106d9 | ||
|
|
4c942a0a16 | ||
|
|
407cc12079 | ||
|
|
01e4568c48 | ||
|
|
158a6264a9 | ||
|
|
909d38c7f4 | ||
|
|
825c4dd7ec | ||
|
|
ef83e34b1e | ||
|
|
a1af01a480 | ||
|
|
971f05c005 | ||
|
|
b06d1b14bd | ||
|
|
423fd3f429 | ||
|
|
257def3b53 | ||
|
|
97a5687f2e | ||
|
|
d2d8e449ae | ||
|
|
a2d3a367d1 | ||
|
|
dc8a62313c | ||
|
|
6ec582a834 | ||
|
|
b3834bf559 | ||
|
|
b234ead964 | ||
|
|
a756a0484f | ||
|
|
34e816ff7c | ||
|
|
841262341a | ||
|
|
142411c0e5 | ||
|
|
e424dac826 | ||
|
|
6acfc74a65 | ||
|
|
aeb3a7be64 | ||
|
|
ea997b41de | ||
|
|
7d04d8861f | ||
|
|
bf9cf2bf96 | ||
|
|
2346708ab1 | ||
|
|
25c216e2b6 | ||
|
|
af0091c370 | ||
|
|
2c4ac8b286 | ||
|
|
4c6187e18d | ||
|
|
b75dadf00e | ||
|
|
e067a17f53 | ||
|
|
9643e08232 | ||
|
|
06792019f8 | ||
|
|
f952d6ed3e | ||
|
|
f0b8118e00 | ||
|
|
e27cda5779 | ||
|
|
f25c6bd8f5 | ||
|
|
64f201f4a3 | ||
|
|
032159149c | ||
|
|
2d6ab078be | ||
|
|
479df08d63 | ||
|
|
0a4bcfa7a3 | ||
|
|
248e485ff0 | ||
|
|
51995681e3 | ||
|
|
92f33c8cff | ||
|
|
e268a581ce | ||
|
|
f42351e94f | ||
|
|
9ed353ebe3 | ||
|
|
8a00828232 | ||
|
|
01cde545ce | ||
|
|
6db280907a | ||
|
|
ca946f2cba | ||
|
|
7da172cfad | ||
|
|
de0e06155b | ||
|
|
44461b1ec7 | ||
|
|
833708e38a | ||
|
|
7f5274b34d | ||
|
|
f6556b579f | ||
|
|
3cd7577b06 | ||
|
|
e6223a36b7 | ||
|
|
60a37b65d6 | ||
|
|
5feb271aed | ||
|
|
cb6fcdd676 | ||
|
|
129c230c72 | ||
|
|
965a8487b9 | ||
|
|
1ce5f37fc4 | ||
|
|
2e60b84c83 | ||
|
|
61b215436b | ||
|
|
101bb022c9 | ||
|
|
35877a1b2e | ||
|
|
df9c7f9cf7 | ||
|
|
d85737bfb8 | ||
|
|
10f48af304 | ||
|
|
2ec9fd14c0 | ||
|
|
0c22fc137b | ||
|
|
cb012a4d82 | ||
|
|
d44cd0b2ed | ||
|
|
60e1a161ca | ||
|
|
1fd773f726 | ||
|
|
2e110dcafd | ||
|
|
59a75aac9d | ||
|
|
7666186f83 | ||
|
|
db3322c3d8 | ||
|
|
9dac3ef988 | ||
|
|
044cbbe698 | ||
|
|
62a141ff6c | ||
|
|
930b3dd1d3 | ||
|
|
1ca8bbf6e0 | ||
|
|
f1f173715e | ||
|
|
b65a913d4e | ||
|
|
349d07c691 | ||
|
|
42febeb654 | ||
|
|
864d2ed3ba | ||
|
|
2726c60608 | ||
|
|
b218a75ea8 | ||
|
|
0895f74b13 | ||
|
|
4693820820 | ||
|
|
0c6a8d7d15 | ||
|
|
62599c22ea | ||
|
|
5ee5d956f0 | ||
|
|
8feb717d91 | ||
|
|
db0888453a | ||
|
|
7b10b20b9e | ||
|
|
613685aebb | ||
|
|
3d4f3a9a77 | ||
|
|
816cb679c7 | ||
|
|
8e048cbddc | ||
|
|
2f35c08afd | ||
|
|
64b0435c86 | ||
|
|
3468baaa84 | ||
|
|
cf76ca4f98 | ||
|
|
4398eb1fdb | ||
|
|
48968bac78 | ||
|
|
e3edd49800 | ||
|
|
abad4b4eb7 | ||
|
|
df3edccd7f | ||
|
|
5a69d9ba20 | ||
|
|
a2be0e2fca | ||
|
|
97ad3cbee2 | ||
|
|
2953a487d2 | ||
|
|
e2939cd8ba | ||
|
|
7fae44790c | ||
|
|
504a64aa63 | ||
|
|
f4083b7014 | ||
|
|
8736c00fd5 | ||
|
|
3f8ab7d905 | ||
|
|
caa9d10b1b | ||
|
|
9a87188318 | ||
|
|
1924270e4e | ||
|
|
d538f6f7a8 | ||
|
|
f9e5d0eb2e | ||
|
|
5a2b0f4f4b | ||
|
|
e496a41a39 | ||
|
|
61758622ef | ||
|
|
531ad3342b | ||
|
|
df490ae04b | ||
|
|
7af750b9e7 | ||
|
|
90fc6e8726 | ||
|
|
4dd501a2f8 | ||
|
|
64c61dd178 | ||
|
|
5d4efc76de | ||
|
|
21ac153d5b | ||
|
|
fa8f843154 | ||
|
|
a72de0a62f | ||
|
|
f3db495bd2 | ||
|
|
07b0c2d3c5 | ||
|
|
31cf8772c2 | ||
|
|
bb9fb0b327 | ||
|
|
146034c78b | ||
|
|
30ac29fd6c | ||
|
|
4eabe21d68 | ||
|
|
a0f5b5dfd5 | ||
|
|
70228912be | ||
|
|
b92213b356 | ||
|
|
86e293498f | ||
|
|
2c4762142e | ||
|
|
14911799b7 | ||
|
|
ed2063df17 | ||
|
|
635b17dd7f | ||
|
|
245d63c7b2 | ||
|
|
cea6b1cff2 | ||
|
|
7a038e6af1 | ||
|
|
b6d901fadf | ||
|
|
c32fa1bccd | ||
|
|
b8d23131b7 | ||
|
|
46b21f75b5 | ||
|
|
19b700b676 | ||
|
|
c6c05193c6 | ||
|
|
39744d6248 | ||
|
|
72d1680946 | ||
|
|
abfc3b0205 | ||
|
|
19638326dd | ||
|
|
13f650b28b | ||
|
|
1d7ac301ab | ||
|
|
a7110576d2 | ||
|
|
0ccd236307 | ||
|
|
2f0a526245 | ||
|
|
69698b312d | ||
|
|
907cf86f6a | ||
|
|
a466726b70 | ||
|
|
3621428093 | ||
|
|
55bfb4d997 | ||
|
|
f62d47e2fb | ||
|
|
0ada050eff |
52
.github/workflows/release-auth-example.yml
vendored
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
name: Build and Deploy htmgo auth example
|
||||
|
||||
on:
|
||||
workflow_run:
|
||||
workflows: [ "Update HTMGO Framework Dependency" ] # The name of the first workflow
|
||||
types:
|
||||
- completed
|
||||
workflow_dispatch: # Trigger on manual workflow_dispatch
|
||||
push:
|
||||
branches:
|
||||
- master # Trigger on pushes to master
|
||||
paths:
|
||||
- 'examples/simple-auth/**' # Trigger only if files in this directory change
|
||||
- "framework-ui/**"
|
||||
- "cli/**"
|
||||
|
||||
jobs:
|
||||
build-and-push:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v2
|
||||
|
||||
- name: Log in to GitHub Container Registry
|
||||
uses: docker/login-action@v2
|
||||
with:
|
||||
registry: ghcr.io
|
||||
username: ${{ github.actor }}
|
||||
password: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Get short commit hash
|
||||
id: vars
|
||||
run: echo "::set-output name=short_sha::$(echo $GITHUB_SHA | cut -c1-7)"
|
||||
|
||||
- name: Build Docker image
|
||||
run: |
|
||||
cd ./examples/simple-auth && docker build -t ghcr.io/${{ github.repository_owner }}/simple-auth:${{ steps.vars.outputs.short_sha }} .
|
||||
|
||||
- name: Tag as latest Docker image
|
||||
run: |
|
||||
docker tag ghcr.io/${{ github.repository_owner }}/simple-auth:${{ steps.vars.outputs.short_sha }} ghcr.io/${{ github.repository_owner }}/simple-auth:latest
|
||||
|
||||
- name: Log in to GitHub Container Registry
|
||||
run: echo "${{ secrets.CR_PAT }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
|
||||
|
||||
- name: Push Docker image
|
||||
run: |
|
||||
docker push ghcr.io/${{ github.repository_owner }}/simple-auth:latest
|
||||
3
.github/workflows/release-chat-example.yml
vendored
|
|
@ -5,9 +5,6 @@ on:
|
|||
workflows: [ "Update HTMGO Framework Dependency" ] # The name of the first workflow
|
||||
types:
|
||||
- completed
|
||||
pull_request:
|
||||
branches:
|
||||
- master
|
||||
workflow_dispatch: # Trigger on manual workflow_dispatch
|
||||
push:
|
||||
branches:
|
||||
|
|
|
|||
48
.github/workflows/release-ws-test.yml
vendored
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
name: Build and Deploy ws-test
|
||||
|
||||
on:
|
||||
workflow_run:
|
||||
workflows: [ "Update HTMGO Framework Dependency" ] # The name of the first workflow
|
||||
types:
|
||||
- completed
|
||||
workflow_dispatch:
|
||||
push:
|
||||
branches:
|
||||
- ws-testing
|
||||
|
||||
jobs:
|
||||
build-and-push:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v2
|
||||
|
||||
- name: Log in to GitHub Container Registry
|
||||
uses: docker/login-action@v2
|
||||
with:
|
||||
registry: ghcr.io
|
||||
username: ${{ github.actor }}
|
||||
password: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Get short commit hash
|
||||
id: vars
|
||||
run: echo "::set-output name=short_sha::$(echo $GITHUB_SHA | cut -c1-7)"
|
||||
|
||||
- name: Build Docker image
|
||||
run: |
|
||||
cd ./examples/ws-example && docker build -t ghcr.io/${{ github.repository_owner }}/ws-example:${{ steps.vars.outputs.short_sha }} .
|
||||
|
||||
- name: Tag as latest Docker image
|
||||
run: |
|
||||
docker tag ghcr.io/${{ github.repository_owner }}/ws-example:${{ steps.vars.outputs.short_sha }} ghcr.io/${{ github.repository_owner }}/ws-example:latest
|
||||
|
||||
- name: Log in to GitHub Container Registry
|
||||
run: echo "${{ secrets.CR_PAT }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
|
||||
|
||||
- name: Push Docker image
|
||||
run: |
|
||||
docker push ghcr.io/${{ github.repository_owner }}/ws-example:latest
|
||||
33
.github/workflows/run-cli-tests.yml
vendored
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
name: CLI Tests
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
pull_request:
|
||||
branches:
|
||||
- '**' # Runs on any pull request to any branch
|
||||
|
||||
jobs:
|
||||
test:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Set up Go
|
||||
uses: actions/setup-go@v4
|
||||
with:
|
||||
go-version: '1.23' # Specify the Go version you need
|
||||
|
||||
- name: Install dependencies
|
||||
run: cd ./cli/htmgo && go mod download
|
||||
|
||||
- name: Run Go tests
|
||||
run: cd ./cli/htmgo/tasks/astgen && go test ./... -coverprofile=coverage.txt
|
||||
|
||||
- name: Upload results to Codecov
|
||||
uses: codecov/codecov-action@v4
|
||||
with:
|
||||
token: ${{ secrets.CODECOV_TOKEN }}
|
||||
9
.github/workflows/run-framework-tests.yml
vendored
|
|
@ -3,7 +3,7 @@ name: Framework Tests
|
|||
on:
|
||||
push:
|
||||
branches:
|
||||
- '**' # Runs on any branch push
|
||||
- master
|
||||
pull_request:
|
||||
branches:
|
||||
- '**' # Runs on any pull request to any branch
|
||||
|
|
@ -25,4 +25,9 @@ jobs:
|
|||
run: cd ./framework && go mod download
|
||||
|
||||
- name: Run Go tests
|
||||
run: cd ./framework && go test ./...
|
||||
run: cd ./framework && go test ./... -coverprofile=coverage.txt
|
||||
|
||||
- name: Upload results to Codecov
|
||||
uses: codecov/codecov-action@v4
|
||||
with:
|
||||
token: ${{ secrets.CODECOV_TOKEN }}
|
||||
|
|
|
|||
3
.github/workflows/update-framework-dep.yml
vendored
|
|
@ -6,7 +6,8 @@ on:
|
|||
branches:
|
||||
- master # Trigger on pushes to master
|
||||
paths:
|
||||
- 'framework/**' # Trigger only if files in this directory change
|
||||
- 'framework/**'
|
||||
- 'tools/html-to-htmgo/**'
|
||||
|
||||
jobs:
|
||||
update-htmgo-dep:
|
||||
|
|
|
|||
18
README.md
|
|
@ -1,6 +1,3 @@
|
|||
> [!WARNING]
|
||||
> htmgo is in alpha release and active development. API's may have breaking changes between versions. Please report any issues on GitHub.
|
||||
|
||||
## **htmgo**
|
||||
|
||||
### build simple and scalable systems with go + htmx
|
||||
|
|
@ -8,8 +5,16 @@
|
|||
-------
|
||||
[](https://goreportcard.com/report/github.com/maddalax/htmgo)
|
||||

|
||||
[](https://htmgo.dev/docs)
|
||||
[](https://codecov.io/github/maddalax/htmgo)
|
||||
[](https://htmgo.dev/discord)
|
||||

|
||||
|
||||
|
||||
|
||||
|
||||
<sup>looking for a python version? check out: https://fastht.ml</sup>
|
||||
|
||||
**introduction:**
|
||||
|
||||
htmgo is a lightweight pure go way to build interactive websites / web applications using go & htmx.
|
||||
|
|
@ -34,9 +39,12 @@ func IndexPage(ctx *h.RequestContext) *h.Page {
|
|||
2. live reload (rebuilds css, go, ent schema, and routes upon change)
|
||||
3. automatic page and partial registration based on file path
|
||||
4. built in tailwindcss support, no need to configure anything by default
|
||||
5. plugin architecture to include optional plugins to streamline development, such as http://entgo.io
|
||||
6. custom [htmx extensions](https://github.com/maddalax/htmgo/tree/b610aefa36e648b98a13823a6f8d87566120cfcc/framework/assets/js/htmxextensions) to reduce boilerplate with common tasks
|
||||
5. custom [htmx extensions](https://github.com/maddalax/htmgo/tree/b610aefa36e648b98a13823a6f8d87566120cfcc/framework/assets/js/htmxextensions) to reduce boilerplate with common tasks
|
||||
|
||||
**get started:**
|
||||
|
||||
View documentation on [htmgo.dev](https://htmgo.dev/docs).
|
||||
|
||||
## Star History
|
||||
|
||||
[](https://star-history.com/#maddalax/htmgo&Date)
|
||||
|
|
|
|||
|
|
@ -3,13 +3,25 @@ module github.com/maddalax/htmgo/cli/htmgo
|
|||
go 1.23.0
|
||||
|
||||
require (
|
||||
github.com/dave/jennifer v1.7.1
|
||||
github.com/fsnotify/fsnotify v1.7.0
|
||||
github.com/google/uuid v1.6.0
|
||||
github.com/maddalax/htmgo/framework v1.0.7-0.20250703190716-06f01b3d7c1b
|
||||
github.com/maddalax/htmgo/tools/html-to-htmgo v0.0.0-20250703190716-06f01b3d7c1b
|
||||
github.com/stretchr/testify v1.9.0
|
||||
golang.org/x/mod v0.21.0
|
||||
golang.org/x/net v0.29.0
|
||||
golang.org/x/sys v0.25.0
|
||||
golang.org/x/sys v0.26.0
|
||||
golang.org/x/tools v0.25.0
|
||||
)
|
||||
|
||||
require github.com/bmatcuk/doublestar/v4 v4.7.1 // indirect
|
||||
require (
|
||||
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||
github.com/pmezard/go-difflib v1.0.0 // indirect
|
||||
)
|
||||
|
||||
require (
|
||||
github.com/bmatcuk/doublestar/v4 v4.7.1
|
||||
github.com/go-chi/chi/v5 v5.1.0 // indirect
|
||||
golang.org/x/net v0.30.0 // indirect
|
||||
golang.org/x/text v0.19.0 // indirect
|
||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,16 +1,32 @@
|
|||
github.com/bmatcuk/doublestar/v4 v4.7.1 h1:fdDeAqgT47acgwd9bd9HxJRDmc9UAmPpc+2m0CXv75Q=
|
||||
github.com/bmatcuk/doublestar/v4 v4.7.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
|
||||
github.com/dave/jennifer v1.7.1 h1:B4jJJDHelWcDhlRQxWeo0Npa/pYKBLrirAQoTN45txo=
|
||||
github.com/dave/jennifer v1.7.1/go.mod h1:nXbxhEmQfOZhWml3D1cDK5M1FLnMSozpbFN/m3RmGZc=
|
||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
|
||||
github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
|
||||
github.com/go-chi/chi/v5 v5.1.0 h1:acVI1TYaD+hhedDJ3r54HyA6sExp3HfXq7QWEEY/xMw=
|
||||
github.com/go-chi/chi/v5 v5.1.0/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
|
||||
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
||||
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||
github.com/maddalax/htmgo/framework v1.0.7-0.20250703190716-06f01b3d7c1b h1:m+xI+HBEQdie/Rs+mYI0HTFTMlYQSCv0l/siPDoywA4=
|
||||
github.com/maddalax/htmgo/framework v1.0.7-0.20250703190716-06f01b3d7c1b/go.mod h1:NGGzWVXWksrQJ9kV9SGa/A1F1Bjsgc08cN7ZVb98RqY=
|
||||
github.com/maddalax/htmgo/tools/html-to-htmgo v0.0.0-20250703190716-06f01b3d7c1b h1:jvfp35fig2TzBjAgw82fe8+7cvaLX9EbipZUlj8FDDY=
|
||||
github.com/maddalax/htmgo/tools/html-to-htmgo v0.0.0-20250703190716-06f01b3d7c1b/go.mod h1:FraJsj3NRuLBQDk83ZVa+psbNRNLe+rajVtVhYMEme4=
|
||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
|
||||
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
||||
golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=
|
||||
golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
|
||||
golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
|
||||
golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
|
||||
golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
|
||||
golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
|
||||
golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
|
||||
golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
|
||||
golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
|
||||
golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
|
||||
golang.org/x/tools v0.25.0 h1:oFU9pkj/iJgs+0DT+VMHrx+oBKs/LJMV+Uvg78sl+fE=
|
||||
golang.org/x/tools v0.25.0/go.mod h1:/vtpO8WL1N9cQC3FN5zPqb//fRXskFHbLKk4OW1Q7rg=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
|
|
|
|||
|
|
@ -3,11 +3,13 @@ package dirutil
|
|||
import (
|
||||
"fmt"
|
||||
"github.com/bmatcuk/doublestar/v4"
|
||||
"strings"
|
||||
)
|
||||
|
||||
func matchesAny(patterns []string, path string) bool {
|
||||
for _, pattern := range patterns {
|
||||
matched, err := doublestar.Match(pattern, path)
|
||||
matched, err :=
|
||||
doublestar.Match(strings.ReplaceAll(pattern, `\`, "/"), strings.ReplaceAll(path, `\`, "/"))
|
||||
if err != nil {
|
||||
fmt.Printf("Error matching pattern: %v\n", err)
|
||||
return false
|
||||
|
|
|
|||
|
|
@ -9,20 +9,22 @@ import (
|
|||
"github.com/maddalax/htmgo/cli/htmgo/tasks/copyassets"
|
||||
"github.com/maddalax/htmgo/cli/htmgo/tasks/css"
|
||||
"github.com/maddalax/htmgo/cli/htmgo/tasks/downloadtemplate"
|
||||
"github.com/maddalax/htmgo/cli/htmgo/tasks/formatter"
|
||||
"github.com/maddalax/htmgo/cli/htmgo/tasks/process"
|
||||
"github.com/maddalax/htmgo/cli/htmgo/tasks/reloader"
|
||||
"github.com/maddalax/htmgo/cli/htmgo/tasks/run"
|
||||
"log/slog"
|
||||
"os"
|
||||
"strings"
|
||||
"sync"
|
||||
)
|
||||
|
||||
const version = "1.0.6"
|
||||
|
||||
func main() {
|
||||
done := RegisterSignals()
|
||||
needsSignals := true
|
||||
|
||||
commandMap := make(map[string]*flag.FlagSet)
|
||||
commands := []string{"template", "run", "watch", "build", "setup", "css", "schema", "generate"}
|
||||
commands := []string{"template", "run", "watch", "build", "setup", "css", "schema", "generate", "format", "version"}
|
||||
|
||||
for _, command := range commands {
|
||||
commandMap[command] = flag.NewFlagSet(command, flag.ExitOnError)
|
||||
|
|
@ -56,6 +58,15 @@ func main() {
|
|||
slog.Debug("Running task:", slog.String("task", taskName))
|
||||
slog.Debug("working dir:", slog.String("dir", process.GetWorkingDir()))
|
||||
|
||||
if taskName == "format" {
|
||||
needsSignals = false
|
||||
}
|
||||
|
||||
done := make(chan bool, 1)
|
||||
if needsSignals {
|
||||
done = RegisterSignals()
|
||||
}
|
||||
|
||||
if taskName == "watch" {
|
||||
fmt.Printf("Running in watch mode\n")
|
||||
os.Setenv("ENV", "development")
|
||||
|
|
@ -67,21 +78,9 @@ func main() {
|
|||
fmt.Printf("Generating CSS...\n")
|
||||
css.GenerateCss(process.ExitOnError)
|
||||
|
||||
wg := sync.WaitGroup{}
|
||||
|
||||
wg.Add(1)
|
||||
go func() {
|
||||
defer wg.Done()
|
||||
astgen.GenAst(process.ExitOnError)
|
||||
}()
|
||||
|
||||
wg.Add(1)
|
||||
go func() {
|
||||
defer wg.Done()
|
||||
run.EntGenerate()
|
||||
}()
|
||||
|
||||
wg.Wait()
|
||||
// generate ast needs to be run after css generation
|
||||
astgen.GenAst(process.ExitOnError)
|
||||
run.EntGenerate()
|
||||
|
||||
fmt.Printf("Starting server...\n")
|
||||
process.KillAll()
|
||||
|
|
@ -90,7 +89,22 @@ func main() {
|
|||
}()
|
||||
startWatcher(reloader.OnFileChange)
|
||||
} else {
|
||||
if taskName == "schema" {
|
||||
if taskName == "version" {
|
||||
fmt.Printf("htmgo cli version %s\n", version)
|
||||
os.Exit(0)
|
||||
}
|
||||
if taskName == "format" {
|
||||
if len(os.Args) < 3 {
|
||||
fmt.Println(fmt.Sprintf("Usage: htmgo format <file>"))
|
||||
os.Exit(1)
|
||||
}
|
||||
file := os.Args[2]
|
||||
if file == "." {
|
||||
formatter.FormatDir(process.GetWorkingDir())
|
||||
} else {
|
||||
formatter.FormatFile(os.Args[2])
|
||||
}
|
||||
} else if taskName == "schema" {
|
||||
reader := bufio.NewReader(os.Stdin)
|
||||
fmt.Print("Enter entity name:")
|
||||
text, _ := reader.ReadString('\n')
|
||||
|
|
@ -104,10 +118,10 @@ func main() {
|
|||
} else if taskName == "css" {
|
||||
_ = css.GenerateCss(process.ExitOnError)
|
||||
} else if taskName == "ast" {
|
||||
css.GenerateCss(process.ExitOnError)
|
||||
_ = astgen.GenAst(process.ExitOnError)
|
||||
} else if taskName == "run" {
|
||||
_ = astgen.GenAst(process.ExitOnError)
|
||||
_ = css.GenerateCss(process.ExitOnError)
|
||||
run.MakeBuildable()
|
||||
_ = run.Server(process.ExitOnError)
|
||||
} else if taskName == "template" {
|
||||
name := ""
|
||||
|
|
|
|||
|
|
@ -2,15 +2,21 @@ package astgen
|
|||
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/maddalax/htmgo/cli/htmgo/tasks/process"
|
||||
"go/ast"
|
||||
"go/parser"
|
||||
"go/token"
|
||||
"golang.org/x/mod/modfile"
|
||||
"io/fs"
|
||||
"log/slog"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"slices"
|
||||
"strings"
|
||||
"unicode"
|
||||
|
||||
"github.com/maddalax/htmgo/cli/htmgo/internal/dirutil"
|
||||
"github.com/maddalax/htmgo/cli/htmgo/tasks/process"
|
||||
"github.com/maddalax/htmgo/framework/h"
|
||||
"golang.org/x/mod/modfile"
|
||||
)
|
||||
|
||||
type Page struct {
|
||||
|
|
@ -24,6 +30,7 @@ type Partial struct {
|
|||
FuncName string
|
||||
Package string
|
||||
Import string
|
||||
Path string
|
||||
}
|
||||
|
||||
const GeneratedDirName = "__htmgo"
|
||||
|
|
@ -34,6 +41,36 @@ const ModuleName = "github.com/maddalax/htmgo/framework/h"
|
|||
var PackageName = fmt.Sprintf("package %s", GeneratedDirName)
|
||||
var GeneratedFileLine = fmt.Sprintf("// Package %s THIS FILE IS GENERATED. DO NOT EDIT.", GeneratedDirName)
|
||||
|
||||
func toPascaleCase(input string) string {
|
||||
words := strings.Split(input, "_")
|
||||
for i := range words {
|
||||
words[i] = strings.Title(strings.ToLower(words[i]))
|
||||
}
|
||||
return strings.Join(words, "")
|
||||
}
|
||||
|
||||
func isValidGoVariableName(name string) bool {
|
||||
// Variable name must not be empty
|
||||
if name == "" {
|
||||
return false
|
||||
}
|
||||
// First character must be a letter or underscore
|
||||
if !unicode.IsLetter(rune(name[0])) && name[0] != '_' {
|
||||
return false
|
||||
}
|
||||
// Remaining characters must be letters, digits, or underscores
|
||||
for _, char := range name[1:] {
|
||||
if !unicode.IsLetter(char) && !unicode.IsDigit(char) && char != '_' {
|
||||
return false
|
||||
}
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
func normalizePath(path string) string {
|
||||
return strings.ReplaceAll(path, `\`, "/")
|
||||
}
|
||||
|
||||
func sliceCommonPrefix(dir1, dir2 string) string {
|
||||
// Use filepath.Clean to normalize the paths
|
||||
dir1 = filepath.Clean(dir1)
|
||||
|
|
@ -59,9 +96,35 @@ func sliceCommonPrefix(dir1, dir2 string) string {
|
|||
|
||||
// Return the longer one
|
||||
if len(slicedDir1) > len(slicedDir2) {
|
||||
return slicedDir1
|
||||
return normalizePath(slicedDir1)
|
||||
}
|
||||
return slicedDir2
|
||||
return normalizePath(slicedDir2)
|
||||
}
|
||||
|
||||
func hasOnlyReqContextParam(funcType *ast.FuncType) bool {
|
||||
if len(funcType.Params.List) != 1 {
|
||||
return false
|
||||
}
|
||||
if funcType.Params.List[0].Names == nil {
|
||||
return false
|
||||
}
|
||||
if len(funcType.Params.List[0].Names) != 1 {
|
||||
return false
|
||||
}
|
||||
t := funcType.Params.List[0].Type
|
||||
name, ok := t.(*ast.StarExpr)
|
||||
if !ok {
|
||||
return false
|
||||
}
|
||||
selectorExpr, ok := name.X.(*ast.SelectorExpr)
|
||||
if !ok {
|
||||
return false
|
||||
}
|
||||
ident, ok := selectorExpr.X.(*ast.Ident)
|
||||
if !ok {
|
||||
return false
|
||||
}
|
||||
return ident.Name == "h" && selectorExpr.Sel.Name == "RequestContext"
|
||||
}
|
||||
|
||||
func findPublicFuncsReturningHPartial(dir string, predicate func(partial Partial) bool) ([]Partial, error) {
|
||||
|
|
@ -100,10 +163,11 @@ func findPublicFuncsReturningHPartial(dir string, predicate func(partial Partial
|
|||
if selectorExpr, ok := starExpr.X.(*ast.SelectorExpr); ok {
|
||||
// Check if the package name is 'h' and type is 'Partial'.
|
||||
if ident, ok := selectorExpr.X.(*ast.Ident); ok && ident.Name == "h" {
|
||||
if selectorExpr.Sel.Name == "Partial" {
|
||||
if selectorExpr.Sel.Name == "Partial" && hasOnlyReqContextParam(funcDecl.Type) {
|
||||
p := Partial{
|
||||
Package: node.Name.Name,
|
||||
Import: sliceCommonPrefix(cwd, strings.ReplaceAll(filepath.Dir(path), `\`, `/`)),
|
||||
Path: normalizePath(sliceCommonPrefix(cwd, path)),
|
||||
Import: sliceCommonPrefix(cwd, normalizePath(filepath.Dir(path))),
|
||||
FuncName: funcDecl.Name.Name,
|
||||
}
|
||||
if predicate(p) {
|
||||
|
|
@ -166,11 +230,11 @@ func findPublicFuncsReturningHPage(dir string) ([]Page, error) {
|
|||
if selectorExpr, ok := starExpr.X.(*ast.SelectorExpr); ok {
|
||||
// Check if the package name is 'h' and type is 'Partial'.
|
||||
if ident, ok := selectorExpr.X.(*ast.Ident); ok && ident.Name == "h" {
|
||||
if selectorExpr.Sel.Name == "Page" {
|
||||
if selectorExpr.Sel.Name == "Page" && hasOnlyReqContextParam(funcDecl.Type) {
|
||||
pages = append(pages, Page{
|
||||
Package: node.Name.Name,
|
||||
Import: strings.ReplaceAll(filepath.Dir(path), `\`, `/`),
|
||||
Path: path,
|
||||
Import: normalizePath(filepath.Dir(path)),
|
||||
Path: normalizePath(path),
|
||||
FuncName: funcDecl.Name.Name,
|
||||
})
|
||||
break
|
||||
|
|
@ -196,70 +260,51 @@ func findPublicFuncsReturningHPage(dir string) ([]Page, error) {
|
|||
}
|
||||
|
||||
func buildGetPartialFromContext(builder *CodeBuilder, partials []Partial) {
|
||||
fName := "GetPartialFromContext"
|
||||
|
||||
body := `
|
||||
path := r.URL.Path
|
||||
`
|
||||
|
||||
if len(partials) == 0 {
|
||||
body = ""
|
||||
}
|
||||
|
||||
moduleName := GetModuleName()
|
||||
for _, f := range partials {
|
||||
if f.FuncName == fName {
|
||||
continue
|
||||
}
|
||||
caller := fmt.Sprintf("%s.%s", f.Package, f.FuncName)
|
||||
path := fmt.Sprintf("/%s/%s.%s", moduleName, f.Import, f.FuncName)
|
||||
|
||||
body += fmt.Sprintf(`
|
||||
if path == "%s" || path == "%s" {
|
||||
cc := r.Context().Value(h.RequestContextKey).(*h.RequestContext)
|
||||
return %s(cc)
|
||||
}
|
||||
`, f.FuncName, path, caller)
|
||||
}
|
||||
|
||||
body += "return nil"
|
||||
|
||||
f := Function{
|
||||
Name: fName,
|
||||
Parameters: []NameType{
|
||||
{Name: "r", Type: "*http.Request"},
|
||||
},
|
||||
Return: []ReturnType{
|
||||
{Type: "*h.Partial"},
|
||||
},
|
||||
Body: body,
|
||||
}
|
||||
|
||||
builder.Append(builder.BuildFunction(f))
|
||||
|
||||
registerFunction := fmt.Sprintf(`
|
||||
func RegisterPartials(router *chi.Mux) {
|
||||
router.Handle("/%s/partials*", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
partial := GetPartialFromContext(r)
|
||||
var routerHandlerMethod = func(path string, caller string) string {
|
||||
return fmt.Sprintf(`
|
||||
router.Handle("%s", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
cc := r.Context().Value(h.RequestContextKey).(*h.RequestContext)
|
||||
partial := %s(cc)
|
||||
if partial == nil {
|
||||
w.WriteHeader(404)
|
||||
return
|
||||
}
|
||||
h.PartialView(w, partial)
|
||||
}))
|
||||
}))`, path, caller)
|
||||
}
|
||||
|
||||
handlerMethods := make([]string, 0)
|
||||
|
||||
for _, f := range partials {
|
||||
caller := fmt.Sprintf("%s.%s", f.Package, f.FuncName)
|
||||
path := fmt.Sprintf("/%s/%s.%s", moduleName, f.Import, f.FuncName)
|
||||
handlerMethods = append(handlerMethods, routerHandlerMethod(path, caller))
|
||||
}
|
||||
|
||||
registerFunction := fmt.Sprintf(`
|
||||
func RegisterPartials(router *chi.Mux) {
|
||||
%s
|
||||
}
|
||||
`, moduleName)
|
||||
`, strings.Join(handlerMethods, "\n"))
|
||||
|
||||
builder.AppendLine(registerFunction)
|
||||
}
|
||||
|
||||
func writePartialsFile() {
|
||||
config := dirutil.GetConfig()
|
||||
|
||||
cwd := process.GetWorkingDir()
|
||||
partialPath := filepath.Join(cwd, "partials")
|
||||
partialPath := filepath.Join(cwd)
|
||||
partials, err := findPublicFuncsReturningHPartial(partialPath, func(partial Partial) bool {
|
||||
return partial.FuncName != "GetPartialFromContext"
|
||||
})
|
||||
|
||||
partials = h.Filter(partials, func(partial Partial) bool {
|
||||
return !dirutil.IsGlobExclude(partial.Path, config.AutomaticPartialRoutingIgnore)
|
||||
})
|
||||
|
||||
if err != nil {
|
||||
fmt.Println(err)
|
||||
return
|
||||
|
|
@ -268,10 +313,13 @@ func writePartialsFile() {
|
|||
builder := NewCodeBuilder(nil)
|
||||
builder.AppendLine(GeneratedFileLine)
|
||||
builder.AppendLine(PackageName)
|
||||
builder.AddImport(ModuleName)
|
||||
builder.AddImport(HttpModuleName)
|
||||
builder.AddImport(ChiModuleName)
|
||||
|
||||
if len(partials) > 0 {
|
||||
builder.AddImport(ModuleName)
|
||||
builder.AddImport(HttpModuleName)
|
||||
}
|
||||
|
||||
moduleName := GetModuleName()
|
||||
for _, partial := range partials {
|
||||
builder.AddImport(fmt.Sprintf(`%s/%s`, moduleName, partial.Import))
|
||||
|
|
@ -317,6 +365,7 @@ func formatRoute(path string) string {
|
|||
}
|
||||
|
||||
func writePagesFile() {
|
||||
config := dirutil.GetConfig()
|
||||
|
||||
builder := NewCodeBuilder(nil)
|
||||
builder.AppendLine(GeneratedFileLine)
|
||||
|
|
@ -326,6 +375,10 @@ func writePagesFile() {
|
|||
|
||||
pages, _ := findPublicFuncsReturningHPage("pages")
|
||||
|
||||
pages = h.Filter(pages, func(page Page) bool {
|
||||
return !dirutil.IsGlobExclude(page.Path, config.AutomaticPageRoutingIgnore)
|
||||
})
|
||||
|
||||
if len(pages) > 0 {
|
||||
builder.AddImport(ModuleName)
|
||||
}
|
||||
|
|
@ -371,9 +424,96 @@ func writePagesFile() {
|
|||
})
|
||||
}
|
||||
|
||||
func writeAssetsFile() {
|
||||
cwd := process.GetWorkingDir()
|
||||
config := dirutil.GetConfig()
|
||||
|
||||
slog.Debug("writing assets file", slog.String("cwd", cwd), slog.String("config", config.PublicAssetPath))
|
||||
|
||||
distAssets := filepath.Join(cwd, "assets", "dist")
|
||||
hasAssets := false
|
||||
|
||||
builder := strings.Builder{}
|
||||
|
||||
builder.WriteString(`package assets`)
|
||||
builder.WriteString("\n")
|
||||
|
||||
filepath.WalkDir(distAssets, func(path string, d fs.DirEntry, err error) error {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if d.IsDir() {
|
||||
return nil
|
||||
}
|
||||
|
||||
if strings.HasPrefix(d.Name(), ".") {
|
||||
return nil
|
||||
}
|
||||
|
||||
path = strings.ReplaceAll(path, distAssets, "")
|
||||
httpUrl := normalizePath(fmt.Sprintf("%s%s", config.PublicAssetPath, path))
|
||||
|
||||
path = normalizePath(path)
|
||||
path = strings.ReplaceAll(path, "/", "_")
|
||||
path = strings.ReplaceAll(path, "//", "_")
|
||||
|
||||
name := strings.ReplaceAll(path, ".", "_")
|
||||
name = strings.ReplaceAll(name, "-", "_")
|
||||
|
||||
name = toPascaleCase(name)
|
||||
|
||||
if isValidGoVariableName(name) {
|
||||
builder.WriteString(fmt.Sprintf(`const %s = "%s"`, name, httpUrl))
|
||||
builder.WriteString("\n")
|
||||
hasAssets = true
|
||||
}
|
||||
|
||||
return nil
|
||||
})
|
||||
|
||||
builder.WriteString("\n")
|
||||
|
||||
str := builder.String()
|
||||
|
||||
if hasAssets {
|
||||
WriteFile(filepath.Join(GeneratedDirName, "assets", "assets-generated.go"), func(content *ast.File) string {
|
||||
return str
|
||||
})
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func HasModuleFile(path string) bool {
|
||||
_, err := os.Stat(path)
|
||||
return !os.IsNotExist(err)
|
||||
}
|
||||
|
||||
func CheckPagesDirectory(path string) error {
|
||||
pagesPath := filepath.Join(path, "pages")
|
||||
_, err := os.Stat(pagesPath)
|
||||
if err != nil {
|
||||
return fmt.Errorf("The directory pages does not exist.")
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func GetModuleName() string {
|
||||
wd := process.GetWorkingDir()
|
||||
modPath := filepath.Join(wd, "go.mod")
|
||||
|
||||
if HasModuleFile(modPath) == false {
|
||||
fmt.Fprintf(os.Stderr, "Module not found: go.mod file does not exist.")
|
||||
return ""
|
||||
}
|
||||
|
||||
checkDir := CheckPagesDirectory(wd)
|
||||
if checkDir != nil {
|
||||
fmt.Fprintf(os.Stderr, checkDir.Error())
|
||||
return ""
|
||||
}
|
||||
|
||||
goModBytes, err := os.ReadFile(modPath)
|
||||
if err != nil {
|
||||
fmt.Fprintf(os.Stderr, "error reading go.mod: %v\n", err)
|
||||
|
|
@ -392,6 +532,7 @@ func GenAst(flags ...process.RunFlag) error {
|
|||
}
|
||||
writePartialsFile()
|
||||
writePagesFile()
|
||||
writeAssetsFile()
|
||||
|
||||
WriteFile("__htmgo/setup-generated.go", func(content *ast.File) string {
|
||||
|
||||
|
|
|
|||
|
|
@ -1,82 +0,0 @@
|
|||
package astgen
|
||||
|
||||
// OrderedMap is a generic data structure that maintains the order of keys.
|
||||
type OrderedMap[K comparable, V any] struct {
|
||||
keys []K
|
||||
values map[K]V
|
||||
}
|
||||
|
||||
// Entries returns the key-value pairs in the order they were added.
|
||||
func (om *OrderedMap[K, V]) Entries() []struct {
|
||||
Key K
|
||||
Value V
|
||||
} {
|
||||
entries := make([]struct {
|
||||
Key K
|
||||
Value V
|
||||
}, len(om.keys))
|
||||
for i, key := range om.keys {
|
||||
entries[i] = struct {
|
||||
Key K
|
||||
Value V
|
||||
}{
|
||||
Key: key,
|
||||
Value: om.values[key],
|
||||
}
|
||||
}
|
||||
return entries
|
||||
}
|
||||
|
||||
// NewOrderedMap creates a new OrderedMap.
|
||||
func NewOrderedMap[K comparable, V any]() *OrderedMap[K, V] {
|
||||
return &OrderedMap[K, V]{
|
||||
keys: []K{},
|
||||
values: make(map[K]V),
|
||||
}
|
||||
}
|
||||
|
||||
// Set adds or updates a key-value pair in the OrderedMap.
|
||||
func (om *OrderedMap[K, V]) Set(key K, value V) {
|
||||
// Check if the key already exists
|
||||
if _, exists := om.values[key]; !exists {
|
||||
om.keys = append(om.keys, key) // Append key to the keys slice if it's a new key
|
||||
}
|
||||
om.values[key] = value
|
||||
}
|
||||
|
||||
// Get retrieves a value by key.
|
||||
func (om *OrderedMap[K, V]) Get(key K) (V, bool) {
|
||||
value, exists := om.values[key]
|
||||
return value, exists
|
||||
}
|
||||
|
||||
// Keys returns the keys in the order they were added.
|
||||
func (om *OrderedMap[K, V]) Keys() []K {
|
||||
return om.keys
|
||||
}
|
||||
|
||||
// Values returns the values in the order of their keys.
|
||||
func (om *OrderedMap[K, V]) Values() []V {
|
||||
values := make([]V, len(om.keys))
|
||||
for i, key := range om.keys {
|
||||
values[i] = om.values[key]
|
||||
}
|
||||
|
||||
return values
|
||||
}
|
||||
|
||||
// Delete removes a key-value pair from the OrderedMap.
|
||||
func (om *OrderedMap[K, V]) Delete(key K) {
|
||||
if _, exists := om.values[key]; exists {
|
||||
// Remove the key from the map
|
||||
delete(om.values, key)
|
||||
|
||||
// Remove the key from the keys slice
|
||||
for i, k := range om.keys {
|
||||
if k == key {
|
||||
om.keys = append(om.keys[:i], om.keys[i+1:]...)
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
6
cli/htmgo/tasks/astgen/project-sample/.gitignore
vendored
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
/assets/dist
|
||||
tmp
|
||||
node_modules
|
||||
.idea
|
||||
__htmgo
|
||||
dist
|
||||
13
cli/htmgo/tasks/astgen/project-sample/assets.go
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
//go:build !prod
|
||||
// +build !prod
|
||||
|
||||
package main
|
||||
|
||||
import (
|
||||
"astgen-project-sample/internal/embedded"
|
||||
"io/fs"
|
||||
)
|
||||
|
||||
func GetStaticAssets() fs.FS {
|
||||
return embedded.NewOsFs()
|
||||
}
|
||||
16
cli/htmgo/tasks/astgen/project-sample/assets_prod.go
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
//go:build prod
|
||||
// +build prod
|
||||
|
||||
package main
|
||||
|
||||
import (
|
||||
"embed"
|
||||
"io/fs"
|
||||
)
|
||||
|
||||
//go:embed assets/dist/*
|
||||
var staticAssets embed.FS
|
||||
|
||||
func GetStaticAssets() fs.FS {
|
||||
return staticAssets
|
||||
}
|
||||
11
cli/htmgo/tasks/astgen/project-sample/go.mod
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
module astgen-project-sample
|
||||
|
||||
go 1.23.0
|
||||
|
||||
require github.com/maddalax/htmgo/framework v1.0.7-0.20250703190716-06f01b3d7c1b
|
||||
|
||||
require (
|
||||
github.com/go-chi/chi/v5 v5.1.0 // indirect
|
||||
github.com/google/uuid v1.6.0 // indirect
|
||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||
)
|
||||
18
cli/htmgo/tasks/astgen/project-sample/go.sum
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/go-chi/chi/v5 v5.1.0 h1:acVI1TYaD+hhedDJ3r54HyA6sExp3HfXq7QWEEY/xMw=
|
||||
github.com/go-chi/chi/v5 v5.1.0/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
|
||||
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
||||
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||
github.com/maddalax/htmgo/framework v1.0.7-0.20250703190716-06f01b3d7c1b h1:m+xI+HBEQdie/Rs+mYI0HTFTMlYQSCv0l/siPDoywA4=
|
||||
github.com/maddalax/htmgo/framework v1.0.7-0.20250703190716-06f01b3d7c1b/go.mod h1:NGGzWVXWksrQJ9kV9SGa/A1F1Bjsgc08cN7ZVb98RqY=
|
||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
|
||||
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
||||
golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
|
||||
golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
21
cli/htmgo/tasks/astgen/project-sample/htmgo.yml
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
# htmgo configuration
|
||||
|
||||
# if tailwindcss is enabled, htmgo will automatically compile your tailwind and output it to assets/dist
|
||||
tailwind: true
|
||||
|
||||
# which directories to ignore when watching for changes, supports glob patterns through https://github.com/bmatcuk/doublestar
|
||||
watch_ignore: [".git", "node_modules", "dist/*"]
|
||||
|
||||
# files to watch for changes, supports glob patterns through https://github.com/bmatcuk/doublestar
|
||||
watch_files: ["**/*.go", "**/*.css", "**/*.md"]
|
||||
|
||||
# files or directories to ignore when automatically registering routes for pages
|
||||
# supports glob patterns through https://github.com/bmatcuk/doublestar
|
||||
automatic_page_routing_ignore: ["root.go"]
|
||||
|
||||
# files or directories to ignore when automatically registering routes for partials
|
||||
# supports glob patterns through https://github.com/bmatcuk/doublestar
|
||||
automatic_partial_routing_ignore: []
|
||||
|
||||
# url path of where the public assets are located
|
||||
public_asset_path: "/public"
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
package embedded
|
||||
|
||||
import (
|
||||
"io/fs"
|
||||
"os"
|
||||
)
|
||||
|
||||
type OsFs struct {
|
||||
}
|
||||
|
||||
func (receiver OsFs) Open(name string) (fs.File, error) {
|
||||
return os.Open(name)
|
||||
}
|
||||
|
||||
func NewOsFs() OsFs {
|
||||
return OsFs{}
|
||||
}
|
||||
36
cli/htmgo/tasks/astgen/project-sample/main.go
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"astgen-project-sample/__htmgo"
|
||||
"fmt"
|
||||
"github.com/maddalax/htmgo/framework/config"
|
||||
"github.com/maddalax/htmgo/framework/h"
|
||||
"github.com/maddalax/htmgo/framework/service"
|
||||
"io/fs"
|
||||
"net/http"
|
||||
)
|
||||
|
||||
func main() {
|
||||
locator := service.NewLocator()
|
||||
cfg := config.Get()
|
||||
|
||||
h.Start(h.AppOpts{
|
||||
ServiceLocator: locator,
|
||||
LiveReload: true,
|
||||
Register: func(app *h.App) {
|
||||
sub, err := fs.Sub(GetStaticAssets(), "assets/dist")
|
||||
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
http.FileServerFS(sub)
|
||||
|
||||
// change this in htmgo.yml (public_asset_path)
|
||||
app.Router.Handle(fmt.Sprintf("%s/*", cfg.PublicAssetPath),
|
||||
http.StripPrefix(cfg.PublicAssetPath, http.FileServerFS(sub)))
|
||||
|
||||
__htmgo.Register(app.Router)
|
||||
},
|
||||
})
|
||||
}
|
||||
30
cli/htmgo/tasks/astgen/project-sample/pages/index.go
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
package pages
|
||||
|
||||
import (
|
||||
"github.com/maddalax/htmgo/framework/h"
|
||||
)
|
||||
|
||||
func IndexPage(ctx *h.RequestContext) *h.Page {
|
||||
return RootPage(
|
||||
h.Div(
|
||||
h.Class("flex flex-col gap-4 items-center pt-24 min-h-screen bg-neutral-100"),
|
||||
h.H3(
|
||||
h.Id("intro-text"),
|
||||
h.Text("hello htmgo"),
|
||||
h.Class("text-5xl"),
|
||||
),
|
||||
h.Div(
|
||||
h.Class("mt-3"),
|
||||
),
|
||||
h.Div(),
|
||||
),
|
||||
)
|
||||
}
|
||||
|
||||
func TestPartial(ctx *h.RequestContext) *h.Partial {
|
||||
return h.NewPartial(
|
||||
h.Div(
|
||||
h.Text("Hello World"),
|
||||
),
|
||||
)
|
||||
}
|
||||
40
cli/htmgo/tasks/astgen/project-sample/pages/root.go
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
package pages
|
||||
|
||||
import (
|
||||
"github.com/maddalax/htmgo/framework/h"
|
||||
)
|
||||
|
||||
func RootPage(children ...h.Ren) *h.Page {
|
||||
title := "htmgo template"
|
||||
description := "an example of the htmgo template"
|
||||
author := "htmgo"
|
||||
url := "https://htmgo.dev"
|
||||
|
||||
return h.NewPage(
|
||||
h.Html(
|
||||
h.HxExtensions(
|
||||
h.BaseExtensions(),
|
||||
),
|
||||
h.Head(
|
||||
h.Title(
|
||||
h.Text(title),
|
||||
),
|
||||
h.Meta("viewport", "width=device-width, initial-scale=1"),
|
||||
h.Meta("title", title),
|
||||
h.Meta("charset", "utf-8"),
|
||||
h.Meta("author", author),
|
||||
h.Meta("description", description),
|
||||
h.Meta("og:title", title),
|
||||
h.Meta("og:url", url),
|
||||
h.Link("canonical", url),
|
||||
h.Meta("og:description", description),
|
||||
),
|
||||
h.Body(
|
||||
h.Div(
|
||||
h.Class("flex flex-col gap-2 bg-white h-full"),
|
||||
h.Fragment(children...),
|
||||
),
|
||||
),
|
||||
),
|
||||
)
|
||||
}
|
||||
18
cli/htmgo/tasks/astgen/project-sample/partials/index.go
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
package partials
|
||||
|
||||
import "github.com/maddalax/htmgo/framework/h"
|
||||
|
||||
func CountersPartial(ctx *h.RequestContext) *h.Partial {
|
||||
return h.NewPartial(
|
||||
h.Div(
|
||||
h.Text("my counter"),
|
||||
),
|
||||
)
|
||||
}
|
||||
|
||||
func SwapFormError(ctx *h.RequestContext, error string) *h.Partial {
|
||||
return h.SwapPartial(
|
||||
ctx,
|
||||
h.Div(),
|
||||
)
|
||||
}
|
||||
66
cli/htmgo/tasks/astgen/registration_test.go
Normal file
|
|
@ -0,0 +1,66 @@
|
|||
package astgen
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/maddalax/htmgo/cli/htmgo/internal/dirutil"
|
||||
"github.com/maddalax/htmgo/cli/htmgo/tasks/process"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"net/http"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"sync"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
func TestAstGen(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
workingDir, err := filepath.Abs("./project-sample")
|
||||
|
||||
assert.NoError(t, err)
|
||||
process.SetWorkingDir(workingDir)
|
||||
assert.NoError(t, os.Chdir(workingDir))
|
||||
|
||||
err = dirutil.DeleteDir(filepath.Join(process.GetWorkingDir(), "__htmgo"))
|
||||
assert.NoError(t, err)
|
||||
err = process.Run(process.NewRawCommand("", "go build ."))
|
||||
assert.Error(t, err)
|
||||
err = GenAst()
|
||||
assert.NoError(t, err)
|
||||
|
||||
go func() {
|
||||
// project was buildable after astgen, confirmed working
|
||||
err = process.Run(process.NewRawCommand("server", "go run ."))
|
||||
assert.NoError(t, err)
|
||||
}()
|
||||
|
||||
time.Sleep(time.Second * 1)
|
||||
|
||||
urls := []string{
|
||||
"/astgen-project-sample/partials.CountersPartial",
|
||||
"/",
|
||||
"/astgen-project-sample/pages.TestPartial",
|
||||
}
|
||||
|
||||
defer func() {
|
||||
serverProcess := process.GetProcessByName("server")
|
||||
assert.NotNil(t, serverProcess)
|
||||
process.KillProcess(*serverProcess)
|
||||
}()
|
||||
|
||||
wg := sync.WaitGroup{}
|
||||
|
||||
for _, url := range urls {
|
||||
wg.Add(1)
|
||||
go func() {
|
||||
defer wg.Done()
|
||||
// ensure we can get a 200 response on the partials
|
||||
resp, e := http.Get(fmt.Sprintf("http://localhost:3000%s", url))
|
||||
assert.NoError(t, e)
|
||||
assert.Equal(t, http.StatusOK, resp.StatusCode, fmt.Sprintf("%s was not a 200 response", url))
|
||||
}()
|
||||
}
|
||||
|
||||
wg.Wait()
|
||||
}
|
||||
|
|
@ -7,16 +7,3 @@ import (
|
|||
func PanicF(format string, args ...interface{}) {
|
||||
panic(fmt.Sprintf(format, args...))
|
||||
}
|
||||
|
||||
func Unique[T any](slice []T, key func(item T) string) []T {
|
||||
var result []T
|
||||
seen := make(map[string]bool)
|
||||
for _, v := range slice {
|
||||
k := key(v)
|
||||
if _, ok := seen[k]; !ok {
|
||||
seen[k] = true
|
||||
result = append(result, v)
|
||||
}
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ func downloadTailwindCli() {
|
|||
log.Fatal(fmt.Sprintf("Unsupported OS/ARCH: %s/%s", os, arch))
|
||||
}
|
||||
fileName := fmt.Sprintf(`tailwindcss-%s`, distro)
|
||||
url := fmt.Sprintf(`https://github.com/tailwindlabs/tailwindcss/releases/latest/download/%s`, fileName)
|
||||
url := fmt.Sprintf(`https://github.com/tailwindlabs/tailwindcss/releases/download/v3.4.16/%s`, fileName)
|
||||
|
||||
cmd := fmt.Sprintf(`curl -LO %s`, url)
|
||||
process.Run(process.NewRawCommand("tailwind-cli-download", cmd, process.ExitOnError))
|
||||
|
|
|
|||
50
cli/htmgo/tasks/formatter/formatter.go
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
package formatter
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/maddalax/htmgo/tools/html-to-htmgo/htmltogo"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
)
|
||||
|
||||
func FormatDir(dir string) {
|
||||
files, err := os.ReadDir(dir)
|
||||
if err != nil {
|
||||
fmt.Printf("error reading dir: %s\n", err.Error())
|
||||
return
|
||||
}
|
||||
for _, file := range files {
|
||||
if file.IsDir() {
|
||||
FormatDir(filepath.Join(dir, file.Name()))
|
||||
} else {
|
||||
FormatFile(filepath.Join(dir, file.Name()))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func FormatFile(file string) {
|
||||
if !strings.HasSuffix(file, ".go") {
|
||||
return
|
||||
}
|
||||
|
||||
fmt.Printf("formatting file: %s\n", file)
|
||||
|
||||
source, err := os.ReadFile(file)
|
||||
if err != nil {
|
||||
fmt.Printf("error reading file: %s\n", err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
str := string(source)
|
||||
|
||||
if !strings.Contains(str, "github.com/maddalax/htmgo/framework/h") {
|
||||
return
|
||||
}
|
||||
|
||||
parsed := htmltogo.Indent(str)
|
||||
|
||||
os.WriteFile(file, []byte(parsed), 0644)
|
||||
|
||||
return
|
||||
}
|
||||
|
|
@ -12,7 +12,10 @@ func KillProcess(process CmdWithFlags) error {
|
|||
if process.Cmd == nil || process.Cmd.Process == nil {
|
||||
return nil
|
||||
}
|
||||
Run(NewRawCommand("killprocess", fmt.Sprintf("taskkill /F /T /PID %s", strconv.Itoa(process.Cmd.Process.Pid))))
|
||||
err := exec.Command("taskkill", "/F", "/T", "/PID", strconv.Itoa(process.Cmd.Process.Pid)).Run()
|
||||
if err != nil {
|
||||
fmt.Println(err)
|
||||
}
|
||||
time.Sleep(time.Millisecond * 50)
|
||||
return nil
|
||||
}
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ func OnShutdown() {
|
|||
}
|
||||
}
|
||||
// give it a second
|
||||
time.Sleep(time.Second * 2)
|
||||
time.Sleep(time.Second * 1)
|
||||
// force kill
|
||||
KillAll()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,12 +9,23 @@ import (
|
|||
"os"
|
||||
)
|
||||
|
||||
func Build() {
|
||||
func MakeBuildable() {
|
||||
copyassets.CopyAssets()
|
||||
astgen.GenAst(process.ExitOnError)
|
||||
css.GenerateCss(process.ExitOnError)
|
||||
astgen.GenAst(process.ExitOnError)
|
||||
}
|
||||
|
||||
process.RunOrExit(process.NewRawCommand("", "mkdir -p ./dist"))
|
||||
func Build() {
|
||||
MakeBuildable()
|
||||
|
||||
_ = os.RemoveAll("./dist")
|
||||
|
||||
err := os.Mkdir("./dist", 0755)
|
||||
|
||||
if err != nil {
|
||||
fmt.Println("Error creating dist directory", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
if os.Getenv("SKIP_GO_BUILD") != "1" {
|
||||
process.RunOrExit(process.NewRawCommand("", fmt.Sprintf("go build -tags prod -o ./dist")))
|
||||
|
|
|
|||
|
|
@ -1,7 +1,42 @@
|
|||
package run
|
||||
|
||||
import "github.com/maddalax/htmgo/cli/htmgo/tasks/process"
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/maddalax/htmgo/cli/htmgo/tasks/process"
|
||||
"io/fs"
|
||||
"os"
|
||||
"path/filepath"
|
||||
)
|
||||
|
||||
func Server(flags ...process.RunFlag) error {
|
||||
return process.Run(process.NewRawCommand("run-server", "go run .", flags...))
|
||||
buildDir := "./__htmgo/temp-build"
|
||||
_ = os.RemoveAll(buildDir)
|
||||
err := os.Mkdir(buildDir, 0755)
|
||||
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
process.RunOrExit(process.NewRawCommand("", fmt.Sprintf("go build -o %s", buildDir)))
|
||||
|
||||
binaryPath := ""
|
||||
|
||||
// find the binary that was built
|
||||
err = filepath.WalkDir(buildDir, func(path string, d fs.DirEntry, err error) error {
|
||||
if d.IsDir() {
|
||||
return nil
|
||||
}
|
||||
binaryPath = path
|
||||
return nil
|
||||
})
|
||||
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if binaryPath == "" {
|
||||
return fmt.Errorf("could not find the binary")
|
||||
}
|
||||
|
||||
return process.Run(process.NewRawCommand("run-server", fmt.Sprintf("./%s", binaryPath), flags...))
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,19 +1,12 @@
|
|||
package run
|
||||
|
||||
import (
|
||||
"github.com/maddalax/htmgo/cli/htmgo/tasks/astgen"
|
||||
"github.com/maddalax/htmgo/cli/htmgo/tasks/copyassets"
|
||||
"github.com/maddalax/htmgo/cli/htmgo/tasks/css"
|
||||
"github.com/maddalax/htmgo/cli/htmgo/tasks/process"
|
||||
)
|
||||
|
||||
func Setup() {
|
||||
process.RunOrExit(process.NewRawCommand("", "go mod download"))
|
||||
process.RunOrExit(process.NewRawCommand("", "go mod tidy"))
|
||||
|
||||
copyassets.CopyAssets()
|
||||
astgen.GenAst(process.ExitOnError)
|
||||
css.GenerateCss(process.ExitOnError)
|
||||
|
||||
MakeBuildable()
|
||||
EntGenerate()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ func ReplaceTextInFile(file string, text string, replacement string) error {
|
|||
|
||||
func ReplaceTextInDirRecursive(dir string, text string, replacement string, filter func(file string) bool) error {
|
||||
return filepath.WalkDir(dir, func(path string, d fs.DirEntry, err error) error {
|
||||
if filter(path) {
|
||||
if filter(filepath.Base(path)) {
|
||||
_ = ReplaceTextInFile(path, text, replacement)
|
||||
}
|
||||
return nil
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ func startWatcher(cb func(version string, file []*fsnotify.Event)) {
|
|||
if !ok {
|
||||
return
|
||||
}
|
||||
slog.Error("error:", err.Error())
|
||||
slog.Error("error:", slog.String("error", err.Error()))
|
||||
}
|
||||
}
|
||||
}()
|
||||
|
|
@ -118,7 +118,7 @@ func startWatcher(cb func(version string, file []*fsnotify.Event)) {
|
|||
if info.IsDir() {
|
||||
err = watcher.Add(path)
|
||||
if err != nil {
|
||||
slog.Error("Error adding directory to watcher:", err)
|
||||
slog.Error("Error adding directory to watcher:", slog.String("error", err.Error()))
|
||||
} else {
|
||||
slog.Debug("Watching directory:", slog.String("path", path))
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,18 +11,25 @@ import (
|
|||
func MessageRow(message *Message) *h.Element {
|
||||
return h.Div(
|
||||
h.Attribute("hx-swap-oob", "beforeend"),
|
||||
h.Class("flex flex-col gap-4 w-full break-words whitespace-normal"), // Ensure container breaks long words
|
||||
h.Class("flex flex-col gap-4 w-full break-words whitespace-normal"),
|
||||
// Ensure container breaks long words
|
||||
h.Id("messages"),
|
||||
h.Div(
|
||||
h.Class("flex flex-col gap-1"),
|
||||
h.Div(
|
||||
h.Class("flex gap-2 items-center"),
|
||||
h.Pf(message.UserName, h.Class("font-bold")),
|
||||
h.Pf(
|
||||
message.UserName,
|
||||
h.Class("font-bold"),
|
||||
),
|
||||
h.Pf(message.CreatedAt.In(time.Local).Format("01/02 03:04 PM")),
|
||||
),
|
||||
h.Article(
|
||||
h.Class("break-words whitespace-normal"), // Ensure message text wraps correctly
|
||||
h.P(h.Text(message.Message)),
|
||||
h.Class("break-words whitespace-normal"),
|
||||
// Ensure message text wraps correctly
|
||||
h.P(
|
||||
h.Text(message.Message),
|
||||
),
|
||||
),
|
||||
),
|
||||
)
|
||||
|
|
|
|||
|
|
@ -28,12 +28,28 @@ func Button(props ButtonProps) h.Ren {
|
|||
text := h.Text(props.Text)
|
||||
|
||||
button := h.Button(
|
||||
h.If(props.Id != "", h.Id(props.Id)),
|
||||
h.If(props.Children != nil, h.Children(props.Children...)),
|
||||
h.If(
|
||||
props.Id != "",
|
||||
h.Id(props.Id),
|
||||
),
|
||||
h.If(
|
||||
props.Children != nil,
|
||||
h.Children(props.Children...),
|
||||
),
|
||||
h.Class("flex gap-1 items-center justify-center border p-4 rounded cursor-hover", props.Class),
|
||||
h.If(props.Get != "", h.Get(props.Get)),
|
||||
h.If(props.Target != "", h.HxTarget(props.Target)),
|
||||
h.IfElse(props.Type != "", h.Type(props.Type), h.Type("button")),
|
||||
h.If(
|
||||
props.Get != "",
|
||||
h.Get(props.Get),
|
||||
),
|
||||
h.If(
|
||||
props.Target != "",
|
||||
h.HxTarget(props.Target),
|
||||
),
|
||||
h.IfElse(
|
||||
props.Type != "",
|
||||
h.Type(props.Type),
|
||||
h.Type("button"),
|
||||
),
|
||||
text,
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -6,6 +6,9 @@ func FormError(error string) *h.Element {
|
|||
return h.Div(
|
||||
h.Id("form-error"),
|
||||
h.Text(error),
|
||||
h.If(error != "", h.Class("p-4 bg-rose-400 text-white rounded")),
|
||||
h.If(
|
||||
error != "",
|
||||
h.Class("p-4 bg-rose-400 text-white rounded"),
|
||||
),
|
||||
)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,11 +19,14 @@ type InputProps struct {
|
|||
}
|
||||
|
||||
func Input(props InputProps) *h.Element {
|
||||
validation := h.If(props.ValidationPath != "", h.Children(
|
||||
h.Post(props.ValidationPath, hx.BlurEvent),
|
||||
h.Attribute("hx-swap", "innerHTML transition:true"),
|
||||
h.Attribute("hx-target", "next div"),
|
||||
))
|
||||
validation := h.If(
|
||||
props.ValidationPath != "",
|
||||
h.Children(
|
||||
h.Post(props.ValidationPath, hx.BlurEvent),
|
||||
h.Attribute("hx-swap", "innerHTML transition:true"),
|
||||
h.Attribute("hx-target", "next div"),
|
||||
),
|
||||
)
|
||||
|
||||
if props.Type == "" {
|
||||
props.Type = "text"
|
||||
|
|
@ -32,18 +35,41 @@ func Input(props InputProps) *h.Element {
|
|||
input := h.Input(
|
||||
props.Type,
|
||||
h.Class("border p-2 rounded focus:outline-none focus:ring focus:ring-slate-800"),
|
||||
h.If(props.Name != "", h.Name(props.Name)),
|
||||
h.If(props.Children != nil, h.Children(props.Children...)),
|
||||
h.If(props.Required, h.Required()),
|
||||
h.If(props.Placeholder != "", h.Placeholder(props.Placeholder)),
|
||||
h.If(props.DefaultValue != "", h.Attribute("value", props.DefaultValue)),
|
||||
h.If(
|
||||
props.Name != "",
|
||||
h.Name(props.Name),
|
||||
),
|
||||
h.If(
|
||||
props.Children != nil,
|
||||
h.Children(props.Children...),
|
||||
),
|
||||
h.If(
|
||||
props.Required,
|
||||
h.Required(),
|
||||
),
|
||||
h.If(
|
||||
props.Placeholder != "",
|
||||
h.Placeholder(props.Placeholder),
|
||||
),
|
||||
h.If(
|
||||
props.DefaultValue != "",
|
||||
h.Attribute("value", props.DefaultValue),
|
||||
),
|
||||
validation,
|
||||
)
|
||||
|
||||
wrapped := h.Div(
|
||||
h.If(props.Id != "", h.Id(props.Id)),
|
||||
h.If(
|
||||
props.Id != "",
|
||||
h.Id(props.Id),
|
||||
),
|
||||
h.Class("flex flex-col gap-1"),
|
||||
h.If(props.Label != "", h.Label(h.Text(props.Label))),
|
||||
h.If(
|
||||
props.Label != "",
|
||||
h.Label(
|
||||
h.Text(props.Label),
|
||||
),
|
||||
),
|
||||
input,
|
||||
h.Div(
|
||||
h.Id(props.Id+"-error"),
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ go 1.23.0
|
|||
require (
|
||||
github.com/go-chi/chi/v5 v5.1.0
|
||||
github.com/google/uuid v1.6.0
|
||||
github.com/maddalax/htmgo/framework v0.0.0-20241014151703-8503dffa4e7d
|
||||
github.com/maddalax/htmgo/framework v1.0.7-0.20250703190716-06f01b3d7c1b
|
||||
github.com/mattn/go-sqlite3 v1.14.23
|
||||
github.com/puzpuzpuz/xsync/v3 v3.4.0
|
||||
)
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ github.com/go-chi/chi/v5 v5.1.0 h1:acVI1TYaD+hhedDJ3r54HyA6sExp3HfXq7QWEEY/xMw=
|
|||
github.com/go-chi/chi/v5 v5.1.0/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
|
||||
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
||||
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||
github.com/maddalax/htmgo/framework v0.0.0-20241014151703-8503dffa4e7d h1:oysEaiKB7/WbvEklkyQ7SEE1xmDeGLrBUvF3BAsBUns=
|
||||
github.com/maddalax/htmgo/framework v0.0.0-20241014151703-8503dffa4e7d/go.mod h1:HYKI49Pb6oyY2opSJdTt145B1vWgfWIDohvlolynv80=
|
||||
github.com/maddalax/htmgo/framework v1.0.7-0.20250703190716-06f01b3d7c1b h1:m+xI+HBEQdie/Rs+mYI0HTFTMlYQSCv0l/siPDoywA4=
|
||||
github.com/maddalax/htmgo/framework v1.0.7-0.20250703190716-06f01b3d7c1b/go.mod h1:NGGzWVXWksrQJ9kV9SGa/A1F1Bjsgc08cN7ZVb98RqY=
|
||||
github.com/mattn/go-sqlite3 v1.14.23 h1:gbShiuAP1W5j9UOksQ06aiiqPMxYecovVGwmTxWtuw0=
|
||||
github.com/mattn/go-sqlite3 v1.14.23/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
|
||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||
|
|
|
|||
|
|
@ -17,13 +17,10 @@ func ChatRoom(ctx *h.RequestContext) *h.Page {
|
|||
RootPage(
|
||||
h.Div(
|
||||
h.TriggerChildren(),
|
||||
|
||||
h.Attribute("sse-connect", fmt.Sprintf("/sse/chat/%s", roomId)),
|
||||
|
||||
h.HxOnSseOpen(
|
||||
js.ConsoleLog("Connected to chat room"),
|
||||
),
|
||||
|
||||
h.HxOnSseError(
|
||||
js.EvalJs(fmt.Sprintf(`
|
||||
const reason = e.detail.event.data
|
||||
|
|
@ -38,35 +35,27 @@ func ChatRoom(ctx *h.RequestContext) *h.Page {
|
|||
}
|
||||
`, roomId, roomId)),
|
||||
),
|
||||
|
||||
// Adjusted flex properties for responsive layout
|
||||
h.Class("flex flex-row h-screen bg-neutral-100 overflow-x-hidden"),
|
||||
|
||||
// Collapse Button for mobile
|
||||
CollapseButton(),
|
||||
|
||||
// Sidebar for connected users
|
||||
UserSidebar(),
|
||||
|
||||
h.Div(
|
||||
// Adjusted to fill height and width
|
||||
h.Class("flex flex-col h-full w-full bg-white p-4 overflow-hidden"),
|
||||
|
||||
// Room name at the top, fixed
|
||||
CachedRoomHeader(ctx),
|
||||
|
||||
h.HxAfterSseMessage(
|
||||
js.EvalJsOnSibling("#messages",
|
||||
`element.scrollTop = element.scrollHeight;`),
|
||||
),
|
||||
|
||||
// Chat Messages
|
||||
h.Div(
|
||||
h.Id("messages"),
|
||||
// Adjusted flex properties and removed max-width
|
||||
h.Class("flex flex-col gap-4 mb-4 overflow-auto flex-grow w-full pt-[50px]"),
|
||||
),
|
||||
|
||||
// Chat Input at the bottom
|
||||
Form(),
|
||||
),
|
||||
|
|
@ -91,7 +80,10 @@ func roomNameHeader(ctx *h.RequestContext) *h.Element {
|
|||
}
|
||||
return h.Div(
|
||||
h.Class("bg-neutral-700 text-white p-3 shadow-sm w-full fixed top-0 left-0 flex justify-center z-10"),
|
||||
h.H2F(room.Name, h.Class("text-lg font-bold")),
|
||||
h.H2F(
|
||||
room.Name,
|
||||
h.Class("text-lg font-bold"),
|
||||
),
|
||||
h.Div(
|
||||
h.Class("absolute right-5 top-3 cursor-pointer"),
|
||||
h.Text("Share"),
|
||||
|
|
@ -108,7 +100,10 @@ func UserSidebar() *h.Element {
|
|||
return h.Div(
|
||||
h.Class("sidebar h-full pt-[67px] min-w-48 w-48 bg-neutral-200 p-4 flex-col justify-between gap-3 rounded-l-lg hidden md:flex"),
|
||||
h.Div(
|
||||
h.H3F("Connected Users", h.Class("text-lg font-bold")),
|
||||
h.H3F(
|
||||
"Connected Users",
|
||||
h.Class("text-lg font-bold"),
|
||||
),
|
||||
chat.ConnectedUsers(make([]db.User, 0), ""),
|
||||
),
|
||||
h.A(
|
||||
|
|
@ -121,9 +116,11 @@ func UserSidebar() *h.Element {
|
|||
|
||||
func CollapseButton() *h.Element {
|
||||
return h.Div(
|
||||
h.Class("fixed top-0 left-4 md:hidden z-50"), // Always visible on mobile
|
||||
h.Class("fixed top-0 left-4 md:hidden z-50"),
|
||||
// Always visible on mobile
|
||||
h.Button(
|
||||
h.Class("p-2 text-2xl bg-neutral-700 text-white rounded-md"), // Styling the button
|
||||
h.Class("p-2 text-2xl bg-neutral-700 text-white rounded-md"),
|
||||
// Styling the button
|
||||
h.OnClick(
|
||||
js.EvalJs(`
|
||||
const sidebar = document.querySelector('.sidebar');
|
||||
|
|
@ -131,13 +128,16 @@ func CollapseButton() *h.Element {
|
|||
sidebar.classList.toggle('flex');
|
||||
`),
|
||||
),
|
||||
h.UnsafeRaw("☰"), // The icon for collapsing the sidebar
|
||||
h.UnsafeRaw("☰"),
|
||||
|
||||
// The icon for collapsing the sidebar
|
||||
),
|
||||
)
|
||||
}
|
||||
|
||||
func MessageInput() *h.Element {
|
||||
return h.Input("text",
|
||||
return h.Input(
|
||||
"text",
|
||||
h.Id("message-input"),
|
||||
h.Required(),
|
||||
h.Class("p-4 rounded-md border border-slate-200 w-full focus:outline-none focus:ring focus:ring-slate-200"),
|
||||
|
|
|
|||
|
|
@ -13,12 +13,14 @@ func ChatAppFirstScreen(ctx *h.RequestContext) *h.Page {
|
|||
h.Class("flex flex-col items-center justify-center min-h-screen bg-neutral-100"),
|
||||
h.Div(
|
||||
h.Class("bg-white p-8 rounded-lg shadow-lg w-full max-w-md"),
|
||||
h.H2F("htmgo chat", h.Class("text-3xl font-bold text-center mb-6")),
|
||||
h.H2F(
|
||||
"htmgo chat",
|
||||
h.Class("text-3xl font-bold text-center mb-6"),
|
||||
),
|
||||
h.Form(
|
||||
h.Attribute("hx-swap", "none"),
|
||||
h.PostPartial(partials.CreateOrJoinRoom),
|
||||
h.Class("flex flex-col gap-6"),
|
||||
|
||||
// Username input at the top
|
||||
components.Input(components.InputProps{
|
||||
Id: "username",
|
||||
|
|
@ -30,11 +32,9 @@ func ChatAppFirstScreen(ctx *h.RequestContext) *h.Page {
|
|||
h.MaxLength(15),
|
||||
},
|
||||
}),
|
||||
|
||||
// Single box for Create or Join a Chat Room
|
||||
h.Div(
|
||||
h.Class("p-4 border border-gray-300 rounded-md flex flex-col gap-6"),
|
||||
|
||||
// Create New Chat Room input
|
||||
components.Input(components.InputProps{
|
||||
Name: "new-chat-room",
|
||||
|
|
@ -45,15 +45,20 @@ func ChatAppFirstScreen(ctx *h.RequestContext) *h.Page {
|
|||
h.MaxLength(20),
|
||||
},
|
||||
}),
|
||||
|
||||
// OR divider
|
||||
h.Div(
|
||||
h.Class("flex items-center justify-center gap-4"),
|
||||
h.Div(h.Class("border-t border-gray-300 flex-grow")),
|
||||
h.P(h.Text("OR"), h.Class("text-gray-500")),
|
||||
h.Div(h.Class("border-t border-gray-300 flex-grow")),
|
||||
h.Div(
|
||||
h.Class("border-t border-gray-300 flex-grow"),
|
||||
),
|
||||
h.P(
|
||||
h.Text("OR"),
|
||||
h.Class("text-gray-500"),
|
||||
),
|
||||
h.Div(
|
||||
h.Class("border-t border-gray-300 flex-grow"),
|
||||
),
|
||||
),
|
||||
|
||||
// Join Chat Room input
|
||||
components.Input(components.InputProps{
|
||||
Id: "join-chat-room",
|
||||
|
|
@ -67,10 +72,8 @@ func ChatAppFirstScreen(ctx *h.RequestContext) *h.Page {
|
|||
},
|
||||
}),
|
||||
),
|
||||
|
||||
// Error message
|
||||
components.FormError(""),
|
||||
|
||||
// Submit button at the bottom
|
||||
components.PrimaryButton(components.ButtonProps{
|
||||
Type: "submit",
|
||||
|
|
|
|||
|
|
@ -50,7 +50,6 @@ func Handle() http.HandlerFunc {
|
|||
defer manager.Disconnect(sessionId)
|
||||
|
||||
defer func() {
|
||||
fmt.Printf("empting channels\n")
|
||||
for len(writer) > 0 {
|
||||
<-writer
|
||||
}
|
||||
|
|
|
|||
|
|
@ -70,16 +70,14 @@ func (manager *SocketManager) Listen(listener chan SocketEvent) {
|
|||
}
|
||||
|
||||
func (manager *SocketManager) dispatch(event SocketEvent) {
|
||||
fmt.Printf("dispatching event: %s\n", event.Type)
|
||||
done := make(chan struct{}, 1)
|
||||
go func() {
|
||||
for {
|
||||
select {
|
||||
case <-done:
|
||||
fmt.Printf("dispatched event: %s\n", event.Type)
|
||||
return
|
||||
case <-time.After(5 * time.Second):
|
||||
fmt.Printf("havent dispatched event after 5s, chan blocked: %s\n", event.Type)
|
||||
fmt.Printf("havent dispatched listener event after 5s, chan blocked: %s\n", event.Type)
|
||||
}
|
||||
}
|
||||
}()
|
||||
|
|
|
|||
|
|
@ -2,9 +2,15 @@ module hackernews
|
|||
|
||||
go 1.23.0
|
||||
|
||||
require github.com/maddalax/htmgo/framework v0.0.0-20241014151703-8503dffa4e7d
|
||||
require (
|
||||
github.com/maddalax/htmgo/framework v1.0.7-0.20250703190716-06f01b3d7c1b
|
||||
github.com/microcosm-cc/bluemonday v1.0.27
|
||||
)
|
||||
|
||||
require (
|
||||
github.com/aymerick/douceur v0.2.0 // indirect
|
||||
github.com/go-chi/chi/v5 v5.1.0 // indirect
|
||||
github.com/google/uuid v1.6.0 // indirect
|
||||
github.com/gorilla/css v1.0.1 // indirect
|
||||
golang.org/x/net v0.29.0 // indirect
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,11 +1,17 @@
|
|||
github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
|
||||
github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
|
||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/go-chi/chi/v5 v5.1.0 h1:acVI1TYaD+hhedDJ3r54HyA6sExp3HfXq7QWEEY/xMw=
|
||||
github.com/go-chi/chi/v5 v5.1.0/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
|
||||
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
||||
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||
github.com/maddalax/htmgo/framework v0.0.0-20241014151703-8503dffa4e7d h1:oysEaiKB7/WbvEklkyQ7SEE1xmDeGLrBUvF3BAsBUns=
|
||||
github.com/maddalax/htmgo/framework v0.0.0-20241014151703-8503dffa4e7d/go.mod h1:HYKI49Pb6oyY2opSJdTt145B1vWgfWIDohvlolynv80=
|
||||
github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8=
|
||||
github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0=
|
||||
github.com/maddalax/htmgo/framework v1.0.7-0.20250703190716-06f01b3d7c1b h1:m+xI+HBEQdie/Rs+mYI0HTFTMlYQSCv0l/siPDoywA4=
|
||||
github.com/maddalax/htmgo/framework v1.0.7-0.20250703190716-06f01b3d7c1b/go.mod h1:NGGzWVXWksrQJ9kV9SGa/A1F1Bjsgc08cN7ZVb98RqY=
|
||||
github.com/microcosm-cc/bluemonday v1.0.27 h1:MpEUotklkwCSLeH+Qdx1VJgNqLlpY2KXwXFM08ygZfk=
|
||||
github.com/microcosm-cc/bluemonday v1.0.27/go.mod h1:jFi9vgW+H7c3V0lb6nR74Ib/DIB5OBs92Dimizgw2cA=
|
||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ import (
|
|||
"github.com/maddalax/htmgo/framework/h"
|
||||
"hackernews/internal/batch"
|
||||
"hackernews/internal/httpjson"
|
||||
"hackernews/internal/sanitize"
|
||||
"hackernews/internal/timeformat"
|
||||
"log/slog"
|
||||
"strconv"
|
||||
|
|
@ -132,6 +133,8 @@ func GetComment(id int) (*Comment, error) {
|
|||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
c.Text = sanitize.Sanitize(c.Text)
|
||||
c.By = sanitize.Sanitize(c.By)
|
||||
c.Time = timeformat.ParseUnix(c.TimeRaw)
|
||||
return c, nil
|
||||
}
|
||||
|
|
@ -141,6 +144,9 @@ func GetStory(id int) (*Story, error) {
|
|||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
s.Title = sanitize.Sanitize(s.Title)
|
||||
s.Text = sanitize.Sanitize(s.Text)
|
||||
s.By = sanitize.Sanitize(s.By)
|
||||
s.Time = timeformat.ParseUnix(s.TimeRaw)
|
||||
return s, nil
|
||||
}
|
||||
|
|
|
|||
9
examples/hackernews/internal/sanitize/sanitize.go
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
package sanitize
|
||||
|
||||
import "github.com/microcosm-cc/bluemonday"
|
||||
|
||||
var p = bluemonday.UGCPolicy()
|
||||
|
||||
func Sanitize(text string) string {
|
||||
return p.Sanitize(text)
|
||||
}
|
||||
|
|
@ -5,14 +5,17 @@ import (
|
|||
)
|
||||
|
||||
func RootPage(children ...h.Ren) h.Ren {
|
||||
banner := h.A(h.Class("bg-neutral-200 text-neutral-600 text-center p-2 flex items-center justify-center"),
|
||||
banner := h.A(
|
||||
h.Class("bg-neutral-200 text-neutral-600 text-center p-2 flex items-center justify-center"),
|
||||
h.Href("https://github.com/maddalax/htmgo"),
|
||||
h.Attribute("target", "_blank"),
|
||||
h.Text("Built with htmgo.dev"),
|
||||
)
|
||||
|
||||
return h.Html(
|
||||
h.HxExtensions(h.BaseExtensions()),
|
||||
h.HxExtensions(
|
||||
h.BaseExtensions(),
|
||||
),
|
||||
h.Head(
|
||||
h.Meta("viewport", "width=device-width, initial-scale=1"),
|
||||
h.Link("/public/favicon.ico", "icon"),
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ import (
|
|||
"github.com/maddalax/htmgo/framework/h"
|
||||
"hackernews/internal/batch"
|
||||
"hackernews/internal/news"
|
||||
"hackernews/internal/sanitize"
|
||||
"hackernews/internal/timeformat"
|
||||
"strings"
|
||||
"time"
|
||||
|
|
@ -13,7 +14,12 @@ import (
|
|||
func StoryComments(ctx *h.RequestContext) *h.Partial {
|
||||
return h.NewPartial(
|
||||
h.Fragment(
|
||||
h.OobSwap(ctx, h.Div(h.Id("comments-loader"))),
|
||||
h.OobSwap(
|
||||
ctx,
|
||||
h.Div(
|
||||
h.Id("comments-loader"),
|
||||
),
|
||||
),
|
||||
h.Div(
|
||||
h.Class("flex flex-col gap-3 prose max-w-none"),
|
||||
CachedStoryComments(news.MustItemId(ctx)),
|
||||
|
|
@ -57,14 +63,20 @@ func Comment(item news.Comment, nesting int) *h.Element {
|
|||
"border-b border-gray-200": nesting == 0,
|
||||
"border-l border-gray-200": nesting > 0,
|
||||
}),
|
||||
h.If(nesting > 0, h.Attribute("style", fmt.Sprintf("margin-left: %dpx", (nesting-1)*15))),
|
||||
h.If(
|
||||
nesting > 0,
|
||||
h.Attribute("style", fmt.Sprintf("margin-left: %dpx", (nesting-1)*15)),
|
||||
),
|
||||
h.Div(
|
||||
h.If(nesting > 0, h.Class("pl-4")),
|
||||
h.If(
|
||||
nesting > 0,
|
||||
h.Class("pl-4"),
|
||||
),
|
||||
h.Div(
|
||||
h.Class("flex gap-1 items-center"),
|
||||
h.Div(
|
||||
h.Class("font-bold text-rose-500"),
|
||||
h.UnsafeRaw(item.By),
|
||||
h.UnsafeRaw(sanitize.Sanitize(item.By)),
|
||||
),
|
||||
h.Div(
|
||||
h.Class("text-sm text-gray-600"),
|
||||
|
|
@ -74,15 +86,18 @@ func Comment(item news.Comment, nesting int) *h.Element {
|
|||
),
|
||||
h.Div(
|
||||
h.Class("text-sm text-gray-600"),
|
||||
h.UnsafeRaw(strings.TrimSpace(item.Text)),
|
||||
h.UnsafeRaw(sanitize.Sanitize(strings.TrimSpace(item.Text))),
|
||||
),
|
||||
),
|
||||
h.If(
|
||||
len(children) > 0,
|
||||
h.List(
|
||||
children, func(child news.Comment, index int) *h.Element {
|
||||
return h.Div(
|
||||
Comment(child, nesting+1),
|
||||
)
|
||||
},
|
||||
),
|
||||
),
|
||||
h.If(len(children) > 0, h.List(
|
||||
children, func(child news.Comment, index int) *h.Element {
|
||||
return h.Div(
|
||||
Comment(child, nesting+1),
|
||||
)
|
||||
},
|
||||
)),
|
||||
)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ import (
|
|||
"hackernews/components"
|
||||
"hackernews/internal/news"
|
||||
"hackernews/internal/parse"
|
||||
"hackernews/internal/sanitize"
|
||||
"hackernews/internal/timeformat"
|
||||
"time"
|
||||
)
|
||||
|
|
@ -57,13 +58,18 @@ func StorySidebar(ctx *h.RequestContext) *h.Partial {
|
|||
|
||||
page := parse.MustParseInt(pageRaw, 0)
|
||||
|
||||
fetchMorePath := h.GetPartialPathWithQs(StorySidebar, h.NewQs("mode", "infinite", "page", fmt.Sprintf("%d", page+1), "category", category))
|
||||
fetchMorePath := h.GetPartialPathWithQs(
|
||||
StorySidebar,
|
||||
h.NewQs("mode", "infinite", "page", fmt.Sprintf("%d", page+1), "category", category),
|
||||
)
|
||||
|
||||
list := CachedStoryList(category, page, 50, fetchMorePath)
|
||||
|
||||
body := h.Aside(
|
||||
h.Id("story-sidebar"),
|
||||
h.JoinExtensions(h.TriggerChildren()),
|
||||
h.JoinExtensions(
|
||||
h.TriggerChildren(),
|
||||
),
|
||||
h.Class("sticky top-0 h-screen p-1 bg-gray-100 overflow-y-auto max-w-80 min-w-80"),
|
||||
h.Div(
|
||||
h.Class("flex flex-col gap-1"),
|
||||
|
|
@ -99,7 +105,9 @@ func SidebarTitle(defaultCategory string) *h.Element {
|
|||
h.Text("Hacker News"),
|
||||
),
|
||||
h.Div(
|
||||
h.OnLoad(h.EvalJs(ScrollJs)),
|
||||
h.OnLoad(
|
||||
h.EvalJs(ScrollJs),
|
||||
),
|
||||
h.Class("scroll-container mt-2 flex gap-1 no-scrollbar overflow-y-hidden whitespace-nowrap overflow-x-auto"),
|
||||
h.List(news.Categories, func(item news.Category, index int) *h.Element {
|
||||
return CategoryBadge(defaultCategory, item)
|
||||
|
|
@ -114,7 +122,13 @@ func CategoryBadge(defaultCategory string, category news.Category) *h.Element {
|
|||
category.Name,
|
||||
selected,
|
||||
h.Attribute("hx-swap", "none"),
|
||||
h.If(!selected, h.PostPartialOnClickQs(StorySidebar, h.NewQs("category", category.Path))),
|
||||
h.If(
|
||||
!selected,
|
||||
h.PostPartialOnClickQs(
|
||||
StorySidebar,
|
||||
h.NewQs("category", category.Path),
|
||||
),
|
||||
),
|
||||
)
|
||||
}
|
||||
|
||||
|
|
@ -129,7 +143,7 @@ var CachedStoryList = h.CachedPerKeyT4(time.Minute*5, func(category string, page
|
|||
h.Class("block p-2 bg-white rounded-md shadow cursor-pointer"),
|
||||
h.Div(
|
||||
h.Class("font-bold"),
|
||||
h.UnsafeRaw(item.Title),
|
||||
h.UnsafeRaw(sanitize.Sanitize(item.Title)),
|
||||
),
|
||||
h.Div(
|
||||
h.Class("text-sm text-gray-600"),
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ import (
|
|||
"fmt"
|
||||
"github.com/maddalax/htmgo/framework/h"
|
||||
"hackernews/internal/news"
|
||||
"hackernews/internal/sanitize"
|
||||
"hackernews/internal/timeformat"
|
||||
"time"
|
||||
)
|
||||
|
|
@ -57,7 +58,7 @@ func StoryBody(story *news.Story) *h.Element {
|
|||
h.Class("prose prose-2xl border-b border-gray-200 pb-3 max-w-none w-full"),
|
||||
h.H5(
|
||||
h.Class("flex gap-2 items-left font-bold"),
|
||||
h.UnsafeRaw(story.Title),
|
||||
h.UnsafeRaw(sanitize.Sanitize(story.Title)),
|
||||
),
|
||||
h.A(
|
||||
h.Href(story.Url),
|
||||
|
|
@ -66,7 +67,7 @@ func StoryBody(story *news.Story) *h.Element {
|
|||
),
|
||||
h.Div(
|
||||
h.Class("text-sm text-gray-600"),
|
||||
h.UnsafeRaw(story.Text),
|
||||
h.UnsafeRaw(sanitize.Sanitize(story.Text)),
|
||||
),
|
||||
h.Div(
|
||||
h.Class("text-sm text-gray-600 mt-2"),
|
||||
|
|
|
|||
6
examples/minimal-htmgo/.gitignore
vendored
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
/assets/dist
|
||||
tmp
|
||||
node_modules
|
||||
.idea
|
||||
__htmgo
|
||||
dist
|
||||
8
examples/minimal-htmgo/README.md
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
Minimal example that just uses htmgo for html rendering / js support and nothing else.
|
||||
|
||||
Removes automatic support for:
|
||||
|
||||
1. live reloading
|
||||
2. tailwind recompilation
|
||||
3. page/partial route registration
|
||||
4. Single binary (since /public/ assets is required to be there), normally htmgo uses the embedded file system in other examples such as https://github.com/maddalax/htmgo/blob/master/templates/starter/assets_prod.go
|
||||
10
examples/minimal-htmgo/go.mod
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
module minimal-htmgo
|
||||
|
||||
go 1.23.0
|
||||
|
||||
require (
|
||||
github.com/go-chi/chi/v5 v5.1.0
|
||||
github.com/maddalax/htmgo/framework v1.0.7-0.20250703190716-06f01b3d7c1b
|
||||
)
|
||||
|
||||
require github.com/google/uuid v1.6.0 // indirect
|
||||
16
examples/minimal-htmgo/go.sum
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/go-chi/chi/v5 v5.1.0 h1:acVI1TYaD+hhedDJ3r54HyA6sExp3HfXq7QWEEY/xMw=
|
||||
github.com/go-chi/chi/v5 v5.1.0/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
|
||||
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
||||
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||
github.com/maddalax/htmgo/framework v1.0.7-0.20250703190716-06f01b3d7c1b h1:m+xI+HBEQdie/Rs+mYI0HTFTMlYQSCv0l/siPDoywA4=
|
||||
github.com/maddalax/htmgo/framework v1.0.7-0.20250703190716-06f01b3d7c1b/go.mod h1:NGGzWVXWksrQJ9kV9SGa/A1F1Bjsgc08cN7ZVb98RqY=
|
||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
|
||||
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
||||
golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
|
||||
golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
|
||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
44
examples/minimal-htmgo/index.go
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"github.com/maddalax/htmgo/framework/h"
|
||||
"github.com/maddalax/htmgo/framework/js"
|
||||
"time"
|
||||
)
|
||||
|
||||
func Index(ctx *h.RequestContext) *h.Page {
|
||||
return h.NewPage(
|
||||
h.Html(
|
||||
h.HxExtensions(
|
||||
h.BaseExtensions(),
|
||||
),
|
||||
h.Head(
|
||||
h.Meta("viewport", "width=device-width, initial-scale=1"),
|
||||
h.Script("/public/htmgo.js"),
|
||||
),
|
||||
h.Body(
|
||||
h.Pf("hello htmgo"),
|
||||
h.Div(
|
||||
h.Get("/current-time", "load, every 1s"),
|
||||
),
|
||||
h.Div(
|
||||
h.Button(
|
||||
h.Text("Click me"),
|
||||
h.OnClick(
|
||||
js.EvalJs(`
|
||||
console.log("you evalulated javascript");
|
||||
alert("you clicked me");
|
||||
`),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
)
|
||||
}
|
||||
|
||||
func CurrentTime(ctx *h.RequestContext) *h.Partial {
|
||||
return h.NewPartial(
|
||||
h.Pf("It is %s", time.Now().String()),
|
||||
)
|
||||
}
|
||||
23
examples/minimal-htmgo/main.go
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"github.com/go-chi/chi/v5"
|
||||
"net/http"
|
||||
)
|
||||
|
||||
func main() {
|
||||
router := chi.NewRouter()
|
||||
|
||||
fileServer := http.StripPrefix("/public", http.FileServer(http.Dir("./public")))
|
||||
router.Handle("/public/*", fileServer)
|
||||
|
||||
router.Get("/", func(writer http.ResponseWriter, request *http.Request) {
|
||||
RenderPage(request, writer, Index)
|
||||
})
|
||||
|
||||
router.Get("/current-time", func(writer http.ResponseWriter, request *http.Request) {
|
||||
RenderPartial(request, writer, CurrentTime)
|
||||
})
|
||||
|
||||
http.ListenAndServe(":3000", router)
|
||||
}
|
||||
1
examples/minimal-htmgo/public/htmgo.js
Normal file
26
examples/minimal-htmgo/render.go
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"github.com/maddalax/htmgo/framework/h"
|
||||
"net/http"
|
||||
)
|
||||
|
||||
func RenderToString(element *h.Element) string {
|
||||
return h.Render(element)
|
||||
}
|
||||
|
||||
func RenderPage(req *http.Request, w http.ResponseWriter, page func(ctx *h.RequestContext) *h.Page) {
|
||||
ctx := h.RequestContext{
|
||||
Request: req,
|
||||
Response: w,
|
||||
}
|
||||
h.HtmlView(w, page(&ctx))
|
||||
}
|
||||
|
||||
func RenderPartial(req *http.Request, w http.ResponseWriter, partial func(ctx *h.RequestContext) *h.Partial) {
|
||||
ctx := h.RequestContext{
|
||||
Request: req,
|
||||
Response: w,
|
||||
}
|
||||
h.PartialView(w, partial(&ctx))
|
||||
}
|
||||
11
examples/simple-auth/.dockerignore
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
# Project exclude paths
|
||||
/tmp/
|
||||
node_modules/
|
||||
dist/
|
||||
js/dist
|
||||
js/node_modules
|
||||
go.work
|
||||
go.work.sum
|
||||
.idea
|
||||
!framework/assets/dist
|
||||
__htmgo
|
||||
6
examples/simple-auth/.gitignore
vendored
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
/assets/dist
|
||||
tmp
|
||||
node_modules
|
||||
.idea
|
||||
__htmgo
|
||||
dist
|
||||
36
examples/simple-auth/Dockerfile
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
# Stage 1: Build the Go binary
|
||||
FROM golang:1.23 AS builder
|
||||
|
||||
# Set the working directory inside the container
|
||||
WORKDIR /app
|
||||
|
||||
# Copy go.mod and go.sum files
|
||||
COPY go.mod go.sum ./
|
||||
|
||||
# Download and cache the Go modules
|
||||
RUN go mod download
|
||||
|
||||
# Copy the source code into the container
|
||||
COPY . .
|
||||
|
||||
# Build the Go binary for Linux
|
||||
RUN CGO_ENABLED=0 GOPRIVATE=github.com/maddalax LOG_LEVEL=debug go run github.com/maddalax/htmgo/cli/htmgo@latest build
|
||||
|
||||
RUN CGO_ENABLED=1 GOOS=linux go build -tags prod -o ./dist -a -ldflags '-linkmode external -extldflags "-static"' .
|
||||
|
||||
|
||||
# Stage 2: Create the smallest possible image
|
||||
FROM gcr.io/distroless/base-debian11
|
||||
|
||||
# Set the working directory inside the container
|
||||
WORKDIR /app
|
||||
|
||||
# Copy the Go binary from the builder stage
|
||||
COPY --from=builder /app/dist .
|
||||
|
||||
# Expose the necessary port (replace with your server port)
|
||||
EXPOSE 3000
|
||||
|
||||
|
||||
# Command to run the binary
|
||||
CMD ["./simpleauth"]
|
||||
20
examples/simple-auth/Taskfile.yml
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
version: '3'
|
||||
|
||||
tasks:
|
||||
run:
|
||||
cmds:
|
||||
- htmgo run
|
||||
silent: true
|
||||
|
||||
build:
|
||||
cmds:
|
||||
- htmgo build
|
||||
|
||||
docker:
|
||||
cmds:
|
||||
- docker build .
|
||||
|
||||
watch:
|
||||
cmds:
|
||||
- htmgo watch
|
||||
silent: true
|
||||
13
examples/simple-auth/assets.go
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
//go:build !prod
|
||||
// +build !prod
|
||||
|
||||
package main
|
||||
|
||||
import (
|
||||
"io/fs"
|
||||
"simpleauth/internal/embedded"
|
||||
)
|
||||
|
||||
func GetStaticAssets() fs.FS {
|
||||
return embedded.NewOsFs()
|
||||
}
|
||||
3
examples/simple-auth/assets/css/input.css
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
@tailwind base;
|
||||
@tailwind components;
|
||||
@tailwind utilities;
|
||||
BIN
examples/simple-auth/assets/public/apple-touch-icon.png
Normal file
|
After Width: | Height: | Size: 3.3 KiB |
BIN
examples/simple-auth/assets/public/favicon.ico
Normal file
|
After Width: | Height: | Size: 5.1 KiB |
|
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 3.6 KiB |
|
Before Width: | Height: | Size: 6.9 KiB After Width: | Height: | Size: 6.9 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 23 KiB |
16
examples/simple-auth/assets_prod.go
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
//go:build prod
|
||||
// +build prod
|
||||
|
||||
package main
|
||||
|
||||
import (
|
||||
"embed"
|
||||
"io/fs"
|
||||
)
|
||||
|
||||
//go:embed assets/dist/*
|
||||
var staticAssets embed.FS
|
||||
|
||||
func GetStaticAssets() fs.FS {
|
||||
return staticAssets
|
||||
}
|
||||
14
examples/simple-auth/go.mod
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
module simpleauth
|
||||
|
||||
go 1.23.0
|
||||
|
||||
require (
|
||||
github.com/maddalax/htmgo/framework v1.0.7-0.20250703190716-06f01b3d7c1b
|
||||
github.com/mattn/go-sqlite3 v1.14.24
|
||||
golang.org/x/crypto v0.28.0
|
||||
)
|
||||
|
||||
require (
|
||||
github.com/go-chi/chi/v5 v5.1.0 // indirect
|
||||
github.com/google/uuid v1.6.0 // indirect
|
||||
)
|
||||
20
examples/simple-auth/go.sum
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/go-chi/chi/v5 v5.1.0 h1:acVI1TYaD+hhedDJ3r54HyA6sExp3HfXq7QWEEY/xMw=
|
||||
github.com/go-chi/chi/v5 v5.1.0/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
|
||||
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
||||
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||
github.com/maddalax/htmgo/framework v1.0.7-0.20250703190716-06f01b3d7c1b h1:m+xI+HBEQdie/Rs+mYI0HTFTMlYQSCv0l/siPDoywA4=
|
||||
github.com/maddalax/htmgo/framework v1.0.7-0.20250703190716-06f01b3d7c1b/go.mod h1:NGGzWVXWksrQJ9kV9SGa/A1F1Bjsgc08cN7ZVb98RqY=
|
||||
github.com/mattn/go-sqlite3 v1.14.24 h1:tpSp2G2KyMnnQu99ngJ47EIkWVmliIizyZBfPrBWDRM=
|
||||
github.com/mattn/go-sqlite3 v1.14.24/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
|
||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
|
||||
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
||||
golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw=
|
||||
golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=
|
||||
golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
|
||||
golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
|
||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
10
examples/simple-auth/htmgo.yml
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
# htmgo configuration
|
||||
|
||||
# if tailwindcss is enabled, htmgo will automatically compile your tailwind and output it to assets/dist
|
||||
tailwind: true
|
||||
|
||||
# which directories to ignore when watching for changes, supports glob patterns through https://github.com/bmatcuk/doublestar
|
||||
watch_ignore: [".git", "node_modules", "dist/*"]
|
||||
|
||||
# files to watch for changes, supports glob patterns through https://github.com/bmatcuk/doublestar
|
||||
watch_files: ["**/*.go", "**/*.css", "**/*.md"]
|
||||
31
examples/simple-auth/internal/db/db.go
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
// Code generated by sqlc. DO NOT EDIT.
|
||||
// versions:
|
||||
// sqlc v1.27.0
|
||||
|
||||
package db
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
)
|
||||
|
||||
type DBTX interface {
|
||||
ExecContext(context.Context, string, ...interface{}) (sql.Result, error)
|
||||
PrepareContext(context.Context, string) (*sql.Stmt, error)
|
||||
QueryContext(context.Context, string, ...interface{}) (*sql.Rows, error)
|
||||
QueryRowContext(context.Context, string, ...interface{}) *sql.Row
|
||||
}
|
||||
|
||||
func New(db DBTX) *Queries {
|
||||
return &Queries{db: db}
|
||||
}
|
||||
|
||||
type Queries struct {
|
||||
db DBTX
|
||||
}
|
||||
|
||||
func (q *Queries) WithTx(tx *sql.Tx) *Queries {
|
||||
return &Queries{
|
||||
db: tx,
|
||||
}
|
||||
}
|
||||
26
examples/simple-auth/internal/db/models.go
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
// Code generated by sqlc. DO NOT EDIT.
|
||||
// versions:
|
||||
// sqlc v1.27.0
|
||||
|
||||
package db
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
)
|
||||
|
||||
type Session struct {
|
||||
ID int64
|
||||
UserID int64
|
||||
SessionID string
|
||||
CreatedAt sql.NullString
|
||||
ExpiresAt string
|
||||
}
|
||||
|
||||
type User struct {
|
||||
ID int64
|
||||
Email string
|
||||
Password string
|
||||
Metadata interface{}
|
||||
CreatedAt sql.NullString
|
||||
UpdatedAt sql.NullString
|
||||
}
|
||||
25
examples/simple-auth/internal/db/provider.go
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
package db
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
_ "embed"
|
||||
_ "github.com/mattn/go-sqlite3"
|
||||
)
|
||||
|
||||
//go:embed schema.sql
|
||||
var ddl string
|
||||
|
||||
func Provide() *Queries {
|
||||
db, err := sql.Open("sqlite3", "file:htmgo-user-example.db?cache=shared&_fk=1")
|
||||
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
if _, err := db.ExecContext(context.Background(), ddl); err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
return New(db)
|
||||
}
|
||||
31
examples/simple-auth/internal/db/queries.sql
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
-- Queries for User Management
|
||||
|
||||
-- name: CreateUser :one
|
||||
INSERT INTO user (email, password, metadata)
|
||||
VALUES (?, ?, ?)
|
||||
RETURNING id;
|
||||
|
||||
-- name: CreateSession :exec
|
||||
INSERT INTO sessions (user_id, session_id, expires_at)
|
||||
VALUES (?, ?, ?);
|
||||
|
||||
-- name: GetUserByToken :one
|
||||
SELECT u.*
|
||||
FROM user u
|
||||
JOIN sessions t ON u.id = t.user_id
|
||||
WHERE t.session_id = ?
|
||||
AND t.expires_at > datetime('now');
|
||||
|
||||
-- name: GetUserByID :one
|
||||
SELECT *
|
||||
FROM user
|
||||
WHERE id = ?;
|
||||
|
||||
|
||||
-- name: GetUserByEmail :one
|
||||
SELECT *
|
||||
FROM user
|
||||
WHERE email = ?;
|
||||
|
||||
-- name: UpdateUserMetadata :exec
|
||||
UPDATE user SET metadata = json_patch(COALESCE(metadata, '{}'), ?) WHERE id = ?;
|
||||
123
examples/simple-auth/internal/db/queries.sql.go
Normal file
|
|
@ -0,0 +1,123 @@
|
|||
// Code generated by sqlc. DO NOT EDIT.
|
||||
// versions:
|
||||
// sqlc v1.27.0
|
||||
// source: queries.sql
|
||||
|
||||
package db
|
||||
|
||||
import (
|
||||
"context"
|
||||
)
|
||||
|
||||
const createSession = `-- name: CreateSession :exec
|
||||
INSERT INTO sessions (user_id, session_id, expires_at)
|
||||
VALUES (?, ?, ?)
|
||||
`
|
||||
|
||||
type CreateSessionParams struct {
|
||||
UserID int64
|
||||
SessionID string
|
||||
ExpiresAt string
|
||||
}
|
||||
|
||||
func (q *Queries) CreateSession(ctx context.Context, arg CreateSessionParams) error {
|
||||
_, err := q.db.ExecContext(ctx, createSession, arg.UserID, arg.SessionID, arg.ExpiresAt)
|
||||
return err
|
||||
}
|
||||
|
||||
const createUser = `-- name: CreateUser :one
|
||||
|
||||
INSERT INTO user (email, password, metadata)
|
||||
VALUES (?, ?, ?)
|
||||
RETURNING id
|
||||
`
|
||||
|
||||
type CreateUserParams struct {
|
||||
Email string
|
||||
Password string
|
||||
Metadata interface{}
|
||||
}
|
||||
|
||||
// Queries for User Management
|
||||
func (q *Queries) CreateUser(ctx context.Context, arg CreateUserParams) (int64, error) {
|
||||
row := q.db.QueryRowContext(ctx, createUser, arg.Email, arg.Password, arg.Metadata)
|
||||
var id int64
|
||||
err := row.Scan(&id)
|
||||
return id, err
|
||||
}
|
||||
|
||||
const getUserByEmail = `-- name: GetUserByEmail :one
|
||||
SELECT id, email, password, metadata, created_at, updated_at
|
||||
FROM user
|
||||
WHERE email = ?
|
||||
`
|
||||
|
||||
func (q *Queries) GetUserByEmail(ctx context.Context, email string) (User, error) {
|
||||
row := q.db.QueryRowContext(ctx, getUserByEmail, email)
|
||||
var i User
|
||||
err := row.Scan(
|
||||
&i.ID,
|
||||
&i.Email,
|
||||
&i.Password,
|
||||
&i.Metadata,
|
||||
&i.CreatedAt,
|
||||
&i.UpdatedAt,
|
||||
)
|
||||
return i, err
|
||||
}
|
||||
|
||||
const getUserByID = `-- name: GetUserByID :one
|
||||
SELECT id, email, password, metadata, created_at, updated_at
|
||||
FROM user
|
||||
WHERE id = ?
|
||||
`
|
||||
|
||||
func (q *Queries) GetUserByID(ctx context.Context, id int64) (User, error) {
|
||||
row := q.db.QueryRowContext(ctx, getUserByID, id)
|
||||
var i User
|
||||
err := row.Scan(
|
||||
&i.ID,
|
||||
&i.Email,
|
||||
&i.Password,
|
||||
&i.Metadata,
|
||||
&i.CreatedAt,
|
||||
&i.UpdatedAt,
|
||||
)
|
||||
return i, err
|
||||
}
|
||||
|
||||
const getUserByToken = `-- name: GetUserByToken :one
|
||||
SELECT u.id, u.email, u.password, u.metadata, u.created_at, u.updated_at
|
||||
FROM user u
|
||||
JOIN sessions t ON u.id = t.user_id
|
||||
WHERE t.session_id = ?
|
||||
AND t.expires_at > datetime('now')
|
||||
`
|
||||
|
||||
func (q *Queries) GetUserByToken(ctx context.Context, sessionID string) (User, error) {
|
||||
row := q.db.QueryRowContext(ctx, getUserByToken, sessionID)
|
||||
var i User
|
||||
err := row.Scan(
|
||||
&i.ID,
|
||||
&i.Email,
|
||||
&i.Password,
|
||||
&i.Metadata,
|
||||
&i.CreatedAt,
|
||||
&i.UpdatedAt,
|
||||
)
|
||||
return i, err
|
||||
}
|
||||
|
||||
const updateUserMetadata = `-- name: UpdateUserMetadata :exec
|
||||
UPDATE user SET metadata = json_patch(COALESCE(metadata, '{}'), ?) WHERE id = ?
|
||||
`
|
||||
|
||||
type UpdateUserMetadataParams struct {
|
||||
JsonPatch interface{}
|
||||
ID int64
|
||||
}
|
||||
|
||||
func (q *Queries) UpdateUserMetadata(ctx context.Context, arg UpdateUserMetadataParams) error {
|
||||
_, err := q.db.ExecContext(ctx, updateUserMetadata, arg.JsonPatch, arg.ID)
|
||||
return err
|
||||
}
|
||||
28
examples/simple-auth/internal/db/schema.sql
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
-- SQLite schema for User Management
|
||||
|
||||
-- User table
|
||||
CREATE TABLE IF NOT EXISTS user
|
||||
(
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
email TEXT NOT NULL UNIQUE,
|
||||
password TEXT NOT NULL,
|
||||
metadata JSON DEFAULT '{}',
|
||||
created_at TEXT DEFAULT (datetime('now')),
|
||||
updated_at TEXT DEFAULT (datetime('now'))
|
||||
);
|
||||
|
||||
-- Auth Token table
|
||||
CREATE TABLE IF NOT EXISTS sessions
|
||||
(
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
user_id INTEGER NOT NULL,
|
||||
session_id TEXT NOT NULL UNIQUE,
|
||||
created_at TEXT DEFAULT (datetime('now')),
|
||||
expires_at TEXT NOT NULL,
|
||||
FOREIGN KEY (user_id) REFERENCES user (id) ON DELETE CASCADE
|
||||
);
|
||||
|
||||
-- Indexes to improve query performance
|
||||
CREATE INDEX IF NOT EXISTS idx_user_email ON user (email);
|
||||
CREATE INDEX IF NOT EXISTS idx_session_id ON sessions (session_id);
|
||||
CREATE INDEX IF NOT EXISTS idx_auth_sessions_user_id ON sessions (user_id);
|
||||
17
examples/simple-auth/internal/embedded/os.go
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
package embedded
|
||||
|
||||
import (
|
||||
"io/fs"
|
||||
"os"
|
||||
)
|
||||
|
||||
type OsFs struct {
|
||||
}
|
||||
|
||||
func (receiver OsFs) Open(name string) (fs.File, error) {
|
||||
return os.Open(name)
|
||||
}
|
||||
|
||||
func NewOsFs() OsFs {
|
||||
return OsFs{}
|
||||
}
|
||||
115
examples/simple-auth/internal/user/handler.go
Normal file
|
|
@ -0,0 +1,115 @@
|
|||
package user
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"github.com/maddalax/htmgo/framework/h"
|
||||
"github.com/maddalax/htmgo/framework/service"
|
||||
"simpleauth/internal/db"
|
||||
)
|
||||
|
||||
type CreateUserRequest struct {
|
||||
Email string
|
||||
Password string
|
||||
}
|
||||
|
||||
type LoginUserRequest struct {
|
||||
Email string
|
||||
Password string
|
||||
}
|
||||
|
||||
type CreatedUser struct {
|
||||
Id string
|
||||
Email string
|
||||
}
|
||||
|
||||
func Create(ctx *h.RequestContext, request CreateUserRequest) (int64, error) {
|
||||
if len(request.Password) < 6 {
|
||||
return 0, errors.New("password must be at least 6 characters long")
|
||||
}
|
||||
|
||||
queries := service.Get[db.Queries](ctx.ServiceLocator())
|
||||
|
||||
hashedPassword, err := HashPassword(request.Password)
|
||||
|
||||
if err != nil {
|
||||
return 0, errors.New("something went wrong")
|
||||
}
|
||||
|
||||
id, err := queries.CreateUser(context.Background(), db.CreateUserParams{
|
||||
Email: request.Email,
|
||||
Password: hashedPassword,
|
||||
})
|
||||
|
||||
if err != nil {
|
||||
|
||||
if err.Error() == "UNIQUE constraint failed: user.email" {
|
||||
return 0, errors.New("email already exists")
|
||||
}
|
||||
|
||||
return 0, err
|
||||
}
|
||||
|
||||
return id, nil
|
||||
}
|
||||
|
||||
func Login(ctx *h.RequestContext, request LoginUserRequest) (int64, error) {
|
||||
|
||||
queries := service.Get[db.Queries](ctx.ServiceLocator())
|
||||
|
||||
user, err := queries.GetUserByEmail(context.Background(), request.Email)
|
||||
|
||||
if err != nil {
|
||||
fmt.Printf("error: %s\n", err.Error())
|
||||
return 0, errors.New("email or password is incorrect")
|
||||
}
|
||||
|
||||
if !PasswordMatches(request.Password, user.Password) {
|
||||
return 0, errors.New("email or password is incorrect")
|
||||
}
|
||||
|
||||
session, err := CreateSession(ctx, user.ID)
|
||||
|
||||
if err != nil {
|
||||
return 0, errors.New("something went wrong")
|
||||
}
|
||||
|
||||
WriteSessionCookie(ctx, session)
|
||||
|
||||
return user.ID, nil
|
||||
}
|
||||
|
||||
func ParseMeta(meta any) map[string]interface{} {
|
||||
if meta == nil {
|
||||
return map[string]interface{}{}
|
||||
}
|
||||
if m, ok := meta.(string); ok {
|
||||
var dest map[string]interface{}
|
||||
json.Unmarshal([]byte(m), &dest)
|
||||
return dest
|
||||
}
|
||||
return meta.(map[string]interface{})
|
||||
}
|
||||
|
||||
func GetMetaKey(meta map[string]interface{}, key string) string {
|
||||
if val, ok := meta[key]; ok {
|
||||
return val.(string)
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func SetMeta(ctx *h.RequestContext, userId int64, meta map[string]interface{}) error {
|
||||
queries := service.Get[db.Queries](ctx.ServiceLocator())
|
||||
serialized, _ := json.Marshal(meta)
|
||||
fmt.Printf("serialized: %s\n", string(serialized))
|
||||
err := queries.UpdateUserMetadata(context.Background(), db.UpdateUserMetadataParams{
|
||||
JsonPatch: serialized,
|
||||
ID: userId,
|
||||
})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
17
examples/simple-auth/internal/user/http.go
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
package user
|
||||
|
||||
import (
|
||||
"github.com/maddalax/htmgo/framework/h"
|
||||
"simpleauth/internal/db"
|
||||
)
|
||||
|
||||
func GetUserOrRedirect(ctx *h.RequestContext) (db.User, bool) {
|
||||
user, err := GetUserFromSession(ctx)
|
||||
|
||||
if err != nil {
|
||||
ctx.Redirect("/login", 302)
|
||||
return db.User{}, false
|
||||
}
|
||||
|
||||
return user, true
|
||||
}
|
||||
18
examples/simple-auth/internal/user/password.go
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
package user
|
||||
|
||||
import (
|
||||
"golang.org/x/crypto/bcrypt"
|
||||
)
|
||||
|
||||
func HashPassword(password string) (string, error) {
|
||||
hashedPassword, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
return string(hashedPassword), nil
|
||||
}
|
||||
|
||||
func PasswordMatches(password string, hashedPassword string) bool {
|
||||
err := bcrypt.CompareHashAndPassword([]byte(hashedPassword), []byte(password))
|
||||
return err == nil
|
||||
}
|
||||
83
examples/simple-auth/internal/user/session.go
Normal file
|
|
@ -0,0 +1,83 @@
|
|||
package user
|
||||
|
||||
import (
|
||||
"context"
|
||||
"crypto/rand"
|
||||
"encoding/hex"
|
||||
"github.com/maddalax/htmgo/framework/h"
|
||||
"github.com/maddalax/htmgo/framework/service"
|
||||
"net/http"
|
||||
"simpleauth/internal/db"
|
||||
"time"
|
||||
)
|
||||
|
||||
type CreatedSession struct {
|
||||
Id string
|
||||
Expiration time.Time
|
||||
UserId int64
|
||||
}
|
||||
|
||||
func CreateSession(ctx *h.RequestContext, userId int64) (CreatedSession, error) {
|
||||
sessionId, err := GenerateSessionID()
|
||||
|
||||
if err != nil {
|
||||
return CreatedSession{}, err
|
||||
}
|
||||
|
||||
// create a session in the database
|
||||
queries := service.Get[db.Queries](ctx.ServiceLocator())
|
||||
|
||||
created := CreatedSession{
|
||||
Id: sessionId,
|
||||
Expiration: time.Now().Add(time.Hour * 24),
|
||||
UserId: userId,
|
||||
}
|
||||
|
||||
err = queries.CreateSession(context.Background(), db.CreateSessionParams{
|
||||
UserID: created.UserId,
|
||||
SessionID: created.Id,
|
||||
ExpiresAt: created.Expiration.Format(time.RFC3339),
|
||||
})
|
||||
|
||||
if err != nil {
|
||||
return CreatedSession{}, err
|
||||
}
|
||||
|
||||
return created, nil
|
||||
}
|
||||
|
||||
func GetUserFromSession(ctx *h.RequestContext) (db.User, error) {
|
||||
cookie, err := ctx.Request.Cookie("session_id")
|
||||
if err != nil {
|
||||
return db.User{}, err
|
||||
}
|
||||
queries := service.Get[db.Queries](ctx.ServiceLocator())
|
||||
user, err := queries.GetUserByToken(context.Background(), cookie.Value)
|
||||
if err != nil {
|
||||
return db.User{}, err
|
||||
}
|
||||
return user, nil
|
||||
}
|
||||
|
||||
func WriteSessionCookie(ctx *h.RequestContext, session CreatedSession) {
|
||||
cookie := http.Cookie{
|
||||
Name: "session_id",
|
||||
Value: session.Id,
|
||||
HttpOnly: true,
|
||||
SameSite: http.SameSiteStrictMode,
|
||||
Expires: session.Expiration,
|
||||
Path: "/",
|
||||
}
|
||||
ctx.SetCookie(&cookie)
|
||||
}
|
||||
|
||||
func GenerateSessionID() (string, error) {
|
||||
// Create a byte slice for storing the random bytes
|
||||
bytes := make([]byte, 32) // 32 bytes = 256 bits, which is a secure length
|
||||
// Read random bytes from crypto/rand
|
||||
if _, err := rand.Read(bytes); err != nil {
|
||||
return "", err
|
||||
}
|
||||
// Encode to hexadecimal to get a string representation
|
||||
return hex.EncodeToString(bytes), nil
|
||||
}
|
||||
35
examples/simple-auth/main.go
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"github.com/maddalax/htmgo/framework/h"
|
||||
"github.com/maddalax/htmgo/framework/service"
|
||||
"io/fs"
|
||||
"net/http"
|
||||
"simpleauth/__htmgo"
|
||||
"simpleauth/internal/db"
|
||||
)
|
||||
|
||||
func main() {
|
||||
locator := service.NewLocator()
|
||||
|
||||
service.Set(locator, service.Singleton, func() *db.Queries {
|
||||
return db.Provide()
|
||||
})
|
||||
|
||||
h.Start(h.AppOpts{
|
||||
ServiceLocator: locator,
|
||||
LiveReload: true,
|
||||
Register: func(app *h.App) {
|
||||
sub, err := fs.Sub(GetStaticAssets(), "assets/dist")
|
||||
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
http.FileServerFS(sub)
|
||||
|
||||
app.Router.Handle("/public/*", http.StripPrefix("/public", http.FileServerFS(sub)))
|
||||
__htmgo.Register(app.Router)
|
||||
},
|
||||
})
|
||||
}
|
||||
72
examples/simple-auth/pages/index.go
Normal file
|
|
@ -0,0 +1,72 @@
|
|||
package pages
|
||||
|
||||
import (
|
||||
"github.com/maddalax/htmgo/framework/h"
|
||||
"simpleauth/internal/db"
|
||||
"simpleauth/internal/user"
|
||||
"simpleauth/partials"
|
||||
"simpleauth/ui"
|
||||
)
|
||||
|
||||
func IndexPage(ctx *h.RequestContext) *h.Page {
|
||||
u, ok := user.GetUserOrRedirect(ctx)
|
||||
if !ok {
|
||||
return nil
|
||||
}
|
||||
return h.NewPage(
|
||||
RootPage(UserProfilePage(u)),
|
||||
)
|
||||
}
|
||||
|
||||
func UserProfilePage(u db.User) *h.Element {
|
||||
|
||||
meta := user.ParseMeta(u.Metadata)
|
||||
|
||||
return h.Div(
|
||||
h.Class("flex flex-col gap-6 items-center pt-10 min-h-screen bg-neutral-100"),
|
||||
h.H3F(
|
||||
"User Profile",
|
||||
h.Class("text-2xl font-bold"),
|
||||
),
|
||||
h.Pf("Welcome, %s!", u.Email),
|
||||
h.Form(
|
||||
h.Attribute("hx-swap", "none"),
|
||||
h.PostPartial(partials.UpdateProfile),
|
||||
h.TriggerChildren(),
|
||||
h.Class("flex flex-col gap-4 w-full max-w-md p-6 bg-white rounded-md shadow-md"),
|
||||
ui.Input(ui.InputProps{
|
||||
Id: "email",
|
||||
Name: "email",
|
||||
Label: "Email Address",
|
||||
Type: "email",
|
||||
DefaultValue: u.Email,
|
||||
Children: []h.Ren{
|
||||
h.Disabled(),
|
||||
},
|
||||
}),
|
||||
ui.Input(ui.InputProps{
|
||||
Name: "birth-date",
|
||||
Label: "Birth Date",
|
||||
DefaultValue: user.GetMetaKey(meta, "birthDate"),
|
||||
Type: "date",
|
||||
}),
|
||||
ui.Input(ui.InputProps{
|
||||
Name: "favorite-color",
|
||||
Label: "Favorite Color",
|
||||
DefaultValue: user.GetMetaKey(meta, "favoriteColor"),
|
||||
}),
|
||||
ui.Input(ui.InputProps{
|
||||
Name: "occupation",
|
||||
Label: "Occupation",
|
||||
DefaultValue: user.GetMetaKey(meta, "occupation"),
|
||||
}),
|
||||
ui.FormError(""),
|
||||
ui.SubmitButton("Save Changes"),
|
||||
),
|
||||
h.A(
|
||||
h.Text("Log out"),
|
||||
h.Href("/logout"),
|
||||
h.Class("text-blue-400"),
|
||||
),
|
||||
)
|
||||
}
|
||||
49
examples/simple-auth/pages/login.go
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
package pages
|
||||
|
||||
import (
|
||||
"github.com/maddalax/htmgo/framework/h"
|
||||
"simpleauth/partials"
|
||||
"simpleauth/ui"
|
||||
)
|
||||
|
||||
func Login(ctx *h.RequestContext) *h.Page {
|
||||
return h.NewPage(
|
||||
RootPage(
|
||||
ui.CenteredForm(ui.CenteredFormProps{
|
||||
Title: "Sign In",
|
||||
SubmitText: "Sign In",
|
||||
PostUrl: h.GetPartialPath(partials.LoginUser),
|
||||
Children: []h.Ren{
|
||||
ui.Input(ui.InputProps{
|
||||
Id: "username",
|
||||
Name: "email",
|
||||
Label: "Email Address",
|
||||
Type: "email",
|
||||
Required: true,
|
||||
Children: []h.Ren{
|
||||
h.Attribute("autocomplete", "off"),
|
||||
h.MaxLength(50),
|
||||
},
|
||||
}),
|
||||
|
||||
ui.Input(ui.InputProps{
|
||||
Id: "password",
|
||||
Name: "password",
|
||||
Label: "Password",
|
||||
Type: "password",
|
||||
Required: true,
|
||||
Children: []h.Ren{
|
||||
h.MinLength(6),
|
||||
},
|
||||
}),
|
||||
|
||||
h.A(
|
||||
h.Href("/register"),
|
||||
h.Text("Don't have an account? Register here"),
|
||||
h.Class("text-blue-500"),
|
||||
),
|
||||
},
|
||||
}),
|
||||
),
|
||||
)
|
||||
}
|
||||
23
examples/simple-auth/pages/logout.go
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
package pages
|
||||
|
||||
import "github.com/maddalax/htmgo/framework/h"
|
||||
|
||||
func LogoutPage(ctx *h.RequestContext) *h.Page {
|
||||
|
||||
// clear the session cookie
|
||||
ctx.Response.Header().Set(
|
||||
"Set-Cookie",
|
||||
"session_id=; Path=/; Max-Age=0",
|
||||
)
|
||||
|
||||
ctx.Response.Header().Set(
|
||||
"Location",
|
||||
"/login",
|
||||
)
|
||||
|
||||
ctx.Response.WriteHeader(
|
||||
302,
|
||||
)
|
||||
|
||||
return nil
|
||||
}
|
||||
49
examples/simple-auth/pages/register.go
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
package pages
|
||||
|
||||
import (
|
||||
"github.com/maddalax/htmgo/framework/h"
|
||||
"simpleauth/partials"
|
||||
"simpleauth/ui"
|
||||
)
|
||||
|
||||
func Register(ctx *h.RequestContext) *h.Page {
|
||||
return h.NewPage(
|
||||
RootPage(
|
||||
ui.CenteredForm(ui.CenteredFormProps{
|
||||
PostUrl: h.GetPartialPath(partials.RegisterUser),
|
||||
Title: "Create an Account",
|
||||
SubmitText: "Register",
|
||||
Children: []h.Ren{
|
||||
ui.Input(ui.InputProps{
|
||||
Id: "username",
|
||||
Name: "email",
|
||||
Label: "Email Address",
|
||||
Type: "email",
|
||||
Required: true,
|
||||
Children: []h.Ren{
|
||||
h.Attribute("autocomplete", "off"),
|
||||
h.MaxLength(50),
|
||||
},
|
||||
}),
|
||||
|
||||
ui.Input(ui.InputProps{
|
||||
Id: "password",
|
||||
Name: "password",
|
||||
Label: "Password",
|
||||
Type: "password",
|
||||
Required: true,
|
||||
Children: []h.Ren{
|
||||
h.MinLength(6),
|
||||
},
|
||||
}),
|
||||
|
||||
h.A(
|
||||
h.Href("/login"),
|
||||
h.Text("Already have an account? Login here"),
|
||||
h.Class("text-blue-500"),
|
||||
),
|
||||
},
|
||||
}),
|
||||
),
|
||||
)
|
||||
}
|
||||
34
examples/simple-auth/pages/root.go
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
package pages
|
||||
|
||||
import (
|
||||
"github.com/maddalax/htmgo/framework/h"
|
||||
)
|
||||
|
||||
func RootPage(children ...h.Ren) h.Ren {
|
||||
return h.Html(
|
||||
h.HxExtensions(
|
||||
h.BaseExtensions(),
|
||||
),
|
||||
h.Head(
|
||||
h.Meta("viewport", "width=device-width, initial-scale=1"),
|
||||
h.Link("/public/favicon.ico", "icon"),
|
||||
h.Link("/public/apple-touch-icon.png", "apple-touch-icon"),
|
||||
h.Meta("title", "htmgo template"),
|
||||
h.Meta("charset", "utf-8"),
|
||||
h.Meta("author", "htmgo"),
|
||||
h.Meta("description", "this is a template"),
|
||||
h.Meta("og:title", "htmgo template"),
|
||||
h.Meta("og:url", "https://htmgo.dev"),
|
||||
h.Link("canonical", "https://htmgo.dev"),
|
||||
h.Meta("og:description", "this is a template"),
|
||||
h.Link("/public/main.css", "stylesheet"),
|
||||
h.Script("/public/htmgo.js"),
|
||||
),
|
||||
h.Body(
|
||||
h.Div(
|
||||
h.Class("flex flex-col gap-2 bg-white h-full"),
|
||||
h.Fragment(children...),
|
||||
),
|
||||
),
|
||||
)
|
||||
}
|
||||
36
examples/simple-auth/partials/profile.go
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
package partials
|
||||
|
||||
import (
|
||||
"github.com/maddalax/htmgo/framework/h"
|
||||
"log/slog"
|
||||
"simpleauth/internal/user"
|
||||
"simpleauth/ui"
|
||||
)
|
||||
|
||||
func UpdateProfile(ctx *h.RequestContext) *h.Partial {
|
||||
if !ctx.IsHttpPost() {
|
||||
return nil
|
||||
}
|
||||
|
||||
patch := map[string]any{
|
||||
"birthDate": ctx.FormValue("birth-date"),
|
||||
"favoriteColor": ctx.FormValue("favorite-color"),
|
||||
"occupation": ctx.FormValue("occupation"),
|
||||
}
|
||||
|
||||
u, ok := user.GetUserOrRedirect(ctx)
|
||||
|
||||
if !ok {
|
||||
return nil
|
||||
}
|
||||
|
||||
err := user.SetMeta(ctx, u.ID, patch)
|
||||
|
||||
if err != nil {
|
||||
slog.Error("failed to update user profile", slog.String("error", err.Error()))
|
||||
ctx.Response.WriteHeader(400)
|
||||
return ui.SwapFormError(ctx, "something went wrong")
|
||||
}
|
||||
|
||||
return h.RedirectPartial("/")
|
||||
}
|
||||
62
examples/simple-auth/partials/user.go
Normal file
|
|
@ -0,0 +1,62 @@
|
|||
package partials
|
||||
|
||||
import (
|
||||
"github.com/maddalax/htmgo/framework/h"
|
||||
"simpleauth/internal/user"
|
||||
"simpleauth/ui"
|
||||
)
|
||||
|
||||
func RegisterUser(ctx *h.RequestContext) *h.Partial {
|
||||
if !ctx.IsHttpPost() {
|
||||
return nil
|
||||
}
|
||||
|
||||
payload := user.CreateUserRequest{
|
||||
Email: ctx.FormValue("email"),
|
||||
Password: ctx.FormValue("password"),
|
||||
}
|
||||
|
||||
id, err := user.Create(
|
||||
ctx,
|
||||
payload,
|
||||
)
|
||||
|
||||
if err != nil {
|
||||
ctx.Response.WriteHeader(400)
|
||||
return ui.SwapFormError(ctx, err.Error())
|
||||
}
|
||||
|
||||
session, err := user.CreateSession(ctx, id)
|
||||
|
||||
if err != nil {
|
||||
ctx.Response.WriteHeader(500)
|
||||
return ui.SwapFormError(ctx, "something went wrong")
|
||||
}
|
||||
|
||||
user.WriteSessionCookie(ctx, session)
|
||||
|
||||
return h.RedirectPartial("/")
|
||||
}
|
||||
|
||||
func LoginUser(ctx *h.RequestContext) *h.Partial {
|
||||
if !ctx.IsHttpPost() {
|
||||
return nil
|
||||
}
|
||||
|
||||
payload := user.LoginUserRequest{
|
||||
Email: ctx.FormValue("email"),
|
||||
Password: ctx.FormValue("password"),
|
||||
}
|
||||
|
||||
_, err := user.Login(
|
||||
ctx,
|
||||
payload,
|
||||
)
|
||||
|
||||
if err != nil {
|
||||
ctx.Response.WriteHeader(400)
|
||||
return ui.SwapFormError(ctx, err.Error())
|
||||
}
|
||||
|
||||
return h.RedirectPartial("/")
|
||||
}
|
||||
9
examples/simple-auth/sqlc.yaml
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
version: "2"
|
||||
sql:
|
||||
- schema: "internal/db/schema.sql"
|
||||
queries: "internal/db/queries.sql"
|
||||
engine: "sqlite"
|
||||
gen:
|
||||
go:
|
||||
package: "db"
|
||||
out: "internal/db"
|
||||
5
examples/simple-auth/tailwind.config.js
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
/** @type {import('tailwindcss').Config} */
|
||||
module.exports = {
|
||||
content: ["**/*.go"],
|
||||
plugins: [],
|
||||
};
|
||||
41
examples/simple-auth/ui/button.go
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
package ui
|
||||
|
||||
import (
|
||||
"github.com/maddalax/htmgo/framework/h"
|
||||
"github.com/maddalax/htmgo/framework/js"
|
||||
)
|
||||
|
||||
func SubmitButton(submitText string) *h.Element {
|
||||
buttonClasses := "rounded items-center px-3 py-2 bg-slate-800 text-white w-full text-center"
|
||||
|
||||
return h.Div(
|
||||
h.HxBeforeRequest(
|
||||
js.RemoveClassOnChildren(".loading", "hidden"),
|
||||
js.SetClassOnChildren(".submit", "hidden"),
|
||||
),
|
||||
h.HxAfterRequest(
|
||||
js.SetClassOnChildren(".loading", "hidden"),
|
||||
js.RemoveClassOnChildren(".submit", "hidden"),
|
||||
),
|
||||
h.Class("flex gap-2 justify-center"),
|
||||
h.Button(
|
||||
h.Class("loading hidden relative text-center", buttonClasses),
|
||||
spinner(),
|
||||
h.Disabled(),
|
||||
h.Text("Submitting..."),
|
||||
),
|
||||
h.Button(
|
||||
h.Type("submit"),
|
||||
h.Class("submit", buttonClasses),
|
||||
h.Text(submitText),
|
||||
),
|
||||
)
|
||||
}
|
||||
|
||||
func spinner(children ...h.Ren) *h.Element {
|
||||
return h.Div(
|
||||
h.Children(children...),
|
||||
h.Class("absolute left-1 spinner spinner-border animate-spin inline-block w-6 h-6 border-4 rounded-full border-slate-200 border-t-transparent"),
|
||||
h.Attribute("role", "status"),
|
||||
)
|
||||
}
|
||||
20
examples/simple-auth/ui/error.go
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
package ui
|
||||
|
||||
import "github.com/maddalax/htmgo/framework/h"
|
||||
|
||||
func FormError(error string) *h.Element {
|
||||
return h.Div(
|
||||
h.Id("form-error"),
|
||||
h.Text(error),
|
||||
h.If(
|
||||
error != "",
|
||||
h.Class("p-4 bg-rose-400 text-white rounded"),
|
||||
),
|
||||
)
|
||||
}
|
||||
|
||||
func SwapFormError(ctx *h.RequestContext, error string) *h.Partial {
|
||||
return h.SwapPartial(ctx,
|
||||
FormError(error),
|
||||
)
|
||||
}
|
||||