diff --git a/main.go b/cmd/build/main.go similarity index 93% rename from main.go rename to cmd/build/main.go index 023d57b..878b1a2 100644 --- a/main.go +++ b/cmd/build/main.go @@ -9,13 +9,13 @@ import ( "strconv" "github.com/FrankenBotDev/FrankenAPI/ent/authorizables" - "github.com/FrankenBotDev/FrankenAPI/pkg/actions" - "github.com/FrankenBotDev/FrankenAPI/pkg/logger" - "github.com/FrankenBotDev/FrankenAPI/pkg/punishments" + "github.com/FrankenBotDev/FrankenAPI/pkg/routes/actions" + "github.com/FrankenBotDev/FrankenAPI/pkg/routes/logger" + "github.com/FrankenBotDev/FrankenAPI/pkg/routes/punishments" "github.com/FrankenBotDev/FrankenAPI/pkg/security" - "github.com/FrankenBotDev/FrankenAPI/pkg/settings" - "github.com/FrankenBotDev/FrankenAPI/pkg/stats" - "github.com/FrankenBotDev/FrankenAPI/pkg/support" + "github.com/FrankenBotDev/FrankenAPI/pkg/routes/settings" + "github.com/FrankenBotDev/FrankenAPI/pkg/routes/stats" + "github.com/FrankenBotDev/FrankenAPI/pkg/routes/support" "github.com/FrankenBotDev/FrankenAPI/pkg/sys" "github.com/joho/godotenv" "gopkg.in/olahol/melody.v1" @@ -197,5 +197,6 @@ func main() { delete(gophers, s) }) - http.ListenAndServe(":3000", r) + fmt.Println("API Online on 0.0.0.0:3000") + http.ListenAndServe("0.0.0.0:3000", r) } diff --git a/go.mod b/go.mod index 0b32f8d..4a15911 100644 --- a/go.mod +++ b/go.mod @@ -9,6 +9,7 @@ require ( github.com/go-chi/jwtauth/v5 v5.0.2 github.com/jackc/pgx/v4 v4.16.1 github.com/joho/godotenv v1.4.0 + gopkg.in/olahol/melody.v1 v1.0.0-20170518105555-d52139073376 ) require ( @@ -41,5 +42,4 @@ require ( golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 // indirect golang.org/x/mod v0.5.1 // indirect golang.org/x/text v0.3.7 // indirect - gopkg.in/olahol/melody.v1 v1.0.0-20170518105555-d52139073376 // indirect ) diff --git a/pkg/actions/actions.go b/pkg/routes/actions/actions.go similarity index 99% rename from pkg/actions/actions.go rename to pkg/routes/actions/actions.go index e55db54..1bd5bd5 100644 --- a/pkg/actions/actions.go +++ b/pkg/routes/actions/actions.go @@ -10,7 +10,7 @@ import ( "github.com/FrankenBotDev/FrankenAPI/ent" "github.com/FrankenBotDev/FrankenAPI/ent/actions" - "github.com/FrankenBotDev/FrankenAPI/pkg/logger" + "github.com/FrankenBotDev/FrankenAPI/pkg/routes/logger" "github.com/FrankenBotDev/FrankenAPI/pkg/sys" "github.com/go-chi/chi/v5" ) diff --git a/pkg/logger/logger.go b/pkg/routes/logger/logger.go similarity index 100% rename from pkg/logger/logger.go rename to pkg/routes/logger/logger.go diff --git a/pkg/punishments/punishments.go b/pkg/routes/punishments/punishments.go similarity index 98% rename from pkg/punishments/punishments.go rename to pkg/routes/punishments/punishments.go index f212d53..7d79a52 100644 --- a/pkg/punishments/punishments.go +++ b/pkg/routes/punishments/punishments.go @@ -8,7 +8,7 @@ import ( "github.com/FrankenBotDev/FrankenAPI/ent" "github.com/FrankenBotDev/FrankenAPI/ent/punishments" - "github.com/FrankenBotDev/FrankenAPI/pkg/logger" + "github.com/FrankenBotDev/FrankenAPI/pkg/routes/logger" "github.com/FrankenBotDev/FrankenAPI/pkg/sys" "github.com/go-chi/chi/v5" ) diff --git a/pkg/settings/settings.go b/pkg/routes/settings/settings.go similarity index 99% rename from pkg/settings/settings.go rename to pkg/routes/settings/settings.go index b7ce0cd..c7229af 100644 --- a/pkg/settings/settings.go +++ b/pkg/routes/settings/settings.go @@ -11,7 +11,7 @@ import ( "github.com/FrankenBotDev/FrankenAPI/ent" "github.com/FrankenBotDev/FrankenAPI/ent/settings" "github.com/FrankenBotDev/FrankenAPI/ent/socialmedia" - "github.com/FrankenBotDev/FrankenAPI/pkg/logger" + "github.com/FrankenBotDev/FrankenAPI/pkg/routes/logger" "github.com/FrankenBotDev/FrankenAPI/pkg/sys" "github.com/go-chi/chi/v5" ) diff --git a/pkg/stats/stats.go b/pkg/routes/stats/stats.go similarity index 99% rename from pkg/stats/stats.go rename to pkg/routes/stats/stats.go index ab7e01e..5e34b19 100644 --- a/pkg/stats/stats.go +++ b/pkg/routes/stats/stats.go @@ -11,7 +11,7 @@ import ( "github.com/FrankenBotDev/FrankenAPI/ent" "github.com/FrankenBotDev/FrankenAPI/ent/user" - "github.com/FrankenBotDev/FrankenAPI/pkg/logger" + "github.com/FrankenBotDev/FrankenAPI/pkg/routes/logger" "github.com/FrankenBotDev/FrankenAPI/pkg/sys" "github.com/go-chi/chi/v5" ) diff --git a/pkg/support/support.go b/pkg/routes/support/support.go similarity index 99% rename from pkg/support/support.go rename to pkg/routes/support/support.go index cc57e3e..f7121b0 100644 --- a/pkg/support/support.go +++ b/pkg/routes/support/support.go @@ -12,7 +12,7 @@ import ( "github.com/FrankenBotDev/FrankenAPI/ent" "github.com/FrankenBotDev/FrankenAPI/ent/support" "github.com/FrankenBotDev/FrankenAPI/ent/supportresponse" - "github.com/FrankenBotDev/FrankenAPI/pkg/logger" + "github.com/FrankenBotDev/FrankenAPI/pkg/routes/logger" "github.com/FrankenBotDev/FrankenAPI/pkg/sys" "github.com/go-chi/chi/v5" )