Renamed project_routes and template-renderer

cmd/web-api/main.go

@@ -28,7 +28,7 @@ import (
 	"geeks-accelerator/oss/saas-starter-kit/internal/platform/notify"
 	"geeks-accelerator/oss/saas-starter-kit/internal/platform/web/webcontext"
 	"geeks-accelerator/oss/saas-starter-kit/internal/project"
-	"geeks-accelerator/oss/saas-starter-kit/internal/project_route"
+	"geeks-accelerator/oss/saas-starter-kit/internal/webroute"
 	"geeks-accelerator/oss/saas-starter-kit/internal/signup"
 	"geeks-accelerator/oss/saas-starter-kit/internal/user"
 	"geeks-accelerator/oss/saas-starter-kit/internal/user_account"
@@ -437,7 +437,7 @@ func main() {
 	// =========================================================================
 	// Init repositories and AppContext
 
-	projectRoute, err := project_route.New(cfg.Service.BaseUrl, cfg.Project.WebAppBaseUrl)
+	projectRoute, err := webroute.New(cfg.Service.BaseUrl, cfg.Project.WebAppBaseUrl)
 	if err != nil {
 		log.Fatalf("main : project routes : %s: %+v", cfg.Service.BaseUrl, err)
 	}

cmd/web-api/tests/tests_test.go

@@ -24,7 +24,7 @@ import (
 	"geeks-accelerator/oss/saas-starter-kit/internal/platform/web/webcontext"
 	"geeks-accelerator/oss/saas-starter-kit/internal/platform/web/weberror"
 	"geeks-accelerator/oss/saas-starter-kit/internal/project"
-	"geeks-accelerator/oss/saas-starter-kit/internal/project_route"
+	"geeks-accelerator/oss/saas-starter-kit/internal/webroute"
 	"geeks-accelerator/oss/saas-starter-kit/internal/signup"
 	"geeks-accelerator/oss/saas-starter-kit/internal/user"
 	"geeks-accelerator/oss/saas-starter-kit/internal/user_account"
@@ -93,7 +93,7 @@ func testMain(m *testing.M) int {
 	log := test.Log
 	log.SetOutput(ioutil.Discard)
 
-	projectRoute, err := project_route.New("http://web-api.com", "http://web-app.com")
+	projectRoute, err := webroute.New("http://web-api.com", "http://web-app.com")
 	if err != nil {
 		panic(err)
 	}

cmd/web-app/handlers/root.go

@@ -8,7 +8,7 @@ import (
 	"geeks-accelerator/oss/saas-starter-kit/internal/platform/auth"
 	"geeks-accelerator/oss/saas-starter-kit/internal/platform/web"
 	"geeks-accelerator/oss/saas-starter-kit/internal/platform/web/webcontext"
-	"geeks-accelerator/oss/saas-starter-kit/internal/project_route"
+	"geeks-accelerator/oss/saas-starter-kit/internal/webroute"
 
 	"github.com/ikeikeikeike/go-sitemap-generator/v2/stm"
 	"github.com/pkg/errors"
@@ -21,7 +21,7 @@ import (
 type Root struct {
 	Renderer     web.Renderer
 	Sitemap      *stm.Sitemap
-	ProjectRoute project_route.ProjectRoute
+	ProjectRoute webroute.ProjectRoute
 }
 
 // Index determines if the user has authentication and loads the associated page.

cmd/web-app/handlers/routes.go

@@ -18,7 +18,7 @@ import (
 	"geeks-accelerator/oss/saas-starter-kit/internal/platform/web/webcontext"
 	"geeks-accelerator/oss/saas-starter-kit/internal/platform/web/weberror"
 	"geeks-accelerator/oss/saas-starter-kit/internal/project"
-	"geeks-accelerator/oss/saas-starter-kit/internal/project_route"
+	"geeks-accelerator/oss/saas-starter-kit/internal/webroute"
 	"geeks-accelerator/oss/saas-starter-kit/internal/signup"
 	"geeks-accelerator/oss/saas-starter-kit/internal/user"
 	"geeks-accelerator/oss/saas-starter-kit/internal/user_account"
@@ -56,7 +56,7 @@ type AppContext struct {
 	StaticDir         string
 	TemplateDir       string
 	Renderer          web.Renderer
-	ProjectRoute      project_route.ProjectRoute
+	ProjectRoute      webroute.ProjectRoute
 	PreAppMiddleware  []web.Middleware
 	PostAppMiddleware []web.Middleware
 	AwsSession        *session.Session

cmd/web-app/main.go

@@ -30,11 +30,11 @@ import (
 	img_resize "geeks-accelerator/oss/saas-starter-kit/internal/platform/img-resize"
 	"geeks-accelerator/oss/saas-starter-kit/internal/platform/notify"
 	"geeks-accelerator/oss/saas-starter-kit/internal/platform/web"
-	template_renderer "geeks-accelerator/oss/saas-starter-kit/internal/platform/web/template-renderer"
+	template_renderer "geeks-accelerator/oss/saas-starter-kit/internal/platform/web/tmplrender"
 	"geeks-accelerator/oss/saas-starter-kit/internal/platform/web/webcontext"
 	"geeks-accelerator/oss/saas-starter-kit/internal/platform/web/weberror"
 	"geeks-accelerator/oss/saas-starter-kit/internal/project"
-	"geeks-accelerator/oss/saas-starter-kit/internal/project_route"
+	"geeks-accelerator/oss/saas-starter-kit/internal/webroute"
 	"geeks-accelerator/oss/saas-starter-kit/internal/signup"
 	"geeks-accelerator/oss/saas-starter-kit/internal/user"
 	"geeks-accelerator/oss/saas-starter-kit/internal/user_account"
@@ -440,7 +440,7 @@ func main() {
 	// =========================================================================
 	// Init repositories and AppContext
 
-	projectRoute, err := project_route.New(cfg.Project.WebApiBaseUrl, cfg.Service.BaseUrl)
+	projectRoute, err := webroute.New(cfg.Project.WebApiBaseUrl, cfg.Service.BaseUrl)
 	if err != nil {
 		log.Fatalf("main : project routes : %+v", cfg.Service.BaseUrl, err)
 	}

internal/platform/web/tmplrender/tmplrender.go

@@ -1,4 +1,4 @@
-package template_renderer
+package tmplrender
 
 import (
 	"context"

internal/webroute/webroute.go

@@ -1,12 +1,13 @@
-package project_route
+package webroute
 
 import (
 	"fmt"
-	"github.com/pkg/errors"
 	"net"
 	"net/url"
 	"os"
 	"strings"
+
+	"github.com/pkg/errors"
 )
 
 type ProjectRoute struct {