diff --git a/Makefile b/Makefile index 29da659..610e5f4 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ migrate: .PHONY: backend backend: - go build -v -o api -ldflags="-buildid= -X gitlab.com/1f320/pronouns/backend/server.Revision=`git rev-parse --short HEAD`" ./backend + go build -v -o api -ldflags="-buildid= -X codeberg.org/u1f320/pronouns.cc/backend/server.Revision=`git rev-parse --short HEAD`" ./backend .PHONY: frontend frontend: diff --git a/backend/main.go b/backend/main.go index ee251d8..7d4c64c 100644 --- a/backend/main.go +++ b/backend/main.go @@ -6,8 +6,8 @@ import ( "os" "os/signal" - "gitlab.com/1f320/pronouns/backend/log" - "gitlab.com/1f320/pronouns/backend/server" + "codeberg.org/u1f320/pronouns.cc/backend/log" + "codeberg.org/u1f320/pronouns.cc/backend/server" _ "github.com/joho/godotenv/autoload" ) diff --git a/backend/routes.go b/backend/routes.go index 5eac2c8..a9159e8 100644 --- a/backend/routes.go +++ b/backend/routes.go @@ -1,10 +1,10 @@ package main import ( + "codeberg.org/u1f320/pronouns.cc/backend/routes/auth" + "codeberg.org/u1f320/pronouns.cc/backend/routes/user" + "codeberg.org/u1f320/pronouns.cc/backend/server" "github.com/go-chi/chi/v5" - "gitlab.com/1f320/pronouns/backend/routes/auth" - "gitlab.com/1f320/pronouns/backend/routes/user" - "gitlab.com/1f320/pronouns/backend/server" ) // mountRoutes mounts all API routes on the server's router. diff --git a/backend/routes/auth/discord.go b/backend/routes/auth/discord.go index 8e7440a..267076c 100644 --- a/backend/routes/auth/discord.go +++ b/backend/routes/auth/discord.go @@ -5,11 +5,11 @@ import ( "net/http" "os" + "codeberg.org/u1f320/pronouns.cc/backend/db" + "codeberg.org/u1f320/pronouns.cc/backend/log" + "codeberg.org/u1f320/pronouns.cc/backend/server" "github.com/bwmarrin/discordgo" "github.com/go-chi/render" - "gitlab.com/1f320/pronouns/backend/db" - "gitlab.com/1f320/pronouns/backend/log" - "gitlab.com/1f320/pronouns/backend/server" "golang.org/x/oauth2" ) diff --git a/backend/routes/auth/routes.go b/backend/routes/auth/routes.go index 6586dc0..80f6fea 100644 --- a/backend/routes/auth/routes.go +++ b/backend/routes/auth/routes.go @@ -3,11 +3,11 @@ package auth import ( "net/http" + "codeberg.org/u1f320/pronouns.cc/backend/log" + "codeberg.org/u1f320/pronouns.cc/backend/server" "emperror.dev/errors" "github.com/go-chi/chi/v5" "github.com/go-chi/render" - "gitlab.com/1f320/pronouns/backend/log" - "gitlab.com/1f320/pronouns/backend/server" ) type Server struct { diff --git a/backend/routes/user/get_user.go b/backend/routes/user/get_user.go index c7edfac..c03c0a7 100644 --- a/backend/routes/user/get_user.go +++ b/backend/routes/user/get_user.go @@ -3,12 +3,12 @@ package user import ( "net/http" + "codeberg.org/u1f320/pronouns.cc/backend/db" + "codeberg.org/u1f320/pronouns.cc/backend/log" + "codeberg.org/u1f320/pronouns.cc/backend/server" "github.com/go-chi/chi/v5" "github.com/go-chi/render" "github.com/rs/xid" - "gitlab.com/1f320/pronouns/backend/db" - "gitlab.com/1f320/pronouns/backend/log" - "gitlab.com/1f320/pronouns/backend/server" ) type GetUserResponse struct { diff --git a/backend/routes/user/routes.go b/backend/routes/user/routes.go index fda9f9c..82ad326 100644 --- a/backend/routes/user/routes.go +++ b/backend/routes/user/routes.go @@ -1,8 +1,8 @@ package user import ( + "codeberg.org/u1f320/pronouns.cc/backend/server" "github.com/go-chi/chi/v5" - "gitlab.com/1f320/pronouns/backend/server" ) type Server struct { diff --git a/backend/server/auth.go b/backend/server/auth.go index 16444e4..08c4861 100644 --- a/backend/server/auth.go +++ b/backend/server/auth.go @@ -4,8 +4,8 @@ import ( "context" "net/http" + "codeberg.org/u1f320/pronouns.cc/backend/server/auth" "github.com/go-chi/render" - "gitlab.com/1f320/pronouns/backend/server/auth" ) // maybeAuth is a globally-used middleware. diff --git a/backend/server/auth/auth.go b/backend/server/auth/auth.go index 2a60154..8d756ce 100644 --- a/backend/server/auth/auth.go +++ b/backend/server/auth/auth.go @@ -6,10 +6,10 @@ import ( "os" "time" + "codeberg.org/u1f320/pronouns.cc/backend/log" "emperror.dev/errors" "github.com/golang-jwt/jwt/v4" "github.com/rs/xid" - "gitlab.com/1f320/pronouns/backend/log" ) // Claims are the claims used in a token. diff --git a/backend/server/errors.go b/backend/server/errors.go index 8440dfd..68108f1 100644 --- a/backend/server/errors.go +++ b/backend/server/errors.go @@ -4,8 +4,8 @@ import ( "fmt" "net/http" + "codeberg.org/u1f320/pronouns.cc/backend/log" "github.com/go-chi/render" - "gitlab.com/1f320/pronouns/backend/log" ) // WrapHandler wraps a modified http.HandlerFunc into a stdlib-compatible one. diff --git a/backend/server/server.go b/backend/server/server.go index e88e178..f145fbf 100644 --- a/backend/server/server.go +++ b/backend/server/server.go @@ -3,10 +3,10 @@ package server import ( "os" + "codeberg.org/u1f320/pronouns.cc/backend/db" + "codeberg.org/u1f320/pronouns.cc/backend/server/auth" "github.com/go-chi/chi/v5" "github.com/go-chi/chi/v5/middleware" - "gitlab.com/1f320/pronouns/backend/db" - "gitlab.com/1f320/pronouns/backend/server/auth" ) // Revision is the git commit, filled at build time diff --git a/frontend/src/pages/Home.tsx b/frontend/src/pages/Home.tsx index 404b8bd..b40bc71 100644 --- a/frontend/src/pages/Home.tsx +++ b/frontend/src/pages/Home.tsx @@ -10,7 +10,7 @@ useful for plurality ([what?](https://morethanone.info/)) and kin, or even just For now though, there's just this landing page <3 (And no, the "Log in" button doesn't do anything either.) -Check out the (work in progress) source code on [GitLab](https://gitlab.com/1f320/pronouns)!`; +Check out the (work in progress) source code on [Codeberg](https://codeberg.org/u1f320/pronouns.cc)!`; function Home() { return ( diff --git a/go.mod b/go.mod index 2c9d4f0..c4a248d 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module gitlab.com/1f320/pronouns +module codeberg.org/u1f320/pronouns.cc go 1.18