unfuck the go.mods

diff --git a/README.md b/README.md
index 952db96c90f10822ad11da0d2680047b80b8cfc8..05b634df1eb40bf1dd3a90ad25145e755e069bac 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1 +1,11 @@
-# Today Web Framework
\ No newline at end of file
+# Today Web Framework
+
+Today is a web framework for making server-side rendered websites in Go.
+
+- Start with a static file website.
+- Add dynamic content where you need it.
+- Encapsulate and distribute repeated behavior.
+
+## Installation and Requirements
+
+`go get git.earlybird.gay/today@latest`

diff --git a/app/app.go b/app/app.go
index ccf1b75d8bcdfbc75daaec4a84cfacf37f9b94b0..9bcace537fea3f84a135c733cdec359dd166f6d9 100644 (file)
--- a/app/app.go
+++ b/app/app.go
@@ -18,8 +18,8 @@ import (
        "sync"
        "sync/atomic"
 
-       "git.earlybird.gay/today-engine/include"
-       "git.earlybird.gay/today-engine/page"
+       "git.earlybird.gay/today/include"
+       "git.earlybird.gay/today/web/page"
 )
 
 func init() {

diff --git a/app/go.mod b/app/go.mod
deleted file mode 100644 (file)
index 18c43e4..0000000
--- a/app/go.mod
+++ /dev/null
@@ -1,5 +0,0 @@
-module git.earlybird.gay/today-app
-
-go 1.22.4
-
-require git.earlybird.gay/today-engine v0.0.0-20240911045033-55d49a64189f

diff --git a/app/go.sum b/app/go.sum
deleted file mode 100644 (file)
index 6423552..0000000
--- a/app/go.sum
+++ /dev/null
@@ -1,2 +0,0 @@
-git.earlybird.gay/today-engine v0.0.0-20240911045033-55d49a64189f h1:vyQTIzkDUvqO3coZArw+jiERQ0xzLVjaZx6n6lIpOxQ=
-git.earlybird.gay/today-engine v0.0.0-20240911045033-55d49a64189f/go.mod h1:9w8xpAPxs1QvT//ph/jgAuRIoWyqdi2QEifwsKWOKns=

diff --git a/go.mod b/go.mod
new file mode 100644 (file)
index 0000000..41e9760
--- /dev/null
+++ b/go.mod
@@ -0,0 +1,10 @@
+module git.earlybird.gay/today
+
+go 1.22.4
+
+require (
+       git.earlybird.gay/today-app v0.0.0-20241023050205-d1c3413a0e12
+       golang.org/x/text v0.19.0
+)
+
+require git.earlybird.gay/today-engine v0.0.0-20240911045033-55d49a64189f // indirect

diff --git a/go.sum b/go.sum
new file mode 100644 (file)
index 0000000..f849da5
--- /dev/null
+++ b/go.sum
@@ -0,0 +1,6 @@
+git.earlybird.gay/today-app v0.0.0-20241023050205-d1c3413a0e12 h1:I4PpIONymTb+ti3at+5+Rixs7uApzVWpY9YoGP10b0s=
+git.earlybird.gay/today-app v0.0.0-20241023050205-d1c3413a0e12/go.mod h1:ua0E6veNXtTRAXXJPsJP4hzQohFW+0Ogy6PZoX7pHCU=
+git.earlybird.gay/today-engine v0.0.0-20240911045033-55d49a64189f h1:vyQTIzkDUvqO3coZArw+jiERQ0xzLVjaZx6n6lIpOxQ=
+git.earlybird.gay/today-engine v0.0.0-20240911045033-55d49a64189f/go.mod h1:9w8xpAPxs1QvT//ph/jgAuRIoWyqdi2QEifwsKWOKns=
+golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
+golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=

diff --git a/web/README.md b/web/README.md
index df9e1df941c409777fdb2e9d573f6817d2ac697f..509c1b8253972c2228055f39a8c443cb44f62f81 100644 (file)
--- a/web/README.md
+++ b/web/README.md
@@ -9,7 +9,7 @@ License: MIT, BSD
 
 ## Installation
 
-go get git.earlybird.gay/today-engine@latest
+go get git.earlybird.gay/today/web@latest
 
 ## Why?
 

diff --git a/web/cmd/standard-test/main.go b/web/cmd/standard-test/main.go
index 88fad7c8c4ac66a690bd4f339bee5708933cbbb6..776abd075a69f23631caa65540171f002c849961 100644 (file)
--- a/web/cmd/standard-test/main.go
+++ b/web/cmd/standard-test/main.go
@@ -7,10 +7,10 @@ import (
        "text/template"
 
        tapp "git.earlybird.gay/today-app/app"
-       "git.earlybird.gay/today-engine/page"
-       "git.earlybird.gay/today-engine/part"
-       "git.earlybird.gay/today-engine/render"
-       stdpart "git.earlybird.gay/today-engine/standard/part"
+       "git.earlybird.gay/today/web/page"
+       "git.earlybird.gay/today/web/part"
+       "git.earlybird.gay/today/web/render"
+       stdpart "git.earlybird.gay/today/web/standard/part"
 )
 
 var Thing = part.New("test-thing", "test_thing.html",

diff --git a/web/component/component.go b/web/component/component.go
index 22370e2bee4f9f5c6851bff308e4b71c5c11b890..38473430852e3f6ca6bb5b5f421212ef683c0dbb 100644 (file)
--- a/web/component/component.go
+++ b/web/component/component.go
@@ -2,8 +2,8 @@
 package component
 
 import (
-       "git.earlybird.gay/today-engine/include"
-       "git.earlybird.gay/today-engine/internal/compile"
+       "git.earlybird.gay/today/include"
+       "git.earlybird.gay/today/web/internal/compile"
 )
 
 type Component struct {
@@ -27,7 +27,7 @@ func New(name string, source string, optional ...func(*Component)) *Component {
        // Assign basic parameters
        p.name = name
        p.fileName = source
-       p.source = include.File(source, "git.earlybird.gay/today-engine/component")
+       p.source = include.File(source, "git.earlybird.gay/today/web/component")
        // Run optional arguments
        for _, of := range optional {
                of(p)

diff --git a/web/go.mod b/web/go.mod
deleted file mode 100644 (file)
index fb5c1b4..0000000
--- a/web/go.mod
+++ /dev/null
@@ -1,8 +0,0 @@
-module git.earlybird.gay/today-engine
-
-go 1.22.4
-
-require (
-       git.earlybird.gay/today-app v0.0.0-20240813010007-675f08ae35b1
-       golang.org/x/text v0.17.0
-)

diff --git a/web/go.sum b/web/go.sum
deleted file mode 100644 (file)
index ca1ee0b..0000000
--- a/web/go.sum
+++ /dev/null
@@ -1,4 +0,0 @@
-git.earlybird.gay/today-app v0.0.0-20240813010007-675f08ae35b1 h1:Fbz2uRIWK6CR+jcNN0KQrna4u/kYZccn2obcla7dPfQ=
-git.earlybird.gay/today-app v0.0.0-20240813010007-675f08ae35b1/go.mod h1:AxsoC2ERffYriW60C1vdV34ew6JPKxllG9mHOTs128I=
-golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
-golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=

diff --git a/web/htmltree/attrs.go b/web/htmltree/attrs.go
index 4d9ab2e9edcafe4dc0a1d3ab7b92e8babc6bc24b..3f337bd6e530fd314031285986dd18ac58ffd3b8 100644 (file)
--- a/web/htmltree/attrs.go
+++ b/web/htmltree/attrs.go
@@ -1,7 +1,7 @@
 // Copyright (C) 2024 early (LGPL)
 package htmltree
 
-import "git.earlybird.gay/today-engine/internal/html"
+import "git.earlybird.gay/today/web/internal/html"
 
 func GetAttr(n *html.Node, name string) string {
        for _, attr := range n.Attr {

diff --git a/web/htmltree/prettify.go b/web/htmltree/prettify.go
index 33fbdd0e5675e00c8aa0cb4e62501c0e220e8ccb..26df0ebb6d4242e03bfd299acebb791e8ede717f 100644 (file)
--- a/web/htmltree/prettify.go
+++ b/web/htmltree/prettify.go
@@ -6,7 +6,7 @@ import (
        "regexp"
        "strings"
 
-       "git.earlybird.gay/today-engine/internal/html"
+       "git.earlybird.gay/today/web/internal/html"
 )
 
 func Walk(root *html.Node, f func(*html.Node) (bool, error)) error {

diff --git a/web/internal/compile/compile.go b/web/internal/compile/compile.go
index 9b8880730781957dd502958d7cbfc9155d16f9ad..c26afc72c4eee006cc637727b952a5d7f95a2099 100644 (file)
--- a/web/internal/compile/compile.go
+++ b/web/internal/compile/compile.go
@@ -7,10 +7,10 @@ import (
        "regexp"
        "strings"
 
-       "git.earlybird.gay/today-engine/htmltree"
-       "git.earlybird.gay/today-engine/include"
-       "git.earlybird.gay/today-engine/internal/html"
-       "git.earlybird.gay/today-engine/render"
+       "git.earlybird.gay/today/include"
+       "git.earlybird.gay/today/web/htmltree"
+       "git.earlybird.gay/today/web/internal/html"
+       "git.earlybird.gay/today/web/render"
 )
 
 type Source interface {

diff --git a/web/internal/compile/component.go b/web/internal/compile/component.go
index 7f779493f88ff4fb289d134ddaf851afec2f8d77..7fd726ccf905af4643be890ee76193b62dc48c9d 100644 (file)
--- a/web/internal/compile/component.go
+++ b/web/internal/compile/component.go
@@ -3,9 +3,9 @@ package compile
 import (
        "errors"
 
-       "git.earlybird.gay/today-engine/htmltree"
-       "git.earlybird.gay/today-engine/internal/html"
-       "git.earlybird.gay/today-engine/internal/html/atom"
+       "git.earlybird.gay/today/web/htmltree"
+       "git.earlybird.gay/today/web/internal/html"
+       "git.earlybird.gay/today/web/internal/html/atom"
 )
 
 var ErrBadComponentFormat = errors.New("web components must either be a script or a template and script")

diff --git a/web/internal/compile/compute.go b/web/internal/compile/compute.go
index 5c5f69a9eb886bb61dc7e2134a2ccbe9df8c80fa..883b888968297ccbb7ff0094716fcff4bdb7bf69 100644 (file)
--- a/web/internal/compile/compute.go
+++ b/web/internal/compile/compute.go
@@ -7,7 +7,7 @@ import (
        "reflect"
        "strings"
 
-       "git.earlybird.gay/today-engine/render"
+       "git.earlybird.gay/today/web/render"
 )
 
 type computeNode struct {

diff --git a/web/internal/compile/template.go b/web/internal/compile/template.go
index 1fd6f5b7191178d97e3d868ff5624de313906a10..369240636bb48339eedd8507b9e1df866e1b14eb 100644 (file)
--- a/web/internal/compile/template.go
+++ b/web/internal/compile/template.go
@@ -8,8 +8,8 @@ import (
        "slices"
        "strings"
 
-       "git.earlybird.gay/today-engine/htmltree"
-       "git.earlybird.gay/today-engine/internal/html"
+       "git.earlybird.gay/today/web/htmltree"
+       "git.earlybird.gay/today/web/internal/html"
 )
 
 const (

diff --git a/web/internal/html/atom/atom.go b/web/internal/html/atom/atom.go
index cb79263be33c5da4ffd49e23fc297377eecf551e..acc60e6c6f328d627baf3d827d1a495d1845269e 100644 (file)
--- a/web/internal/html/atom/atom.go
+++ b/web/internal/html/atom/atom.go
@@ -15,7 +15,7 @@
 // whether atom.H1 < atom.H2 may also change. The codes are not guaranteed to
 // be dense. The only guarantees are that e.g. looking up "div" will yield
 // atom.Div, calling atom.Div.String will return "div", and atom.Div != 0.
-package atom // import "git.earlybird.gay/today-engine/internal/html/atom"
+package atom // import "git.earlybird.gay/today/web/internal/html/atom"
 
 // Atom is an integer code for a string. The zero value maps to "".
 type Atom uint32

diff --git a/web/internal/html/charset/charset.go b/web/internal/html/charset/charset.go
index f61c6c30bd3d962deb704e2a548602db2833e4f1..e40a8657488ef232f77cbbe3e2c2f04b3a2f31e0 100644 (file)
--- a/web/internal/html/charset/charset.go
+++ b/web/internal/html/charset/charset.go
@@ -6,7 +6,7 @@
 //
 // The mapping from encoding labels to encodings is defined at
 // https://encoding.spec.whatwg.org/.
-package charset // import "git.earlybird.gay/today-engine/internal/html/charset"
+package charset // import "git.earlybird.gay/today/web/internal/html/charset"
 
 import (
        "bytes"
@@ -16,7 +16,7 @@ import (
        "strings"
        "unicode/utf8"
 
-       "git.earlybird.gay/today-engine/internal/html"
+       "git.earlybird.gay/today/web/internal/html"
        "golang.org/x/text/encoding"
        "golang.org/x/text/encoding/charmap"
        "golang.org/x/text/encoding/htmlindex"

diff --git a/web/internal/html/doc.go b/web/internal/html/doc.go
index 850c47fdbadedf59fba0a186dc192104d2c3ecda..c54063c9baac94e1bad1971fed256f3bb359ebfb 100644 (file)
--- a/web/internal/html/doc.go
+++ b/web/internal/html/doc.go
@@ -114,7 +114,7 @@ parsed content, the input must be re-serialized (for instance by using Render or
 Token.String) in order for those trust decisions to hold, as the process of
 tokenization or parsing may alter the content.
 */
-package html // import "git.earlybird.gay/today-engine/internal/html"
+package html // import "git.earlybird.gay/today/web/internal/html"
 
 // The tokenization algorithm implemented by this package is not a line-by-line
 // transliteration of the relatively verbose state-machine in the WHATWG

diff --git a/web/internal/html/example_test.go b/web/internal/html/example_test.go
index ebdd168a232c0b3352d5ce7c2bf1e63017f8c2b6..55a3d2cd8d710ac101c2f5736ed704e50142f494 100644 (file)
--- a/web/internal/html/example_test.go
+++ b/web/internal/html/example_test.go
@@ -10,7 +10,7 @@ import (
        "log"
        "strings"
 
-       "git.earlybird.gay/today-engine/internal/html"
+       "git.earlybird.gay/today/web/internal/html"
 )
 
 func ExampleParse() {

diff --git a/web/internal/html/node.go b/web/internal/html/node.go
index bb1624b7ccfed4bde882320b2c96f33b4c6956b2..ef0a079b73e9c910f6ec68b73d6f17b22f308330 100644 (file)
--- a/web/internal/html/node.go
+++ b/web/internal/html/node.go
@@ -5,7 +5,7 @@
 package html
 
 import (
-       "git.earlybird.gay/today-engine/internal/html/atom"
+       "git.earlybird.gay/today/web/internal/html/atom"
 )
 
 // A NodeType is the type of a Node.

diff --git a/web/internal/html/parse.go b/web/internal/html/parse.go
index 8c1131b78f432650e6b6adfdd1d132bcc052cdc5..b4aac5521d5e8d68e6042d8d5f9ee1493cb2f905 100644 (file)
--- a/web/internal/html/parse.go
+++ b/web/internal/html/parse.go
@@ -10,7 +10,7 @@ import (
        "io"
        "strings"
 
-       a "git.earlybird.gay/today-engine/internal/html/atom"
+       a "git.earlybird.gay/today/web/internal/html/atom"
 )
 
 // A parser implements the HTML5 parsing algorithm:

diff --git a/web/internal/html/parse_test.go b/web/internal/html/parse_test.go
index b2b7fdc5f0b3fae4af402fc338017f303f55bd19..3b7a349ced99a511e4fcfb10e42e8e93cc3482e2 100644 (file)
--- a/web/internal/html/parse_test.go
+++ b/web/internal/html/parse_test.go
@@ -17,7 +17,7 @@ import (
        "strings"
        "testing"
 
-       "git.earlybird.gay/today-engine/internal/html/atom"
+       "git.earlybird.gay/today/web/internal/html/atom"
 )
 
 type testAttrs struct {

diff --git a/web/internal/html/token.go b/web/internal/html/token.go
index a4861bd002f7460cbbff63c9dbfa3bf470fdea5a..1c8251deebd7a46776e12d173463b96c3dac03ef 100644 (file)
--- a/web/internal/html/token.go
+++ b/web/internal/html/token.go
@@ -11,7 +11,7 @@ import (
        "strconv"
        "strings"
 
-       "git.earlybird.gay/today-engine/internal/html/atom"
+       "git.earlybird.gay/today/web/internal/html/atom"
 )
 
 // A TokenType is the type of a Token.

diff --git a/web/page/page.go b/web/page/page.go
index 95879e7d7723437211ace35ba2005aad310f294f..be74b9ed91431c7d03ed95c3744d0b51a9074d37 100644 (file)
--- a/web/page/page.go
+++ b/web/page/page.go
@@ -7,11 +7,11 @@ import (
        "path/filepath"
        "strings"
 
-       "git.earlybird.gay/today-engine/htmltree"
-       "git.earlybird.gay/today-engine/include"
-       "git.earlybird.gay/today-engine/internal/compile"
-       "git.earlybird.gay/today-engine/part"
-       "git.earlybird.gay/today-engine/render"
+       "git.earlybird.gay/today/include"
+       "git.earlybird.gay/today/web/htmltree"
+       "git.earlybird.gay/today/web/internal/compile"
+       "git.earlybird.gay/today/web/part"
+       "git.earlybird.gay/today/web/render"
 )
 
 type Page struct {
@@ -40,7 +40,7 @@ func Name(name string) Config {
 
 func Source(source string) Config {
        return func(p *Page) {
-               p.source = include.File(source, "git.earlybird.gay/today-engine/part")
+               p.source = include.File(source, "git.earlybird.gay/today/web/part")
        }
 }
 
@@ -74,7 +74,7 @@ func New(name string, source string, optional ...func(*Page)) *Page {
        p := new(Page)
        // Assign basic parameters
        p.name = name
-       p.source = include.File(source, "git.earlybird.gay/today-engine/page")
+       p.source = include.File(source, "git.earlybird.gay/today/web/page")
        p.onLoad = func(ctx context.Context, d render.Data) error {
                return nil
        }

diff --git a/web/page/serve.go b/web/page/serve.go
index ad05884f38bc10a3eea58048d58903adf48d67de..75f8bcaa76e6a1902a3e5e508ff6159996b44683 100644 (file)
--- a/web/page/serve.go
+++ b/web/page/serve.go
@@ -4,7 +4,7 @@ package page
 import (
        "net/http"
 
-       "git.earlybird.gay/today-engine/render"
+       "git.earlybird.gay/today/web/render"
 )
 
 type RootData struct {

diff --git a/web/part/part.go b/web/part/part.go
index ed808cfaab1ce2b5c4139b6f7521e19dde5591d6..baa8c6c0c61b955f35dcb465216a77a3cd4a1a46 100644 (file)
--- a/web/part/part.go
+++ b/web/part/part.go
@@ -5,9 +5,9 @@ import (
        "context"
        "text/template"
 
-       "git.earlybird.gay/today-engine/include"
-       "git.earlybird.gay/today-engine/internal/compile"
-       "git.earlybird.gay/today-engine/render"
+       "git.earlybird.gay/today/include"
+       "git.earlybird.gay/today/web/internal/compile"
+       "git.earlybird.gay/today/web/render"
 )
 
 type Part struct {
@@ -30,7 +30,7 @@ func Name(name string) Config {
 
 func Source(source string) Config {
        return func(p *Part) {
-               p.source = include.File(source, "git.earlybird.gay/today-engine/part")
+               p.source = include.File(source, "git.earlybird.gay/today/web/part")
        }
 }
 
@@ -68,7 +68,7 @@ func New(name string, source string, optional ...func(*Part)) *Part {
        p := new(Part)
        // Assign basic parameters
        p.name = name
-       p.source = include.File(source, "git.earlybird.gay/today-engine/part")
+       p.source = include.File(source, "git.earlybird.gay/today/web/part")
        p.onLoad = func(ctx context.Context, data render.Data) error {
                return nil
        }

diff --git a/web/standard/part/contact_form.go b/web/standard/part/contact_form.go
index f8aae3674447ca2029def131c4cf1ccb166e9b96..901b101e097beaf63d0a610074bf404e4bc86d50 100644 (file)
--- a/web/standard/part/contact_form.go
+++ b/web/standard/part/contact_form.go
@@ -7,8 +7,8 @@ import (
        "net/http"
        "net/url"
 
-       "git.earlybird.gay/today-engine/part"
-       "git.earlybird.gay/today-engine/render"
+       "git.earlybird.gay/today/web/part"
+       "git.earlybird.gay/today/web/render"
 )
 
 var (