Formatting fixes and move router.go to routers/

Author: ethantkoenig

cmd/web.go

@@ -14,9 +14,10 @@ import (
 	"strings"
 
 	"code.gitea.io/gitea/modules/log"
-	"code.gitea.io/gitea/modules/router"
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/routers"
+	"code.gitea.io/gitea/routers/routes"
+
 	context2 "github.com/gorilla/context"
 	"github.com/urfave/cli"
 )
@@ -58,8 +59,8 @@ func runWeb(ctx *cli.Context) error {
 
 	routers.GlobalInit()
 
-	m := router.NewMacaron()
-	router.RegisterRoutes(m)
+	m := routes.NewMacaron()
+	routes.RegisterRoutes(m)
 
 	// Flag for port number in case first time run conflict.
 	if ctx.IsSet("port") {

integrations/integration_test.go

@@ -5,18 +5,18 @@
 package integrations
 
 import (
+	"bytes"
 	"fmt"
 	"io"
 	"net/http"
 	"os"
 	"testing"
 
 	"code.gitea.io/gitea/models"
-	"code.gitea.io/gitea/modules/router"
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/routers"
+	"code.gitea.io/gitea/routers/routes"
 
-	"bytes"
 	"gopkg.in/macaron.v1"
 	"gopkg.in/testfixtures.v2"
 )
@@ -31,8 +31,8 @@ func TestMain(m *testing.M) {
 	}
 	setting.CustomConf = appIniPath
 	routers.GlobalInit()
-	mac = router.NewMacaron()
-	router.RegisterRoutes(mac)
+	mac = routes.NewMacaron()
+	routes.RegisterRoutes(mac)
 
 	var helper testfixtures.Helper
 	if setting.UseMySQL {

integrations/signup_test.go

@@ -12,6 +12,7 @@ import (
 
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/setting"
+
 	"github.com/stretchr/testify/assert"
 )
 

integrations/sqlite.ini

@@ -52,5 +52,7 @@ LEVEL     = Info
 ROOT_PATH = log
 
 [security]
-INSTALL_LOCK = true
-SECRET_KEY   = 9pCviYTWSb
+INSTALL_LOCK   = true
+SECRET_KEY     = 9pCviYTWSb
+INTERNAL_TOKEN = eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYmYiOjE0OTI3OTU5ODN9.OQkH5UmzID2XBdwQ9TAI6Jj2t1X-wElVTjbE7aoN4I8
+

integrations/view_test.go

@@ -9,6 +9,7 @@ import (
 	"testing"
 
 	"code.gitea.io/gitea/models"
+
 	"github.com/stretchr/testify/assert"
 )
 

modules/router/router.go renamed to routers/routes/routes.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 
-package router
+package routes
 
 import (
 	"os"
@@ -17,15 +17,15 @@ import (
 	"code.gitea.io/gitea/modules/public"
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/templates"
+	"code.gitea.io/gitea/modules/validation"
 	"code.gitea.io/gitea/routers"
 	"code.gitea.io/gitea/routers/admin"
 	apiv1 "code.gitea.io/gitea/routers/api/v1"
 	"code.gitea.io/gitea/routers/dev"
 	"code.gitea.io/gitea/routers/org"
+	"code.gitea.io/gitea/routers/private"
 	"code.gitea.io/gitea/routers/repo"
 	"code.gitea.io/gitea/routers/user"
-	"code.gitea.io/gitea/routers/private"
-	"code.gitea.io/gitea/modules/validation"
 
 	"github.com/go-macaron/binding"
 	"github.com/go-macaron/cache"
@@ -126,7 +126,7 @@ func NewMacaron() *macaron.Macaron {
 	return m
 }
 
-// RegisterRoutes register routes to Macaron
+// RegisterRoutes routes routes to Macaron
 func RegisterRoutes(m *macaron.Macaron) {
 	reqSignIn := context.Toggle(&context.ToggleOptions{SignInRequired: true})
 	ignSignIn := context.Toggle(&context.ToggleOptions{SignInRequired: setting.Service.RequireSignInView})
@@ -170,7 +170,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 				m.Combo("/connect").
 					Get(user.ConnectOpenID).
 					Post(bindIgnErr(auth.ConnectOpenIDForm{}), user.ConnectOpenIDPost)
-				m.Combo("/register").
+				m.Combo("/routes").
 					Get(user.RegisterOpenID).
 					Post(bindIgnErr(auth.SignUpOpenIDForm{}), user.RegisterOpenIDPost)
 			})