diff --git a/ui/button.go b/framework-ui/ui/button.go similarity index 100% rename from ui/button.go rename to framework-ui/ui/button.go diff --git a/ui/input.go b/framework-ui/ui/input.go similarity index 100% rename from ui/input.go rename to framework-ui/ui/input.go diff --git a/assets/css/input.css b/framework/assets/css/input.css similarity index 100% rename from assets/css/input.css rename to framework/assets/css/input.css diff --git a/assets/css/tailwind.config.js b/framework/assets/css/tailwind.config.js similarity index 100% rename from assets/css/tailwind.config.js rename to framework/assets/css/tailwind.config.js diff --git a/framework/assets/css/tailwindcss b/framework/assets/css/tailwindcss new file mode 100755 index 0000000..f012497 Binary files /dev/null and b/framework/assets/css/tailwindcss differ diff --git a/assets/js/.prettierignore b/framework/assets/js/.prettierignore similarity index 100% rename from assets/js/.prettierignore rename to framework/assets/js/.prettierignore diff --git a/assets/js/htmx.ts b/framework/assets/js/htmx.ts similarity index 100% rename from assets/js/htmx.ts rename to framework/assets/js/htmx.ts diff --git a/assets/js/htmxextensions/debug.ts b/framework/assets/js/htmxextensions/debug.ts similarity index 100% rename from assets/js/htmxextensions/debug.ts rename to framework/assets/js/htmxextensions/debug.ts diff --git a/assets/js/htmxextensions/mutation-error.ts b/framework/assets/js/htmxextensions/mutation-error.ts similarity index 100% rename from assets/js/htmxextensions/mutation-error.ts rename to framework/assets/js/htmxextensions/mutation-error.ts diff --git a/assets/js/htmxextensions/pathdeps.ts b/framework/assets/js/htmxextensions/pathdeps.ts similarity index 100% rename from assets/js/htmxextensions/pathdeps.ts rename to framework/assets/js/htmxextensions/pathdeps.ts diff --git a/assets/js/htmxextensions/response-targets.ts b/framework/assets/js/htmxextensions/response-targets.ts similarity index 100% rename from assets/js/htmxextensions/response-targets.ts rename to framework/assets/js/htmxextensions/response-targets.ts diff --git a/assets/js/htmxextensions/trigger-children.ts b/framework/assets/js/htmxextensions/trigger-children.ts similarity index 100% rename from assets/js/htmxextensions/trigger-children.ts rename to framework/assets/js/htmxextensions/trigger-children.ts diff --git a/assets/js/mhtml.ts b/framework/assets/js/mhtml.ts similarity index 100% rename from assets/js/mhtml.ts rename to framework/assets/js/mhtml.ts diff --git a/assets/js/package-lock.json b/framework/assets/js/package-lock.json similarity index 100% rename from assets/js/package-lock.json rename to framework/assets/js/package-lock.json diff --git a/assets/js/package.json b/framework/assets/js/package.json similarity index 100% rename from assets/js/package.json rename to framework/assets/js/package.json diff --git a/assets/js/scripts/shiki.ts b/framework/assets/js/scripts/shiki.ts similarity index 100% rename from assets/js/scripts/shiki.ts rename to framework/assets/js/scripts/shiki.ts diff --git a/assets/js/tsconfig.json b/framework/assets/js/tsconfig.json similarity index 100% rename from assets/js/tsconfig.json rename to framework/assets/js/tsconfig.json diff --git a/assets/js/tsup.config.ts b/framework/assets/js/tsup.config.ts similarity index 100% rename from assets/js/tsup.config.ts rename to framework/assets/js/tsup.config.ts diff --git a/framework/go.mod b/framework/go.mod new file mode 100644 index 0000000..83dda96 --- /dev/null +++ b/framework/go.mod @@ -0,0 +1,25 @@ +module mhtml-framework + +go 1.23.0 + +require ( + github.com/dave/jennifer v1.7.1 + github.com/fsnotify/fsnotify v1.7.0 + github.com/gofiber/fiber/v2 v2.52.5 + golang.org/x/net v0.29.0 + golang.org/x/tools v0.25.0 +) + +require ( + github.com/andybalholm/brotli v1.0.5 // indirect + github.com/google/uuid v1.5.0 // indirect + github.com/klauspost/compress v1.17.0 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect + github.com/mattn/go-runewidth v0.0.15 // indirect + github.com/rivo/uniseg v0.2.0 // indirect + github.com/valyala/bytebufferpool v1.0.0 // indirect + github.com/valyala/fasthttp v1.51.0 // indirect + github.com/valyala/tcplisten v1.0.0 // indirect + golang.org/x/sys v0.25.0 // indirect +) diff --git a/framework/go.sum b/framework/go.sum new file mode 100644 index 0000000..51c3953 --- /dev/null +++ b/framework/go.sum @@ -0,0 +1,35 @@ +github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs= +github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/dave/jennifer v1.7.1 h1:B4jJJDHelWcDhlRQxWeo0Npa/pYKBLrirAQoTN45txo= +github.com/dave/jennifer v1.7.1/go.mod h1:nXbxhEmQfOZhWml3D1cDK5M1FLnMSozpbFN/m3RmGZc= +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/gofiber/fiber/v2 v2.52.5 h1:tWoP1MJQjGEe4GB5TUGOi7P2E0ZMMRx5ZTG4rT+yGMo= +github.com/gofiber/fiber/v2 v2.52.5/go.mod h1:KEOE+cXMhXG0zHc9d8+E38hoX+ZN7bhOtgeF2oT6jrQ= +github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= +github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/klauspost/compress v1.17.0 h1:Rnbp4K9EjcDuVuHtd0dgA4qNuv9yKDYKK1ulpJwgrqM= +github.com/klauspost/compress v1.17.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U= +github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= +github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= +github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= +github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= +github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= +github.com/valyala/fasthttp v1.51.0 h1:8b30A5JlZ6C7AS81RsWjYMQmrZG6feChmgAolCl1SqA= +github.com/valyala/fasthttp v1.51.0/go.mod h1:oI2XroL+lI7vdXyYoQk03bXBThfFl2cVdIA3Xl7cH8g= +github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8= +github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= +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.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +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/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= diff --git a/h/app.go b/framework/h/app.go similarity index 100% rename from h/app.go rename to framework/h/app.go diff --git a/h/base.go b/framework/h/base.go similarity index 100% rename from h/base.go rename to framework/h/base.go diff --git a/h/lifecycle.go b/framework/h/lifecycle.go similarity index 100% rename from h/lifecycle.go rename to framework/h/lifecycle.go diff --git a/h/livereload.go b/framework/h/livereload.go similarity index 100% rename from h/livereload.go rename to framework/h/livereload.go diff --git a/h/render.go b/framework/h/render.go similarity index 100% rename from h/render.go rename to framework/h/render.go diff --git a/h/state.go b/framework/h/state.go similarity index 100% rename from h/state.go rename to framework/h/state.go diff --git a/h/tag.go b/framework/h/tag.go similarity index 100% rename from h/tag.go rename to framework/h/tag.go diff --git a/h/util.go b/framework/h/util.go similarity index 100% rename from h/util.go rename to framework/h/util.go diff --git a/tooling/astgen/ast.go b/framework/tooling/astgen/ast.go similarity index 100% rename from tooling/astgen/ast.go rename to framework/tooling/astgen/ast.go diff --git a/tooling/astgen/codebuilder.go b/framework/tooling/astgen/codebuilder.go similarity index 100% rename from tooling/astgen/codebuilder.go rename to framework/tooling/astgen/codebuilder.go diff --git a/tooling/astgen/entry.go b/framework/tooling/astgen/entry.go similarity index 100% rename from tooling/astgen/entry.go rename to framework/tooling/astgen/entry.go diff --git a/tooling/astgen/map.go b/framework/tooling/astgen/map.go similarity index 100% rename from tooling/astgen/map.go rename to framework/tooling/astgen/map.go diff --git a/tooling/astgen/util.go b/framework/tooling/astgen/util.go similarity index 100% rename from tooling/astgen/util.go rename to framework/tooling/astgen/util.go diff --git a/tooling/astgen/writer.go b/framework/tooling/astgen/writer.go similarity index 100% rename from tooling/astgen/writer.go rename to framework/tooling/astgen/writer.go diff --git a/tooling/htmltogo/entry.go b/framework/tooling/htmltogo/entry.go similarity index 100% rename from tooling/htmltogo/entry.go rename to framework/tooling/htmltogo/entry.go diff --git a/tooling/watch.go b/framework/tooling/watch.go similarity index 100% rename from tooling/watch.go rename to framework/tooling/watch.go diff --git a/httpjson/http.go b/framework/util/httpjson/http.go similarity index 100% rename from httpjson/http.go rename to framework/util/httpjson/http.go diff --git a/database/database.go b/starter-template/database/database.go similarity index 100% rename from database/database.go rename to starter-template/database/database.go diff --git a/features/patient/patient-service.go b/starter-template/features/patient/patient-service.go similarity index 100% rename from features/patient/patient-service.go rename to starter-template/features/patient/patient-service.go diff --git a/starter-template/go.mod b/starter-template/go.mod new file mode 100644 index 0000000..eca734d --- /dev/null +++ b/starter-template/go.mod @@ -0,0 +1,25 @@ +module mhtml/starter-template + +go 1.23.0 + +require ( + github.com/gofiber/fiber/v2 v2.52.5 + github.com/google/uuid v1.6.0 + github.com/redis/go-redis/v9 v9.6.1 + github.com/maddalax/mhtml-framework v1.0.0 +) + +require ( + github.com/andybalholm/brotli v1.0.5 // indirect + github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect + github.com/klauspost/compress v1.17.0 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect + github.com/mattn/go-runewidth v0.0.15 // indirect + github.com/rivo/uniseg v0.2.0 // indirect + github.com/valyala/bytebufferpool v1.0.0 // indirect + github.com/valyala/fasthttp v1.51.0 // indirect + github.com/valyala/tcplisten v1.0.0 // indirect + golang.org/x/sys v0.15.0 // indirect +) diff --git a/news/posts.go b/starter-template/news/posts.go similarity index 100% rename from news/posts.go rename to starter-template/news/posts.go diff --git a/news/views.go b/starter-template/news/views.go similarity index 92% rename from news/views.go rename to starter-template/news/views.go index 1cfbf70..2a1fd50 100644 --- a/news/views.go +++ b/starter-template/news/views.go @@ -2,8 +2,8 @@ package news import ( "fmt" - "mhtml/database" - "mhtml/h" + "mhtml/framework/h" + "mhtml/starter-template/database" "time" ) diff --git a/pages/base/root.go b/starter-template/pages/base/root.go similarity index 100% rename from pages/base/root.go rename to starter-template/pages/base/root.go diff --git a/pages/generated.go b/starter-template/pages/generated.go similarity index 100% rename from pages/generated.go rename to starter-template/pages/generated.go diff --git a/pages/index.go b/starter-template/pages/index.go similarity index 100% rename from pages/index.go rename to starter-template/pages/index.go diff --git a/pages/news.$id.go b/starter-template/pages/news.$id.go similarity index 100% rename from pages/news.$id.go rename to starter-template/pages/news.$id.go diff --git a/pages/news.index.go b/starter-template/pages/news.index.go similarity index 100% rename from pages/news.index.go rename to starter-template/pages/news.index.go diff --git a/pages/patients.index.go b/starter-template/pages/patients.index.go similarity index 100% rename from pages/patients.index.go rename to starter-template/pages/patients.index.go diff --git a/partials/button.go b/starter-template/partials/button.go similarity index 100% rename from partials/button.go rename to starter-template/partials/button.go diff --git a/partials/load/generated.go b/starter-template/partials/load/generated.go similarity index 100% rename from partials/load/generated.go rename to starter-template/partials/load/generated.go diff --git a/partials/load/register.go b/starter-template/partials/load/register.go similarity index 100% rename from partials/load/register.go rename to starter-template/partials/load/register.go diff --git a/partials/nav.go b/starter-template/partials/nav.go similarity index 100% rename from partials/nav.go rename to starter-template/partials/nav.go diff --git a/partials/news.go b/starter-template/partials/news.go similarity index 100% rename from partials/news.go rename to starter-template/partials/news.go diff --git a/partials/patient/create.go b/starter-template/partials/patient/create.go similarity index 100% rename from partials/patient/create.go rename to starter-template/partials/patient/create.go diff --git a/partials/patient/patient.go b/starter-template/partials/patient/patient.go similarity index 100% rename from partials/patient/patient.go rename to starter-template/partials/patient/patient.go diff --git a/partials/sheet/sheet.go b/starter-template/partials/sheet/sheet.go similarity index 100% rename from partials/sheet/sheet.go rename to starter-template/partials/sheet/sheet.go