snafu
/
go-blog
1
0
Fork 0
Code Issues Releases 2 Activity
Browse Source

updated dependencies / new git path

master
Lars Hoogestraat 2 years ago
parent
239f279503
commit
0139b07927
45 changed files with 158 additions and 183 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      clt/createuser/create_user.go
  2. 4
      clt/initdatabase/init_database.go
  3. 2
      components/mail/mail.go
  4. 8
      controllers/account.go
  5. 4
      controllers/account_test.go
  6. 8
      controllers/article.go
  7. 4
      controllers/article_test.go
  8. 6
      controllers/category.go
  9. 4
      controllers/category_test.go
  10. 8
      controllers/file.go
  11. 4
      controllers/file_test.go
  12. 2
      controllers/form_util.go
  13. 4
      controllers/login.go
  14. 2
      controllers/login_test.go
  15. 6
      controllers/site.go
  16. 4
      controllers/site_test.go
  17. 6
      controllers/user.go
  18. 4
      controllers/user_invite.go
  19. 4
      controllers/user_invite_test.go
  20. 4
      controllers/user_test.go
  21. 16
      controllers/utils_test.go
  22. 2
      examples/plugin/user_mail.go
  23. 29
      go.mod
  24. 76
      go.sum
  25. 18
      main.go
  26. 6
      middleware/app_context.go
  27. 6
      middleware/json_handler.go
  28. 4
      middleware/middleware_util.go
  29. 12
      middleware/template.go
  30. 6
      middleware/template_handler.go
  31. 4
      middleware/xml_handler.go
  32. 6
      models/article.go
  33. 4
      models/category.go
  34. 8
      models/file.go
  35. 2
      models/file_test.go
  36. 6
      models/mail.go
  37. 2
      models/pagination.go
  38. 4
      models/site.go
  39. 2
      models/site_sqlite.go
  40. 6
      models/token.go
  41. 8
      models/user.go
  42. 4
      models/user_invite.go
  43. 6
      routers/router.go
  44. 6
      settings/config.go
  45. 2
      utils/string_test.go

8
clt/createuser/create_user.go
View File

@ -12,10 +12,10 @@ import (
"os"
"syscall"
"git.hoogi.eu/go-blog/components/database"
"git.hoogi.eu/go-blog/components/logger"
"git.hoogi.eu/go-blog/models"
"git.hoogi.eu/go-blog/utils"
"git.hoogi.eu/snafu/go-blog/components/database"
"git.hoogi.eu/snafu/go-blog/components/logger"
"git.hoogi.eu/snafu/go-blog/models"
"git.hoogi.eu/snafu/go-blog/utils"
"golang.org/x/crypto/ssh/terminal"
)

4
clt/initdatabase/init_database.go
View File

