Open platform to collect and prioritize feedback
more refactoring
goenningcd33a2c88024
diff --git a/.vscode/settings.json b/.vscode/settings.jsonindex db5a8bac1..aab2e7948 100644--- a/.vscode/settings.json+++ b/.vscode/settings.json@@ -27,6 +27,8 @@"vendor": true},"vsicons.presets.angular": true,+ "go.coverOnSave": true,+ "go.coverageOptions": "showBothCoveredAndUncoveredCode","go.testEnvVars": {"GO_ENV": "test","HOST_MODE": "multi",diff --git a/app/handlers/common.go b/app/handlers/common.godeleted file mode 100644index 162047e02..000000000--- a/app/handlers/common.go+++ /dev/null@@ -1,20 +0,0 @@-package handlers--import (- "net/http"- "time"-- "github.com/getfider/fider/app/pkg/web"-)--// Logout remove auth cookies-func Logout() web.HandlerFunc {- return func(c web.Context) error {- c.SetCookie(&http.Cookie{- Name: "auth",- MaxAge: -1,- Expires: time.Now().Add(-100 * time.Hour),- })- return c.Redirect(http.StatusTemporaryRedirect, c.QueryParam("redirect"))- }-}diff --git a/app/handlers/identity.go b/app/handlers/identity.goindex d27a626f8..e7c7df4e7 100644--- a/app/handlers/identity.go+++ b/app/handlers/identity.go@@ -4,6 +4,7 @@ import ("net/http""net/url""strings"+ "time""github.com/getfider/fider/app""github.com/getfider/fider/app/models"@@ -109,6 +110,18 @@ func Login(provider string) web.HandlerFunc {}}+// Logout remove auth cookies+func Logout() web.HandlerFunc {+ return func(c web.Context) error {+ c.SetCookie(&http.Cookie{+ Name: "auth",+ MaxAge: -1,+ Expires: time.Now().Add(-100 * time.Hour),+ })+ return c.Redirect(http.StatusTemporaryRedirect, c.QueryParam("redirect"))+ }+}+func stripPort(hostport string) string {colon := strings.IndexByte(hostport, ':')if colon == -1 {diff --git a/app/models/feedback.go b/app/models/feedback.goindex 267e0311b..339510306 100644--- a/app/models/feedback.go+++ b/app/models/feedback.go@@ -18,9 +18,9 @@ type Idea struct {//IdeaResponse is a staff response to a given ideatype IdeaResponse struct {- Text string `json:"text"`- CreatedOn time.Time `json:"createdOn"` //TODO: Rename??- User *User `json:"user"`+ Text string `json:"text"`+ RespondedOn time.Time `json:"respondedOn"`+ User *User `json:"user"`}//Comment represents an user comment on an ideadiff --git a/app/storage/inmemory/idea.go b/app/storage/inmemory/idea.goindex 343541cfe..d362cde8a 100644--- a/app/storage/inmemory/idea.go+++ b/app/storage/inmemory/idea.go@@ -86,9 +86,9 @@ func (s *IdeaStorage) SetResponse(number int, text string, userID, status int) efor _, idea := range s.ideas {if idea.Number == number {idea.Response = &models.IdeaResponse{- Text: text,- User: &models.User{ID: userID},- CreatedOn: time.Now(),+ Text: text,+ User: &models.User{ID: userID},+ RespondedOn: time.Now(),}}}diff --git a/app/storage/postgres/idea.go b/app/storage/postgres/idea.goindex 472f02202..34ba46915 100644--- a/app/storage/postgres/idea.go+++ b/app/storage/postgres/idea.go@@ -41,9 +41,9 @@ func (i *dbIdea) toModel() *models.Idea {if i.Response.Valid {idea.Response = &models.IdeaResponse{- Text: i.Response.String,- CreatedOn: i.RespondedOn.Time,- User: i.ResponseUser.toModel(),+ Text: i.Response.String,+ RespondedOn: i.RespondedOn.Time,+ User: i.ResponseUser.toModel(),}}return ideadiff --git a/public/models.ts b/public/models.tsindex b37e900ed..cee9a88aa 100644--- a/public/models.ts+++ b/public/models.ts@@ -63,7 +63,7 @@ IdeaStatusMetadata[IdeaDeclined] = {export interface IdeaResponse {user: User;text: string;- createdOn: Date;+ respondedOn: Date;}export interface Comment {diff --git a/public/shared/Common.tsx b/public/shared/Common.tsxindex b08a2b6c6..f2133a88d 100644--- a/public/shared/Common.tsx+++ b/public/shared/Common.tsx@@ -64,7 +64,9 @@ export const ShowIdeaResponse = (props: IdeaResponseProps): JSX.Element => {<IdeaStatusRibbon status={props.status} /><div className="info"><Gravatar email={props.response.user.email}/> <u>{props.response.user.name}</u>- <span title={props.response.createdOn.toString()}>{ moment(props.response.createdOn).fromNow() }</span>+ <span title={props.response.respondedOn.toString()}>+ { moment(props.response.respondedOn).fromNow() }+ </span></div><div className="content"><MultiLineText text={ props.response.text } />diff --git a/public/shared/Header.tsx b/public/shared/Header.tsxindex 1aa2a8455..3822afc18 100644--- a/public/shared/Header.tsx+++ b/public/shared/Header.tsx@@ -1,6 +1,6 @@import * as React from "react";import { User, Tenant } from "../models";-import { get, getCurrentUser } from "../storage";+import { get, getCurrentUser, isStaff } from "../storage";import { EnvironmentInfo, Gravatar } from "./Common";import { SocialSignInList } from "./SocialSignInList";@@ -32,7 +32,8 @@ export class Header extends React.Component<{}, {}> {<div className="item"><b>{ this.user.email }</b></div>- { this.isStaff() &&+ {+ isStaff() &&<div className="item"><a href="/admin">Administration@@ -66,8 +67,4 @@ export class Header extends React.Component<{}, {}> {</div></div>;}-- private isStaff() {- return this.user.role >= 2;- }}diff --git a/public/shared/SupportCounter.tsx b/public/shared/SupportCounter.tsxindex 49e45805d..47fba9346 100644--- a/public/shared/SupportCounter.tsx+++ b/public/shared/SupportCounter.tsx@@ -55,7 +55,7 @@ export class SupportCounter extends React.Component<SupportCounterProps, Supporttotal: this.state.total + (this.state.supported ? -1 : 1)});} catch (ex) {- // TODO: handle this+ // TODO: handle this. we should have a global alert box}}diff --git a/public/storage.ts b/public/storage.tsindex d314fd4dc..84523fdac 100644--- a/public/storage.ts+++ b/public/storage.ts@@ -17,6 +17,10 @@ export function getCurrentUser(): User {return get<User>("user");}+export function isStaff() {+ return getCurrentUser().role >= 2;+}+export function set<T>(key: string, value: T) {w[`_${key}`] = value;}