Open platform to collect and prioritize feedback
remove gravatar from signup page (#230)
Guilherme Oenningcc2bd4c3ddf7
diff --git a/app/handlers/avatar.go b/app/handlers/avatar.goindex d064a6ee8..166a8fe9c 100644--- a/app/handlers/avatar.go+++ b/app/handlers/avatar.go@@ -18,7 +18,7 @@ func Avatar() web.HandlerFunc {return func(c web.Context) error {name := c.Param("name")size, _ := c.ParamAsInt("size")- email := c.QueryParam("e")+ email := c.QueryParam("e") //TODO: remove this parameter, not used anymoreid, err := c.ParamAsInt("id")if err == nil && id > 0 && email == "" {diff --git a/app/pkg/web/renderer.go b/app/pkg/web/renderer.goindex 47fbe458c..ad55c0a0a 100644--- a/app/pkg/web/renderer.go+++ b/app/pkg/web/renderer.go@@ -24,32 +24,21 @@ type Renderer struct {// NewRenderer creates a new Rendererfunc NewRenderer(settings *models.AppSettings, logger log.Logger) *Renderer {- renderer := &Renderer{+ r := &Renderer{templates: make(map[string]*template.Template),logger: logger,settings: settings,}- renderer.add("index.html")- renderer.add("403.html")- renderer.add("404.html")- renderer.add("500.html")+ r.add("index.html")+ r.add("403.html")+ r.add("404.html")+ r.add("500.html")- files, _ := ioutil.ReadDir(env.Path("/dist/js"))- if len(files) > 0 {- renderer.jsBundle = files[0].Name()- } else {- panic("JavaScript Bundle not found.")- }-- files, _ = ioutil.ReadDir(env.Path("/dist/css"))- if len(files) > 0 {- renderer.cssBundle = files[0].Name()- } else {- panic("CSS Bundle not found.")- }+ r.jsBundle = r.getBundle("/dist/js")+ r.cssBundle = r.getBundle("/dist/css")- return renderer+ return r}//Render a template based on parameters@@ -65,6 +54,14 @@ func (r *Renderer) add(name string) *template.Template {return tpl}+func (r *Renderer) getBundle(folder string) string {+ files, _ := ioutil.ReadDir(env.Path(folder))+ if len(files) > 0 {+ return files[0].Name()+ }+ panic(fmt.Sprintf("Bundle not found: %s.", folder))+}+//Render a template based on parametersfunc (r *Renderer) Render(w io.Writer, name string, data interface{}, ctx *Context) error {tmpl, ok := r.templates[name]@@ -74,6 +71,8 @@ func (r *Renderer) Render(w io.Writer, name string, data interface{}, ctx *Conteif env.IsDevelopment() {tmpl = r.add(name)+ r.jsBundle = r.getBundle("/dist/js")+ r.cssBundle = r.getBundle("/dist/css")}m := data.(Map)diff --git a/public/components/common/Gravatar.tsx b/public/components/common/Gravatar.tsxindex 4fd650dae..96eb9e6a2 100644--- a/public/components/common/Gravatar.tsx+++ b/public/components/common/Gravatar.tsx@@ -4,16 +4,13 @@ import { User } from '@fider/models';interface GravatarProps {user?: User;- name?: string;- email?: string;}export const Gravatar = (props: GravatarProps) => {- const name = props.name ? props.name : props.user ? props.user.name : '_';+ const name = props.user ? props.user.name : '_';const id = props.user ? props.user.id : 0;- const queryString = props.email ? `?e=${encodeURIComponent(props.email)}` : '';- const url = `${getBaseUrl()}/avatars/50/${id}/${encodeURIComponent(name)}${queryString}`;+ const url = `${getBaseUrl()}/avatars/50/${id}/${encodeURIComponent(name)}`;const isCollaborator = props.user ? props.user.role >= 2 : false;let element: any;diff --git a/public/pages/signup/SignUpPage.tsx b/public/pages/signup/SignUpPage.tsxindex d99bc997a..d4052ae5d 100644--- a/public/pages/signup/SignUpPage.tsx+++ b/public/pages/signup/SignUpPage.tsx@@ -140,7 +140,6 @@ export class SignUpPage extends React.Component<{}, SignUpPageState> {<div><p>Hello, - <Gravatar name={this.user.name} email={this.user.email} /><b>{this.user.name}</b> {this.user.email && `(${this.user.email})`}</p></div> :