Open platform to collect and prioritize feedback
Allow site member to create and assign tags to posts (#190)
Guilherme Oenningc25fcf711457
diff --git a/README.md b/README.mdindex 6d3fd9503..ab6921bff 100644--- a/README.md+++ b/README.md@@ -1,6 +1,6 @@-# Fider · [](https://app.wercker.com/project/byKey/99ca65c4a8cd5711504a19deedbc6461) [](https://codecov.io/gh/getfider/fider)+# Fider · [](https://travis-ci.org/getfider/fider) [](https://codecov.io/gh/getfider/fider)Fider is an open platform to collect and organize customer feedback. By using the platform, your community can share, vote and discuss on ideas they have to make your product or company even better.diff --git a/app/actions/tag.go b/app/actions/tag.goindex 7d62a1556..63eb6a555 100644--- a/app/actions/tag.go+++ b/app/actions/tag.go@@ -63,25 +63,25 @@ func (input *CreateEditTag) Validate(services *app.Services) *validate.Result {return result}-// RemoveTag is used to delete an existing tag-type RemoveTag struct {+// DeleteTag is used to delete an existing tag+type DeleteTag struct {Tag *models.Tag- Model *models.RemoveTag+ Model *models.DeleteTag}// Initialize the model-func (input *RemoveTag) Initialize() interface{} {- input.Model = new(models.RemoveTag)+func (input *DeleteTag) Initialize() interface{} {+ input.Model = new(models.DeleteTag)return input.Model}// IsAuthorized returns true if current user is authorized to perform this action-func (input *RemoveTag) IsAuthorized(user *models.User) bool {+func (input *DeleteTag) IsAuthorized(user *models.User) bool {return user != nil && user.IsAdministrator()}// Validate is current model is valid-func (input *RemoveTag) Validate(services *app.Services) *validate.Result {+func (input *DeleteTag) Validate(services *app.Services) *validate.Result {tag, err := services.Tags.GetBySlug(input.Model.Slug)if err != nil {return validate.Error(err)diff --git a/app/handlers/idea.go b/app/handlers/idea.goindex bcb74aee7..c4d877c15 100644--- a/app/handlers/idea.go+++ b/app/handlers/idea.go@@ -14,8 +14,14 @@ func Index() web.HandlerFunc {return c.Failure(err)}+ tags, err := c.Services().Tags.GetAll()+ if err != nil {+ return c.Failure(err)+ }+return c.Page(web.Map{"ideas": ideas,+ "tags": tags,})}}@@ -78,9 +84,15 @@ func IdeaDetails() web.HandlerFunc {return c.Failure(err)}+ tags, err := c.Services().Tags.GetAll()+ if err != nil {+ return c.Failure(err)+ }+return c.Page(web.Map{"comments": comments,"idea": idea,+ "tags": tags,})}}diff --git a/app/handlers/idea_test.go b/app/handlers/idea_test.goindex 62acf07d8..4adf6af38 100644--- a/app/handlers/idea_test.go+++ b/app/handlers/idea_test.go@@ -53,11 +53,13 @@ func TestPostIdeaHandler(t *testing.T) {RegisterTestingT(t)server, services := mock.NewServer()- code, _ := server.+ code, resp := server.OnTenant(mock.DemoTenant).AsUser(mock.JonSnow).ExecutePost(handlers.PostIdea(), `{ "title": "My newest idea :)" }`)+ println(resp.Body.String())+idea, err := services.Ideas.GetByID(1)Expect(code).To(Equal(200))Expect(err).To(BeNil())diff --git a/app/handlers/tag.go b/app/handlers/tag.goindex 08fc4c4cb..0be0bc868 100644--- a/app/handlers/tag.go+++ b/app/handlers/tag.go@@ -6,6 +6,20 @@ import ("github.com/getfider/fider/app/pkg/web")+// ManageTags is the home page for managing tags+func ManageTags() web.HandlerFunc {+ return func(c web.Context) error {+ tags, err := c.Services().Tags.GetAll()+ if err != nil {+ return c.Failure(err)+ }++ return c.Page(web.Map{+ "tags": tags,+ })+ }+}+// CreateEditTag creates a new tag on current tenantfunc CreateEditTag() web.HandlerFunc {return func(c web.Context) error {@@ -33,15 +47,15 @@ func CreateEditTag() web.HandlerFunc {}}-// RemoveTag deletes anexisting tag-func RemoveTag() web.HandlerFunc {+// DeleteTag deletes anexisting tag+func DeleteTag() web.HandlerFunc {return func(c web.Context) error {- input := new(actions.RemoveTag)+ input := new(actions.DeleteTag)if result := c.BindTo(input); !result.Ok {return c.HandleValidation(result)}- err := c.Services().Tags.Remove(input.Tag.ID)+ err := c.Services().Tags.Delete(input.Tag.ID)if err != nil {return c.Failure(err)}diff --git a/app/handlers/tag_test.go b/app/handlers/tag_test.goindex 96746d1e2..80e1d0586 100644--- a/app/handlers/tag_test.go+++ b/app/handlers/tag_test.go@@ -131,19 +131,19 @@ func TestEditExistingTagHandler(t *testing.T) {Expect(err).To(BeNil())}-func TestRemoveInvalidTagHandler(t *testing.T) {+func TestDeleteInvalidTagHandler(t *testing.T) {RegisterTestingT(t)server, _ := mock.NewServer()status, _ := server.AsUser(mock.JonSnow).AddParam("slug", "bug").- Execute(handlers.RemoveTag())+ Execute(handlers.DeleteTag())Expect(status).To(Equal(http.StatusNotFound))}-func TestRemoveExistingTagHandler(t *testing.T) {+func TestDeleteExistingTagHandler(t *testing.T) {RegisterTestingT(t)server, services := mock.NewServer()@@ -152,7 +152,7 @@ func TestRemoveExistingTagHandler(t *testing.T) {status, _ := server.AsUser(mock.JonSnow).AddParam("slug", "bug").- Execute(handlers.RemoveTag())+ Execute(handlers.DeleteTag())tag, err := services.Tags.GetBySlug("bug")Expect(status).To(Equal(http.StatusOK))@@ -160,7 +160,7 @@ func TestRemoveExistingTagHandler(t *testing.T) {Expect(tag).To(BeNil())}-func TestRemoveExistingTagHandler_Collaborator(t *testing.T) {+func TestDeleteExistingTagHandler_Collaborator(t *testing.T) {RegisterTestingT(t)server, services := mock.NewServer()@@ -169,7 +169,7 @@ func TestRemoveExistingTagHandler_Collaborator(t *testing.T) {status, _ := server.AsUser(mock.AryaStark).AddParam("slug", "bug").- Execute(handlers.RemoveTag())+ Execute(handlers.DeleteTag())tag, err := services.Tags.GetBySlug("bug")Expect(status).To(Equal(http.StatusForbidden))diff --git a/app/middlewares/setup.go b/app/middlewares/setup.goindex bf506a1a9..b9b486e97 100644--- a/app/middlewares/setup.go+++ b/app/middlewares/setup.go@@ -39,6 +39,10 @@ func Setup(db *dbx.Database, emailer email.Sender) web.MiddlewareFunc {c.SetServices(&app.Services{Tenants: postgres.NewTenantStorage(trx),+ OAuth: &oauth.HTTPService{},+ Users: postgres.NewUserStorage(trx),+ Ideas: postgres.NewIdeaStorage(trx),+ Tags: postgres.NewTagStorage(trx),Emailer: emailer,})@@ -67,20 +71,3 @@ func Setup(db *dbx.Database, emailer email.Sender) web.MiddlewareFunc {}}}--//AddServices adds services to current context-func AddServices() web.MiddlewareFunc {- return func(next web.HandlerFunc) web.HandlerFunc {- return func(c web.Context) error {- trx := c.ActiveTransaction()- tenant := c.Tenant()- services := c.Services()- services.Tenants.SetCurrentTenant(tenant)- services.OAuth = &oauth.HTTPService{}- services.Ideas = postgres.NewIdeaStorage(tenant, trx)- services.Users = postgres.NewUserStorage(tenant, trx)- services.Tags = postgres.NewTagStorage(tenant, trx)- return next(c)- }- }-}diff --git a/app/models/feedback.go b/app/models/feedback.goindex 9e751a1dc..086bc7913 100644--- a/app/models/feedback.go+++ b/app/models/feedback.go@@ -17,6 +17,7 @@ type Idea struct {TotalComments int `json:"totalComments"`Status int `json:"status"`Response *IdeaResponse `json:"response"`+ Tags []int64 `json:"tags"`}// NewIdea represents a new idea@@ -77,8 +78,8 @@ type CreateEditTag struct {IsPublic bool `json:"isPublic"`}-// RemoveTag is used to delete an existing tag-type RemoveTag struct {+// DeleteTag is used to delete an existing tag+type DeleteTag struct {Slug string `route:"slug"`}diff --git a/app/pkg/dbx/dbx.go b/app/pkg/dbx/dbx.goindex 3365339da..adcec1239 100644--- a/app/pkg/dbx/dbx.go+++ b/app/pkg/dbx/dbx.go@@ -6,6 +6,8 @@ import ("io/ioutil""reflect"+ "github.com/lib/pq"+"strings""github.com/getfider/fider/app/pkg/env"@@ -68,7 +70,11 @@ func scan(prefix string, data interface{}) map[string]interface{} {tag := typeField.Tag.Get("db")if tag != "" {- if typeField.Type.Kind() != reflect.Ptr {+ if typeField.Type.Kind() == reflect.Slice {+ obj := reflect.New(reflect.MakeSlice(typeField.Type, 0, 0).Type()).Elem()+ field.Set(obj)+ fields[prefix+tag] = pq.Array(field.Addr().Interface())+ } else if typeField.Type.Kind() != reflect.Ptr {fields[prefix+tag] = field.Addr().Interface()} else if field.Type().Elem().Kind() != reflect.Struct || field.Type().Elem().String() == "time.Time" {obj := reflect.New(field.Type().Elem()).Elem()diff --git a/app/pkg/dbx/dbx_test.go b/app/pkg/dbx/dbx_test.goindex 9904431bb..977aa37c8 100644--- a/app/pkg/dbx/dbx_test.go+++ b/app/pkg/dbx/dbx_test.go@@ -227,3 +227,25 @@ func TestScalar(t *testing.T) {Expect(err).To(BeNil())Expect(value).To(Equal(1))}++func TestArray(t *testing.T) {+ RegisterTestingT(t)+ db, _ := dbx.New()+ defer db.Close()++ trx, _ := db.Begin()+ defer trx.Rollback()++ type ideaTags struct {+ ID int `db:"id"`+ Tags []int64 `db:"tags"`+ }++ result := ideaTags{}+ err := trx.Get(&result, "SELECT 1 as id, array[5,10] as tags")+ Expect(err).To(BeNil())+ Expect(result.ID).To(Equal(1))+ Expect(len(result.Tags)).To(Equal(2))+ Expect(result.Tags[0]).To(Equal(int64(5)))+ Expect(result.Tags[1]).To(Equal(int64(10)))+}diff --git a/app/pkg/dbx/scan_test.go b/app/pkg/dbx/scan_test.goindex 10464e102..34f2db5ba 100644--- a/app/pkg/dbx/scan_test.go+++ b/app/pkg/dbx/scan_test.go@@ -40,7 +40,6 @@ func TestScan(t *testing.T) {Expect(result["name"]).To(Equal(&u.Name))Expect(result["tenant_id"]).To(Equal(&u.Tenant.ID))Expect(result["tenant_name"]).To(Equal(&u.Tenant.Name))-}func TestScan_WithStringPointer(t *testing.T) {diff --git a/app/pkg/mock/server.go b/app/pkg/mock/server.goindex 6771d65c0..1e9dbf0db 100644--- a/app/pkg/mock/server.go+++ b/app/pkg/mock/server.go@@ -48,12 +48,14 @@ func (s *Server) Use(middleware web.MiddlewareFunc) {// OnTenant set current context tenantfunc (s *Server) OnTenant(tenant *models.Tenant) *Server {s.context.SetTenant(tenant)+ s.context.Services().SetCurrentTenant(tenant)return s}// AsUser set current context userfunc (s *Server) AsUser(user *models.User) *Server {s.context.SetUser(user)+ s.context.Services().SetCurrentUser(user)return s}@@ -102,6 +104,7 @@ func (s *Server) ExecutePost(handler web.HandlerFunc, body string) (int, *httptes.context.Request.Method = "POST"s.context.Request.URL.Path = "/"s.context.Request.Body = ioutil.NopCloser(strings.NewReader(body))+ s.context.Request.ContentLength = int64(len(body))s.context.Request.Header.Set("Content-Type", web.JSONContentType)if err := s.middleware(handler)(s.context); err != nil {diff --git a/app/pkg/web/binder.go b/app/pkg/web/binder.goindex 3df6e57a0..f62ddd2fd 100644--- a/app/pkg/web/binder.go+++ b/app/pkg/web/binder.go@@ -24,7 +24,7 @@ func NewDefaultBinder() *DefaultBinder {//Bind request data to object ifunc (b *DefaultBinder) Bind(target interface{}, c *Context) error {- if c.Request.Method == http.MethodPost {+ if c.Request.Method == http.MethodPost && c.Request.ContentLength > 0 {if err := json.NewDecoder(c.Request.Body).Decode(target); err != nil {return err}diff --git a/app/pkg/web/binder_test.go b/app/pkg/web/binder_test.goindex e4fe57b1a..b49d2aa91 100644--- a/app/pkg/web/binder_test.go+++ b/app/pkg/web/binder_test.go@@ -66,3 +66,22 @@ func TestDefaultBinder_TrimSpaces(t *testing.T) {Expect(u.Color).To(Equal("FF00AD"))Expect(u.Other).To(Equal(""))}++func TestDefaultBinder_POST_WithoutBody(t *testing.T) {+ RegisterTestingT(t)++ type action struct {+ Number int `route:"number"`+ Slug string `route:"slug"`+ }++ params := make(web.StringMap, 0)+ params["number"] = "2"+ params["slug"] = "jon-snow"+ ctx := newPostContext(params, "")+ a := new(action)+ err := binder.Bind(a, ctx)+ Expect(err).To(BeNil())+ Expect(a.Number).To(Equal(2))+ Expect(a.Slug).To(Equal("jon-snow"))+}diff --git a/app/pkg/web/context.go b/app/pkg/web/context.goindex daa52f5e5..30310edb7 100644--- a/app/pkg/web/context.go+++ b/app/pkg/web/context.go@@ -71,7 +71,7 @@ func (ctx *Context) SetTenant(tenant *models.Tenant) {} else {ctx.Logger().Debugf("Current tenant: nil")}- ctx.Services().Tenants.SetCurrentTenant(tenant)+ ctx.Services().SetCurrentTenant(tenant)ctx.Set(tenantContextKey, tenant)}@@ -187,6 +187,7 @@ func (ctx *Context) SetUser(user *models.User) {ctx.Logger().Debugf("Logged as: nil")}ctx.Set(userContextKey, user)+ ctx.Services().SetCurrentUser(user)}//Services returns current app.Services from contextdiff --git a/app/pkg/web/engine.go b/app/pkg/web/engine.goindex e22dd09ac..6e8a4c477 100644--- a/app/pkg/web/engine.go+++ b/app/pkg/web/engine.go@@ -141,6 +141,11 @@ func (g *Group) Post(path string, handler HandlerFunc) {g.engine.mux.Handle("POST", path, g.handler(handler))}+//Delete handles HTTP DELETE requests+func (g *Group) Delete(path string, handler HandlerFunc) {+ g.engine.mux.Handle("DELETE", path, g.handler(handler))+}+func (g *Group) handler(handler HandlerFunc) httprouter.Handle {next := handlerfor i := len(g.middlewares) - 1; i >= 0; i-- {@@ -152,7 +157,10 @@ func (g *Group) handler(handler HandlerFunc) httprouter.Handle {params[p.Key] = p.Value}ctx := g.engine.NewContext(res, req, params)- next(ctx)+ err := next(ctx)+ if err != nil {+ ctx.Failure(err)+ }}return h}diff --git a/app/services.go b/app/services.goindex b24ef730a..2804c9795 100644--- a/app/services.go+++ b/app/services.go@@ -1,6 +1,7 @@package appimport (+ "github.com/getfider/fider/app/models""github.com/getfider/fider/app/pkg/email""github.com/getfider/fider/app/pkg/oauth""github.com/getfider/fider/app/storage"@@ -15,3 +16,19 @@ type Services struct {Ideas storage.IdeaEmailer email.Sender}++// SetCurrentTenant to current context+func (s *Services) SetCurrentTenant(tenant *models.Tenant) {+ s.Users.SetCurrentTenant(tenant)+ s.Tags.SetCurrentTenant(tenant)+ s.Tenants.SetCurrentTenant(tenant)+ s.Ideas.SetCurrentTenant(tenant)+}++// SetCurrentUser to current context+func (s *Services) SetCurrentUser(user *models.User) {+ s.Users.SetCurrentUser(user)+ s.Tags.SetCurrentUser(user)+ s.Tenants.SetCurrentUser(user)+ s.Ideas.SetCurrentUser(user)+}diff --git a/app/storage/inmemory/idea.go b/app/storage/inmemory/idea.goindex 80544f6d8..403245663 100644--- a/app/storage/inmemory/idea.go+++ b/app/storage/inmemory/idea.go@@ -12,6 +12,8 @@ type IdeaStorage struct {lastID intideas []*models.IdeaideasSupportedBy map[int][]int+ tenant *models.Tenant+ user *models.User}// NewIdeaStorage creates a new IdeaStorage@@ -22,6 +24,16 @@ func NewIdeaStorage() *IdeaStorage {}}+// SetCurrentTenant to current context+func (s *IdeaStorage) SetCurrentTenant(tenant *models.Tenant) {+ s.tenant = tenant+}++// SetCurrentUser to current context+func (s *IdeaStorage) SetCurrentUser(user *models.User) {+ s.user = user+}+// GetByID returns idea by given idfunc (s *IdeaStorage) GetByID(ideaID int) (*models.Idea, error) {for _, idea := range s.ideas {diff --git a/app/storage/inmemory/tag.go b/app/storage/inmemory/tag.goindex fb266fc5d..d5e5693b3 100644--- a/app/storage/inmemory/tag.go+++ b/app/storage/inmemory/tag.go@@ -10,6 +10,8 @@ import (type TagStorage struct {lastID inttags []*models.Tag+ user *models.User+ tenant *models.Tenantassigned map[int][]*models.Tag}@@ -21,6 +23,16 @@ func NewTagStorage() *TagStorage {}}+// SetCurrentTenant to current context+func (s *TagStorage) SetCurrentTenant(tenant *models.Tenant) {+ s.tenant = tenant+}++// SetCurrentUser to current context+func (s *TagStorage) SetCurrentUser(user *models.User) {+ s.user = user+}+// Add creates a new tag with given inputfunc (s *TagStorage) Add(name, color string, isPublic bool) (*models.Tag, error) {s.lastID = s.lastID + 1@@ -59,8 +71,8 @@ func (s *TagStorage) Update(tagID int, name, color string, isPublic bool) (*modereturn nil, app.ErrNotFound}-// Remove a tag by its id-func (s *TagStorage) Remove(tagID int) error {+// Delete a tag by its id+func (s *TagStorage) Delete(tagID int) error {for i, tag := range s.tags {if tag.ID == tagID {s.tags = append(s.tags[:i], s.tags[i+1:]...)@@ -119,3 +131,17 @@ func (s *TagStorage) GetAssigned(ideaID int) ([]*models.Tag, error) {}return make([]*models.Tag, 0), nil}++// GetAll returns all tags+func (s *TagStorage) GetAll() ([]*models.Tag, error) {+ if s.user != nil && s.user.IsCollaborator() {+ return s.tags, nil+ }+ tags := make([]*models.Tag, 0)+ for _, tag := range s.tags {+ if tag.IsPublic {+ tags = append(tags, tag)+ }+ }+ return tags, nil+}diff --git a/app/storage/inmemory/tenant.go b/app/storage/inmemory/tenant.goindex b107328c4..82c622a0b 100644--- a/app/storage/inmemory/tenant.go+++ b/app/storage/inmemory/tenant.go@@ -14,6 +14,7 @@ type TenantStorage struct {lastID inttenants []*models.Tenantcurrent *models.Tenant+ user *models.Userrequests []*models.SignInRequest}@@ -22,6 +23,11 @@ func (s *TenantStorage) SetCurrentTenant(tenant *models.Tenant) {s.current = tenant}+// SetCurrentUser to current context+func (s *TenantStorage) SetCurrentUser(user *models.User) {+ s.user = user+}+// Add given tenant to tenant listfunc (s *TenantStorage) Add(name string, subdomain string, status int) (*models.Tenant, error) {s.lastID = s.lastID + 1diff --git a/app/storage/inmemory/user.go b/app/storage/inmemory/user.goindex 6408d0d17..561b5fc19 100644--- a/app/storage/inmemory/user.go+++ b/app/storage/inmemory/user.go@@ -9,6 +9,8 @@ import (// UserStorage is used for user operationstype UserStorage struct {+ user *models.User+ tenant *models.Tenantusers []*models.UserlastID int}@@ -23,6 +25,16 @@ func (s *UserStorage) GetByID(userID int) (*models.User, error) {return nil, app.ErrNotFound}+// SetCurrentTenant tenant+func (s *UserStorage) SetCurrentTenant(tenant *models.Tenant) {+ s.tenant = tenant+}++// SetCurrentUser to current context+func (s *UserStorage) SetCurrentUser(user *models.User) {+ s.user = user+}+// GetByEmail returns a user based on given emailfunc (s *UserStorage) GetByEmail(tenantID int, email string) (*models.User, error) {for _, user := range s.users {diff --git a/app/storage/postgres/idea.go b/app/storage/postgres/idea.goindex 232219948..eb5776b0a 100644--- a/app/storage/postgres/idea.go+++ b/app/storage/postgres/idea.go@@ -1,6 +1,7 @@package postgresimport (+ "fmt""time""database/sql"@@ -25,6 +26,7 @@ type dbIdea struct {Response sql.NullString `db:"response"`RespondedOn dbx.NullTime `db:"response_date"`ResponseUser *dbUser `db:"response_user"`+ Tags []int64 `db:"tags"`}func (i *dbIdea) toModel() *models.Idea {@@ -39,6 +41,7 @@ func (i *dbIdea) toModel() *models.Idea {TotalComments: i.TotalComments,Status: i.Status,User: i.User.toModel(),+ Tags: i.Tags,}if i.Response.Valid {@@ -71,16 +74,26 @@ func (c *dbComment) toModel() *models.Comment {type IdeaStorage struct {trx *dbx.Trxtenant *models.Tenant+ user *models.User}// NewIdeaStorage creates a new IdeaStorage-func NewIdeaStorage(tenant *models.Tenant, trx *dbx.Trx) *IdeaStorage {+func NewIdeaStorage(trx *dbx.Trx) *IdeaStorage {return &IdeaStorage{- trx: trx,- tenant: tenant,+ trx: trx,}}+// SetCurrentTenant to current context+func (s *IdeaStorage) SetCurrentTenant(tenant *models.Tenant) {+ s.tenant = tenant+}++// SetCurrentUser to current context+func (s *IdeaStorage) SetCurrentUser(user *models.User) {+ s.user = user+}+var (sqlSelectIdeasWhere = `SELECT i.id,i.number,@@ -100,19 +113,36 @@ var (r.id AS response_user_id,r.name AS response_user_name,r.email AS response_user_email,- r.role AS response_user_role+ r.role AS response_user_role,+ array_remove(array_agg(t.id), NULL) AS tagsFROM ideas iINNER JOIN users uON u.id = i.user_idLEFT JOIN users rON r.id = i.response_user_id- WHERE`+ LEFT JOIN idea_tags it+ ON it.idea_id = i.id+ LEFT JOIN tags t+ ON t.id = it.tag_id+ %s+ WHERE %s+ GROUP BY i.id, u.id, r.id+ ORDER BY %s`)+// GetAll returns all tenant ideas+func (s *IdeaStorage) getIdeaQuery(filter, order string) string {+ tagCondition := `AND t.is_public = true`+ if s.user != nil && s.user.IsCollaborator() {+ tagCondition = ``+ }+ return fmt.Sprintf(sqlSelectIdeasWhere, tagCondition, filter, order)+}+// GetAll returns all tenant ideasfunc (s *IdeaStorage) GetAll() ([]*models.Idea, error) {var ideas []*dbIdea- err := s.trx.Select(&ideas, sqlSelectIdeasWhere+" i.tenant_id = $1 ORDER BY i.created_on DESC", s.tenant.ID)+ err := s.trx.Select(&ideas, s.getIdeaQuery("i.tenant_id = $1", "i.created_on DESC"), s.tenant.ID)if err != nil {return nil, err}@@ -128,7 +158,7 @@ func (s *IdeaStorage) GetAll() ([]*models.Idea, error) {func (s *IdeaStorage) GetByID(ideaID int) (*models.Idea, error) {idea := dbIdea{}- err := s.trx.Get(&idea, sqlSelectIdeasWhere+" i.tenant_id = $1 AND i.id = $2 ORDER BY i.created_on DESC", s.tenant.ID, ideaID)+ err := s.trx.Get(&idea, s.getIdeaQuery("i.tenant_id = $1 AND i.id = $2", "i.created_on DESC"), s.tenant.ID, ideaID)if err == sql.ErrNoRows {return nil, app.ErrNotFound} else if err != nil {@@ -142,7 +172,7 @@ func (s *IdeaStorage) GetByID(ideaID int) (*models.Idea, error) {func (s *IdeaStorage) GetByNumber(number int) (*models.Idea, error) {idea := dbIdea{}- err := s.trx.Get(&idea, sqlSelectIdeasWhere+" i.tenant_id = $1 AND i.number = $2 ORDER BY i.created_on DESC", s.tenant.ID, number)+ err := s.trx.Get(&idea, s.getIdeaQuery("i.tenant_id = $1 AND i.number = $2", "i.created_on DESC"), s.tenant.ID, number)if err == sql.ErrNoRows {return nil, app.ErrNotFound} else if err != nil {diff --git a/app/storage/postgres/idea_test.go b/app/storage/postgres/idea_test.goindex 782c60602..b8eb249a3 100644--- a/app/storage/postgres/idea_test.go+++ b/app/storage/postgres/idea_test.go@@ -20,7 +20,8 @@ func TestIdeaStorage_GetAll(t *testing.T) {trx.Execute("INSERT INTO ideas (title, slug, number, description, created_on, tenant_id, user_id, supporters, status) VALUES ('Idea #2', 'idea-2', 2, 'Description #2', $1, 1, 2, 5, 2)", now)tenants := postgres.NewTenantStorage(trx)- ideas := postgres.NewIdeaStorage(demoTenant(tenants), trx)+ ideas := postgres.NewIdeaStorage(trx)+ ideas.SetCurrentTenant(demoTenant(tenants))dbIdeas, err := ideas.GetAll()Expect(err).To(BeNil())@@ -48,7 +49,8 @@ func TestIdeaStorage_AddAndGet(t *testing.T) {defer TeardownDatabaseTest()tenants := postgres.NewTenantStorage(trx)- ideas := postgres.NewIdeaStorage(demoTenant(tenants), trx)+ ideas := postgres.NewIdeaStorage(trx)+ ideas.SetCurrentTenant(demoTenant(tenants))idea, err := ideas.Add("My new idea", "with this description", 1)Expect(err).To(BeNil())@@ -71,7 +73,8 @@ func TestIdeaStorage_GetInvalid(t *testing.T) {defer TeardownDatabaseTest()tenants := postgres.NewTenantStorage(trx)- ideas := postgres.NewIdeaStorage(demoTenant(tenants), trx)+ ideas := postgres.NewIdeaStorage(trx)+ ideas.SetCurrentTenant(demoTenant(tenants))dbIdea, err := ideas.GetByID(1)Expect(err).To(Equal(app.ErrNotFound))@@ -83,7 +86,8 @@ func TestIdeaStorage_AddAndReturnComments(t *testing.T) {defer TeardownDatabaseTest()tenants := postgres.NewTenantStorage(trx)- ideas := postgres.NewIdeaStorage(demoTenant(tenants), trx)+ ideas := postgres.NewIdeaStorage(trx)+ ideas.SetCurrentTenant(demoTenant(tenants))idea, err := ideas.Add("My new idea", "with this description", 1)Expect(err).To(BeNil())@@ -105,10 +109,12 @@ func TestIdeaStorage_AddAndGet_DifferentTenants(t *testing.T) {defer TeardownDatabaseTest()tenants := postgres.NewTenantStorage(trx)- demoIdeas := postgres.NewIdeaStorage(demoTenant(tenants), trx)+ demoIdeas := postgres.NewIdeaStorage(trx)+ demoIdeas.SetCurrentTenant(demoTenant(tenants))demoIdea, _ := demoIdeas.Add("My new idea", "with this description", 1)- orangeIdeas := postgres.NewIdeaStorage(orangeTenant(tenants), trx)+ orangeIdeas := postgres.NewIdeaStorage(trx)+ orangeIdeas.SetCurrentTenant(orangeTenant(tenants))orangeIdea, _ := orangeIdeas.Add("My other idea", "with other description", 3)dbIdea, err := demoIdeas.GetByNumber(1)@@ -133,7 +139,8 @@ func TestIdeaStorage_Update(t *testing.T) {defer TeardownDatabaseTest()tenants := postgres.NewTenantStorage(trx)- ideas := postgres.NewIdeaStorage(demoTenant(tenants), trx)+ ideas := postgres.NewIdeaStorage(trx)+ ideas.SetCurrentTenant(demoTenant(tenants))idea, err := ideas.Add("My new idea", "with this description", 1)Expect(err).To(BeNil())@@ -150,7 +157,8 @@ func TestIdeaStorage_AddSupporter(t *testing.T) {defer TeardownDatabaseTest()tenants := postgres.NewTenantStorage(trx)- ideas := postgres.NewIdeaStorage(demoTenant(tenants), trx)+ ideas := postgres.NewIdeaStorage(trx)+ ideas.SetCurrentTenant(demoTenant(tenants))idea, _ := ideas.Add("My new idea", "with this description", 1)err := ideas.AddSupporter(idea.Number, 1)@@ -169,7 +177,8 @@ func TestIdeaStorage_AddSupporter_Twice(t *testing.T) {defer TeardownDatabaseTest()tenants := postgres.NewTenantStorage(trx)- ideas := postgres.NewIdeaStorage(demoTenant(tenants), trx)+ ideas := postgres.NewIdeaStorage(trx)+ ideas.SetCurrentTenant(demoTenant(tenants))idea, _ := ideas.Add("My new idea", "with this description", 1)err := ideas.AddSupporter(idea.Number, 1)@@ -188,7 +197,8 @@ func TestIdeaStorage_RemoveSupporter(t *testing.T) {defer TeardownDatabaseTest()tenants := postgres.NewTenantStorage(trx)- ideas := postgres.NewIdeaStorage(demoTenant(tenants), trx)+ ideas := postgres.NewIdeaStorage(trx)+ ideas.SetCurrentTenant(demoTenant(tenants))idea, _ := ideas.Add("My new idea", "with this description", 1)err := ideas.AddSupporter(idea.Number, 1)@@ -207,7 +217,8 @@ func TestIdeaStorage_RemoveSupporter_Twice(t *testing.T) {defer TeardownDatabaseTest()tenants := postgres.NewTenantStorage(trx)- ideas := postgres.NewIdeaStorage(demoTenant(tenants), trx)+ ideas := postgres.NewIdeaStorage(trx)+ ideas.SetCurrentTenant(demoTenant(tenants))idea, _ := ideas.Add("My new idea", "with this description", 1)err := ideas.AddSupporter(idea.Number, 1)@@ -229,7 +240,8 @@ func TestIdeaStorage_SetResponse(t *testing.T) {defer TeardownDatabaseTest()tenants := postgres.NewTenantStorage(trx)- ideas := postgres.NewIdeaStorage(demoTenant(tenants), trx)+ ideas := postgres.NewIdeaStorage(trx)+ ideas.SetCurrentTenant(demoTenant(tenants))idea, _ := ideas.Add("My new idea", "with this description", 1)err := ideas.SetResponse(idea.Number, "We liked this idea", 1, models.IdeaStarted)@@ -246,7 +258,8 @@ func TestIdeaStorage_AddSupporter_ClosedIdea(t *testing.T) {defer TeardownDatabaseTest()tenants := postgres.NewTenantStorage(trx)- ideas := postgres.NewIdeaStorage(demoTenant(tenants), trx)+ ideas := postgres.NewIdeaStorage(trx)+ ideas.SetCurrentTenant(demoTenant(tenants))idea, _ := ideas.Add("My new idea", "with this description", 1)ideas.SetResponse(idea.Number, "We liked this idea", 1, models.IdeaCompleted)ideas.AddSupporter(idea.Number, 1)@@ -261,7 +274,8 @@ func TestIdeaStorage_RemoveSupporter_ClosedIdea(t *testing.T) {defer TeardownDatabaseTest()tenants := postgres.NewTenantStorage(trx)- ideas := postgres.NewIdeaStorage(demoTenant(tenants), trx)+ ideas := postgres.NewIdeaStorage(trx)+ ideas.SetCurrentTenant(demoTenant(tenants))idea, _ := ideas.Add("My new idea", "with this description", 1)ideas.AddSupporter(idea.Number, 1)ideas.SetResponse(idea.Number, "We liked this idea", 1, models.IdeaCompleted)@@ -277,7 +291,8 @@ func TestIdeaStorage_ListSupportedIdeas(t *testing.T) {defer TeardownDatabaseTest()tenants := postgres.NewTenantStorage(trx)- ideas := postgres.NewIdeaStorage(demoTenant(tenants), trx)+ ideas := postgres.NewIdeaStorage(trx)+ ideas.SetCurrentTenant(demoTenant(tenants))idea1, _ := ideas.Add("My new idea", "with this description", 1)idea2, _ := ideas.Add("My other idea", "with better description", 1)ideas.AddSupporter(idea1.Number, 2)@@ -286,3 +301,32 @@ func TestIdeaStorage_ListSupportedIdeas(t *testing.T) {Expect(ideas.SupportedBy(1)).To(Equal([]int{}))Expect(ideas.SupportedBy(2)).To(Equal([]int{idea1.ID, idea2.ID}))}++func TestIdeaStorage_WithTags(t *testing.T) {+ SetupDatabaseTest(t)+ defer TeardownDatabaseTest()++ tenants := postgres.NewTenantStorage(trx)+ users := postgres.NewUserStorage(trx)+ ideas := postgres.NewIdeaStorage(trx)+ ideas.SetCurrentTenant(demoTenant(tenants))+ tags := postgres.NewTagStorage(trx)+ tags.SetCurrentTenant(demoTenant(tenants))++ idea, _ := ideas.Add("My new idea", "with this description", 1)+ bug, _ := tags.Add("Bug", "FF0000", true)+ featureRequest, _ := tags.Add("Feature Request", "00FF00", false)++ tags.AssignTag(bug.ID, idea.ID, 1)+ tags.AssignTag(featureRequest.ID, idea.ID, 1)++ idea, _ = ideas.GetByID(idea.ID)+ Expect(len(idea.Tags)).To(Equal(1))+ Expect(idea.Tags[0]).To(Equal(int64(bug.ID)))++ ideas.SetCurrentUser(jonSnow(users))+ idea, _ = ideas.GetByID(idea.ID)+ Expect(len(idea.Tags)).To(Equal(2))+ Expect(idea.Tags[0]).To(Equal(int64(bug.ID)))+ Expect(idea.Tags[1]).To(Equal(int64(featureRequest.ID)))+}diff --git a/app/storage/postgres/setup_test.go b/app/storage/postgres/setup_test.goindex bc0ca154e..7823a6c9f 100644--- a/app/storage/postgres/setup_test.go+++ b/app/storage/postgres/setup_test.go@@ -20,6 +20,16 @@ func demoTenant(tenants *postgres.TenantStorage) *models.Tenant {return tenant}+func jonSnow(users *postgres.UserStorage) *models.User {+ user, _ := users.GetByID(1)+ return user+}++func aryaStark(users *postgres.UserStorage) *models.User {+ user, _ := users.GetByID(2)+ return user+}+var db *dbx.Databasevar trx *dbx.Trxdiff --git a/app/storage/postgres/tag.go b/app/storage/postgres/tag.goindex 98e621f42..557e2b9c2 100644--- a/app/storage/postgres/tag.go+++ b/app/storage/postgres/tag.go@@ -2,6 +2,7 @@ package postgresimport ("database/sql"+ "fmt""time""github.com/getfider/fider/app"@@ -32,16 +33,26 @@ func (t *dbTag) toModel() *models.Tag {type TagStorage struct {trx *dbx.Trxtenant *models.Tenant+ user *models.User}// NewTagStorage creates a new TagStorage-func NewTagStorage(tenant *models.Tenant, trx *dbx.Trx) *TagStorage {+func NewTagStorage(trx *dbx.Trx) *TagStorage {return &TagStorage{- trx: trx,- tenant: tenant,+ trx: trx,}}+// SetCurrentTenant to current context+func (s *TagStorage) SetCurrentTenant(tenant *models.Tenant) {+ s.tenant = tenant+}++// SetCurrentUser to current context+func (s *TagStorage) SetCurrentUser(user *models.User) {+ s.user = user+}+// Add creates a new tag with given inputfunc (s *TagStorage) Add(name, color string, isPublic bool) (*models.Tag, error) {tagSlug := slug.Make(name)@@ -85,8 +96,8 @@ func (s *TagStorage) Update(tagID int, name, color string, isPublic bool) (*modereturn s.GetBySlug(tagSlug)}-// Remove a tag by its id-func (s *TagStorage) Remove(tagID int) error {+// Delete a tag by its id+func (s *TagStorage) Delete(tagID int) error {err := s.trx.Execute(`DELETE FROM idea_tags WHERE tag_id = $1`, tagID)if err != nil {return err@@ -96,7 +107,7 @@ func (s *TagStorage) Remove(tagID int) error {// AssignTag adds a tag to an ideafunc (s *TagStorage) AssignTag(tagID, ideaID, userID int) error {- alreadyAssigned, err := s.trx.Exists("SELECT 1 FROM idea_tags WHERE idea_id = $1", ideaID)+ alreadyAssigned, err := s.trx.Exists("SELECT 1 FROM idea_tags WHERE idea_id = $1 AND tag_id = $2", ideaID, tagID)if err != nil {return err}@@ -125,14 +136,34 @@ func (s *TagStorage) UnassignTag(tagID, ideaID int) error {// GetAssigned returns all tags assigned to given ideafunc (s *TagStorage) GetAssigned(ideaID int) ([]*models.Tag, error) {- tags := []*dbTag{}- err := s.trx.Select(&tags, `+ return s.getTags(`SELECT t.id, t.name, t.slug, t.color, t.is_publicFROM tags tINNER JOIN idea_tags itON it.tag_id = t.idWHERE it.idea_id = $1 AND t.tenant_id = $2`, ideaID, s.tenant.ID)+}++// GetAll returns all tags+func (s *TagStorage) GetAll() ([]*models.Tag, error) {+ condition := `AND t.is_public = true`+ if s.user != nil && s.user.IsCollaborator() {+ condition = ``+ }++ query := fmt.Sprintf(`+ SELECT t.id, t.name, t.slug, t.color, t.is_public+ FROM tags t+ WHERE t.tenant_id = $1 %s+ `, condition)+ return s.getTags(query, s.tenant.ID)+}++// GetAll returns all tags+func (s *TagStorage) getTags(query string, args ...interface{}) ([]*models.Tag, error) {+ tags := []*dbTag{}+ err := s.trx.Select(&tags, query, args...)if err != nil {return nil, err}diff --git a/app/storage/postgres/tag_test.go b/app/storage/postgres/tag_test.goindex 02f103756..83ebd136e 100644--- a/app/storage/postgres/tag_test.go+++ b/app/storage/postgres/tag_test.go@@ -13,15 +13,16 @@ func TestTagStorage_AddAndGet(t *testing.T) {defer TeardownDatabaseTest()tenants := postgres.NewTenantStorage(trx)- tags := postgres.NewTagStorage(demoTenant(tenants), trx)+ tags := postgres.NewTagStorage(trx)+ tags.SetCurrentTenant(demoTenant(tenants))tag, err := tags.Add("Feature Request", "FF0000", true)Expect(err).To(BeNil())- Expect(tag.ID).To(Equal(1))+ Expect(tag.ID).ToNot(BeZero())dbTag, err := tags.GetBySlug("feature-request")Expect(err).To(BeNil())- Expect(dbTag.ID).To(Equal(1))+ Expect(dbTag.ID).ToNot(BeZero())Expect(dbTag.Name).To(Equal("Feature Request"))Expect(dbTag.Slug).To(Equal("feature-request"))Expect(dbTag.Color).To(Equal("FF0000"))@@ -33,7 +34,8 @@ func TestTagStorage_AddUpdateAndGet(t *testing.T) {defer TeardownDatabaseTest()tenants := postgres.NewTenantStorage(trx)- tags := postgres.NewTagStorage(demoTenant(tenants), trx)+ tags := postgres.NewTagStorage(trx)+ tags.SetCurrentTenant(demoTenant(tenants))tag, err := tags.Add("Feature Request", "FF0000", true)tag, err = tags.Update(tag.ID, "Bug", "000000", false)@@ -47,15 +49,16 @@ func TestTagStorage_AddUpdateAndGet(t *testing.T) {Expect(dbTag.IsPublic).To(BeFalse())}-func TestTagStorage_AddRemoveAndGet(t *testing.T) {+func TestTagStorage_AddDeleteAndGet(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()tenants := postgres.NewTenantStorage(trx)- tags := postgres.NewTagStorage(demoTenant(tenants), trx)+ tags := postgres.NewTagStorage(trx)+ tags.SetCurrentTenant(demoTenant(tenants))tag, err := tags.Add("Bug", "FFFFFF", true)- err = tags.Remove(tag.ID)+ err = tags.Delete(tag.ID)Expect(err).To(BeNil())dbTag, err := tags.GetBySlug("bug")@@ -69,8 +72,13 @@ func TestTagStorage_Assign_Unassign(t *testing.T) {defer TeardownDatabaseTest()tenants := postgres.NewTenantStorage(trx)- ideas := postgres.NewIdeaStorage(demoTenant(tenants), trx)- tags := postgres.NewTagStorage(demoTenant(tenants), trx)++ ideas := postgres.NewIdeaStorage(trx)+ ideas.SetCurrentTenant(demoTenant(tenants))++ tags := postgres.NewTagStorage(trx)+ tags.SetCurrentTenant(demoTenant(tenants))+idea, _ := ideas.Add("My great idea", "with a great description", 2)tag, _ := tags.Add("Bug", "FFFFFF", true)@@ -94,23 +102,67 @@ func TestTagStorage_Assign_Unassign(t *testing.T) {Expect(len(assigned)).To(Equal(0))}-func TestTagStorage_Assign_RemoveTag(t *testing.T) {+func TestTagStorage_Assign_DeleteTag(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()tenants := postgres.NewTenantStorage(trx)- ideas := postgres.NewIdeaStorage(demoTenant(tenants), trx)- tags := postgres.NewTagStorage(demoTenant(tenants), trx)++ ideas := postgres.NewIdeaStorage(trx)+ ideas.SetCurrentTenant(demoTenant(tenants))++ tags := postgres.NewTagStorage(trx)+ tags.SetCurrentTenant(demoTenant(tenants))+idea, _ := ideas.Add("My great idea", "with a great description", 2)tag, _ := tags.Add("Bug", "FFFFFF", true)err := tags.AssignTag(tag.ID, idea.ID, 2)Expect(err).To(BeNil())- err = tags.Remove(tag.ID)+ err = tags.Delete(tag.ID)Expect(err).To(BeNil())assigned, err := tags.GetAssigned(idea.ID)Expect(err).To(BeNil())Expect(len(assigned)).To(Equal(0))}++func TestTagStorage_GetAll(t *testing.T) {+ SetupDatabaseTest(t)+ defer TeardownDatabaseTest()++ tenants := postgres.NewTenantStorage(trx)+ users := postgres.NewUserStorage(trx)+ users.SetCurrentTenant(demoTenant(tenants))++ tags := postgres.NewTagStorage(trx)+ tags.SetCurrentTenant(demoTenant(tenants))+ tags.SetCurrentUser(jonSnow(users))+ tags.Add("Feature Request", "FF0000", true)+ tags.Add("Bug", "0F0F0F", false)++ allTags, err := tags.GetAll()++ Expect(err).To(BeNil())+ Expect(len(allTags)).To(Equal(2))++ Expect(allTags[0].ID).NotTo(BeZero())+ Expect(allTags[0].Name).To(Equal("Feature Request"))+ Expect(allTags[0].Slug).To(Equal("feature-request"))+ Expect(allTags[0].Color).To(Equal("FF0000"))+ Expect(allTags[0].IsPublic).To(BeTrue())++ Expect(allTags[1].ID).NotTo(BeZero())+ Expect(allTags[1].Name).To(Equal("Bug"))+ Expect(allTags[1].Slug).To(Equal("bug"))+ Expect(allTags[1].Color).To(Equal("0F0F0F"))+ Expect(allTags[1].IsPublic).To(BeFalse())++ tags.SetCurrentUser(aryaStark(users))++ visitorTags, err := tags.GetAll()+ Expect(err).To(BeNil())+ Expect(len(visitorTags)).To(Equal(1))+ Expect(visitorTags[0].Name).To(Equal("Feature Request"))+}diff --git a/app/storage/postgres/tenant.go b/app/storage/postgres/tenant.goindex d462bccae..302ac2e72 100644--- a/app/storage/postgres/tenant.go+++ b/app/storage/postgres/tenant.go@@ -12,17 +12,6 @@ import ("github.com/getfider/fider/app/pkg/env")-// TenantStorage contains read and write operations for tenants-type TenantStorage struct {- trx *dbx.Trx- current *models.Tenant-}--// NewTenantStorage creates a new TenantStorage-func NewTenantStorage(trx *dbx.Trx) *TenantStorage {- return &TenantStorage{trx: trx}-}-type dbTenant struct {ID int `db:"id"`Name string `db:"name"`@@ -72,11 +61,28 @@ func (t *dbSignInRequest) toModel() *models.SignInRequest {return model}-// SetCurrentTenant tenant+// TenantStorage contains read and write operations for tenants+type TenantStorage struct {+ trx *dbx.Trx+ current *models.Tenant+ user *models.User+}++// NewTenantStorage creates a new TenantStorage+func NewTenantStorage(trx *dbx.Trx) *TenantStorage {+ return &TenantStorage{trx: trx}+}++// SetCurrentTenant to current contextfunc (s *TenantStorage) SetCurrentTenant(tenant *models.Tenant) {s.current = tenant}+// SetCurrentUser to current context+func (s *TenantStorage) SetCurrentUser(user *models.User) {+ s.user = user+}+// Add given tenant to tenant listfunc (s *TenantStorage) Add(name string, subdomain string, status int) (*models.Tenant, error) {var id intdiff --git a/app/storage/postgres/user.go b/app/storage/postgres/user.goindex ebbba3bd4..2f57d9875 100644--- a/app/storage/postgres/user.go+++ b/app/storage/postgres/user.go@@ -51,12 +51,23 @@ func (u *dbUser) toModel() *models.User {// UserStorage is used for user operations using a Postgres databasetype UserStorage struct {tenant *models.Tenant+ user *models.Usertrx *dbx.Trx}// NewUserStorage creates a new UserStorage-func NewUserStorage(tenant *models.Tenant, trx *dbx.Trx) *UserStorage {- return &UserStorage{tenant: tenant, trx: trx}+func NewUserStorage(trx *dbx.Trx) *UserStorage {+ return &UserStorage{trx: trx}+}++// SetCurrentTenant to current context+func (s *UserStorage) SetCurrentTenant(tenant *models.Tenant) {+ s.tenant = tenant+}++// SetCurrentUser to current context+func (s *UserStorage) SetCurrentUser(user *models.User) {+ s.user = user}// GetByID returns a user based on given iddiff --git a/app/storage/postgres/user_test.go b/app/storage/postgres/user_test.goindex 10bb86094..700281f1c 100644--- a/app/storage/postgres/user_test.go+++ b/app/storage/postgres/user_test.go@@ -14,7 +14,7 @@ func TestUserStorage_GetByID(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- users := postgres.NewUserStorage(nil, trx)+ users := postgres.NewUserStorage(trx)user, err := users.GetByID(1)Expect(err).To(BeNil())@@ -31,7 +31,7 @@ func TestUserStorage_GetByEmail_Error(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- users := postgres.NewUserStorage(nil, trx)+ users := postgres.NewUserStorage(trx)user, err := users.GetByEmail(1, "[email protected]")Expect(user).To(BeNil())@@ -42,7 +42,7 @@ func TestUserStorage_GetByEmail(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- users := postgres.NewUserStorage(nil, trx)+ users := postgres.NewUserStorage(trx)user, err := users.GetByEmail(1, "[email protected]")Expect(err).To(BeNil())@@ -59,7 +59,7 @@ func TestUserStorage_GetByProvider(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- users := postgres.NewUserStorage(nil, trx)+ users := postgres.NewUserStorage(trx)user, err := users.GetByProvider(1, "facebook", "FB1234")Expect(err).To(BeNil())@@ -76,7 +76,7 @@ func TestUserStorage_GetByProvider_WrongTenant(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- users := postgres.NewUserStorage(nil, trx)+ users := postgres.NewUserStorage(trx)user, err := users.GetByProvider(2, "facebook", "FB1234")Expect(user).To(BeNil())@@ -87,7 +87,7 @@ func TestUserStorage_GetByEmail_WrongTenant(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- users := postgres.NewUserStorage(nil, trx)+ users := postgres.NewUserStorage(trx)user, err := users.GetByEmail(2, "[email protected]")Expect(user).To(BeNil())@@ -98,7 +98,7 @@ func TestUserStorage_Register(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- users := postgres.NewUserStorage(nil, trx)+ users := postgres.NewUserStorage(trx)user := &models.User{Name: "Rob Stark",Email: "[email protected]",@@ -135,7 +135,7 @@ func TestUserStorage_Register_MultipleProviders(t *testing.T) {RETURNING id`).Scan(&tenantID)- users := postgres.NewUserStorage(nil, trx)+ users := postgres.NewUserStorage(trx)user := &models.User{Name: "Jon Snow",Email: "[email protected]",@@ -166,7 +166,7 @@ func TestUserStorage_RegisterProvider(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- users := postgres.NewUserStorage(nil, trx)+ users := postgres.NewUserStorage(trx)users.RegisterProvider(1, &models.UserProvider{UID: "GO1234",Name: "google",@@ -190,7 +190,7 @@ func TestUserStorage_UpdateSettings(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- users := postgres.NewUserStorage(nil, trx)+ users := postgres.NewUserStorage(trx)err := users.Update(1, &models.UpdateUserSettings{Name: "Jon Stark"})Expect(err).To(BeNil())@@ -204,7 +204,8 @@ func TestUserStorage_ChangeRole(t *testing.T) {tenants := postgres.NewTenantStorage(trx)- users := postgres.NewUserStorage(demoTenant(tenants), trx)+ users := postgres.NewUserStorage(trx)+ users.SetCurrentTenant(demoTenant(tenants))err := users.ChangeRole(1, models.RoleVisitor)Expect(err).To(BeNil())@@ -218,7 +219,8 @@ func TestUserStorage_GetAll(t *testing.T) {tenants := postgres.NewTenantStorage(trx)- users := postgres.NewUserStorage(demoTenant(tenants), trx)+ users := postgres.NewUserStorage(trx)+ users.SetCurrentTenant(demoTenant(tenants))all, err := users.GetAll()Expect(err).To(BeNil())Expect(len(all)).To(Equal(2))diff --git a/app/storage/storage.go b/app/storage/storage.goindex 0ff26d6d0..03f78eab4 100644--- a/app/storage/storage.go+++ b/app/storage/storage.go@@ -6,8 +6,15 @@ import ("github.com/getfider/fider/app/models")+// Base is a generic storage base interface+type Base interface {+ SetCurrentTenant(*models.Tenant)+ SetCurrentUser(*models.User)+}+// Idea contains read and write operations for ideastype Idea interface {+ BaseGetByID(ideaID int) (*models.Idea, error)GetByNumber(number int) (*models.Idea, error)GetCommentsByIdea(number int) ([]*models.Comment, error)@@ -23,6 +30,7 @@ type Idea interface {// User is used for user operationstype User interface {+ BaseGetByID(userID int) (*models.User, error)GetByEmail(tenantID int, email string) (*models.User, error)GetByProvider(tenantID int, provider string, uid string) (*models.User, error)@@ -35,6 +43,7 @@ type User interface {// Tenant contains read and write operations for tenantstype Tenant interface {+ BaseAdd(name string, subdomain string, status int) (*models.Tenant, error)First() (*models.Tenant, error)Activate(id int) error@@ -45,16 +54,17 @@ type Tenant interface {SaveVerificationKey(key string, duration time.Duration, email, name string) errorFindVerificationByKey(key string) (*models.SignInRequest, error)SetKeyAsVerified(key string) error- SetCurrentTenant(*models.Tenant)}// Tag contains read and write operations for tagstype Tag interface {+ BaseAdd(name, color string, isPublic bool) (*models.Tag, error)GetBySlug(slug string) (*models.Tag, error)Update(tagID int, name, color string, isPublic bool) (*models.Tag, error)- Remove(tagID int) error+ Delete(tagID int) errorGetAssigned(ideaID int) ([]*models.Tag, error)AssignTag(tagID, ideaID, userID int) errorUnassignTag(tagID, ideaID int) error+ GetAll() ([]*models.Tag, error)}diff --git a/package-lock.json b/package-lock.jsonindex c0feb1dac..596292af9 100644--- a/package-lock.json+++ b/package-lock.json@@ -5,9 +5,9 @@"requires": true,"dependencies": {"@types/jquery": {- "version": "3.2.13",- "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.2.13.tgz",- "integrity": "sha512-T1rbXqLSQb4wDJClzfEgJ2kcjHrZXw+TcVzxhZCpnkv80FPj9bxGBatkUpd5flReysCBF9f+GR6bnzanoO5Cvw==",+ "version": "3.2.16",+ "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.2.16.tgz",+ "integrity": "sha512-q2WC02YxQoX2nY1HRKlYGHpGP1saPmD7GN0pwCDlTz35a4eOtJG+aHRlXyjCuXokUukSrR2aXyBhSW3j+jPc0A==","dev": true},"@types/markdown-it": {@@ -26,9 +26,9 @@}},"@types/mocha": {- "version": "2.2.43",- "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-2.2.43.tgz",- "integrity": "sha512-xNlAmH+lRJdUMXClMTI9Y0pRqIojdxfm7DHsIxoB2iTzu3fnPmSMEN8SsSx0cdwV36d02PWCWaDUoZPDSln+xw==",+ "version": "2.2.44",+ "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-2.2.44.tgz",+ "integrity": "sha512-k2tWTQU8G4+iSMvqKi0Q9IIsWAp/n8xzdZS4Q4YVIltApoMA00wFBFdlJnmoaK1/z7B0Cy0yPe6GgXteSmdUNw==","dev": true},"@types/node": {@@ -38,19 +38,19 @@"dev": true},"@types/react": {- "version": "16.0.10",- "resolved": "https://registry.npmjs.org/@types/react/-/react-16.0.10.tgz",- "integrity": "sha512-2/Qd50RYot1536DXqIyAtxiWRhFErArHRLZgshrrj28lTJsWdvSL/gumB60YqZ3yLbdnAOkbFOE/hOLy6SPjnw==",+ "version": "16.0.25",+ "resolved": "https://registry.npmjs.org/@types/react/-/react-16.0.25.tgz",+ "integrity": "sha512-K79zMwWRzQ2db+nPoKpi3gA/KmLo6ZQgT4iO2QPEUdBO7as0PcgrmU9KHYzIO3V6lbD7gRjOM0/nUch6xBfOvQ==","dev": true},"@types/react-dom": {- "version": "16.0.0",- "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-16.0.0.tgz",- "integrity": "sha512-jSddgUWWZmMkU1ULfFg1nrxmK5Isun1D/AxlgsYh68tP7jIG7xOWiRzStRdn7AFXigu3deyeHdchd4aQRUk9DQ==",+ "version": "16.0.3",+ "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-16.0.3.tgz",+ "integrity": "sha512-xAvZiGhQlEhjStoKktoai8CelXVFBaSN6JX4vy1UQioRba3c2vum1TGzR0thHoEauZtIwzWg8mos0AHu2ne4jw==","dev": true,"requires": {"@types/node": "8.0.32",- "@types/react": "16.0.10"+ "@types/react": "16.0.25"}},"@types/react-textarea-autosize": {@@ -59,13 +59,13 @@"integrity": "sha512-50W9dx8TlA1Z2ZemtXXCu5docRHRTvdzIMwMAA1PSzeoivPmPguh3PHQ9ibEkK4WczPecrZblvyZCrA2t5KKnA==","dev": true,"requires": {- "@types/react": "16.0.10"+ "@types/react": "16.0.25"}},"@types/selenium-webdriver": {- "version": "3.0.7",- "resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-3.0.7.tgz",- "integrity": "sha512-tHdDdGUBKTbiLLwf5mF78EP35F31UZekG+GRNowl8G5rMQoupAT4qWn/7AaGOvmaqvROdqC3Io/hP1ZyO58QkA==",+ "version": "3.0.8",+ "resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-3.0.8.tgz",+ "integrity": "sha512-yrqQvb1EZhH+ONMzUmsEnBjzitortVv0lynRe5US2+FofdoMWUE4wf7v4peCd62fqXq8COCVTbpS1/jIg5EbuQ==","dev": true},"abbrev": {@@ -75,9 +75,9 @@"dev": true},"acorn": {- "version": "5.1.2",- "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.2.tgz",- "integrity": "sha512-o96FZLJBPY1lvTuJylGA9Bk3t/GKPPJG8H0ydQQl01crzwJgspa4AEIq/pVTXigmK0PHVQhiAtn8WMBLL9D2WA==",+ "version": "5.2.1",+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.2.1.tgz",+ "integrity": "sha512-jG0u7c4Ly+3QkkW18V+NRDN+4bWHdln30NL1ZL2AvFZZmQe/BfopYCtghCKKVBUSetZ4QKcyA0pY6/4Gw8Pv8w==","dev": true},"acorn-dynamic-import": {@@ -110,9 +110,9 @@}},"ajv-keywords": {- "version": "2.1.0",- "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.0.tgz",- "integrity": "sha1-opbhf3v658HOT34N5T0pyzIWLfA=",+ "version": "2.1.1",+ "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz",+ "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=","dev": true},"align-text": {@@ -238,9 +238,9 @@"dev": true},"asn1.js": {- "version": "4.9.1",- "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.1.tgz",- "integrity": "sha1-SLokC0WpKA6UdImQull9IWYX/UA=",+ "version": "4.9.2",+ "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.2.tgz",+ "integrity": "sha512-b/OsSjvWEo8Pi8H0zsDd2P6Uqo2TK2pH8gNLSJtNLM2Db0v2QaAZ0pBQJXVjAn4gBuugeVDr7s63ZogpUIwWDg==","dev": true,"requires": {"bn.js": "4.11.8",@@ -317,9 +317,9 @@"dev": true},"axios": {- "version": "0.16.2",- "resolved": "https://registry.npmjs.org/axios/-/axios-0.16.2.tgz",- "integrity": "sha1-uk+S8XFn37q0CYN4VFS5rBScPG0=",+ "version": "0.17.1",+ "resolved": "https://registry.npmjs.org/axios/-/axios-0.17.1.tgz",+ "integrity": "sha1-LY4+XQvb1zJ/kbyBT1xXZg+Bgk0=","requires": {"follow-redirects": "1.2.5","is-buffer": "1.1.5"@@ -365,9 +365,9 @@"dev": true},"binary-extensions": {- "version": "1.10.0",- "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.10.0.tgz",- "integrity": "sha1-muuabF6IY4qtFx4Wf1kAq+JINdA=",+ "version": "1.11.0",+ "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz",+ "integrity": "sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=","dev": true},"block-stream": {@@ -428,9 +428,9 @@"dev": true},"browserify-aes": {- "version": "1.0.8",- "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.8.tgz",- "integrity": "sha512-WYCMOT/PtGTlpOKFht0YJFYcPy6pLCR98CtWfzK13zoynLlBMvAdEMSRGmgnJCw2M2j/5qxBkinZQFobieM8dQ==",+ "version": "1.1.1",+ "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.1.1.tgz",+ "integrity": "sha512-UGnTYAnB2a3YuYKIRy1/4FB2HdM866E0qC46JXvVTYKlBlZlnvfpSfY6OKfXZAkv70eJ2a1SqzpAo5CRhZGDFg==","dev": true,"requires": {"buffer-xor": "1.0.3",@@ -447,7 +447,7 @@"integrity": "sha1-mYgkSHS/XtTijalWZtzWasj8Njo=","dev": true,"requires": {- "browserify-aes": "1.0.8",+ "browserify-aes": "1.1.1","browserify-des": "1.0.0","evp_bytestokey": "1.0.3"}@@ -489,20 +489,12 @@}},"browserify-zlib": {- "version": "0.1.4",- "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",- "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=",+ "version": "0.2.0",+ "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",+ "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==","dev": true,"requires": {- "pako": "0.2.9"- },- "dependencies": {- "pako": {- "version": "0.2.9",- "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",- "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=",- "dev": true- }+ "pako": "1.0.6"}},"browserslist": {@@ -628,7 +620,7 @@"requires": {"anymatch": "1.3.2","async-each": "1.0.1",- "fsevents": "1.1.2",+ "fsevents": "1.1.3","glob-parent": "2.0.0","inherits": "2.0.3","is-binary-path": "1.0.1",@@ -638,16 +630,16 @@}},"chromedriver": {- "version": "2.33.0",- "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-2.33.0.tgz",- "integrity": "sha512-SQgyJVowUp10j6VTUbNr6vKPDGe2LrrxV3MR4PtZQjj4sXZJ5VtvMC0956WpaxaaA17qRUdAl+kj5Ko0oDhA6w==",+ "version": "2.33.2",+ "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-2.33.2.tgz",+ "integrity": "sha512-etnQeM8Mqiys50ZB4IiuNqeB1WS2/EKFhVXwkPQ1qjzKMMAJUyrLjaRUcoZoHrbjGscnhBrWkRR+p3zcTGMhDg==","dev": true,"requires": {- "extract-zip": "1.6.5",+ "del": "3.0.0",+ "extract-zip": "1.6.6","kew": "0.7.0","mkdirp": "0.5.1",- "request": "2.83.0",- "rimraf": "2.6.2"+ "request": "2.83.0"}},"cipher-base": {@@ -907,9 +899,9 @@}},"crypto-browserify": {- "version": "3.11.1",- "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.1.tgz",- "integrity": "sha512-Na7ZlwCOqoaW5RwUK1WpXws2kv8mNhWdTlzob0UXulk6G9BDbyiJaGTYBIX61Ozn9l1EPPJpICZb4DaOpT9NlQ==",+ "version": "3.12.0",+ "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",+ "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==","dev": true,"requires": {"browserify-cipher": "1.0.0",@@ -921,7 +913,8 @@"inherits": "2.0.3","pbkdf2": "3.0.14","public-encrypt": "4.0.0",- "randombytes": "2.0.5"+ "randombytes": "2.0.5",+ "randomfill": "1.0.3"}},"css-color-names": {@@ -1034,7 +1027,7 @@"integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=","dev": true,"requires": {- "es5-ext": "0.10.30"+ "es5-ext": "0.10.35"}},"dashdash": {@@ -1084,14 +1077,6 @@"p-map": "1.2.0","pify": "3.0.0","rimraf": "2.6.2"- },- "dependencies": {- "pify": {- "version": "3.0.0",- "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",- "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",- "dev": true- }}},"delayed-stream": {@@ -1226,23 +1211,23 @@}},"es5-ext": {- "version": "0.10.30",- "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.30.tgz",- "integrity": "sha1-cUGhaDZpfbq/qq7uQUlc4p9SyTk=",+ "version": "0.10.35",+ "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.35.tgz",+ "integrity": "sha1-GO6FjOajxFx9eekcFfzKnsVoSU8=","dev": true,"requires": {- "es6-iterator": "2.0.1",+ "es6-iterator": "2.0.3","es6-symbol": "3.1.1"}},"es6-iterator": {- "version": "2.0.1",- "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.1.tgz",- "integrity": "sha1-jjGcnwRTv1ddN0lAplWSDlnKVRI=",+ "version": "2.0.3",+ "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",+ "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=","dev": true,"requires": {"d": "1.0.0",- "es5-ext": "0.10.30",+ "es5-ext": "0.10.35","es6-symbol": "3.1.1"}},@@ -1253,8 +1238,8 @@"dev": true,"requires": {"d": "1.0.0",- "es5-ext": "0.10.30",- "es6-iterator": "2.0.1",+ "es5-ext": "0.10.35",+ "es6-iterator": "2.0.3","es6-set": "0.1.5","es6-symbol": "3.1.1","event-emitter": "0.3.5"@@ -1273,8 +1258,8 @@"dev": true,"requires": {"d": "1.0.0",- "es5-ext": "0.10.30",- "es6-iterator": "2.0.1",+ "es5-ext": "0.10.35",+ "es6-iterator": "2.0.3","es6-symbol": "3.1.1","event-emitter": "0.3.5"}@@ -1286,7 +1271,7 @@"dev": true,"requires": {"d": "1.0.0",- "es5-ext": "0.10.30"+ "es5-ext": "0.10.35"}},"es6-weak-map": {@@ -1296,8 +1281,8 @@"dev": true,"requires": {"d": "1.0.0",- "es5-ext": "0.10.30",- "es6-iterator": "2.0.1",+ "es5-ext": "0.10.35",+ "es6-iterator": "2.0.3","es6-symbol": "3.1.1"}},@@ -1354,7 +1339,7 @@"dev": true,"requires": {"d": "1.0.0",- "es5-ext": "0.10.30"+ "es5-ext": "0.10.35"}},"events": {@@ -1435,38 +1420,29 @@}},"extract-text-webpack-plugin": {- "version": "3.0.1",- "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.1.tgz",- "integrity": "sha512-zv0/Cg2mU8uMzeQQ3oyfJvZU4Iv/GbQYUIr/HU+8pZetT/0W3xj6XAbxoG4gsp8SbnYcFd4BOsCAZPl9NvplPw==",+ "version": "3.0.2",+ "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.2.tgz",+ "integrity": "sha512-bt/LZ4m5Rqt/Crl2HiKuAl/oqg0psx1tsTLkvWbJen1CtD+fftkZhMaQ9HOtY2gWsl2Wq+sABmMVi9z3DhKWQQ==","dev": true,"requires": {"async": "2.5.0","loader-utils": "1.1.0","schema-utils": "0.3.0",- "webpack-sources": "1.0.1"+ "webpack-sources": "1.0.2"}},"extract-zip": {- "version": "1.6.5",- "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.5.tgz",- "integrity": "sha1-maBnNbbqIOqbcF13ms/8yHz/BEA=",+ "version": "1.6.6",+ "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.6.tgz",+ "integrity": "sha1-EpDt6NINCHK0Kf0/NRyhKOxe+Fw=","dev": true,"requires": {"concat-stream": "1.6.0",- "debug": "2.2.0",+ "debug": "2.6.9","mkdirp": "0.5.0","yauzl": "2.4.1"},"dependencies": {- "debug": {- "version": "2.2.0",- "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",- "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",- "dev": true,- "requires": {- "ms": "0.7.1"- }- },"mkdirp": {"version": "0.5.0","resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",@@ -1475,12 +1451,6 @@"requires": {"minimist": "0.0.8"}- },- "ms": {- "version": "0.7.1",- "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",- "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",- "dev": true}}},@@ -1513,7 +1483,7 @@"object-assign": "4.1.1","promise": "7.3.1","setimmediate": "1.0.5",- "ua-parser-js": "0.7.14"+ "ua-parser-js": "0.7.17"}},"fd-slicer": {@@ -1628,14 +1598,14 @@"dev": true},"fsevents": {- "version": "1.1.2",- "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz",- "integrity": "sha512-Sn44E5wQW4bTHXvQmvSHwqbuiXtduD6Rrjm2ZtUEGbyrig+nUH3t/QD4M4/ZXViY556TBpRgZkHLDx3JxPwxiw==",+ "version": "1.1.3",+ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz",+ "integrity": "sha512-WIr7iDkdmdbxu/Gh6eKEZJL6KPE74/5MEsf2whTOFNxbIoIixogroLdKYqB6FDav4Wavh/lZdzzd3b2KxIXC5Q==","dev": true,"optional": true,"requires": {- "nan": "2.7.0",- "node-pre-gyp": "0.6.36"+ "nan": "2.8.0",+ "node-pre-gyp": "0.6.39"},"dependencies": {"abbrev": {@@ -1793,7 +1763,6 @@"version": "2.0.5","bundled": true,"dev": true,- "optional": true,"requires": {"boom": "2.10.1"}@@ -1841,6 +1810,12 @@"dev": true,"optional": true},+ "detect-libc": {+ "version": "1.0.2",+ "bundled": true,+ "dev": true,+ "optional": true+ },"ecc-jsbn": {"version": "0.1.1","bundled": true,@@ -1982,7 +1957,6 @@"version": "3.1.3","bundled": true,"dev": true,- "optional": true,"requires": {"boom": "2.10.1","cryptiles": "2.0.5",@@ -2154,11 +2128,13 @@"optional": true},"node-pre-gyp": {- "version": "0.6.36",+ "version": "0.6.39","bundled": true,"dev": true,"optional": true,"requires": {+ "detect-libc": "1.0.2",+ "hawk": "3.1.3","mkdirp": "0.5.1","nopt": "4.0.1","npmlog": "4.1.0",@@ -2366,7 +2342,6 @@"version": "1.0.9","bundled": true,"dev": true,- "optional": true,"requires": {"hoek": "2.16.3"}@@ -2569,6 +2544,21 @@"globule": "1.2.0"}},+ "generate-function": {+ "version": "2.0.0",+ "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",+ "integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ=",+ "dev": true+ },+ "generate-object-property": {+ "version": "1.2.0",+ "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",+ "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=",+ "dev": true,+ "requires": {+ "is-property": "1.0.2"+ }+ },"get-caller-file": {"version": "1.0.2","resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz",@@ -2640,6 +2630,14 @@"object-assign": "4.1.1","pify": "2.3.0","pinkie-promise": "2.0.1"+ },+ "dependencies": {+ "pify": {+ "version": "2.3.0",+ "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",+ "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",+ "dev": true+ }}},"globule": {@@ -2739,7 +2737,7 @@"boom": "4.3.1","cryptiles": "3.1.2","hoek": "4.2.0",- "sntp": "2.0.2"+ "sntp": "2.1.0"}},"he": {@@ -2789,9 +2787,9 @@}},"https-browserify": {- "version": "0.0.1",- "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz",- "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI=",+ "version": "1.0.0",+ "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",+ "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=","dev": true},"iconv-lite": {@@ -2930,14 +2928,14 @@"dev": true},"inversify": {- "version": "4.3.0",- "resolved": "https://registry.npmjs.org/inversify/-/inversify-4.3.0.tgz",- "integrity": "sha512-BbKzOP4nLl7DSHx31vN5KgUkkJc759+OLocDGryldXPjogixzOs/n4qvT25lbNN67uB6aWlFF84NS/zI5j8pfg=="+ "version": "4.5.1",+ "resolved": "https://registry.npmjs.org/inversify/-/inversify-4.5.1.tgz",+ "integrity": "sha512-iTGJ/1sN5og+7iYVbsk8K2WY7dvJfVadMish4No7WGTGNKmLCtudNaMEhaZp8MFHKViUJbh/7U85t5J6qFAQkg=="},"inversify-inject-decorators": {- "version": "3.0.1",- "resolved": "https://registry.npmjs.org/inversify-inject-decorators/-/inversify-inject-decorators-3.0.1.tgz",- "integrity": "sha1-3kbfRrpyZC6srHlFHsXBAeTbywA="+ "version": "3.0.2",+ "resolved": "https://registry.npmjs.org/inversify-inject-decorators/-/inversify-inject-decorators-3.0.2.tgz",+ "integrity": "sha512-kM7lR4kdQPWUkKf8CpzgxksZwBnlbAiCyuIF5cCa2tblzGuVUJ27C5byDN5mOyUGUKzFD0W1Abw3R07NL7/zAA=="},"invert-kv": {"version": "1.0.0",@@ -2963,7 +2961,7 @@"integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=","dev": true,"requires": {- "binary-extensions": "1.10.0"+ "binary-extensions": "1.11.0"}},"is-buffer": {@@ -3034,6 +3032,18 @@"is-extglob": "1.0.0"}},+ "is-my-json-valid": {+ "version": "2.16.1",+ "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz",+ "integrity": "sha512-ochPsqWS1WXj8ZnMIV0vnNXooaMhp7cyL4FMSIPKTtnV0Ha/T19G2b9kkhcNsabV9bxYkze7/aLZJb/bYuFduQ==",+ "dev": true,+ "requires": {+ "generate-function": "2.0.0",+ "generate-object-property": "1.2.0",+ "jsonpointer": "4.0.1",+ "xtend": "4.0.1"+ }+ },"is-number": {"version": "2.1.0","resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",@@ -3094,6 +3104,12 @@"integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=","dev": true},+ "is-property": {+ "version": "1.0.2",+ "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",+ "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=",+ "dev": true+ },"is-stream": {"version": "1.1.0","resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",@@ -3237,6 +3253,12 @@"integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=","dev": true},+ "jsonpointer": {+ "version": "4.0.1",+ "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",+ "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=",+ "dev": true+ },"jsprim": {"version": "1.4.1","resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",@@ -3348,6 +3370,14 @@"pify": "2.3.0","pinkie-promise": "2.0.1","strip-bom": "2.0.0"+ },+ "dependencies": {+ "pify": {+ "version": "2.3.0",+ "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",+ "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",+ "dev": true+ }}},"loader-runner": {@@ -3730,9 +3760,9 @@}},"moment": {- "version": "2.18.1",- "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz",- "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8="+ "version": "2.19.2",+ "resolved": "https://registry.npmjs.org/moment/-/moment-2.19.2.tgz",+ "integrity": "sha512-Rf6jiHPEfxp9+dlzxPTmRHbvoFXsh2L/U8hOupUMpnuecHQmI6cF6lUbJl3QqKPko1u6ujO+FxtcajLVfLpAtA=="},"ms": {"version": "2.0.0",@@ -3740,9 +3770,9 @@"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="},"nan": {- "version": "2.7.0",- "resolved": "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz",- "integrity": "sha1-2Vv3IeyHfgjbJ27T/G63j5CDrUY=",+ "version": "2.8.0",+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz",+ "integrity": "sha1-7XFfP+neArV6XmJS2QqWZ14fCFo=","dev": true},"node-fetch": {@@ -3784,21 +3814,21 @@}},"node-libs-browser": {- "version": "2.0.0",- "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.0.0.tgz",- "integrity": "sha1-o6WeyXAkmFtG6Vg3lkb5bEthZkY=",+ "version": "2.1.0",+ "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz",+ "integrity": "sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==","dev": true,"requires": {"assert": "1.4.1",- "browserify-zlib": "0.1.4",+ "browserify-zlib": "0.2.0","buffer": "4.9.1","console-browserify": "1.1.0","constants-browserify": "1.0.0",- "crypto-browserify": "3.11.1",+ "crypto-browserify": "3.12.0","domain-browser": "1.1.7","events": "1.1.1",- "https-browserify": "0.0.1",- "os-browserify": "0.2.1",+ "https-browserify": "1.0.0",+ "os-browserify": "0.3.0","path-browserify": "0.0.0","process": "0.11.10","punycode": "1.4.1",@@ -3806,26 +3836,18 @@"readable-stream": "2.3.3","stream-browserify": "2.0.1","stream-http": "2.7.2",- "string_decoder": "0.10.31",+ "string_decoder": "1.0.3","timers-browserify": "2.0.4","tty-browserify": "0.0.0","url": "0.11.0","util": "0.10.3","vm-browserify": "0.0.4"- },- "dependencies": {- "string_decoder": {- "version": "0.10.31",- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",- "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",- "dev": true- }}},"node-sass": {- "version": "4.5.3",- "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.5.3.tgz",- "integrity": "sha1-0JydEXlkEjnRuX/8YjH9zsU+FWg=",+ "version": "4.7.1",+ "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.7.1.tgz",+ "integrity": "sha512-WUG10FNj6E3bXpAy7f3bXVdLVUJuNn8pRbT4oo5ez9Zp5ZfqPFKsVJuDEEUmkpdyGa8P9JwifEr5dhNgZT2FpQ==","dev": true,"requires": {"async-foreach": "0.1.3",@@ -3840,12 +3862,152 @@"lodash.mergewith": "4.6.0","meow": "3.7.0","mkdirp": "0.5.1",- "nan": "2.7.0",+ "nan": "2.8.0","node-gyp": "3.6.2","npmlog": "4.1.2",- "request": "2.83.0",+ "request": "2.79.0","sass-graph": "2.2.4",- "stdout-stream": "1.4.0"+ "stdout-stream": "1.4.0",+ "true-case-path": "1.0.2"+ },+ "dependencies": {+ "assert-plus": {+ "version": "0.2.0",+ "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",+ "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",+ "dev": true+ },+ "aws-sign2": {+ "version": "0.6.0",+ "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",+ "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",+ "dev": true+ },+ "boom": {+ "version": "2.10.1",+ "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",+ "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",+ "dev": true,+ "requires": {+ "hoek": "2.16.3"+ }+ },+ "caseless": {+ "version": "0.11.0",+ "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",+ "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=",+ "dev": true+ },+ "cryptiles": {+ "version": "2.0.5",+ "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",+ "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",+ "dev": true,+ "requires": {+ "boom": "2.10.1"+ }+ },+ "form-data": {+ "version": "2.1.4",+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",+ "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",+ "dev": true,+ "requires": {+ "asynckit": "0.4.0",+ "combined-stream": "1.0.5",+ "mime-types": "2.1.17"+ }+ },+ "har-validator": {+ "version": "2.0.6",+ "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",+ "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=",+ "dev": true,+ "requires": {+ "chalk": "1.1.3",+ "commander": "2.11.0",+ "is-my-json-valid": "2.16.1",+ "pinkie-promise": "2.0.1"+ }+ },+ "hawk": {+ "version": "3.1.3",+ "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",+ "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",+ "dev": true,+ "requires": {+ "boom": "2.10.1",+ "cryptiles": "2.0.5",+ "hoek": "2.16.3",+ "sntp": "1.0.9"+ }+ },+ "hoek": {+ "version": "2.16.3",+ "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",+ "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",+ "dev": true+ },+ "http-signature": {+ "version": "1.1.1",+ "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",+ "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",+ "dev": true,+ "requires": {+ "assert-plus": "0.2.0",+ "jsprim": "1.4.1",+ "sshpk": "1.13.1"+ }+ },+ "qs": {+ "version": "6.3.2",+ "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz",+ "integrity": "sha1-51vV9uJoEioqDgvaYwslUMFmUCw=",+ "dev": true+ },+ "request": {+ "version": "2.79.0",+ "resolved": "https://registry.npmjs.org/request/-/request-2.79.0.tgz",+ "integrity": "sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4=",+ "dev": true,+ "requires": {+ "aws-sign2": "0.6.0",+ "aws4": "1.6.0",+ "caseless": "0.11.0",+ "combined-stream": "1.0.5",+ "extend": "3.0.1",+ "forever-agent": "0.6.1",+ "form-data": "2.1.4",+ "har-validator": "2.0.6",+ "hawk": "3.1.3",+ "http-signature": "1.1.1",+ "is-typedarray": "1.0.0",+ "isstream": "0.1.2",+ "json-stringify-safe": "5.0.1",+ "mime-types": "2.1.17",+ "oauth-sign": "0.8.2",+ "qs": "6.3.2",+ "stringstream": "0.0.5",+ "tough-cookie": "2.3.3",+ "tunnel-agent": "0.4.3",+ "uuid": "3.1.0"+ }+ },+ "sntp": {+ "version": "1.0.9",+ "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",+ "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",+ "dev": true,+ "requires": {+ "hoek": "2.16.3"+ }+ },+ "tunnel-agent": {+ "version": "0.4.3",+ "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",+ "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",+ "dev": true+ }}},"nopt": {@@ -3971,9 +4133,9 @@}},"os-browserify": {- "version": "0.2.1",- "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz",- "integrity": "sha1-Y/xMzuXS13Y9Jrv4YBB45sLgBE8=",+ "version": "0.3.0",+ "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",+ "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=","dev": true},"os-homedir": {@@ -4046,8 +4208,8 @@"integrity": "sha1-N8T5t+06tlx0gXtfJICTf7+XxxI=","dev": true,"requires": {- "asn1.js": "4.9.1",- "browserify-aes": "1.0.8",+ "asn1.js": "4.9.2",+ "browserify-aes": "1.1.1","create-hash": "1.1.3","evp_bytestokey": "1.0.3","pbkdf2": "3.0.14"@@ -4122,6 +4284,14 @@"graceful-fs": "4.1.11","pify": "2.3.0","pinkie-promise": "2.0.1"+ },+ "dependencies": {+ "pify": {+ "version": "2.3.0",+ "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",+ "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",+ "dev": true+ }}},"pbkdf2": {@@ -4150,9 +4320,9 @@"dev": true},"pify": {- "version": "2.3.0",- "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",- "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",+ "version": "3.0.0",+ "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",+ "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=","dev": true},"pinkie": {@@ -4889,10 +5059,20 @@"safe-buffer": "5.1.1"}},+ "randomfill": {+ "version": "1.0.3",+ "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.3.tgz",+ "integrity": "sha512-YL6GrhrWoic0Eq8rXVbMptH7dAxCs0J+mh5Y0euNekPPYaxEmdVGim6GdoxoRzKW2yJoU8tueifS7mYxvcFDEQ==",+ "dev": true,+ "requires": {+ "randombytes": "2.0.5",+ "safe-buffer": "5.1.1"+ }+ },"react": {- "version": "16.0.0",- "resolved": "https://registry.npmjs.org/react/-/react-16.0.0.tgz",- "integrity": "sha1-zn348ZQbA28Cssyp29DLHw6FXi0=",+ "version": "16.1.1",+ "resolved": "https://registry.npmjs.org/react/-/react-16.1.1.tgz",+ "integrity": "sha512-FQfiFfk2z2Fk87OngNJHT05KyC9DOVn8LPeB7ZX+9u5+yU1JK6o5ozRlU3PeOMr0IFkWNvgn9jU8/IhRxR1F0g==","requires": {"fbjs": "0.8.16","loose-envify": "1.3.1",@@ -4901,9 +5081,9 @@}},"react-dom": {- "version": "16.0.0",- "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.0.0.tgz",- "integrity": "sha1-nMMHnD3NcNTG4BuEqrKn40wwP1g=",+ "version": "16.1.1",+ "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.1.1.tgz",+ "integrity": "sha512-q06jiwST8SEPAMIEkAsu7BgynEZtqF87VrTc70XsW7nxVhWEu2Y4MF5UfxxHQO/mNtQHQWP0YcFxmwm9oMrMaQ==","requires": {"fbjs": "0.8.16","loose-envify": "1.3.1",@@ -4912,9 +5092,9 @@}},"react-textarea-autosize": {- "version": "5.1.0",- "resolved": "https://registry.npmjs.org/react-textarea-autosize/-/react-textarea-autosize-5.1.0.tgz",- "integrity": "sha1-/7+BZPziF8eUQ8HBfe33MFkt8iQ=",+ "version": "5.2.1",+ "resolved": "https://registry.npmjs.org/react-textarea-autosize/-/react-textarea-autosize-5.2.1.tgz",+ "integrity": "sha512-bx6z2I35aapr71ggw2yZIA4qhmqeTa4ZVsSaTeFvtf9kfcZppDBh2PbMt8lvbdmzEk7qbSFhAxR9vxEVm6oiMg==","requires": {"prop-types": "15.6.0"}@@ -5330,9 +5510,9 @@"dev": true},"sntp": {- "version": "2.0.2",- "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.0.2.tgz",- "integrity": "sha1-UGQRDwr4X3z9t9a2ekACjOUrSys=",+ "version": "2.1.0",+ "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz",+ "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==","dev": true,"requires": {"hoek": "4.2.0"@@ -5580,13 +5760,37 @@"integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=","dev": true},+ "true-case-path": {+ "version": "1.0.2",+ "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.2.tgz",+ "integrity": "sha1-fskRMJJHZsf1c74wIMNPj9/QDWI=",+ "dev": true,+ "requires": {+ "glob": "6.0.4"+ },+ "dependencies": {+ "glob": {+ "version": "6.0.4",+ "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",+ "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",+ "dev": true,+ "requires": {+ "inflight": "1.0.6",+ "inherits": "2.0.3",+ "minimatch": "3.0.4",+ "once": "1.4.0",+ "path-is-absolute": "1.0.1"+ }+ }+ }+ },"ts-loader": {- "version": "2.3.7",- "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-2.3.7.tgz",- "integrity": "sha512-8t3bu2FcEkXb+D4L+Cn8qiK2E2C6Ms4/GQChvz6IMbVurcFHLXrhW4EMtfaol1a1ASQACZGDUGit4NHnX9g7hQ==",+ "version": "3.1.1",+ "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-3.1.1.tgz",+ "integrity": "sha512-AQmLFSIgTiR8AlS5BxqvoHpZ3OUTwHHuDZTAZ2KcKsYRz/yANGeQn4Se/DCQ4cn1/eVvN37f/caVW4+kUPNNHw==","dev": true,"requires": {- "chalk": "2.1.0",+ "chalk": "2.3.0","enhanced-resolve": "3.4.1","loader-utils": "1.1.0","semver": "5.4.1"@@ -5602,14 +5806,14 @@}},"chalk": {- "version": "2.1.0",- "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz",- "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==",+ "version": "2.3.0",+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",+ "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==","dev": true,"requires": {"ansi-styles": "3.2.0","escape-string-regexp": "1.0.5",- "supports-color": "4.4.0"+ "supports-color": "4.5.0"}},"has-flag": {@@ -5619,9 +5823,9 @@"dev": true},"supports-color": {- "version": "4.4.0",- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",- "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",+ "version": "4.5.0",+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",+ "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=","dev": true,"requires": {"has-flag": "2.0.0"@@ -5753,9 +5957,9 @@"dev": true},"ua-parser-js": {- "version": "0.7.14",- "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.14.tgz",- "integrity": "sha1-EQ1T+kw/MmwSEpK76skE0uAzh8o="+ "version": "0.7.17",+ "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.17.tgz",+ "integrity": "sha512-uRdSdu1oA1rncCQL7sCj8vSyZkgtL7faaw9Tc9rZ3mGgraQ7+Pdx7w5mnOSF3gw9ZNG6oc+KXfkon3bKuROm0g=="},"uc.micro": {"version": "1.0.3",@@ -5819,7 +6023,7 @@"requires": {"source-map": "0.5.7","uglify-js": "2.8.29",- "webpack-sources": "1.0.1"+ "webpack-sources": "1.0.2"}},"uniq": {@@ -5938,15 +6142,15 @@}},"webpack": {- "version": "3.6.0",- "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.6.0.tgz",- "integrity": "sha512-OsHT3D0W0KmPPh60tC7asNnOmST6bKTiR90UyEdT9QYoaJ4OYN4Gg7WK1k3VxHK07ZoiYWPsKvlS/gAjwL/vRA==",+ "version": "3.8.1",+ "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.8.1.tgz",+ "integrity": "sha512-5ZXLWWsMqHKFr5y0N3Eo5IIisxeEeRAajNq4mELb/WELOR7srdbQk2N5XiyNy2A/AgvlR3AmeBCZJW8lHrolbw==","dev": true,"requires": {- "acorn": "5.1.2",+ "acorn": "5.2.1","acorn-dynamic-import": "2.0.2","ajv": "5.2.3",- "ajv-keywords": "2.1.0",+ "ajv-keywords": "2.1.1","async": "2.5.0","enhanced-resolve": "3.4.1","escope": "3.6.0",@@ -5957,13 +6161,13 @@"loader-utils": "1.1.0","memory-fs": "0.4.1","mkdirp": "0.5.1",- "node-libs-browser": "2.0.0",+ "node-libs-browser": "2.1.0","source-map": "0.5.7",- "supports-color": "4.4.0",+ "supports-color": "4.5.0","tapable": "0.2.8","uglifyjs-webpack-plugin": "0.4.6","watchpack": "1.4.0",- "webpack-sources": "1.0.1",+ "webpack-sources": "1.0.2","yargs": "8.0.2"},"dependencies": {@@ -6032,6 +6236,12 @@"pify": "2.3.0"}},+ "pify": {+ "version": "2.3.0",+ "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",+ "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",+ "dev": true+ },"read-pkg": {"version": "2.0.0","resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",@@ -6079,9 +6289,9 @@"dev": true},"supports-color": {- "version": "4.4.0",- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",- "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",+ "version": "4.5.0",+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",+ "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=","dev": true,"requires": {"has-flag": "2.0.0"@@ -6126,22 +6336,30 @@}},"webpack-clean-obsolete-chunks": {- "version": "0.2.0",- "resolved": "https://registry.npmjs.org/webpack-clean-obsolete-chunks/-/webpack-clean-obsolete-chunks-0.2.0.tgz",- "integrity": "sha512-uiKlYgpI2q79gln4DRjLusNNg/vESo9e46wOjolo7WJDQwDz1i4vovlsrRa5iETU5ikagewfL0U5z+boFgfQjA==",+ "version": "0.3.0",+ "resolved": "https://registry.npmjs.org/webpack-clean-obsolete-chunks/-/webpack-clean-obsolete-chunks-0.3.0.tgz",+ "integrity": "sha1-ZAgUwz+pkTlV36cmQClCGrMTN/w=","dev": true,"requires": {"del": "3.0.0"}},"webpack-sources": {- "version": "1.0.1",- "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.1.tgz",- "integrity": "sha512-05tMxipUCwHqYaVS8xc7sYPTly8PzXayRCB4dTxLhWTqlKUiwH6ezmEe0OSreL1c30LAuA3Zqmc+uEBUGFJDjw==",+ "version": "1.0.2",+ "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.2.tgz",+ "integrity": "sha512-Y7UddMCv6dGjy81nBv6nuQeFFIt5aalHm7uyDsAsW86nZwfOVPGRr3XMjEQLaT+WKo8rlzhC9qtbJvYKLtAwaw==","dev": true,"requires": {"source-list-map": "2.0.0",- "source-map": "0.5.7"+ "source-map": "0.6.1"+ },+ "dependencies": {+ "source-map": {+ "version": "0.6.1",+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",+ "dev": true+ }}},"whatwg-fetch": {diff --git a/package.json b/package.jsonindex 06002c850..dc8823d6b 100644--- a/package.json+++ b/package.json@@ -11,42 +11,42 @@"lint": "tslint -c tslint.json 'public/**/*.{ts,tsx}'"},"dependencies": {- "axios": "^0.16.2",- "inversify": "^4.3.0",- "inversify-inject-decorators": "^3.0.1",+ "axios": "^0.17.1",+ "inversify": "^4.5.1",+ "inversify-inject-decorators": "^3.0.2","jquery": "^3.2.1","markdown-it": "^8.4.0","md5": "^2.2.1",- "moment": "^2.18.1",- "react": "^16.0.0",- "react-dom": "^16.0.0",- "react-textarea-autosize": "^5.1.0",+ "moment": "^2.19.2",+ "react": "^16.1.1",+ "react-dom": "^16.1.1",+ "react-textarea-autosize": "^5.2.1","reflect-metadata": "^0.1.10","throttle-debounce": "^1.0.1"},"devDependencies": {- "@types/jquery": "^3.2.13",+ "@types/jquery": "^3.2.16","@types/markdown-it": "0.0.4","@types/md5": "^2.1.32",- "@types/mocha": "^2.2.43",- "@types/react": "^16.0.10",- "@types/react-dom": "^16.0.0",+ "@types/mocha": "^2.2.44",+ "@types/react": "^16.0.25",+ "@types/react-dom": "^16.0.3","@types/react-textarea-autosize": "^4.3.1",- "@types/selenium-webdriver": "^3.0.7",- "chromedriver": "^2.33.0",+ "@types/selenium-webdriver": "^3.0.8",+ "chromedriver": "^2.33.2","css-loader": "^0.28.7","dotenv": "^4.0.0",- "extract-text-webpack-plugin": "^3.0.1",+ "extract-text-webpack-plugin": "^3.0.2","file-loader": "^1.1.5","mocha": "^4.0.1",- "node-sass": "^4.5.3",+ "node-sass": "^4.7.1","sass-loader": "^6.0.6","selenium-webdriver": "^3.6.0",- "ts-loader": "^2.3.7",+ "ts-loader": "^3.1.1","tslint": "^5.8.0","tslint-react": "^3.2.0","typescript": "^2.6.1",- "webpack": "^3.6.0",- "webpack-clean-obsolete-chunks": "^0.2.0"+ "webpack": "^3.8.1",+ "webpack-clean-obsolete-chunks": "^0.3.0"}}diff --git a/public/assets/styles/form.scss b/public/assets/styles/form.scssindex c94cc8217..61818140a 100644--- a/public/assets/styles/form.scss+++ b/public/assets/styles/form.scss@@ -2,6 +2,10 @@.info {padding: 5px 0px 0px 5px;}+ .info.clickable {+ color: $link-color;+ cursor: pointer;+ }}textarea {diff --git a/public/assets/styles/variables.scss b/public/assets/styles/variables.scssindex 9baa13a91..5a49c253e 100644--- a/public/assets/styles/variables.scss+++ b/public/assets/styles/variables.scss@@ -3,6 +3,10 @@ $admin-color: #365899;$bg-color: #fff;$menu-color: #f9f9f9;+$link-color: #07C;+$negative-color: #db2828;+$positive-color: #21ba45;+@function textColorFor($color) {@if (lightness($color) > 60) {@return #484848; // Lighter backgorund, return dark colordiff --git a/public/components/ShowTag.tsx b/public/components/ShowTag.tsxnew file mode 100644index 000000000..6173aba76--- /dev/null+++ b/public/components/ShowTag.tsx@@ -0,0 +1,47 @@+import * as React from 'react';+import { Tag } from '@fider/models';++interface TagProps {+ tag: Tag;+ size?: 'mini' | 'tiny' | 'small' | 'normal' | 'large';+ circular?: boolean;+}++const getRGB = (color: string) => {+ const r = color.substring(1, 3);+ const g = color.substring(3, 5);+ const b = color.substring(5, 7);++ return {+ R: parseInt(r, 16),+ G: parseInt(g, 16),+ B: parseInt(b, 16)+ };+};++const idealTextColor = (color: string) => {+ const nThreshold = 105;+ const components = getRGB(color);+ const bgDelta = (components.R * 0.299) + (components.G * 0.587) + (components.B * 0.114);++ return (bgDelta > 186) ? '#000000' : '#ffffff';+};++export const ShowTag = (props: TagProps) => {+ const formatClass = props.circular === true ? 'empty circular' : '';+ const sizeClass = props.size || 'normal';++ return (+ <div+ title={`${props.tag.name}${!props.tag.isPublic ? ' (Private)' : ''}`}+ className={`ui label ${sizeClass} ${formatClass}`}+ style={{+ backgroundColor: `#${props.tag.color}`,+ color: idealTextColor(props.tag.color)+ }}+ >+ {!props.tag.isPublic && !props.circular && <i className="lock icon"/>}+ {props.circular ? '' : props.tag.name || 'Tag'}+ </div>+ );+};diff --git a/public/components/common/Button.scss b/public/components/common/Button.scssnew file mode 100644index 000000000..4c7ff9d08--- /dev/null+++ b/public/components/common/Button.scss@@ -0,0 +1,26 @@+@import '~@fider/assets/styles/variables.scss';++.as-link {+ padding: 0;+ font-size: 12px;+ border: none;+ outline: none;+ cursor: pointer;+ background-color: transparent;++ i {+ margin: 0;+ }++ &:hover {+ text-decoration: underline;+ }++ &.negative {+ color: $negative-color;+ }++ &.positive {+ color: $positive-color;+ }+}\ No newline at end of filediff --git a/public/components/common/Button.tsx b/public/components/common/Button.tsxindex 9a03fc257..acddab3df 100644--- a/public/components/common/Button.tsx+++ b/public/components/common/Button.tsx@@ -2,6 +2,7 @@ import * as React from 'react';interface ButtonProps {className?: string;+ simple?: boolean;href?: string;size?: 'mini' | 'tiny' | 'small' | 'large';onClick?: (event: ButtonClickEvent) => Promise<any>;@@ -11,6 +12,8 @@ interface ButtonState {clicked: boolean;}+import './Button.scss';+export class ButtonClickEvent {private shouldEnable = true;public preventEnable(): void {@@ -25,7 +28,7 @@ export class Button extends React.Component<ButtonProps, ButtonState> {private unmounted: boolean;public static defaultProps: Partial<ButtonProps> = {- size: 'tiny'+ size: 'tiny',};public constructor(props: ButtonProps) {@@ -56,7 +59,7 @@ export class Button extends React.Component<ButtonProps, ButtonState> {}public render() {- const cssClasses = `ui ${this.props.size} button ${this.props.className || ''} ${this.state.clicked ? 'loading disabled' : ''}`;+ const cssClasses = `ui ${this.props.size} ${this.props.simple ? 'as-link' : 'button'} ${this.props.className || ''} ${this.state.clicked ? 'loading disabled' : ''}`;if (this.props.href) {return (<a href={this.props.href} className={cssClasses} onClick={() => this.click()}>diff --git a/public/components/common/Header.tsx b/public/components/common/Header.tsxindex d8f3b8f4c..d368e4210 100644--- a/public/components/common/Header.tsx+++ b/public/components/common/Header.tsx@@ -43,7 +43,8 @@ export class Header extends React.Component<{}, {}> {</div>,<a key={2} href="/admin" className="item">General Settings</a>,<a key={3} href="/admin/members" className="item">Members</a>,- <div key={4} className="divider" />+ <a key={4} href="/admin/tags" className="item">Tags</a>,+ <div key={5} className="divider" />]}<a href="/signout?redirect=/" className="item signout">Sign out</a>diff --git a/public/components/common/index.tsx b/public/components/common/index.tsxindex d20e061a7..19e7201f0 100644--- a/public/components/common/index.tsx+++ b/public/components/common/index.tsx@@ -10,3 +10,5 @@ export * from './SocialSignInButton';export * from './SignInControl';export * from './Moment';export * from './UserName';+import Textarea from 'react-textarea-autosize';+export { Textarea };diff --git a/public/di.ts b/public/di.tsindex ab4abafef..12e28281e 100644--- a/public/di.ts+++ b/public/di.ts@@ -16,6 +16,7 @@ const injectables = {IdeaService: Symbol('IdeaService'),UserService: Symbol('UserService'),TenantService: Symbol('TenantService'),+ TagService: Symbol('TagService'),};export {diff --git a/public/index.tsx b/public/index.tsxindex 45f61891b..469e9b071 100644--- a/public/index.tsx+++ b/public/index.tsx@@ -4,7 +4,8 @@ import * as ReactDOM from 'react-dom';import { SignInModal } from '@fider/components/SignInModal';import { AdminHomePage } from '@fider/pages/admin/AdminHomePage';import { MembersPage } from '@fider/pages/admin/MembersPage';-import { SiteHomePage } from '@fider/pages/site/SiteHomePage';+import { ManageTagsPage } from '@fider/pages/admin/ManageTagsPage';+import { HomePage } from '@fider/pages/site/HomePage';import { ShowIdeaPage } from '@fider/pages/site/ShowIdeaPage';import { UserSettingsPage } from '@fider/pages/site/UserSettingsPage';import { CompleteSignInProfilePage } from '@fider/pages/site/CompleteSignInProfilePage';@@ -19,7 +20,9 @@ import {TenantService,HttpTenantService,UserService,- HttpUserService+ HttpUserService,+ TagService,+ HttpTagService} from '@fider/services';import '@fider/assets/styles/main.scss';@@ -28,6 +31,7 @@ container.bind<Session>(injectables.Session).toConstantValue(new BrowserSession(container.bind<IdeaService>(injectables.IdeaService).to(HttpIdeaService);container.bind<TenantService>(injectables.TenantService).to(HttpTenantService);container.bind<UserService>(injectables.UserService).to(HttpUserService);+container.bind<TagService>(injectables.TagService).to(HttpTagService);interface PageConfiguration {id: string;@@ -36,8 +40,9 @@ interface PageConfiguration {}const pathRegex = [- { regex: new RegExp('^\/$'), component: SiteHomePage, id: 'fdr-home-page' },+ { regex: new RegExp('^\/$'), component: HomePage, id: 'fdr-home-page' },{ regex: new RegExp('^\/admin\/members$'), component: MembersPage, id: 'fdr-admin-members-page' },+ { regex: new RegExp('^\/admin\/tags$'), component: ManageTagsPage, id: 'fdr-admin-tags-page' },{ regex: new RegExp('^\/admin$'), component: AdminHomePage, id: 'fdr-admin-page' },{ regex: new RegExp('^\/signup$'), component: SignUpPage, id: 'fdr-signup-page' },{ regex: new RegExp('^\/ideas\/\\d+.*$'), component: ShowIdeaPage, id: 'fdr-show-idea-page' },diff --git a/public/models/idea.ts b/public/models/idea.tsindex 362b2763d..c3f7765fd 100644--- a/public/models/idea.ts+++ b/public/models/idea.ts@@ -12,6 +12,7 @@ export interface Idea {response: IdeaResponse;totalSupporters: number;totalComments: number;+ tags: number[];}export class IdeaStatus {@@ -55,3 +56,11 @@ export interface Comment {createdOn: string;user: User;}++export interface Tag {+ id: number;+ slug: string;+ name: string;+ color: string;+ isPublic: boolean;+}diff --git a/public/pages/admin/AdminHomePage.tsx b/public/pages/admin/AdminHomePage.tsxindex 51bcf97f5..a61d5f019 100644--- a/public/pages/admin/AdminHomePage.tsx+++ b/public/pages/admin/AdminHomePage.tsx@@ -1,10 +1,9 @@import * as React from 'react';-import Textarea from 'react-textarea-autosize';import { Tenant } from '@fider/models';import { setTitle } from '@fider/utils/page';-import { Header, Footer, Button, DisplayError } from '@fider/components/common';+import { Header, Footer, Button, Textarea, DisplayError } from '@fider/components/common';import { inject, injectables } from '@fider/di';import { Session, TenantService, Failure } from '@fider/services';diff --git a/public/pages/admin/ManageTagsPage/ManageTagsPage.scss b/public/pages/admin/ManageTagsPage/ManageTagsPage.scssnew file mode 100644index 000000000..227c9e90b--- /dev/null+++ b/public/pages/admin/ManageTagsPage/ManageTagsPage.scss@@ -0,0 +1,13 @@+#fdr-admin-tags-page {+ .ui.list {+ .item {+ .content {+ display: inline-block;+ line-height: 26px;+ }+ button.as-link {+ line-height: 26px;+ }+ }+ }+}\ No newline at end of filediff --git a/public/pages/admin/ManageTagsPage/ManageTagsPage.tsx b/public/pages/admin/ManageTagsPage/ManageTagsPage.tsxnew file mode 100644index 000000000..920e6429a--- /dev/null+++ b/public/pages/admin/ManageTagsPage/ManageTagsPage.tsx@@ -0,0 +1,181 @@+import * as React from 'react';+import { Header, Footer, Button, Gravatar, UserName } from '@fider/components/common';+import { ShowTag } from '@fider/components/ShowTag';+import { inject, injectables } from '@fider/di';+import { Session, TagService } from '@fider/services';+import { Tag, CurrentUser, UserRole } from '@fider/models';++import { TagForm, TagFormState } from './';+import { Failure } from 'services/http';++interface ManageTagsPageState {+ isAdding: boolean;+ allTags: Tag[];+ deleting?: number;+ editing?: number;+}++import './ManageTagsPage.scss';++export class ManageTagsPage extends React.Component<{}, ManageTagsPageState> {+ @inject(injectables.Session)+ public session: Session;++ @inject(injectables.TagService)+ public tagService: TagService;++ constructor(props: {}) {+ super(props);+ this.state = {+ isAdding: false,+ allTags: this.session.get<Tag[]>('tags') || []+ };+ }++ private async saveNewTag(data: TagFormState): Promise<Failure | undefined> {+ const result = await this.tagService.add(data.name, data.color, data.isPublic);+ if (result.ok) {+ this.setState({+ isAdding: false,+ allTags: this.state.allTags.concat(result.data)+ });+ } else {+ return result.error;+ }+ }++ private async updateTag(tag: Tag, data: TagFormState): Promise<Failure | undefined> {+ const result = await this.tagService.update(tag.slug, data.name, data.color, data.isPublic);+ if (result.ok) {+ tag.name = result.data.name;+ tag.slug = result.data.slug;+ tag.color = result.data.color;+ tag.isPublic = result.data.isPublic;+ this.setState({+ editing: undefined+ });+ } else {+ return result.error;+ }+ }++ private async deleteTag(tag: Tag) {+ const result = await this.tagService.delete(tag.slug);+ const idx = this.state.allTags.indexOf(tag);+ if (result.ok) {+ this.setState({+ deleting: undefined,+ allTags: this.state.allTags.splice(idx, 1) && this.state.allTags+ });+ }+ }++ public render() {+ const items = this.state.allTags.map(+ (t) => {+ if (this.state.editing === t.id) {+ return (+ <div key={t.id} className="item">+ <TagForm+ name={t.name}+ color={t.color}+ isPublic={t.isPublic}+ onSave={async (data) => this.updateTag(t, data)}+ onCancel={() => this.setState({ editing: undefined })}+ />+ </div>+ );+ }++ if (this.state.deleting === t.id) {+ return (+ <div key={t.id} className="item">+ <div className="content">+ <b>Are you sure?</b> <span>The tag <ShowTag tag={t} /> will be removed from all ideas.</span>+ </div>+ <Button+ className="right floated"+ onClick={async () => this.setState({ deleting: undefined })}+ >+ Cancel+ </Button>+ <Button+ className="negative right floated"+ onClick={() => this.deleteTag(t)}+ >+ Delete tag+ </Button>+ </div>+ );+ }++ return (+ <div key={t.id} className="item">+ <ShowTag tag={t} />+ {+ this.session.isAdmin() && [+ <Button+ key={0}+ simple={true}+ onClick={async () => this.setState({ isAdding: false, editing: undefined, deleting: t.id })}+ className="icon negative right floated"+ >+ <i className="remove icon" />Remove+ </Button>,+ <Button+ key={1}+ simple={true}+ onClick={async () => this.setState({ isAdding: false, editing: t.id, deleting: undefined })}+ className="icon right floated"+ >+ <i className="edit icon" />Edit+ </Button>+ ]+ }+ </div>+ );+ }+ );++ return (+ <div>+ <Header />+ <div className="page ui container">+ <h2 className="ui header">+ <i className="circular tags icon" />+ <div className="content">+ Tags+ <div className="sub header">Manage your account tags.</div>+ </div>+ </h2>++ {+ this.session.isAdmin() && (+ this.state.isAdding+ ? <div className="ui segment">+ <TagForm+ onSave={async (data) => this.saveNewTag(data)}+ onCancel={() => this.setState({ isAdding: false })}+ />+ </div>+ : <Button+ className="positive"+ onClick={async (e) => this.setState({ isAdding: true, deleting: undefined, editing: undefined })}+ >+ Add new+ </Button>+ )+ }++ <div className="ui segment">+ <div className="ui middle aligned very relaxed divided list">+ {items.length ? items : <div className="content">There aren’t any tags yet.</div>}+ </div>+ </div>++ </div>+ <Footer />+ </div>+ );+ }+}diff --git a/public/pages/admin/ManageTagsPage/TagForm.scss b/public/pages/admin/ManageTagsPage/TagForm.scssnew file mode 100644index 000000000..1fba45fcd--- /dev/null+++ b/public/pages/admin/ManageTagsPage/TagForm.scss@@ -0,0 +1,9 @@+#tag-form {+ .ui.form .grouped.fields .field {+ margin: .2em 0+ }++ input.color {+ text-transform: uppercase;+ }+}\ No newline at end of filediff --git a/public/pages/admin/ManageTagsPage/TagForm.tsx b/public/pages/admin/ManageTagsPage/TagForm.tsxnew file mode 100644index 000000000..7eff0b576--- /dev/null+++ b/public/pages/admin/ManageTagsPage/TagForm.tsx@@ -0,0 +1,139 @@+import * as React from 'react';+import { Button, ButtonClickEvent, DisplayError } from '@fider/components/common';+import { ShowTag } from '@fider/components/ShowTag';+import { Tag } from '@fider/models';+import { Failure } from '@fider/services';++interface TagFormProps {+ name?: string;+ color?: string;+ isPublic?: boolean;+ onSave: (data: TagFormState) => Promise<Failure | undefined>;+ onCancel: () => void;+}++export interface TagFormState {+ name: string;+ color: string;+ isPublic: boolean;+ error?: Failure;+}++import './TagForm.scss';++export class TagForm extends React.Component<TagFormProps, TagFormState> {+ constructor(props: TagFormProps) {+ super(props);+ this.state = {+ color: props.color || this.randomizeColor(),+ name: props.name || '',+ isPublic: props.isPublic || false+ };+ }++ private randomizeColor(): string {+ const letters = '0123456789ABCDEF';+ let color = '';+ for (let i = 0; i < 6; i++) {+ color += letters[Math.floor(Math.random() * 16)];+ }+ return color;+ }++ private async onSave(e: ButtonClickEvent) {+ const error = await this.props.onSave(this.state);+ if (error) {+ this.setState({ error });+ }+ }++ public render() {+ return (+ <div id="tag-form" className="ui form">+ <div className="four fields">+ <div className="four wide field">+ <label>Name</label>+ <input+ className="name"+ onChange={(e) => this.setState({ name: e.currentTarget.value })}+ type="text"+ placeholder="New tag name"+ value={this.state.name}+ />+ <DisplayError fields={['name']} error={this.state.error} pointing="above" />+ </div>+ <div className="three wide field">+ <label>+ Color+ <span+ className="info clickable"+ onClick={() => this.setState({ color: this.randomizeColor() })}+ >+ randomize+ </span>+ </label>+ <input+ className="color"+ onChange={(e) => this.setState({ color: e.currentTarget.value })}+ type="text"+ value={this.state.color}+ />+ <DisplayError fields={['color']} error={this.state.error} pointing="above" />+ </div>+ <div className="two wide field">+ <div className="grouped fields">+ <label>Visibility</label>+ <div className="field">+ <div className="ui radio checkbox">+ <input+ id="visibility-public"+ type="radio"+ name="visibility"+ checked={this.state.isPublic}+ onChange={(e) => this.setState({ isPublic: true })}+ />+ <label htmlFor="visibility-public">Public</label>+ </div>+ </div>+ <div className="field">+ <div className="ui radio checkbox">+ <input+ id="visibility-private"+ type="radio"+ name="visibility"+ checked={!this.state.isPublic}+ onChange={(e) => this.setState({ isPublic: false })}+ />+ <label htmlFor="visibility-private">Private</label>+ </div>+ </div>+ </div>+ </div>+ <div className="field">+ <label>Preview</label>+ <ShowTag+ tag={{+ id: 0,+ slug: '',+ name: this.state.name,+ color: this.state.color,+ isPublic: this.state.isPublic+ }}+ />+ </div>+ </div>+ <Button+ onClick={async () => this.props.onCancel()}+ >+ Cancel+ </Button>+ <Button+ className="positive"+ onClick={(e) => this.onSave(e)}+ >+ Save+ </Button>+ </div>+ );+ }+}diff --git a/public/pages/admin/ManageTagsPage/index.ts b/public/pages/admin/ManageTagsPage/index.tsnew file mode 100644index 000000000..92d60b6e2--- /dev/null+++ b/public/pages/admin/ManageTagsPage/index.ts@@ -0,0 +1,2 @@+export * from './ManageTagsPage';+export * from './TagForm';diff --git a/public/pages/site/CompleteSignInProfilePage.tsx b/public/pages/site/CompleteSignInProfilePage.tsxindex cee5cf3a1..e416b6f03 100644--- a/public/pages/site/CompleteSignInProfilePage.tsx+++ b/public/pages/site/CompleteSignInProfilePage.tsx@@ -1,6 +1,6 @@import * as React from 'react';-import { SiteHomePage } from './SiteHomePage';+import { HomePage } from './HomePage';import { showModal, getQueryString } from '@fider/utils/page';import { Form } from '@fider/components/common';@@ -68,7 +68,7 @@ export class CompleteSignInProfilePage extends React.Component<{}, CompleteSignIreturn (<div>{modal}- <SiteHomePage />+ <HomePage /></div>);}diff --git a/public/pages/site/SiteHomePage.scss b/public/pages/site/HomePage/HomePage.scsssimilarity index 78%rename from public/pages/site/SiteHomePage.scssrename to public/pages/site/HomePage/HomePage.scssindex bfe220c57..67e2f4250 100644--- a/public/pages/site/SiteHomePage.scss+++ b/public/pages/site/HomePage/HomePage.scss@@ -29,6 +29,21 @@}}+ .tags-filter.has-selection {+ i.filter {+ vertical-align: middle;+ }+ .ui.label.transition {+ background-color: transparent;+ box-shadow: none;+ font-weight: 500;+ .ui.empty.circular.label {+ font-size: .71428571rem;+ margin-right: 5px;+ }+ }+ }+.filter-column {display: flex;align-items: center;diff --git a/public/pages/site/SiteHomePage.tsx b/public/pages/site/HomePage/HomePage.tsxsimilarity index 81%rename from public/pages/site/SiteHomePage.tsxrename to public/pages/site/HomePage/HomePage.tsxindex 632035b69..2c7e18645 100644--- a/public/pages/site/SiteHomePage.tsx+++ b/public/pages/site/HomePage/HomePage.tsx@@ -1,20 +1,23 @@import * as React from 'react';-import { Idea, IdeaStatus, CurrentUser, Tenant } from '@fider/models';+import { Idea, Tag, IdeaStatus, CurrentUser, Tenant } from '@fider/models';import { Gravatar, MultiLineText, Moment, Header, Footer } from '@fider/components/common';import { ShowIdeaResponse } from '@fider/components/ShowIdeaResponse';import { SupportCounter } from '@fider/components/SupportCounter';-import { IdeaInput } from '@fider/components/IdeaInput';-import { IdeaFilter, IdeaFilterFunction } from '@fider/components/IdeaFilter';+import { ShowTag } from '@fider/components/ShowTag';+import { IdeaInput } from './IdeaInput';+import { IdeaFilter, IdeaFilterFunction } from './IdeaFilter';import { inject, injectables } from '@fider/di';import { Session } from '@fider/services';import { getBaseUrl, getQueryString } from '@fider/utils/page';-import './SiteHomePage.scss';+import { TagsFilter } from './TagsFilter';++import './HomePage.scss';const defaultShowCount = 20;-interface SiteHomePageState {+interface HomePageState {ideas: Idea[];showCount: number;searching: boolean;@@ -31,7 +34,7 @@ const EmptyList = () => {);};-const ListIdeaItem = (props: { idea: Idea, user?: CurrentUser }) => {+const ListIdeaItem = (props: { idea: Idea, user?: CurrentUser, tags: Tag[] }) => {return (<div className="item"><SupportCounter user={props.user} idea={props.idea} />@@ -47,15 +50,21 @@ const ListIdeaItem = (props: { idea: Idea, user?: CurrentUser }) => {</a><MultiLineText className="description" text={props.idea.description} style="simple" /><ShowIdeaResponse status={props.idea.status} response={props.idea.response} />+ {+ props.tags.map((tag) => (+ <ShowTag key={tag.id} size="tiny" tag={tag} />+ ))+ }</div></div>);};-export class SiteHomePage extends React.Component<{}, SiteHomePageState> {+export class HomePage extends React.Component<{}, HomePageState> {private user?: CurrentUser;private tenant: Tenant;private allIdeas: Idea[];+ private allTags: Tag[];private filter: HTMLDivElement;@inject(injectables.Session)@@ -65,7 +74,8 @@ export class SiteHomePage extends React.Component<{}, SiteHomePageState> {super(props);this.user = this.session.getCurrentUser();this.tenant = this.session.getCurrentTenant();- this.allIdeas = this.session.get<Idea[]>('ideas') || [];+ this.allIdeas = this.session.getArray<Idea>('ideas');+ this.allTags = this.session.getArray<Tag>('tags');const search = getQueryString('q');const activeFilter = window.location.hash.substring(1);@@ -87,6 +97,17 @@ export class SiteHomePage extends React.Component<{}, SiteHomePageState> {return true;}+ private selectedTagsChanged(tags: number[]): void {+ const ideas = this.filterIdeas(this.state.activeFilter, this.state.search);+ this.setState({+ ideas: ideas.filter(+ (i) => i.tags.filter(+ (t) => tags.indexOf(t) >= 0+ ).length === tags.length+ ),+ });+ }+private filterIdeas(activeFilter: string, search: string | undefined): Idea[] {let newUrl = getBaseUrl();let ideas = [];@@ -150,7 +171,14 @@ export class SiteHomePage extends React.Component<{}, SiteHomePageState> {const displayIdeas = (ideasToList.length > 0)? (<div className="ui divided unstackable items fdr-idea-list">- {ideasToList.map((x) => <ListIdeaItem key={x.id} user={this.user} idea={x} />)}+ {+ ideasToList.map((idea) =>+ <ListIdeaItem+ key={idea.id}+ user={this.user}+ idea={idea}+ tags={this.allTags.filter((tag) => idea.tags.indexOf(tag.id) >= 0)}+ />)}{this.state.ideas.length > this.state.showCount &&<h5@@ -186,9 +214,11 @@ We'd love to hear what you're thinking about. What can we do better? This is the? <EmptyList />: <div><div className="ui grid">- { !this.state.searching && <div className="ten wide mobile ten wide tablet twelve wide computer column filter-column">+ {+ !this.state.searching && <div className="ten wide mobile ten wide tablet twelve wide computer column filter-column"><IdeaFilter activeFilter={this.state.activeFilter} filterChanged={(name) => this.filterChanged(name)} />- </div> }+ </div>+ }<div className={!this.state.searching ? `six wide mobile six wide tablet four wide computer column` : 'column'}><div className="ui search"><div className="ui icon fluid input">@@ -209,6 +239,7 @@ We'd love to hear what you're thinking about. What can we do better? This is the</div></div></div>+ <TagsFilter tags={this.allTags} selectionChanged={(selected) => this.selectedTagsChanged(selected)} />{displayIdeas}</div>}diff --git a/public/components/IdeaFilter.tsx b/public/pages/site/HomePage/IdeaFilter.tsxsimilarity index 100%rename from public/components/IdeaFilter.tsxrename to public/pages/site/HomePage/IdeaFilter.tsxdiff --git a/public/components/IdeaInput.tsx b/public/pages/site/HomePage/IdeaInput.tsxsimilarity index 94%rename from public/components/IdeaInput.tsxrename to public/pages/site/HomePage/IdeaInput.tsxindex 543c2ea82..237ee0d93 100644--- a/public/components/IdeaInput.tsx+++ b/public/pages/site/HomePage/IdeaInput.tsx@@ -1,6 +1,5 @@import * as React from 'react';-import Textarea from 'react-textarea-autosize';-import { DisplayError, Button, ButtonClickEvent, Form } from '@fider/components/common';+import { DisplayError, Button, ButtonClickEvent, Form, Textarea } from '@fider/components/common';import { inject, injectables } from '@fider/di';import { Session, IdeaService, Failure } from '@fider/services';@@ -31,8 +30,8 @@ export class IdeaInput extends React.Component<IdeaInputProps, IdeaInputState> {@inject(injectables.IdeaService)private service: IdeaService;- constructor() {- super();+ constructor(props: IdeaInputProps) {+ super(props);this.user = this.session.getCurrentUser();this.state = {title: this.session.getCache(CACHE_TITLE_KEY) || '',diff --git a/public/pages/site/HomePage/TagsFilter.tsx b/public/pages/site/HomePage/TagsFilter.tsxnew file mode 100644index 000000000..83fd9971e--- /dev/null+++ b/public/pages/site/HomePage/TagsFilter.tsx@@ -0,0 +1,77 @@+import * as React from 'react';+import { Tag } from '@fider/models';+import { ShowTag } from '@fider/components/ShowTag';++interface TagsFilterProps {+ tags: Tag[];+ selectionChanged: (selected: number[]) => void;+}++interface TagsFilterState {+ selected: number[];+}++export class TagsFilter extends React.Component<TagsFilterProps, TagsFilterState> {+ private element: HTMLDivElement;++ constructor(props: TagsFilterProps) {+ super(props);+ this.state = {+ selected: []+ };+ }++ public componentDidMount() {+ $(this.element).dropdown({+ onAdd: (value: string) => {+ const id = parseInt(value, 10);+ const selected = this.state.selected.concat(id);+ this.setState({ selected });+ this.props.selectionChanged(selected);+ },+ onRemove: (value: string) => {+ const id = parseInt(value, 10);+ const idx = this.state.selected.indexOf(id);+ const selected = this.state.selected.splice(idx, 1) && this.state.selected;+ this.setState({ selected });+ this.props.selectionChanged(selected);+ }+ });+ }++ public render() {+ if (this.props.tags.length === 0) {+ return null;+ }++ return (+ <div className={`tags-filter ${this.state.selected.length > 0 ? 'has-selection' : ''}`}>+ <div className={`ui multiple dropdown `} ref={(e) => this.element = e!}>+ <i className="filter icon"/>+ <span className="text">Filter by tag...</span>+ <div className="menu">+ <div className="ui icon search input">+ <i className="search icon"/>+ <input type="text" placeholder="Search tags..."/>+ </div>+ <div className="divider"/>+ <div className="header">+ <i className="tags icon"/>+ Tag+ </div>+ <div className="scrolling menu">+ {+ this.props.tags.map((t) => (+ <div key={t.id} className="item" data-value={t.id}>+ <ShowTag tag={t} circular={true}/>+ {t.name}+ </div>+ ))+ }+ </div>+ </div>+ </div>+ </div>+ );+ }+}diff --git a/public/pages/site/HomePage/index.ts b/public/pages/site/HomePage/index.tsnew file mode 100644index 000000000..11e53da67--- /dev/null+++ b/public/pages/site/HomePage/index.ts@@ -0,0 +1 @@+export * from './HomePage';diff --git a/public/pages/site/ShowIdeaPage.scss b/public/pages/site/ShowIdeaPage.scssdeleted file mode 100644index 392e5f3e8..000000000--- a/public/pages/site/ShowIdeaPage.scss+++ /dev/null@@ -1,44 +0,0 @@-#fdr-show-idea-page {- .idea-header {- width: 100%;- h1 {- font-weight: 400;- margin: 0px;- }- .fdr-avatar {- width: 24px;- }- }-- .ui.comments {- .fdr-avatar {- margin-right: 5px;- vertical-align: top;- margin-top: 2px;- }-- .comment > .content {- display: inline-block;- max-width: 85%;- }- }-- .comment-input {- margin-top: 10px;-- textarea {- margin-top: 5px;- }-- .form {- display: inline-block;- width: 100%;- }-- &.authenticated{- .form {- width: 85%;- }- }- }-}\ No newline at end of filediff --git a/public/pages/site/ShowIdeaPage.tsx b/public/pages/site/ShowIdeaPage.tsxdeleted file mode 100644index 2a9a3de02..000000000--- a/public/pages/site/ShowIdeaPage.tsx+++ /dev/null@@ -1,180 +0,0 @@-import * as React from 'react';--import { CurrentUser, Comment, Idea } from '@fider/models';-import { setTitle } from '@fider/utils/page';--import { CommentInput } from '@fider/components/CommentInput';-import { ResponseForm } from '@fider/components/ResponseForm';-import { SupportCounter } from '@fider/components/SupportCounter';-import { ShowIdeaResponse } from '@fider/components/ShowIdeaResponse';-import { DisplayError, Button, UserName, Gravatar, Moment, Form, MultiLineText, Footer, Header, SocialSignInButton } from '@fider/components/common';-import Textarea from 'react-textarea-autosize';--import { inject, injectables } from '@fider/di';-import { Session, IdeaService, Failure } from '@fider/services';--import './ShowIdeaPage.scss';--interface ShowIdeaPageState {- editMode: boolean;- newTitle: string;- newDescription: string;- error?: Failure;-}--export class ShowIdeaPage extends React.Component<{}, ShowIdeaPageState> {- private user?: CurrentUser;- private idea: Idea;- private comments: Comment[];-- @inject(injectables.Session)- public session: Session;-- @inject(injectables.IdeaService)- public ideaService: IdeaService;-- constructor(props: {}) {- super(props);-- this.user = this.session.getCurrentUser();- this.idea = this.session.get<Idea>('idea');- this.comments = this.session.getArray<Comment>('comments');-- this.state = {- editMode: false,- newTitle: this.idea.title,- newDescription: this.idea.description- };-- setTitle(`${this.idea.title} · ${document.title}`);- }-- private async saveChanges() {- const result = await this.ideaService.updateIdea(this.idea.number, this.state.newTitle, this.state.newDescription);- if (result.ok) {- this.setState({- error: undefined,- editMode: false- });- this.idea.title = this.state.newTitle;- this.idea.description = this.state.newDescription;- this.forceUpdate();- } else {- this.setState({- error: result.error- });- }- }-- public render() {-- const commentsList = this.comments.map((c) => (- <div key={c.id} className="comment">- <Gravatar user={c.user} />- <div className="content">- <UserName user={c.user} />- <div className="metadata">- · <Moment date={c.createdOn} />- </div>- <div className="text">- <MultiLineText text={c.content} style="simple" />- </div>- </div>- </div>- ));-- return (- <div>- <Header />- <div className="page ui container">- <div className="ui stackable grid container">- <div className="thirteen wide column">- <div className="ui items unstackable">- <div className="item">- <SupportCounter user={this.user} idea={this.idea} />-- <div className="idea-header">- { this.state.editMode- ? [- <div key={1} className="ui input huge fluid">- <input type="text" onChange={(e) => this.setState({ newTitle: e.currentTarget.value })} defaultValue={this.state.newTitle} />- </div>,- <DisplayError key={0} fields={['title']} pointing="above" error={this.state.error} />- ]- : <h1 className="ui header">{this.idea.title}</h1>- }-- <span className="info">- Shared <Moment date={this.idea.createdOn} /> by <Gravatar user={this.idea.user} /> <UserName user={this.idea.user} />- </span>- </div>- </div>- </div>-- <span className="subtitle">Description</span>- {- this.state.editMode- ? <div className="ui form">- <div className="field">- <DisplayError fields={['description']} error={this.state.error} />- <Textarea onChange={(e) => this.setState({ newDescription: e.currentTarget.value })} defaultValue={this.state.newDescription} />- </div>- </div>- : this.idea.description- ? <MultiLineText className="description" text={this.idea.description} style="simple" />- : <p className="description">This idea doesn't have a description.</p>- }-- <ShowIdeaResponse status={this.idea.status} response={this.idea.response} />-- </div>-- {- this.session.isCollaborator() &&- <div className="three wide column">- <span className="subtitle">Actions</span>- { this.state.editMode && <div className="ui list">- <div className="item">- <Button className="positive icon fluid text-left" onClick={async () => this.saveChanges()}>- <i className="save icon" /> Save- </Button>- </div>- <div className="item">- <Button className="icon fluid text-left" onClick={async () => this.setState({ error: undefined, editMode: false })}>- <i className="cancel icon" /> Cancel- </Button>- </div>- </div>- }-- {- !this.state.editMode &&- <div className="ui list">- <div className="item">- <Button className="icon fluid text-left" onClick={async () => this.setState({ editMode: true })}>- <i className="edit icon" /> Edit- </Button>- </div>- <div className="item">- <ResponseForm idea={this.idea} />- </div>- </div>- }- </div>- }-- <div className="sixteen wide column">- <div className="ui comments">- <span className="subtitle">Discussion</span>- {commentsList}- <CommentInput idea={this.idea} />- </div>- </div>- </div>-- </div>- <Footer />- </div>- );- }-}diff --git a/public/components/CommentInput.tsx b/public/pages/site/ShowIdeaPage/CommentInput.tsxsimilarity index 92%rename from public/components/CommentInput.tsxrename to public/pages/site/ShowIdeaPage/CommentInput.tsxindex a1da0cb46..df2e2ad21 100644--- a/public/components/CommentInput.tsx+++ b/public/pages/site/ShowIdeaPage/CommentInput.tsx@@ -1,9 +1,8 @@import * as React from 'react';import * as ReactDOM from 'react-dom';-import Textarea from 'react-textarea-autosize';import { Idea, CurrentUser } from '@fider/models';-import { Gravatar, UserName, Button, DisplayError, SignInControl } from '@fider/components/common';+import { Gravatar, UserName, Button, Textarea, DisplayError, SignInControl } from '@fider/components/common';import { inject, injectables } from '@fider/di';import { Session, IdeaService, Failure } from '@fider/services';@@ -29,8 +28,8 @@ export class CommentInput extends React.Component<CommentInputProps, CommentInpuprivate user?: CurrentUser;- constructor() {- super();+ constructor(props: CommentInputProps) {+ super(props);this.user = this.session.getCurrentUser();this.state = {diff --git a/public/components/ResponseForm.tsx b/public/pages/site/ShowIdeaPage/ResponseForm.tsxsimilarity index 96%rename from public/components/ResponseForm.tsxrename to public/pages/site/ShowIdeaPage/ResponseForm.tsxindex d128a257a..d4f734ff5 100644--- a/public/components/ResponseForm.tsx+++ b/public/pages/site/ShowIdeaPage/ResponseForm.tsx@@ -1,8 +1,7 @@import * as React from 'react';-import Textarea from 'react-textarea-autosize';import { User, Comment, Idea } from '@fider/models';-import { Button, DisplayError } from '@fider/components/common';+import { Button, DisplayError, Textarea } from '@fider/components/common';import { inject, injectables } from '@fider/di';import { IdeaService, Failure } from '@fider/services';diff --git a/public/pages/site/ShowIdeaPage/ShowIdeaPage.scss b/public/pages/site/ShowIdeaPage/ShowIdeaPage.scssnew file mode 100644index 000000000..7ed8cb0e9--- /dev/null+++ b/public/pages/site/ShowIdeaPage/ShowIdeaPage.scss@@ -0,0 +1,82 @@+@import '~@fider/assets/styles/variables.scss';++#fdr-show-idea-page {+ .idea-header {+ width: 100%;+ h1 {+ font-weight: 400;+ margin: 0px;+ }+ .fdr-avatar {+ width: 24px;+ }+ }++ .subtitle {+ display: block;+ &.active {+ cursor: pointer;+ &:hover {+ color: $main-color;+ }+ i {+ float: right;+ }+ }+ }++ .tag-list {+ .tag-icon {+ width: 10px;+ height: 10px;+ display: inline-block;+ margin-right: 5px;+ border-radius: 50%;+ }+ .selectable {+ &.item {+ margin: 5px 0px;+ }+ i {+ display: inline-block;+ color: $positive-color;+ }+ .ui.circular.label {+ margin-right: 5px;+ }+ cursor: pointer;+ }+ }++ .ui.comments {+ .fdr-avatar {+ margin-right: 5px;+ vertical-align: top;+ margin-top: 2px;+ }++ .comment > .content {+ display: inline-block;+ max-width: 85%;+ }+ }++ .comment-input {+ margin-top: 10px;++ textarea {+ margin-top: 5px;+ }++ .form {+ display: inline-block;+ width: 100%;+ }++ &.authenticated{+ .form {+ width: 85%;+ }+ }+ }+}\ No newline at end of filediff --git a/public/pages/site/ShowIdeaPage/ShowIdeaPage.tsx b/public/pages/site/ShowIdeaPage/ShowIdeaPage.tsxnew file mode 100644index 000000000..46e82f76b--- /dev/null+++ b/public/pages/site/ShowIdeaPage/ShowIdeaPage.tsx@@ -0,0 +1,240 @@+import * as React from 'react';++import { CurrentUser, Comment, Idea, Tag } from '@fider/models';+import { setTitle } from '@fider/utils/page';+import { SupportCounter } from '@fider/components/SupportCounter';+import { ShowIdeaResponse } from '@fider/components/ShowIdeaResponse';+import { CommentInput } from './CommentInput';+import { ResponseForm } from './ResponseForm';+import { ShowTag } from '@fider/components/ShowTag';+import { DisplayError, Button, Textarea, UserName, Gravatar, Moment, Form, MultiLineText, Footer, Header, SocialSignInButton } from '@fider/components/common';++import { inject, injectables } from '@fider/di';+import { Session, IdeaService, TagService, Failure } from '@fider/services';++import './ShowIdeaPage.scss';++interface ShowIdeaPageState {+ editMode: boolean;+ editTags: boolean;+ newTitle: string;+ newDescription: string;+ assignedTags: Tag[];+ error?: Failure;+}++export class ShowIdeaPage extends React.Component<{}, ShowIdeaPageState> {+ private user?: CurrentUser;+ private idea: Idea;+ private comments: Comment[];+ private tags: Tag[];++ @inject(injectables.Session)+ public session: Session;++ @inject(injectables.IdeaService)+ public ideaService: IdeaService;++ @inject(injectables.TagService)+ public tagService: TagService;++ constructor(props: {}) {+ super(props);++ this.user = this.session.getCurrentUser();+ this.idea = this.session.get<Idea>('idea');+ this.comments = this.session.getArray<Comment>('comments');+ this.tags = this.session.getArray<Tag>('tags');++ this.state = {+ editMode: false,+ editTags: false,+ newTitle: this.idea.title,+ newDescription: this.idea.description,+ assignedTags: this.tags.filter((t) => this.idea.tags.indexOf(t.id) >= 0),+ };++ setTitle(`${this.idea.title} · ${document.title}`);+ }++ private async saveChanges() {+ const result = await this.ideaService.updateIdea(this.idea.number, this.state.newTitle, this.state.newDescription);+ if (result.ok) {+ this.setState({+ error: undefined,+ editMode: false+ });+ this.idea.title = this.state.newTitle;+ this.idea.description = this.state.newDescription;+ this.forceUpdate();+ } else {+ this.setState({+ error: result.error+ });+ }+ }++ private async assignOrUnassignTag(tag: Tag) {+ const idx = this.state.assignedTags.indexOf(tag);+ let assignedTags: Tag[] = [];+ if (idx >= 0) {+ const response = await this.tagService.unassign(tag.slug, this.idea.number);+ if (response.ok) {+ assignedTags = this.state.assignedTags.splice(idx, 1) && this.state.assignedTags;+ }+ } else {+ const response = await this.tagService.assign(tag.slug, this.idea.number);+ if (response.ok) {+ assignedTags = this.state.assignedTags.concat(tag);+ }+ }++ this.setState({+ assignedTags+ });+ }++ public render() {+ const commentsList = this.comments.map((c) => (+ <div key={c.id} className="comment">+ <Gravatar user={c.user} />+ <div className="content">+ <UserName user={c.user} />+ <div className="metadata">+ · <Moment date={c.createdOn} />+ </div>+ <div className="text">+ <MultiLineText text={c.content} style="simple" />+ </div>+ </div>+ </div>+ ));++ const tagsList = this.state.assignedTags.length+ ?+ this.state.assignedTags.map((tag) => (+ <div key={tag.id} className="item">+ <ShowTag tag={tag} />+ </div>+ ))+ :+ <span className="info">None yet</span>;++ return (+ <div>+ <Header />+ <div className="page ui container">+ <div className="ui stackable grid container">+ <div className="thirteen wide column">+ <div className="ui items unstackable">+ <div className="item">+ <SupportCounter user={this.user} idea={this.idea} />++ <div className="idea-header">+ { this.state.editMode+ ? [+ <div key={1} className="ui input huge fluid">+ <input type="text" onChange={(e) => this.setState({ newTitle: e.currentTarget.value })} defaultValue={this.state.newTitle} />+ </div>,+ <DisplayError key={0} fields={['title']} pointing="above" error={this.state.error} />+ ]+ : <h1 className="ui header">{this.idea.title}</h1>+ }++ <span className="info">+ Shared <Moment date={this.idea.createdOn} /> by <Gravatar user={this.idea.user} /> <UserName user={this.idea.user} />+ </span>+ </div>+ </div>+ </div>++ <span className="subtitle">Description</span>+ {+ this.state.editMode+ ? <div className="ui form">+ <div className="field">+ <DisplayError fields={['description']} error={this.state.error} />+ <Textarea onChange={(e) => this.setState({ newDescription: e.currentTarget.value })} defaultValue={this.state.newDescription} />+ </div>+ </div>+ : this.idea.description+ ? <MultiLineText className="description" text={this.idea.description} style="simple" />+ : <p className="description">This idea doesn't have a description.</p>+ }++ <ShowIdeaResponse status={this.idea.status} response={this.idea.response} />++ </div>++ <div className="three wide column">+ {+ this.session.isCollaborator() && [+ <span key={0} className="subtitle">Actions</span>,+ this.state.editMode+ ?+ <div key={1} className="ui list">+ <div className="item">+ <Button className="positive icon fluid text-left" onClick={async () => this.saveChanges()}>+ <i className="save icon" /> Save+ </Button>+ </div>+ <div className="item">+ <Button className="icon fluid text-left" onClick={async () => this.setState({ error: undefined, editMode: false })}>+ <i className="cancel icon" /> Cancel+ </Button>+ </div>+ </div>+ :+ <div key={1} className="ui list">+ <div className="item">+ <Button className="icon fluid text-left" onClick={async () => this.setState({ editMode: true })}>+ <i className="edit icon" /> Edit+ </Button>+ </div>+ <div className="item">+ <ResponseForm idea={this.idea} />+ </div>+ </div>+ ]+ }++ <span+ className={`subtitle ${this.session.isCollaborator() && this.tags.length > 0 && 'active'}`}+ onClick={() => this.session.isCollaborator() && this.tags.length > 0 && this.setState({ editTags: !this.state.editTags })}+ >+ Tags+ {this.session.isCollaborator() && this.tags.length > 0 && <i className="setting icon" />}+ </span>++ <div className="ui list tag-list">+ {+ !this.state.editTags && tagsList+ }+ {+ this.state.editTags &&+ this.tags.map((tag) => (+ <div key={tag.id} className="item selectable" onClick={async () => this.assignOrUnassignTag(tag)}>+ <i className={`icon ${this.state.assignedTags.indexOf(tag) >= 0 && 'check'}`} />+ <ShowTag tag={tag} circular={true}/>+ <span>{tag.name}</span>+ </div>+ ))+ }+ </div>+ </div>++ <div className="sixteen wide column">+ <div className="ui comments">+ <span className="subtitle">Discussion</span>+ {commentsList}+ <CommentInput idea={this.idea} />+ </div>+ </div>+ </div>++ </div>+ <Footer />+ </div>+ );+ }+}diff --git a/public/pages/site/ShowIdeaPage/index.ts b/public/pages/site/ShowIdeaPage/index.tsnew file mode 100644index 000000000..e17ca84c2--- /dev/null+++ b/public/pages/site/ShowIdeaPage/index.ts@@ -0,0 +1 @@+export * from './ShowIdeaPage';diff --git a/public/services/TagService.ts b/public/services/TagService.tsnew file mode 100644index 000000000..89dfc72f8--- /dev/null+++ b/public/services/TagService.ts@@ -0,0 +1,30 @@+import { get, post, doDelete, Result } from '@fider/services/http';+import { injectable } from '@fider/di';+import { Tag } from '@fider/models';++export interface TagService {+ add(name: string, color: string, isPublic: boolean): Promise<Result<Tag>>;+ update(slug: string, name: string, color: string, isPublic: boolean): Promise<Result<Tag>>;+ delete(slug: string): Promise<Result>;+ assign(slug: string, ideaNumber: number): Promise<Result>;+ unassign(slug: string, ideaNumber: number): Promise<Result>;+}++@injectable()+export class HttpTagService implements TagService {+ public async add(name: string, color: string, isPublic: boolean): Promise<Result<Tag>> {+ return await post<Tag>(`/api/admin/tags`, { name, color, isPublic });+ }+ public async update(slug: string, name: string, color: string, isPublic: boolean): Promise<Result<Tag>> {+ return await post<Tag>(`/api/admin/tags/${slug}`, { name, color, isPublic });+ }+ public async delete(slug: string): Promise<Result> {+ return await doDelete(`/api/admin/tags/${slug}`);+ }+ public async assign(slug: string, ideaNumber: number): Promise<Result> {+ return await post(`/api/ideas/${ideaNumber}/tags/${slug}`);+ }+ public async unassign(slug: string, ideaNumber: number): Promise<Result> {+ return await doDelete(`/api/ideas/${ideaNumber}/tags/${slug}`);+ }+}diff --git a/public/services/http.ts b/public/services/http.tsindex e19795ac3..d400a0a7d 100644--- a/public/services/http.ts+++ b/public/services/http.ts@@ -44,3 +44,8 @@ export async function post<T = void>(url: string, data?: any): Promise<Result<T>const response = await axios.post(url, data);return toResult<T>(response);}++export async function doDelete<T = void>(url: string, data?: any): Promise<Result<T>> {+ const response = await axios.delete(url, data);+ return toResult<T>(response);+}diff --git a/public/services/index.ts b/public/services/index.tsindex 7aee161d3..0e8bc23d8 100644--- a/public/services/index.ts+++ b/public/services/index.ts@@ -2,4 +2,5 @@ export * from './Session';export * from './IdeaService';export * from './TenantService';export * from './UserService';+export * from './TagService';export { Failure } from './http';diff --git a/routes.go b/routes.goindex 4dba75935..3e07dda63 100644--- a/routes.go+++ b/routes.go@@ -49,7 +49,6 @@ func GetMainEngine(settings *models.AppSettings) *web.Engine {noTenant := r.Group(){noTenant.Use(middlewares.Setup(db, emailer))- noTenant.Use(middlewares.AddServices())noTenant.Post("/api/tenants", handlers.CreateTenant())noTenant.Get("/api/tenants/:subdomain/availability", handlers.CheckAvailability())@@ -67,7 +66,6 @@ func GetMainEngine(settings *models.AppSettings) *web.Engine {{verify.Use(middlewares.Setup(db, emailer))verify.Use(middlewares.Tenant())- verify.Use(middlewares.AddServices())verify.Get("/signup/verify", handlers.VerifySignUpKey())}@@ -75,7 +73,6 @@ func GetMainEngine(settings *models.AppSettings) *web.Engine {{page.Use(middlewares.Setup(db, emailer))page.Use(middlewares.Tenant())- page.Use(middlewares.AddServices())page.Use(middlewares.JwtGetter())page.Use(middlewares.JwtSetter())page.Use(middlewares.OnlyActiveTenants())@@ -103,11 +100,16 @@ func GetMainEngine(settings *models.AppSettings) *web.Engine {private.Post("/api/ideas/:number/status", handlers.SetResponse())private.Post("/api/ideas/:number/support", handlers.AddSupporter())private.Post("/api/ideas/:number/unsupport", handlers.RemoveSupporter())+ private.Post("/api/ideas/:number/tags/:slug", handlers.AssignTag())+ private.Delete("/api/ideas/:number/tags/:slug", handlers.UnassignTag())private.Post("/api/user/settings", handlers.UpdateUserSettings())private.Use(middlewares.IsAuthorized(models.RoleAdministrator))private.Post("/api/admin/settings", handlers.UpdateSettings())+ private.Delete("/api/admin/tags/:slug", handlers.DeleteTag())+ private.Post("/api/admin/tags/:slug", handlers.CreateEditTag())+ private.Post("/api/admin/tags", handlers.CreateEditTag())private.Post("/api/admin/users/:user_id/role", handlers.ChangeUserRole())}@@ -118,6 +120,7 @@ func GetMainEngine(settings *models.AppSettings) *web.Engine {admin.Get("/admin", handlers.Page())admin.Get("/admin/members", handlers.ManageMembers())+ admin.Get("/admin/tags", handlers.ManageTags())}}diff --git a/tests/testcases/SubmitIdeas.ts b/tests/testcases/SubmitIdeas.tsindex e7a4548f0..2c1edbd5c 100644--- a/tests/testcases/SubmitIdeas.ts+++ b/tests/testcases/SubmitIdeas.ts@@ -75,11 +75,9 @@ describe('Submit ideas', () => {await pages.home.submitNewIdea('Add support to TypeScript', 'Because the language and community is awesome! :)');// Assert- await Promise.all([- ensure(pages.showIdea.Title).textIs('Add support to TypeScript'),- ensure(pages.showIdea.Description).textIs('Because the language and community is awesome! :)'),- ensure(pages.showIdea.SupportCounter).textIs('1'),- ]);+ await ensure(pages.showIdea.Title).textIs('Add support to TypeScript');+ await ensure(pages.showIdea.Description).textIs('Because the language and community is awesome! :)');+ await ensure(pages.showIdea.SupportCounter).textIs('1');});it('Can sign in with Google and support an idea', async () => {