Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

Remove PoweredBy text and internal cleanup (#108)

Guilherme Oenninga1dbe6ec2356
diff --git a/README.md b/README.md
index c32da0aed..cf81eed36 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-![](/public/images/logo-small.png)
+![](/public/assets/images/logo-small.png)
[![status](https://app.wercker.com/status/99ca65c4a8cd5711504a19deedbc6461/s/master)](https://app.wercker.com/project/byKey/99ca65c4a8cd5711504a19deedbc6461)
[![codecov](https://codecov.io/gh/getfider/fider/branch/master/graph/badge.svg)](https://codecov.io/gh/getfider/fider)
diff --git a/app/handlers/admin.go b/app/handlers/admin.go
index 72a946db3..7a4d19aaa 100644
--- a/app/handlers/admin.go
+++ b/app/handlers/admin.go
@@ -12,7 +12,7 @@ func UpdateSettings() web.HandlerFunc {
if result := c.BindTo(input); !result.Ok {
return c.HandleValidation(result)
}
- err := c.Services().Tenants.UpdateSettings(c.Tenant().ID, input.Model.Title, input.Model.Invitation, input.Model.WelcomeMessage)
+ err := c.Services().Tenants.UpdateSettings(c.Tenant().ID, input.Model)
if err != nil {
return c.Failure(err)
}
diff --git a/app/storage/identity.go b/app/storage/identity.go
index 4a08c19c3..4ff99fa5e 100644
--- a/app/storage/identity.go
+++ b/app/storage/identity.go
@@ -16,6 +16,6 @@ type Tenant interface {
Add(name string, subdomain string) (*models.Tenant, error)
First() (*models.Tenant, error)
GetByDomain(domain string) (*models.Tenant, error)
- UpdateSettings(tenantID int, title, invitation, welcomeMessage string) error
+ UpdateSettings(tenantID int, settings *models.UpdateTenantSettings) error
IsSubdomainAvailable(subdomain string) (bool, error)
}
diff --git a/app/storage/inmemory/tenant.go b/app/storage/inmemory/tenant.go
index 321241da0..88da64a2f 100644
--- a/app/storage/inmemory/tenant.go
+++ b/app/storage/inmemory/tenant.go
@@ -52,12 +52,12 @@ func (s *TenantStorage) IsSubdomainAvailable(subdomain string) (bool, error) {
}
// UpdateSettings of given tenant
-func (s *TenantStorage) UpdateSettings(tenantID int, title, invitation, welcomeMessage string) error {
+func (s *TenantStorage) UpdateSettings(tenantID int, settings *models.UpdateTenantSettings) error {
for _, tenant := range s.tenants {
if tenant.ID == tenantID {
- tenant.Invitation = invitation
- tenant.WelcomeMessage = welcomeMessage
- tenant.Name = title
+ tenant.Invitation = settings.Invitation
+ tenant.WelcomeMessage = settings.WelcomeMessage
+ tenant.Name = settings.Title
return nil
}
}
diff --git a/app/storage/postgres/tenant.go b/app/storage/postgres/tenant.go
index 7a0b2cd21..51f0d7afb 100644
--- a/app/storage/postgres/tenant.go
+++ b/app/storage/postgres/tenant.go
@@ -83,9 +83,9 @@ func (s *TenantStorage) GetByDomain(domain string) (*models.Tenant, error) {
}
// UpdateSettings of given tenant
-func (s *TenantStorage) UpdateSettings(tenantID int, title, invitation, welcomeMessage string) error {
+func (s *TenantStorage) UpdateSettings(tenantID int, settings *models.UpdateTenantSettings) error {
query := "UPDATE tenants SET name = $1, invitation = $2, welcome_message = $3 WHERE id = $4"
- return s.trx.Execute(query, title, invitation, welcomeMessage, tenantID)
+ return s.trx.Execute(query, settings.Title, settings.Invitation, settings.WelcomeMessage, tenantID)
}
// IsSubdomainAvailable returns true if subdomain is available to use
diff --git a/app/storage/postgres/tenant_test.go b/app/storage/postgres/tenant_test.go
index 1e10ea67a..e28a6abdf 100644
--- a/app/storage/postgres/tenant_test.go
+++ b/app/storage/postgres/tenant_test.go
@@ -3,6 +3,8 @@ package postgres_test
import (
"testing"
+ "github.com/getfider/fider/app/models"
+
"github.com/getfider/fider/app"
"github.com/getfider/fider/app/pkg/dbx"
"github.com/getfider/fider/app/storage/postgres"
@@ -125,7 +127,12 @@ func TestTenantStorage_UpdateSettings(t *testing.T) {
tenants := postgres.NewTenantStorage(trx)
tenant, _ := tenants.GetByDomain("demo")
- err := tenants.UpdateSettings(tenant.ID, "New Demonstration", "Leave us your suggestion", "Welcome!")
+ settings := &models.UpdateTenantSettings{
+ Title: "New Demonstration",
+ Invitation: "Leave us your suggestion",
+ WelcomeMessage: "Welcome!",
+ }
+ err := tenants.UpdateSettings(tenant.ID, settings)
Expect(err).To(BeNil())
tenant, err = tenants.GetByDomain("demo")
diff --git a/public/images/logo-small.png b/public/assets/images/logo-small.png
similarity index 100%
rename from public/images/logo-small.png
rename to public/assets/images/logo-small.png
diff --git a/public/images/logo.png b/public/assets/images/logo.png
similarity index 100%
rename from public/images/logo.png
rename to public/assets/images/logo.png
diff --git a/public/styles/form.scss b/public/assets/styles/form.scss
similarity index 100%
rename from public/styles/form.scss
rename to public/assets/styles/form.scss
diff --git a/public/styles/main.scss b/public/assets/styles/main.scss
similarity index 97%
rename from public/styles/main.scss
rename to public/assets/styles/main.scss
index aa453807b..f81c8dcd1 100644
--- a/public/styles/main.scss
+++ b/public/assets/styles/main.scss
@@ -149,7 +149,11 @@ code {
img {
width: 30px;
- filter: grayscale(100%)
+ filter: grayscale(100%);
+
+ &:hover {
+ filter: grayscale(0%)
+ }
}
}
}
diff --git a/public/styles/variables.scss b/public/assets/styles/variables.scss
similarity index 100%
rename from public/styles/variables.scss
rename to public/assets/styles/variables.scss
diff --git a/public/pages/home/IdeaFilter.tsx b/public/components/IdeaFilter.tsx
similarity index 100%
rename from public/pages/home/IdeaFilter.tsx
rename to public/components/IdeaFilter.tsx
diff --git a/public/pages/home/IdeaInput.tsx b/public/components/IdeaInput.tsx
similarity index 100%
rename from public/pages/home/IdeaInput.tsx
rename to public/components/IdeaInput.tsx
diff --git a/public/components/common/Footer.tsx b/public/components/common/Footer.tsx
index e97316175..ebb79b533 100644
--- a/public/components/common/Footer.tsx
+++ b/public/components/common/Footer.tsx
@@ -1,5 +1,5 @@
import * as React from 'react';
-const logo = require('@fider/images/logo-small.png');
+const logo = require('@fider/assets/images/logo-small.png');
export const Footer = () => {
return <div id="footer" className="ui vertical footer segment">
@@ -7,13 +7,7 @@ export const Footer = () => {
<div className="ui inverted section divider"></div>
<div className="ui horizontal small divided link list">
<div id="powered-by">
- <p>
- <span>Powered by </span>
- <b>
- <a className="item" target="_blank" href="http://getfider.com/">Fider</a>
- </b>
- </p>
- <p><img src={logo} /></p>
+ <a className="item" target="_blank" href="http://getfider.com/"><img src={logo} /></a>
</div>
</div>
</div>
diff --git a/public/components/common/SocialSignInButton.tsx b/public/components/common/SocialSignInButton.tsx
index 271c91a2b..74ba87dea 100644
--- a/public/components/common/SocialSignInButton.tsx
+++ b/public/components/common/SocialSignInButton.tsx
@@ -3,6 +3,7 @@ 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 {
provider: 'google' | 'facebook' | 'github';
@@ -33,7 +34,7 @@ export class SocialSignInButton extends React.Component<SocialSignInButtonProps,
public session: Session;
public render() {
- const auth = this.session.get<any>('auth');
+ const auth = this.session.get<AuthSettings>('auth');
const href = `${auth.endpoint}/oauth/${this.props.provider}?redirect=${location.href}`;
const classes = `${providers[this.props.provider].class} ${this.props.size === 'small' ? 'circular icon' : 'fluid'}`;
diff --git a/public/components/common/SocialSignInList.tsx b/public/components/common/SocialSignInList.tsx
index 9acb69d57..50eba9e71 100644
--- a/public/components/common/SocialSignInList.tsx
+++ b/public/components/common/SocialSignInList.tsx
@@ -2,15 +2,7 @@ import * as React from 'react';
import { SocialSignInButton } from '@fider/components/common';
import { inject, injectables } from '@fider/di';
import { Session } from '@fider/services/Session';
-
-interface AuthSettings {
- endpoint: string;
- providers: {
- google: boolean,
- facebook: boolean,
- github: boolean
- };
-}
+import { AuthSettings } from '@fider/models';
interface SocialSignInListProps {
size: 'small' | 'normal';
diff --git a/public/di/index.ts b/public/di.ts
similarity index 100%
rename from public/di/index.ts
rename to public/di.ts
diff --git a/public/index.tsx b/public/index.tsx
index 74a6f1324..0ecdcb2d3 100644
--- a/public/index.tsx
+++ b/public/index.tsx
@@ -2,45 +2,45 @@ import * as React from 'react';
import * as ReactDOM from 'react-dom';
import { AdminHomePage } from '@fider/pages/admin/AdminHomePage';
-import { SiteHomePage } from '@fider/pages/home/SiteHomePage';
-import { ShowIdeaPage } from '@fider/pages/ShowIdeaPage';
+import { SiteHomePage } from '@fider/pages/site/SiteHomePage';
+import { ShowIdeaPage } from '@fider/pages/site/ShowIdeaPage';
import { SignUpPage } from '@fider/pages/signup/SignUpPage';
import { container, injectables } from '@fider/di';
import {
- Session,
- BrowserSession,
- IdeaService,
- HttpIdeaService,
- TenantService,
- HttpTenantService
+ Session,
+ BrowserSession,
+ IdeaService,
+ HttpIdeaService,
+ TenantService,
+ HttpTenantService
} from '@fider/services';
+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);
-import '@fider/styles/main.scss';
-
const pathRegex = [
- { regex: new RegExp('^\/$'), component: <SiteHomePage /> },
- { regex: new RegExp('^\/admin$'), component: <AdminHomePage /> },
- { regex: new RegExp('^\/signup$'), component: <SignUpPage /> },
- { regex: new RegExp('^\/ideas\/\\d+.*$'), component: <ShowIdeaPage /> },
+ { regex: new RegExp('^\/$'), component: <SiteHomePage /> },
+ { regex: new RegExp('^\/admin$'), component: <AdminHomePage /> },
+ { regex: new RegExp('^\/signup$'), component: <SignUpPage /> },
+ { regex: new RegExp('^\/ideas\/\\d+.*$'), component: <ShowIdeaPage /> },
];
const resolveRootComponent = (path: string): JSX.Element => {
- for (const entry of pathRegex) {
- if (entry.regex.test(path)) {
- return entry.component;
- }
+ for (const entry of pathRegex) {
+ if (entry.regex.test(path)) {
+ return entry.component;
}
+ }
- return <div />;
+ return <div />;
};
document.addEventListener('DOMContentLoaded', () => {
ReactDOM.render(
- resolveRootComponent(location.pathname),
- document.getElementById('root')
+ resolveRootComponent(location.pathname),
+ document.getElementById('root')
);
});
diff --git a/public/models/settings.ts b/public/models/settings.ts
index 8832c8aaf..7cb087abb 100644
--- a/public/models/settings.ts
+++ b/public/models/settings.ts
@@ -8,3 +8,12 @@ export interface AppSettings {
compiler: string;
domain: string;
}
+
+export interface AuthSettings {
+ endpoint: string;
+ providers: {
+ google: boolean,
+ facebook: boolean,
+ github: boolean
+ };
+}
diff --git a/public/pages/admin/AdminHomePage.tsx b/public/pages/admin/AdminHomePage.tsx
index 80f126223..02fc6c57a 100644
--- a/public/pages/admin/AdminHomePage.tsx
+++ b/public/pages/admin/AdminHomePage.tsx
@@ -1,7 +1,9 @@
import * as React from 'react';
-import { Header, Footer, Button, DisplayError } from '@fider/components/common';
import { Tenant } from '@fider/models';
+import { setTitle } from '@fider/utils/page';
+
+import { Header, Footer, Button, DisplayError } from '@fider/components/common';
import { inject, injectables } from '@fider/di';
import { Session, TenantService, Failure } from '@fider/services';
@@ -31,6 +33,8 @@ export class AdminHomePage extends React.Component<{}, AdminHomePageState> {
welcomeMessage: this.tenant.welcomeMessage,
invitation: this.tenant.invitation
};
+
+ setTitle(`Administration · ${document.title}`);
}
private async confirm() {
diff --git a/public/pages/signup/SignUpPage.tsx b/public/pages/signup/SignUpPage.tsx
index 73df17e0a..3f4df98b0 100644
--- a/public/pages/signup/SignUpPage.tsx
+++ b/public/pages/signup/SignUpPage.tsx
@@ -5,7 +5,7 @@ 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/images/logo-small.png');
+const logo = require('@fider/assets/images/logo-small.png');
import { inject, injectables } from '@fider/di';
import { Session, TenantService, Failure } from '@fider/services';
diff --git a/public/pages/ShowIdeaPage.tsx b/public/pages/site/ShowIdeaPage.tsx
similarity index 97%
rename from public/pages/ShowIdeaPage.tsx
rename to public/pages/site/ShowIdeaPage.tsx
index 4aa96bc87..9bb6c8584 100644
--- a/public/pages/ShowIdeaPage.tsx
+++ b/public/pages/site/ShowIdeaPage.tsx
@@ -26,7 +26,7 @@ export class ShowIdeaPage extends React.Component<{}, {}> {
this.user = this.session.getCurrentUser();
this.idea = this.session.get<Idea>('idea');
this.comments = this.session.getArray<Comment>('comments');
- setTitle(`${this.idea.title} · Idea #${this.idea.number} · ${document.title}`);
+ setTitle(`${this.idea.title} · ${document.title}`);
}
public render() {
diff --git a/public/pages/home/SiteHomePage.scss b/public/pages/site/SiteHomePage.scss
similarity index 92%
rename from public/pages/home/SiteHomePage.scss
rename to public/pages/site/SiteHomePage.scss
index 6b030fd4d..69545e4b1 100644
--- a/public/pages/home/SiteHomePage.scss
+++ b/public/pages/site/SiteHomePage.scss
@@ -1,4 +1,4 @@
-@import '~@fider/styles/variables.scss';
+@import '~@fider/assets/styles/variables.scss';
.SiteHomePage {
diff --git a/public/pages/home/SiteHomePage.tsx b/public/pages/site/SiteHomePage.tsx
similarity index 96%
rename from public/pages/home/SiteHomePage.tsx
rename to public/pages/site/SiteHomePage.tsx
index dc134d3b8..090fde45e 100644
--- a/public/pages/home/SiteHomePage.tsx
+++ b/public/pages/site/SiteHomePage.tsx
@@ -3,8 +3,8 @@ import { Idea, IdeaStatus, User, Tenant } from '@fider/models';
import { Gravatar, MultiLineText, Moment, Header, Footer } from '@fider/components/common';
import { ShowIdeaResponse } from '@fider/components/ShowIdeaResponse';
import { SupportCounter } from '@fider/components/SupportCounter';
-import { IdeaInput } from './IdeaInput';
-import { IdeaFilter, IdeaFilterFunction } from './IdeaFilter';
+import { IdeaInput } from '@fider/components/IdeaInput';
+import { IdeaFilter, IdeaFilterFunction } from '@fider/components/IdeaFilter';
import { inject, injectables } from '@fider/di';
import { Session } from '@fider/services';