@ -12,8 +12,8 @@ import (
"os"
"strings"
"git.hoogi.eu/go-blog/components/database"
"git.hoogi.eu/go-blog/components/logger"
"git.hoogi.eu/snafu/go-blog/components/database"
"git.hoogi.eu/snafu/go-blog/components/logger"
)
var (

2
components/mail/mail.go
View File

@ -6,7 +6,7 @@ import (
"fmt"
"net/smtp"
"git.hoogi.eu/go-blog/components/logger"
"git.hoogi.eu/snafu/go-blog/components/logger"
)
//Service holds configuration for the SMTP server

8
controllers/account.go
View File

@ -8,10 +8,10 @@ import (
"net/http"
"time"
"git.hoogi.eu/go-blog/components/httperror"
"git.hoogi.eu/go-blog/components/logger"
"git.hoogi.eu/go-blog/middleware"
"git.hoogi.eu/go-blog/models"
"git.hoogi.eu/snafu/go-blog/components/httperror"
"git.hoogi.eu/snafu/go-blog/components/logger"
"git.hoogi.eu/snafu/go-blog/middleware"
"git.hoogi.eu/snafu/go-blog/models"
)
//AdminProfileHandler returns page for updating the profile of the currently logged-in user

4
controllers/account_test.go
View File

@ -5,8 +5,8 @@ import (
"net/url"
"testing"
"git.hoogi.eu/go-blog/controllers"
"git.hoogi.eu/go-blog/models"
"git.hoogi.eu/snafu/go-blog/controllers"
"git.hoogi.eu/snafu/go-blog/models"
)
func TestAccountActivation(t *testing.T) {

8
controllers/article.go
View File

@ -10,10 +10,10 @@ import (
"net/http"
"time"
"git.hoogi.eu/go-blog/components/httperror"
"git.hoogi.eu/go-blog/middleware"
"git.hoogi.eu/go-blog/models"
"git.hoogi.eu/go-blog/utils"
"git.hoogi.eu/snafu/go-blog/components/httperror"
"git.hoogi.eu/snafu/go-blog/middleware"
"git.hoogi.eu/snafu/go-blog/models"
"git.hoogi.eu/snafu/go-blog/utils"
)
//GetArticleHandler returns a specific article

4
controllers/article_test.go
View File

@ -13,8 +13,8 @@ import (
"strconv"
"testing"
"git.hoogi.eu/go-blog/controllers"
"git.hoogi.eu/go-blog/models"
"git.hoogi.eu/snafu/go-blog/controllers"
"git.hoogi.eu/snafu/go-blog/models"
)
func TestArticleWorkflow(t *testing.T) {

6
controllers/category.go
View File

@ -8,9 +8,9 @@ import (
"fmt"
"net/http"
"git.hoogi.eu/go-blog/components/httperror"
"git.hoogi.eu/go-blog/middleware"
"git.hoogi.eu/go-blog/models"
"git.hoogi.eu/snafu/go-blog/components/httperror"
"git.hoogi.eu/snafu/go-blog/middleware"
"git.hoogi.eu/snafu/go-blog/models"
)
func AdminListCategoriesHandler(ctx *middleware.AppContext, w http.ResponseWriter, r *http.Request) *middleware.Template {

4
controllers/category_test.go
View File

@ -6,8 +6,8 @@ import (
"strconv"
"testing"
"git.hoogi.eu/go-blog/controllers"
"git.hoogi.eu/go-blog/models"
"git.hoogi.eu/snafu/go-blog/controllers"
"git.hoogi.eu/snafu/go-blog/models"
)
func TestCategoryWorkflow(t *testing.T) {

8
controllers/file.go
View File

@ -9,10 +9,10 @@ import (
"path/filepath"
"syscall"
"git.hoogi.eu/go-blog/components/httperror"
"git.hoogi.eu/go-blog/components/logger"
"git.hoogi.eu/go-blog/middleware"
"git.hoogi.eu/go-blog/models"
"git.hoogi.eu/snafu/go-blog/components/httperror"
"git.hoogi.eu/snafu/go-blog/components/logger"
"git.hoogi.eu/snafu/go-blog/middleware"
"git.hoogi.eu/snafu/go-blog/models"
)
type FileHandler struct {

4
controllers/file_test.go
View File

@ -7,8 +7,8 @@ import (
"strconv"
"testing"
"git.hoogi.eu/go-blog/controllers"
"git.hoogi.eu/go-blog/models"
"git.hoogi.eu/snafu/go-blog/controllers"
"git.hoogi.eu/snafu/go-blog/models"
)
func TestFileWorkflow(t *testing.T) {

2
controllers/form_util.go
View File

@ -8,7 +8,7 @@ import (
"net/http"
"strconv"
"git.hoogi.eu/go-blog/components/logger"
"git.hoogi.eu/snafu/go-blog/components/logger"
"github.com/gorilla/mux"
)

4
controllers/login.go
View File

@ -7,8 +7,8 @@ package controllers
import (
"net/http"
"git.hoogi.eu/go-blog/middleware"
"git.hoogi.eu/go-blog/models"
"git.hoogi.eu/snafu/go-blog/middleware"
"git.hoogi.eu/snafu/go-blog/models"
)
// LoginHandler shows the login form;

2
controllers/login_test.go
View File

@ -6,7 +6,7 @@ import (
"net/url"
"testing"
"git.hoogi.eu/go-blog/controllers"
"git.hoogi.eu/snafu/go-blog/controllers"
)
func TestLogin(t *testing.T) {

6
controllers/site.go
View File

@ -10,9 +10,9 @@ import (
"fmt"
"net/http"
"git.hoogi.eu/go-blog/components/httperror"
"git.hoogi.eu/go-blog/middleware"
"git.hoogi.eu/go-blog/models"
"git.hoogi.eu/snafu/go-blog/components/httperror"
"git.hoogi.eu/snafu/go-blog/middleware"
"git.hoogi.eu/snafu/go-blog/models"
)
//GetSiteHandler returns the site template - only published sites are considered

4
controllers/site_test.go
View File

@ -7,8 +7,8 @@ import (
"strconv"
"testing"
"git.hoogi.eu/go-blog/controllers"
"git.hoogi.eu/go-blog/models"
"git.hoogi.eu/snafu/go-blog/controllers"
"git.hoogi.eu/snafu/go-blog/models"
)
func TestSiteWorkflow(t *testing.T) {

6
controllers/user.go
View File

@ -8,9 +8,9 @@ import (
"fmt"
"net/http"
"git.hoogi.eu/go-blog/components/httperror"
"git.hoogi.eu/go-blog/middleware"
"git.hoogi.eu/go-blog/models"
"git.hoogi.eu/snafu/go-blog/components/httperror"
"git.hoogi.eu/snafu/go-blog/middleware"
"git.hoogi.eu/snafu/go-blog/models"
)
//AdminUsersHandler returns an overview of the created users (admin only action)

4
controllers/user_invite.go
View File

@ -4,8 +4,8 @@ import (
"fmt"
"net/http"
"git.hoogi.eu/go-blog/middleware"
"git.hoogi.eu/go-blog/models"
"git.hoogi.eu/snafu/go-blog/middleware"
"git.hoogi.eu/snafu/go-blog/models"
)
func AdminUserInviteNewHandler(ctx *middleware.AppContext, w http.ResponseWriter, r *http.Request) *middleware.Template {

4
controllers/user_invite_test.go
View File

@ -6,8 +6,8 @@ import (
"strconv"
"testing"
"git.hoogi.eu/go-blog/controllers"
"git.hoogi.eu/go-blog/models"
"git.hoogi.eu/snafu/go-blog/controllers"
"git.hoogi.eu/snafu/go-blog/models"
)
func TestUserInviteWorkflow(t *testing.T) {

4
controllers/user_test.go
View File

@ -11,8 +11,8 @@ import (
"strconv"
"testing"
"git.hoogi.eu/go-blog/controllers"
"git.hoogi.eu/go-blog/models"
"git.hoogi.eu/snafu/go-blog/controllers"
"git.hoogi.eu/snafu/go-blog/models"
)
func TestUserWorklfow(t *testing.T) {

16
controllers/utils_test.go
View File

@ -20,14 +20,14 @@ import (
"path/filepath"
"testing"
"git.hoogi.eu/go-blog/components/database"
"git.hoogi.eu/go-blog/components/logger"
"git.hoogi.eu/go-blog/components/mail"
"git.hoogi.eu/go-blog/middleware"
"git.hoogi.eu/go-blog/models"
"git.hoogi.eu/go-blog/settings"
"git.hoogi.eu/go-blog/utils"
"git.hoogi.eu/session"
"git.hoogi.eu/snafu/go-blog/components/database"
"git.hoogi.eu/snafu/go-blog/components/logger"
"git.hoogi.eu/snafu/go-blog/components/mail"
"git.hoogi.eu/snafu/go-blog/middleware"
"git.hoogi.eu/snafu/go-blog/models"
"git.hoogi.eu/snafu/go-blog/settings"
"git.hoogi.eu/snafu/go-blog/utils"
"git.hoogi.eu/snafu/session"
_ "github.com/mattn/go-sqlite3"
)

2
examples/plugin/user_mail.go
View File

@ -5,7 +5,7 @@ import (
"database/sql"
"os/exec"
"git.hoogi.eu/go-blog/models"
"git.hoogi.eu/snafu/go-blog/models"
_ "github.com/mattn/go-sqlite3"
)

29
go.mod
View File

@ -1,25 +1,22 @@
module git.hoogi.eu/go-blog
module git.hoogi.eu/snafu/go-blog
go 1.13
require (
git.hoogi.eu/cfg v1.0.1
git.hoogi.eu/session v1.1.0
github.com/gorilla/csrf v1.6.1
git.hoogi.eu/snafu/cfg v1.0.4
git.hoogi.eu/snafu/session v1.1.1
github.com/gorilla/csrf v1.6.2
github.com/gorilla/handlers v1.4.2
github.com/gorilla/mux v1.7.3
github.com/justinas/alice v0.0.0-20171023064455-03f45bd4b7da
github.com/gorilla/mux v1.7.4
github.com/justinas/alice v1.2.0
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
github.com/mattn/go-sqlite3 v1.10.0
github.com/mattn/go-sqlite3 v2.0.3+incompatible
github.com/microcosm-cc/bluemonday v1.0.2
github.com/pkg/errors v0.8.1 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/russross/blackfriday/v2 v2.0.1
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
github.com/sirupsen/logrus v1.4.2
github.com/stretchr/objx v0.2.0 // indirect
golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734
golang.org/x/net v0.0.0-20190424112056-4829fb13d2c6 // indirect
golang.org/x/sys v0.0.0-20190429094411-2cc0cad0ac78 // indirect
golang.org/x/text v0.3.2 // indirect
golang.org/x/tools v0.0.0-20190428024724-550556f78a90 // indirect
golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975
golang.org/x/net v0.0.0-20200219183655-46282727080f // indirect
golang.org/x/sys v0.0.0-20200219091948-cb0a6d8edb6c // indirect
)
go 1.13

76
go.sum
View File

@ -1,76 +1,54 @@
git.hoogi.eu/cfg v1.0.1 h1:Oz7v1Sei1gISlqh1xOJGArA+VQdOWB0dhXuJ/0SCrZ0=
git.hoogi.eu/cfg v1.0.1/go.mod h1:+MNsW3r2nSt2ESUBMEDh76Yl5fIy1k/DVheCBtatvnk=
git.hoogi.eu/session v1.1.0 h1:8skqhdUj+uJ7H3hxs0/mAuF2/G56gqpYWJC7KdwCSEE=
git.hoogi.eu/session v1.1.0/go.mod h1:pYq481XvKXjA6RQ2vp+XYHyYLolajqMIn72q57/vO5Y=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
git.hoogi.eu/snafu/cfg v1.0.4 h1:MKt50Hm9n6YUEVpxDjXVBG7dI6EMGRpazGKFQuWI6ok=
git.hoogi.eu/snafu/cfg v1.0.4/go.mod h1:LQolv8bqH8ZPz7h9PSVswdBXj1BIM+kW79AVS/jpE7A=
git.hoogi.eu/snafu/session v0.0.0-20200220204922-85f6a7801594 h1:XfxFkU12wEcveZAJJpCuja3JFWhgu4F82Mj8L5F7BAs=
git.hoogi.eu/snafu/session v0.0.0-20200220204922-85f6a7801594/go.mod h1:kgRDrnHcKc9H18G9533BXy6qO+81eBf6e9gkUzBMDuA=
git.hoogi.eu/snafu/session v1.1.1 h1:v2f6uRbUxuTW37nVXOn6INR0wRPz1LCZr2L2Xj9/dx0=
git.hoogi.eu/snafu/session v1.1.1/go.mod h1:kgRDrnHcKc9H18G9533BXy6qO+81eBf6e9gkUzBMDuA=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
github.com/gorilla/csrf v1.5.1 h1:UASc2+EB0T51tvl6/2ls2ciA8/qC7KdTO7DsOEKbttQ=
github.com/gorilla/csrf v1.5.1/go.mod h1:HTDW7xFOO1aHddQUmghe9/2zTvg7AYCnRCs7MxTGu/0=
github.com/gorilla/csrf v1.6.0 h1:60oN1cFdncCE8tjwQ3QEkFND5k37lQPcRjnlvm7CIJ0=
github.com/gorilla/csrf v1.6.0/go.mod h1:7tSf8kmjNYr7IWDCYhd3U8Ck34iQ/Yw5CJu7bAkHEGI=
github.com/gorilla/csrf v1.6.1 h1:wua1OxOTarfqtUVfiSvzs2zTr3qV57cXVGclVETJXXc=
github.com/gorilla/csrf v1.6.1/go.mod h1:7tSf8kmjNYr7IWDCYhd3U8Ck34iQ/Yw5CJu7bAkHEGI=
github.com/gorilla/handlers v1.4.0 h1:XulKRWSQK5uChr4pEgSE4Tc/OcmnU9GJuSwdog/tZsA=
github.com/gorilla/handlers v1.4.0/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
github.com/gorilla/csrf v1.6.2 h1:QqQ/OWwuFp4jMKgBFAzJVW3FMULdyUW7JoM4pEWuqKg=
github.com/gorilla/csrf v1.6.2/go.mod h1:7tSf8kmjNYr7IWDCYhd3U8Ck34iQ/Yw5CJu7bAkHEGI=
github.com/gorilla/handlers v1.4.2 h1:0QniY0USkHQ1RGCLfKxeNHK9bkDHGRYGNDFBCS+YARg=
github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
github.com/gorilla/mux v1.7.0 h1:tOSd0UKHQd6urX6ApfOn4XdBMY6Sh1MfxV3kmaazO+U=
github.com/gorilla/mux v1.7.0/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
github.com/gorilla/mux v1.7.1 h1:Dw4jY2nghMMRsh1ol8dv1axHkDwMQK2DHerMNJsIpJU=
github.com/gorilla/mux v1.7.1/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
github.com/gorilla/mux v1.7.3 h1:gnP5JzjVOuiZD07fKKToCAOjS0yOpj/qPETTXCCS6hw=
github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
github.com/gorilla/mux v1.7.4 h1:VuZ8uybHlWmqV03+zRzdwKL4tUnIp1MAQtp1mIFE1bc=
github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ=
github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
github.com/justinas/alice v0.0.0-20171023064455-03f45bd4b7da h1:5y58+OCjoHCYB8182mpf/dEsq0vwTKPOo4zGfH0xW9A=
github.com/justinas/alice v0.0.0-20171023064455-03f45bd4b7da/go.mod h1:oLH0CmIaxCGXD67VKGR5AacGXZSMznlmeqM8RzPrcY8=
github.com/justinas/alice v1.2.0 h1:+MHSA/vccVCF4Uq37S42jwlkvI2Xzl7zTPCN5BnZNVo=
github.com/justinas/alice v1.2.0/go.mod h1:fN5HRH/reO/zrUflLfTN43t3vXvKzvZIENsNEe7i7qA=
github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=
github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK860o=
github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U=
github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
github.com/microcosm-cc/bluemonday v1.0.2 h1:5lPfLTTAvAbtS0VqT+94yOtFnGfUWYyx0+iToC3Os3s=
github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc=
github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw=
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/russross/blackfriday v2.0.0+incompatible h1:cBXrhZNUf9C+La9/YpS+UHpUT8YD6Td9ZMSU9APFcsk=
github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k=
github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190403202508-8e1b8d32e692 h1:GRhHqDOgeDr6QDTtq9gn2O4iKvm5dsbfqD/TXb0KLX0=
golang.org/x/crypto v0.0.0-20190403202508-8e1b8d32e692/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734 h1:p/H982KKEjUnLJkM3tt/LemDnOc1GiZL5FCVlORJ5zo=
golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975 h1:/Tl7pH94bvbAAHBdZJT947M/+gp0+CqQXDtMRC0fseo=
golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190403144856-b630fd6fe46b h1:/zjbcJPEGAyu6Is/VBOALsgdi4z9+kz/Vtdm6S+beD0=
golang.org/x/net v0.0.0-20190403144856-b630fd6fe46b/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190424112056-4829fb13d2c6 h1:FP8hkuE6yUEaJnK7O2eTuejKWwW+Rhfj80dQ2JcKxCU=
golang.org/x/net v0.0.0-20190424112056-4829fb13d2c6/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/net v0.0.0-20200219183655-46282727080f h1:dB42wwhNuwPvh8f+5zZWNcU+F2Xs/B9wXXwvUCOH7r8=
golang.org/x/net v0.0.0-20200219183655-46282727080f/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e h1:nFYrTHrdrAOpShe27kaFHjsqYSEQ0KWqdWLu3xuZJts=
golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc=
golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190429094411-2cc0cad0ac78 h1:ddnrbGOgFiC0zV+uaYoSkl0f47vnII6Zu426zWQrWkg=
golang.org/x/sys v0.0.0-20190429094411-2cc0cad0ac78/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200219091948-cb0a6d8edb6c h1:jceGD5YNJGgGMkJz79agzOln1K9TaZUjv5ird16qniQ=
golang.org/x/sys v0.0.0-20200219091948-cb0a6d8edb6c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190428024724-550556f78a90/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=

18
main.go
View File

@ -12,15 +12,15 @@ import (
"plugin"
"time"
"git.hoogi.eu/cfg"
"git.hoogi.eu/go-blog/components/database"
"git.hoogi.eu/go-blog/components/logger"
"git.hoogi.eu/go-blog/components/mail"
m "git.hoogi.eu/go-blog/middleware"
"git.hoogi.eu/go-blog/models"
"git.hoogi.eu/go-blog/routers"
"git.hoogi.eu/go-blog/settings"
"git.hoogi.eu/session"
"git.hoogi.eu/snafu/cfg"
"git.hoogi.eu/snafu/go-blog/components/database"
"git.hoogi.eu/snafu/go-blog/components/logger"
"git.hoogi.eu/snafu/go-blog/components/mail"
m "git.hoogi.eu/snafu/go-blog/middleware"
"git.hoogi.eu/snafu/go-blog/models"
"git.hoogi.eu/snafu/go-blog/routers"
"git.hoogi.eu/snafu/go-blog/settings"
"git.hoogi.eu/snafu/session"
)
var (

6
middleware/app_context.go
View File

@ -7,9 +7,9 @@ package middleware
import (
"html/template"
"git.hoogi.eu/go-blog/models"
"git.hoogi.eu/go-blog/settings"
"git.hoogi.eu/session"
"git.hoogi.eu/snafu/go-blog/models"
"git.hoogi.eu/snafu/go-blog/settings"
"git.hoogi.eu/snafu/session"
)
//AppContext contains the services, session store, templates, ...

6
middleware/json_handler.go
View File

@ -8,9 +8,9 @@ import (
"encoding/json"
"net/http"
"git.hoogi.eu/go-blog/components/httperror"
"git.hoogi.eu/go-blog/components/logger"
"git.hoogi.eu/go-blog/models"
"git.hoogi.eu/snafu/go-blog/components/httperror"
"git.hoogi.eu/snafu/go-blog/components/logger"
"git.hoogi.eu/snafu/go-blog/models"
)
// JSONHandler marshals JSON and writes to the http response

4
middleware/middleware_util.go
View File

@ -10,8 +10,8 @@ import (
"strings"
"time"
"git.hoogi.eu/go-blog/components/logger"
"git.hoogi.eu/go-blog/utils"
"git.hoogi.eu/snafu/go-blog/components/logger"
"git.hoogi.eu/snafu/go-blog/utils"
)
var locals = [...]net.IPNet{

12
middleware/template.go
View File

@ -15,12 +15,12 @@ import (
"strings"
"time"
"git.hoogi.eu/cfg"
"git.hoogi.eu/go-blog/components/httperror"
"git.hoogi.eu/go-blog/components/logger"
"git.hoogi.eu/go-blog/models"
"git.hoogi.eu/go-blog/settings"
"git.hoogi.eu/go-blog/utils"
"git.hoogi.eu/snafu/cfg"
"git.hoogi.eu/snafu/go-blog/components/httperror"
"git.hoogi.eu/snafu/go-blog/components/logger"
"git.hoogi.eu/snafu/go-blog/models"
"git.hoogi.eu/snafu/go-blog/settings"
"git.hoogi.eu/snafu/go-blog/utils"
)
// Template contains the information about the template to render.

6
middleware/template_handler.go
View File

@ -12,9 +12,9 @@ import (
"github.com/gorilla/csrf"
"git.hoogi.eu/go-blog/components/httperror"
"git.hoogi.eu/go-blog/components/logger"
"git.hoogi.eu/go-blog/models"
"git.hoogi.eu/snafu/go-blog/components/httperror"
"git.hoogi.eu/snafu/go-blog/components/logger"
"git.hoogi.eu/snafu/go-blog/models"
)
type contextKey string

4
middleware/xml_handler.go
View File

@ -5,8 +5,8 @@ import (
"encoding/xml"
"net/http"
"git.hoogi.eu/go-blog/components/logger"
"git.hoogi.eu/go-blog/models"
"git.hoogi.eu/snafu/go-blog/components/logger"
"git.hoogi.eu/snafu/go-blog/models"
)
// XMLHandler marshals XML and writes to the http response

6
models/article.go
View File

@ -13,9 +13,9 @@ import (
"strings"
"time"
"git.hoogi.eu/go-blog/components/httperror"
"git.hoogi.eu/go-blog/settings"
"git.hoogi.eu/go-blog/utils"
"git.hoogi.eu/snafu/go-blog/components/httperror"
"git.hoogi.eu/snafu/go-blog/settings"
"git.hoogi.eu/snafu/go-blog/utils"
)
// Article represents an article

4
models/category.go
View File

@ -8,8 +8,8 @@ import (
"strings"
"time"
"git.hoogi.eu/go-blog/components/httperror"
"git.hoogi.eu/go-blog/utils"
"git.hoogi.eu/snafu/go-blog/components/httperror"
"git.hoogi.eu/snafu/go-blog/utils"
)
type Category struct {

8
models/file.go
View File

@ -12,10 +12,10 @@ import (
"strings"
"time"
"git.hoogi.eu/go-blog/components/httperror"
"git.hoogi.eu/go-blog/components/logger"
"git.hoogi.eu/go-blog/settings"
"git.hoogi.eu/go-blog/utils"
"git.hoogi.eu/snafu/go-blog/components/httperror"
"git.hoogi.eu/snafu/go-blog/components/logger"
"git.hoogi.eu/snafu/go-blog/settings"
"git.hoogi.eu/snafu/go-blog/utils"
)
//File represents a file

2
models/file_test.go
View File

@ -3,7 +3,7 @@ package models_test
import (
"testing"
"git.hoogi.eu/go-blog/models"
"git.hoogi.eu/snafu/go-blog/models"
)
func TestFilenameSplit(t *testing.T) {

6
models/mail.go
View File

@ -3,9 +3,9 @@ package models
import (
"fmt"
"git.hoogi.eu/go-blog/components/mail"
"git.hoogi.eu/go-blog/settings"
"git.hoogi.eu/go-blog/utils"
"git.hoogi.eu/snafu/go-blog/components/mail"
"git.hoogi.eu/snafu/go-blog/settings"
"git.hoogi.eu/snafu/go-blog/utils"
)
type Mailer struct {

2
models/pagination.go
View File

@ -10,7 +10,7 @@ import (
"html/template"
"math"
"git.hoogi.eu/go-blog/utils"
"git.hoogi.eu/snafu/go-blog/utils"
)
//Pagination type is used to provide a page selector

4
models/site.go
View File

@ -7,8 +7,8 @@ import (
"net/url"
"time"
"git.hoogi.eu/go-blog/components/httperror"
"git.hoogi.eu/go-blog/utils"
"git.hoogi.eu/snafu/go-blog/components/httperror"
"git.hoogi.eu/snafu/go-blog/utils"
)
//SiteDatasourceService defines an interface for CRUD operations on sites

2
models/site_sqlite.go
View File

@ -5,7 +5,7 @@ import (
"database/sql"
"time"
"git.hoogi.eu/go-blog/components/logger"
"git.hoogi.eu/snafu/go-blog/components/logger"
)
//SQLiteSiteDatasource providing an implementation of SiteDatasourceService for sqlite

6
models/token.go
View File

@ -7,9 +7,9 @@ import (
"net/http"
"time"
"git.hoogi.eu/go-blog/components/httperror"
"git.hoogi.eu/go-blog/components/logger"
"git.hoogi.eu/go-blog/utils"
"git.hoogi.eu/snafu/go-blog/components/httperror"
"git.hoogi.eu/snafu/go-blog/components/logger"
"git.hoogi.eu/snafu/go-blog/utils"
)
//TokenDatasourceService defines an interface for CRUD operations for tokens

8
models/user.go
View File

@ -12,10 +12,10 @@ import (
"strings"
"time"
"git.hoogi.eu/go-blog/components/httperror"
"git.hoogi.eu/go-blog/components/logger"
"git.hoogi.eu/go-blog/settings"
"git.hoogi.eu/go-blog/utils"
"git.hoogi.eu/snafu/go-blog/components/httperror"
"git.hoogi.eu/snafu/go-blog/components/logger"
"git.hoogi.eu/snafu/go-blog/settings"
"git.hoogi.eu/snafu/go-blog/utils"
"golang.org/x/crypto/bcrypt"
)

4
models/user_invite.go
View File

@ -3,8 +3,8 @@ package models
import (
"time"
"git.hoogi.eu/go-blog/components/mail"
"git.hoogi.eu/go-blog/utils"
"git.hoogi.eu/snafu/go-blog/components/mail"
"git.hoogi.eu/snafu/go-blog/utils"
)
//User represents a user

6
routers/router.go
View File

@ -8,9 +8,9 @@ import (
"net/http"
"os"
c "git.hoogi.eu/go-blog/controllers"
m "git.hoogi.eu/go-blog/middleware"
"git.hoogi.eu/go-blog/settings"
c "git.hoogi.eu/snafu/go-blog/controllers"
m "git.hoogi.eu/snafu/go-blog/middleware"
"git.hoogi.eu/snafu/go-blog/settings"
"github.com/gorilla/csrf"
"github.com/gorilla/handlers"

6
settings/config.go
View File

@ -14,9 +14,9 @@ import (
"strings"
"time"
"git.hoogi.eu/cfg"
"git.hoogi.eu/go-blog/components/logger"
"git.hoogi.eu/go-blog/utils"
"git.hoogi.eu/snafu/cfg"
"git.hoogi.eu/snafu/go-blog/components/logger"
"git.hoogi.eu/snafu/go-blog/utils"
)
type LoginMethod int

2
utils/string_test.go
View File

@ -7,7 +7,7 @@ package utils_test
import (
"testing"
"git.hoogi.eu/go-blog/utils"
"git.hoogi.eu/snafu/go-blog/utils"
)
func TestCreateURLSafeSlug(t *testing.T) {

Write Preview
Loading…
Cancel
Save