Merge pull request #140 from confetti-framework/framework

Moving base Confetti Framework components
confetti-framework · May 21, 2022 · 868d974 · 868d974
2 parents ee166ec + 22e73b5
commit 868d974
Show file tree

Hide file tree

Showing 30 changed files with 110 additions and 155 deletions.
diff --git a/app/console/commands/example_command.go b/app/console/commands/example_command.go
@@ -1,7 +1,7 @@
 package commands
 
 import (
-	"github.com/confetti-framework/contract/inter"
+	"github.com/confetti-framework/framework/inter"
 )
 
 // ExampleCommand to give you an example of what a command might look like.

diff --git a/app/console/kernel.go b/app/console/kernel.go
@@ -2,8 +2,8 @@ package console
 
 import (
 	"flag"
-	"github.com/confetti-framework/contract/inter"
-	"github.com/confetti-framework/foundation/console"
+	"github.com/confetti-framework/framework/foundation/console"
+	"github.com/confetti-framework/framework/inter"
 	"src/app/console/commands"
 	"src/app/console/getters"
 )

diff --git a/app/http/controllers/homepage.go b/app/http/controllers/homepage.go
@@ -1,8 +1,8 @@
 package controllers
 
 import (
-	"github.com/confetti-framework/contract/inter"
-	"github.com/confetti-framework/foundation/http/outcome"
+	"github.com/confetti-framework/framework/foundation/http/outcome"
+	"github.com/confetti-framework/framework/inter"
 	"src/resources/views"
 )
 

diff --git a/app/http/controllers/ping.go b/app/http/controllers/ping.go
@@ -1,8 +1,8 @@
 package controllers
 
 import (
-	"github.com/confetti-framework/contract/inter"
-	"github.com/confetti-framework/foundation/http/outcome"
+	"github.com/confetti-framework/framework/foundation/http/outcome"
+	"github.com/confetti-framework/framework/inter"
 	net "net/http"
 )
 

diff --git a/app/http/decorator/boot_providers.go b/app/http/decorator/boot_providers.go
@@ -1,7 +1,7 @@
 package decorator
 
 import (
-	"github.com/confetti-framework/contract/inter"
+	"github.com/confetti-framework/framework/inter"
 	"src/app/providers"
 )
 

