Open platform to collect and prioritize feedback
Lots of small refactor while offline (#232)
Guilherme Oenninga5051264cb86
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.mdindex 4b00386eb..4a5a8f0df 100644--- a/CONTRIBUTING.md+++ b/CONTRIBUTING.md@@ -6,7 +6,7 @@ If you know these technologies or would like to learn them, lucky you! This is tTools you'll need:- Go 1.9 (https://golang.org)-- Node.js 6+ (https://nodejs.org/)+- Node.js 8+ (https://nodejs.org/)- Docker (https://www.docker.com/)- github.com/codegangsta/gin (https://github.com/codegangsta/gin)@@ -14,11 +14,10 @@ Step by step:1) clone this repository into `$GOPATH/src/github.com/getfider/fider`2) run `npm install` to install front end packages-3) run `npm run watch` to pack the front end source into a bundle on every file change.-4) run `docker-compose up -d pgdev` to start a local PostgreSQL database on Docker.-5) run `cp .example.env .env` to create a local environment configuration file.-6) run `make watch` to start the application.-7) Navigate to `http://localhost:3000/` and boom! Welcome to your new local Fider development copy!+3) run `docker-compose up -d pgdev` to start a local PostgreSQL database on Docker.+4) run `cp .example.env .env` to create a local environment configuration file.+5) run `make watch` to start the application.+6) Navigate to `http://localhost:3000/` and boom! Welcome to your new local Fider development copy!Change some code, fix some bugs, implement some features and send us your Pull Request!diff --git a/README.md b/README.mdindex ab6921bff..c610d35a3 100644--- a/README.md+++ b/README.md@@ -6,7 +6,7 @@ Fider is an open platform to collect and organize customer feedback. By using th[See it in action](https://feedback.fider.io/) or visit http://getfider.com for information about it and how to host your own instance.-+# How Fider is organizeddiff --git a/app/handlers/avatar.go b/app/handlers/avatar.goindex 166a8fe9c..80a899526 100644--- a/app/handlers/avatar.go+++ b/app/handlers/avatar.go@@ -18,25 +18,22 @@ func Avatar() web.HandlerFunc {return func(c web.Context) error {name := c.Param("name")size, _ := c.ParamAsInt("size")- email := c.QueryParam("e") //TODO: remove this parameter, not used anymore-id, err := c.ParamAsInt("id")- if err == nil && id > 0 && email == "" {++ if err == nil && id > 0 {user, err := c.Services().Users.GetByID(id)if err == nil && user.Tenant.ID == c.Tenant().ID {- email = user.Email- }- }-- if email != "" {- hash := md5.Sum([]byte(email))- url := fmt.Sprintf("https://www.gravatar.com/avatar/%x?s=%d&d=404", hash, size)- c.Logger().Debugf("Requesting gravatar: %s", url)- resp, err := http.Get(url)- if err == nil && resp != nil && resp.StatusCode == http.StatusOK {- bytes, err := ioutil.ReadAll(resp.Body)- if err == nil {- return c.Blob(http.StatusOK, "image/png", bytes)+ if user.Email != "" {+ hash := md5.Sum([]byte(user.Email))+ url := fmt.Sprintf("https://www.gravatar.com/avatar/%x?s=%d&d=404", hash, size)+ c.Logger().Debugf("Requesting gravatar: %s", url)+ resp, err := http.Get(url)+ if err == nil && resp != nil && resp.StatusCode == http.StatusOK {+ bytes, err := ioutil.ReadAll(resp.Body)+ if err == nil {+ return c.Blob(http.StatusOK, "image/png", bytes)+ }+ }}}}diff --git a/app/handlers/avatar_test.go b/app/handlers/avatar_test.goindex b36e1b939..b13fb882f 100644--- a/app/handlers/avatar_test.go+++ b/app/handlers/avatar_test.go@@ -35,29 +35,6 @@ func TestGravatarHandler(t *testing.T) {Expect(ioutil.ReadAll(response.Body)).To(Equal(expectedAvatar))}-func TestGravatarQueryStringHandler(t *testing.T) {- RegisterTestingT(t)-- server, services := mock.NewServer()- user := &models.User{- Name: "Darth Vader",- Email: "[email protected]",- Tenant: mock.DemoTenant,- }- services.Users.Register(user)- code, response := server.- OnTenant(mock.DemoTenant).- WithURL("/avatars/0/50/Darth%[email protected]").- AddParam("size", 50).- AddParam("name", user.Name).- Execute(handlers.Avatar())-- expectedAvatar := []byte{255, 216, 255, 224, 0, 16, 74, 70, 73, 70, 0, 1, 1, 0, 0, 1, 0, 1, 0, 0, 255, 254, 0, 59, 67, 82, 69, 65, 84, 79, 82, 58, 32, 103, 100, 45, 106, 112, 101, 103, 32, 118, 49, 46, 48, 32, 40, 117, 115, 105, 110, 103, 32, 73, 74, 71, 32, 74, 80, 69, 71, 32, 118, 54, 50, 41, 44, 32, 113, 117, 97, 108, 105, 116, 121, 32, 61, 32, 57, 48, 10, 255, 219, 0, 67, 0, 3, 2, 2, 3, 2, 2, 3, 3, 3, 3, 4, 3, 3, 4, 5, 8, 5, 5, 4, 4, 5, 10, 7, 7, 6, 8, 12, 10, 12, 12, 11, 10, 11, 11, 13, 14, 18, 16, 13, 14, 17, 14, 11, 11, 16, 22, 16, 17, 19, 20, 21, 21, 21, 12, 15, 23, 24, 22, 20, 24, 18, 20, 21, 20, 255, 219, 0, 67, 1, 3, 4, 4, 5, 4, 5, 9, 5, 5, 9, 20, 13, 11, 13, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 255, 192, 0, 17, 8, 0, 50, 0, 50, 3, 1, 34, 0, 2, 17, 1, 3, 17, 1, 255, 196, 0, 31, 0, 0, 1, 5, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 255, 196, 0, 181, 16, 0, 2, 1, 3, 3, 2, 4, 3, 5, 5, 4, 4, 0, 0, 1, 125, 1, 2, 3, 0, 4, 17, 5, 18, 33, 49, 65, 6, 19, 81, 97, 7, 34, 113, 20, 50, 129, 145, 161, 8, 35, 66, 177, 193, 21, 82, 209, 240, 36, 51, 98, 114, 130, 9, 10, 22, 23, 24, 25, 26, 37, 38, 39, 40, 41, 42, 52, 53, 54, 55, 56, 57, 58, 67, 68, 69, 70, 71, 72, 73, 74, 83, 84, 85, 86, 87, 88, 89, 90, 99, 100, 101, 102, 103, 104, 105, 106, 115, 116, 117, 118, 119, 120, 121, 122, 131, 132, 133, 134, 135, 136, 137, 138, 146, 147, 148, 149, 150, 151, 152, 153, 154, 162, 163, 164, 165, 166, 167, 168, 169, 170, 178, 179, 180, 181, 182, 183, 184, 185, 186, 194, 195, 196, 197, 198, 199, 200, 201, 202, 210, 211, 212, 213, 214, 215, 216, 217, 218, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 255, 196, 0, 31, 1, 0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 255, 196, 0, 181, 17, 0, 2, 1, 2, 4, 4, 3, 4, 7, 5, 4, 4, 0, 1, 2, 119, 0, 1, 2, 3, 17, 4, 5, 33, 49, 6, 18, 65, 81, 7, 97, 113, 19, 34, 50, 129, 8, 20, 66, 145, 161, 177, 193, 9, 35, 51, 82, 240, 21, 98, 114, 209, 10, 22, 36, 52, 225, 37, 241, 23, 24, 25, 26, 38, 39, 40, 41, 42, 53, 54, 55, 56, 57, 58, 67, 68, 69, 70, 71, 72, 73, 74, 83, 84, 85, 86, 87, 88, 89, 90, 99, 100, 101, 102, 103, 104, 105, 106, 115, 116, 117, 118, 119, 120, 121, 122, 130, 131, 132, 133, 134, 135, 136, 137, 138, 146, 147, 148, 149, 150, 151, 152, 153, 154, 162, 163, 164, 165, 166, 167, 168, 169, 170, 178, 179, 180, 181, 182, 183, 184, 185, 186, 194, 195, 196, 197, 198, 199, 200, 201, 202, 210, 211, 212, 213, 214, 215, 216, 217, 218, 226, 227, 228, 229, 230, 231, 232, 233, 234, 242, 243, 244, 245, 246, 247, 248, 249, 250, 255, 218, 0, 12, 3, 1, 0, 2, 17, 3, 17, 0, 63, 0, 252, 207, 109, 22, 21, 199, 12, 61, 112, 213, 57, 209, 237, 33, 182, 105, 165, 46, 168, 163, 183, 57, 62, 149, 245, 7, 236, 5, 225, 255, 0, 3, 235, 159, 181, 46, 155, 99, 227, 221, 31, 79, 214, 244, 137, 244, 107, 150, 182, 179, 213, 33, 89, 160, 123, 133, 101, 32, 148, 111, 148, 144, 130, 67, 200, 237, 94, 239, 255, 0, 5, 55, 248, 123, 240, 166, 203, 194, 254, 23, 210, 126, 29, 120, 111, 194, 158, 24, 214, 165, 214, 86, 43, 171, 171, 8, 161, 179, 45, 7, 145, 35, 54, 66, 224, 20, 12, 83, 45, 142, 14, 209, 223, 7, 179, 151, 70, 212, 79, 38, 51, 189, 175, 61, 207, 139, 79, 193, 22, 210, 244, 49, 168, 222, 70, 100, 114, 155, 150, 44, 0, 188, 142, 6, 113, 147, 214, 188, 207, 84, 125, 62, 210, 249, 173, 96, 178, 44, 85, 182, 231, 130, 73, 252, 171, 236, 77, 122, 230, 211, 83, 248, 123, 13, 181, 133, 237, 189, 237, 205, 148, 40, 151, 83, 7, 85, 141, 36, 85, 220, 9, 98, 113, 180, 237, 206, 115, 192, 53, 243, 111, 135, 188, 51, 164, 71, 227, 107, 121, 117, 45, 95, 79, 186, 182, 50, 3, 32, 176, 147, 206, 216, 51, 215, 177, 35, 220, 10, 43, 69, 69, 46, 84, 42, 18, 114, 187, 155, 216, 169, 160, 248, 58, 195, 92, 133, 198, 207, 42, 120, 240, 94, 41, 19, 4, 3, 208, 253, 56, 171, 147, 124, 54, 180, 83, 247, 98, 3, 25, 232, 223, 227, 95, 74, 254, 206, 158, 16, 240, 47, 141, 255, 0, 110, 47, 15, 120, 71, 80, 180, 77, 127, 194, 122, 134, 149, 112, 37, 242, 103, 150, 5, 44, 45, 222, 85, 108, 198, 202, 195, 13, 26, 140, 103, 191, 61, 13, 125, 161, 241, 7, 246, 40, 248, 19, 166, 207, 226, 11, 75, 123, 61, 86, 11, 230, 137, 26, 22, 143, 85, 148, 165, 129, 59, 137, 3, 113, 57, 227, 105, 195, 238, 60, 142, 153, 171, 167, 21, 39, 203, 107, 179, 58, 142, 80, 138, 159, 53, 147, 63, 36, 207, 195, 155, 44, 253, 216, 255, 0, 241, 239, 254, 42, 138, 250, 238, 251, 224, 231, 192, 219, 11, 219, 139, 89, 126, 37, 220, 44, 144, 200, 209, 178, 181, 237, 190, 65, 7, 4, 31, 147, 218, 138, 233, 246, 17, 236, 190, 244, 115, 123, 106, 157, 223, 226, 121, 191, 236, 225, 225, 237, 38, 235, 196, 90, 30, 175, 127, 4, 114, 125, 140, 93, 100, 191, 241, 6, 27, 54, 253, 48, 77, 124, 243, 241, 167, 198, 35, 226, 39, 196, 237, 94, 235, 78, 139, 26, 104, 185, 107, 125, 58, 218, 17, 144, 33, 86, 33, 118, 129, 221, 190, 241, 247, 106, 244, 107, 47, 23, 73, 225, 15, 133, 90, 133, 196, 13, 229, 220, 75, 20, 144, 68, 71, 4, 51, 182, 220, 143, 112, 9, 63, 133, 120, 5, 178, 204, 242, 55, 144, 28, 176, 82, 78, 204, 228, 14, 245, 203, 94, 126, 226, 130, 245, 59, 240, 112, 213, 212, 126, 136, 244, 13, 55, 74, 178, 240, 239, 135, 124, 77, 160, 235, 186, 69, 235, 248, 154, 254, 218, 6, 210, 86, 221, 247, 164, 18, 137, 163, 102, 50, 42, 57, 249, 140, 94, 114, 224, 130, 65, 113, 144, 59, 114, 87, 90, 123, 216, 216, 219, 93, 164, 166, 11, 168, 159, 99, 194, 210, 1, 42, 54, 73, 4, 40, 59, 128, 192, 28, 144, 57, 53, 235, 31, 7, 143, 143, 126, 30, 106, 54, 94, 32, 240, 236, 210, 232, 154, 157, 131, 75, 50, 203, 106, 26, 43, 150, 67, 20, 76, 81, 164, 94, 118, 178, 49, 194, 156, 242, 132, 17, 212, 87, 97, 241, 150, 255, 0, 196, 30, 54, 240, 54, 163, 172, 248, 150, 120, 237, 158, 105, 197, 202, 202, 2, 192, 215, 239, 130, 0, 242, 219, 27, 74, 156, 238, 0, 99, 43, 129, 201, 192, 227, 183, 83, 177, 212, 229, 146, 91, 220, 227, 127, 103, 175, 137, 175, 225, 175, 142, 190, 1, 241, 13, 228, 134, 40, 99, 186, 58, 117, 212, 209, 49, 70, 141, 103, 86, 133, 159, 35, 160, 11, 38, 239, 248, 11, 12, 98, 189, 215, 246, 171, 241, 135, 142, 45, 245, 173, 91, 77, 209, 124, 79, 126, 44, 245, 139, 159, 54, 243, 124, 196, 201, 147, 144, 64, 110, 170, 164, 99, 229, 30, 149, 241, 45, 148, 139, 230, 52, 82, 62, 200, 228, 227, 118, 126, 235, 127, 11, 126, 127, 161, 53, 245, 126, 187, 227, 120, 254, 34, 120, 99, 70, 241, 35, 184, 150, 226, 242, 216, 45, 216, 207, 41, 118, 152, 89, 129, 244, 203, 124, 224, 127, 118, 68, 174, 202, 18, 188, 92, 14, 76, 92, 57, 92, 106, 37, 177, 226, 171, 240, 158, 2, 163, 204, 190, 99, 39, 241, 125, 123, 209, 91, 242, 106, 110, 36, 108, 103, 25, 52, 86, 156, 144, 254, 83, 139, 219, 213, 254, 98, 75, 109, 16, 120, 175, 192, 113, 105, 198, 65, 19, 191, 207, 28, 135, 160, 96, 73, 25, 246, 237, 248, 215, 157, 234, 191, 12, 124, 83, 160, 193, 113, 52, 154, 116, 173, 104, 138, 124, 201, 237, 220, 58, 21, 235, 147, 131, 211, 128, 121, 244, 174, 183, 71, 241, 141, 151, 135, 60, 63, 100, 247, 83, 22, 148, 198, 25, 97, 143, 150, 111, 240, 252, 107, 152, 241, 151, 197, 61, 91, 197, 182, 198, 199, 119, 216, 244, 204, 130, 109, 227, 57, 47, 142, 155, 219, 191, 211, 165, 101, 87, 217, 181, 119, 185, 215, 134, 85, 163, 39, 20, 189, 219, 255, 0, 86, 56, 239, 51, 228, 219, 142, 125, 107, 214, 62, 16, 252, 25, 241, 47, 199, 75, 235, 75, 107, 101, 187, 155, 78, 179, 30, 76, 183, 140, 75, 45, 180, 99, 36, 12, 177, 194, 168, 207, 78, 131, 53, 15, 134, 252, 1, 168, 63, 129, 228, 241, 11, 91, 88, 106, 0, 198, 124, 184, 46, 98, 102, 109, 163, 142, 10, 144, 115, 199, 124, 213, 95, 17, 106, 30, 37, 248, 117, 161, 157, 30, 211, 84, 159, 79, 178, 212, 80, 61, 205, 189, 155, 180, 105, 38, 224, 172, 59, 231, 161, 0, 250, 226, 185, 121, 26, 179, 107, 67, 181, 212, 231, 188, 96, 245, 48, 190, 38, 248, 13, 62, 29, 120, 170, 243, 71, 77, 98, 203, 89, 16, 57, 95, 58, 206, 64, 227, 232, 112, 72, 4, 122, 100, 214, 175, 195, 127, 19, 182, 157, 165, 221, 233, 247, 26, 149, 188, 86, 79, 47, 157, 29, 172, 163, 14, 36, 192, 5, 149, 136, 192, 4, 0, 8, 207, 59, 87, 142, 5, 112, 166, 202, 115, 100, 110, 202, 17, 0, 144, 71, 188, 247, 98, 9, 199, 228, 42, 189, 17, 151, 44, 174, 141, 37, 14, 120, 114, 201, 158, 181, 37, 234, 51, 177, 15, 193, 39, 24, 52, 87, 147, 110, 62, 166, 138, 232, 250, 199, 145, 195, 245, 37, 252, 223, 128, 249, 216, 179, 140, 146, 112, 160, 115, 244, 162, 220, 3, 113, 16, 35, 32, 176, 227, 241, 162, 138, 228, 61, 37, 178, 62, 222, 240, 253, 180, 48, 120, 14, 241, 34, 137, 35, 65, 230, 0, 168, 160, 1, 197, 121, 119, 199, 187, 120, 158, 227, 74, 221, 26, 55, 250, 29, 185, 229, 71, 247, 18, 138, 43, 210, 173, 252, 63, 184, 249, 236, 63, 241, 126, 103, 156, 120, 158, 24, 227, 248, 96, 74, 162, 169, 254, 215, 65, 144, 49, 199, 144, 213, 230, 180, 81, 94, 124, 186, 30, 229, 47, 132, 40, 162, 138, 147, 99, 255, 217}-- Expect(code).To(Equal(http.StatusOK))- Expect(ioutil.ReadAll(response.Body)).To(Equal(expectedAvatar))-}-func TestGravatarNotFound_LetterAvatarHandler(t *testing.T) {RegisterTestingT(t)diff --git a/app/handlers/signin_test.go b/app/handlers/signin_test.goindex c8a1d7127..3f26d5f6b 100644--- a/app/handlers/signin_test.go+++ b/app/handlers/signin_test.go@@ -38,7 +38,7 @@ func TestSignInHandler(t *testing.T) {code, response := server.Execute(handlers.SignIn(oauth.FacebookProvider))Expect(code).To(Equal(http.StatusTemporaryRedirect))- Expect(response.Header().Get("Location")).To(Equal("http://orange.test.fider.io/oauth/token?provider=facebook&redirect="))+ Expect(response.Header().Get("Location")).To(Equal("http://avengers.test.fider.io/oauth/token?provider=facebook&redirect="))}func TestCallbackHandler_InvalidState(t *testing.T) {@@ -57,11 +57,11 @@ func TestCallbackHandler_InvalidCode(t *testing.T) {server, _ := mock.NewServer()code, response := server.- WithURL("http://login.test.fider.io/oauth/callback?state=http://orange.test.fider.io").+ WithURL("http://login.test.fider.io/oauth/callback?state=http://avengers.test.fider.io").Execute(handlers.OAuthCallback(oauth.FacebookProvider))Expect(code).To(Equal(http.StatusTemporaryRedirect))- Expect(response.Header().Get("Location")).To(Equal("http://orange.test.fider.io"))+ Expect(response.Header().Get("Location")).To(Equal("http://avengers.test.fider.io"))}func TestCallbackHandler_ExistingUserAndProvider(t *testing.T) {@@ -93,15 +93,15 @@ func TestCallbackHandler_NewUser(t *testing.T) {server, services := mock.NewServer()code, response := server.- WithURL("http://login.test.fider.io/oauth/callback?state=http://orange.test.fider.io&code=456").+ WithURL("http://login.test.fider.io/oauth/callback?state=http://avengers.test.fider.io&code=456").Execute(handlers.OAuthCallback(oauth.FacebookProvider))- user, err := services.Users.GetByEmail(mock.OrangeTenant.ID, "[email protected]")+ user, err := services.Users.GetByEmail(mock.AvengersTenant.ID, "[email protected]")Expect(err).To(BeNil())Expect(user.Name).To(Equal("Some Facebook Guy"))Expect(code).To(Equal(http.StatusTemporaryRedirect))- Expect(response.Header().Get("Location")).To(Equal("http://orange.test.fider.io?token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjozLCJ1c2VyL25hbWUiOiJTb21lIEZhY2Vib29rIEd1eSIsInVzZXIvZW1haWwiOiJzb21lLmd1eUBmYWNlYm9vay5jb20ifQ.ydyGDIZZHbJ-mgvpAsXTZnbs1rBH6cTVjHctZEACUOo"))+ Expect(response.Header().Get("Location")).To(Equal("http://avengers.test.fider.io?token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjozLCJ1c2VyL25hbWUiOiJTb21lIEZhY2Vib29rIEd1eSIsInVzZXIvZW1haWwiOiJzb21lLmd1eUBmYWNlYm9vay5jb20ifQ.ydyGDIZZHbJ-mgvpAsXTZnbs1rBH6cTVjHctZEACUOo"))}func TestCallbackHandler_NewUserWithoutEmail(t *testing.T) {diff --git a/app/middlewares/auth.go b/app/middlewares/auth.goindex 476750a66..fa9f68309 100644--- a/app/middlewares/auth.go+++ b/app/middlewares/auth.go@@ -9,7 +9,7 @@ import (func IsAuthenticated() web.MiddlewareFunc {return func(next web.HandlerFunc) web.HandlerFunc {return func(c web.Context) error {- if c.User() == nil {+ if !c.IsAuthenticated() {return c.Unauthorized()}return next(c)diff --git a/app/middlewares/domain.go b/app/middlewares/domain.goindex 7d3874364..d5690444a 100644--- a/app/middlewares/domain.go+++ b/app/middlewares/domain.go@@ -23,13 +23,12 @@ func Tenant() web.MiddlewareFunc {func SingleTenant() web.MiddlewareFunc {return func(next web.HandlerFunc) web.HandlerFunc {return func(c web.Context) error {- tenants := c.Services().Tenants- tenant, err := tenants.First()+ tenant, err := c.Services().Tenants.First()if err != nil {if err == app.ErrNotFound {return c.Redirect(http.StatusTemporaryRedirect, "/signup")}- return err+ return c.Failure(err)}c.SetTenant(tenant)@@ -42,7 +41,6 @@ func SingleTenant() web.MiddlewareFunc {func MultiTenant() web.MiddlewareFunc {return func(next web.HandlerFunc) web.HandlerFunc {return func(c web.Context) error {- tenants := c.Services().Tenantshostname := stripPort(c.Request.Host)// If no tenant is specified, redirect user to getfider.com@@ -52,7 +50,7 @@ func MultiTenant() web.MiddlewareFunc {return c.Redirect(http.StatusTemporaryRedirect, "http://getfider.com")}- tenant, err := tenants.GetByDomain(hostname)+ tenant, err := c.Services().Tenants.GetByDomain(hostname)if err == nil {c.SetTenant(tenant)return next(c)diff --git a/app/middlewares/domain_test.go b/app/middlewares/domain_test.goindex 6495c1a4a..95e5373d7 100644--- a/app/middlewares/domain_test.go+++ b/app/middlewares/domain_test.go@@ -16,10 +16,10 @@ var testCases = []struct {urls []string}{{- "The Orange Inc.",+ "Avengers",[]string{- "http://orange.test.fider.io",- "http://orange.test.fider.io:3000",+ "http://avengers.test.fider.io",+ "http://avengers.test.fider.io:3000",},},{@@ -124,7 +124,7 @@ func TestHostChecker_DifferentHost(t *testing.T) {server, _ := mock.NewServer()server.Use(middlewares.HostChecker("login.test.fider.io"))- status, _ := server.WithURL("http://orange.test.fider.io").Execute(func(c web.Context) error {+ status, _ := server.WithURL("http://avengers.test.fider.io").Execute(func(c web.Context) error {return c.NoContent(http.StatusOK)})diff --git a/app/middlewares/jwt.go b/app/middlewares/jwt.goindex 523b957f9..91d188f3d 100644--- a/app/middlewares/jwt.go+++ b/app/middlewares/jwt.go@@ -29,8 +29,7 @@ func JwtGetter() web.MiddlewareFunc {return next(c)}- services := c.Services()- user, err := services.Users.GetByID(claims.UserID)+ user, err := c.Services().Users.GetByID(claims.UserID)if err != nil {if err == app.ErrNotFound {c.RemoveCookie(web.CookieAuthName)diff --git a/app/middlewares/jwt_test.go b/app/middlewares/jwt_test.goindex a7f44749d..a03ae5b2d 100644--- a/app/middlewares/jwt_test.go+++ b/app/middlewares/jwt_test.go@@ -61,7 +61,7 @@ func TestJwtGetter_WithCookie_InvalidUser(t *testing.T) {server.Use(middlewares.JwtGetter())status, response := server.- OnTenant(mock.OrangeTenant).+ OnTenant(mock.AvengersTenant).AddCookie(web.CookieAuthName, token).Execute(func(c web.Context) error {if c.User() == nil {@@ -85,7 +85,7 @@ func TestJwtGetter_WithCookie_DifferentTenant(t *testing.T) {server.Use(middlewares.JwtGetter())status, _ := server.- OnTenant(mock.OrangeTenant).+ OnTenant(mock.AvengersTenant).AddCookie(web.CookieAuthName, token).Execute(func(c web.Context) error {if c.User() == nil {@@ -103,7 +103,7 @@ func TestJwtSetter_WithoutJwt(t *testing.T) {server, _ := mock.NewServer()server.Use(middlewares.JwtSetter())- status, _ := server.WithURL("http://orange.test.fider.io/abc").Execute(func(c web.Context) error {+ status, _ := server.WithURL("http://avengers.test.fider.io/abc").Execute(func(c web.Context) error {return c.NoContent(http.StatusOK)})@@ -119,12 +119,12 @@ func TestJwtSetter_WithJwt_WithoutParameter(t *testing.T) {})server.Use(middlewares.JwtSetter())- status, response := server.WithURL("http://orange.test.fider.io/abc?token=" + token).Execute(func(c web.Context) error {+ status, response := server.WithURL("http://avengers.test.fider.io/abc?token=" + token).Execute(func(c web.Context) error {return c.NoContent(http.StatusOK)})Expect(status).To(Equal(http.StatusTemporaryRedirect))- Expect(response.Header().Get("Location")).To(Equal("http://orange.test.fider.io/abc"))+ Expect(response.Header().Get("Location")).To(Equal("http://avengers.test.fider.io/abc"))}func TestJwtSetter_WithJwt_WithParameter(t *testing.T) {@@ -136,10 +136,10 @@ func TestJwtSetter_WithJwt_WithParameter(t *testing.T) {})server.Use(middlewares.JwtSetter())- status, response := server.WithURL("http://orange.test.fider.io/abc?token=" + token + "&foo=bar").Execute(func(c web.Context) error {+ status, response := server.WithURL("http://avengers.test.fider.io/abc?token=" + token + "&foo=bar").Execute(func(c web.Context) error {return c.NoContent(http.StatusOK)})Expect(status).To(Equal(http.StatusTemporaryRedirect))- Expect(response.Header().Get("Location")).To(Equal("http://orange.test.fider.io/abc?foo=bar"))+ Expect(response.Header().Get("Location")).To(Equal("http://avengers.test.fider.io/abc?foo=bar"))}diff --git a/app/middlewares/setup.go b/app/middlewares/setup.goindex b9b486e97..acfebcdf7 100644--- a/app/middlewares/setup.go+++ b/app/middlewares/setup.go@@ -53,8 +53,8 @@ func Setup(db *dbx.Database, emailer email.Sender) web.MiddlewareFunc {if trx != nil {trx.Rollback()}- c.Logger().Debugf("Finished Request %s", path)c.Failure(err)+ c.Logger().Debugf("Finished Request %s", path)}}()diff --git a/app/pkg/dbx/dbx.go b/app/pkg/dbx/dbx.goindex adcec1239..51c86b3fb 100644--- a/app/pkg/dbx/dbx.go+++ b/app/pkg/dbx/dbx.go@@ -10,6 +10,7 @@ import ("strings"+ "github.com/getfider/fider/app""github.com/getfider/fider/app/pkg/env""github.com/getfider/fider/app/pkg/log""github.com/mattes/migrate"@@ -63,8 +64,7 @@ func scan(prefix string, data interface{}) map[string]interface{} {s := reflect.ValueOf(data).Elem()- numfield := s.NumField()- for i := 0; i < numfield; i++ {+ for i := 0; i < s.NumField(); i++ {field := s.Field(i)typeField := s.Type().Field(i)tag := typeField.Tag.Get("db")@@ -83,8 +83,7 @@ func scan(prefix string, data interface{}) map[string]interface{} {} else {obj := reflect.New(field.Type().Elem()).Elem()field.Set(obj.Addr())- nestedFields := scan(prefix+tag+"_", field.Interface())- for name, address := range nestedFields {+ for name, address := range scan(prefix+tag+"_", field.Interface()) {fields[name] = address}}@@ -107,11 +106,7 @@ func fill(rows *sql.Rows, data interface{}) error {}}- err := rows.Scan(pointers...)- if err != nil {- return err- }- return nil+ return rows.Scan(pointers...)}func (db Database) load(path string) {@@ -180,10 +175,7 @@ func (trx Trx) Execute(command string, args ...interface{}) error {command = formatCommand(command)trx.logger.Debugf("%s %v", log.Yellow(command), log.Blue(args))_, err := trx.tx.Exec(command, args...)- if err != nil {- return err- }- return nil+ return err}func formatCommand(cmd string) string {@@ -195,7 +187,11 @@ func formatCommand(cmd string) string {// Scalar returns first row and first columnfunc (trx Trx) Scalar(data interface{}, command string, args ...interface{}) error {row := trx.QueryRow(command, args...)- return row.Scan(data)+ err := row.Scan(data)+ if err == sql.ErrNoRows {+ return app.ErrNotFound+ }+ return err}// Get first row and bind to given data@@ -210,7 +206,7 @@ func (trx Trx) Get(data interface{}, command string, args ...interface{}) errorreturn fill(rows, data)}- return sql.ErrNoRows+ return app.ErrNotFound}// QueryIntArray executes given SQL command and return first column as intdiff --git a/app/pkg/dbx/setup.sql b/app/pkg/dbx/setup.sqlindex 2808dfc8f..579e27bcb 100644--- a/app/pkg/dbx/setup.sql+++ b/app/pkg/dbx/setup.sql@@ -8,7 +8,7 @@ INSERT INTO user_providers (user_id, provider, provider_uid, created_on) VALUESINSERT INTO users (name, email, tenant_id, created_on, role) VALUES ('Arya Stark', '[email protected]', 1, now(), 1);INSERT INTO user_providers (user_id, provider, provider_uid, created_on) VALUES (2, 'google', 'GO5678', now());-INSERT INTO tenants (name, subdomain, created_on, cname, invitation, welcome_message, status) VALUES ('Orange Inc.', 'orange', now(), 'feedback.orangeinc.com', '', '', 1);+INSERT INTO tenants (name, subdomain, created_on, cname, invitation, welcome_message, status) VALUES ('Avengers', 'avengers', now(), 'feedback.avengers.com', '', '', 1);INSERT INTO users (name, email, tenant_id, created_on, role) VALUES ('Tony Stark', '[email protected]', 2, now(), 3);INSERT INTO user_providers (user_id, provider, provider_uid, created_on) VALUES (3, 'facebook', 'FB2222', now());diff --git a/app/pkg/log/logger.go b/app/pkg/log/logger.goindex 7baa91e55..6ef8ab3b6 100644--- a/app/pkg/log/logger.go+++ b/app/pkg/log/logger.go@@ -27,6 +27,7 @@ type Logger interface {Warnf(format string, args ...interface{})Errorf(format string, args ...interface{})Error(err error)+ Write(p []byte) (int, error)}// ConsoleLogger output messages to console@@ -73,6 +74,12 @@ func (l *ConsoleLogger) Error(err error) {}}+// Write writes len(p) bytes from p to the underlying data stream.+func (l *ConsoleLogger) Write(p []byte) (int, error) {+ l.Debugf("%s", p)+ return len(p), nil+}+func (l *ConsoleLogger) log(level Level, format string, args ...interface{}) {if level >= l.level {message := ""diff --git a/app/pkg/mock/oauth.go b/app/pkg/mock/oauth.goindex ea0820984..a82ce2d97 100644--- a/app/pkg/mock/oauth.go+++ b/app/pkg/mock/oauth.go@@ -7,7 +7,7 @@ type OAuthService struct{}//GetAuthURL returns authentication url for given providerfunc (p *OAuthService) GetAuthURL(authEndpoint string, provider string, redirect string) string {- return "http://orange.test.fider.io/oauth/token?provider=" + provider + "&redirect=" + redirect+ return "http://avengers.test.fider.io/oauth/token?provider=" + provider + "&redirect=" + redirect}//GetProfile returns user profile based on provider and codediff --git a/app/pkg/mock/setup.go b/app/pkg/mock/setup.goindex b29a1d8f1..423696d10 100644--- a/app/pkg/mock/setup.go+++ b/app/pkg/mock/setup.go@@ -13,8 +13,8 @@ import (// DemoTenant is a mocked tenantvar DemoTenant *models.Tenant-// OrangeTenant is a mocked tenant-var OrangeTenant *models.Tenant+// AvengersTenant is a mocked tenant+var AvengersTenant *models.Tenant// JonSnow is a mocked uservar JonSnow *models.User@@ -50,7 +50,7 @@ func createServices(seed bool) *app.Services {if seed {DemoTenant, _ = services.Tenants.Add("Demonstration", "demo", models.TenantActive)- OrangeTenant, _ = services.Tenants.Add("The Orange Inc.", "orange", models.TenantActive)+ AvengersTenant, _ = services.Tenants.Add("Avengers", "avengers", models.TenantActive)JonSnow = &models.User{Name: "Jon Snow",diff --git a/app/pkg/web/binder_test.go b/app/pkg/web/binder_test.goindex b49d2aa91..6970c9073 100644--- a/app/pkg/web/binder_test.go+++ b/app/pkg/web/binder_test.go@@ -1,8 +1,6 @@package web_testimport (- "net/http/httptest"- "strings""testing""github.com/getfider/fider/app/pkg/web"@@ -11,22 +9,6 @@ import (var binder = web.NewDefaultBinder()-func newGetContext(params web.StringMap) *web.Context {- e := web.New(nil)- res := httptest.NewRecorder()- req := httptest.NewRequest("GET", "/", nil)- ctx := e.NewContext(res, req, params)- return &ctx-}--func newPostContext(params web.StringMap, body string) *web.Context {- e := web.New(nil)- res := httptest.NewRecorder()- req := httptest.NewRequest("POST", "/", strings.NewReader(body))- ctx := e.NewContext(res, req, params)- return &ctx-}-func TestDefaultBinder_FromParams(t *testing.T) {type updateUser struct {Number int `route:"number"`diff --git a/app/pkg/web/context.go b/app/pkg/web/context.goindex 30310edb7..9b09c0cd2 100644--- a/app/pkg/web/context.go+++ b/app/pkg/web/context.go@@ -3,6 +3,7 @@ package webimport ("bytes""encoding/json"+ "fmt""net""net/http""strconv"@@ -120,7 +121,20 @@ func (ctx *Context) Failure(err error) error {if err == app.ErrNotFound {return ctx.NotFound()}- ctx.Logger().Errorf("%s", log.Red(err.Error()))++ url := ctx.BaseURL() + ctx.Request.RequestURI+ tenant := "undefined"+ if ctx.Tenant() != nil {+ tenant = fmt.Sprintf("%s (%d)", ctx.Tenant().Name, ctx.Tenant().ID)+ }++ user := "not signed in"+ if ctx.User() != nil {+ user = fmt.Sprintf("%s (%d)", ctx.User().Name, ctx.User().ID)+ }++ message := fmt.Sprintf("URL: %s\nTenant: %s\nUser: %s\n%s", url, tenant, user, err.Error())+ ctx.Logger().Errorf(log.Red(message))ctx.Render(http.StatusInternalServerError, "500.html", Map{})return err}@@ -247,7 +261,6 @@ func (ctx *Context) ActiveTransaction() *dbx.Trx {}//BaseURL returns base URL as string-//TODO: missing unit testsfunc (ctx *Context) BaseURL() string {protocol := "http"if ctx.Request.TLS != nil {@@ -257,7 +270,6 @@ func (ctx *Context) BaseURL() string {}//TenantBaseURL returns base URL for a given tenant-//TODO: missing unit testsfunc (ctx *Context) TenantBaseURL(tenant *models.Tenant) string {if env.IsSingleHostMode() {return ctx.BaseURL()diff --git a/app/pkg/web/context_test.go b/app/pkg/web/context_test.gonew file mode 100644index 000000000..6e947691f--- /dev/null+++ b/app/pkg/web/context_test.go@@ -0,0 +1,59 @@+package web_test++import (+ "net/http/httptest"+ "os"+ "strings"+ "testing"++ "github.com/getfider/fider/app/models"+ "github.com/getfider/fider/app/pkg/web"+ . "github.com/onsi/gomega"+)++func newGetContext(params web.StringMap) *web.Context {+ e := web.New(nil)+ res := httptest.NewRecorder()+ req := httptest.NewRequest("GET", "http://demo.test.fider.io:3000/some/resource", nil)+ ctx := e.NewContext(res, req, params)+ return &ctx+}++func newPostContext(params web.StringMap, body string) *web.Context {+ e := web.New(nil)+ res := httptest.NewRecorder()+ req := httptest.NewRequest("POST", "http://demo.test.fider.io:3000/some/resource", strings.NewReader(body))+ ctx := e.NewContext(res, req, params)+ return &ctx+}++func TestBaseURL(t *testing.T) {+ RegisterTestingT(t)++ ctx := newGetContext(nil)++ Expect(ctx.BaseURL()).To(Equal("http://demo.test.fider.io:3000"))+}++func TestTenantURL(t *testing.T) {+ RegisterTestingT(t)++ ctx := newGetContext(nil)+ tenant := &models.Tenant{+ ID: 1,+ Subdomain: "lotr",+ }+ Expect(ctx.TenantBaseURL(tenant)).To(Equal("http://lotr.test.fider.io:3000"))+}++func TestTenantURL_SingleTenantMode(t *testing.T) {+ RegisterTestingT(t)+ os.Setenv("HOST_MODE", "single")++ ctx := newGetContext(nil)+ tenant := &models.Tenant{+ ID: 1,+ Subdomain: "lotr",+ }+ Expect(ctx.TenantBaseURL(tenant)).To(Equal("http://demo.test.fider.io:3000"))+}diff --git a/app/pkg/web/engine.go b/app/pkg/web/engine.goindex 6e8a4c477..9393b9cf6 100644--- a/app/pkg/web/engine.go+++ b/app/pkg/web/engine.go@@ -3,6 +3,7 @@ package webimport ("crypto/tls""fmt"+ stdLog "log""net/http""os"@@ -52,8 +53,9 @@ func (e *Engine) Start(address string) {autoSSL := env.GetEnvOrDefault("SSL_AUTO", "")server := &http.Server{- Addr: address,- Handler: e.mux,+ Addr: address,+ Handler: e.mux,+ ErrorLog: stdLog.New(e.logger, "", 0),}var err errordiff --git a/app/pkg/web/renderer.go b/app/pkg/web/renderer.goindex ad55c0a0a..85827a935 100644--- a/app/pkg/web/renderer.go+++ b/app/pkg/web/renderer.go@@ -98,8 +98,15 @@ func (r *Renderer) Render(w io.Writer, name string, data interface{}, ctx *Conte}if ctx.IsAuthenticated() {- m["user"] = ctx.User()- m["email"] = ctx.User().Email+ u := ctx.User()+ m["user"] = &Map{+ "id": u.ID,+ "name": u.Name,+ "email": u.Email,+ "role": u.Role,+ "isAdministrator": u.IsAdministrator(),+ "isCollaborator": u.IsCollaborator(),+ }}return tmpl.Execute(w, m)diff --git a/app/storage/postgres/idea.go b/app/storage/postgres/idea.goindex f119b1ca8..4d7396e53 100644--- a/app/storage/postgres/idea.go+++ b/app/storage/postgres/idea.go@@ -7,7 +7,6 @@ import ("database/sql"- "github.com/getfider/fider/app""github.com/getfider/fider/app/models""github.com/getfider/fider/app/pkg/dbx""github.com/gosimple/slug"@@ -158,10 +157,7 @@ func (s *IdeaStorage) getIdeaQuery(filter string) string {func (s *IdeaStorage) getSingle(query string, args ...interface{}) (*models.Idea, error) {idea := dbIdea{}- err := s.trx.Get(&idea, query, args...)- if err == sql.ErrNoRows {- return nil, app.ErrNotFound- } else if err != nil {+ if err := s.trx.Get(&idea, query, args...); err != nil {return nil, err}diff --git a/app/storage/postgres/idea_test.go b/app/storage/postgres/idea_test.goindex c04f45bf4..04d4408dc 100644--- a/app/storage/postgres/idea_test.go+++ b/app/storage/postgres/idea_test.go@@ -6,7 +6,6 @@ import ("github.com/getfider/fider/app""github.com/getfider/fider/app/models"- "github.com/getfider/fider/app/storage/postgres". "github.com/onsi/gomega")@@ -19,11 +18,9 @@ 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 #1', 'idea-1', 1, 'Description #1', $1, 1, 1, 0, 1)", now)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(trx)- ideas.SetCurrentTenant(demoTenant(tenants))- dbIdeas, err := ideas.GetAll()+ ideas.SetCurrentTenant(demoTenant)+ dbIdeas, err := ideas.GetAll()Expect(err).To(BeNil())Expect(dbIdeas).To(HaveLen(2))@@ -48,14 +45,11 @@ func TestIdeaStorage_AddAndGet(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- tenants := postgres.NewTenantStorage(trx)- ideas := postgres.NewIdeaStorage(trx)- ideas.SetCurrentTenant(demoTenant(tenants))+ ideas.SetCurrentTenant(demoTenant)idea, err := ideas.Add("My new idea", "with this description", 1)Expect(err).To(BeNil())dbIdeaById, err := ideas.GetByID(idea.ID)-Expect(err).To(BeNil())Expect(dbIdeaById.ID).To(Equal(idea.ID))Expect(dbIdeaById.Number).To(Equal(1))@@ -87,11 +81,9 @@ func TestIdeaStorage_GetInvalid(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- tenants := postgres.NewTenantStorage(trx)- ideas := postgres.NewIdeaStorage(trx)- ideas.SetCurrentTenant(demoTenant(tenants))- dbIdea, err := ideas.GetByID(1)+ ideas.SetCurrentTenant(demoTenant)+ dbIdea, err := ideas.GetByID(1)Expect(err).To(Equal(app.ErrNotFound))Expect(dbIdea).To(BeNil())}@@ -100,9 +92,7 @@ func TestIdeaStorage_AddAndReturnComments(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- tenants := postgres.NewTenantStorage(trx)- ideas := postgres.NewIdeaStorage(trx)- ideas.SetCurrentTenant(demoTenant(tenants))+ ideas.SetCurrentTenant(demoTenant)idea, err := ideas.Add("My new idea", "with this description", 1)Expect(err).To(BeNil())@@ -123,16 +113,14 @@ func TestIdeaStorage_AddAndGet_DifferentTenants(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- tenants := postgres.NewTenantStorage(trx)- demoIdeas := postgres.NewIdeaStorage(trx)- demoIdeas.SetCurrentTenant(demoTenant(tenants))- demoIdea, _ := demoIdeas.Add("My new idea", "with this description", 1)+ ideas.SetCurrentTenant(demoTenant)+ demoIdea, _ := ideas.Add("My new idea", "with this description", 1)- orangeIdeas := postgres.NewIdeaStorage(trx)- orangeIdeas.SetCurrentTenant(orangeTenant(tenants))- orangeIdea, _ := orangeIdeas.Add("My other idea", "with other description", 3)+ ideas.SetCurrentTenant(avengersTenant)+ avengersIdea, _ := ideas.Add("My other idea", "with other description", 3)- dbIdea, err := demoIdeas.GetByNumber(1)+ ideas.SetCurrentTenant(demoTenant)+ dbIdea, err := ideas.GetByNumber(1)Expect(err).To(BeNil())Expect(dbIdea.ID).To(Equal(demoIdea.ID))@@ -140,10 +128,11 @@ func TestIdeaStorage_AddAndGet_DifferentTenants(t *testing.T) {Expect(dbIdea.Title).To(Equal("My new idea"))Expect(dbIdea.Slug).To(Equal("my-new-idea"))- dbIdea, err = orangeIdeas.GetByNumber(1)+ ideas.SetCurrentTenant(avengersTenant)+ dbIdea, err = ideas.GetByNumber(1)Expect(err).To(BeNil())- Expect(dbIdea.ID).To(Equal(orangeIdea.ID))+ Expect(dbIdea.ID).To(Equal(avengersIdea.ID))Expect(dbIdea.Number).To(Equal(1))Expect(dbIdea.Title).To(Equal("My other idea"))Expect(dbIdea.Slug).To(Equal("my-other-idea"))@@ -153,15 +142,13 @@ func TestIdeaStorage_Update(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- tenants := postgres.NewTenantStorage(trx)- ideas := postgres.NewIdeaStorage(trx)- ideas.SetCurrentTenant(demoTenant(tenants))+ ideas.SetCurrentTenant(demoTenant)+idea, err := ideas.Add("My new idea", "with this description", 1)Expect(err).To(BeNil())idea, err = ideas.Update(idea.Number, "The new comment", "With the new description")Expect(err).To(BeNil())-Expect(idea.Title).To(Equal("The new comment"))Expect(idea.Description).To(Equal("With the new description"))Expect(idea.Slug).To(Equal("the-new-comment"))@@ -171,23 +158,21 @@ func TestIdeaStorage_AddSupporter(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- tenants := postgres.NewTenantStorage(trx)- users := postgres.NewUserStorage(trx)- users.SetCurrentTenant(demoTenant(tenants))- ideas := postgres.NewIdeaStorage(trx)- ideas.SetCurrentTenant(demoTenant(tenants))- ideas.SetCurrentUser(jonSnow(users))+ users.SetCurrentTenant(demoTenant)+ ideas.SetCurrentTenant(demoTenant)+ ideas.SetCurrentUser(jonSnow)+idea, err := ideas.Add("My new idea", "with this description", 1)Expect(err).To(BeNil())- err = ideas.AddSupporter(idea.Number, aryaStark(users).ID)+ err = ideas.AddSupporter(idea.Number, aryaStark.ID)Expect(err).To(BeNil())dbIdea, err := ideas.GetByNumber(1)Expect(dbIdea.ViewerSupported).To(BeFalse())Expect(dbIdea.TotalSupporters).To(Equal(1))- err = ideas.AddSupporter(idea.Number, jonSnow(users).ID)+ err = ideas.AddSupporter(idea.Number, jonSnow.ID)Expect(err).To(BeNil())dbIdea, err = ideas.GetByNumber(1)@@ -200,9 +185,7 @@ func TestIdeaStorage_AddSupporter_Twice(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- tenants := postgres.NewTenantStorage(trx)- ideas := postgres.NewIdeaStorage(trx)- ideas.SetCurrentTenant(demoTenant(tenants))+ ideas.SetCurrentTenant(demoTenant)idea, _ := ideas.Add("My new idea", "with this description", 1)err := ideas.AddSupporter(idea.Number, 1)@@ -220,9 +203,7 @@ func TestIdeaStorage_RemoveSupporter(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- tenants := postgres.NewTenantStorage(trx)- ideas := postgres.NewIdeaStorage(trx)- ideas.SetCurrentTenant(demoTenant(tenants))+ ideas.SetCurrentTenant(demoTenant)idea, _ := ideas.Add("My new idea", "with this description", 1)err := ideas.AddSupporter(idea.Number, 1)@@ -240,9 +221,7 @@ func TestIdeaStorage_RemoveSupporter_Twice(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- tenants := postgres.NewTenantStorage(trx)- ideas := postgres.NewIdeaStorage(trx)- ideas.SetCurrentTenant(demoTenant(tenants))+ ideas.SetCurrentTenant(demoTenant)idea, _ := ideas.Add("My new idea", "with this description", 1)err := ideas.AddSupporter(idea.Number, 1)@@ -263,9 +242,7 @@ func TestIdeaStorage_SetResponse(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- tenants := postgres.NewTenantStorage(trx)- ideas := postgres.NewIdeaStorage(trx)- ideas.SetCurrentTenant(demoTenant(tenants))+ ideas.SetCurrentTenant(demoTenant)idea, _ := ideas.Add("My new idea", "with this description", 1)err := ideas.SetResponse(idea.Number, "We liked this idea", 1, models.IdeaStarted)@@ -281,9 +258,7 @@ func TestIdeaStorage_SetResponse_KeepOpen(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- tenants := postgres.NewTenantStorage(trx)- ideas := postgres.NewIdeaStorage(trx)- ideas.SetCurrentTenant(demoTenant(tenants))+ ideas.SetCurrentTenant(demoTenant)idea, _ := ideas.Add("My new idea", "with this description", 1)err := ideas.SetResponse(idea.Number, "We liked this idea", 1, models.IdeaOpen)Expect(err).To(BeNil())@@ -293,9 +268,7 @@ func TestIdeaStorage_SetResponse_ChangeText(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- tenants := postgres.NewTenantStorage(trx)- ideas := postgres.NewIdeaStorage(trx)- ideas.SetCurrentTenant(demoTenant(tenants))+ ideas.SetCurrentTenant(demoTenant)idea, _ := ideas.Add("My new idea", "with this description", 1)ideas.SetResponse(idea.Number, "We liked this idea", 1, models.IdeaStarted)idea, _ = ideas.GetByID(idea.ID)@@ -314,9 +287,7 @@ func TestIdeaStorage_AddSupporter_ClosedIdea(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- tenants := postgres.NewTenantStorage(trx)- ideas := postgres.NewIdeaStorage(trx)- ideas.SetCurrentTenant(demoTenant(tenants))+ ideas.SetCurrentTenant(demoTenant)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)@@ -330,9 +301,7 @@ func TestIdeaStorage_RemoveSupporter_ClosedIdea(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- tenants := postgres.NewTenantStorage(trx)- ideas := postgres.NewIdeaStorage(trx)- ideas.SetCurrentTenant(demoTenant(tenants))+ ideas.SetCurrentTenant(demoTenant)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)@@ -347,9 +316,7 @@ func TestIdeaStorage_ListSupportedIdeas(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- tenants := postgres.NewTenantStorage(trx)- ideas := postgres.NewIdeaStorage(trx)- ideas.SetCurrentTenant(demoTenant(tenants))+ ideas.SetCurrentTenant(demoTenant)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)@@ -363,12 +330,8 @@ 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))+ ideas.SetCurrentTenant(demoTenant)+ tags.SetCurrentTenant(demoTenant)idea, _ := ideas.Add("My new idea", "with this description", 1)bug, _ := tags.Add("Bug", "FF0000", true)@@ -381,7 +344,7 @@ func TestIdeaStorage_WithTags(t *testing.T) {Expect(len(idea.Tags)).To(Equal(1))Expect(idea.Tags[0]).To(Equal(int64(bug.ID)))- ideas.SetCurrentUser(jonSnow(users))+ ideas.SetCurrentUser(jonSnow)idea, _ = ideas.GetByID(idea.ID)Expect(len(idea.Tags)).To(Equal(2))Expect(idea.Tags[0]).To(Equal(int64(bug.ID)))diff --git a/app/storage/postgres/setup_test.go b/app/storage/postgres/setup_test.goindex 7823a6c9f..5b1df20d6 100644--- a/app/storage/postgres/setup_test.go+++ b/app/storage/postgres/setup_test.go@@ -10,32 +10,33 @@ import (. "github.com/onsi/gomega")-func orangeTenant(tenants *postgres.TenantStorage) *models.Tenant {- tenant, _ := tenants.GetByDomain("orange")- return tenant-}--func demoTenant(tenants *postgres.TenantStorage) *models.Tenant {- tenant, _ := tenants.GetByDomain("demo")- 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.Trx+var tenants *postgres.TenantStorage+var users *postgres.UserStorage+var ideas *postgres.IdeaStorage+var tags *postgres.TagStorage++var demoTenant *models.Tenant+var avengersTenant *models.Tenant+var gotTenant *models.Tenant+var jonSnow *models.User+var aryaStark *models.User+func SetupDatabaseTest(t *testing.T) {RegisterTestingT(t)trx, _ = db.Begin()++ tenants = postgres.NewTenantStorage(trx)+ users = postgres.NewUserStorage(trx)+ ideas = postgres.NewIdeaStorage(trx)+ tags = postgres.NewTagStorage(trx)++ demoTenant, _ = tenants.GetByDomain("demo")+ avengersTenant, _ = tenants.GetByDomain("avengers")+ jonSnow, _ = users.GetByID(1)+ aryaStark, _ = users.GetByID(2)}func TeardownDatabaseTest() {diff --git a/app/storage/postgres/tag.go b/app/storage/postgres/tag.goindex 0eb3604fc..dccaba23d 100644--- a/app/storage/postgres/tag.go+++ b/app/storage/postgres/tag.go@@ -1,11 +1,9 @@package postgresimport (- "database/sql""fmt""time"- "github.com/getfider/fider/app""github.com/getfider/fider/app/models""github.com/getfider/fider/app/pkg/dbx""github.com/gosimple/slug"@@ -74,9 +72,7 @@ func (s *TagStorage) GetBySlug(slug string) (*models.Tag, error) {tag := dbTag{}err := s.trx.Get(&tag, "SELECT id, name, slug, color, is_public FROM tags WHERE tenant_id = $1 AND slug = $2", s.tenant.ID, slug)- if err == sql.ErrNoRows {- return nil, app.ErrNotFound- } else if err != nil {+ if err != nil {return nil, err}diff --git a/app/storage/postgres/tag_test.go b/app/storage/postgres/tag_test.goindex 83ebd136e..d4103ccf8 100644--- a/app/storage/postgres/tag_test.go+++ b/app/storage/postgres/tag_test.go@@ -4,7 +4,6 @@ import ("testing""github.com/getfider/fider/app"- "github.com/getfider/fider/app/storage/postgres". "github.com/onsi/gomega")@@ -12,9 +11,7 @@ func TestTagStorage_AddAndGet(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- tenants := postgres.NewTenantStorage(trx)- tags := postgres.NewTagStorage(trx)- tags.SetCurrentTenant(demoTenant(tenants))+ tags.SetCurrentTenant(demoTenant)tag, err := tags.Add("Feature Request", "FF0000", true)Expect(err).To(BeNil())Expect(tag.ID).ToNot(BeZero())@@ -33,9 +30,7 @@ func TestTagStorage_AddUpdateAndGet(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- tenants := postgres.NewTenantStorage(trx)- tags := postgres.NewTagStorage(trx)- tags.SetCurrentTenant(demoTenant(tenants))+ tags.SetCurrentTenant(demoTenant)tag, err := tags.Add("Feature Request", "FF0000", true)tag, err = tags.Update(tag.ID, "Bug", "000000", false)@@ -53,9 +48,7 @@ func TestTagStorage_AddDeleteAndGet(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- tenants := postgres.NewTenantStorage(trx)- tags := postgres.NewTagStorage(trx)- tags.SetCurrentTenant(demoTenant(tenants))+ tags.SetCurrentTenant(demoTenant)tag, err := tags.Add("Bug", "FFFFFF", true)err = tags.Delete(tag.ID)@@ -71,13 +64,8 @@ func TestTagStorage_Assign_Unassign(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- tenants := postgres.NewTenantStorage(trx)-- ideas := postgres.NewIdeaStorage(trx)- ideas.SetCurrentTenant(demoTenant(tenants))-- tags := postgres.NewTagStorage(trx)- tags.SetCurrentTenant(demoTenant(tenants))+ ideas.SetCurrentTenant(demoTenant)+ tags.SetCurrentTenant(demoTenant)idea, _ := ideas.Add("My great idea", "with a great description", 2)tag, _ := tags.Add("Bug", "FFFFFF", true)@@ -106,13 +94,8 @@ func TestTagStorage_Assign_DeleteTag(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- tenants := postgres.NewTenantStorage(trx)-- ideas := postgres.NewIdeaStorage(trx)- ideas.SetCurrentTenant(demoTenant(tenants))-- tags := postgres.NewTagStorage(trx)- tags.SetCurrentTenant(demoTenant(tenants))+ ideas.SetCurrentTenant(demoTenant)+ tags.SetCurrentTenant(demoTenant)idea, _ := ideas.Add("My great idea", "with a great description", 2)tag, _ := tags.Add("Bug", "FFFFFF", true)@@ -132,13 +115,10 @@ func TestTagStorage_GetAll(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- tenants := postgres.NewTenantStorage(trx)- users := postgres.NewUserStorage(trx)- users.SetCurrentTenant(demoTenant(tenants))+ users.SetCurrentTenant(demoTenant)+ tags.SetCurrentTenant(demoTenant)+ tags.SetCurrentUser(jonSnow)- tags := postgres.NewTagStorage(trx)- tags.SetCurrentTenant(demoTenant(tenants))- tags.SetCurrentUser(jonSnow(users))tags.Add("Feature Request", "FF0000", true)tags.Add("Bug", "0F0F0F", false)@@ -159,7 +139,7 @@ func TestTagStorage_GetAll(t *testing.T) {Expect(allTags[1].Color).To(Equal("0F0F0F"))Expect(allTags[1].IsPublic).To(BeFalse())- tags.SetCurrentUser(aryaStark(users))+ tags.SetCurrentUser(aryaStark)visitorTags, err := tags.GetAll()Expect(err).To(BeNil())diff --git a/app/storage/postgres/tenant.go b/app/storage/postgres/tenant.goindex 97fe64b61..27a3ba1ac 100644--- a/app/storage/postgres/tenant.go+++ b/app/storage/postgres/tenant.go@@ -4,9 +4,6 @@ import ("strings""time"- "database/sql"-- "github.com/getfider/fider/app""github.com/getfider/fider/app/models""github.com/getfider/fider/app/pkg/dbx""github.com/getfider/fider/app/pkg/env"@@ -101,9 +98,7 @@ func (s *TenantStorage) First() (*models.Tenant, error) {tenant := dbTenant{}err := s.trx.Get(&tenant, "SELECT id, name, subdomain, cname, invitation, welcome_message, status FROM tenants ORDER BY id LIMIT 1")- if err == sql.ErrNoRows {- return nil, app.ErrNotFound- } else if err != nil {+ if err != nil {return nil, err}@@ -115,9 +110,7 @@ func (s *TenantStorage) GetByDomain(domain string) (*models.Tenant, error) {tenant := dbTenant{}err := s.trx.Get(&tenant, "SELECT id, name, subdomain, cname, invitation, welcome_message, status FROM tenants WHERE subdomain = $1 OR cname = $2 ORDER BY cname DESC", extractSubdomain(domain), domain)- if err == sql.ErrNoRows {- return nil, app.ErrNotFound- } else if err != nil {+ if err != nil {return nil, err}@@ -159,9 +152,7 @@ func (s *TenantStorage) FindVerificationByKey(key string) (*models.SignInRequestrequest := dbSignInRequest{}err := s.trx.Get(&request, "SELECT id, email, name, key, created_on, verified_on, expires_on FROM signin_requests WHERE key = $1 LIMIT 1", key)- if err == sql.ErrNoRows {- return nil, app.ErrNotFound- } else if err != nil {+ if err != nil {return nil, err}diff --git a/app/storage/postgres/tenant_test.go b/app/storage/postgres/tenant_test.goindex b5262c134..665e62ea4 100644--- a/app/storage/postgres/tenant_test.go+++ b/app/storage/postgres/tenant_test.go@@ -8,7 +8,6 @@ import ("github.com/getfider/fider/app/models""github.com/getfider/fider/app"- "github.com/getfider/fider/app/storage/postgres". "github.com/onsi/gomega")@@ -16,7 +15,6 @@ func TestTenantStorage_Add_Activate(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- tenants := postgres.NewTenantStorage(trx)tenant, err := tenants.Add("My Domain Inc.", "mydomain", models.TenantInactive)Expect(err).To(BeNil())@@ -44,9 +42,7 @@ func TestTenantStorage_SingleTenant_Add(t *testing.T) {os.Setenv("HOST_MODE", "single")- tenants := postgres.NewTenantStorage(trx)tenant, err := tenants.Add("My Domain Inc.", "mydomain", models.TenantInactive)-Expect(err).To(BeNil())Expect(tenant).NotTo(BeNil())}@@ -55,9 +51,7 @@ func TestTenantStorage_First(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- tenants := postgres.NewTenantStorage(trx)tenant, err := tenants.First()-Expect(err).To(BeNil())Expect(tenant.ID).To(Equal(1))}@@ -68,9 +62,7 @@ func TestTenantStorage_Empty_First(t *testing.T) {trx.Execute("TRUNCATE tenants CASCADE")- tenants := postgres.NewTenantStorage(trx)tenant, err := tenants.First()-Expect(err).To(Equal(app.ErrNotFound))Expect(tenant).To(BeNil())}@@ -79,7 +71,6 @@ func TestTenantStorage_GetByDomain_NotFound(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- tenants := postgres.NewTenantStorage(trx)tenant, err := tenants.GetByDomain("mydomain")Expect(tenant).To(BeNil())@@ -90,12 +81,10 @@ func TestTenantStorage_GetByDomain_Subdomain(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- tenants := postgres.NewTenantStorage(trx)tenant, err := tenants.Add("My Domain Inc.", "mydomain", models.TenantActive)Expect(err).To(BeNil())tenant, err = tenants.GetByDomain("mydomain")-Expect(err).To(BeNil())Expect(tenant.ID).NotTo(BeZero())Expect(tenant.Name).To(Equal("My Domain Inc."))@@ -108,9 +97,7 @@ func TestTenantStorage_IsSubdomainAvailable_ExistingDomain(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- tenants := postgres.NewTenantStorage(trx)available, err := tenants.IsSubdomainAvailable("demo")-Expect(available).To(BeFalse())Expect(err).To(BeNil())}@@ -119,9 +106,7 @@ func TestTenantStorage_IsSubdomainAvailable_NewDomain(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- tenants := postgres.NewTenantStorage(trx)available, err := tenants.IsSubdomainAvailable("thisisanewdomain")-Expect(available).To(BeTrue())Expect(err).To(BeNil())}@@ -130,7 +115,6 @@ func TestTenantStorage_UpdateSettings(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- tenants := postgres.NewTenantStorage(trx)tenant, _ := tenants.GetByDomain("demo")tenants.SetCurrentTenant(tenant)@@ -156,7 +140,6 @@ func TestTenantStorage_SaveFindSet_VerificationKey(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- tenants := postgres.NewTenantStorage(trx)tenant, _ := tenants.GetByDomain("demo")tenants.SetCurrentTenant(tenant)@@ -193,7 +176,6 @@ func TestTenantStorage_FindUnknownVerificationKey(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- tenants := postgres.NewTenantStorage(trx)tenant, _ := tenants.GetByDomain("demo")tenants.SetCurrentTenant(tenant)diff --git a/app/storage/postgres/user.go b/app/storage/postgres/user.goindex 6a965f29c..06369174d 100644--- a/app/storage/postgres/user.go+++ b/app/storage/postgres/user.go@@ -6,7 +6,6 @@ import ("database/sql"- "github.com/getfider/fider/app""github.com/getfider/fider/app/models""github.com/getfider/fider/app/pkg/dbx")@@ -82,11 +81,7 @@ func (s *UserStorage) GetByProvider(tenantID int, provider string, uid string) (var userID intquery := "SELECT user_id FROM user_providers up INNER JOIN users u ON u.id = up.user_id WHERE up.provider = $1 AND up.provider_uid = $2 AND u.tenant_id = $3"if err := s.trx.Scalar(&userID, query, provider, uid, tenantID); err != nil {- if err == sql.ErrNoRows {- return nil, app.ErrNotFound- } else if err != nil {- return nil, err- }+ return nil, err}return s.GetByID(userID)}@@ -130,9 +125,7 @@ func (s *UserStorage) ChangeRole(userID int, role models.Role) error {func getUser(trx *dbx.Trx, filter string, args ...interface{}) (*models.User, error) {user := dbUser{}err := trx.Get(&user, "SELECT id, name, email, tenant_id, role FROM users WHERE "+filter, args...)- if err == sql.ErrNoRows {- return nil, app.ErrNotFound- } else if err != nil {+ if err != nil {return nil, err}diff --git a/app/storage/postgres/user_test.go b/app/storage/postgres/user_test.goindex ae11e6e8d..e3cb22e12 100644--- a/app/storage/postgres/user_test.go+++ b/app/storage/postgres/user_test.go@@ -6,7 +6,6 @@ import ("github.com/getfider/fider/app""github.com/getfider/fider/app/models""github.com/getfider/fider/app/pkg/oauth"- "github.com/getfider/fider/app/storage/postgres". "github.com/onsi/gomega")@@ -14,9 +13,7 @@ func TestUserStorage_GetByID(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- users := postgres.NewUserStorage(trx)user, err := users.GetByID(1)-Expect(err).To(BeNil())Expect(user.ID).To(Equal(int(1)))Expect(user.Tenant.ID).To(Equal(1))@@ -31,9 +28,7 @@ func TestUserStorage_GetByEmail_Error(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- users := postgres.NewUserStorage(trx)user, err := users.GetByEmail(1, "[email protected]")-Expect(user).To(BeNil())Expect(err).NotTo(BeNil())}@@ -42,9 +37,7 @@ func TestUserStorage_GetByEmail(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- users := postgres.NewUserStorage(trx)user, err := users.GetByEmail(1, "[email protected]")-Expect(err).To(BeNil())Expect(user.ID).To(Equal(int(1)))Expect(user.Tenant.ID).To(Equal(1))@@ -59,9 +52,7 @@ func TestUserStorage_GetByProvider(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- users := postgres.NewUserStorage(trx)user, err := users.GetByProvider(1, "facebook", "FB1234")-Expect(err).To(BeNil())Expect(user.ID).To(Equal(int(1)))Expect(user.Tenant.ID).To(Equal(1))@@ -76,9 +67,7 @@ func TestUserStorage_GetByProvider_WrongTenant(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- users := postgres.NewUserStorage(trx)user, err := users.GetByProvider(2, "facebook", "FB1234")-Expect(user).To(BeNil())Expect(err).To(Equal(app.ErrNotFound))}@@ -87,9 +76,7 @@ func TestUserStorage_GetByEmail_WrongTenant(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- users := postgres.NewUserStorage(trx)user, err := users.GetByEmail(2, "[email protected]")-Expect(user).To(BeNil())Expect(err).NotTo(BeNil())}@@ -98,7 +85,6 @@ func TestUserStorage_Register(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- users := postgres.NewUserStorage(trx)user := &models.User{Name: "Rob Stark",Email: "[email protected]",@@ -128,7 +114,6 @@ func TestUserStorage_Register_WhiteSpaceEmail(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- users := postgres.NewUserStorage(trx)user := &models.User{Name: "Rob Stark",Email: " ",@@ -158,7 +143,6 @@ func TestUserStorage_Register_MultipleProviders(t *testing.T) {RETURNING id`).Scan(&tenantID)- users := postgres.NewUserStorage(trx)user := &models.User{Name: "Jon Snow",Email: "[email protected]",@@ -177,8 +161,8 @@ func TestUserStorage_Register_MultipleProviders(t *testing.T) {},},}- err := users.Register(user)+ err := users.Register(user)Expect(err).To(BeNil())Expect(user.ID).NotTo(BeZero())Expect(user.Name).To(Equal("Jon Snow"))@@ -189,7 +173,6 @@ func TestUserStorage_RegisterProvider(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- users := postgres.NewUserStorage(trx)users.RegisterProvider(1, &models.UserProvider{UID: "GO1234",Name: "google",@@ -213,7 +196,6 @@ func TestUserStorage_UpdateSettings(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- users := postgres.NewUserStorage(trx)err := users.Update(1, &models.UpdateUserSettings{Name: "Jon Stark"})Expect(err).To(BeNil())@@ -225,10 +207,7 @@ func TestUserStorage_ChangeRole(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- tenants := postgres.NewTenantStorage(trx)-- users := postgres.NewUserStorage(trx)- users.SetCurrentTenant(demoTenant(tenants))+ users.SetCurrentTenant(demoTenant)err := users.ChangeRole(1, models.RoleVisitor)Expect(err).To(BeNil())@@ -240,10 +219,8 @@ func TestUserStorage_GetAll(t *testing.T) {SetupDatabaseTest(t)defer TeardownDatabaseTest()- tenants := postgres.NewTenantStorage(trx)+ users.SetCurrentTenant(demoTenant)- 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/docs/homepage.png b/etc/homepage.pngsimilarity index 100%rename from docs/homepage.pngrename to etc/homepage.pngdiff --git a/package-lock.json b/package-lock.jsonindex b394f8e0b..70bfbe277 100644--- a/package-lock.json+++ b/package-lock.json@@ -5,9 +5,9 @@"requires": true,"dependencies": {"@types/jquery": {- "version": "3.2.16",- "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.2.16.tgz",- "integrity": "sha512-q2WC02YxQoX2nY1HRKlYGHpGP1saPmD7GN0pwCDlTz35a4eOtJG+aHRlXyjCuXokUukSrR2aXyBhSW3j+jPc0A==",+ "version": "3.2.17",+ "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.2.17.tgz",+ "integrity": "sha512-lt8i2ZqymxxN1JnWSOTPU7Xc3ze32lhASkVdsMd6/SZnb/jtBsmFEoYCBSa0tzGDSyO7ZB+4r4aihj+KTlDs5w==","dev": true},"@types/markdown-it": {@@ -17,21 +17,24 @@"dev": true},"@types/mocha": {- "version": "2.2.44",- "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-2.2.44.tgz",- "integrity": "sha512-k2tWTQU8G4+iSMvqKi0Q9IIsWAp/n8xzdZS4Q4YVIltApoMA00wFBFdlJnmoaK1/z7B0Cy0yPe6GgXteSmdUNw==",- "dev": true+ "version": "2.2.45",+ "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-2.2.45.tgz",+ "integrity": "sha512-tE1SYtNG3I3atRVPELSGN2FJJJtPg3O/G0tycYSyzeDqdAbdLPRH089LhpWYA5M/iHeWHkVZq/b0OVKngcK0Eg==",+ "dev": true,+ "requires": {+ "@types/node": "8.5.2"+ }},"@types/node": {- "version": "8.0.32",- "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.32.tgz",- "integrity": "sha512-n1zzgeQehndikZc/8N4rGSZc99cO6Tb3OInKzvWYniJsT/jet3m57buaBFa5cMeVNFosN4PKZ2LM1y16CFD7Rg==",+ "version": "8.5.2",+ "resolved": "https://registry.npmjs.org/@types/node/-/node-8.5.2.tgz",+ "integrity": "sha512-KA4GKOpgXnrqEH2eCVhiv2CsxgXGQJgV1X0vsGlh+WCnxbeAE1GT44ZsTU1IN5dEeV/gDupKa7gWo08V5IxWVQ==","dev": true},"@types/react": {- "version": "16.0.25",- "resolved": "https://registry.npmjs.org/@types/react/-/react-16.0.25.tgz",- "integrity": "sha512-K79zMwWRzQ2db+nPoKpi3gA/KmLo6ZQgT4iO2QPEUdBO7as0PcgrmU9KHYzIO3V6lbD7gRjOM0/nUch6xBfOvQ==",+ "version": "16.0.31",+ "resolved": "https://registry.npmjs.org/@types/react/-/react-16.0.31.tgz",+ "integrity": "sha512-ft7OuDGUo39e+9LGwUewf2RyEaNBOjWbHUmD5bzjNuSuDabccE/1IuO7iR0dkzLjVUKxTMq69E+FmKfbgBcfbQ==","dev": true},"@types/react-dom": {@@ -40,8 +43,8 @@"integrity": "sha512-xAvZiGhQlEhjStoKktoai8CelXVFBaSN6JX4vy1UQioRba3c2vum1TGzR0thHoEauZtIwzWg8mos0AHu2ne4jw==","dev": true,"requires": {- "@types/node": "8.0.32",- "@types/react": "16.0.25"+ "@types/node": "8.5.2",+ "@types/react": "16.0.31"}},"@types/react-textarea-autosize": {@@ -50,7 +53,7 @@"integrity": "sha512-50W9dx8TlA1Z2ZemtXXCu5docRHRTvdzIMwMAA1PSzeoivPmPguh3PHQ9ibEkK4WczPecrZblvyZCrA2t5KKnA==","dev": true,"requires": {- "@types/react": "16.0.25"+ "@types/react": "16.0.31"}},"@types/selenium-webdriver": {@@ -66,9 +69,9 @@"dev": true},"acorn": {- "version": "5.2.1",- "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.2.1.tgz",- "integrity": "sha512-jG0u7c4Ly+3QkkW18V+NRDN+4bWHdln30NL1ZL2AvFZZmQe/BfopYCtghCKKVBUSetZ4QKcyA0pY6/4Gw8Pv8w==",+ "version": "5.3.0",+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.3.0.tgz",+ "integrity": "sha512-Yej+zOJ1Dm/IMZzzj78OntP/r3zHEaKcyNoU2lAaxPtrseM6rF0xwqoz5Q5ysAiED9hTjI2hgtvLXitlCN1/Ug==","dev": true},"acorn-dynamic-import": {@@ -89,15 +92,15 @@}},"ajv": {- "version": "5.2.3",- "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.3.tgz",- "integrity": "sha1-wG9Zh3jETGsWGrr+NGa4GtGBTtI=",+ "version": "5.5.2",+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",+ "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=","dev": true,"requires": {"co": "4.6.0","fast-deep-equal": "1.0.0",- "json-schema-traverse": "0.3.1",- "json-stable-stringify": "1.0.1"+ "fast-json-stable-stringify": "2.0.0",+ "json-schema-traverse": "0.3.1"}},"ajv-keywords": {@@ -255,9 +258,9 @@"dev": true},"async": {- "version": "2.5.0",- "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz",- "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==",+ "version": "2.6.0",+ "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz",+ "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==","dev": true,"requires": {"lodash": "4.17.4"@@ -288,7 +291,7 @@"dev": true,"requires": {"browserslist": "1.7.7",- "caniuse-db": "1.0.30000744",+ "caniuse-db": "1.0.30000784","normalize-range": "0.1.2","num2fraction": "1.2.2","postcss": "5.2.18",@@ -307,15 +310,6 @@"integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=","dev": true},- "axios": {- "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"- }- },"babel-code-frame": {"version": "6.26.0","resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",@@ -494,8 +488,8 @@"integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=","dev": true,"requires": {- "caniuse-db": "1.0.30000744",- "electron-to-chromium": "1.3.24"+ "caniuse-db": "1.0.30000784",+ "electron-to-chromium": "1.3.30"}},"buffer": {@@ -550,15 +544,15 @@"dev": true,"requires": {"browserslist": "1.7.7",- "caniuse-db": "1.0.30000744",+ "caniuse-db": "1.0.30000784","lodash.memoize": "4.1.2","lodash.uniq": "4.5.0"}},"caniuse-db": {- "version": "1.0.30000744",- "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000744.tgz",- "integrity": "sha1-AHWP991fcTjTShVgjcz3Glllb/4=",+ "version": "1.0.30000784",+ "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000784.tgz",+ "integrity": "sha1-G+lQEtlInHcZB0+BruV9vf/mNhs=","dev": true},"caseless": {@@ -616,9 +610,9 @@}},"chromedriver": {- "version": "2.33.2",- "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-2.33.2.tgz",- "integrity": "sha512-etnQeM8Mqiys50ZB4IiuNqeB1WS2/EKFhVXwkPQ1qjzKMMAJUyrLjaRUcoZoHrbjGscnhBrWkRR+p3zcTGMhDg==",+ "version": "2.34.0",+ "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-2.34.0.tgz",+ "integrity": "sha512-fnumeP3JaPU6F3n8dMo4ZUJHWQSTdLwpwALt5CNzmH4QQkWAoa74IuET/QlfZzOHRi+BoVI6wrg6EwzQI+KaFQ==","dev": true,"requires": {"del": "3.0.0",@@ -659,9 +653,9 @@}},"clone": {- "version": "1.0.2",- "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz",- "integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=",+ "version": "1.0.3",+ "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz",+ "integrity": "sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=","dev": true},"clone-deep": {@@ -688,7 +682,7 @@"integrity": "sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0=","dev": true,"requires": {- "q": "1.5.0"+ "q": "1.5.1"}},"code-point-at": {@@ -703,15 +697,15 @@"integrity": "sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=","dev": true,"requires": {- "clone": "1.0.2",- "color-convert": "1.9.0",+ "clone": "1.0.3",+ "color-convert": "1.9.1","color-string": "0.3.0"}},"color-convert": {- "version": "1.9.0",- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz",- "integrity": "sha1-Gsz5fdc5uYO/mU1W/sj5WFNkG3o=",+ "version": "1.9.1",+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz",+ "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==","dev": true,"requires": {"color-name": "1.1.3"@@ -1008,7 +1002,7 @@"integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=","dev": true,"requires": {- "es5-ext": "0.10.35"+ "es5-ext": "0.10.37"}},"dashdash": {@@ -1030,6 +1024,7 @@"version": "2.6.9","resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz","integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",+ "dev": true,"requires": {"ms": "2.0.0"}@@ -1121,12 +1116,21 @@"jsbn": "0.1.1"}},- "electron-to-chromium": {- "version": "1.3.24",- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.24.tgz",- "integrity": "sha1-m3uIuwXOufoBahd4M8wt3jiPIbY=",+ "electron-releases": {+ "version": "2.1.0",+ "resolved": "https://registry.npmjs.org/electron-releases/-/electron-releases-2.1.0.tgz",+ "integrity": "sha512-cyKFD1bTE/UgULXfaueIN1k5EPFzs+FRc/rvCY5tIynefAPqopQEgjr0EzY+U3Dqrk/G4m9tXSPuZ77v6dL/Rw==","dev": true},+ "electron-to-chromium": {+ "version": "1.3.30",+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.30.tgz",+ "integrity": "sha512-zx1Prv7kYLfc4OA60FhxGbSo4qrEjgSzpo1/37i7l9ltXPYOoQBtjQxY9KmsgfHnBxHlBGXwLlsbt/gub1w5lw==",+ "dev": true,+ "requires": {+ "electron-releases": "2.1.0"+ }+ },"elliptic": {"version": "6.4.0","resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz",@@ -1174,12 +1178,12 @@"integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA="},"errno": {- "version": "0.1.4",- "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz",- "integrity": "sha1-uJbiOp5ei6M4cfyZar02NfyaHH0=",+ "version": "0.1.6",+ "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.6.tgz",+ "integrity": "sha512-IsORQDpaaSwcDP4ZZnHxgE85werpo34VYn1Ud3mq+eUsF593faR8oCZNXrROVkpFu2TsbrNhHin0aUrTsQ9vNw==","dev": true,"requires": {- "prr": "0.0.0"+ "prr": "1.0.1"}},"error-ex": {@@ -1192,9 +1196,9 @@}},"es5-ext": {- "version": "0.10.35",- "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.35.tgz",- "integrity": "sha1-GO6FjOajxFx9eekcFfzKnsVoSU8=",+ "version": "0.10.37",+ "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.37.tgz",+ "integrity": "sha1-DudB0Ui4AGm6J9AgOTdWryV978M=","dev": true,"requires": {"es6-iterator": "2.0.3",@@ -1208,7 +1212,7 @@"dev": true,"requires": {"d": "1.0.0",- "es5-ext": "0.10.35",+ "es5-ext": "0.10.37","es6-symbol": "3.1.1"}},@@ -1219,7 +1223,7 @@"dev": true,"requires": {"d": "1.0.0",- "es5-ext": "0.10.35",+ "es5-ext": "0.10.37","es6-iterator": "2.0.3","es6-set": "0.1.5","es6-symbol": "3.1.1",@@ -1239,7 +1243,7 @@"dev": true,"requires": {"d": "1.0.0",- "es5-ext": "0.10.35",+ "es5-ext": "0.10.37","es6-iterator": "2.0.3","es6-symbol": "3.1.1","event-emitter": "0.3.5"@@ -1252,7 +1256,7 @@"dev": true,"requires": {"d": "1.0.0",- "es5-ext": "0.10.35"+ "es5-ext": "0.10.37"}},"es6-weak-map": {@@ -1262,7 +1266,7 @@"dev": true,"requires": {"d": "1.0.0",- "es5-ext": "0.10.35",+ "es5-ext": "0.10.37","es6-iterator": "2.0.3","es6-symbol": "3.1.1"}@@ -1320,7 +1324,7 @@"dev": true,"requires": {"d": "1.0.0",- "es5-ext": "0.10.35"+ "es5-ext": "0.10.37"}},"events": {@@ -1406,10 +1410,10 @@"integrity": "sha512-bt/LZ4m5Rqt/Crl2HiKuAl/oqg0psx1tsTLkvWbJen1CtD+fftkZhMaQ9HOtY2gWsl2Wq+sABmMVi9z3DhKWQQ==","dev": true,"requires": {- "async": "2.5.0",+ "async": "2.6.0","loader-utils": "1.1.0","schema-utils": "0.3.0",- "webpack-sources": "1.0.2"+ "webpack-sources": "1.1.0"}},"extract-zip": {@@ -1447,6 +1451,12 @@"integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=","dev": true},+ "fast-json-stable-stringify": {+ "version": "2.0.0",+ "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",+ "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",+ "dev": true+ },"fastparse": {"version": "1.1.1","resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.1.tgz",@@ -1477,9 +1487,9 @@}},"file-loader": {- "version": "1.1.5",- "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-1.1.5.tgz",- "integrity": "sha512-RzGHDatcVNpGISTvCpfUfOGpYuSR7HSsSg87ki+wF6rw1Hm0RALPTiAdsxAq1UwLf0RRhbe22/eHK6nhXspiOQ==",+ "version": "1.1.6",+ "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-1.1.6.tgz",+ "integrity": "sha512-873ztuL+/hfvXbLDJ262PGO6XjERnybJu2gW1/5j8HUfxSiFJI9Hj/DhZ50ZGRUxBvuNiazb/cM2rh9pqrxP6Q==","dev": true,"requires": {"loader-utils": "1.1.0",@@ -1532,14 +1542,6 @@"integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=","dev": true},- "follow-redirects": {- "version": "1.2.5",- "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.2.5.tgz",- "integrity": "sha512-lMhwQTryFbG+wYsAIEKC1Kf5IGDlVNnONRogIBllh7LLoV7pNIxW0z9fhjRar9NBql+hd2Y49KboVVNxf6GEfg==",- "requires": {- "debug": "2.6.9"- }- },"for-in": {"version": "1.0.2","resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",@@ -2656,7 +2658,7 @@"integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=","dev": true,"requires": {- "ajv": "5.2.3",+ "ajv": "5.5.2","har-schema": "2.0.0"}},@@ -2790,7 +2792,7 @@"integrity": "sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=","dev": true,"requires": {- "postcss": "6.0.13"+ "postcss": "6.0.15"},"dependencies": {"ansi-styles": {@@ -2799,18 +2801,29 @@"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==","dev": true,"requires": {- "color-convert": "1.9.0"+ "color-convert": "1.9.1"}},"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"+ },+ "dependencies": {+ "supports-color": {+ "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"+ }+ }}},"has-flag": {@@ -2820,14 +2833,14 @@"dev": true},"postcss": {- "version": "6.0.13",- "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.13.tgz",- "integrity": "sha512-nHsrD1PPTMSJDfU+osVsLtPkSP9YGeoOz4FDLN4r1DW4N5vqL1J+gACzTQHsfwIiWG/0/nV4yCzjTMo1zD8U1g==",+ "version": "6.0.15",+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.15.tgz",+ "integrity": "sha512-v/SpyMzLbtkmh45zUdaqLAaqXqzPdSrw8p4cQVO0/w6YiYfpj4k+Wkzhn68qk9br+H+0qfddhdPEVnbmBPfXVQ==","dev": true,"requires": {- "chalk": "2.1.0",+ "chalk": "2.3.0","source-map": "0.6.1",- "supports-color": "4.4.0"+ "supports-color": "5.1.0"}},"source-map": {@@ -2837,9 +2850,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": "5.1.0",+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz",+ "integrity": "sha512-Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ==","dev": true,"requires": {"has-flag": "2.0.0"@@ -2903,21 +2916,11 @@"dev": true},"interpret": {- "version": "1.0.4",- "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.4.tgz",- "integrity": "sha1-ggzdWIuGj/sZGoCVBtbJyPISsbA=",+ "version": "1.1.0",+ "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz",+ "integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=","dev": true},- "inversify": {- "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.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","resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",@@ -2946,9 +2949,10 @@}},"is-buffer": {- "version": "1.1.5",- "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz",- "integrity": "sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw="+ "version": "1.1.6",+ "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",+ "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",+ "dev": true},"is-builtin-module": {"version": "1.0.0",@@ -3014,9 +3018,9 @@}},"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==",+ "version": "2.17.1",+ "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.17.1.tgz",+ "integrity": "sha512-Q2khNw+oBlWuaYvEEHtKSw/pCxD2L5Rc1C+UQme9X6JdRDh7m5D7HkozA0qa3DUkQ6VzCnEm8mVIQPyIRkI5sQ==","dev": true,"requires": {"generate-function": "2.0.0",@@ -3046,13 +3050,13 @@"integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=","dev": true,"requires": {- "is-path-inside": "1.0.0"+ "is-path-inside": "1.0.1"}},"is-path-inside": {- "version": "1.0.0",- "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.0.tgz",- "integrity": "sha1-/AbloWg/vaE95mev9xe7wQpI838=",+ "version": "1.0.1",+ "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",+ "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=","dev": true,"requires": {"path-is-inside": "1.0.2"@@ -3156,9 +3160,9 @@"integrity": "sha1-XE2d5lKvbNCncBVKYxu6ErAVx4c="},"js-base64": {- "version": "2.3.2",- "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.3.2.tgz",- "integrity": "sha512-Y2/+DnfJJXT1/FCwUebUhLWb3QihxiSC42+ctHLGogmW2jPY6LCapMdFZXRvVP2z6qyKW7s6qncE/9gSqZiArw==",+ "version": "2.4.0",+ "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.0.tgz",+ "integrity": "sha512-Wehd+7Pf9tFvGb+ydPm9TjYjV8X1YHOVyG8QyELZxEMqOhemVwGRmoG8iQ/soqI3n8v4xn59zaLxiCJiaaRzKA==","dev": true},"js-tokens": {@@ -3207,15 +3211,6 @@"integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=","dev": true},- "json-stable-stringify": {- "version": "1.0.1",- "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",- "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",- "dev": true,- "requires": {- "jsonify": "0.0.0"- }- },"json-stringify-safe": {"version": "5.0.1","resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",@@ -3228,12 +3223,6 @@"integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=","dev": true},- "jsonify": {- "version": "0.0.0",- "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",- "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",- "dev": true- },"jsonpointer": {"version": "4.0.1","resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",@@ -3253,9 +3242,9 @@}},"jszip": {- "version": "3.1.4",- "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.1.4.tgz",- "integrity": "sha512-z6w8iYIxZ/fcgul0j/OerkYnkomH8BZigvzbxVmr2h5HkZUrPtk2kjYtLkqR9wwQxEP6ecKNoKLsbhd18jfnGA==",+ "version": "3.1.5",+ "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.1.5.tgz",+ "integrity": "sha512-5W8NUaFRFRqTOL7ZDDrx5qWHJyBXy6velVudIzQUSoqAAYqzSh2Z7/m0Rf1QbmQJccegD0r+YZxBjzqoBiEeJQ==","dev": true,"requires": {"core-js": "2.3.0",@@ -3305,7 +3294,7 @@"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=","dev": true,"requires": {- "is-buffer": "1.1.5"+ "is-buffer": "1.1.6"}},"lazy-cache": {@@ -3550,7 +3539,7 @@"integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=","dev": true,"requires": {- "errno": "0.1.4",+ "errno": "0.1.6","readable-stream": "2.3.3"}},@@ -3687,9 +3676,9 @@}},"mocha": {- "version": "4.0.1",- "resolved": "https://registry.npmjs.org/mocha/-/mocha-4.0.1.tgz",- "integrity": "sha512-evDmhkoA+cBNiQQQdSKZa2b9+W2mpLoj50367lhy+Klnx9OV8XlCIhigUnn1gaTFLQCa0kdNhEGDr0hCXOQFDw==",+ "version": "4.1.0",+ "resolved": "https://registry.npmjs.org/mocha/-/mocha-4.1.0.tgz",+ "integrity": "sha512-0RVnjg1HJsXY2YFDoTNzcc1NKhYuXKRrBAG2gDygmJJA136Cs2QlRliZG1mA0ap7cuaT30mw16luAeln+4RiNA==","dev": true,"requires": {"browser-stdout": "1.3.0",@@ -3730,15 +3719,11 @@}}},- "moment": {- "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","resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",- "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="+ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",+ "dev": true},"nan": {"version": "2.8.0",@@ -3816,9 +3801,9 @@}},"node-sass": {- "version": "4.7.1",- "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.7.1.tgz",- "integrity": "sha512-WUG10FNj6E3bXpAy7f3bXVdLVUJuNn8pRbT4oo5ez9Zp5ZfqPFKsVJuDEEUmkpdyGa8P9JwifEr5dhNgZT2FpQ==",+ "version": "4.7.2",+ "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.7.2.tgz",+ "integrity": "sha512-CaV+wLqZ7//Jdom5aUFCpGNoECd7BbNhjuwdsX/LkXBrHl8eb1Wjw4HvWqcFvhr5KuNgAk8i/myf/MQ1YYeroA==","dev": true,"requires": {"async-foreach": "0.1.3",@@ -3897,7 +3882,7 @@"requires": {"chalk": "1.1.3","commander": "2.11.0",- "is-my-json-valid": "2.16.1",+ "is-my-json-valid": "2.17.1","pinkie-promise": "2.0.1"}},@@ -4318,7 +4303,7 @@"dev": true,"requires": {"chalk": "1.1.3",- "js-base64": "2.3.2",+ "js-base64": "2.4.0","source-map": "0.5.7","supports-color": "3.2.3"},@@ -4512,7 +4497,7 @@"integrity": "sha1-thTJcgvmgW6u41+zpfqh26agXds=","dev": true,"requires": {- "postcss": "6.0.13"+ "postcss": "6.0.15"},"dependencies": {"ansi-styles": {@@ -4521,18 +4506,29 @@"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==","dev": true,"requires": {- "color-convert": "1.9.0"+ "color-convert": "1.9.1"}},"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"+ },+ "dependencies": {+ "supports-color": {+ "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"+ }+ }}},"has-flag": {@@ -4542,14 +4538,14 @@"dev": true},"postcss": {- "version": "6.0.13",- "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.13.tgz",- "integrity": "sha512-nHsrD1PPTMSJDfU+osVsLtPkSP9YGeoOz4FDLN4r1DW4N5vqL1J+gACzTQHsfwIiWG/0/nV4yCzjTMo1zD8U1g==",+ "version": "6.0.15",+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.15.tgz",+ "integrity": "sha512-v/SpyMzLbtkmh45zUdaqLAaqXqzPdSrw8p4cQVO0/w6YiYfpj4k+Wkzhn68qk9br+H+0qfddhdPEVnbmBPfXVQ==","dev": true,"requires": {- "chalk": "2.1.0",+ "chalk": "2.3.0","source-map": "0.6.1",- "supports-color": "4.4.0"+ "supports-color": "5.1.0"}},"source-map": {@@ -4559,9 +4555,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": "5.1.0",+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz",+ "integrity": "sha512-Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ==","dev": true,"requires": {"has-flag": "2.0.0"@@ -4576,7 +4572,7 @@"dev": true,"requires": {"css-selector-tokenizer": "0.7.0",- "postcss": "6.0.13"+ "postcss": "6.0.15"},"dependencies": {"ansi-styles": {@@ -4585,18 +4581,29 @@"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==","dev": true,"requires": {- "color-convert": "1.9.0"+ "color-convert": "1.9.1"}},"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"+ },+ "dependencies": {+ "supports-color": {+ "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"+ }+ }}},"has-flag": {@@ -4606,14 +4613,14 @@"dev": true},"postcss": {- "version": "6.0.13",- "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.13.tgz",- "integrity": "sha512-nHsrD1PPTMSJDfU+osVsLtPkSP9YGeoOz4FDLN4r1DW4N5vqL1J+gACzTQHsfwIiWG/0/nV4yCzjTMo1zD8U1g==",+ "version": "6.0.15",+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.15.tgz",+ "integrity": "sha512-v/SpyMzLbtkmh45zUdaqLAaqXqzPdSrw8p4cQVO0/w6YiYfpj4k+Wkzhn68qk9br+H+0qfddhdPEVnbmBPfXVQ==","dev": true,"requires": {- "chalk": "2.1.0",+ "chalk": "2.3.0","source-map": "0.6.1",- "supports-color": "4.4.0"+ "supports-color": "5.1.0"}},"source-map": {@@ -4623,9 +4630,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": "5.1.0",+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz",+ "integrity": "sha512-Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ==","dev": true,"requires": {"has-flag": "2.0.0"@@ -4640,7 +4647,7 @@"dev": true,"requires": {"css-selector-tokenizer": "0.7.0",- "postcss": "6.0.13"+ "postcss": "6.0.15"},"dependencies": {"ansi-styles": {@@ -4649,18 +4656,29 @@"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==","dev": true,"requires": {- "color-convert": "1.9.0"+ "color-convert": "1.9.1"}},"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"+ },+ "dependencies": {+ "supports-color": {+ "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"+ }+ }}},"has-flag": {@@ -4670,14 +4688,14 @@"dev": true},"postcss": {- "version": "6.0.13",- "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.13.tgz",- "integrity": "sha512-nHsrD1PPTMSJDfU+osVsLtPkSP9YGeoOz4FDLN4r1DW4N5vqL1J+gACzTQHsfwIiWG/0/nV4yCzjTMo1zD8U1g==",+ "version": "6.0.15",+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.15.tgz",+ "integrity": "sha512-v/SpyMzLbtkmh45zUdaqLAaqXqzPdSrw8p4cQVO0/w6YiYfpj4k+Wkzhn68qk9br+H+0qfddhdPEVnbmBPfXVQ==","dev": true,"requires": {- "chalk": "2.1.0",+ "chalk": "2.3.0","source-map": "0.6.1",- "supports-color": "4.4.0"+ "supports-color": "5.1.0"}},"source-map": {@@ -4687,9 +4705,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": "5.1.0",+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz",+ "integrity": "sha512-Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ==","dev": true,"requires": {"has-flag": "2.0.0"@@ -4704,7 +4722,7 @@"dev": true,"requires": {"icss-replace-symbols": "1.1.0",- "postcss": "6.0.13"+ "postcss": "6.0.15"},"dependencies": {"ansi-styles": {@@ -4713,18 +4731,29 @@"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==","dev": true,"requires": {- "color-convert": "1.9.0"+ "color-convert": "1.9.1"}},"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"+ },+ "dependencies": {+ "supports-color": {+ "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"+ }+ }}},"has-flag": {@@ -4734,14 +4763,14 @@"dev": true},"postcss": {- "version": "6.0.13",- "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.13.tgz",- "integrity": "sha512-nHsrD1PPTMSJDfU+osVsLtPkSP9YGeoOz4FDLN4r1DW4N5vqL1J+gACzTQHsfwIiWG/0/nV4yCzjTMo1zD8U1g==",+ "version": "6.0.15",+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.15.tgz",+ "integrity": "sha512-v/SpyMzLbtkmh45zUdaqLAaqXqzPdSrw8p4cQVO0/w6YiYfpj4k+Wkzhn68qk9br+H+0qfddhdPEVnbmBPfXVQ==","dev": true,"requires": {- "chalk": "2.1.0",+ "chalk": "2.3.0","source-map": "0.6.1",- "supports-color": "4.4.0"+ "supports-color": "5.1.0"}},"source-map": {@@ -4751,9 +4780,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": "5.1.0",+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz",+ "integrity": "sha512-Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ==","dev": true,"requires": {"has-flag": "2.0.0"@@ -4916,9 +4945,9 @@}},"prr": {- "version": "0.0.0",- "resolved": "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz",- "integrity": "sha1-GoS4WQgyVQFBGFPQCB7j+obikmo=",+ "version": "1.0.1",+ "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",+ "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=","dev": true},"pseudomap": {@@ -4947,9 +4976,9 @@"dev": true},"q": {- "version": "1.5.0",- "resolved": "https://registry.npmjs.org/q/-/q-1.5.0.tgz",- "integrity": "sha1-3QG6ydBtMObyGa7LglPunr3DCPE=",+ "version": "1.5.1",+ "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",+ "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=","dev": true},"qs": {@@ -5005,7 +5034,7 @@"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=","dev": true,"requires": {- "is-buffer": "1.1.5"+ "is-buffer": "1.1.6"}}}@@ -5016,7 +5045,7 @@"integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=","dev": true,"requires": {- "is-buffer": "1.1.5"+ "is-buffer": "1.1.6"}}}@@ -5041,9 +5070,9 @@}},"react": {- "version": "16.1.1",- "resolved": "https://registry.npmjs.org/react/-/react-16.1.1.tgz",- "integrity": "sha512-FQfiFfk2z2Fk87OngNJHT05KyC9DOVn8LPeB7ZX+9u5+yU1JK6o5ozRlU3PeOMr0IFkWNvgn9jU8/IhRxR1F0g==",+ "version": "16.2.0",+ "resolved": "https://registry.npmjs.org/react/-/react-16.2.0.tgz",+ "integrity": "sha512-ZmIomM7EE1DvPEnSFAHZn9Vs9zJl5A9H7el0EGTE6ZbW9FKe/14IYAlPbC8iH25YarEQxZL+E8VW7Mi7kfQrDQ==","requires": {"fbjs": "0.8.16","loose-envify": "1.3.1",@@ -5052,9 +5081,9 @@}},"react-dom": {- "version": "16.1.1",- "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.1.1.tgz",- "integrity": "sha512-q06jiwST8SEPAMIEkAsu7BgynEZtqF87VrTc70XsW7nxVhWEu2Y4MF5UfxxHQO/mNtQHQWP0YcFxmwm9oMrMaQ==",+ "version": "16.2.0",+ "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.2.0.tgz",+ "integrity": "sha512-zpGAdwHVn9K0091d+hr+R0qrjoJ84cIBFL2uU60KvWBPfZ7LPSrfqviTxGHWN0sjPZb2hxWzMexwrvJdKePvjg==","requires": {"fbjs": "0.8.16","loose-envify": "1.3.1",@@ -5167,7 +5196,8 @@"reflect-metadata": {"version": "0.1.10","resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.10.tgz",- "integrity": "sha1-tPg3BEFqytiZiMmxVjXUfgO5NEo="+ "integrity": "sha1-tPg3BEFqytiZiMmxVjXUfgO5NEo=",+ "dev": true},"regenerate": {"version": "1.3.3",@@ -5340,19 +5370,11 @@"integrity": "sha512-c3/Zc+iW+qqDip6kXPYLEgsAu2lf4xz0EZDplB7EmSUMda12U1sGJPetH55B/j9eu0bTtKzKlNPWWyYC7wFNyQ==","dev": true,"requires": {- "async": "2.5.0",+ "async": "2.6.0","clone-deep": "0.3.0","loader-utils": "1.1.0","lodash.tail": "4.1.1","pify": "3.0.0"- },- "dependencies": {- "pify": {- "version": "3.0.0",- "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",- "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",- "dev": true- }}},"sax": {@@ -5367,7 +5389,7 @@"integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=","dev": true,"requires": {- "ajv": "5.2.3"+ "ajv": "5.5.2"}},"scss-tokenizer": {@@ -5376,7 +5398,7 @@"integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=","dev": true,"requires": {- "js-base64": "2.3.2",+ "js-base64": "2.4.0","source-map": "0.4.4"},"dependencies": {@@ -5397,12 +5419,20 @@"integrity": "sha512-WH7Aldse+2P5bbFBO4Gle/nuQOdVwpHMTL6raL3uuBj/vPG07k6uzt3aiahu352ONBr5xXh0hDlM3LhtXPOC4Q==","dev": true,"requires": {- "jszip": "3.1.4",+ "jszip": "3.1.5","rimraf": "2.6.2","tmp": "0.0.30","xml2js": "0.4.19"}},+ "semantic-ui-css": {+ "version": "2.2.12",+ "resolved": "https://registry.npmjs.org/semantic-ui-css/-/semantic-ui-css-2.2.12.tgz",+ "integrity": "sha512-RrA3k6hya+kEMDmVLT38SBTDQD8FgdnFi16eMPuQ1N1xUOoBxKzr+HZASb7Zo3xlMvkYqEWvPIp58Wjl6Zcsfg==",+ "requires": {+ "jquery": "3.2.1"+ }+ },"semver": {"version": "5.4.1","resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",@@ -5454,7 +5484,7 @@"integrity": "sha1-AY7HpM5+OobLkUG+UZ0kyPqpgbU=","dev": true,"requires": {- "is-buffer": "1.1.5"+ "is-buffer": "1.1.6"}}}@@ -5687,11 +5717,6 @@"inherits": "2.0.3"}},- "throttle-debounce": {- "version": "1.0.1",- "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-1.0.1.tgz",- "integrity": "sha1-2tD+Ew+drzcZ/eoz3Dao5rp/MLU="- },"timers-browserify": {"version": "2.0.4","resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.4.tgz",@@ -5756,9 +5781,9 @@}},"ts-loader": {- "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==",+ "version": "3.2.0",+ "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-3.2.0.tgz",+ "integrity": "sha512-4g8BF3gKWBHeM1jAFmMPHofuJlwTUU4iHJ0i3mwXRHwy74RU6VBOgl9kDVMGpapvGcMlVqV5G6v9XmV66Qqd7w==","dev": true,"requires": {"chalk": "2.3.0",@@ -5773,7 +5798,7 @@"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==","dev": true,"requires": {- "color-convert": "1.9.0"+ "color-convert": "1.9.1"}},"chalk": {@@ -5805,9 +5830,9 @@}},"tslib": {- "version": "1.7.1",- "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.7.1.tgz",- "integrity": "sha1-vIAEFkaRkjp5/oN4u+s9ogF1OOw=",+ "version": "1.8.1",+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.8.1.tgz",+ "integrity": "sha1-aUavLR1lGnsYY7Ux1uWvpBqkTqw=","dev": true},"tslint": {@@ -5825,8 +5850,8 @@"minimatch": "3.0.4","resolve": "1.5.0","semver": "5.4.1",- "tslib": "1.7.1",- "tsutils": "2.12.2"+ "tslib": "1.8.1",+ "tsutils": "2.15.0"},"dependencies": {"ansi-styles": {@@ -5835,7 +5860,7 @@"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==","dev": true,"requires": {- "color-convert": "1.9.0"+ "color-convert": "1.9.1"}},"chalk": {@@ -5863,34 +5888,25 @@"requires": {"has-flag": "2.0.0"}- },- "tsutils": {- "version": "2.12.2",- "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.12.2.tgz",- "integrity": "sha1-rVikhl0X7D3bZjG2ylO+FKVlb/M=",- "dev": true,- "requires": {- "tslib": "1.7.1"- }}}},"tslint-react": {- "version": "3.2.0",- "resolved": "https://registry.npmjs.org/tslint-react/-/tslint-react-3.2.0.tgz",- "integrity": "sha1-hR+1BSAcY9A0PFFybmNk9+mtLpk=",+ "version": "3.3.3",+ "resolved": "https://registry.npmjs.org/tslint-react/-/tslint-react-3.3.3.tgz",+ "integrity": "sha512-Lo/s1V1CzV26KN4r+w+VZgFWAUNNyIUDkEM95NQ61kHZ71ClXLc8tTRPy+KBU/Y+Cr/vXVD21ehzKJMKrXeKvg==","dev": true,"requires": {- "tsutils": "2.12.0"+ "tsutils": "2.15.0"}},"tsutils": {- "version": "2.12.0",- "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.12.0.tgz",- "integrity": "sha1-yJKoTI8vjeE/jvMsLFw4tFfM6sY=",+ "version": "2.15.0",+ "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.15.0.tgz",+ "integrity": "sha512-kKb1mSqRMwF0GHKya5/hZsI2m7Flg4ONZDeYu4e6Gx+kYAu86zsLNCHcUmNWhCRaUcKshNI272hOzuaCQDzJ2g==","dev": true,"requires": {- "tslib": "1.7.1"+ "tslib": "1.8.1"}},"tty-browserify": {@@ -5922,9 +5938,9 @@"dev": true},"typescript": {- "version": "2.6.1",- "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.6.1.tgz",- "integrity": "sha1-7znN6ierrAtQAkLWcmq5DgyEZjE=",+ "version": "2.6.2",+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.6.2.tgz",+ "integrity": "sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q=","dev": true},"ua-parser-js": {@@ -5994,7 +6010,7 @@"requires": {"source-map": "0.5.7","uglify-js": "2.8.29",- "webpack-sources": "1.0.2"+ "webpack-sources": "1.1.0"}},"uniq": {@@ -6107,25 +6123,25 @@"integrity": "sha1-ShRyvLuVK9Cpu0A2gB+VTfs5+qw=","dev": true,"requires": {- "async": "2.5.0",+ "async": "2.6.0","chokidar": "1.7.0","graceful-fs": "4.1.11"}},"webpack": {- "version": "3.8.1",- "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.8.1.tgz",- "integrity": "sha512-5ZXLWWsMqHKFr5y0N3Eo5IIisxeEeRAajNq4mELb/WELOR7srdbQk2N5XiyNy2A/AgvlR3AmeBCZJW8lHrolbw==",+ "version": "3.10.0",+ "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.10.0.tgz",+ "integrity": "sha512-fxxKXoicjdXNUMY7LIdY89tkJJJ0m1Oo8PQutZ5rLgWbV5QVKI15Cn7+/IHnRTd3vfKfiwBx6SBqlorAuNA8LA==","dev": true,"requires": {- "acorn": "5.2.1",+ "acorn": "5.3.0","acorn-dynamic-import": "2.0.2",- "ajv": "5.2.3",+ "ajv": "5.5.2","ajv-keywords": "2.1.1",- "async": "2.5.0",+ "async": "2.6.0","enhanced-resolve": "3.4.1","escope": "3.6.0",- "interpret": "1.0.4",+ "interpret": "1.1.0","json-loader": "0.5.7","json5": "0.5.1","loader-runner": "2.3.0",@@ -6138,7 +6154,7 @@"tapable": "0.2.8","uglifyjs-webpack-plugin": "0.4.6","watchpack": "1.4.0",- "webpack-sources": "1.0.2",+ "webpack-sources": "1.1.0","yargs": "8.0.2"},"dependencies": {@@ -6316,9 +6332,9 @@}},"webpack-sources": {- "version": "1.0.2",- "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.2.tgz",- "integrity": "sha512-Y7UddMCv6dGjy81nBv6nuQeFFIt5aalHm7uyDsAsW86nZwfOVPGRr3XMjEQLaT+WKo8rlzhC9qtbJvYKLtAwaw==",+ "version": "1.1.0",+ "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.1.0.tgz",+ "integrity": "sha512-aqYp18kPphgoO5c/+NaUvEeACtZjMESmDChuD3NBciVpah3XpMEU9VAAtIaB1BsfJWWTSdv8Vv1m3T0aRk2dUw==","dev": true,"requires": {"source-list-map": "2.0.0",diff --git a/package.json b/package.jsonindex 171927e10..0bf03680a 100644--- a/package.json+++ b/package.json@@ -4,19 +4,15 @@"repository": "https://github.com/getfider/fider","private": true,"dependencies": {- "axios": "^0.17.1",- "inversify": "^4.5.1",- "inversify-inject-decorators": "^3.0.2","jquery": "^3.2.1","markdown-it": "^8.4.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"+ "semantic-ui-css": "^2.2.12"},"devDependencies": {+ "reflect-metadata": "^0.1.10","@types/jquery": "^3.2.16","@types/markdown-it": "0.0.4","@types/mocha": "^2.2.44",diff --git a/public/assets/styles/main.scss b/public/assets/styles/main.scssindex 457605f27..bc849909a 100644--- a/public/assets/styles/main.scss+++ b/public/assets/styles/main.scss@@ -19,6 +19,7 @@ body {}#environment-info {+ padding: 2px;border-radius: 0px;}diff --git a/public/components/SignInModal.tsx b/public/components/SignInModal.tsxindex 630d00545..5ff1c9a82 100644--- a/public/components/SignInModal.tsx+++ b/public/components/SignInModal.tsx@@ -1,7 +1,12 @@import * as React from 'react';import { SignInControl } from '@fider/components/common';+import { AuthSettings } from '@fider/models';-export class SignInModal extends React.Component<{}, {}> {+interface SignInModalProps {+ auth: AuthSettings;+}++export class SignInModal extends React.Component<SignInModalProps, {}> {public render() {return (<div id="signin-modal" className="ui modal small">@@ -9,7 +14,7 @@ export class SignInModal extends React.Component<{}, {}> {Sign in to raise your voice</div><div className="content">- <SignInControl signInByEmail={true} />+ <SignInControl auth={this.props.auth} signInByEmail={true} /></div></div>);diff --git a/public/components/SupportCounter.tsx b/public/components/SupportCounter.tsxindex 8f78a0025..10254fad3 100644--- a/public/components/SupportCounter.tsx+++ b/public/components/SupportCounter.tsx@@ -1,81 +1,69 @@import * as React from 'react';import { Idea, User, IdeaStatus } from '@fider/models';-import { SignInControl } from '@fider/components/common';--import { inject, injectables } from '@fider/di';-import { Session, IdeaService } from '@fider/services';-import { showSignIn } from '@fider/utils/page';+import { page, actions } from '@fider/services';interface SupportCounterProps {- user?: User;- idea: Idea;+ user?: User;+ idea: Idea;}interface SupportCounterState {- supported: boolean;- total: number;+ supported: boolean;+ total: number;}export class SupportCounter extends React.Component<SupportCounterProps, SupportCounterState> {- @inject(injectables.Session)- public session: Session;- @inject(injectables.IdeaService)- public service: IdeaService;+ constructor(props: SupportCounterProps) {+ super(props);+ this.state = {+ supported: props.idea.viewerSupported,+ total: props.idea.totalSupporters+ };+ }- constructor(props: SupportCounterProps) {- super(props);- this.state = {- supported: props.idea.viewerSupported,- total: props.idea.totalSupporters- };+ public async supportOrUndo() {+ if (!this.props.user) {+ page.showSignIn();+ return;}- public async supportOrUndo() {- if (!this.props.user) {- showSignIn();- return;- }-- const action = this.state.supported ? this.service.removeSupport : this.service.addSupport;+ const action = this.state.supported ? actions.removeSupport : actions.addSupport;- const response = await action(this.props.idea.number);- if (response.ok) {- this.setState((state) => ({- supported: !state.supported,- total: state.total + (state.supported ? -1 : 1)- }));- } else {- // TODO: handle this. we should have a global alert box- }+ const response = await action(this.props.idea.number);+ if (response.ok) {+ this.setState((state) => ({+ supported: !state.supported,+ total: state.total + (state.supported ? -1 : 1)+ }));}+ }- public render() {+ public render() {+ const noTouch = !('ontouchstart' in window);+ const status = IdeaStatus.Get(this.props.idea.status);- const noTouch = !('ontouchstart' in window);- const status = IdeaStatus.Get(this.props.idea.status);+ const vote = (+ <button+ className={`ui button ${noTouch ? 'no-touch' : ''} ${this.state.supported ? 'supported' : ''} `}+ onClick={async () => await this.supportOrUndo()}+ >+ <i className="medium caret up icon" />+ {this.state.total}+ </button>+ );- const vote = (- <button- className={`ui button ${noTouch ? 'no-touch' : ''} ${this.state.supported ? 'supported' : ''} `}- onClick={async () => await this.supportOrUndo()}- >- <i className="medium caret up icon" />- {this.state.total}- </button>- );+ const disabled = (+ <div className="ui button disabled">+ <i className="medium caret up icon" />+ {this.state.total}+ </div>+ );- const disabled = (- <div className="ui button disabled">- <i className="medium caret up icon" />- {this.state.total}- </div>- );-- return (- <div className="support-counter ui">- {status.closed ? disabled : vote}- </div>- );- }+ return (+ <div className="support-counter ui">+ {status.closed ? disabled : vote}+ </div>+ );+ }}diff --git a/public/components/common/Button.tsx b/public/components/common/Button.tsxindex 2b6122b7a..3f4dc9d18 100644--- a/public/components/common/Button.tsx+++ b/public/components/common/Button.tsx@@ -1,82 +1,81 @@import * as React from 'react';interface ButtonProps {- className?: string;- simple?: boolean;- href?: string;- size?: 'mini' | 'tiny' | 'small' | 'large';- onClick?: (event: ButtonClickEvent) => Promise<any>;+ className?: string;+ simple?: boolean;+ href?: string;+ size?: 'mini' | 'tiny' | 'small' | 'large';+ onClick?: (event: ButtonClickEvent) => Promise<any>;}interface ButtonState {- clicked: boolean;+ clicked: boolean;}import './Button.scss';export class ButtonClickEvent {- private shouldEnable = true;- public preventEnable(): void {- this.shouldEnable = false;- }- public canEnable(): boolean {- return this.shouldEnable;- }+ private shouldEnable = true;+ public preventEnable(): void {+ this.shouldEnable = false;+ }+ public canEnable(): boolean {+ return this.shouldEnable;+ }}export class Button extends React.Component<ButtonProps, ButtonState> {- private unmounted: boolean;+ private unmounted: boolean;- public static defaultProps: Partial<ButtonProps> = {- size: 'tiny',+ public static defaultProps: Partial<ButtonProps> = {+ size: 'tiny',+ };++ public constructor(props: ButtonProps) {+ super(props);+ this.state = {+ clicked: false};+ }- public constructor(props: ButtonProps) {- super(props);- this.state = {- clicked: false- };- }+ public componentWillUnmount() {+ this.unmounted = true;+ }- public componentWillUnmount() {- this.unmounted = true;+ public async click(e?: React.MouseEvent<HTMLButtonElement>) {+ if (e) {+ e.preventDefault();+ e.stopPropagation();}- public async click(e?: React.MouseEvent<HTMLButtonElement>) {- if (e) {- e.preventDefault();- e.stopPropagation();- }-- if (this.state.clicked) {- return;- }-- const event = new ButtonClickEvent();- this.setState({ clicked: true });- if (this.props.onClick) {- await this.props.onClick(event);- if (!this.unmounted && event.canEnable()) {- this.setState({ clicked: false });- }- }+ if (this.state.clicked) {+ return;}- public render() {- 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()}>- {this.props.children}- </a>- );- } else {- return (- <button type="button" className={cssClasses} onClick={(e) => this.click(e)}>- {this.props.children}- </button>- );- }+ const event = new ButtonClickEvent();+ this.setState({ clicked: true });+ if (this.props.onClick) {+ await this.props.onClick(event);+ if (!this.unmounted && event.canEnable()) {+ this.setState({ clicked: false });+ }}+ }+ public render() {+ 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()}>+ {this.props.children}+ </a>+ );+ } else {+ return (+ <button type="button" className={cssClasses} onClick={(e) => this.click(e)}>+ {this.props.children}+ </button>+ );+ }+ }}diff --git a/public/components/common/DisplayError.tsx b/public/components/common/DisplayError.tsxindex 2b3a34c11..49175648f 100644--- a/public/components/common/DisplayError.tsx+++ b/public/components/common/DisplayError.tsx@@ -1,5 +1,5 @@import * as React from 'react';-import { Session, Failure } from '@fider/services';+import { Failure } from '@fider/services';const arrayToTag = (items: string[]) => {return items.map((m) => <li key={m}>{m}</li>);diff --git a/public/components/common/EnvironmentInfo.tsx b/public/components/common/EnvironmentInfo.tsxindex 46222a4ce..ee22036a0 100644--- a/public/components/common/EnvironmentInfo.tsx+++ b/public/components/common/EnvironmentInfo.tsx@@ -1,27 +1,24 @@import * as React from 'react';-import { inject, injectables } from '@fider/di';-import { Session } from '@fider/services';+import { AppSettings } from '@fider/models';-export class EnvironmentInfo extends React.Component<{}, {}> {-- @inject(injectables.Session)- public session: Session;+interface EnvironmentInfoProps {+ settings: AppSettings;+}+export class EnvironmentInfo extends React.Component<EnvironmentInfoProps, {}> {public render() {- if (!this.session.isProduction()) {- const settings = this.session.getAppSettings();+ if (this.props.settings.environment !== 'production') {return (<divid="environment-info"className=" ui mini negative message no-border no-margin">- Env: {settings.environment} |- Compiler: {settings.compiler} |- Version: {settings.version} |- BuildTime: {settings.buildTime}+ Env: {this.props.settings.environment} |+ Compiler: {this.props.settings.compiler} |+ Version: {this.props.settings.version} |+ BuildTime: {this.props.settings.buildTime}</div>);}- return <div/>;}}diff --git a/public/components/common/Gravatar.tsx b/public/components/common/Gravatar.tsxindex 96eb9e6a2..cf796a1a5 100644--- a/public/components/common/Gravatar.tsx+++ b/public/components/common/Gravatar.tsx@@ -1,6 +1,6 @@import * as React from 'react';-import { getBaseUrl } from '@fider/utils/page';-import { User } from '@fider/models';+import { page } from '@fider/services';+import { User, UserRole } from '@fider/models';interface GravatarProps {user?: User;@@ -10,8 +10,8 @@ export const Gravatar = (props: GravatarProps) => {const name = props.user ? props.user.name : '_';const id = props.user ? props.user.id : 0;- const url = `${getBaseUrl()}/avatars/50/${id}/${encodeURIComponent(name)}`;- const isCollaborator = props.user ? props.user.role >= 2 : false;+ const url = `${page.getBaseUrl()}/avatars/50/${id}/${encodeURIComponent(name)}`;+ const isCollaborator = props.user ? props.user.role >= UserRole.Collaborator : false;let element: any;return (diff --git a/public/components/common/Header.tsx b/public/components/common/Header.tsxindex d368e4210..ac1a6ba99 100644--- a/public/components/common/Header.tsx+++ b/public/components/common/Header.tsx@@ -1,42 +1,37 @@import * as React from 'react';-import { User, Tenant } from '@fider/models';+import { AppSettings, CurrentUser, Tenant } from '@fider/models';import { SignInControl, EnvironmentInfo, Gravatar } from '@fider/components/common';+import { page } from '@fider/services';-import { inject, injectables } from '@fider/di';-import { Session } from '@fider/services/Session';-import { showSignIn } from '@fider/utils/page';--export class Header extends React.Component<{}, {}> {- private user?: User;- private tenant: Tenant;+interface HeaderProps {+ user?: CurrentUser;+ settings: AppSettings;+ tenant: Tenant;+}- @inject(injectables.Session)- public session: Session;+export class Header extends React.Component<HeaderProps, {}> {- constructor(props: {}) {+ constructor(props: HeaderProps) {super(props);-- this.user = this.session.getCurrentUser();- this.tenant = this.session.get<Tenant>('tenant');}private showModal() {- if (!this.user) {- showSignIn();+ if (!this.props.user) {+ page.showSignIn();}}public render() {- const items = this.user && (+ const items = this.props.user && (<div className="menu"><div className="name header"><i className="user icon" />- {this.user.name}+ {this.props.user.name}</div><a href="/settings" className="item">Settings</a><div className="divider" />{- this.session.isCollaborator() && [+ this.props.user.isCollaborator && [<div key={1} className="header"><i className="setting icon" />Administration@@ -53,15 +48,15 @@ export class Header extends React.Component<{}, {}> {return (<div>- <EnvironmentInfo />+ <EnvironmentInfo settings={this.props.settings}/><div id="menu" className="ui small borderless menu"><div className="ui container"><a href="/" className="header item">- {this.tenant.name}+ {this.props.tenant.name}</a>- <div onClick={() => this.showModal()} className={`ui right simple dropdown item signin ${!this.user && 'subtitle'}`}>- {this.user && <Gravatar user={this.user} />}- {!this.user && 'Sign in'} {this.user && <i className="dropdown icon" />}+ <div onClick={() => this.showModal()} className={`ui right simple dropdown item signin ${!this.props.user && 'subtitle'}`}>+ {this.props.user && <Gravatar user={this.props.user} />}+ {!this.props.user && 'Sign in'} {this.props.user && <i className="dropdown icon" />}{items}</div></div>diff --git a/public/components/common/Moment.tsx b/public/components/common/Moment.tsxindex ae5ef660f..363671da5 100644--- a/public/components/common/Moment.tsx+++ b/public/components/common/Moment.tsx@@ -1,21 +1,83 @@import * as React from 'react';-import * as moment from 'moment';interface MomentText {date: Date | string;}+const templates: { [key: string]: string } = {+ seconds: 'less than a minute',+ minute: 'about a minute',+ minutes: '%d minutes',+ hour: 'about an hour',+ hours: 'about %d hours',+ day: 'a day',+ days: '%d days',+ month: 'about a month',+ months: '%d months',+ year: 'about a year',+ years: '%d years'+};++const template = (t: string, n: number): string => {+ return templates[t] && templates[t].replace(/%d/i, Math.abs(Math.round(n)).toString());+};++const monthNames = [+ 'January', 'February', 'March',+ 'April', 'May', 'June', 'July',+ 'August', 'September', 'October',+ 'November', 'December'+];++function format(date: Date) {++ const day = date.getDate();+ const monthIndex = date.getMonth();+ const year = date.getFullYear();++ return `${monthNames[date.getMonth()]} ${date.getDate()}, ${date.getFullYear()} · ${date.getHours()}:${date.getMinutes()}`;+}++function timeSince(now: Date, date: Date) {++ const seconds = (now.getTime() - date.getTime()) / 1000;+ const minutes = seconds / 60;+ const hours = minutes / 60;+ const days = hours / 24;+ const years = days / 365;++ return (+ seconds < 45 && template('seconds', seconds) ||+ seconds < 90 && template('minute', 1) ||+ minutes < 45 && template('minutes', minutes) ||+ minutes < 90 && template('hour', 1) ||+ hours < 24 && template('hours', hours) ||+ hours < 42 && template('day', 1) ||+ days < 30 && template('days', days) ||+ days < 45 && template('month', 1) ||+ days < 365 && template('months', days / 30) ||+ years < 1.5 && template('year', 1) ||+ template('years', years)+ ) + ' ago';+}+export const Moment = (props: MomentText) => {if (!props.date) {return <span />;}- const m = moment(props.date);- const diff = m.diff(new Date(), 'years');- const display = (diff !== 0) ? m.format('MMMM D, YYYY') : m.fromNow();+ const now = new Date();+ const date = props.date instanceof Date ? props.date : new Date(props.date);++ const diff = (now.getTime() - date.getTime()) / (60 * 60 * 24 * 1000);++ // const m = moment(props.date);+ // const diff = m.diff(new Date(), 'years');+ // const display = (diff !== 0) ? m.format('MMMM D, YYYY') : m.fromNow();+ const display = (diff >= 365) ? format(date) : timeSince(now, date);return (- <span className="date" title={m.format('MMMM D, YYYY')}>+ <span className="date" title={format(date)}>{display}</span>);diff --git a/public/components/common/SignInControl.tsx b/public/components/common/SignInControl.tsxindex 795ff55fd..c3a23e798 100644--- a/public/components/common/SignInControl.tsx+++ b/public/components/common/SignInControl.tsx@@ -1,10 +1,7 @@import * as React from 'react';import { SocialSignInButton, Form, Button } from '@fider/components/common';-import { inject, injectables } from '@fider/di';-import { Session } from '@fider/services/Session';import { AuthSettings } from '@fider/models';-import { TenantService } from '@fider/services';-import { hideSignIn } from '@fider/utils/page';+import { page, actions } from '@fider/services';interface SignInControlState {email: string;@@ -13,17 +10,12 @@ interface SignInControlState {interface SignInControlProps {signInByEmail: boolean;+ auth: AuthSettings;}export class SignInControl extends React.Component<SignInControlProps, SignInControlState> {private form: Form;- @inject(injectables.Session)- public session: Session;-- @inject(injectables.TenantService)- public service: TenantService;-constructor(props: SignInControlProps) {super(props);@@ -34,7 +26,7 @@ export class SignInControl extends React.Component<SignInControlProps, SignInCon}private async signIn() {- const result = await this.service.signIn(this.state.email);+ const result = await actions.signIn(this.state.email);if (result.ok) {this.form.clearFailure();this.setState({ sent: true });@@ -47,30 +39,37 @@ export class SignInControl extends React.Component<SignInControlProps, SignInCon}public render() {- const settings = this.session.get<AuthSettings>('auth');-if (this.state.sent) {return (<div><p>We sent a sign in link to <b>{this.state.email}</b>. <br /> Please check your inbox.</p>- <p><a href="#" onClick={() => hideSignIn()}>OK</a></p>+ <p><a href="#" onClick={() => page.hideSignIn()}>OK</a></p></div>);}- const google = settings.providers.google && (+ const google = this.props.auth.providers.google && (<div className="column">- <SocialSignInButton provider="google" />+ <SocialSignInButton+ oauthEndpoint={this.props.auth.endpoint}+ provider="google"+ /></div>);- const facebook = settings.providers.facebook && (+ const facebook = this.props.auth.providers.facebook && (<div className="column">- <SocialSignInButton provider="facebook" />+ <SocialSignInButton+ oauthEndpoint={this.props.auth.endpoint}+ provider="facebook"+ /></div>);- const github = settings.providers.github && (+ const github = this.props.auth.providers.github && (<div className="column">- <SocialSignInButton provider="github" />+ <SocialSignInButton+ oauthEndpoint={this.props.auth.endpoint}+ provider="github"+ /></div>);const hasOAuth = !!(google || facebook || github);diff --git a/public/components/common/SocialSignInButton.tsx b/public/components/common/SocialSignInButton.tsxindex dd4465cfa..6cac99601 100644--- a/public/components/common/SocialSignInButton.tsx+++ b/public/components/common/SocialSignInButton.tsx@@ -1,11 +1,8 @@import * as React from 'react';--import { inject, injectables } from '@fider/di';-import { Session } from '@fider/services/Session';import { Button } from '@fider/components/common';-import { AuthSettings } from '@fider/models';interface SocialSignInButtonProps {+ oauthEndpoint: string;provider: 'google' | 'facebook' | 'github';}@@ -28,13 +25,8 @@ const providers = {};export class SocialSignInButton extends React.Component<SocialSignInButtonProps, {}> {- @inject(injectables.Session)- public session: Session;-public render() {- const auth = this.session.get<AuthSettings>('auth');-- const href = `${auth.endpoint}/oauth/${this.props.provider}?redirect=${location.href}`;+ const href = `${this.props.oauthEndpoint}/oauth/${this.props.provider}?redirect=${location.href}`;return (<Button size="small" href={href} className={`${providers[this.props.provider].class} fluid`}>diff --git a/public/components/common/UserName.tsx b/public/components/common/UserName.tsxindex 8a0ccb565..d4e495f72 100644--- a/public/components/common/UserName.tsx+++ b/public/components/common/UserName.tsx@@ -1,11 +1,11 @@import * as React from 'react';-import { User } from '@fider/models';+import { User, UserRole } from '@fider/models';interface UserNameProps {user: User;}export const UserName = (props: UserNameProps) => {- const isCollaborator = props.user.role >= 2;+ const isCollaborator = props.user.role >= UserRole.Collaborator;return <span className={`name ${isCollaborator ? 'staff' : ''}`}>{props.user.name}</span>;};diff --git a/public/di.ts b/public/di.tsdeleted file mode 100644index 12e28281e..000000000--- a/public/di.ts+++ /dev/null@@ -1,27 +0,0 @@-import 'reflect-metadata';-import getDecorators from 'inversify-inject-decorators';-import { Container, injectable } from 'inversify';--const container = new Container();--const {- lazyInject,- lazyInjectNamed,- lazyInjectTagged,- lazyMultiInject-} = getDecorators(container);--const injectables = {- Session: Symbol('Session'),- IdeaService: Symbol('IdeaService'),- UserService: Symbol('UserService'),- TenantService: Symbol('TenantService'),- TagService: Symbol('TagService'),-};--export {- container,- injectables,- injectable,- lazyInject as inject-};diff --git a/public/index.tsx b/public/index.tsxindex 469e9b071..b77419984 100644--- a/public/index.tsx+++ b/public/index.tsx@@ -1,74 +1,41 @@import * as React from 'react';import * as ReactDOM from 'react-dom';-+import { resolveRootComponent } from '@fider/router';import { SignInModal } from '@fider/components/SignInModal';-import { AdminHomePage } from '@fider/pages/admin/AdminHomePage';-import { MembersPage } from '@fider/pages/admin/MembersPage';-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';-import { SignUpPage } from '@fider/pages/signup/SignUpPage';-import { container, injectables } from '@fider/di';+import { Header, Footer } from '@fider/components/common';+import { analytics } from '@fider/services';+import * as $ from 'jquery';-import {- Session,- BrowserSession,- IdeaService,- HttpIdeaService,- TenantService,- HttpTenantService,- UserService,- HttpUserService,- TagService,- HttpTagService-} from '@fider/services';+const w = window as any;+w.$ = w.jQuery = $;+import 'semantic-ui-css/semantic.min.js';+import 'semantic-ui-css/semantic.min.css';import '@fider/assets/styles/main.scss';-container.bind<Session>(injectables.Session).toConstantValue(new BrowserSession(window));-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;- regex: RegExp;- component: any;-}--const pathRegex = [- { 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' },- { regex: new RegExp('^\/signin\/verify'), component: CompleteSignInProfilePage, id: 'fdr-complete-signin-profile' },- { regex: new RegExp('^\/settings$'), component: UserSettingsPage, id: 'fdr-user-settings' },-];--const resolveRootComponent = (path: string): PageConfiguration | undefined => {- for (const entry of pathRegex) {- if (entry.regex.test(path)) {- return entry;- }- }+w.props = { };+w.set = (key: string, value: any): void => {+ w.props[key] = value;};+window.addEventListener('error', (evt: ErrorEvent) => {+ analytics.error(evt.error);+});+document.addEventListener('DOMContentLoaded', () => {const root = document.getElementById('root');if (root) {- const config = resolveRootComponent(location.pathname)!;+ const config = resolveRootComponent(location.pathname);ReactDOM.render(<div>- <SignInModal />+ {!w.props.user && React.createElement(SignInModal, w.props)}<div id={config.id}>- {React.createElement(config.component)}+ {config.showHeader && React.createElement(Header, w.props)}+ {React.createElement(config.component, w.props)}+ {React.createElement(Footer, w.props)}</div>- </div>, root+ </div>,+ root);}});diff --git a/public/models/identity.ts b/public/models/identity.tsindex 1c05720af..cad2fe34f 100644--- a/public/models/identity.ts+++ b/public/models/identity.ts@@ -10,7 +10,7 @@ export interface Tenant {export interface User {id: number;name: string;- role: number;+ role: UserRole;}export enum UserRole {@@ -23,5 +23,7 @@ export interface CurrentUser {id: number;name: string;email: string;- role: number;+ role: UserRole;+ isAdministrator: boolean;+ isCollaborator: boolean;}diff --git a/public/models/settings.ts b/public/models/settings.tsindex 7cb087abb..f2e116398 100644--- a/public/models/settings.ts+++ b/public/models/settings.ts@@ -1,19 +1,19 @@export interface AppSettings {- mode: string;- buildTime: string;- version: string;- authEndpoint: string;- environment: string;- googleAnalytics: string;- compiler: string;- domain: string;+ mode: string;+ buildTime: string;+ version: string;+ authEndpoint: string;+ environment: string;+ googleAnalytics: string;+ compiler: string;+ domain: string;}export interface AuthSettings {- endpoint: string;- providers: {- google: boolean,- facebook: boolean,- github: boolean- };+ endpoint: string;+ providers: {+ google: boolean,+ facebook: boolean,+ github: boolean+ };}diff --git a/public/pages/admin/AdminHomePage.tsx b/public/pages/admin/AdminHomePage.tsxindex f8e01f30c..8f4698386 100644--- a/public/pages/admin/AdminHomePage.tsx+++ b/public/pages/admin/AdminHomePage.tsx@@ -1,11 +1,14 @@import * as React from 'react';-import { Tenant } from '@fider/models';-import { setTitle } from '@fider/utils/page';+import { AppSettings, CurrentUser, Tenant } from '@fider/models';+import { Button, Textarea, DisplayError } from '@fider/components/common';+import { actions, page, Failure } from '@fider/services';-import { Header, Footer, Button, Textarea, DisplayError } from '@fider/components/common';-import { inject, injectables } from '@fider/di';-import { Session, TenantService, Failure } from '@fider/services';+interface AdminHomePageProps {+ user: CurrentUser;+ tenant: Tenant;+ settings: AppSettings;+}interface AdminHomePageState {title: string;@@ -15,32 +18,23 @@ interface AdminHomePageState {error?: Failure;}-export class AdminHomePage extends React.Component<{}, AdminHomePageState> {-- @inject(injectables.Session)- public session: Session;-- @inject(injectables.TenantService)- public service: TenantService;+export class AdminHomePage extends React.Component<AdminHomePageProps, AdminHomePageState> {- private tenant: Tenant;-- constructor(props: {}) {+ constructor(props: AdminHomePageProps) {super(props);- this.tenant = this.session.getCurrentTenant();this.state = {- title: this.tenant.name,- cname: this.tenant.cname,- welcomeMessage: this.tenant.welcomeMessage,- invitation: this.tenant.invitation+ title: this.props.tenant.name,+ cname: this.props.tenant.cname,+ welcomeMessage: this.props.tenant.welcomeMessage,+ invitation: this.props.tenant.invitation};- setTitle(`Administration · ${document.title}`);+ page.setTitle(`Administration · ${document.title}`);}private async confirm() {- const result = await this.service.updateSettings(+ const result = await actions.updateTenantSettings(this.state.title,this.state.invitation,this.state.welcomeMessage,@@ -55,103 +49,99 @@ export class AdminHomePage extends React.Component<{}, AdminHomePageState> {public render() {return (- <div>- <Header />- <div className="page ui container">- <h2 className="ui header">- <i className="circular settings icon" />- <div className="content">- General Settings- <div className="sub header">Manage your site settings</div>- </div>- </h2>+ <div className="page ui container">+ <h2 className="ui header">+ <i className="circular settings icon" />+ <div className="content">+ General Settings+ <div className="sub header">Manage your site settings</div>+ </div>+ </h2>- <div className="ui grid">- <div className="eight wide computer sixteen wide mobile column">- <div className="ui form">- <DisplayError fields={['title']} error={this.state.error} />- <div className="field">- <label htmlFor="title">Title</label>- <input- id="title"- type="text"- maxLength={60}- disabled={!this.session.isAdmin()}- value={this.state.title}- onChange={(e) => this.setState({ title: e.currentTarget.value })}- />- <div className="info">- <p>Use this field to change the title that is shown on the top of your page.</p>- </div>- </div>- <DisplayError fields={['welcomeMessage']} error={this.state.error} />- <div className="field">- <label htmlFor="welcome-message">Welcome Message</label>- <Textarea- id="welcome-message"- disabled={!this.session.isAdmin()}- onChange={(e) => this.setState({ welcomeMessage: e.currentTarget.value })}- value={this.state.welcomeMessage}- />- <div className="info">- <p>Use this space to change message of your initial page.</p>- <p>Common use case for this area is a brief description of what is your company/product, why you created this space and how the visitors can collaborate.</p>- <p>This field is powered by Commonmark. You can style and add links to your message. Learn more at <a target="_blank" href="http://commonmark.org/help/">http://commonmark.org/help/</a>.</p>- </div>- </div>- <DisplayError fields={['invitation']} error={this.state.error} />- <div className="field">- <label htmlFor="invitation">Invitation</label>+ <div className="ui grid">+ <div className="eight wide computer sixteen wide mobile column">+ <div className="ui form">+ <DisplayError fields={['title']} error={this.state.error} />+ <div className="field">+ <label htmlFor="title">Title</label>+ <input+ id="title"+ type="text"+ maxLength={60}+ disabled={!this.props.user.isAdministrator}+ value={this.state.title}+ onChange={(e) => this.setState({ title: e.currentTarget.value })}+ />+ <div className="info">+ <p>Use this field to change the title that is shown on the top of your page.</p>+ </div>+ </div>+ <DisplayError fields={['welcomeMessage']} error={this.state.error} />+ <div className="field">+ <label htmlFor="welcome-message">Welcome Message</label>+ <Textarea+ id="welcome-message"+ disabled={!this.props.user.isAdministrator}+ onChange={(e) => this.setState({ welcomeMessage: e.currentTarget.value })}+ value={this.state.welcomeMessage}+ />+ <div className="info">+ <p>Use this space to change message of your initial page.</p>+ <p>Common use case for this area is a brief description of what is your company/product, why you created this space and how the visitors can collaborate.</p>+ <p>This field is powered by Commonmark. You can style and add links to your message. Learn more at <a target="_blank" href="http://commonmark.org/help/">http://commonmark.org/help/</a>.</p>+ </div>+ </div>+ <DisplayError fields={['invitation']} error={this.state.error} />+ <div className="field">+ <label htmlFor="invitation">Invitation</label>+ <input+ id="invitation"+ type="text"+ maxLength={60}+ disabled={!this.props.user.isAdministrator}+ value={this.state.invitation}+ onChange={(e) => this.setState({ invitation: e.currentTarget.value })}+ />+ <div className="info">+ <p>This is your customized message to invite visitors to share their ideas and suggestions.</p>+ </div>+ </div>+ {+ !page.isSingleHostMode() && [+ <DisplayError key={1} fields={['cname']} error={this.state.error} />,+ <div key={2} className="field">+ <label htmlFor="cname">Custom Domain</label><input- id="invitation"- type="text"- maxLength={60}- disabled={!this.session.isAdmin()}- value={this.state.invitation}- onChange={(e) => this.setState({ invitation: e.currentTarget.value })}+ id="cname"+ type="text"+ placeholder="feedback.yourcompany.com"+ maxLength={100}+ disabled={!this.props.user.isAdministrator}+ value={this.state.cname}+ onChange={(e) => this.setState({ cname: e.currentTarget.value })}/><div className="info">- <p>This is your customized message to invite visitors to share their ideas and suggestions.</p>+ {+ this.state.cname ? [+ <p key={0}>Enter the following record into your DNS zone records:</p>,+ <p key={1}><strong>{this.state.cname}</strong> CNAME <strong>{this.props.tenant.subdomain}{this.props.settings.domain}</strong></p>,+ <p key={2}>Please note that it may take up to 72 hours for the change to take effect worldwide due to DNS propagation.</p>+ ] :+ <p>Custom domains allow you to access your app via your own domain name (for example, <code>feedback.yourcomany.com</code>).</p>+ }</div></div>- {- !this.session.isSingleHostMode() && [- <DisplayError key={1} fields={['cname']} error={this.state.error} />,- <div key={2} className="field">- <label htmlFor="cname">Custom Domain</label>- <input- id="cname"- type="text"- placeholder="feedback.yourcompany.com"- maxLength={100}- disabled={!this.session.isAdmin()}- value={this.state.cname}- onChange={(e) => this.setState({ cname: e.currentTarget.value })}- />- <div className="info">- {- this.state.cname ? [- <p key={0}>Enter the following record into your DNS zone records:</p>,- <p key={1}><strong>{this.state.cname}</strong> CNAME <strong>{this.session.getCurrentTenant().subdomain}{this.session.getAppSettings().domain}</strong></p>,- <p key={2}>Please note that it may take up to 72 hours for the change to take effect worldwide due to DNS propagation.</p>- ] :- <p>Custom domains allow you to access your app via your own domain name (for example, <code>feedback.yourcomany.com</code>).</p>- }- </div>- </div>- ]- }- {- this.session.isAdmin() &&- <div className="field">- <Button className="positive" size="tiny" onClick={async () => await this.confirm()}>Confirm</Button>- </div>- }+ ]+ }+ {+ this.props.user.isAdministrator &&+ <div className="field">+ <Button className="positive" size="tiny" onClick={async () => await this.confirm()}>Confirm</Button></div>- </div>+ }</div></div>- <Footer />+ </div></div>);}diff --git a/public/pages/admin/ManageTagsPage/ManageTagsPage.tsx b/public/pages/admin/ManageTagsPage/ManageTagsPage.tsxindex 920e6429a..1e75e70a3 100644--- a/public/pages/admin/ManageTagsPage/ManageTagsPage.tsx+++ b/public/pages/admin/ManageTagsPage/ManageTagsPage.tsx@@ -1,12 +1,15 @@import * as React from 'react';-import { Header, Footer, Button, Gravatar, UserName } from '@fider/components/common';+import { 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';+import { actions, Failure } from '@fider/services';++interface ManageTagsPageProps {+ user: CurrentUser;+ tags: Tag[];+}interface ManageTagsPageState {isAdding: boolean;@@ -17,23 +20,18 @@ interface ManageTagsPageState {import './ManageTagsPage.scss';-export class ManageTagsPage extends React.Component<{}, ManageTagsPageState> {- @inject(injectables.Session)- public session: Session;+export class ManageTagsPage extends React.Component<ManageTagsPageProps, ManageTagsPageState> {- @inject(injectables.TagService)- public tagService: TagService;-- constructor(props: {}) {+ constructor(props: ManageTagsPageProps) {super(props);this.state = {isAdding: false,- allTags: this.session.get<Tag[]>('tags') || []+ allTags: this.props.tags};}private async saveNewTag(data: TagFormState): Promise<Failure | undefined> {- const result = await this.tagService.add(data.name, data.color, data.isPublic);+ const result = await actions.createTag(data.name, data.color, data.isPublic);if (result.ok) {this.setState({isAdding: false,@@ -45,7 +43,7 @@ export class ManageTagsPage extends React.Component<{}, ManageTagsPageState> {}private async updateTag(tag: Tag, data: TagFormState): Promise<Failure | undefined> {- const result = await this.tagService.update(tag.slug, data.name, data.color, data.isPublic);+ const result = await actions.updateTag(tag.slug, data.name, data.color, data.isPublic);if (result.ok) {tag.name = result.data.name;tag.slug = result.data.slug;@@ -60,7 +58,7 @@ export class ManageTagsPage extends React.Component<{}, ManageTagsPageState> {}private async deleteTag(tag: Tag) {- const result = await this.tagService.delete(tag.slug);+ const result = await actions.deleteTag(tag.slug);const idx = this.state.allTags.indexOf(tag);if (result.ok) {this.setState({@@ -113,7 +111,7 @@ export class ManageTagsPage extends React.Component<{}, ManageTagsPageState> {<div key={t.id} className="item"><ShowTag tag={t} />{- this.session.isAdmin() && [+ this.props.user.isAdministrator && [<Buttonkey={0}simple={true}@@ -138,43 +136,39 @@ export class ManageTagsPage extends React.Component<{}, ManageTagsPageState> {);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="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>- <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>+ {+ this.props.user.isAdministrator && (+ 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>- <Footer />+ </div>+</div>);}diff --git a/public/pages/admin/MembersPage.tsx b/public/pages/admin/MembersPage.tsxindex 2ee5c7bd6..2d1c67666 100644--- a/public/pages/admin/MembersPage.tsx+++ b/public/pages/admin/MembersPage.tsx@@ -1,40 +1,32 @@import * as React from 'react';-import { Header, Footer, Button, Gravatar, UserName } from '@fider/components/common';-+import { Button, Gravatar, UserName } from '@fider/components/common';import { User, CurrentUser, UserRole } from '@fider/models';--import { inject, injectables } from '@fider/di';-import { Session, TenantService } from '@fider/services';+import { actions } from '@fider/services';interface MembersPageState {- administrators: User[];- collaborators: User[];- visitors: User[];- filteredNewAdministrators: User[];- filteredNewCollaborators: User[];- newAdministratorFilter: string;- newCollaboratorFilter: string;+ administrators: User[];+ collaborators: User[];+ visitors: User[];+ filteredNewAdministrators: User[];+ filteredNewCollaborators: User[];+ newAdministratorFilter: string;+ newCollaboratorFilter: string;}-export class MembersPage extends React.Component<{}, MembersPageState> {- private allUsers: User[];- private currentUser: CurrentUser;-- @inject(injectables.Session)- public session: Session;+interface MembersPageProps {+ user: CurrentUser;+ users: User[];+}- @inject(injectables.TenantService)- public tenantService: TenantService;+export class MembersPage extends React.Component<MembersPageProps, MembersPageState> {- constructor(props: {}) {+ constructor(props: MembersPageProps) {super(props);- this.allUsers = this.session.get<User[]>('users') || [];- this.currentUser = this.session.getCurrentUser()!;this.state = this.groupUsers();}private async changeRole(user: User, role: UserRole): Promise<any> {- const response = await this.tenantService.changeRole(user.id, role);+ const response = await actions.changeUserRole(user.id, role);if (response.ok) {user.role = role;this.setState(this.groupUsers());@@ -42,7 +34,7 @@ export class MembersPage extends React.Component<{}, MembersPageState> {}private groupUsers(): MembersPageState {- const usersByRole = this.allUsers.reduce<{ [key: number]: User[] }>((groups, x) => {+ const usersByRole = this.props.users.reduce<{ [key: number]: User[] }>((groups, x) => {groups[x.role] = [ x ].concat(groups[x.role] || []);return groups;}, {});@@ -59,7 +51,7 @@ export class MembersPage extends React.Component<{}, MembersPageState> {}private showUser(user: User, role: UserRole, addable: boolean, removable: boolean) {- if (user.id === this.currentUser.id || this.currentUser.role !== UserRole.Administrator) {+ if (user.id === this.props.user.id || this.props.user.role !== UserRole.Administrator) {removable = false;}@@ -108,85 +100,81 @@ export class MembersPage extends React.Component<{}, MembersPageState> {public render() {return (- <div>- <Header />- <div className="page ui container">- <h2 className="ui header">- <i className="circular users icon" />- <div className="content">- Members- <div className="sub header">Manage your account administrators and collaborators.</div>- </div>- </h2>+ <div className="page ui container">+ <h2 className="ui header">+ <i className="circular users icon" />+ <div className="content">+ Members+ <div className="sub header">Manage your account administrators and collaborators.</div>+ </div>+ </h2>- <div className="ui grid">+ <div className="ui grid">- <div className="eight wide computer sixteen wide mobile column">- <div className="ui segment">- <h4 className="ui header">Administrators</h4>- <p className="info">Administrators have full access to edit and manage content, permissions and settings.</p>+ <div className="eight wide computer sixteen wide mobile column">+ <div className="ui segment">+ <h4 className="ui header">Administrators</h4>+ <p className="info">Administrators have full access to edit and manage content, permissions and settings.</p>+ <div className="ui middle aligned very relaxed selection list">+ {this.state.administrators.map((x) => this.showUser(x, UserRole.Administrator, false, true))}+ </div>+ {+ this.props.user.role === UserRole.Administrator &&+ <div className="ui mini form">+ <p>Add new administrator</p>+ <div className="mini field">+ <input+ type="text"+ value={this.state.newAdministratorFilter}+ onChange={(x) => this.filterVisitors('administrator', x.currentTarget.value)}+ placeholder="Search users by name"+ />+ </div><div className="ui middle aligned very relaxed selection list">- {this.state.administrators.map((x) => this.showUser(x, UserRole.Administrator, false, true))}+ {this.state.filteredNewAdministrators.map((x) => this.showUser(x, UserRole.Administrator, true, false))}</div>{- this.currentUser.role === UserRole.Administrator &&- <div className="ui mini form">- <p>Add new administrator</p>- <div className="mini field">- <input- type="text"- value={this.state.newAdministratorFilter}- onChange={(x) => this.filterVisitors('administrator', x.currentTarget.value)}- placeholder="Search users by name"- />- </div>- <div className="ui middle aligned very relaxed selection list">- {this.state.filteredNewAdministrators.map((x) => this.showUser(x, UserRole.Administrator, true, false))}- </div>- {- this.state.newAdministratorFilter &&- this.state.filteredNewAdministrators.length === 0 &&- <p className="info">No users to show.</p>- }- </div>+ this.state.newAdministratorFilter &&+ this.state.filteredNewAdministrators.length === 0 &&+ <p className="info">No users to show.</p>}</div>- </div>+ }+ </div>+ </div>- <div className="eight wide computer sixteen wide mobile column">- <div className="ui segment">- <h4 className="ui header">Collaborators</h4>- <p className="info">Collaborators can edit and manage content, but not permissions and settings.</p>+ <div className="eight wide computer sixteen wide mobile column">+ <div className="ui segment">+ <h4 className="ui header">Collaborators</h4>+ <p className="info">Collaborators can edit and manage content, but not permissions and settings.</p>+ <div className="ui middle aligned very relaxed selection list">+ {this.state.collaborators.map((x) => this.showUser(x, UserRole.Collaborator, false, true))}+ </div>+ {+ this.props.user.role === UserRole.Administrator &&+ <div className="ui mini form">+ <p>Add new collaborator</p>+ <div className="mini field">+ <input+ type="text"+ value={this.state.newCollaboratorFilter}+ onChange={(x) => this.filterVisitors('collaborator', x.currentTarget.value)}+ placeholder="Search users by name"+ />+ </div><div className="ui middle aligned very relaxed selection list">- {this.state.collaborators.map((x) => this.showUser(x, UserRole.Collaborator, false, true))}+ {this.state.filteredNewCollaborators.map((x) => this.showUser(x, UserRole.Collaborator, true, false))}</div>{- this.currentUser.role === UserRole.Administrator &&- <div className="ui mini form">- <p>Add new collaborator</p>- <div className="mini field">- <input- type="text"- value={this.state.newCollaboratorFilter}- onChange={(x) => this.filterVisitors('collaborator', x.currentTarget.value)}- placeholder="Search users by name"- />- </div>- <div className="ui middle aligned very relaxed selection list">- {this.state.filteredNewCollaborators.map((x) => this.showUser(x, UserRole.Collaborator, true, false))}- </div>- {- this.state.newCollaboratorFilter &&- this.state.filteredNewCollaborators.length === 0 &&- <p className="info">No users to show.</p>- }- </div>+ this.state.newCollaboratorFilter &&+ this.state.filteredNewCollaborators.length === 0 &&+ <p className="info">No users to show.</p>}</div>- </div>+ }</div></div>- <Footer />+ </div></div>);}diff --git a/public/pages/signup/SignUpPage.tsx b/public/pages/signup/SignUpPage.tsxindex d4052ae5d..d455b980a 100644--- a/public/pages/signup/SignUpPage.tsx+++ b/public/pages/signup/SignUpPage.tsx@@ -1,22 +1,22 @@import * as React from 'react';-import { SignInControl, Footer, Button, EnvironmentInfo, Gravatar, DisplayError } from '@fider/components/common';-import { AppSettings } from '@fider/models';-import { setTitle, getQueryString } from '@fider/utils/page';-import { decode } from '@fider/utils/jwt';-const td = require('throttle-debounce');const logo = require('@fider/assets/images/logo-small.png');-import { inject, injectables } from '@fider/di';-import { Session, TenantService, Failure } from '@fider/services';-import { showModal } from '@fider/utils/page';+import { SignInControl, Button, DisplayError } from '@fider/components/common';+import { AuthSettings, AppSettings } from '@fider/models';+import { jwt, page, actions, Failure } from '@fider/services';import './SignUpPage.scss';interface OAuthUser {- token: string;- name: string;- email: string;+ token: string;+ name: string;+ email: string;+}++interface SignUpPageProps {+ settings: AppSettings;+ auth: AuthSettings;}interface SignUpPageState {@@ -32,17 +32,10 @@ interface SignUpPageState {};}-export class SignUpPage extends React.Component<{}, SignUpPageState> {- private settings: AppSettings;+export class SignUpPage extends React.Component<SignUpPageProps, SignUpPageState> {private user: OAuthUser;- @inject(injectables.Session)- public session: Session;-- @inject(injectables.TenantService)- public service: TenantService;-- constructor(props: {}) {+ constructor(props: SignUpPageProps) {super(props);this.state = {submitted: false,@@ -50,14 +43,11 @@ export class SignUpPage extends React.Component<{}, SignUpPageState> {subdomain: { available: false }};- this.settings = this.session.getAppSettings();- this.checkAvailability = td.debounce(300, this.checkAvailability);-- setTitle(this.session.isSingleHostMode() ? 'Installation · Fider' : 'Sign up · Fider');+ page.setTitle(page.isSingleHostMode() ? 'Installation · Fider' : 'Sign up · Fider');- const token = getQueryString('token');+ const token = page.getQueryString('token');if (token) {- const data = decode(token);+ const data = jwt.decode(token);if (data) {this.user = {token,@@ -70,12 +60,12 @@ export class SignUpPage extends React.Component<{}, SignUpPageState> {public componentDidUpdate() {if (this.state.submitted) {- showModal('#submitted-modal', { closable: false });+ page.showModal('#submitted-modal', { closable: false });}}private async confirm() {- const result = await this.service.create({+ const result = await actions.createTenant({token: this.user && this.user.token,tenantName: this.state.tenantName,subdomain: this.state.subdomain.value,@@ -85,10 +75,10 @@ export class SignUpPage extends React.Component<{}, SignUpPageState> {if (result.ok) {if (result.data.token) {- if (this.session.isSingleHostMode()) {+ if (page.isSingleHostMode()) {location.reload();} else {- let baseUrl = `${location.protocol}//${this.state.subdomain.value}${this.settings.domain}`;+ let baseUrl = `${location.protocol}//${this.state.subdomain.value}${this.props.settings.domain}`;if (location.port) {baseUrl = `${baseUrl}:${location.port}`;}@@ -104,7 +94,7 @@ export class SignUpPage extends React.Component<{}, SignUpPageState> {}private async checkAvailability(subdomain: string) {- const result = await this.service.checkAvailability(subdomain);+ const result = await actions.checkAvailability(subdomain);this.setState({subdomain: {@@ -126,89 +116,85 @@ export class SignUpPage extends React.Component<{}, SignUpPageState> {);return (- <div>- <EnvironmentInfo />- <div className="page ui container">- {modal}- <img className="logo" src={logo} />-- <h3 className="ui header">1. Who are you?</h3>- <DisplayError fields={['token']} error={this.state.error} />-- {- this.user ?- <div>- <p>- Hello, - <b>{this.user.name}</b> {this.user.email && `(${this.user.email})`}- </p>- </div> :- <div>- <p>We need to identify you to setup your new Fider account.</p>- <SignInControl signInByEmail={false} />- <div className="ui form">- <DisplayError fields={['name', 'email']} error={this.state.error} />- <div className="fluid field">- <input id="name" onChange={(e) => this.setState({ name: e.currentTarget.value })} type="text" placeholder="your name" className="small" />- </div>- <div className="fluid field">- <input id="email" onChange={(e) => this.setState({ email: e.currentTarget.value })} type="text" placeholder="[email protected]" className="small" />- </div>+ <div className="page ui container">+ {modal}+ <img className="logo" src={logo} />++ <h3 className="ui header">1. Who are you?</h3>+ <DisplayError fields={['token']} error={this.state.error} />++ {+ this.user ?+ <div>+ <p>+ Hello, + <b>{this.user.name}</b> {this.user.email && `(${this.user.email})`}+ </p>+ </div> :+ <div>+ <p>We need to identify you to setup your new Fider account.</p>+ <SignInControl auth={this.props.auth} signInByEmail={false} />+ <div className="ui form">+ <DisplayError fields={['name', 'email']} error={this.state.error} />+ <div className="fluid field">+ <input id="name" onChange={(e) => this.setState({ name: e.currentTarget.value })} type="text" placeholder="your name" className="small" />+ </div>+ <div className="fluid field">+ <input id="email" onChange={(e) => this.setState({ email: e.currentTarget.value })} type="text" placeholder="[email protected]" className="small" /></div></div>- }+ </div>+ }- <div className="ui section divider" />+ <div className="ui section divider" />- <h3 className="ui header">2. What is this Feedback Forum for?</h3>+ <h3 className="ui header">2. What is this Feedback Forum for?</h3>- <DisplayError fields={['tenantName', 'subdomain']} error={this.state.error} />- <div className="ui form">- <div className="fluid field">- <input- id="tenantName"- type="text"- placeholder="your company or product name"- maxLength={60}- onChange={(e) => this.setState({ tenantName: e.currentTarget.value })}- />- </div>- {- !this.session.isSingleHostMode() && <div className="fluid field">- <div className="ui right labeled input">- <input- id="subdomain"- type="text"- maxLength={40}- placeholder="subdomain"- onChange={(e) => this.checkAvailability(e.currentTarget.value)}- />- <div className="ui label">{this.settings.domain}</div>- {- this.state.subdomain.available &&- <div className="ui left pointing green basic label">- Great!- </div>- }- {- this.state.subdomain.message &&- <div className="ui left pointing red basic label">- {this.state.subdomain.message}- </div>- }- </div>- </div>- }+ <DisplayError fields={['tenantName', 'subdomain']} error={this.state.error} />+ <div className="ui form">+ <div className="fluid field">+ <input+ id="tenantName"+ type="text"+ placeholder="your company or product name"+ maxLength={60}+ onChange={(e) => this.setState({ tenantName: e.currentTarget.value })}+ /></div>- <div className="ui section divider" />+ {+ !page.isSingleHostMode() && <div className="fluid field">+ <div className="ui right labeled input">+ <input+ id="subdomain"+ type="text"+ maxLength={40}+ placeholder="subdomain"+ onChange={(e) => this.checkAvailability(e.currentTarget.value)}+ />+ <div className="ui label">{this.props.settings.domain}</div>+ {+ this.state.subdomain.available &&+ <div className="ui left pointing green basic label">+ Great!+ </div>+ }+ {+ this.state.subdomain.message &&+ <div className="ui left pointing red basic label">+ {this.state.subdomain.message}+ </div>+ }+ </div>+ </div>+ }+ </div>+ <div className="ui section divider" />- <h3 className="ui header">3. Review and continue</h3>+ <h3 className="ui header">3. Review and continue</h3>- <p>Make sure information provided above is correct before proceeding.</p>+ <p>Make sure information provided above is correct before proceeding.</p>- <Button className="positive" size="large" onClick={() => this.confirm()}>Confirm</Button>- </div>- <Footer />+ <Button className="positive" size="large" onClick={() => this.confirm()}>Confirm</Button></div>);}diff --git a/public/pages/site/CompleteSignInProfilePage.tsx b/public/pages/site/CompleteSignInProfilePage.tsxindex a2a844c58..9013b3a6f 100644--- a/public/pages/site/CompleteSignInProfilePage.tsx+++ b/public/pages/site/CompleteSignInProfilePage.tsx@@ -1,37 +1,31 @@import * as React from 'react';-import { HomePage } from './HomePage';-import { showModal, getQueryString } from '@fider/utils/page';+import { HomePage, HomePageProps } from './HomePage';import { Form, Button } from '@fider/components/common';--import { inject, injectables } from '@fider/di';-import { TenantService } from '@fider/services';+import { page, actions } from '@fider/services';interface CompleteSignInProfilePageState {name: string;}-export class CompleteSignInProfilePage extends React.Component<{}, CompleteSignInProfilePageState> {+export class CompleteSignInProfilePage extends React.Component<HomePageProps, CompleteSignInProfilePageState> {private form: Form;private key: string;- @inject(injectables.TenantService)- public service: TenantService;-- constructor(props: {}) {+ constructor(props: HomePageProps) {super(props);- this.key = getQueryString('k');+ this.key = page.getQueryString('k');this.state = {name: '',};}public componentDidMount() {- showModal('#signin-complete-modal', { closable: false });+ page.showModal('#signin-complete-modal', { closable: false });}private async submit() {- const result = await this.service.completeProfile(this.key, this.state.name);+ const result = await actions.completeProfile(this.key, this.state.name);if (result.ok) {location.href = '/';} else if (result.error) {@@ -43,7 +37,7 @@ export class CompleteSignInProfilePage extends React.Component<{}, CompleteSignIconst modal = (<div id="signin-complete-modal" className="ui modal small"><div className="header">- Complete your profile+ Complete your profile</div><div className="content"><p>Because this is your first sign in, please input your display name.</p>@@ -68,7 +62,7 @@ export class CompleteSignInProfilePage extends React.Component<{}, CompleteSignIreturn (<div>{modal}- <HomePage />+ {React.createElement(HomePage, this.props)}</div>);}diff --git a/public/pages/site/HomePage/HomePage.tsx b/public/pages/site/HomePage/HomePage.tsxindex ef2d3765f..9c07a32cc 100644--- a/public/pages/site/HomePage/HomePage.tsx+++ b/public/pages/site/HomePage/HomePage.tsx@@ -1,16 +1,20 @@import * as React from 'react';import { Idea, Tag, IdeaStatus, CurrentUser, Tenant } from '@fider/models';-import { ShowTag, ShowIdeaResponse, SupportCounter, Gravatar, MultiLineText, Moment, Header, Footer } from '@fider/components';+import { ShowTag, ShowIdeaResponse, SupportCounter, Gravatar, MultiLineText, Moment } from '@fider/components';import { IdeaInput, TagsFilter, IdeaFilter, IdeaFilterFunction } from './';--import { inject, injectables } from '@fider/di';-import { Session } from '@fider/services';-import { getBaseUrl, getQueryString, getQueryStringArray } from '@fider/utils/page';+import { page } from '@fider/services';import './HomePage.scss';const defaultShowCount = 20;+export interface HomePageProps {+ user?: CurrentUser;+ tenant: Tenant;+ ideas: Idea[];+ tags: Tag[];+}+interface HomePageState {ideas: Idea[];search?: string;@@ -55,43 +59,32 @@ const ListIdeaItem = (props: { idea: Idea, user?: CurrentUser, tags: Tag[] }) =>);};-export class HomePage extends React.Component<{}, HomePageState> {- private user?: CurrentUser;- private tenant: Tenant;- private allIdeas: Idea[];- private allTags: Tag[];+export class HomePage extends React.Component<HomePageProps, HomePageState> {private filter: HTMLDivElement;- @inject(injectables.Session)- public session: Session;+ constructor(props: HomePageProps) {+ super(props);- constructor(props: {}) {- super(props);- this.user = this.session.getCurrentUser();- this.tenant = this.session.getCurrentTenant();- this.allIdeas = this.session.getArray<Idea>('ideas');- this.allTags = this.session.getArray<Tag>('tags');-- const search = getQueryString('q');- const tags = getQueryStringArray('t');- const activeFilter = window.location.hash.substring(1);- this.state = {- ideas: this.filterIdeas(activeFilter, search, tags),- showCount: defaultShowCount,- activeFilter,- searching: !!search,- search,- tags- };+ const search = page.getQueryString('q');+ const tags = page.getQueryStringArray('t');+ const activeFilter = window.location.hash.substring(1);+ this.state = {+ ideas: this.filterIdeas(activeFilter, search, tags),+ showCount: defaultShowCount,+ activeFilter,+ searching: !!search,+ search,+ tags+ };}private containsAll(str: string, substrings: string[]): boolean {- for (let i = 0; i !== substrings.length; i++) {- if (str.indexOf(substrings[i]) === - 1) {- return false;- }- }- return true;+ for (let i = 0; i !== substrings.length; i++) {+ if (str.indexOf(substrings[i]) === - 1) {+ return false;+ }+ }+ return true;}private selectedTagsChanged(tags: string[]): void {@@ -109,7 +102,7 @@ export class HomePage extends React.Component<{}, HomePageState> {if (search) {const s = search.trim().toLowerCase();path += `?q=${encodeURIComponent(s).replace(/%20/g, '+')}`;- ideas = this.allIdeas.filter((idea) => {+ ideas = this.props.ideas.filter((idea) => {const terms = s.split(' ').filter((x) => x.length >= 2);return (this.containsAll(idea.title.toLowerCase(), terms) ||@@ -119,7 +112,7 @@ export class HomePage extends React.Component<{}, HomePageState> {});} else {path += activeFilter ? `#${activeFilter}` : '';- ideas = IdeaFilter.getFilter(activeFilter)(this.allIdeas);+ ideas = IdeaFilter.getFilter(activeFilter)(this.props.ideas);}if (tags.length > 0) {@@ -128,12 +121,12 @@ export class HomePage extends React.Component<{}, HomePageState> {}if (history.replaceState) {- const newUrl = getBaseUrl() + path;+ const newUrl = page.getBaseUrl() + path;window.history.replaceState({ path: newUrl }, '', newUrl);}if (tags.length > 0) {- const tagsToFilter = this.allTags.filter((x) => tags.indexOf(x.slug) >= 0).map((x) => x.id);+ const tagsToFilter = this.props.tags.filter((x) => tags.indexOf(x.slug) >= 0).map((x) => x.id);ideas = ideas.filter((i) => i.tags.filter((t) => tagsToFilter.indexOf(t) >= 0@@ -184,9 +177,9 @@ export class HomePage extends React.Component<{}, HomePageState> {ideasToList.map((idea) =><ListIdeaItemkey={idea.id}- user={this.user}+ user={this.props.user}idea={idea}- tags={this.allTags.filter((tag) => idea.tags.indexOf(tag.id) >= 0)}+ tags={this.props.tags.filter((tag) => idea.tags.indexOf(tag.id) >= 0)}/>)}{this.state.ideas.length > this.state.showCount &&@@ -202,68 +195,66 @@ export class HomePage extends React.Component<{}, HomePageState> {): <p className="no-ideas-found">No ideas found for given filter.</p>;- const welcomeMessage = this.tenant.welcomeMessage ||+ const welcomeMessage = this.props.tenant.welcomeMessage ||`## Welcome to our feedback forum!We'd love to hear what you're thinking about. What can we do better? This is the place for you to vote, discuss and share ideas.`;return (- <div>- <Header />- <div className="page ui container">-- <div className="ui grid stackable">- <div className="six wide column">- <MultiLineText className="welcome-message" text={welcomeMessage} style="full" />- <IdeaInput placeholder={this.tenant.invitation || 'I suggest you...'} />- </div>- <div className="ten wide column">- {- this.allIdeas.length === 0- ? <EmptyList />- : <div>- <div className="ui grid">- {- !this.state.searching && <div className="ten wide mobile ten wide tablet twelve wide computer column filter-column">- <IdeaFilter- ideas={this.allIdeas}- activeFilter={this.state.activeFilter}- filterChanged={(name) => this.filterChanged(name)}- />- </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">- <input- onFocus={() => this.setState({ searching: true })}- onBlur={(x) => this.setState({ searching: !!this.state.search })}- onChange={(x) => this.searchIdea(x.currentTarget.value)}- value={this.state.search}- type="text"- placeholder="Search..."- />- {- this.state.searching- ? <i onClick={() => this.resetSearch()} className="cancel link icon" />- : <i className="search icon" />- }- </div>+ <div className="page ui container">+ <div className="ui grid stackable">+ <div className="six wide column">+ <MultiLineText className="welcome-message" text={welcomeMessage} style="full" />+ <IdeaInput+ user={this.props.user}+ placeholder={this.props.tenant.invitation || 'I suggest you...'}+ />+ </div>+ <div className="ten wide column">+ {+ this.props.ideas.length === 0+ ? <EmptyList />+ : <div>+ <div className="ui grid">+ {+ !this.state.searching && <div className="ten wide mobile ten wide tablet twelve wide computer column filter-column">+ <IdeaFilter+ ideas={this.props.ideas}+ activeFilter={this.state.activeFilter}+ filterChanged={(name) => this.filterChanged(name)}+ />+ </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">+ <input+ onFocus={() => this.setState({ searching: true })}+ onBlur={(x) => this.setState({ searching: !!this.state.search })}+ onChange={(x) => this.searchIdea(x.currentTarget.value)}+ value={this.state.search}+ type="text"+ placeholder="Search..."+ />+ {+ this.state.searching+ ? <i onClick={() => this.resetSearch()} className="cancel link icon" />+ : <i className="search icon" />+ }</div></div></div>- <TagsFilter- tags={this.allTags}- selectionChanged={(selected) => this.selectedTagsChanged(selected)}- defaultSelection={this.state.tags}- />- {displayIdeas}</div>- }- </div>+ <TagsFilter+ tags={this.props.tags}+ selectionChanged={(selected) => this.selectedTagsChanged(selected)}+ defaultSelection={this.state.tags}+ />+ {displayIdeas}+ </div>+ }</div></div>- <Footer /></div>);}diff --git a/public/pages/site/HomePage/IdeaInput.tsx b/public/pages/site/HomePage/IdeaInput.tsxindex 237ee0d93..a2b8f0e29 100644--- a/public/pages/site/HomePage/IdeaInput.tsx+++ b/public/pages/site/HomePage/IdeaInput.tsx@@ -1,13 +1,11 @@import * as React from 'react';import { DisplayError, Button, ButtonClickEvent, Form, Textarea } from '@fider/components/common';--import { inject, injectables } from '@fider/di';-import { Session, IdeaService, Failure } from '@fider/services';+import { page, cache, actions, Failure } from '@fider/services';import { CurrentUser } from '@fider/models';-import { showSignIn } from '@fider/utils/page';interface IdeaInputProps {- placeholder: string;+ user?: CurrentUser;+ placeholder: string;}interface IdeaInputState {@@ -22,52 +20,44 @@ const CACHE_DESCRIPTION_KEY = 'IdeaInput-Description';export class IdeaInput extends React.Component<IdeaInputProps, IdeaInputState> {private title: HTMLInputElement;private form: Form;- private user?: CurrentUser;-- @inject(injectables.Session)- private session: Session;-- @inject(injectables.IdeaService)- private service: IdeaService;constructor(props: IdeaInputProps) {super(props);- this.user = this.session.getCurrentUser();this.state = {- title: this.session.getCache(CACHE_TITLE_KEY) || '',- description: this.session.getCache(CACHE_DESCRIPTION_KEY) || '',+ title: cache.get(CACHE_TITLE_KEY) || '',+ description: cache.get(CACHE_DESCRIPTION_KEY) || '',focused: false};}public componentDidMount() {- if (this.user) {+ if (this.props.user) {this.title.focus();}}private onTitleFocused() {- if (!this.user) {+ if (!this.props.user) {this.title.blur();- showSignIn();+ page.showSignIn();}}private onTitleChanged(title: string) {- this.session.setCache(CACHE_TITLE_KEY, title);+ cache.set(CACHE_TITLE_KEY, title);this.setState({ title });}private onDescriptionChanged(description: string) {- this.session.setCache(CACHE_DESCRIPTION_KEY, description);+ cache.set(CACHE_DESCRIPTION_KEY, description);this.setState({ description });}private async submit(event: ButtonClickEvent) {if (this.state.title) {- const result = await this.service.addIdea(this.state.title, this.state.description);+ const result = await actions.createIdea(this.state.title, this.state.description);if (result.ok) {- this.session.removeCache(CACHE_TITLE_KEY, CACHE_DESCRIPTION_KEY);+ cache.remove(CACHE_TITLE_KEY, CACHE_DESCRIPTION_KEY);this.form.clearFailure();location.href = `/ideas/${result.data.number}/${result.data.slug}`;event.preventEnable();diff --git a/public/pages/site/ShowIdeaPage/CommentInput.tsx b/public/pages/site/ShowIdeaPage/CommentInput.tsxindex df2e2ad21..b93b5d78a 100644--- a/public/pages/site/ShowIdeaPage/CommentInput.tsx+++ b/public/pages/site/ShowIdeaPage/CommentInput.tsx@@ -4,11 +4,10 @@ import * as ReactDOM from 'react-dom';import { Idea, CurrentUser } from '@fider/models';import { Gravatar, UserName, Button, Textarea, DisplayError, SignInControl } from '@fider/components/common';-import { inject, injectables } from '@fider/di';-import { Session, IdeaService, Failure } from '@fider/services';-import { showSignIn } from '@fider/utils/page';+import { page, actions, Failure } from '@fider/services';interface CommentInputProps {+ user?: CurrentUser;idea: Idea;}@@ -20,27 +19,18 @@ interface CommentInputState {export class CommentInput extends React.Component<CommentInputProps, CommentInputState> {private input: HTMLTextAreaElement;- @inject(injectables.Session)- public session: Session;-- @inject(injectables.IdeaService)- public service: IdeaService;-- private user?: CurrentUser;-constructor(props: CommentInputProps) {- super(props);- this.user = this.session.getCurrentUser();+ super(props);- this.state = {- content: ''- };+ this.state = {+ content: ''+ };}private onTextFocused() {- if (!this.user) {+ if (!this.props.user) {this.input.blur();- showSignIn();+ page.showSignIn();}}@@ -49,7 +39,7 @@ export class CommentInput extends React.Component<CommentInputProps, CommentInpuerror: undefined});- const result = await this.service.addComment(this.props.idea.number, this.state.content);+ const result = await actions.createComment(this.props.idea.number, this.state.content);if (result.ok) {location.reload();} else {@@ -60,13 +50,12 @@ export class CommentInput extends React.Component<CommentInputProps, CommentInpu}public render() {- const user = this.session.getCurrentUser();return (- <div className={`comment-input ${user && 'authenticated' }`}>- {this.user && <Gravatar user={this.user} />}+ <div className={`comment-input ${this.props.user && 'authenticated' }`}>+ {this.props.user && <Gravatar user={this.props.user} />}<div className="ui form">- {this.user && <UserName user={this.user} />}+ {this.props.user && <UserName user={this.props.user} />}<DisplayError error={this.state.error} /><div className="field"><Textareadiff --git a/public/pages/site/ShowIdeaPage/ResponseForm.tsx b/public/pages/site/ShowIdeaPage/ResponseForm.tsxindex 4229d138f..3ad6c308b 100644--- a/public/pages/site/ShowIdeaPage/ResponseForm.tsx+++ b/public/pages/site/ShowIdeaPage/ResponseForm.tsx@@ -3,8 +3,7 @@ import * as React from 'react';import { User, Comment, Idea, IdeaStatus } from '@fider/models';import { Button, DisplayError, Textarea } from '@fider/components/common';-import { inject, injectables } from '@fider/di';-import { IdeaService, Failure } from '@fider/services';+import { actions, Failure } from '@fider/services';interface ResponseFormProps {idea: Idea;@@ -19,9 +18,6 @@ interface ResponseFormState {export class ResponseForm extends React.Component<ResponseFormProps, ResponseFormState> {private modal: HTMLDivElement;- @inject(injectables.IdeaService)- public service: IdeaService;-constructor(props: ResponseFormProps) {super(props);@@ -32,7 +28,7 @@ export class ResponseForm extends React.Component<ResponseFormProps, ResponseFor}private async submit() {- const result = await this.service.setResponse(this.props.idea.number, this.state.status, this.state.text);+ const result = await actions.setResponse(this.props.idea.number, this.state.status, this.state.text);if (result.ok) {location.reload();} else {diff --git a/public/pages/site/ShowIdeaPage/ShowIdeaPage.tsx b/public/pages/site/ShowIdeaPage/ShowIdeaPage.tsxindex a87504265..fa83adedb 100644--- a/public/pages/site/ShowIdeaPage/ShowIdeaPage.tsx+++ b/public/pages/site/ShowIdeaPage/ShowIdeaPage.tsx@@ -1,16 +1,20 @@import * as React from 'react';-import { inject, injectables } from '@fider/di';import { CurrentUser, Comment, Idea, Tag } from '@fider/models';-import { Session, IdeaService, Failure } from '@fider/services';--import { setTitle } from '@fider/utils/page';+import { page, actions, Failure } from '@fider/services';import { TagsPanel, CommentInput, CommentList, ResponseForm } from './';-import { SupportCounter, ShowIdeaResponse, DisplayError, Button, Textarea, UserName, Gravatar, Moment, Form, MultiLineText, Footer, Header } from '@fider/components';+import { SupportCounter, ShowIdeaResponse, DisplayError, Button, Textarea, UserName, Gravatar, Moment, MultiLineText } from '@fider/components';import './ShowIdeaPage.scss';+interface ShowIdeaPageProps {+ user?: CurrentUser;+ idea: Idea;+ comments: Comment[];+ tags: Tag[];+}+interface ShowIdeaPageState {editMode: boolean;newTitle: string;@@ -18,44 +22,29 @@ interface ShowIdeaPageState {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;+export class ShowIdeaPage extends React.Component<ShowIdeaPageProps, ShowIdeaPageState> {- @inject(injectables.IdeaService)- public ideaService: IdeaService;-- constructor(props: {}) {+ constructor(props: ShowIdeaPageProps) {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,- newTitle: this.idea.title,- newDescription: this.idea.description,+ newTitle: this.props.idea.title,+ newDescription: this.props.idea.description,};- setTitle(`${this.idea.title} · ${document.title}`);+ page.setTitle(`${this.props.idea.title} · ${document.title}`);}private async saveChanges() {- const result = await this.ideaService.updateIdea(this.idea.number, this.state.newTitle, this.state.newDescription);+ const result = await actions.updateIdea(this.props.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.props.idea.title = this.state.newTitle;+ this.props.idea.description = this.state.newDescription;this.forceUpdate();} else {this.setState({@@ -66,96 +55,92 @@ export class ShowIdeaPage extends React.Component<{}, ShowIdeaPageState> {public render() {return (- <div>- <Header />- <div className="page ui container">- <div className="ui stackable vertically padded 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 className="page ui container">+ <div className="ui stackable vertically padded grid container">+ <div className="thirteen wide column">+ <div className="ui items unstackable">+ <div className="item">+ <SupportCounter user={this.props.user} idea={this.props.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.props.idea.title}</h1>+ }++ <span className="info">+ Shared <Moment date={this.props.idea.createdOn} /> by <Gravatar user={this.props.idea.user} /> <UserName user={this.props.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>+ <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>- : this.idea.description- ? <MultiLineText className="description" text={this.idea.description} style="simple" />- : <p className="description">This idea doesn't have a description.</p>- }+ </div>+ : this.props.idea.description+ ? <MultiLineText className="description" text={this.props.idea.description} style="simple" />+ : <p className="description">This idea doesn't have a description.</p>+ }- <ShowIdeaResponse status={this.idea.status} response={this.idea.response} />+ <ShowIdeaResponse status={this.props.idea.status} response={this.props.idea.response} />- </div>- <div className="three wide column action-col">- {- 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+ </div>+ <div className="three wide column action-col">+ {+ this.props.user && this.props.user.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>- :- <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 className="item">+ <ResponseForm idea={this.props.idea} /></div>- ]- }-- <TagsPanel idea={this.idea} tags={this.tags} />- </div>- <div className="thirteen wide column">- <div className="ui comments">- <span className="subtitle">Discussion</span>- <CommentList comments={this.comments} />- <CommentInput idea={this.idea} />- </div>- </div>+ </div>+ ]+ }+ <TagsPanel user={this.props.user} idea={this.props.idea} tags={this.props.tags} />+ </div>+ <div className="thirteen wide column">+ <div className="ui comments">+ <span className="subtitle">Discussion</span>+ <CommentList comments={this.props.comments} />+ <CommentInput user={this.props.user} idea={this.props.idea} />+ </div></div></div>- <Footer />+</div>);}diff --git a/public/pages/site/ShowIdeaPage/TagsPanel.tsx b/public/pages/site/ShowIdeaPage/TagsPanel.tsxindex ffe1829a1..48c68022b 100644--- a/public/pages/site/ShowIdeaPage/TagsPanel.tsx+++ b/public/pages/site/ShowIdeaPage/TagsPanel.tsx@@ -1,11 +1,10 @@import * as React from 'react';-import { Tag, Idea } from '@fider/models';-import { inject, injectables } from '@fider/di';-import { Session, TagService } from '@fider/services';-+import { CurrentUser, Tag, Idea } from '@fider/models';+import { actions } from '@fider/services';import { ShowTag } from '@fider/components';interface TagsPanelProps {+ user?: CurrentUser;idea: Idea;tags: Tag[];}@@ -18,16 +17,10 @@ interface TagsPanelState {export class TagsPanel extends React.Component<TagsPanelProps, TagsPanelState> {- @inject(injectables.Session)- public session: Session;-- @inject(injectables.TagService)- public tagService: TagService;-constructor(props: TagsPanelProps) {super(props);this.state = {- canEdit: this.session.isCollaborator() === true && this.props.tags.length > 0,+ canEdit: !!this.props.user && this.props.user.isCollaborator && this.props.tags.length > 0,isEditing: false,assignedTags: this.props.tags.filter((t) => this.props.idea.tags.indexOf(t.id) >= 0),};@@ -37,12 +30,12 @@ export class TagsPanel extends React.Component<TagsPanelProps, TagsPanelState> {const idx = this.state.assignedTags.indexOf(tag);let assignedTags: Tag[] = [];if (idx >= 0) {- const response = await this.tagService.unassign(tag.slug, this.props.idea.number);+ const response = await actions.unassignTag(tag.slug, this.props.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.props.idea.number);+ const response = await actions.assignTag(tag.slug, this.props.idea.number);if (response.ok) {assignedTags = this.state.assignedTags.concat(tag);}diff --git a/public/pages/site/UserSettingsPage.tsx b/public/pages/site/UserSettingsPage.tsxindex aeb0cf892..7a22a3603 100644--- a/public/pages/site/UserSettingsPage.tsx+++ b/public/pages/site/UserSettingsPage.tsx@@ -1,99 +1,89 @@import * as React from 'react';-import { inject, injectables } from '@fider/di';-import { Footer, Header, Form, DisplayError, Button, Gravatar } from '@fider/components/common';+import { Form, DisplayError, Button, Gravatar } from '@fider/components/common';import { CurrentUser } from '@fider/models';-import { Session, Failure, UserService } from '@fider/services';+import { Failure, actions } from '@fider/services';interface UserSettingsPageState {name: string;error?: Failure;}-export class UserSettingsPage extends React.Component<{}, UserSettingsPageState> {- private user: CurrentUser;-- @inject(injectables.Session)- private session: Session;+interface UserSettingsPageProps {+ user: CurrentUser;+}- @inject(injectables.UserService)- private userService: UserService;+export class UserSettingsPage extends React.Component<UserSettingsPageProps, UserSettingsPageState> {- constructor(props: {}) {- super(props);- this.user = this.session.getCurrentUser()!;- this.state = {- name: this.user.name- };+ constructor(props: UserSettingsPageProps) {+ super(props);+ this.state = {+ name: this.props.user.name+ };}private async confirm() {- const result = await this.userService.updateSettings(this.state.name);+ const result = await actions.updateUserSettings(this.state.name);if (result.ok) {- location.reload();+ location.reload();} else if (result.error) {- this.setState({ error: result.error });+ this.setState({ error: result.error });}}public render() {return (- <div>- <Header />- <div className="page ui container">- <h2 className="ui header">- <i className="circular id badge icon" />- <div className="content">- Settings- <div className="sub header">Manage your profile settings</div>- </div>- </h2>+ <div className="page ui container">+ <h2 className="ui header">+ <i className="circular id badge icon" />+ <div className="content">+ Settings+ <div className="sub header">Manage your profile settings</div>+ </div>+ </h2>- <div className="ui grid">- <div className="eight wide computer sixteen wide mobile column">- <div className="ui form">- <div className="field">- <label htmlFor="email">Avatar</label>- <p><Gravatar user={this.user} /></p>- <div className="info">- <p>- This site uses <a href="https://en.gravatar.com/" target="blank">Gravatar</a> to display profile avatars. <br/>- A letter avatar based on your name is generated for profiles without a Gravatar.- </p>- </div>- </div>- <div className="field">- <label htmlFor="email">E-mail</label>- <p><b>{this.user.email}</b></p>- <div className="info">- {- this.user.email- ? <p>Your e-mail is private and will never be displayed to anyone.</p>- : <p>Your account doesn't have an e-mail.</p>- }- </div>+ <div className="ui grid">+ <div className="eight wide computer sixteen wide mobile column">+ <div className="ui form">+ <div className="field">+ <label htmlFor="email">Avatar</label>+ <p><Gravatar user={this.props.user} /></p>+ <div className="info">+ <p>+ This site uses <a href="https://en.gravatar.com/" target="blank">Gravatar</a> to display profile avatars. <br/>+ A letter avatar based on your name is generated for profiles without a Gravatar.+ </p></div>- <DisplayError fields={['name']} error={this.state.error} />- <div className="field">- <label htmlFor="name">Name</label>- <input- id="name"- type="text"- maxLength={100}- value={this.state.name}- onChange={(e) => this.setState({ name: e.currentTarget.value })}- />- </div>- <div className="field">- <Button className="positive" size="tiny" onClick={async () => await this.confirm()}>Confirm</Button>+ </div>+ <div className="field">+ <label htmlFor="email">E-mail</label>+ <p><b>{this.props.user.email}</b></p>+ <div className="info">+ {+ this.props.user.email+ ? <p>Your e-mail is private and will never be displayed to anyone.</p>+ : <p>Your account doesn't have an e-mail.</p>+ }</div>- </div>+ </div>+ <DisplayError fields={['name']} error={this.state.error} />+ <div className="field">+ <label htmlFor="name">Name</label>+ <input+ id="name"+ type="text"+ maxLength={100}+ value={this.state.name}+ onChange={(e) => this.setState({ name: e.currentTarget.value })}+ />+ </div>+ <div className="field">+ <Button className="positive" size="tiny" onClick={async () => await this.confirm()}>Confirm</Button></div></div>-</div>- <Footer />+ </div></div>);}diff --git a/public/router.tsx b/public/router.tsxnew file mode 100644index 000000000..323d61fc4--- /dev/null+++ b/public/router.tsx@@ -0,0 +1,46 @@+import * as React from 'react';++import { AdminHomePage } from '@fider/pages/admin/AdminHomePage';+import { MembersPage } from '@fider/pages/admin/MembersPage';+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';+import { SignUpPage } from '@fider/pages/signup/SignUpPage';++interface PageConfiguration {+ id: string;+ regex: RegExp;+ component: any;+ showHeader: boolean;+}++const route = (path: string, component: any, id: string, showHeader: boolean): PageConfiguration => {+ path = path.replace('/', '\/')+ .replace(':number', '\\d+')+ .replace('*', '.*');++ const regex = new RegExp(`^${path}$`);+ return { regex, component, id, showHeader };+};++const pathRegex = [+ route('/', HomePage, 'fdr-home-page', true),+ route('/ideas/:number/*', ShowIdeaPage, 'fdr-show-idea-page', true),+ route('/admin/members', MembersPage, 'fdr-admin-members-page', true),+ route('/admin/tags', ManageTagsPage, 'fdr-admin-tags-page', true),+ route('/admin', AdminHomePage, 'fdr-admin-page', true),+ route('/signup', SignUpPage, 'fdr-signup-page', false),+ route('/signin/verify', CompleteSignInProfilePage, 'fdr-complete-signin-profile', true),+ route('/settings', UserSettingsPage, 'fdr-user-settings', true),+];++export const resolveRootComponent = (path: string): PageConfiguration => {+ for (const entry of pathRegex) {+ if (entry.regex.test(path)) {+ return entry;+ }+ }+ throw new Error(`Component not found for route ${path}.`);+};diff --git a/public/services/IdeaService.ts b/public/services/IdeaService.tsdeleted file mode 100644index 7009692a1..000000000--- a/public/services/IdeaService.ts+++ /dev/null@@ -1,39 +0,0 @@-import { get, post, Result } from '@fider/services/http';-import { injectable } from '@fider/di';-import { Idea } from '@fider/models';--export interface IdeaService {- addSupport(ideaNumber: number): Promise<Result>;- removeSupport(ideaNumber: number): Promise<Result>;- addComment(ideaNumber: number, content: string): Promise<Result>;- setResponse(ideaNumber: number, status: number, text: string): Promise<Result>;- addIdea(title: string, description: string): Promise<Result<Idea>>;- updateIdea(ideaNumber: number, title: string, description: string): Promise<Result>;-}--@injectable()-export class HttpIdeaService implements IdeaService {- public async addSupport(ideaNumber: number): Promise<Result> {- return await post(`/api/ideas/${ideaNumber}/support`);- }-- public async removeSupport(ideaNumber: number): Promise<Result> {- return await post(`/api/ideas/${ideaNumber}/unsupport`);- }-- public async addComment(ideaNumber: number, content: string): Promise<Result> {- return await post(`/api/ideas/${ideaNumber}/comments`, { content });- }-- public async setResponse(ideaNumber: number, status: number, text: string): Promise<Result> {- return await post(`/api/ideas/${ideaNumber}/status`, { status, text });- }-- public async addIdea(title: string, description: string): Promise<Result<Idea>> {- return await post<Idea>(`/api/ideas`, { title, description });- }-- public async updateIdea(ideaNumber: number, title: string, description: string): Promise<Result> {- return await post(`/api/ideas/${ideaNumber}`, { title, description });- }-}diff --git a/public/services/Session.ts b/public/services/Session.tsdeleted file mode 100644index e876af59d..000000000--- a/public/services/Session.ts+++ /dev/null@@ -1,98 +0,0 @@-import { User, CurrentUser, AppSettings, Tenant } from '@fider/models';-import { injectable } from '@fider/di';--export interface Session {- getCurrentUser(): CurrentUser | undefined;- getCurrentTenant(): Tenant;- isAdmin(): boolean;- isCollaborator(): boolean;- set<T>(key: string, value: T): void;- get<T>(key: string): T;- getArray<T>(key: string): T[];- getAppSettings(): AppSettings;- isSingleHostMode(): boolean;- isProduction(): boolean;- setCache(key: string, value: string): void;- getCache(key: string): string | null;- removeCache(...key: string[]): void;-}--@injectable()-export class BrowserSession implements Session {- private w: any;-- constructor(window: Window) {- this.w = window;- this.w.getCurrentUser = this.getCurrentUser.bind(this);- this.w.set = this.set.bind(this);- this.w.get = this.get.bind(this);- }-- public getCurrentUser(): CurrentUser | undefined {- const w: any = window;- if (`_email` in w) {- w[`_user`].email = w[`_email`];- }- return w[`_user`] as CurrentUser;- }-- public getCurrentTenant(): Tenant {- const w: any = window;- return w[`_tenant`] as Tenant;- }-- public isAdmin(): boolean {- const user = this.getCurrentUser();- return !!user && user.role === 3;- }-- public isCollaborator(): boolean {- const user = this.getCurrentUser();- return !!user && user.role >= 2;- }-- public set<T>(key: string, value: T): void {- this.w[`_${key}`] = value;- }-- public get<T>(key: string): T {- return this.w[`_${key}`];- }-- public getArray<T>(key: string): T[] {- return this.w[`_${key}`] || [];- }-- public getAppSettings(): AppSettings {- return this.get<AppSettings>('settings');- }-- public isSingleHostMode(): boolean {- return this.getAppSettings().mode.toLowerCase() === 'single';- }-- public isProduction(): boolean {- return this.getAppSettings().environment.toLowerCase() === 'production';- }-- public setCache(key: string, value: string): void {- if (this.w.sessionStorage) {- this.w.sessionStorage.setItem(key, value);- }- }-- public getCache(key: string): string | null {- if (this.w.sessionStorage) {- return this.w.sessionStorage.getItem(key);- }- return null;- }-- public removeCache(...keys: string[]): void {- if (this.w.sessionStorage && keys) {- for (const key of keys) {- this.w.sessionStorage.removeItem(key);- }- }- }-}diff --git a/public/services/TagService.ts b/public/services/TagService.tsdeleted file mode 100644index 89dfc72f8..000000000--- a/public/services/TagService.ts+++ /dev/null@@ -1,30 +0,0 @@-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/TenantService.ts b/public/services/TenantService.tsdeleted file mode 100644index 863a2b843..000000000--- a/public/services/TenantService.ts+++ /dev/null@@ -1,64 +0,0 @@-import { get, post, Result } from '@fider/services/http';-import { injectable } from '@fider/di';-import { Tenant, UserRole } from '@fider/models';--export interface TenantService {- create(request: CreateTenantRequest): Promise<Result<CreateTenantResponse>>;- updateSettings(title: string, invitation: string, welcomeMessage: string, cname: string): Promise<Result>;- checkAvailability(subdomain: string): Promise<Result<CheckAvailabilityResponse>>;- signIn(email: string): Promise<Result>;- completeProfile(key: string, name: string): Promise<Result>;- changeRole(userId: number, role: UserRole): Promise<Result>;-}--export interface CheckAvailabilityResponse {- message: string;-}--export interface CreateTenantRequest {- tenantName: string;- subdomain?: string;- name?: string;- token?: string;- email?: string;-}--export interface CreateTenantResponse {- token?: string;-}--@injectable()-export class HttpTenantService implements TenantService {- public async create(request: CreateTenantRequest): Promise<Result<CreateTenantResponse>> {- return await post<CreateTenantResponse>('/api/tenants', request);- }-- public async updateSettings(title: string, invitation: string, welcomeMessage: string, cname: string): Promise<Result> {- return await post('/api/admin/settings', {- title, invitation, welcomeMessage, cname- });- }-- public async checkAvailability(subdomain: string): Promise<Result<CheckAvailabilityResponse>> {- return await get<CheckAvailabilityResponse>(`/api/tenants/${subdomain}/availability`);- }-- public async signIn(email: string): Promise<Result> {- return await post('/api/signin', {- email,- });- }-- public async completeProfile(key: string, name: string): Promise<Result> {- return await post('/api/signin/complete', {- key,- name,- });- }-- public async changeRole(userId: number, role: UserRole): Promise<Result> {- return await post(`/api/admin/users/${userId}/role`, {- role,- });- }-}diff --git a/public/services/UserService.ts b/public/services/UserService.tsdeleted file mode 100644index 791487226..000000000--- a/public/services/UserService.ts+++ /dev/null@@ -1,16 +0,0 @@-import { get, post, Result } from '@fider/services/http';-import { injectable } from '@fider/di';-import { Tenant } from '@fider/models';--export interface UserService {- updateSettings(name: string): Promise<Result>;-}--@injectable()-export class HttpUserService implements UserService {- public async updateSettings(name: string): Promise<Result> {- return await post('/api/user/settings', {- name,- });- }-}diff --git a/public/services/actions/idea.ts b/public/services/actions/idea.tsnew file mode 100644index 000000000..42f640a35--- /dev/null+++ b/public/services/actions/idea.ts@@ -0,0 +1,26 @@+import { http, Result } from '@fider/services';+import { Idea } from '@fider/models';++export const addSupport = async (ideaNumber: number): Promise<Result> => {+ return http.post(`/api/ideas/${ideaNumber}/support`).then(http.event('idea', 'support'));+};++export const removeSupport = async (ideaNumber: number): Promise<Result> => {+ return http.post(`/api/ideas/${ideaNumber}/unsupport`).then(http.event('idea', 'unsupport'));+};++export const createComment = async (ideaNumber: number, content: string): Promise<Result> => {+ return http.post(`/api/ideas/${ideaNumber}/comments`, { content }).then(http.event('comment', 'create'));+};++export const setResponse = async (ideaNumber: number, status: number, text: string): Promise<Result> => {+ return http.post(`/api/ideas/${ideaNumber}/status`, { status, text }).then(http.event('idea', 'respond'));+};++export const createIdea = async (title: string, description: string): Promise<Result<Idea>> => {+ return http.post<Idea>(`/api/ideas`, { title, description }).then(http.event('idea', 'create'));+};++export const updateIdea = async (ideaNumber: number, title: string, description: string): Promise<Result> => {+ return http.post(`/api/ideas/${ideaNumber}`, { title, description }).then(http.event('idea', 'update'));+};diff --git a/public/services/actions/index.ts b/public/services/actions/index.tsnew file mode 100644index 000000000..ae642b98d--- /dev/null+++ b/public/services/actions/index.ts@@ -0,0 +1,5 @@+export * from './user';+export * from './tag';+export * from './idea';+export * from './tenant';+export { Failure } from '@fider/services/http';diff --git a/public/services/actions/tag.ts b/public/services/actions/tag.tsnew file mode 100644index 000000000..29a85650e--- /dev/null+++ b/public/services/actions/tag.ts@@ -0,0 +1,22 @@+import { http, Result } from '@fider/services/http';+import { Tag } from '@fider/models';++export const createTag = async (name: string, color: string, isPublic: boolean): Promise<Result<Tag>> => {+ return http.post<Tag>(`/api/admin/tags`, { name, color, isPublic }).then(http.event('tag', 'create'));+};++export const updateTag = async (slug: string, name: string, color: string, isPublic: boolean): Promise<Result<Tag>> => {+ return http.post<Tag>(`/api/admin/tags/${slug}`, { name, color, isPublic }).then(http.event('tag', 'update'));+};++export const deleteTag = async (slug: string): Promise<Result> => {+ return http.delete(`/api/admin/tags/${slug}`).then(http.event('tag', 'delete'));+};++export const assignTag = async (slug: string, ideaNumber: number): Promise<Result> => {+ return http.post(`/api/ideas/${ideaNumber}/tags/${slug}`).then(http.event('tag', 'assign'));+};++export const unassignTag = async (slug: string, ideaNumber: number): Promise<Result> => {+ return http.delete(`/api/ideas/${ideaNumber}/tags/${slug}`).then(http.event('tag', 'unassign'));+};diff --git a/public/services/actions/tenant.ts b/public/services/actions/tenant.tsnew file mode 100644index 000000000..1750176a2--- /dev/null+++ b/public/services/actions/tenant.ts@@ -0,0 +1,51 @@+import { http, Result } from '@fider/services/http';+import { Tenant, UserRole } from '@fider/models';++export interface CheckAvailabilityResponse {+ message: string;+}++export interface CreateTenantRequest {+ tenantName: string;+ subdomain?: string;+ name?: string;+ token?: string;+ email?: string;+}++export interface CreateTenantResponse {+ token?: string;+}++export const createTenant = async (request: CreateTenantRequest): Promise<Result<CreateTenantResponse>> => {+ return await http.post<CreateTenantResponse>('/api/tenants', request);+};++export const updateTenantSettings = async (title: string, invitation: string, welcomeMessage: string, cname: string): Promise<Result> => {+ return await http.post('/api/admin/settings', {+ title, invitation, welcomeMessage, cname+ });+};++export const checkAvailability = async (subdomain: string): Promise<Result<CheckAvailabilityResponse>> => {+ return await http.get<CheckAvailabilityResponse>(`/api/tenants/${subdomain}/availability`);+};++export const signIn = async (email: string): Promise<Result> => {+ return await http.post('/api/signin', {+ email,+ });+};++export const completeProfile = async (key: string, name: string): Promise<Result> => {+ return await http.post('/api/signin/complete', {+ key,+ name,+ });+};++export const changeUserRole = async (userId: number, role: UserRole): Promise<Result> => {+ return await http.post(`/api/admin/users/${userId}/role`, {+ role,+ });+};diff --git a/public/services/actions/user.ts b/public/services/actions/user.tsnew file mode 100644index 000000000..be5b58a03--- /dev/null+++ b/public/services/actions/user.ts@@ -0,0 +1,7 @@+import { http, Result } from '@fider/services/http';++export const updateUserSettings = async (name: string): Promise<Result> => {+ return await http.post('/api/user/settings', {+ name,+ });+};diff --git a/public/services/analytics.ts b/public/services/analytics.tsnew file mode 100644index 000000000..c7a023aa5--- /dev/null+++ b/public/services/analytics.ts@@ -0,0 +1,18 @@+export const analytics = {+ event: (eventCategory: string, eventAction: string): void => {+ if (window.ga) {+ window.ga('send', 'event', {+ eventCategory,+ eventAction+ });+ }+ },+ error: (err: Error): void => {+ if (window.ga) {+ window.ga('send', 'exception', {+ exDescription: err.stack,+ exFatal: false+ });+ }+ }+};diff --git a/public/services/cache.ts b/public/services/cache.tsnew file mode 100644index 000000000..4a13b3eb7--- /dev/null+++ b/public/services/cache.ts@@ -0,0 +1,20 @@+export const cache = {+ set: (key: string, value: string): void => {+ if (window.sessionStorage) {+ window.sessionStorage.setItem(key, value);+ }+ },+ get: (key: string): string | null => {+ if (window.sessionStorage) {+ return window.sessionStorage.getItem(key);+ }+ return null;+ },+ remove: (...keys: string[]): void => {+ if (window.sessionStorage && keys) {+ for (const key of keys) {+ window.sessionStorage.removeItem(key);+ }+ }+ }+};diff --git a/public/services/http.ts b/public/services/http.tsindex d400a0a7d..65b024e62 100644--- a/public/services/http.ts+++ b/public/services/http.ts@@ -1,51 +1,58 @@-import axios, { AxiosResponse } from 'axios';--axios.defaults.validateStatus = (status: number) => {- return status < 500;-};+import { analytics } from '@fider/services';export interface Failure {- messages: string[];- failures: {- [key: string]: string[]- };+ messages: string[];+ failures: {+ [key: string]: string[]+ };}export interface Result<T = void> {- ok: boolean;- data: T;- error?: Failure;-}--function toResult<T>(response: AxiosResponse): Result<T> {- if (response.status < 400) {- return {- ok: true,- data: response.data as T,- };- } else {- return {- ok: false,- data: response.data as T,- error: {- messages: response.data.messages,- failures: response.data.failures,- }- };- }+ ok: boolean;+ data: T;+ error?: Failure;}-export async function get<T = void>(url: string): Promise<Result<T>> {- const response = await axios.get(url);- return toResult<T>(response);+async function toResult<T>(response: Response): Promise<Result<T>> {+ const body = await response.json();+ if (response.status < 400) {+ return {+ ok: true,+ data: body as T,+ };+ } else {+ return {+ ok: false,+ data: body as T,+ error: {+ messages: body.messages,+ failures: body.failures,+ }+ };+ }}--export async function post<T = void>(url: string, data?: any): Promise<Result<T>> {- const response = await axios.post(url, data);- return toResult<T>(response);+async function request<T>(url: string, method: 'GET' | 'POST' | 'DELETE', body?: any): Promise<Result<T>> {+ const headers = [[+ 'Content-Type', 'application/json'+ ]];+ const response = await fetch(url, { method, headers, body: JSON.stringify(body), credentials: 'same-origin' });+ return await 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);-}+export const http = {+ get: async <T = void>(url: string): Promise<Result<T>> => {+ return await request<T>(url, 'GET');+ },+ post: async <T = void>(url: string, body?: any): Promise<Result<T>> => {+ return await request<T>(url, 'POST', body);+ },+ delete: async <T = void>(url: string, body?: any): Promise<Result<T>> => {+ return await request<T>(url, 'DELETE', body);+ },+ event: (category: string, action: string) => <T>(result: Result<T>): Result<T> => {+ if (result && result.ok) {+ analytics.event(category, action);+ }+ return result;+ }+};diff --git a/public/services/index.ts b/public/services/index.tsindex 0e8bc23d8..0deebd5e5 100644--- a/public/services/index.ts+++ b/public/services/index.ts@@ -1,6 +1,7 @@-export * from './Session';-export * from './IdeaService';-export * from './TenantService';-export * from './UserService';-export * from './TagService';-export { Failure } from './http';+export * from './http';+export * from './cache';+export * from './analytics';+export * from './jwt';+import * as page from './page';+import * as actions from './actions';+export { actions, page };diff --git a/public/services/jwt.ts b/public/services/jwt.tsnew file mode 100644index 000000000..897382e63--- /dev/null+++ b/public/services/jwt.ts@@ -0,0 +1,12 @@+export const jwt = {+ decode: (token: string): any => {+ if (token) {+ const segments = token.split('.');+ try {+ return JSON.parse(window.atob(segments[1]));+ } catch {+ return undefined;+ }+ }+ }+};diff --git a/public/utils/page.ts b/public/services/page.tssimilarity index 53%rename from public/utils/page.tsrename to public/services/page.tsindex b072f4361..99fa243fb 100644--- a/public/utils/page.ts+++ b/public/services/page.ts@@ -1,34 +1,37 @@-export function setTitle(title: string) {+export const setTitle = (title: string): void => {document.title = title;-}+};-export function getBaseUrl(): string {- return (window as any)._baseUrl;-}+export const getBaseUrl = (): string => {+ return (window as any).props.baseUrl;+};++export const isSingleHostMode = (): boolean => {+ return (window as any).props.settings.mode === 'single';+};export interface ModalOptions {closable: boolean;}-export function showModal(selector: string, options?: ModalOptions): void {+export const showModal = (selector: string, options?: ModalOptions): void => {const opts = Object.assign({ blurring: true }, options || { });-$(selector).modal(opts).modal('show');-}+};-export function hideModal(selector: string): void {+export const hideModal = (selector: string): void => {$(selector).modal('hide');-}+};-export function showSignIn(): void {+export const showSignIn = (): void => {showModal('#signin-modal');-}+};-export function hideSignIn(): void {+export const hideSignIn = (): void => {hideModal('#signin-modal');-}+};-export function getQueryString(name: string): string {+export const getQueryString = (name: string): string => {const url = window.location.href;name = name.replace(/[\[\]]/g, '\\$&');const regex = new RegExp('[?&]' + name + '(=([^&#]*)|&|#|$)');@@ -39,13 +42,13 @@ export function getQueryString(name: string): string {}return decodeURIComponent(results[2].replace(/\+/g, ' '));-}+};-export function getQueryStringArray(name: string): string[] {+export const getQueryStringArray = (name: string): string[] => {const qs = getQueryString(name);if (qs) {return qs.split(',').filter((i) => i);}return [];-}+};diff --git a/public/tsd.d.ts b/public/tsd.d.tsindex 9e2b604fb..b692a2c83 100644--- a/public/tsd.d.ts+++ b/public/tsd.d.ts@@ -1,5 +1,9 @@interface JQuery {- modal(opts: any): any;- popup(args: any): any;- dropdown(args?: any, args2?: any): any;+ modal(opts: any): any;+ popup(args: any): any;+ dropdown(args?: any, args2?: any): any;+}++interface Window {+ ga?: (cmd: string, evt: string, args?: any) => void;}diff --git a/public/utils/jwt.ts b/public/utils/jwt.tsdeleted file mode 100644index f81dc202a..000000000--- a/public/utils/jwt.ts+++ /dev/null@@ -1,10 +0,0 @@-export function decode(token: string): any {- if (token) {- const segments = token.split('.');- try {- return JSON.parse(window.atob(segments[1]));- } catch {- return undefined;- }- }-}diff --git a/scripts/e2e.sh b/scripts/e2e.shindex 7d014b95d..e3b90803d 100755--- a/scripts/e2e.sh+++ b/scripts/e2e.sh@@ -11,6 +11,7 @@ fiecho "Clean up ..."rm -rf outputtsc+mkdir -p logs/docker rm -f $CONTAINER || truedocker run -d -e POSTGRES_USER=fider_e2e -e POSTGRES_PASSWORD=fider_e2e_pw -p 5577:5432 --name $CONTAINER postgres:9.6.2docker run --link $CONTAINER -e TARGETS=$CONTAINER:5432 waisbrot/waitdiff --git a/tests/lib/mailgun/index.ts b/tests/lib/mailgun/index.tsindex 3e948c32a..93ab7ef1a 100644--- a/tests/lib/mailgun/index.ts+++ b/tests/lib/mailgun/index.ts@@ -1,12 +1,25 @@require('dotenv').config();-import axios from 'axios';+import { parse as parseURL } from 'url';+import * as http from 'http';+import * as https from 'https';import { delay } from '../';-const mailgunOptions = {- auth: {- username: 'api',- password: process.env.MAILGUN_API!- }+const httpGet = (endpoint: string): Promise<any> => {+ const url = parseURL(endpoint);+ return new Promise((resolve, reject) => {+ const opts = {+ host: url.host,+ port: 443,+ method: 'GET',+ auth: `api:${process.env.MAILGUN_API}`,+ path: url.path,+ };+ https.get(opts, (res: http.IncomingMessage) => {+ const content: any[] = [];+ res.on('data', (chunk) => content.push(chunk));+ res.on('end', () => resolve(JSON.parse(content.join(''))));+ });+ });};export const mailgun = {@@ -17,9 +30,9 @@ export const mailgun = {do {count++;const url = `https://api.mailgun.net/v3/${process.env.MAILGUN_DOMAIN}/events?to=${to}&event=accepted&limit=1&ascending=no`;- const events = await axios.get(url, mailgunOptions);- if (events.data.items.length > 0 && events.data.items[0].message.headers.to === to) {- messageUrl = events.data.items[0].storage.url;+ const events = await httpGet(url);+ if (events.items.length > 0 && events.items[0].message.headers.to === to) {+ messageUrl = events.items[0].storage.url;} else {await delay(5000);}@@ -29,9 +42,9 @@ export const mailgun = {throw new Error(`Message not found for ${to}.`);}- const message = await axios.get(messageUrl, mailgunOptions);+ const messages = await httpGet(messageUrl);- const matches = /<a\s+(?:[^>]*?\s+)?href=(["'])(.*?)\1/.exec(message.data['body-html']);+ const matches = /<a\s+(?:[^>]*?\s+)?href=(["'])(.*?)\1/.exec(messages['body-html']);if (matches) {return matches[2];}diff --git a/views/base.html b/views/base.htmlindex b2e97d50e..baa683539 100644--- a/views/base.html+++ b/views/base.html@@ -4,7 +4,6 @@<meta charset="utf-8"/><meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0"><link rel="icon" type="image/x-icon" href="/favicon.ico">- <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/semantic.min.css" /><link rel="stylesheet" href="/assets/css/{{ .__StyleBundle }}" /><title>{{ template "title" .}}</title><meta property="og:title" content="{{template "title" .}}" />@@ -21,24 +20,21 @@<p>Please enable JavaScript and then reload the page.</p></div></noscript>- {{ if .tenant }}- {{ if ne .settings.GoogleAnalytics "" }}- <script>- (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){- (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),- m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)- })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');++ {{ if ne .settings.GoogleAnalytics "" }}+ <script>+ (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){+ (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),+ m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)+ })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');- ga('create', '{{ .settings.GoogleAnalytics }}', 'auto');- ga('set', 'dimension1', '{{ .tenant.Subdomain }}');- ga('send', 'pageview');- </script>- {{ end }}+ ga('create', '{{ .settings.GoogleAnalytics }}', 'auto');+ {{ if .tenant }}ga('set', 'dimension1', '{{ .tenant.Subdomain }}');{{ end }}+ ga('send', 'pageview');+ </script>{{ end }}{{template "content" .}}- <script src="https://cdn.polyfill.io/v2/polyfill.min.js"></script>- <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/jquery.min.js"></script>- <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/semantic.min.js"></script>+ <script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=default,fetch"></script><script src="/assets/js/{{ .__JavaScriptBundle }}"></script><script type="text/javascript">{{template "javascript" .}}diff --git a/webpack.config.js b/webpack.config.jsindex b0b9ae881..0f0cdb444 100755--- a/webpack.config.js+++ b/webpack.config.js@@ -19,7 +19,7 @@ module.exports = {module: {rules: [{- test: /\.scss$/,+ test: /\.(css|scss)$/,loader: ExtractTextPlugin.extract("css-loader!sass-loader")},{ test: /\.(ts|tsx)$/, loader: "ts-loader" },@@ -40,8 +40,5 @@ module.exports = {disable: false,allChunks: true})- ],- externals: {- "jquery": "jQuery"- }+ ]};\ No newline at end of file