Open platform to collect and prioritize feedback
rename to Fider
goenning53a3ca52e019
diff --git a/.ci.env b/.ci.envindex cc8d590e8..05802ce98 100644--- a/.ci.env+++ b/.ci.env@@ -1,5 +1,5 @@GO_ENV=testHOST_MODE=multi-DATABASE_URL=postgres://wechy_test:wechy_test-pw@postgres:5432/wechy_test?sslmode=disable-AUTH_ENDPOINT=http://login.test.canhearyou.com:3000+DATABASE_URL=postgres://fider_test:fider_test-pw@postgres:5432/fider_test?sslmode=disable+AUTH_ENDPOINT=http://login.test.fider.io:3000JWT_SECRET=I1$$MplJ-007A8]G#RE0VVfvv:I~o6+2yA0@)>2|{K$Z1628z9;w7lAsZ\ No newline at end of filediff --git a/.example.env b/.example.envindex 1924030e7..d4a1b47a1 100644--- a/.example.env+++ b/.example.env@@ -1,4 +1,4 @@-DATABASE_URL=postgres://wechy:wechy-pw@localhost:5555/wechy?sslmode=disable+DATABASE_URL=postgres://fider:fider-pw@localhost:5555/fider?sslmode=disableJWT_SECRET=hsjl]W;&ZcHxT&FK;s%bgIQF:#ch=~#Al4:5]N;7V<qPZ3e9lT4'%;go;LIkc%kOAUTH_FACEBOOK_APPID=diff --git a/.gitignore b/.gitignoreindex 195adf837..7fddedb2c 100644--- a/.gitignore+++ b/.gitignore@@ -4,8 +4,8 @@ dist/node_modules/*.coverprofile-wechy-wechy.exe+fider+fider.exegin-bingin-bin.exegin-bin.exe~diff --git a/.test.env b/.test.envindex a35876f6d..bf0d78694 100644--- a/.test.env+++ b/.test.env@@ -1,5 +1,5 @@GO_ENV=testHOST_MODE=multi-DATABASE_URL=postgres://wechy_test:wechy_test-pw@localhost:5566/wechy_test?sslmode=disable-AUTH_ENDPOINT=http://login.test.canhearyou.com:3000+DATABASE_URL=postgres://fider_test:fider_test-pw@localhost:5566/fider_test?sslmode=disable+AUTH_ENDPOINT=http://login.test.fider.io.com:3000JWT_SECRET=I1$$MplJ-007A8]G#RE0VVfvv:I~o6+2yA0@)>2|{K$Z1628z9;w7lAsZ\ No newline at end of filediff --git a/.vscode/settings.json b/.vscode/settings.jsonindex fdb3e1fb8..a22d57a1f 100644--- a/.vscode/settings.json+++ b/.vscode/settings.json@@ -9,8 +9,8 @@"gin-bin": true,"gin-bin.exe": true,"gin-bin.exe~": true,- "wechy": true,- "wechy.exe": true,+ "fider": true,+ "fider.exe": true,"tmp": true,"vendor": false,"node_modules": true,@@ -27,8 +27,8 @@"go.testEnvVars": {"GO_ENV": "test","HOST_MODE": "multi",- "DATABASE_URL": "postgres://wechy_test:wechy_test-pw@localhost:5566/wechy_test?sslmode=disable",- "AUTH_ENDPOINT": "http://login.test.canhearyou.com:3000",+ "DATABASE_URL": "postgres://fider_test:fider_test-pw@localhost:5566/fider_test?sslmode=disable",+ "AUTH_ENDPOINT": "http://login.test.fider.io.com:3000","JWT_SECRET": "I1$$MplJ-007A8]G#RE0VVfvv:I~o6+2yA0@)>2|{K$Z1628z9;w7lAsZ"}}\ No newline at end of filediff --git a/Makefile b/Makefileindex c31ad32b8..e4a0fb291 100644--- a/Makefile+++ b/Makefile@@ -13,12 +13,12 @@ coverage:godotenv -f ${ENV_FILE} ./cover.sh $$(go list ./... | grep -v /vendor/)build:- go build -a -ldflags='-X main.buildtime=${BUILD_TIME}' -o wechy .+ go build -a -ldflags='-X main.buildtime=${BUILD_TIME}' -o fider .watch:gin --buildArgs "-ldflags='-X main.buildtime=${BUILD_TIME}'"run:- wechy+ fider.DEFAULT_GOAL := builddiff --git a/README.md b/README.mdindex d1e4705d9..a0b4307f9 100644--- a/README.md+++ b/README.md@@ -1,15 +1,15 @@-[](https://app.wercker.com/project/byKey/921c1213268ff20191c449eb6eae5db2)-[](https://codecov.io/gh/WeCanHearYou/wechy)+[](https://app.wercker.com/project/byKey/99ca65c4a8cd5711504a19deedbc6461)+[](https://codecov.io/gh/getfider/fider)-# What is WeCanHearYou?+# What is Fider?-Visit http://we.canhearyou.com for information on what it is and how to use it.+Visit http://getfider.com for information on what it is and how to use it.# How to run it locally for development purpose?-WeCanHearYou is mainly written in Go and TypeScript, but we're also using things like Node.js, React and PostgreSQL.+Fider is mainly written in Go and TypeScript, but we're also using things like Node.js, React and PostgreSQL.If you know these technologies or would like to learn them, lucky you! This is the right place!Tools you'll need:@@ -21,13 +21,13 @@ Tools you'll need:Step by step:-1) clone this repository into `$GOPATH/src/github.com/WeCanHearYou/wechy`+1) clone this repository into `$GOPATH/src/github.com/getfider/fider`2) run `npm install` to install front end packages3) run `npm run build:watch` to pack the front end source into a bundle. It'll4) 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://demo.dev.canhearyou.com:3000/` and boom! Welcome to your new local WeCanHearYou development copy!+7) Navigate to `http://demo.dev.fider.io.com: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/app/handlers/common.go b/app/handlers/common.goindex 661a25248..162047e02 100644--- a/app/handlers/common.go+++ b/app/handlers/common.go@@ -4,7 +4,7 @@ import ("net/http""time"- "github.com/WeCanHearYou/wechy/app/pkg/web"+ "github.com/getfider/fider/app/pkg/web")// Logout remove auth cookiesdiff --git a/app/handlers/feedback.go b/app/handlers/feedback.goindex 5d2f37e76..609b006c9 100644--- a/app/handlers/feedback.go+++ b/app/handlers/feedback.go@@ -3,9 +3,9 @@ package handlersimport ("strings"- "github.com/WeCanHearYou/wechy/app"- "github.com/WeCanHearYou/wechy/app/pkg/web"- "github.com/WeCanHearYou/wechy/app/storage"+ "github.com/getfider/fider/app"+ "github.com/getfider/fider/app/pkg/web"+ "github.com/getfider/fider/app/storage""github.com/labstack/echo")diff --git a/app/handlers/feedback_test.go b/app/handlers/feedback_test.goindex dfc8e2b73..260e16d2b 100644--- a/app/handlers/feedback_test.go+++ b/app/handlers/feedback_test.go@@ -5,10 +5,10 @@ import ("strconv"- "github.com/WeCanHearYou/wechy/app/handlers"- "github.com/WeCanHearYou/wechy/app/mock"- "github.com/WeCanHearYou/wechy/app/models"- "github.com/WeCanHearYou/wechy/app/storage/inmemory"+ "github.com/getfider/fider/app/handlers"+ "github.com/getfider/fider/app/mock"+ "github.com/getfider/fider/app/models"+ "github.com/getfider/fider/app/storage/inmemory". "github.com/onsi/gomega")diff --git a/app/handlers/identity.go b/app/handlers/identity.goindex 5232c5eb4..4a39ab1de 100644--- a/app/handlers/identity.go+++ b/app/handlers/identity.go@@ -5,12 +5,12 @@ import ("net/url""strings"- "github.com/WeCanHearYou/wechy/app"- "github.com/WeCanHearYou/wechy/app/models"- "github.com/WeCanHearYou/wechy/app/pkg/jwt"- "github.com/WeCanHearYou/wechy/app/pkg/oauth"- "github.com/WeCanHearYou/wechy/app/pkg/web"- "github.com/WeCanHearYou/wechy/app/storage"+ "github.com/getfider/fider/app"+ "github.com/getfider/fider/app/models"+ "github.com/getfider/fider/app/pkg/jwt"+ "github.com/getfider/fider/app/pkg/oauth"+ "github.com/getfider/fider/app/pkg/web"+ "github.com/getfider/fider/app/storage")type oauthUserProfile struct {@@ -95,7 +95,7 @@ func (h OAuthHandlers) Callback(provider string) web.HandlerFunc {}}- claims := &models.WechyClaims{+ claims := &models.FiderClaims{UserID: user.ID,UserName: user.Name,UserEmail: user.Email,diff --git a/app/handlers/identity_test.go b/app/handlers/identity_test.goindex 7bdbfcc47..e8a1b3f6f 100644--- a/app/handlers/identity_test.go+++ b/app/handlers/identity_test.go@@ -7,11 +7,11 @@ import ("net/url"- "github.com/WeCanHearYou/wechy/app/handlers"- "github.com/WeCanHearYou/wechy/app/mock"- "github.com/WeCanHearYou/wechy/app/models"- "github.com/WeCanHearYou/wechy/app/pkg/oauth"- "github.com/WeCanHearYou/wechy/app/storage/inmemory"+ "github.com/getfider/fider/app/handlers"+ "github.com/getfider/fider/app/mock"+ "github.com/getfider/fider/app/models"+ "github.com/getfider/fider/app/pkg/oauth"+ "github.com/getfider/fider/app/storage/inmemory". "github.com/onsi/gomega")@@ -46,11 +46,11 @@ func TestCallbackHandler_InvalidCode(t *testing.T) {RegisterTestingT(t)server := mock.NewServer()- server.Context.Request().URL, _ = url.Parse("http://login.test.canherayou.com/oauth/callback?state=http://orange.test.canhearyou.com")+ server.Context.Request().URL, _ = url.Parse("http://login.test.canherayou.com/oauth/callback?state=http://orange.test.fider.io.com")code, response := server.Execute(oauthHandlers.Callback(oauth.FacebookProvider))Expect(code).To(Equal(http.StatusTemporaryRedirect))- Expect(response.Header().Get("Location")).To(Equal("http://orange.test.canhearyou.com"))+ Expect(response.Header().Get("Location")).To(Equal("http://orange.test.fider.io.com"))}func TestCallbackHandler_ExistingUserAndProvider(t *testing.T) {@@ -70,11 +70,11 @@ func TestCallbackHandler_ExistingUserAndProvider(t *testing.T) {})server := mock.NewServer()- server.Context.Request().URL, _ = url.Parse("http://demo.test.canherayou.com/oauth/callback?state=http://demo.test.canhearyou.com&code=123")+ server.Context.Request().URL, _ = url.Parse("http://demo.test.canherayou.com/oauth/callback?state=http://demo.test.fider.io.com&code=123")code, response := server.Execute(oauthHandlers.Callback(oauth.FacebookProvider))Expect(code).To(Equal(http.StatusTemporaryRedirect))- Expect(response.Header().Get("Location")).To(Equal("http://demo.test.canhearyou.com?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjozMDAsInVzZXIvbmFtZSI6IkpvbiBTbm93IiwidXNlci9lbWFpbCI6Impvbi5zbm93QGdvdC5jb20ifQ.6_dLZrulH37ymBtqy-l7bhCti9hBv0lgEhH8tLm07CI"))+ Expect(response.Header().Get("Location")).To(Equal("http://demo.test.fider.io.com?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjozMDAsInVzZXIvbmFtZSI6IkpvbiBTbm93IiwidXNlci9lbWFpbCI6Impvbi5zbm93QGdvdC5jb20ifQ.6_dLZrulH37ymBtqy-l7bhCti9hBv0lgEhH8tLm07CI"))}func TestCallbackHandler_NewUser(t *testing.T) {@@ -83,7 +83,7 @@ func TestCallbackHandler_NewUser(t *testing.T) {tenants.Add(tenant)server := mock.NewServer()- server.Context.Request().URL, _ = url.Parse("http://login.test.canherayou.com/oauth/callback?state=http://orange.test.canhearyou.com&code=456")+ server.Context.Request().URL, _ = url.Parse("http://login.test.canherayou.com/oauth/callback?state=http://orange.test.fider.io.com&code=456")code, response := server.Execute(oauthHandlers.Callback(oauth.FacebookProvider))user, err := users.GetByEmail(tenant.ID, "[email protected]")@@ -91,14 +91,14 @@ func TestCallbackHandler_NewUser(t *testing.T) {Expect(user.Name).To(Equal("Some Facebook Guy"))Expect(code).To(Equal(http.StatusTemporaryRedirect))- Expect(response.Header().Get("Location")).To(Equal("http://orange.test.canhearyou.com?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjoxLCJ1c2VyL25hbWUiOiJTb21lIEZhY2Vib29rIEd1eSIsInVzZXIvZW1haWwiOiJzb21lLmd1eUBmYWNlYm9vay5jb20ifQ.PGavs5a6HRotRozfXfNP39JPb0vSus_8LL9MAOeLGDs"))+ Expect(response.Header().Get("Location")).To(Equal("http://orange.test.fider.io.com?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjoxLCJ1c2VyL25hbWUiOiJTb21lIEZhY2Vib29rIEd1eSIsInVzZXIvZW1haWwiOiJzb21lLmd1eUBmYWNlYm9vay5jb20ifQ.PGavs5a6HRotRozfXfNP39JPb0vSus_8LL9MAOeLGDs"))}func TestCallbackHandler_ExistingUser_NewProvider(t *testing.T) {RegisterTestingT(t)server := mock.NewServer()- server.Context.Request().URL, _ = url.Parse("http://login.test.canherayou.com/oauth/callback?state=http://demo.test.canhearyou.com&code=123")+ server.Context.Request().URL, _ = url.Parse("http://login.test.canherayou.com/oauth/callback?state=http://demo.test.fider.io.com&code=123")code, response := server.Execute(oauthHandlers.Callback(oauth.GoogleProvider))tenant, _ := tenants.GetByDomain("demo")@@ -107,5 +107,5 @@ func TestCallbackHandler_ExistingUser_NewProvider(t *testing.T) {Expect(len(user.Providers)).To(Equal(2))Expect(code).To(Equal(http.StatusTemporaryRedirect))- Expect(response.Header().Get("Location")).To(Equal("http://demo.test.canhearyou.com?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjozMDAsInVzZXIvbmFtZSI6IkpvbiBTbm93IiwidXNlci9lbWFpbCI6Impvbi5zbm93QGdvdC5jb20ifQ.6_dLZrulH37ymBtqy-l7bhCti9hBv0lgEhH8tLm07CI"))+ Expect(response.Header().Get("Location")).To(Equal("http://demo.test.fider.io.com?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyL2lkIjozMDAsInVzZXIvbmFtZSI6IkpvbiBTbm93IiwidXNlci9lbWFpbCI6Impvbi5zbm93QGdvdC5jb20ifQ.6_dLZrulH37ymBtqy-l7bhCti9hBv0lgEhH8tLm07CI"))}diff --git a/app/handlers/status.go b/app/handlers/status.goindex 31690d46a..2212f378a 100644--- a/app/handlers/status.go+++ b/app/handlers/status.go@@ -4,8 +4,8 @@ import ("net/http""time"- "github.com/WeCanHearYou/wechy/app/models"- "github.com/WeCanHearYou/wechy/app/pkg/web"+ "github.com/getfider/fider/app/models"+ "github.com/getfider/fider/app/pkg/web""github.com/labstack/echo")diff --git a/app/handlers/status_test.go b/app/handlers/status_test.goindex abfb517b2..54187c1d0 100644--- a/app/handlers/status_test.go+++ b/app/handlers/status_test.go@@ -3,9 +3,9 @@ package handlers_testimport ("testing"- "github.com/WeCanHearYou/wechy/app/handlers"- "github.com/WeCanHearYou/wechy/app/mock"- "github.com/WeCanHearYou/wechy/app/models"+ "github.com/getfider/fider/app/handlers"+ "github.com/getfider/fider/app/mock"+ "github.com/getfider/fider/app/models". "github.com/onsi/gomega")diff --git a/app/middlewares/auth.go b/app/middlewares/auth.goindex 24140bf4a..115a6d9f6 100644--- a/app/middlewares/auth.go+++ b/app/middlewares/auth.go@@ -3,8 +3,8 @@ package middlewaresimport ("net/http"- "github.com/WeCanHearYou/wechy/app/models"- "github.com/WeCanHearYou/wechy/app/pkg/web"+ "github.com/getfider/fider/app/models"+ "github.com/getfider/fider/app/pkg/web")// IsAuthenticated blocks non-authenticated requestsdiff --git a/app/middlewares/auth_test.go b/app/middlewares/auth_test.goindex 13bc5b07f..461f6030a 100644--- a/app/middlewares/auth_test.go+++ b/app/middlewares/auth_test.go@@ -4,10 +4,10 @@ import ("net/http""testing"- "github.com/WeCanHearYou/wechy/app/middlewares"- "github.com/WeCanHearYou/wechy/app/mock"- "github.com/WeCanHearYou/wechy/app/models"- "github.com/WeCanHearYou/wechy/app/pkg/web"+ "github.com/getfider/fider/app/middlewares"+ "github.com/getfider/fider/app/mock"+ "github.com/getfider/fider/app/models"+ "github.com/getfider/fider/app/pkg/web". "github.com/onsi/gomega")diff --git a/app/middlewares/cache.go b/app/middlewares/cache.goindex 48e35901b..9393959f1 100644--- a/app/middlewares/cache.go+++ b/app/middlewares/cache.go@@ -1,6 +1,6 @@package middlewares-import "github.com/WeCanHearYou/wechy/app/pkg/web"+import "github.com/getfider/fider/app/pkg/web"// OneYearCache adds Cache-Control header for one yearfunc OneYearCache() web.MiddlewareFunc {diff --git a/app/middlewares/cache_test.go b/app/middlewares/cache_test.goindex 90faddff9..2d485ed10 100644--- a/app/middlewares/cache_test.go+++ b/app/middlewares/cache_test.go@@ -4,9 +4,9 @@ import ("net/http""testing"- "github.com/WeCanHearYou/wechy/app/middlewares"- "github.com/WeCanHearYou/wechy/app/mock"- "github.com/WeCanHearYou/wechy/app/pkg/web"+ "github.com/getfider/fider/app/middlewares"+ "github.com/getfider/fider/app/mock"+ "github.com/getfider/fider/app/pkg/web". "github.com/onsi/gomega")diff --git a/app/middlewares/domain.go b/app/middlewares/domain.goindex e85f7d252..ac21019a3 100644--- a/app/middlewares/domain.go+++ b/app/middlewares/domain.go@@ -4,11 +4,11 @@ import ("net/http""net/url"- "github.com/WeCanHearYou/wechy/app"- "github.com/WeCanHearYou/wechy/app/models"- "github.com/WeCanHearYou/wechy/app/pkg/env"- "github.com/WeCanHearYou/wechy/app/pkg/web"- "github.com/WeCanHearYou/wechy/app/storage"+ "github.com/getfider/fider/app"+ "github.com/getfider/fider/app/models"+ "github.com/getfider/fider/app/pkg/env"+ "github.com/getfider/fider/app/pkg/web"+ "github.com/getfider/fider/app/storage")// Tenant adds either SingleTenant or MultiTenant to the pipelinediff --git a/app/middlewares/domain_test.go b/app/middlewares/domain_test.goindex 57d6979bd..dc5071f61 100644--- a/app/middlewares/domain_test.go+++ b/app/middlewares/domain_test.go@@ -4,11 +4,11 @@ import ("net/http""testing"- "github.com/WeCanHearYou/wechy/app/middlewares"- "github.com/WeCanHearYou/wechy/app/mock"- "github.com/WeCanHearYou/wechy/app/models"- "github.com/WeCanHearYou/wechy/app/pkg/web"- "github.com/WeCanHearYou/wechy/app/storage/inmemory"+ "github.com/getfider/fider/app/middlewares"+ "github.com/getfider/fider/app/mock"+ "github.com/getfider/fider/app/models"+ "github.com/getfider/fider/app/pkg/web"+ "github.com/getfider/fider/app/storage/inmemory". "github.com/onsi/gomega")@@ -19,16 +19,16 @@ var testCases = []struct {{"The Orange Inc.",[]string{- "orange.test.canhearyou.com",- "orange.test.canhearyou.com:3000",+ "orange.test.fider.io.com",+ "orange.test.fider.io.com:3000",},},{"Demonstration",[]string{- "demo.test.canhearyou.com",- "demo.test.canhearyou.com:1231",- "demo.test.canhearyou.com:80",+ "demo.test.fider.io.com",+ "demo.test.fider.io.com:1231",+ "demo.test.fider.io.com:80",},},}@@ -62,7 +62,7 @@ func TestMultiTenant_AuthDomain(t *testing.T) {tenants := &inmemory.TenantStorage{}server := mock.NewServer()- server.Context.Request().Host = "login.test.canhearyou.com"+ server.Context.Request().Host = "login.test.fider.io.com"server.Use(middlewares.MultiTenant(tenants))status, _ := server.Execute(func(c web.Context) error {@@ -115,9 +115,9 @@ func TestHostChecker(t *testing.T) {RegisterTestingT(t)server := mock.NewServer()- server.Context.Request().Host = "login.test.canhearyou.com"+ server.Context.Request().Host = "login.test.fider.io.com"- server.Use(middlewares.HostChecker("login.test.canhearyou.com"))+ server.Use(middlewares.HostChecker("login.test.fider.io.com"))status, _ := server.Execute(func(c web.Context) error {return c.NoContent(http.StatusOK)})@@ -129,8 +129,8 @@ func TestHostChecker_DifferentHost(t *testing.T) {RegisterTestingT(t)server := mock.NewServer()- server.Context.Request().Host = "orange.test.canhearyou.com"- server.Use(middlewares.HostChecker("login.test.canhearyou.com"))+ server.Context.Request().Host = "orange.test.fider.io.com"+ server.Use(middlewares.HostChecker("login.test.fider.io.com"))status, _ := server.Execute(func(c web.Context) error {return c.NoContent(http.StatusOK)})diff --git a/app/middlewares/jwt.go b/app/middlewares/jwt.goindex ba41f5f75..82b4f96d8 100644--- a/app/middlewares/jwt.go+++ b/app/middlewares/jwt.go@@ -4,9 +4,9 @@ import ("net/http""strings"- "github.com/WeCanHearYou/wechy/app/pkg/jwt"- "github.com/WeCanHearYou/wechy/app/pkg/web"- "github.com/WeCanHearYou/wechy/app/storage"+ "github.com/getfider/fider/app/pkg/jwt"+ "github.com/getfider/fider/app/pkg/web"+ "github.com/getfider/fider/app/storage")// JwtGetter gets JWT token from cookie and add into contextdiff --git a/app/middlewares/jwt_test.go b/app/middlewares/jwt_test.goindex 08a24d4e9..4535a96b7 100644--- a/app/middlewares/jwt_test.go+++ b/app/middlewares/jwt_test.go@@ -6,12 +6,12 @@ import ("net/url"- "github.com/WeCanHearYou/wechy/app/middlewares"- "github.com/WeCanHearYou/wechy/app/mock"- "github.com/WeCanHearYou/wechy/app/models"- "github.com/WeCanHearYou/wechy/app/pkg/jwt"- "github.com/WeCanHearYou/wechy/app/pkg/web"- "github.com/WeCanHearYou/wechy/app/storage/inmemory"+ "github.com/getfider/fider/app/middlewares"+ "github.com/getfider/fider/app/mock"+ "github.com/getfider/fider/app/models"+ "github.com/getfider/fider/app/pkg/jwt"+ "github.com/getfider/fider/app/pkg/web"+ "github.com/getfider/fider/app/storage/inmemory". "github.com/onsi/gomega")@@ -40,7 +40,7 @@ func TestJwtGetter_WithCookie(t *testing.T) {Name: "Jon Snow",Tenant: tenant,}- token, _ := jwt.Encode(&models.WechyClaims{+ token, _ := jwt.Encode(&models.FiderClaims{UserID: user.ID,UserName: user.Name,})@@ -66,7 +66,7 @@ func TestJwtGetter_WithCookie(t *testing.T) {func TestJwtGetter_WithCookie_DifferentTenant(t *testing.T) {RegisterTestingT(t)- token, _ := jwt.Encode(&models.WechyClaims{+ token, _ := jwt.Encode(&models.FiderClaims{UserID: 300,UserName: "Jon Snow",})@@ -94,7 +94,7 @@ func TestJwtSetter_WithoutJwt(t *testing.T) {RegisterTestingT(t)server := mock.NewServer()- server.Context.Request().Host = "orange.test.canhearyou.com"+ server.Context.Request().Host = "orange.test.fider.io.com"server.Context.Request().RequestURI = "/abc"server.Use(middlewares.JwtSetter())@@ -108,12 +108,12 @@ func TestJwtSetter_WithoutJwt(t *testing.T) {func TestJwtSetter_WithJwt_WithoutParameter(t *testing.T) {RegisterTestingT(t)- token, _ := jwt.Encode(&models.WechyClaims{+ token, _ := jwt.Encode(&models.FiderClaims{UserName: "Jon Snow",})server := mock.NewServer()- server.Context.Request().Host = "orange.test.canhearyou.com"+ server.Context.Request().Host = "orange.test.fider.io.com"server.Context.Request().URL, _ = url.Parse("/abc?jwt=" + token)server.Use(middlewares.JwtSetter())@@ -122,18 +122,18 @@ func TestJwtSetter_WithJwt_WithoutParameter(t *testing.T) {})Expect(status).To(Equal(http.StatusTemporaryRedirect))- Expect(response.Header().Get("Location")).To(Equal("http://orange.test.canhearyou.com/abc"))+ Expect(response.Header().Get("Location")).To(Equal("http://orange.test.fider.io.com/abc"))}func TestJwtSetter_WithJwt_WithParameter(t *testing.T) {RegisterTestingT(t)- token, _ := jwt.Encode(&models.WechyClaims{+ token, _ := jwt.Encode(&models.FiderClaims{UserName: "Jon Snow",})server := mock.NewServer()- server.Context.Request().Host = "orange.test.canhearyou.com"+ server.Context.Request().Host = "orange.test.fider.io.com"server.Context.Request().URL, _ = url.Parse("/abc?jwt=" + token + "&foo=bar")server.Use(middlewares.JwtSetter())@@ -142,5 +142,5 @@ func TestJwtSetter_WithJwt_WithParameter(t *testing.T) {})Expect(status).To(Equal(http.StatusTemporaryRedirect))- Expect(response.Header().Get("Location")).To(Equal("http://orange.test.canhearyou.com/abc?foo=bar"))+ Expect(response.Header().Get("Location")).To(Equal("http://orange.test.fider.io.com/abc?foo=bar"))}diff --git a/app/middlewares/noop.go b/app/middlewares/noop.goindex a1ef32032..0aebcf916 100644--- a/app/middlewares/noop.go+++ b/app/middlewares/noop.go@@ -1,6 +1,6 @@package middlewares-import "github.com/WeCanHearYou/wechy/app/pkg/web"+import "github.com/getfider/fider/app/pkg/web"// Noop does nothingfunc Noop() web.MiddlewareFunc {diff --git a/app/mock/server.go b/app/mock/server.goindex 0da137872..b3190989f 100644--- a/app/mock/server.go+++ b/app/mock/server.go@@ -6,9 +6,9 @@ import ("net/http/httptest""strings"- "github.com/WeCanHearYou/wechy/app/middlewares"- "github.com/WeCanHearYou/wechy/app/models"- "github.com/WeCanHearYou/wechy/app/pkg/web"+ "github.com/getfider/fider/app/middlewares"+ "github.com/getfider/fider/app/models"+ "github.com/getfider/fider/app/pkg/web""github.com/jmoiron/jsonq""github.com/labstack/echo")diff --git a/app/models/identity.go b/app/models/identity.goindex 9e22d89af..27229a38c 100644--- a/app/models/identity.go+++ b/app/models/identity.go@@ -50,8 +50,8 @@ type UserProvider struct {UID string `json:"uid" db:"provider_uid"`}-//WechyClaims represents what goes into JWT tokens-type WechyClaims struct {+//FiderClaims represents what goes into JWT tokens+type FiderClaims struct {UserID int `json:"user/id"`UserName string `json:"user/name"`UserEmail string `json:"user/email"`diff --git a/app/pkg/dbx/dbx.go b/app/pkg/dbx/dbx.goindex 8965c388b..bad4d8dfb 100644--- a/app/pkg/dbx/dbx.go+++ b/app/pkg/dbx/dbx.go@@ -6,7 +6,7 @@ import ("io/ioutil""reflect"- "github.com/WeCanHearYou/wechy/app/pkg/env"+ "github.com/getfider/fider/app/pkg/env""github.com/mattes/migrate"//requireddiff --git a/app/pkg/dbx/dbx_test.go b/app/pkg/dbx/dbx_test.goindex 81f1906c4..f6e6a35f5 100644--- a/app/pkg/dbx/dbx_test.go+++ b/app/pkg/dbx/dbx_test.go@@ -4,7 +4,7 @@ import ("os""testing"- "github.com/WeCanHearYou/wechy/app/pkg/dbx"+ "github.com/getfider/fider/app/pkg/dbx". "github.com/onsi/gomega")diff --git a/app/pkg/env/env.go b/app/pkg/env/env.goindex c294be417..595f7e647 100644--- a/app/pkg/env/env.go+++ b/app/pkg/env/env.go@@ -31,19 +31,7 @@ func IsSingleHostMode() bool {return GetEnvOrDefault("HOST_MODE", "single") == "single"}-// CurrentDomain returns Wechy domain based on current environment variables-func CurrentDomain() string {- switch Current() {- case "test":- return "test.canhearyou.com"- case "development":- return "dev.canhearyou.com"- }- return "canhearyou.com"--}--// Current returns current Wechy environment+// Current returns current Fider environmentfunc Current() string {env := os.Getenv("GO_ENV")switch env {@@ -55,12 +43,12 @@ func Current() string {return "development"}-// IsProduction returns true on Wechy production environment+// IsProduction returns true on Fider production environmentfunc IsProduction() bool {return Current() == "production"}-// IsTest returns true on Wechy test environment+// IsTest returns true on Fider test environmentfunc IsTest() bool {return Current() == "test"}@@ -69,14 +57,14 @@ func IsTest() bool {func Path(p ...string) string {root := "./"if IsTest() {- root = os.Getenv("GOPATH") + "/src/github.com/WeCanHearYou/wechy/"+ root = os.Getenv("GOPATH") + "/src/github.com/getfider/fider/"}elems := append([]string{root}, p...)return path.Join(elems...)}-// IsDevelopment returns true on Wechy production environment+// IsDevelopment returns true on Fider production environmentfunc IsDevelopment() bool {return Current() == "development"}diff --git a/app/pkg/env/env_test.go b/app/pkg/env/env_test.goindex b7fa37a7c..62cd2c2dd 100644--- a/app/pkg/env/env_test.go+++ b/app/pkg/env/env_test.go@@ -4,20 +4,19 @@ import ("os""testing"- "github.com/WeCanHearYou/wechy/app/pkg/env"+ "github.com/getfider/fider/app/pkg/env". "github.com/onsi/gomega")var envs = []struct {go_env string- domain stringenv stringisEnv func() bool}{- {"test", "test.canhearyou.com", "test", env.IsTest},- {"development", "dev.canhearyou.com", "development", env.IsDevelopment},- {"production", "canhearyou.com", "production", env.IsProduction},- {"anything", "dev.canhearyou.com", "development", env.IsDevelopment},+ {"test", "test", env.IsTest},+ {"development", "development", env.IsDevelopment},+ {"production", "production", env.IsProduction},+ {"anything", "development", env.IsDevelopment},}func TestGetEnvOrDefault(t *testing.T) {@@ -30,16 +29,6 @@ func TestGetEnvOrDefault(t *testing.T) {Expect(path).NotTo(Equal("default path"))}-func TestCurrentDomain(t *testing.T) {- RegisterTestingT(t)-- for _, testCase := range envs {- os.Setenv("GO_ENV", testCase.go_env)- actual := env.CurrentDomain()- Expect(actual).To(Equal(testCase.domain))- }-}-func TestCurrent(t *testing.T) {RegisterTestingT(t)diff --git a/app/pkg/jwt/jwt.go b/app/pkg/jwt/jwt.goindex c3c5fc946..d4807f0b6 100644--- a/app/pkg/jwt/jwt.go+++ b/app/pkg/jwt/jwt.go@@ -1,22 +1,22 @@package jwtimport (- "github.com/WeCanHearYou/wechy/app/models"- "github.com/WeCanHearYou/wechy/app/pkg/env"+ "github.com/getfider/fider/app/models"+ "github.com/getfider/fider/app/pkg/env"jwtgo "github.com/dgrijalva/jwt-go")var jwtSecret = env.MustGet("JWT_SECRET")//Encode creates new JWT tokens with given claims-func Encode(claims *models.WechyClaims) (string, error) {+func Encode(claims *models.FiderClaims) (string, error) {jwtToken := jwtgo.NewWithClaims(jwtgo.GetSigningMethod("HS256"), claims)return jwtToken.SignedString([]byte(jwtSecret))}//Decode extract claims from JWT tokens-func Decode(token string) (*models.WechyClaims, error) {- claims := &models.WechyClaims{}+func Decode(token string) (*models.FiderClaims, error) {+ claims := &models.FiderClaims{}jwtToken, err := jwtgo.ParseWithClaims(token, claims, func(t *jwtgo.Token) (interface{}, error) {return []byte(jwtSecret), nil})diff --git a/app/pkg/jwt/jwt_test.go b/app/pkg/jwt/jwt_test.goindex e5cc27691..f9d7ca556 100644--- a/app/pkg/jwt/jwt_test.go+++ b/app/pkg/jwt/jwt_test.go@@ -3,15 +3,15 @@ package jwt_testimport ("testing"- "github.com/WeCanHearYou/wechy/app/models"- "github.com/WeCanHearYou/wechy/app/pkg/jwt"+ "github.com/getfider/fider/app/models"+ "github.com/getfider/fider/app/pkg/jwt". "github.com/onsi/gomega")func TestJWT_Encode(t *testing.T) {RegisterTestingT(t)- claims := &models.WechyClaims{+ claims := &models.FiderClaims{UserID: 424,UserName: "Jon Snow",UserEmail: "[email protected]",@@ -25,7 +25,7 @@ func TestJWT_Encode(t *testing.T) {func TestJWT_Decode(t *testing.T) {RegisterTestingT(t)- claims := &models.WechyClaims{+ claims := &models.FiderClaims{UserID: 424,UserName: "Jon Snow",UserEmail: "[email protected]",@@ -43,7 +43,7 @@ func TestJWT_Decode(t *testing.T) {func TestJWT_DecodeChangedToken(t *testing.T) {RegisterTestingT(t)- claims := &models.WechyClaims{+ claims := &models.FiderClaims{UserID: 424,UserName: "Jon Snow",UserEmail: "[email protected]",diff --git a/app/pkg/oauth/http_test.go b/app/pkg/oauth/http_test.goindex 7ffb436ae..f651fde98 100644--- a/app/pkg/oauth/http_test.go+++ b/app/pkg/oauth/http_test.go@@ -3,7 +3,7 @@ package oauth_testimport ("testing"- "github.com/WeCanHearYou/wechy/app/pkg/oauth"+ "github.com/getfider/fider/app/pkg/oauth". "github.com/onsi/gomega")@@ -11,16 +11,16 @@ func TestGetAuthURL_Facebook(t *testing.T) {RegisterTestingT(t)svc := &oauth.HTTPService{}- authURL := svc.GetAuthURL("http://login.test.canhearyou.com:3000", oauth.FacebookProvider, "")+ authURL := svc.GetAuthURL("http://login.test.fider.io.com:3000", oauth.FacebookProvider, "")- Expect(authURL).To(Equal("https://www.facebook.com/dialog/oauth?client_id=&redirect_uri=http%3A%2F%2Flogin.test.canhearyou.com%3A3000%2Foauth%2Ffacebook%2Fcallback&response_type=code&scope=public_profile+email&state="))+ Expect(authURL).To(Equal("https://www.facebook.com/dialog/oauth?client_id=&redirect_uri=http%3A%2F%2Flogin.test.fider.io.com%3A3000%2Foauth%2Ffacebook%2Fcallback&response_type=code&scope=public_profile+email&state="))}func TestGetAuthURL_Google(t *testing.T) {RegisterTestingT(t)svc := &oauth.HTTPService{}- authURL := svc.GetAuthURL("http://login.test.canhearyou.com:3000", oauth.GoogleProvider, "")+ authURL := svc.GetAuthURL("http://login.test.fider.io.com:3000", oauth.GoogleProvider, "")- Expect(authURL).To(Equal("https://accounts.google.com/o/oauth2/auth?client_id=&redirect_uri=http%3A%2F%2Flogin.test.canhearyou.com%3A3000%2Foauth%2Fgoogle%2Fcallback&response_type=code&scope=https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fuserinfo.profile+https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fuserinfo.email&state="))+ Expect(authURL).To(Equal("https://accounts.google.com/o/oauth2/auth?client_id=&redirect_uri=http%3A%2F%2Flogin.test.fider.io.com%3A3000%2Foauth%2Fgoogle%2Fcallback&response_type=code&scope=https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fuserinfo.profile+https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fuserinfo.email&state="))}diff --git a/app/pkg/web/context.go b/app/pkg/web/context.goindex 3e1f6a598..b829769f9 100644--- a/app/pkg/web/context.go+++ b/app/pkg/web/context.go@@ -4,8 +4,8 @@ import ("net/http""strconv"- "github.com/WeCanHearYou/wechy/app/models"- "github.com/WeCanHearYou/wechy/app/pkg/env"+ "github.com/getfider/fider/app/models"+ "github.com/getfider/fider/app/pkg/env""github.com/labstack/echo")diff --git a/app/pkg/web/engine.go b/app/pkg/web/engine.goindex f8a0d0f70..b0b77b405 100644--- a/app/pkg/web/engine.go+++ b/app/pkg/web/engine.go@@ -6,8 +6,8 @@ import ("fmt"- "github.com/WeCanHearYou/wechy/app/models"- "github.com/WeCanHearYou/wechy/app/pkg/env"+ "github.com/getfider/fider/app/models"+ "github.com/getfider/fider/app/pkg/env""github.com/labstack/echo""github.com/labstack/echo/middleware""github.com/labstack/gommon/log"diff --git a/app/pkg/web/renderer.go b/app/pkg/web/renderer.goindex b3f0606d1..243a5fedb 100644--- a/app/pkg/web/renderer.go+++ b/app/pkg/web/renderer.go@@ -7,9 +7,9 @@ import ("io/ioutil"- "github.com/WeCanHearYou/wechy/app/models"- "github.com/WeCanHearYou/wechy/app/pkg/env"- "github.com/WeCanHearYou/wechy/app/pkg/oauth"+ "github.com/getfider/fider/app/models"+ "github.com/getfider/fider/app/pkg/env"+ "github.com/getfider/fider/app/pkg/oauth""github.com/labstack/echo")diff --git a/app/storage/feedback.go b/app/storage/feedback.goindex 6510d54a7..de2f227d1 100644--- a/app/storage/feedback.go+++ b/app/storage/feedback.go@@ -1,6 +1,6 @@package storage-import "github.com/WeCanHearYou/wechy/app/models"+import "github.com/getfider/fider/app/models"// Idea contains read and write operations for ideastype Idea interface {diff --git a/app/storage/identity.go b/app/storage/identity.goindex 80735bcf1..10b0fb2bb 100644--- a/app/storage/identity.go+++ b/app/storage/identity.go@@ -1,6 +1,6 @@package storage-import "github.com/WeCanHearYou/wechy/app/models"+import "github.com/getfider/fider/app/models"// User is used for user operationstype User interface {diff --git a/app/storage/inmemory/idea.go b/app/storage/inmemory/idea.goindex bc95a5f7d..3e5d3c2cf 100644--- a/app/storage/inmemory/idea.go+++ b/app/storage/inmemory/idea.go@@ -1,8 +1,8 @@package inmemoryimport (- "github.com/WeCanHearYou/wechy/app"- "github.com/WeCanHearYou/wechy/app/models"+ "github.com/getfider/fider/app"+ "github.com/getfider/fider/app/models")// IdeaStorage contains read and write operations for ideasdiff --git a/app/storage/inmemory/tenant.go b/app/storage/inmemory/tenant.goindex 3e6f63e35..cc44d0238 100644--- a/app/storage/inmemory/tenant.go+++ b/app/storage/inmemory/tenant.go@@ -3,8 +3,8 @@ package inmemoryimport ("strings"- "github.com/WeCanHearYou/wechy/app"- "github.com/WeCanHearYou/wechy/app/models"+ "github.com/getfider/fider/app"+ "github.com/getfider/fider/app/models")// TenantStorage contains read and write operations for tenantsdiff --git a/app/storage/inmemory/user.go b/app/storage/inmemory/user.goindex f16db6802..94e5b53c7 100644--- a/app/storage/inmemory/user.go+++ b/app/storage/inmemory/user.go@@ -1,8 +1,8 @@package inmemoryimport (- "github.com/WeCanHearYou/wechy/app"- "github.com/WeCanHearYou/wechy/app/models"+ "github.com/getfider/fider/app"+ "github.com/getfider/fider/app/models")// UserStorage is used for user operationsdiff --git a/app/storage/postgres/idea.go b/app/storage/postgres/idea.goindex 92ea325b8..0e0d92df6 100644--- a/app/storage/postgres/idea.go+++ b/app/storage/postgres/idea.go@@ -5,9 +5,9 @@ import ("database/sql"- "github.com/WeCanHearYou/wechy/app"- "github.com/WeCanHearYou/wechy/app/models"- "github.com/WeCanHearYou/wechy/app/pkg/dbx"+ "github.com/getfider/fider/app"+ "github.com/getfider/fider/app/models"+ "github.com/getfider/fider/app/pkg/dbx")// IdeaStorage contains read and write operations for ideasdiff --git a/app/storage/postgres/idea_test.go b/app/storage/postgres/idea_test.goindex dd580a98f..b6b2f3999 100644--- a/app/storage/postgres/idea_test.go+++ b/app/storage/postgres/idea_test.go@@ -4,10 +4,10 @@ import ("testing""time"- "github.com/WeCanHearYou/wechy/app"- "github.com/WeCanHearYou/wechy/app/models"- "github.com/WeCanHearYou/wechy/app/pkg/dbx"- "github.com/WeCanHearYou/wechy/app/storage/postgres"+ "github.com/getfider/fider/app"+ "github.com/getfider/fider/app/models"+ "github.com/getfider/fider/app/pkg/dbx"+ "github.com/getfider/fider/app/storage/postgres". "github.com/onsi/gomega")diff --git a/app/storage/postgres/setup_test.go b/app/storage/postgres/setup_test.goindex 0159f389b..d7222b2ad 100644--- a/app/storage/postgres/setup_test.go+++ b/app/storage/postgres/setup_test.go@@ -4,7 +4,7 @@ import ("os""testing"- "github.com/WeCanHearYou/wechy/app/pkg/dbx"+ "github.com/getfider/fider/app/pkg/dbx")func TestMain(m *testing.M) {diff --git a/app/storage/postgres/tenant.go b/app/storage/postgres/tenant.goindex 04eb6d7d7..090a080ec 100644--- a/app/storage/postgres/tenant.go+++ b/app/storage/postgres/tenant.go@@ -6,9 +6,9 @@ import ("database/sql"- "github.com/WeCanHearYou/wechy/app"- "github.com/WeCanHearYou/wechy/app/models"- "github.com/WeCanHearYou/wechy/app/pkg/dbx"+ "github.com/getfider/fider/app"+ "github.com/getfider/fider/app/models"+ "github.com/getfider/fider/app/pkg/dbx")// TenantStorage contains read and write operations for tenantsdiff --git a/app/storage/postgres/tenant_test.go b/app/storage/postgres/tenant_test.goindex b1feaf775..3ea9c7139 100644--- a/app/storage/postgres/tenant_test.go+++ b/app/storage/postgres/tenant_test.go@@ -5,10 +5,10 @@ import ("database/sql"- "github.com/WeCanHearYou/wechy/app"- "github.com/WeCanHearYou/wechy/app/models"- "github.com/WeCanHearYou/wechy/app/pkg/dbx"- "github.com/WeCanHearYou/wechy/app/storage/postgres"+ "github.com/getfider/fider/app"+ "github.com/getfider/fider/app/models"+ "github.com/getfider/fider/app/pkg/dbx"+ "github.com/getfider/fider/app/storage/postgres". "github.com/onsi/gomega")diff --git a/app/storage/postgres/user.go b/app/storage/postgres/user.goindex fb6b31274..f83488f99 100644--- a/app/storage/postgres/user.go+++ b/app/storage/postgres/user.go@@ -5,9 +5,9 @@ import ("database/sql"- "github.com/WeCanHearYou/wechy/app"- "github.com/WeCanHearYou/wechy/app/models"- "github.com/WeCanHearYou/wechy/app/pkg/dbx"+ "github.com/getfider/fider/app"+ "github.com/getfider/fider/app/models"+ "github.com/getfider/fider/app/pkg/dbx")// UserStorage is used for user operations using a Postgres databasediff --git a/app/storage/postgres/user_test.go b/app/storage/postgres/user_test.goindex 1775a3faf..459dcbfe5 100644--- a/app/storage/postgres/user_test.go+++ b/app/storage/postgres/user_test.go@@ -3,10 +3,10 @@ package postgres_testimport ("testing"- "github.com/WeCanHearYou/wechy/app/models"- "github.com/WeCanHearYou/wechy/app/pkg/dbx"- "github.com/WeCanHearYou/wechy/app/pkg/oauth"- "github.com/WeCanHearYou/wechy/app/storage/postgres"+ "github.com/getfider/fider/app/models"+ "github.com/getfider/fider/app/pkg/dbx"+ "github.com/getfider/fider/app/pkg/oauth"+ "github.com/getfider/fider/app/storage/postgres". "github.com/onsi/gomega")diff --git a/cover.sh b/cover.shindex 63148585a..5532c9b5f 100755--- a/cover.sh+++ b/cover.sh@@ -3,7 +3,7 @@set -eCOVER=.cover-ROOT_PKG=github.com/WeCanHearYou/wechy/+ROOT_PKG=github.com/getfider/fider/if [[ -d "$COVER" ]]; thenrm -rf "$COVER"diff --git a/docker-compose.yml b/docker-compose.ymlindex 60cc53b07..66a9b237c 100644--- a/docker-compose.yml+++ b/docker-compose.yml@@ -8,13 +8,13 @@ services:ports:- "5555:5432"environment:- POSTGRES_USER: wechy- POSTGRES_PASSWORD: wechy-pw+ POSTGRES_USER: fider+ POSTGRES_PASSWORD: fider-pwpgtest:restart: alwaysimage: postgres:9.6ports:- "5566:5432"environment:- POSTGRES_USER: wechy_test- POSTGRES_PASSWORD: wechy_test-pw\ No newline at end of file+ POSTGRES_USER: fider_test+ POSTGRES_PASSWORD: fider_test-pw\ No newline at end of filediff --git a/docs/docker-compose.yml b/docs/docker-compose.ymlindex c5ce33208..829759ecb 100644--- a/docs/docker-compose.yml+++ b/docs/docker-compose.yml@@ -4,17 +4,17 @@ services:restart: alwaysimage: postgres:9.6environment:- POSTGRES_USER: wechy+ POSTGRES_USER: fiderPOSTGRES_PASSWORD: s0m3g00dp4ssw0rdapp:restart: always- image: wecanhearyou/wechy:latest+ image: getfider/fider:latestports:- "9999:8080"environment:PORT: 8080GO_ENV: production- DATABASE_URL: postgres://wechy:s0m3g00dp4ssw0rd@db:5432/wechy?sslmode=disable+ DATABASE_URL: postgres://fider:s0m3g00dp4ssw0rd@db:5432/fider?sslmode=disableJWT_SECRET: Ml_1%vQwv]lchqm5;>y2(xKbU@Q@Lybwb(COx+d.o3&|5>)y;~G[KuWWYvR--6_g# You can generate a new salt here: https://api.wordpress.org/secret-key/1.1/salt/depends_on:diff --git a/glide.yaml b/glide.yamlindex 94a619178..5cf325c7c 100644--- a/glide.yaml+++ b/glide.yaml@@ -1,4 +1,4 @@-package: github.com/WeCanHearYou/wechy+package: github.com/getfider/fiderimport:- package: github.com/dgrijalva/jwt-go- package: github.com/jmoiron/jsonqdiff --git a/main.go b/main.goindex 1fda7f2c3..8398f8f9f 100644--- a/main.go+++ b/main.go@@ -5,11 +5,11 @@ import ("fmt"- "github.com/WeCanHearYou/wechy/app/models"- "github.com/WeCanHearYou/wechy/app/pkg/dbx"- "github.com/WeCanHearYou/wechy/app/pkg/env"- "github.com/WeCanHearYou/wechy/app/pkg/oauth"- "github.com/WeCanHearYou/wechy/app/storage/postgres"+ "github.com/getfider/fider/app/models"+ "github.com/getfider/fider/app/pkg/dbx"+ "github.com/getfider/fider/app/pkg/env"+ "github.com/getfider/fider/app/pkg/oauth"+ "github.com/getfider/fider/app/storage/postgres"_ "github.com/lib/pq"_ "github.com/mattes/migrate/database/postgres"_ "github.com/mattes/migrate/source/file"diff --git a/package.json b/package.jsonindex 70f688576..f918321d3 100644--- a/package.json+++ b/package.json@@ -1,8 +1,8 @@{- "name": "wechy",- "description": "WeCanHearYou is an open source, cross platform and free to use feedback system for companies and products.",+ "name": "fider",+ "description": "Fider is an open source, cross platform and free to use feedback system for companies and products.","version": "0.0.0",- "repository": "https://github.com/WeCanHearYou/wechy",+ "repository": "https://github.com/getfider/fider","license": "GPL-3.0","scripts": {"build": "rm -rf dist && webpack -p",diff --git a/public/components/Footer.tsx b/public/components/Footer.tsxindex 1b2537eba..248ce5612 100644--- a/public/components/Footer.tsx+++ b/public/components/Footer.tsx@@ -36,7 +36,7 @@ export class Footer extends React.Component<{}, {}> {<div className="ui inverted section divider"></div><div className="ui horizontal inverted small divided link list"><span>Powered by</span>- <a className="item" target="_blank" href="http://we.canhearyou.com/">WeCanHearYou</a>+ <a className="item" target="_blank" href="http://getfider.com/">Fider</a></div></div></div>;diff --git a/router.go b/router.goindex 3771b8e0f..3479eadf1 100644--- a/router.go+++ b/router.go@@ -3,15 +3,15 @@ package mainimport ("net/http"- "github.com/WeCanHearYou/wechy/app/handlers"- "github.com/WeCanHearYou/wechy/app/middlewares"- "github.com/WeCanHearYou/wechy/app/models"- "github.com/WeCanHearYou/wechy/app/pkg/oauth"- "github.com/WeCanHearYou/wechy/app/pkg/web"- "github.com/WeCanHearYou/wechy/app/storage"+ "github.com/getfider/fider/app/handlers"+ "github.com/getfider/fider/app/middlewares"+ "github.com/getfider/fider/app/models"+ "github.com/getfider/fider/app/pkg/oauth"+ "github.com/getfider/fider/app/pkg/web"+ "github.com/getfider/fider/app/storage")-// AppServices holds reference to all Wechy services+// AppServices holds reference to all Fider servicestype AppServices struct {OAuth oauth.ServiceUser storage.Userdiff --git a/wercker.yml b/wercker.ymlindex 4763a8887..90c6fc24f 100644--- a/wercker.yml+++ b/wercker.yml@@ -2,8 +2,8 @@ services:- id: postgrestag: 9.6env:- POSTGRES_USER: wechy_test- POSTGRES_PASSWORD: wechy_test-pw+ POSTGRES_USER: fider_test+ POSTGRES_PASSWORD: fider_test-pwbuild-assets:box: node:6.10@@ -24,7 +24,7 @@ build-assets:test:box: golang:1.8- base-path: /go/src/github.com/WeCanHearYou/wechy+ base-path: /go/src/github.com/getfider/fidersteps:# Get dependencies- script:@@ -46,7 +46,7 @@ test:coverage:box: golang:1.8- base-path: /go/src/github.com/WeCanHearYou/wechy+ base-path: /go/src/github.com/getfider/fidersteps:# Install jq- script:@@ -83,7 +83,7 @@ dockerize:name: prepare outputcode: |mkdir /app- cp wechy /app+ cp fider /appcp favicon.ico /appcp -R migrations/ /app/migrationscp -R views/ /app/views@@ -95,13 +95,13 @@ dockerize:mv /app /pipeline/output- internal/docker-push:- repository: wecanhearyou/wechy+ repository: getfider/fiderusername: $DOCKER_USERpassword: $DOCKER_PASSworking-dir: /pipeline/output/apptag: latestports: 8080- cmd: ./wechy+ cmd: ./fiderdeploy:box:@@ -113,11 +113,11 @@ deploy:code: |apk update && apk add openssh-client bash- add-to-known_hosts:- hostname: canhearyou.com+ hostname: getfider.comfingerprint: SHA256:KsmKuG/9bu/5GPkMjVBt37hoB82PY3/932kwxLXkdn0- add-ssh-key:keyname: CORE- script:name: restartcode: |- ssh [email protected] "/home/core/start-wechy.sh"\ No newline at end of file+ ssh [email protected] "/home/core/start-fider.sh"\ No newline at end of file