diff --git a/app/http/decorator/bootstrap_container.go b/app/http/decorator/bootstrap_container.go
@@ -1,9 +1,9 @@
 package decorator
 
 import (
-	"github.com/confetti-framework/contract/inter"
-	"github.com/confetti-framework/foundation"
-	"github.com/confetti-framework/foundation/decorator/container_decorator"
+	"github.com/confetti-framework/framework/foundation"
+	"github.com/confetti-framework/framework/foundation/decorator/container_decorator"
+	"github.com/confetti-framework/framework/inter"
 )
 
 var bootstraps = []inter.Bootstrap{

diff --git a/app/http/decorator/register_providers.go b/app/http/decorator/register_providers.go
@@ -1,7 +1,7 @@
 package decorator
 
 import (
-	"github.com/confetti-framework/contract/inter"
+	"github.com/confetti-framework/framework/inter"
 	"src/app/providers"
 )
 

diff --git a/app/http/kernel.go b/app/http/kernel.go
@@ -1,11 +1,11 @@
 package http
 
 import (
-	"github.com/confetti-framework/contract/inter"
-	"github.com/confetti-framework/foundation/http"
+	"github.com/confetti-framework/framework/foundation/http"
+	"github.com/confetti-framework/framework/inter"
 )
 
-// NewKernel generates a HTTP Kernel. The kernel is responsible
+// NewKernel generates an HTTP Kernel. The kernel is responsible
 // for building the middlewares and calling the controller.
 func NewKernel(app inter.App) http.Kernel {
 	return http.Kernel{App: &app}

diff --git a/app/http/middleware/api.go b/app/http/middleware/api.go
@@ -1,9 +1,9 @@
 package middleware
 
 import (
-	"github.com/confetti-framework/contract/inter"
-	"github.com/confetti-framework/foundation/http/middleware"
-	"github.com/confetti-framework/foundation/http/outcome"
+	"github.com/confetti-framework/framework/foundation/http/middleware"
+	"github.com/confetti-framework/framework/foundation/http/outcome"
+	"github.com/confetti-framework/framework/inter"
 )
 
 // Api contains all middlewares that only apply to the API endpoints.

diff --git a/app/http/middleware/route_model_binding.go b/app/http/middleware/route_model_binding.go
@@ -1,7 +1,7 @@
 package middleware
 
 import (
-	"github.com/confetti-framework/contract/inter"
+	"github.com/confetti-framework/framework/inter"
 )
 
 // RouteModelBinding For simple transformation of a parameter to a model, you can bind a

diff --git a/app/http/middleware/web.go b/app/http/middleware/web.go
@@ -1,9 +1,9 @@
 package middleware
 
 import (
-	"github.com/confetti-framework/contract/inter"
-	"github.com/confetti-framework/foundation/http/middleware"
-	"github.com/confetti-framework/foundation/http/outcome"
+	"github.com/confetti-framework/framework/foundation/http/middleware"
+	"github.com/confetti-framework/framework/foundation/http/outcome"
+	"github.com/confetti-framework/framework/inter"
 )
 
 // Web contains all middlewares that only apply to the web pages.

diff --git a/app/providers/app_service_provider.go b/app/providers/app_service_provider.go
@@ -1,7 +1,7 @@
 package providers
 
 import (
-	"github.com/confetti-framework/contract/inter"
+	"github.com/confetti-framework/framework/inter"
 )
 
 // AppServiceProvider contains all providers

diff --git a/app/providers/env_service_provider.go b/app/providers/env_service_provider.go
@@ -1,7 +1,7 @@
 package providers
 
 import (
-	"github.com/confetti-framework/contract/inter"
+	"github.com/confetti-framework/framework/inter"
 	"src/config"
 )
 

diff --git a/app/providers/provider_index.go b/app/providers/provider_index.go
@@ -1,8 +1,8 @@
 package providers
 
 import (
-	"github.com/confetti-framework/contract/inter"
-	"github.com/confetti-framework/foundation/providers"
+	"github.com/confetti-framework/framework/foundation/providers"
+	"github.com/confetti-framework/framework/inter"
 	"src/config"
 )
 

diff --git a/app/providers/response_service_provider.go b/app/providers/response_service_provider.go
@@ -1,9 +1,9 @@
 package providers
 
 import (
-	"github.com/confetti-framework/contract/inter"
-	decorator "github.com/confetti-framework/foundation/decorator/response_decorator"
-	"github.com/confetti-framework/foundation/encoder"
+	decorator "github.com/confetti-framework/framework/foundation/decorator/response_decorator"
+	"github.com/confetti-framework/framework/foundation/encoder"
+	"github.com/confetti-framework/framework/inter"
 	net "net/http"
 	"src/resources/views"
 )

diff --git a/app/providers/route_service_provider.go b/app/providers/route_service_provider.go
@@ -1,9 +1,9 @@
 package providers
 
 import (
-	"github.com/confetti-framework/contract/inter"
-	foundationMiddleware "github.com/confetti-framework/foundation/http/middleware"
-	"github.com/confetti-framework/foundation/http/routing"
+	foundationMiddleware "github.com/confetti-framework/framework/foundation/http/middleware"
+	"github.com/confetti-framework/framework/foundation/http/routing"
+	"github.com/confetti-framework/framework/inter"
 	"src/app/http/middleware"
 	"src/routes"
 )

diff --git a/app/providers/view_service_provider.go b/app/providers/view_service_provider.go
@@ -1,8 +1,8 @@
 package providers
 
 import (
-	"github.com/confetti-framework/contract/inter"
-	"github.com/confetti-framework/validation/val_errors"
+	"github.com/confetti-framework/framework/inter"
+	"github.com/confetti-framework/framework/validation/val_errors"
 	"html/template"
 	"src/config"
 	"strings"

diff --git a/bootstrap/app.go b/bootstrap/app.go
@@ -1,8 +1,8 @@
 package bootstrap
 
 import (
-	"github.com/confetti-framework/contract/inter"
-	"github.com/confetti-framework/foundation"
+	"github.com/confetti-framework/framework/foundation"
+	"github.com/confetti-framework/framework/inter"
 	"src/app/console"
 	"src/app/http"
 	"src/app/http/decorator"

diff --git a/config/app.go b/config/app.go
@@ -1,7 +1,7 @@
 package config
 
 import (
-	"github.com/confetti-framework/support/env"
+	"github.com/confetti-framework/framework/support/env"
 	"golang.org/x/text/language"
 	"os"
 	"time"

diff --git a/config/database.go b/config/database.go
@@ -1,8 +1,8 @@
 package config
 
 import (
-	"github.com/confetti-framework/contract/inter"
-	"github.com/confetti-framework/support/env"
+	"github.com/confetti-framework/framework/inter"
+	"github.com/confetti-framework/framework/support/env"
 )
 
 var Database = struct {
@@ -35,15 +35,15 @@ var Database = struct {
 
 	Connections: map[string]inter.Connection{
 		/*
-		"mysql": &db.MySQL{
-			Host:         env.StringOr("DB_HOST", "127.0.0.1"),
-			Port:         env.IntOr("DB_PORT", 3306),
-			Database:     env.StringOr("DB_DATABASE", "confetti"),
-			Username:     env.StringOr("DB_USERNAME", "app"),
-			Password:     env.StringOr("DB_PASSWORD", ""),
-			QueryTimeout: 10 * time.Second,
-		},
-		 */
+			"mysql": &db.MySQL{
+				Host:         env.StringOr("DB_HOST", "127.0.0.1"),
+				Port:         env.IntOr("DB_PORT", 3306),
+				Database:     env.StringOr("DB_DATABASE", "confetti"),
+				Username:     env.StringOr("DB_USERNAME", "app"),
+				Password:     env.StringOr("DB_PASSWORD", ""),
+				QueryTimeout: 10 * time.Second,
+			},
+		*/
 
 		/*
 			"postgresql": &db.PostgreSQL{

diff --git a/config/errors.go b/config/errors.go
@@ -1,7 +1,7 @@
 package config
 
 import (
-	"github.com/confetti-framework/foundation/http/routing"
+	"github.com/confetti-framework/framework/foundation/http/routing"
 	"src/app/report"
 )
 

diff --git a/config/logging.go b/config/logging.go
@@ -1,9 +1,9 @@
 package config
 
 import (
-	"github.com/confetti-framework/contract/inter"
-	"github.com/confetti-framework/foundation/loggers"
-	"github.com/confetti-framework/support/env"
+	"github.com/confetti-framework/framework/foundation/loggers"
+	"github.com/confetti-framework/framework/inter"
+	"github.com/confetti-framework/framework/support/env"
 	"github.com/confetti-framework/syslog/log_level"
 	"os"
 )

diff --git a/go.mod b/go.mod
@@ -1,32 +1,29 @@
 module src
 
-go 1.17
+go 1.18
 
 require (
-	github.com/confetti-framework/contract v0.3.0
 	github.com/confetti-framework/errors v0.12.0
-	github.com/confetti-framework/foundation v0.13.0
-	github.com/confetti-framework/support v0.5.1
+	github.com/confetti-framework/framework v0.29.4-beta
 	github.com/confetti-framework/syslog v0.1.1
-	github.com/confetti-framework/validation v0.1.0
 	golang.org/x/text v0.3.7
 )
 
 require (
-	github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
+	github.com/chzyer/readline v1.5.0 // indirect
 	github.com/confetti-framework/baker v1.1.1 // indirect
 	github.com/go-sql-driver/mysql v1.6.0 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/gorilla/mux v1.8.0 // indirect
 	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
-	github.com/jackc/pgconn v1.11.0 // indirect
+	github.com/jackc/pgconn v1.12.1 // indirect
 	github.com/jackc/pgio v1.0.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
-	github.com/jackc/pgproto3/v2 v2.2.0 // indirect
+	github.com/jackc/pgproto3/v2 v2.3.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
-	github.com/jackc/pgtype v1.10.0 // indirect
-	github.com/jackc/pgx/v4 v4.15.0 // indirect
-	github.com/jedib0t/go-pretty/v6 v6.2.7 // indirect
+	github.com/jackc/pgtype v1.11.0 // indirect
+	github.com/jackc/pgx/v4 v4.16.1 // indirect
+	github.com/jedib0t/go-pretty/v6 v6.3.1 // indirect
 	github.com/joho/godotenv v1.4.0 // indirect
 	github.com/manifoldco/promptui v0.9.0 // indirect
 	github.com/mattn/go-runewidth v0.0.13 // indirect
@@ -35,15 +32,15 @@ require (
 	github.com/peterh/liner v1.2.2 // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
 	github.com/schollz/progressbar/v3 v3.8.6 // indirect
-	github.com/spf13/cast v1.4.1 // indirect
-	github.com/tidwall/gjson v1.14.0 // indirect
+	github.com/spf13/cast v1.5.0 // indirect
+	github.com/tidwall/gjson v1.14.1 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.0 // indirect
 	github.com/vigneshuvi/GoDateFormat v0.0.0-20210204121036-67364dc23c79 // indirect
-	golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
-	golang.org/x/mod v0.5.1 // indirect
-	golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9 // indirect
-	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
-	golang.org/x/tools v0.1.9 // indirect
-	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
+	golang.org/x/crypto v0.0.0-20220511200225-c6db032c6c88 // indirect
+	golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
+	golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 // indirect
+	golang.org/x/term v0.0.0-20220411215600-e5f449aeb171 // indirect
+	golang.org/x/tools v0.1.10 // indirect
+	golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect
 )