Shuffle around package directories

cmd/blog/main.go

@@ -10,7 +10,7 @@ import (
 	"os"
 
 	"github.com/kirsle/blog/core"
-	"github.com/kirsle/blog/core/jsondb"
+	"github.com/kirsle/blog/jsondb"
 )
 
 // Build-time config constants.

cmd/rophako-import/main.go

@@ -16,7 +16,7 @@ import (
 	"time"
 
 	"github.com/google/uuid"
-	"github.com/kirsle/blog/core/jsondb"
+	"github.com/kirsle/blog/jsondb"
 	"github.com/kirsle/blog/core/models/comments"
 	"github.com/kirsle/blog/core/models/posts"
 	"github.com/kirsle/golog"

core/admin.go

@@ -11,10 +11,10 @@ import (
 	"strings"
 
 	"github.com/gorilla/mux"
-	"github.com/kirsle/blog/core/caches/null"
-	"github.com/kirsle/blog/core/caches/redis"
-	"github.com/kirsle/blog/core/forms"
-	"github.com/kirsle/blog/core/models/settings"
+	"github.com/kirsle/blog/jsondb/caches/null"
+	"github.com/kirsle/blog/jsondb/caches/redis"
+	"github.com/kirsle/blog/core/internal/forms"
+	"github.com/kirsle/blog/core/internal/models/settings"
 	"github.com/urfave/negroni"
 )
 

core/app.go

@@ -7,14 +7,14 @@ import (
 
 	"github.com/gorilla/mux"
 	"github.com/gorilla/sessions"
-	"github.com/kirsle/blog/core/caches"
-	"github.com/kirsle/blog/core/caches/null"
-	"github.com/kirsle/blog/core/caches/redis"
-	"github.com/kirsle/blog/core/jsondb"
-	"github.com/kirsle/blog/core/models/comments"
-	"github.com/kirsle/blog/core/models/posts"
-	"github.com/kirsle/blog/core/models/settings"
-	"github.com/kirsle/blog/core/models/users"
+	"github.com/kirsle/blog/jsondb/caches"
+	"github.com/kirsle/blog/jsondb/caches/null"
+	"github.com/kirsle/blog/jsondb/caches/redis"
+	"github.com/kirsle/blog/jsondb"
+	"github.com/kirsle/blog/core/internal/models/comments"
+	"github.com/kirsle/blog/core/internal/models/posts"
+	"github.com/kirsle/blog/core/internal/models/settings"
+	"github.com/kirsle/blog/core/internal/models/users"
 	"github.com/shurcooL/github_flavored_markdown/gfmstyle"
 	"github.com/urfave/negroni"
 )

core/auth.go

@@ -5,8 +5,8 @@ import (
 	"net/http"
 
 	"github.com/gorilla/mux"
-	"github.com/kirsle/blog/core/forms"
-	"github.com/kirsle/blog/core/models/users"
+	"github.com/kirsle/blog/core/internal/forms"
+	"github.com/kirsle/blog/core/internal/models/users"
 )
 
 // AuthRoutes attaches the auth routes to the app.

core/blog.go

@@ -13,10 +13,10 @@ import (
 
 	"github.com/gorilla/feeds"
 	"github.com/gorilla/mux"
-	"github.com/kirsle/blog/core/models/comments"
-	"github.com/kirsle/blog/core/models/posts"
-	"github.com/kirsle/blog/core/models/settings"
-	"github.com/kirsle/blog/core/models/users"
+	"github.com/kirsle/blog/core/internal/models/comments"
+	"github.com/kirsle/blog/core/internal/models/posts"
+	"github.com/kirsle/blog/core/internal/models/settings"
+	"github.com/kirsle/blog/core/internal/models/users"
 	"github.com/urfave/negroni"
 )
 

core/comments.go

@@ -11,8 +11,8 @@ import (
 	"github.com/google/uuid"
 	"github.com/gorilla/mux"
 	"github.com/gorilla/sessions"
-	"github.com/kirsle/blog/core/models/comments"
-	"github.com/kirsle/blog/core/models/users"
+	"github.com/kirsle/blog/core/internal/models/comments"
+	"github.com/kirsle/blog/core/internal/models/users"
 )
 
 // CommentRoutes attaches the comment routes to the app.

core/contact.go

@@ -9,8 +9,8 @@ import (
 	"time"
 
 	"github.com/gorilla/mux"
-	"github.com/kirsle/blog/core/forms"
-	"github.com/kirsle/blog/core/models/settings"
+	"github.com/kirsle/blog/core/internal/forms"
+	"github.com/kirsle/blog/core/internal/models/settings"
 )
 
 // ContactRoutes attaches the contact URL to the app.

core/initial-setup.go

@@ -4,9 +4,9 @@ import (
 	"net/http"
 
 	"github.com/gorilla/sessions"
-	"github.com/kirsle/blog/core/forms"
-	"github.com/kirsle/blog/core/models/settings"
-	"github.com/kirsle/blog/core/models/users"
+	"github.com/kirsle/blog/core/internal/forms"
+	"github.com/kirsle/blog/core/internal/models/settings"
+	"github.com/kirsle/blog/core/internal/models/users"
 )
 
 // SetupHandler is the initial blog setup route.

core/internal/models/comments/comments.go

@@ -11,7 +11,7 @@ import (
 	"time"
 
 	"github.com/google/uuid"
-	"github.com/kirsle/blog/core/jsondb"
+	"github.com/kirsle/blog/jsondb"
 	"github.com/kirsle/golog"
 )
 

core/internal/models/posts/posts.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/kirsle/blog/core/jsondb"
+	"github.com/kirsle/blog/jsondb"
 	"github.com/kirsle/golog"
 )
 

core/internal/models/settings/settings.go

@@ -4,7 +4,7 @@ import (
 	"crypto/rand"
 	"encoding/base64"
 
-	"github.com/kirsle/blog/core/jsondb"
+	"github.com/kirsle/blog/jsondb"
 )
 
 // DB is a reference to the parent app's JsonDB object.

core/internal/models/users/users.go

@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/kirsle/blog/core/jsondb"
+	"github.com/kirsle/blog/jsondb"
 	"golang.org/x/crypto/bcrypt"
 )
 

core/mail.go

@@ -8,8 +8,8 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/kirsle/blog/core/models/comments"
-	"github.com/kirsle/blog/core/models/settings"
+	"github.com/kirsle/blog/core/internal/models/comments"
+	"github.com/kirsle/blog/core/internal/models/settings"
 	"github.com/microcosm-cc/bluemonday"
 	gomail "gopkg.in/gomail.v2"
 )

core/middleware.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/gorilla/sessions"
-	"github.com/kirsle/blog/core/models/users"
+	"github.com/kirsle/blog/core/internal/models/users"
 )
 
 type key int

core/templates.go

@@ -7,9 +7,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/kirsle/blog/core/forms"
-	"github.com/kirsle/blog/core/models/settings"
-	"github.com/kirsle/blog/core/models/users"
+	"github.com/kirsle/blog/core/internal/forms"
+	"github.com/kirsle/blog/core/internal/models/settings"
+	"github.com/kirsle/blog/core/internal/models/users"
 )
 
 // Vars is an interface to implement by the templates to pass their own custom

jsondb/jsondb.go

@@ -12,7 +12,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/kirsle/blog/core/caches"
+	"github.com/kirsle/blog/jsondb/caches"
 )
 
 var (