Open platform to collect and prioritize feedback
show ideas on main page
goenningd121794f4492
diff --git a/.vscode/settings.json b/.vscode/settings.jsonindex 26c003e5f..81a43f63d 100644--- a/.vscode/settings.json+++ b/.vscode/settings.json@@ -11,6 +11,5 @@"wchy": true,"wchy.exe": true,"tmp": true- },- "vsicons.presets.angular": false+ }}\ No newline at end of filediff --git a/context/wchy.go b/context/wchy.goindex b50e84e3f..83be99a6f 100644--- a/context/wchy.go+++ b/context/wchy.go@@ -10,6 +10,7 @@ type WchySettings struct {// WchyContext is an application-wide contexttype WchyContext struct {Health service.HealthCheckService+ Idea service.IdeaServiceTenant service.TenantServiceSettings WchySettings}diff --git a/handler/index.go b/handler/index.goindex 80d5ed6a9..38e6aa11c 100644--- a/handler/index.go+++ b/handler/index.go@@ -2,6 +2,7 @@ package handlerimport ("github.com/WeCanHearYou/wchy/context"+ "github.com/WeCanHearYou/wchy/model""github.com/gin-gonic/gin")@@ -16,8 +17,11 @@ func Index(ctx *context.WchyContext) gin.HandlerFunc {func (h indexHandlder) get() gin.HandlerFunc {return func(c *gin.Context) {+ tenant := c.MustGet("Tenant").(*model.Tenant)+ ideas, _ := h.ctx.Idea.GetAll(tenant.ID)c.HTML(200, "index.html", gin.H{- "Tenant": c.MustGet("Tenant"),+ "Tenant": tenant,+ "Ideas": ideas,})}}diff --git a/handler/index_test.go b/handler/index_test.goindex 0f14b477b..f8b1507d9 100644--- a/handler/index_test.go+++ b/handler/index_test.go@@ -10,10 +10,18 @@ import (. "github.com/onsi/gomega")+type mockIdeaService struct{}++func (svc mockIdeaService) GetAll(tenantID int) ([]*model.Idea, error) {+ return make([]*model.Idea, 0), nil+}+func TestIndexHandler(t *testing.T) {RegisterTestingT(t)- ctx := &context.WchyContext{}+ ctx := &context.WchyContext{+ Idea: &mockIdeaService{},+ }server := mock.NewServer()server.Set("Tenant", &model.Tenant{Name: "Any Tenant"})diff --git a/main.go b/main.goindex 8b988b1a0..9a1d03e25 100644--- a/main.go+++ b/main.go@@ -26,6 +26,7 @@ func init() {ctx = &context.WchyContext{Health: &service.PostgresHealthCheckService{DB: db},+ Idea: &service.PostgresIdeaService{DB: db},Tenant: &service.PostgresTenantService{DB: db},Settings: context.WchySettings{BuildTime: buildtime,diff --git a/migrations/20170126_1850_create_tenants.up.sql b/migrations/201701261850_create_tenants.up.sqlsimilarity index 100%rename from migrations/20170126_1850_create_tenants.up.sqlrename to migrations/201701261850_create_tenants.up.sqldiff --git a/migrations/20170128_1131_rename_domain.up.sql b/migrations/201701281131_rename_domain.up.sqlsimilarity index 100%rename from migrations/20170128_1131_rename_domain.up.sqlrename to migrations/201701281131_rename_domain.up.sqldiff --git a/migrations/201702072040_create_ideas.up.sql b/migrations/201702072040_create_ideas.up.sqlnew file mode 100644index 000000000..239b8e96f--- /dev/null+++ b/migrations/201702072040_create_ideas.up.sql@@ -0,0 +1,9 @@+create table if not exists ideas (+ id serial primary key,+ title varchar(100) not null,+ description text null,+ tenant_id int not null,+ created_on timestamptz not null default now(),+ modified_on timestamptz not null default now(),+ foreign key (tenant_id) references tenants(id)+);\ No newline at end of filediff --git a/model/idea.go b/model/idea.gonew file mode 100644index 000000000..7c8b56b4c--- /dev/null+++ b/model/idea.go@@ -0,0 +1,8 @@+package model++//Idea represents an idea on a tenant board+type Idea struct {+ ID int `json:"id"`+ Title string `json:"title"`+ Description string `json:"description"`+}diff --git a/service/idea.go b/service/idea.gonew file mode 100644index 000000000..4d717d0ee--- /dev/null+++ b/service/idea.go@@ -0,0 +1,34 @@+package service++import (+ "database/sql"++ "github.com/WeCanHearYou/wchy/model"+)++// IdeaService contains read and write operations for ideas+type IdeaService interface {+ GetAll(tenantID int) ([]*model.Idea, error)+}++// PostgresIdeaService contains read and write operations for ideas+type PostgresIdeaService struct {+ DB *sql.DB+}++// GetAll returns all tenant ideas+func (svc PostgresIdeaService) GetAll(tenantID int) ([]*model.Idea, error) {+ rows, err := svc.DB.Query("SELECT id, title, description FROM ideas WHERE tenant_id = $1", tenantID)+ if err != nil {+ return nil, err+ }++ var ideas []*model.Idea+ for rows.Next() {+ idea := &model.Idea{}+ rows.Scan(&idea.ID, &idea.Title, &idea.Description)+ ideas = append(ideas, idea)+ }++ return ideas, nil+}diff --git a/service/idea_test.go b/service/idea_test.gonew file mode 100644index 000000000..98b114880--- /dev/null+++ b/service/idea_test.go@@ -0,0 +1,48 @@+package service_test++import (+ "database/sql/driver"+ "testing"++ sqlmock "gopkg.in/DATA-DOG/go-sqlmock.v1"++ "github.com/WeCanHearYou/wchy/model"+ "github.com/WeCanHearYou/wchy/service"+ . "github.com/onsi/gomega"+)++func TestIdeaService_GetAll_Error(t *testing.T) {+ RegisterTestingT(t)++ db, mock, _ := sqlmock.New()+ defer db.Close()++ mock.ExpectQuery("SELECT id, title, description FROM ideas WHERE tenant_id = \\$1").WithArgs(2134).WillReturnError(driver.ErrBadConn)++ svc := &service.PostgresIdeaService{DB: db}+ ideas, err := svc.GetAll(2134)++ Expect(ideas).To(BeEmpty())+ Expect(err).NotTo(BeNil())+}++func TestIdeaService_GetAll(t *testing.T) {+ RegisterTestingT(t)++ db, mock, _ := sqlmock.New()+ defer db.Close()++ rows := sqlmock.NewRows([]string{"id", "title", "description"})+ rows.AddRow(1, "Idea #1", "Description #1")+ rows.AddRow(2, "Idea #2", "Description #2")++ mock.ExpectQuery("SELECT id, title, description FROM ideas WHERE tenant_id = \\$1").WithArgs(2134).WillReturnRows(rows)++ svc := &service.PostgresIdeaService{DB: db}+ ideas, err := svc.GetAll(2134)++ Expect(ideas).To(HaveLen(2))+ Expect(ideas[0]).To(Equal(&model.Idea{ID: 1, Title: "Idea #1", Description: "Description #1"}))+ Expect(ideas[1]).To(Equal(&model.Idea{ID: 2, Title: "Idea #2", Description: "Description #2"}))+ Expect(err).To(BeNil())+}diff --git a/views/index.html b/views/index.htmlindex e0a44ad38..06435c84f 100644--- a/views/index.html+++ b/views/index.html@@ -4,41 +4,26 @@<meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="stylesheet" type="text/css" href="/assets/semantic-ui-css/semantic.min.css">+ <style type="text/css">+ .ui.dividing.header,.first {+ margin-top: 5em;+ }+ </style><title>{{ .Tenant.Name }}</title></head><body>-<div class="ui text container"><h1 class="ui dividing header">{{ .Tenant.Name }}</h1><p>Welcome to our feedback forum.</p></div>- <div class="ui container">- <div class="ui grid">- <div class="column"></div>- <div class="column"></div>- <div class="column"></div>- <div class="column"></div>- <div class="column"></div>- <div class="column"></div>- <div class="column"></div>- <div class="column"></div>- <div class="column"></div>- <div class="column"></div>- <div class="column"></div>- <div class="column"></div>- <div class="column"></div>- <div class="column"></div>- <div class="column"></div>- <div class="column"></div>- </div>- </div>-<div class="ui text container">- <h3 class="first">Text Container</h3>- <p>Sometimes you just need to put a single column of centered text on a page. A <code>text container</code> is a special type of container optimized for a single flowing column of text, like this instructions on this page.- </p>- <p>Text containers <b>do not need to use grids</b> and help simplify basic page layouts.</p>+ <h3>Ideas</h3>+ <ul>+ {{ range $value := .Ideas }}+ <li><strong>{{ $value.ID }}</strong>: {{ $value.Title }}</li>+ {{ end }}+ </ul></div><div class="ui text container">@@ -47,348 +32,5 @@</div></div>-- <div class="ui text container">-- <h1 class="ui dividing header">Grid Content</h1>-- <h3 class="first">Column Flow</h3>- <p>A grid does not necessarily need to specify rows. If you include <code>columns</code> as direct child of <code>ui grid</code> content will automatically flow to the next row when all the grid columns are taken in the current row</b>.</p>-- <div class="ui grid">- <div class="four wide column"></div>- <div class="four wide column"></div>- <div class="four wide column"></div>- <div class="four wide column"></div>- <div class="four wide column"></div>- <div class="four wide column"></div>- <div class="four wide column"></div>- <div class="four wide column"></div>- </div>-- <h3>Clearing Rows</h3>- <p>Adding row wrappers allow you to manually specify you want a new row to begin.</p>-- <div class="ui three column grid">- <div class="column"></div>- <div class="row">- <div class="column"></div>- <div class="column"></div>- <div class="column"></div>- </div>- </div>-- <h3>Specifying Row Width</h3>- <p>Specifying a grid column count will divide columns into rows of predetermined column count. Additional columns will automatically flow to the next row.</p>- <div class="ui three column grid">- <div class="column">column</div>- <div class="column">column</div>- <div class="column">column</div>- <div class="column">column</div>- <div class="column">column</div>- <div class="column">column</div>- </div>-- <h3>Specifying Column Width</h3>- <p>You can also specify column widths for each column individually</p>- <div class="ui three column grid">- <div class="four wide column">four wide column</div>- <div class="eight wide column">eight wide column</div>- <div class="four wide column">four wide column</div>- </div>-- <h3>Special Variations</h3>- <p>Some special variations that format grids like tables require you to specify rows. For example a <code>divided grid</code> or a <code>celled grid</code> requires row wrappers.</p>-- <div class="ui horizontal section divider">Celled Grid</div>- <div class="ui celled grid">- <div class="row">- <div class="four wide column"></div>- <div class="four wide column"></div>- <div class="four wide column"></div>- <div class="four wide column"></div>- </div>- <div class="row">- <div class="four wide column"></div>- <div class="four wide column"></div>- <div class="four wide column"></div>- <div class="four wide column"></div>- </div>- </div>-- <div class="ui horizontal section divider">Internally Celled Grid</div>-- <div class="ui internally celled grid">- <div class="row">- <div class="four wide column"></div>- <div class="four wide column"></div>- <div class="four wide column"></div>- <div class="four wide column"></div>- </div>- <div class="row">- <div class="four wide column"></div>- <div class="four wide column"></div>- <div class="four wide column"></div>- <div class="four wide column"></div>- </div>- </div>--- <div class="ui horizontal section divider">Divided Grid</div>-- <div class="ui divided grid">- <div class="row">- <div class="four wide column"></div>- <div class="four wide column"></div>- <div class="four wide column"></div>- <div class="four wide column"></div>- </div>- <div class="row">- <div class="four wide column"></div>- <div class="four wide column"></div>- <div class="four wide column"></div>- <div class="four wide column"></div>- </div>- </div>-- <div class="ui horizontal section divider">Vertically Divided Grid</div>-- <div class="ui vertically divided grid">- <div class="row">- <div class="four wide column"></div>- <div class="four wide column"></div>- <div class="four wide column"></div>- <div class="four wide column"></div>- </div>- <div class="row">- <div class="four wide column"></div>- <div class="four wide column"></div>- <div class="four wide column"></div>- <div class="four wide column"></div>- </div>- </div>-- <h1 class="ui dividing header">Adjusting Grids</h1>--- <h3 class="first">Centering Content</h3>- <p>If a row does not take up all sixteen grid columns, you can use a <code>ui centered grid</code>, <code>centered row</code>, or <code>centered column</code> to center the column contents inside the grid.- </p>- <div class="ui two column centered grid">- <div class="column"></div>- <div class="four column centered row">- <div class="column"></div>- <div class="column"></div>- </div>- </div>-- <h3>Floating Rows</h3>- <p>Since Semantic UI's grid is based on flex box, a <code>left floated</code> item should come first, and a <code>right floated</code> item last in its row.</p>-- <div class="ui grid">- <div class="left floated six wide column">- <div class="ui segment">- Left floated- </div>- </div>- <div class="right floated six wide column">- <div class="ui segment">- Right floated- </div>- </div>- </div>--- <h3>Text Alignment</h3>- <p>You can specify text alignment using alignment variations on a grid, row, or column level.</p>-- <div class="ui grid">- <div class="right aligned eight wide column">- right aligned column- </div>- <div class="left aligned eight wide column">- left aligned column- </div>- <div class="center aligned two column row">- <div class="column">- center aligned row- </div>- <div class="column">- center aligned row- </div>- </div>- <div class="sixteen wide right aligned column">- right aligned column- </div>- </div>-- <h3>Vertical Alignment</h3>- <p>You can specify vertical alignment on a grid, row, or column level.</p>- <div class="ui middle aligned four column centered grid">- <div class="row">- <div class="column">- <img class="ui wireframe image" src="assets/images/wireframe/image.png">- </div>- <div class="column">- <img class="ui wireframe image" src="assets/images/wireframe/image.png">- <img class="ui wireframe image" src="assets/images/wireframe/image.png">- </div>- <div class="column">- <img class="ui wireframe image" src="assets/images/wireframe/image.png">- </div>- </div>- </div>-- <h3>Equal Width Columns</h3>- <p>Specifying an <code>equal width grid</code> will automatically determine column sizes to fit evenly inside one row</p>- <div class="ui equal width grid">- <div class="row">- <div class="column">column</div>- <div class="column">column</div>- <div class="column">column</div>- <div class="column">column</div>- </div>- <div class="row">- <div class="column">column</div>- <div class="column">column</div>- <div class="column">column</div>- </div>- </div>--- <h1>Responsive Patterns</h1>-- <h3 class="first">Doubling</h3>- <p>You can set columns to double in width at each device jump</p>- <div class="ui five column doubling grid">- <div class="column">column</div>- <div class="column">column</div>- <div class="column">column</div>- <div class="column">column</div>- <div class="column">column</div>- </div>-- <h3>Stackable</h3>- <p>You can set columns to stack on mobile</p>- <div class="ui three column stackable grid">- <div class="column">column</div>- <div class="column">column</div>- <div class="column">column</div>- </div>-- <h3>Responsive Width Adjustments</h3>- <p>You can specify columns to appear at different widths on different screens</p>-- <div class="ui grid">- <div class="eight wide mobile six wide tablet four wide computer column"></div>- <div class="eight wide mobile six wide tablet four wide computer column"></div>- <div class="eight wide mobile six wide tablet four wide computer column"></div>- <div class="eight wide mobile six wide tablet four wide computer column"></div>- <div class="eight wide mobile six wide tablet four wide computer column"></div>- </div>- <div class="ui grid">- <div class="four wide two wide large screen one wide widescreen column"></div>- <div class="four wide two wide large screen one wide widescreen column"></div>- <div class="four wide two wide large screen one wide widescreen column"></div>- <div class="four wide two wide large screen one wide widescreen column"></div>- </div>-- <h3>Specifying Device Visibility</h3>- <p>You can specify columns to appear only a particular screen</p>- <div class="ui grid">- <div class="two column computer only row">- <div class="ten wide column">ten wide column computer only</div>- <div class="six wide column">six wide column computer only</div>- </div>- <div class="sixteen wide mobile only column">sixteen wide column mobile only</div>- <div class="three column computer only row">- <div class="column">computer only row</div>- <div class="column">computer only row</div>- <div class="column">computer only row</div>- </div>- <div class="two column mobile only row">- <div class="column">mobile only column</div>- <div class="column">mobile only column</div>- </div>- <div class="two column row">- <div class="column">column</div>- <div class="column">column</div>- </div>- </div>-- </div>- </div>---<style type="text/css">--/* Some basic formatting */-code {- background-color: #E0E0E0;- padding: 0.25em 0.3em;- font-family: 'Lato';- font-weight: bold;-}-.container {- padding: 5em 0em;-}-.ui.dividing.header,-.first {- margin-top: 5em;-}--.ui.dividing.header:first-child {- margin-top: 0em;-}--h1,-h3 {- margin-top: 10em;-}--img {- display: block;- max-width: 100%;-}-img + img {- margin-top: 0.5em;-}--/* Shows content box (not negative margins) */-.grid {- position: relative;-}-.grid:before {- position: absolute;- top: 1rem;- left: 1rem;- background-color: #F0F0F0;- content: '';- width: calc(100% - 2rem);- height: calc(100% - 2rem);- box-shadow: 0px 0px 0px 1px #DDDDDD inset;-}-.ui.divided.grid:before,-.celled.grid:before {- display: none;-}-.ui.aligned .column:after {- display: none !important;-}-.grid .column:not(.row):not(.grid):after {- background-color: rgba(86, 61, 124, .15);- box-shadow: 0px 0px 0px 1px rgba(86, 61, 124, 0.2) inset;- content: "";- display: block;- min-height: 50px;-}-@media only screen and (max-width: 768px) {- .stackable.grid:before {- width: 100%;- left: 0em;- }-}-</style></body>-</html>