Core separation #13

Merged
Teajey merged 11 commits from core-separation into main 2025-06-27 01:14:19 +12:00
44 changed files with 39 additions and 39 deletions
Showing only changes of commit d89b855299 - Show all commits

2
.gitignore vendored
View File

@ -2,5 +2,5 @@
gin-bin
*lishwist.db
.env*.local
server/api/db/init_sql.go
http/api/db/init_sql.go
.ignored/

View File

@ -2,4 +2,4 @@ go 1.23
toolchain go1.23.3
use ./server
use ./http

View File

@ -5,7 +5,7 @@ package db
import (
"database/sql"
"fmt"
"lishwist/env"
"lishwist/http/env"
"github.com/Teajey/sqlstore"
_ "github.com/glebarez/go-sqlite"

View File

@ -2,7 +2,7 @@ package db
import (
"fmt"
"lishwist/normalize"
"lishwist/http/normalize"
"strconv"
)

View File

@ -3,7 +3,7 @@ package db
import (
"database/sql"
"fmt"
"lishwist/normalize"
"lishwist/http/normalize"
"github.com/google/uuid"
)

View File

@ -1,8 +1,8 @@
package api
import (
"lishwist/api/db"
"lishwist/templates"
"lishwist/http/api/db"
"lishwist/http/templates"
"log"
"golang.org/x/crypto/bcrypt"

View File

@ -3,8 +3,8 @@ package api
import (
"log"
"lishwist/api/db"
"lishwist/templates"
"lishwist/http/api/db"
"lishwist/http/templates"
"golang.org/x/crypto/bcrypt"
)

View File

@ -1,4 +1,4 @@
module lishwist
module lishwist/http
go 1.23

View File

@ -5,12 +5,12 @@ import (
"log"
"net/http"
"lishwist/api"
// TODO: lishwist/api/db ought not to be used outside lishwist/api
"lishwist/api/db"
"lishwist/env"
"lishwist/router"
"lishwist/routing"
"lishwist/http/api"
// TODO: lishwist/http/api/db ought not to be used outside lishwist/http/api
"lishwist/http/api/db"
"lishwist/http/env"
"lishwist/http/router"
"lishwist/http/routing"
)
func main() {

View File

@ -1,7 +1,7 @@
package router
import (
"lishwist/rsvp"
"lishwist/http/rsvp"
"net/http"
"github.com/Teajey/sqlstore"

View File

@ -1,8 +1,8 @@
package routing
import (
"lishwist/api/db"
"lishwist/rsvp"
"lishwist/http/api/db"
"lishwist/http/rsvp"
"net/http"
)

View File

@ -1,8 +1,8 @@
package routing
import (
"lishwist/api/db"
"lishwist/rsvp"
"lishwist/http/api/db"
"lishwist/http/rsvp"
"net/http"
)

View File

@ -4,8 +4,8 @@ import (
"net/http"
"slices"
"lishwist/api/db"
"lishwist/rsvp"
"lishwist/http/api/db"
"lishwist/http/rsvp"
)
type GroupProps struct {

View File

@ -3,9 +3,9 @@ package routing
import (
"net/http"
"lishwist/api/db"
"lishwist/env"
"lishwist/rsvp"
"lishwist/http/api/db"
"lishwist/http/env"
"lishwist/http/rsvp"
)
type HomeProps struct {

View File

@ -1,8 +1,8 @@
package routing
import (
"lishwist/api"
"lishwist/rsvp"
"lishwist/http/api"
"lishwist/http/rsvp"
"net/http"
)

View File

@ -1,7 +1,7 @@
package routing
import (
"lishwist/rsvp"
"lishwist/http/rsvp"
"net/http"
)

View File

@ -3,7 +3,7 @@ package routing
import (
"net/http"
"lishwist/rsvp"
"lishwist/http/rsvp"
)
func NotFound(h http.Header, r *rsvp.Request) rsvp.Response {

View File

@ -1,8 +1,8 @@
package routing
import (
"lishwist/api"
"lishwist/rsvp"
"lishwist/http/api"
"lishwist/http/rsvp"
"net/http"
)

View File

@ -1,8 +1,8 @@
package routing
import (
"lishwist/api/db"
"lishwist/rsvp"
"lishwist/http/api/db"
"lishwist/http/rsvp"
"net/http"
)

View File

@ -1,8 +1,8 @@
package routing
import (
"lishwist/api/db"
"lishwist/rsvp"
"lishwist/http/api/db"
"lishwist/http/rsvp"
"net/http"
)

View File

@ -1,8 +1,8 @@
package routing
import (
"lishwist/api/db"
"lishwist/rsvp"
"lishwist/http/api/db"
"lishwist/http/rsvp"
"net/http"
)

View File

@ -4,7 +4,7 @@ import (
"bytes"
"encoding/json"
"fmt"
"lishwist/templates"
"lishwist/http/templates"
"log"
"net/http"
"strings"