Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

add more info

goenning8486d3df3e6e
diff --git a/app/handlers/status.go b/app/handlers/status.go
index 17c5a9b7a..9a6be3076 100644
--- a/app/handlers/status.go
+++ b/app/handlers/status.go
@@ -2,11 +2,9 @@ package handlers
import (
"net/http"
- "runtime"
"time"
"github.com/WeCanHearYou/wechy/app/models"
- "github.com/WeCanHearYou/wechy/app/pkg/env"
"github.com/WeCanHearYou/wechy/app/pkg/web"
"github.com/labstack/echo"
)
@@ -25,8 +23,8 @@ func (h statusHandler) get() web.HandlerFunc {
return c.JSON(http.StatusOK, echo.Map{
"build": h.settings.BuildTime,
"version": h.settings.Version,
- "env": env.Current(),
- "compiler": runtime.Version(),
+ "env": h.settings.Environment,
+ "compiler": h.settings.Compiler,
"now": time.Now().Format("2006.01.02.150405"),
})
}
diff --git a/app/mock/server.go b/app/mock/server.go
index d1a5dc3bc..cd97ce6fc 100644
--- a/app/mock/server.go
+++ b/app/mock/server.go
@@ -9,6 +9,7 @@ import (
"fmt"
+ "github.com/WeCanHearYou/wechy/app/models"
"github.com/WeCanHearYou/wechy/app/pkg/web"
"github.com/jmoiron/jsonq"
"github.com/labstack/echo"
@@ -25,7 +26,7 @@ type Server struct {
// NewServer creates a new test server
func NewServer() *Server {
engine := echo.New()
- engine.Renderer = web.NewHTMLRenderer(engine.Logger)
+ engine.Renderer = web.NewHTMLRenderer(&models.WeCHYSettings{}, engine.Logger)
engine.HTTPErrorHandler = func(e error, c echo.Context) {
fmt.Println(e)
c.NoContent(e.(*echo.HTTPError).Code)
diff --git a/app/models/infra.go b/app/models/infra.go
index 970d20345..f608e6d45 100644
--- a/app/models/infra.go
+++ b/app/models/infra.go
@@ -5,4 +5,6 @@ type WeCHYSettings struct {
BuildTime string
Version string
AuthEndpoint string
+ Environment string
+ Compiler string
}
diff --git a/app/pkg/web/engine.go b/app/pkg/web/engine.go
index 667bc25b1..4794f09cc 100644
--- a/app/pkg/web/engine.go
+++ b/app/pkg/web/engine.go
@@ -6,6 +6,7 @@ import (
"fmt"
+ "github.com/WeCanHearYou/wechy/app/models"
"github.com/WeCanHearYou/wechy/app/pkg/env"
"github.com/labstack/echo"
"github.com/labstack/echo/middleware"
@@ -18,12 +19,12 @@ type Engine struct {
}
//New creates a new Engine
-func New() *Engine {
+func New(settings *models.WeCHYSettings) *Engine {
router := echo.New()
router.Use(middleware.Gzip())
router.Static("/favicon.ico", "favicon.ico")
router.Logger = createLogger()
- router.Renderer = NewHTMLRenderer(router.Logger)
+ router.Renderer = NewHTMLRenderer(settings, router.Logger)
router.HTTPErrorHandler = errorHandler
return &Engine{router: router}
}
diff --git a/app/pkg/web/renderer.go b/app/pkg/web/renderer.go
index b6158ad7f..fb9c8d7c1 100644
--- a/app/pkg/web/renderer.go
+++ b/app/pkg/web/renderer.go
@@ -5,10 +5,9 @@ import (
"html/template"
"io"
- "os"
-
"io/ioutil"
+ "github.com/WeCanHearYou/wechy/app/models"
"github.com/WeCanHearYou/wechy/app/pkg/env"
"github.com/labstack/echo"
)
@@ -17,11 +16,12 @@ import (
type HTMLRenderer struct {
templates map[string]*template.Template
logger echo.Logger
+ settings *models.WeCHYSettings
}
// NewHTMLRenderer creates a new HTMLRenderer
-func NewHTMLRenderer(logger echo.Logger) *HTMLRenderer {
- renderer := &HTMLRenderer{nil, logger}
+func NewHTMLRenderer(settings *models.WeCHYSettings, logger echo.Logger) *HTMLRenderer {
+ renderer := &HTMLRenderer{nil, logger, settings}
renderer.templates = make(map[string]*template.Template)
renderer.add("index.html")
@@ -58,9 +58,8 @@ func (r *HTMLRenderer) Render(w io.Writer, name string, data interface{}, c echo
}
m := data.(echo.Map)
- m["authEndpoint"] = os.Getenv("AUTH_ENDPOINT")
m["tenant"] = ctx.Tenant()
- m["env"] = env.Current()
+ m["settings"] = r.settings
if ctx.IsAuthenticated() {
m["__User"] = ctx.User()
diff --git a/main.go b/main.go
index 1023de961..231ac9f98 100644
--- a/main.go
+++ b/main.go
@@ -1,6 +1,8 @@
package main
import (
+ "runtime"
+
"github.com/WeCanHearYou/wechy/app/models"
"github.com/WeCanHearYou/wechy/app/pkg/dbx"
"github.com/WeCanHearYou/wechy/app/pkg/env"
@@ -50,6 +52,8 @@ func main() {
BuildTime: buildtime,
Version: version,
AuthEndpoint: env.MustGet("AUTH_ENDPOINT"),
+ Compiler: runtime.Version(),
+ Environment: env.Current(),
},
}
diff --git a/public/components/common.tsx b/public/components/common.tsx
index edaa34bd5..90e3fecfa 100644
--- a/public/components/common.tsx
+++ b/public/components/common.tsx
@@ -32,10 +32,13 @@ export const DisplayError = (props: {error?: Error}) => {
};
export const EnvironmentInfo = () => {
- const env = get<string>("env");
- if (env && env.toLowerCase() !== "production") {
+ const settings = get<any>("settings");
+ if (settings.Environment.toLowerCase() !== "production") {
return <div className="ui mini negative message no-border no-margin">
- Env: {env}
+ Env: { settings.Environment } |
+ Compiler: { settings.Compiler } |
+ Version: { settings.Version } |
+ BuildTime: { settings.BuildTime }
</div>;
}
return <div/>;
diff --git a/public/components/social_signin_button.tsx b/public/components/social_signin_button.tsx
index c9f4bc0be..a5c626272 100644
--- a/public/components/social_signin_button.tsx
+++ b/public/components/social_signin_button.tsx
@@ -18,7 +18,7 @@ export class SocialSignInButton extends React.Component<SocialSignInButtonProps,
}
public render() {
- const authEndpoint = get<string>("authEndpoint");
+ const authEndpoint = get<any>("settings").AuthEndpoint;
const providerClassName = this.props.provider === "google" ? "google plus" : "facebook";
const providerDisplayName = this.props.provider === "google" ? "Google" : "Facebook";
const oauthUrl = `${authEndpoint}/oauth/${this.props.provider}?redirect=${location.href}`;
diff --git a/router.go b/router.go
index aaf9ac67c..fa368d7e5 100644
--- a/router.go
+++ b/router.go
@@ -23,7 +23,7 @@ type WeCHYServices struct {
// GetMainEngine returns main HTTP engine
func GetMainEngine(ctx *WeCHYServices) *web.Engine {
- r := web.New()
+ r := web.New(ctx.Settings)
assets := r.Group("/assets")
{