From 700a831094cd5f79c9a0d0e7bb54a99960bf8faf Mon Sep 17 00:00:00 2001 From: akosgarai Date: Tue, 28 May 2019 21:43:56 +0200 Subject: [PATCH 1/2] generate admin_role model with cli tool --- .../20190505130557_create_admin_roles.down.fizz | 1 + .../20190505130557_create_admin_roles.up.fizz | 10 ++++++++++ models/admin_role.go | 14 ++++++++++++++ models/admin_role_test.go | 7 +++++++ 4 files changed, 32 insertions(+) create mode 100644 migrations/20190505130557_create_admin_roles.down.fizz create mode 100644 migrations/20190505130557_create_admin_roles.up.fizz create mode 100644 models/admin_role.go create mode 100644 models/admin_role_test.go diff --git a/migrations/20190505130557_create_admin_roles.down.fizz b/migrations/20190505130557_create_admin_roles.down.fizz new file mode 100644 index 0000000..1d09656 --- /dev/null +++ b/migrations/20190505130557_create_admin_roles.down.fizz @@ -0,0 +1 @@ +drop_table("admin_roles") \ No newline at end of file diff --git a/migrations/20190505130557_create_admin_roles.up.fizz b/migrations/20190505130557_create_admin_roles.up.fizz new file mode 100644 index 0000000..76f4071 --- /dev/null +++ b/migrations/20190505130557_create_admin_roles.up.fizz @@ -0,0 +1,10 @@ +create_table("admin_roles") { + t.Column("id", "uuid", {primary: true}) + t.Column("label", "text", {}) + t.Column("description", "text", {}) +} +sql("insert into admin_roles (id, label, description) VALUES('a38ead89-39f1-443b-9326-1469949280a5','content_writer', 'Content writer administrator role');") +sql("insert into admin_roles (id, label, description) VALUES('228b837e-3ed4-4bf8-88d2-773e1710a46e','content_reviewer', 'Content reviewer administrator role');") +sql("insert into admin_roles (id, label, description) VALUES('9d337253-ff93-4445-a30b-3772e8bcd0cf','user_moderator', 'User moderator administrator administrator role');") +sql("insert into admin_roles (id, label, description) VALUES('54ea7725-a882-4e2c-88fd-6ee579b740b7','sys_admin', 'System administrator role');") +sql("insert into admin_roles (id, label, description) VALUES('268a0bb7-9151-4da0-9eb7-47874ce12e05','root', 'Root administrator role');") diff --git a/models/admin_role.go b/models/admin_role.go new file mode 100644 index 0000000..dfc83a2 --- /dev/null +++ b/models/admin_role.go @@ -0,0 +1,14 @@ +package models + +import ( + "github.com/gobuffalo/uuid" +) + +type AdminRole struct { + ID uuid.UUID `json:"id" db:"id"` + Label string `json:"label" db:"label"` + Description string `json:"description" db:"description"` +} + +// AdminRoles is not required by pop and may be deleted +type AdminRoles []AdminRole diff --git a/models/admin_role_test.go b/models/admin_role_test.go new file mode 100644 index 0000000..94f8dcf --- /dev/null +++ b/models/admin_role_test.go @@ -0,0 +1,7 @@ +package models + +import "testing" + +func Test_AdminRole(t *testing.T) { + t.Skip("This test needs to be implemented!") +} From 2b9dfe3f920c4826dce0d03b72438ef92e2dcbc1 Mon Sep 17 00:00:00 2001 From: akosgarai Date: Tue, 28 May 2019 21:51:28 +0200 Subject: [PATCH 2/2] some changes based on buffalo version update --- Gopkg.lock | 42 ++++++++++++++++++++++++++++++++++++----- actions/actions_test.go | 4 ++-- actions/app.go | 4 ++-- actions/render.go | 6 +++--- models/models_test.go | 4 ++-- 5 files changed, 46 insertions(+), 14 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index b72af67..ed6577f 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -188,9 +188,13 @@ [[projects]] branch = "master" - digest = "1:4a67d4014d426b5a5672ed7c3bbb2bc732f754013bfca7a5a80ad65836b73727" + digest = "1:7779ec172ea5898029020425bf58586c68c341fe4c3c23c2508605767de3ce47" name = "github.com/gobuffalo/gogen" - packages = ["gomods"] + packages = [ + ".", + "goimports", + "gomods", + ] pruneopts = "UT" revision = "8f38393713f59beb43221f903c07f58f0377a063" @@ -283,9 +287,16 @@ revision = "a385830c7fc0495b810318788a043c7655da337d" [[projects]] - digest = "1:3b7665270f828e8305a8d184e9c58a104124b4469437a5415ad9fcceb53b1485" + digest = "1:84d1d205888c2f666c0a4d489e2a6e66c39fe8fd8bfd118c51b81f80230be51b" name = "github.com/gobuffalo/packr" - packages = ["."] + packages = [ + "v2", + "v2/file", + "v2/file/resolver", + "v2/file/resolver/encoding/hex", + "v2/jam/parser", + "v2/plog", + ] pruneopts = "UT" revision = "cef464b1513d9b6cf3d4ad6d6983a716e048e89d" version = "v2.1.0" @@ -813,6 +824,27 @@ pruneopts = "UT" revision = "4b34438f7a67ee5f45cc6132e2bad873a20324e9" +[[projects]] + branch = "master" + digest = "1:37a10ef0ba5126e0459bf3644213c664babe7a04e39fd4c292f8f5d130820990" + name = "golang.org/x/tools" + packages = [ + "go/ast/astutil", + "go/gcexportdata", + "go/internal/gcimporter", + "go/internal/packagesdriver", + "go/packages", + "go/types/typeutil", + "imports", + "internal/fastwalk", + "internal/gopathwalk", + "internal/imports", + "internal/module", + "internal/semver", + ] + pruneopts = "UT" + revision = "7be61e1b0e514e106d83fc439d56a79143738603" + [[projects]] digest = "1:c25289f43ac4a68d88b02245742347c94f1e108c534dda442188015ff80669b3" name = "google.golang.org/appengine" @@ -841,7 +873,7 @@ "github.com/gobuffalo/mw-forcessl", "github.com/gobuffalo/mw-i18n", "github.com/gobuffalo/mw-paramlogger", - "github.com/gobuffalo/packr", + "github.com/gobuffalo/packr/v2", "github.com/gobuffalo/pop", "github.com/gobuffalo/suite", "github.com/gobuffalo/uuid", diff --git a/actions/actions_test.go b/actions/actions_test.go index f403105..73118ef 100644 --- a/actions/actions_test.go +++ b/actions/actions_test.go @@ -3,7 +3,7 @@ package actions import ( "testing" - "github.com/gobuffalo/packr" + "github.com/gobuffalo/packr/v2" "github.com/gobuffalo/suite" ) @@ -12,7 +12,7 @@ type ActionSuite struct { } func Test_ActionSuite(t *testing.T) { - action, err := suite.NewActionWithFixtures(App(), packr.NewBox("../fixtures")) + action, err := suite.NewActionWithFixtures(App(), packr.New("../fixtures", "../fixtures")) if err != nil { t.Fatal(err) } diff --git a/actions/app.go b/actions/app.go index 5b6d207..bba0159 100644 --- a/actions/app.go +++ b/actions/app.go @@ -5,13 +5,13 @@ import ( "github.com/gobuffalo/envy" forcessl "github.com/gobuffalo/mw-forcessl" paramlogger "github.com/gobuffalo/mw-paramlogger" + "github.com/gobuffalo/packr/v2" "github.com/unrolled/secure" "github.com/akosgarai/buffalo_example/models" "github.com/gobuffalo/buffalo-pop/pop/popmw" csrf "github.com/gobuffalo/mw-csrf" i18n "github.com/gobuffalo/mw-i18n" - "github.com/gobuffalo/packr" ) // ENV is used to help switch settings based on where the @@ -79,7 +79,7 @@ func App() *buffalo.App { // for more information: https://gobuffalo.io/en/docs/localization func translations() buffalo.MiddlewareFunc { var err error - if T, err = i18n.New(packr.NewBox("../locales"), "en-US"); err != nil { + if T, err = i18n.New(packr.New("../locales", "../locales"), "en-US"); err != nil { app.Stop(err) } return T.Middleware() diff --git a/actions/render.go b/actions/render.go index eca8994..00e345f 100644 --- a/actions/render.go +++ b/actions/render.go @@ -2,13 +2,13 @@ package actions import ( "github.com/gobuffalo/buffalo/render" - "github.com/gobuffalo/packr" + "github.com/gobuffalo/packr/v2" "github.com/akosgarai/buffalo_example/models" ) var r *render.Engine -var assetsBox = packr.NewBox("../public") +var assetsBox = packr.New("../public", "../public") func init() { r = render.New(render.Options{ @@ -16,7 +16,7 @@ func init() { HTMLLayout: "application.html", // Box containing all of the templates: - TemplatesBox: packr.NewBox("../templates"), + TemplatesBox: packr.New("../templates", "../templates"), AssetsBox: assetsBox, // Add template helpers here: diff --git a/models/models_test.go b/models/models_test.go index 7151b59..dddcdd6 100644 --- a/models/models_test.go +++ b/models/models_test.go @@ -3,7 +3,7 @@ package models import ( "testing" - "github.com/gobuffalo/packr" + "github.com/gobuffalo/packr/v2" "github.com/gobuffalo/suite" ) @@ -12,7 +12,7 @@ type ModelSuite struct { } func Test_ModelSuite(t *testing.T) { - model, err := suite.NewModelWithFixtures(packr.NewBox("../fixtures")) + model, err := suite.NewModelWithFixtures(packr.New("../fixtures", "../fixtures")) if err != nil { t.Fatal(err) }