Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

Step 1 to support login via e-mail (#121)

Guilherme Oenninga7dfabe3827c
diff --git a/app/pkg/validate/domain.go b/app/pkg/validate/domain.go
index 09f8e847e..730fdbb1b 100644
--- a/app/pkg/validate/domain.go
+++ b/app/pkg/validate/domain.go
@@ -29,7 +29,7 @@ func Subdomain(tenants storage.Tenant, subdomain string) *Result {
switch subdomain {
case
- "signup", "fider", "admin", "setup", "about", "wecanhearyou", "dev",
+ "signup", "fider", "admin", "setup", "about", "wecanhearyou", "dev", "mail",
"billing", "www", "web", "translate", "help", "support", "staging":
return Failed([]string{fmt.Sprintf("%s is a reserved subdomain.", subdomain)})
}
diff --git a/public/assets/styles/form.scss b/public/assets/styles/form.scss
index d0caba2ae..344de391e 100644
--- a/public/assets/styles/form.scss
+++ b/public/assets/styles/form.scss
@@ -4,4 +4,8 @@
color: rgba(0,0,0,.6);
padding: 5px 0px 0px 5px;
}
+}
+
+textarea {
+ resize: none !important;
}
\ No newline at end of file
diff --git a/public/assets/styles/main.scss b/public/assets/styles/main.scss
index 96d469de5..949e24d78 100644
--- a/public/assets/styles/main.scss
+++ b/public/assets/styles/main.scss
@@ -1,5 +1,6 @@
@import 'variables.scss';
@import 'form.scss';
+@import 'semantic.scss';
.center {
text-align: center;
@@ -114,10 +115,6 @@ code {
}
}
-textarea {
- resize: none !important;
-}
-
.support-counter {
margin-right: 10px;
@@ -234,8 +231,29 @@ textarea {
background-color: $menu-color;
}
-.ui.popup.login-message {
- min-width: 360px;
+.login-options{
+ .ui.stackable.grid>.column:not(.row),
+ .column {
+ padding: 10px 5px !important;
+ }
+
+ .button.fluid {
+ padding: 10px 5px;
+ }
+}
+
+#login-modal {
+ text-align: center;
+
+ @media only screen and (max-width: 767px) {
+ width: 95%;
+ margin: 0em 0em 0em -47.5%;
+ }
+
+ @media only screen and (min-width: 768px) {
+ width: 440px;
+ margin: 0 0 0 -220px;
+ }
}
.ui.main-color {
diff --git a/public/assets/styles/semantic.scss b/public/assets/styles/semantic.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/public/components/CommentInput.tsx b/public/components/CommentInput.tsx
index 9a0cb6994..5f169af30 100644
--- a/public/components/CommentInput.tsx
+++ b/public/components/CommentInput.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
import Textarea from 'react-textarea-autosize';
import { Idea, User } from '@fider/models';
-import { Gravatar, UserName, Button, DisplayError, SocialSignInList } from '@fider/components/common';
+import { Gravatar, UserName, Button, DisplayError, LogInControl } from '@fider/components/common';
import { inject, injectables } from '@fider/di';
import { Session, IdeaService, Failure } from '@fider/services';
@@ -61,11 +61,10 @@ export class CommentInput extends React.Component<CommentInputProps, CommentInpu
<div className="header">
Log in to raise your voice.
</div>
- <p className="info">We'll never post to any of your accounts.</p>
- <SocialSignInList orientation="horizontal" size="small" />
+ <LogInControl />
</div>;
- return <div className="comment-input">
+ return <div className={`comment-input ${user && 'authenticated' }`}>
<Gravatar name={ this.user.name } hash={ this.user.gravatar }/>
<div className="ui form">
<UserName user={ user } />
diff --git a/public/components/IdeaInput.tsx b/public/components/IdeaInput.tsx
index 57b176994..d01b9380a 100644
--- a/public/components/IdeaInput.tsx
+++ b/public/components/IdeaInput.tsx
@@ -1,6 +1,6 @@
import * as React from 'react';
import Textarea from 'react-textarea-autosize';
-import { DisplayError, Button, Form, SocialSignInList } from '@fider/components/common';
+import { DisplayError, Button, Form, LogInControl } from '@fider/components/common';
import { inject, injectables } from '@fider/di';
import { Session, IdeaService, Failure } from '@fider/services';
@@ -74,14 +74,11 @@ export class IdeaInput extends React.Component<IdeaInputProps, IdeaInputState> {
Submit
</Button>
</div> :
- <div>
- <div className="ui message login-message">
- <div className="header">
- Log in to raise your voice.
- </div>
- <p className="info">We'll never post to any of your accounts.</p>
- <SocialSignInList orientation="horizontal" size="small" />
+ <div className="ui message login-message">
+ <div className="header">
+ Log in to raise your voice.
</div>
+ <LogInControl />
</div>;
return <Form ref={(f) => { this.form = f!; } } onSubmit={() => this.submit()}>
diff --git a/public/components/LogInModal.tsx b/public/components/LogInModal.tsx
new file mode 100644
index 000000000..726d6349a
--- /dev/null
+++ b/public/components/LogInModal.tsx
@@ -0,0 +1,15 @@
+import * as React from 'react';
+import { LogInControl } from '@fider/components/common';
+
+export class LogInModal extends React.Component<{}, {}> {
+ public render() {
+ return <div id="login-modal" className="ui modal small">
+ <div className="header">
+ Log in to raise your voice.
+ </div>
+ <div className="content">
+ <LogInControl />
+ </div>
+ </div>;
+ }
+}
diff --git a/public/components/ResponseForm.tsx b/public/components/ResponseForm.tsx
index 78698329b..22609ca45 100644
--- a/public/components/ResponseForm.tsx
+++ b/public/components/ResponseForm.tsx
@@ -44,7 +44,9 @@ export class ResponseForm extends React.Component<ResponseFormProps, ResponseFor
}
private showModal() {
- $(this.modal).modal('show');
+ $(this.modal).modal({
+ blurring: true
+ }).modal('show');
}
private closeModel() {
diff --git a/public/components/SupportCounter.tsx b/public/components/SupportCounter.tsx
index 399b7fa5e..fe3fd379b 100644
--- a/public/components/SupportCounter.tsx
+++ b/public/components/SupportCounter.tsx
@@ -1,6 +1,6 @@
import * as React from 'react';
import { Idea, User, IdeaStatus } from '@fider/models';
-import { SocialSignInList } from '@fider/components/common';
+import { LogInControl } from '@fider/components/common';
import { inject, injectables } from '@fider/di';
import { Session, IdeaService } from '@fider/services';
@@ -16,9 +16,6 @@ interface SupportCounterState {
}
export class SupportCounter extends React.Component<SupportCounterProps, SupportCounterState> {
- private elem: HTMLElement;
- private list: HTMLElement;
-
@inject(injectables.Session)
public session: Session;
@@ -35,21 +32,11 @@ export class SupportCounter extends React.Component<SupportCounterProps, Support
};
}
- public componentDidMount() {
- if (!this.props.user) {
- $(this.elem).popup({
- inline: true,
- hoverable: true,
- popup: this.list,
- on: 'click',
- position : 'bottom left'
- });
- return;
- }
- }
-
public async supportOrUndo() {
if (!this.props.user) {
+ $('#login-modal').modal({
+ blurring: true
+ }).modal('show');
return;
}
@@ -71,7 +58,7 @@ export class SupportCounter extends React.Component<SupportCounterProps, Support
const noTouch = !('ontouchstart' in window);
const status = IdeaStatus.Get(this.props.idea.status);
- const vote = <button ref={(e) => { this.elem = e!; } }
+ const vote = <button
className={`ui button ${noTouch ? 'no-touch' : ''} ${this.state.supported ? 'supported' : ''} `}
onClick={async () => await this.supportOrUndo()}>
<i className="medium caret up icon"></i>
@@ -83,17 +70,8 @@ export class SupportCounter extends React.Component<SupportCounterProps, Support
{ this.state.total }
</div>;
- return <div>
- <div className="support-counter ui">
- { status.closed ? disabled : vote }
- </div>
- <div ref={(e) => { this.list = e!; } } className="ui popup transition hidden login-message">
- <div className="header">
- Log in to raise your voice.
- </div>
- <p className="info">We'll never post to any of your accounts.</p>
- <SocialSignInList orientation="horizontal" size="small" />
- </div>
+ return <div className="support-counter ui">
+ { status.closed ? disabled : vote }
</div>;
}
}
diff --git a/public/components/common/Button.tsx b/public/components/common/Button.tsx
index 9bd154755..7020ca0ff 100644
--- a/public/components/common/Button.tsx
+++ b/public/components/common/Button.tsx
@@ -3,7 +3,7 @@ import * as React from 'react';
interface ButtonProps {
className?: string;
href?: string;
- size?: 'tiny' | 'large';
+ size?: 'tiny' | 'small' | 'large';
onClick?: () => Promise<any>;
}
diff --git a/public/components/common/Header.tsx b/public/components/common/Header.tsx
index 09d821846..4aa05cca7 100644
--- a/public/components/common/Header.tsx
+++ b/public/components/common/Header.tsx
@@ -1,6 +1,6 @@
import * as React from 'react';
import { User, Tenant } from '@fider/models';
-import { SocialSignInList, EnvironmentInfo, Gravatar } from '@fider/components/common';
+import { LogInControl, EnvironmentInfo, Gravatar } from '@fider/components/common';
import { inject, injectables } from '@fider/di';
import { Session } from '@fider/services/Session';
@@ -22,17 +22,26 @@ export class Header extends React.Component<{}, {}> {
}
public componentDidMount() {
- $(this.dropdown).popup({
- inline: true,
- hoverable: true,
- popup: this.list,
- position : 'bottom right'
- });
+ if (this.user) {
+ $(this.dropdown).popup({
+ inline: true,
+ hoverable: true,
+ popup: this.list,
+ position : 'bottom right'
+ });
+ }
+ }
+
+ private showModal() {
+ if (!this.user) {
+ $('#login-modal').modal({
+ blurring: true
+ }).modal('show');
+ }
}
public render() {
- const items = this.user ?
- <div className="ui divided list">
+ const items = <div className="ui divided list">
{
this.session.isStaff() &&
<div className="item">
@@ -46,8 +55,7 @@ export class Header extends React.Component<{}, {}> {
Log out
</a>
</div>
- </div> :
- <SocialSignInList orientation="vertical" size="normal" />;
+ </div>;
return <div>
<EnvironmentInfo />
@@ -56,10 +64,10 @@ export class Header extends React.Component<{}, {}> {
<a href="/" className="header item">
{ this.tenant.name }
</a>
- <a ref={(e) => { this.dropdown = e!; } } className={`item right signin ${!this.user.name && 'subtitle' }`}>
+ <a ref={(e) => { this.dropdown = e!; } } onClick={ () => this.showModal() } className={`item login right ${!this.user.name && 'subtitle' }`}>
<Gravatar name={this.user.name} hash={this.user.gravatar} />
{ this.user.name || 'Log in' }
- <i className="dropdown icon"></i>
+ { this.user.name && <i className="dropdown icon"></i> }
</a>
</div>
</div>
diff --git a/public/components/common/LogInControl.tsx b/public/components/common/LogInControl.tsx
new file mode 100644
index 000000000..f0cb81033
--- /dev/null
+++ b/public/components/common/LogInControl.tsx
@@ -0,0 +1,45 @@
+import * as React from 'react';
+import { SocialLogInButton } from '@fider/components/common';
+import { inject, injectables } from '@fider/di';
+import { Session } from '@fider/services/Session';
+import { AuthSettings } from '@fider/models';
+
+export class LogInControl extends React.Component<{}, {}> {
+
+ @inject(injectables.Session)
+ public session: Session;
+
+ public render() {
+ const settings = this.session.get<AuthSettings>('auth');
+
+ const google = settings.providers.google &&
+ <div className="column">
+ <SocialLogInButton provider="google" />
+ </div>;
+ const facebook = settings.providers.facebook &&
+ <div className="column">
+ <SocialLogInButton provider="facebook" />
+ </div>;
+ const github = settings.providers.github &&
+ <div className="column">
+ <SocialLogInButton provider="github" />
+ </div>;
+
+ return <div className="login-options">
+ <p className="info">We'll never post to any of your accounts.</p>
+ <div className="ui stackable three column centered grid">
+ { facebook }
+ { google }
+ { github }
+ </div>
+ </div>;
+ }
+}
+
+/*
+<div className="ui horizontal divider">OR</div>
+<div className="ui small action fluid input">
+ <input type="text" placeholder="Log in with e-mail" className="small" />
+ <button className="ui small disabled primary button">Log in</button>
+</div>
+*/
diff --git a/public/components/common/SocialSignInButton.tsx b/public/components/common/SocialLogInButton.tsx
similarity index 59%
rename from public/components/common/SocialSignInButton.tsx
rename to public/components/common/SocialLogInButton.tsx
index 907415aff..051bd7cc1 100644
--- a/public/components/common/SocialSignInButton.tsx
+++ b/public/components/common/SocialLogInButton.tsx
@@ -5,9 +5,8 @@ import { Session } from '@fider/services/Session';
import { Button } from '@fider/components/common';
import { AuthSettings } from '@fider/models';
-interface SocialSignInButtonProps {
+interface SocialLogInButtonProps {
provider: 'google' | 'facebook' | 'github';
- size: 'small' | 'normal';
}
const providers = {
@@ -28,7 +27,7 @@ const providers = {
}
};
-export class SocialSignInButton extends React.Component<SocialSignInButtonProps, {}> {
+export class SocialLogInButton extends React.Component<SocialLogInButtonProps, {}> {
@inject(injectables.Session)
public session: Session;
@@ -37,12 +36,10 @@ export class SocialSignInButton extends React.Component<SocialSignInButtonProps,
const auth = this.session.get<AuthSettings>('auth');
const href = `${auth.endpoint}/oauth/${this.props.provider}?redirect=${location.href}`;
- const btnClasses = `${providers[this.props.provider].class} ${this.props.size === 'small' ? 'icon' : 'fluid'}`;
- const iconClasses = `icon ${providers[this.props.provider].icon} ${this.props.size === 'small' ? 'large' : ''}`;
- return <Button href={href} className={btnClasses}>
- <i className={iconClasses}></i>
- { this.props.size === 'normal' && `${providers[this.props.provider].name}` }
+ return <Button size="small" href={href} className={`${providers[this.props.provider].class} fluid`}>
+ <i className={`icon ${providers[this.props.provider].icon}`}></i>
+ <span>{ providers[this.props.provider].name }</span>
</Button>;
}
}
diff --git a/public/components/common/SocialSignInList.tsx b/public/components/common/SocialSignInList.tsx
deleted file mode 100644
index f620f57f8..000000000
--- a/public/components/common/SocialSignInList.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import * as React from 'react';
-import { SocialSignInButton } from '@fider/components/common';
-import { inject, injectables } from '@fider/di';
-import { Session } from '@fider/services/Session';
-import { AuthSettings } from '@fider/models';
-
-interface SocialSignInListProps {
- size: 'small' | 'normal';
- orientation: 'horizontal' | 'vertical';
-}
-
-export class SocialSignInList extends React.Component<SocialSignInListProps, {}> {
-
- @inject(injectables.Session)
- public session: Session;
-
- constructor(props: SocialSignInListProps) {
- super(props);
- }
-
- public render() {
- const settings = this.session.get<AuthSettings>('auth');
- const cssClasses = this.props.orientation === 'horizontal' ? 'horizontal' : '';
-
- const google = settings.providers.google &&
- <div className="item">
- <SocialSignInButton provider="google" size={this.props.size} />
- </div>;
- const facebook = settings.providers.facebook &&
- <div className="item">
- <SocialSignInButton provider="facebook" size={this.props.size} />
- </div>;
- const github = settings.providers.github &&
- <div className="item">
- <SocialSignInButton provider="github" size={this.props.size} />
- </div>;
-
- const noAuth = !facebook && !google &&
- <div className="item">
- <div className="ui tertiary inverted red segment">
- No authentication methods available.
- </div>
- </div>;
-
- return <div className={`ui list signin-list ${cssClasses}`}>
- { facebook }
- { google }
- { github }
- { noAuth }
- </div>;
- }
-}
diff --git a/public/components/common/index.tsx b/public/components/common/index.tsx
index a4d862e86..c4d6a2e6e 100644
--- a/public/components/common/index.tsx
+++ b/public/components/common/index.tsx
@@ -6,7 +6,7 @@ export * from './EnvironmentInfo';
export * from './Gravatar';
export * from './Footer';
export * from './Header';
-export * from './SocialSignInButton';
-export * from './SocialSignInList';
+export * from './SocialLogInButton';
+export * from './LogInControl';
export * from './Moment';
export * from './UserName';
diff --git a/public/index.tsx b/public/index.tsx
index 0ecdcb2d3..cb8966414 100644
--- a/public/index.tsx
+++ b/public/index.tsx
@@ -1,6 +1,7 @@
import * as React from 'react';
import * as ReactDOM from 'react-dom';
+import { LogInModal } from '@fider/components/LogInModal';
import { AdminHomePage } from '@fider/pages/admin/AdminHomePage';
import { SiteHomePage } from '@fider/pages/site/SiteHomePage';
import { ShowIdeaPage } from '@fider/pages/site/ShowIdeaPage';
@@ -21,26 +22,33 @@ container.bind<Session>(injectables.Session).toConstantValue(new BrowserSession(
container.bind<IdeaService>(injectables.IdeaService).to(HttpIdeaService);
container.bind<TenantService>(injectables.TenantService).to(HttpTenantService);
+interface PageConfiguration {
+ id: string;
+ regex: RegExp;
+ component: JSX.Element;
+}
+
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 />, id: 'fdr-home-page' },
+ { regex: new RegExp('^\/admin$'), component: <AdminHomePage />, id: 'fdr-admin-page' },
+ { regex: new RegExp('^\/signup$'), component: <SignUpPage />, id: 'fdr-signup-page' },
+ { regex: new RegExp('^\/ideas\/\\d+.*$'), component: <ShowIdeaPage />, id: 'fdr-show-idea-page' },
];
-const resolveRootComponent = (path: string): JSX.Element => {
+const resolveRootComponent = (path: string): PageConfiguration | undefined => {
for (const entry of pathRegex) {
if (entry.regex.test(path)) {
- return entry.component;
+ return entry;
}
}
-
- return <div />;
};
document.addEventListener('DOMContentLoaded', () => {
+ const config = resolveRootComponent(location.pathname)!;
ReactDOM.render(
- resolveRootComponent(location.pathname),
- document.getElementById('root')
+ <div id={ config.id }>
+ <LogInModal />
+ { config.component }
+ </div>, document.getElementById('root')
);
});
diff --git a/public/pages/signup/SignUpPage.scss b/public/pages/signup/SignUpPage.scss
index 7a0bba8ad..793dbd79b 100644
--- a/public/pages/signup/SignUpPage.scss
+++ b/public/pages/signup/SignUpPage.scss
@@ -1,7 +1,9 @@
#fdr-signup-page {
- margin-top: 50px;
- max-width: 500px !important;
- text-align: center;
+ .page {
+ margin-top: 50px;
+ max-width: 500px !important;
+ text-align: center;
+ }
.fdr-avatar {
margin-right: 5px;
@@ -11,6 +13,11 @@
height: 100px;
}
+ .login-options {
+ width: 400px;
+ margin: 0 auto;
+ }
+
.ui.form {
.ui.input, .field > input {
width: 300px;
diff --git a/public/pages/signup/SignUpPage.tsx b/public/pages/signup/SignUpPage.tsx
index 1b4437942..8b8333889 100644
--- a/public/pages/signup/SignUpPage.tsx
+++ b/public/pages/signup/SignUpPage.tsx
@@ -1,6 +1,6 @@
import * as React from 'react';
-import { SocialSignInList, Footer, Button, EnvironmentInfo, Gravatar, DisplayError } from '@fider/components/common';
+import { LogInControl, Footer, Button, EnvironmentInfo, Gravatar, DisplayError } from '@fider/components/common';
import { AppSettings } from '@fider/models';
import { setTitle, getQueryString } from '@fider/utils/page';
import { decode } from '@fider/utils/jwt';
@@ -47,7 +47,7 @@ export class SignUpPage extends React.Component<{}, SignUpPageState> {
this.settings = this.session.getAppSettings();
this.checkAvailability = td.debounce(300, this.checkAvailability);
- setTitle(this.session.isSingleHostMode() ? 'Installation · Fider' : 'New tenant · Fider');
+ setTitle(this.session.isSingleHostMode() ? 'Installation · Fider' : 'Sign up · Fider');
const token = getQueryString('jwt');
if (token) {
@@ -92,7 +92,7 @@ export class SignUpPage extends React.Component<{}, SignUpPageState> {
public render() {
return <div>
<EnvironmentInfo />
- <div id="fdr-signup-page" className="page ui container">
+ <div className="page ui container">
<img className="logo" src={logo} />
<h3 className="ui header">1. Who are you?</h3>
@@ -109,7 +109,7 @@ export class SignUpPage extends React.Component<{}, SignUpPageState> {
</div> :
<div>
<p>We need to identify you in order to setup your new Fider instance.</p>
- <SocialSignInList size="normal" orientation="horizontal" />
+ <LogInControl />
</div>
}
diff --git a/public/pages/site/ShowIdeaPage.scss b/public/pages/site/ShowIdeaPage.scss
index 3dcd0731c..fa891f06c 100644
--- a/public/pages/site/ShowIdeaPage.scss
+++ b/public/pages/site/ShowIdeaPage.scss
@@ -1,4 +1,4 @@
-.ShowIdeaPage {
+#fdr-show-idea-page {
.idea-header {
h1 {
font-weight: 400;
@@ -31,7 +31,13 @@
.form {
display: inline-block;
- width: 85%;
+ width: 100%;
+ }
+
+ &.authenticated{
+ .form {
+ width: 85%;
+ }
}
}
}
\ No newline at end of file
diff --git a/public/pages/site/ShowIdeaPage.tsx b/public/pages/site/ShowIdeaPage.tsx
index 445c7ad8e..311630988 100644
--- a/public/pages/site/ShowIdeaPage.tsx
+++ b/public/pages/site/ShowIdeaPage.tsx
@@ -7,7 +7,7 @@ import { CommentInput } from '@fider/components/CommentInput';
import { ResponseForm } from '@fider/components/ResponseForm';
import { SupportCounter } from '@fider/components/SupportCounter';
import { ShowIdeaResponse } from '@fider/components/ShowIdeaResponse';
-import { Button, UserName, Gravatar, Moment, MultiLineText, Footer, Header, SocialSignInButton } from '@fider/components/common';
+import { Button, UserName, Gravatar, Moment, MultiLineText, Footer, Header, SocialLogInButton } from '@fider/components/common';
import { inject, injectables } from '@fider/di';
import { Session } from '@fider/services';
@@ -48,7 +48,7 @@ export class ShowIdeaPage extends React.Component<{}, {}> {
</div>
);
- return <div className="ShowIdeaPage">
+ return <div>
<Header />
<div className="page ui container">
<div className="ui stackable grid container">
diff --git a/public/pages/site/SiteHomePage.scss b/public/pages/site/SiteHomePage.scss
index 29c541b79..1a8b9f8f3 100644
--- a/public/pages/site/SiteHomePage.scss
+++ b/public/pages/site/SiteHomePage.scss
@@ -1,6 +1,6 @@
@import '~@fider/assets/styles/variables.scss';
-.SiteHomePage {
+#fdr-home-page {
.welcome-message {
margin-bottom: 20px;
@@ -18,7 +18,7 @@
}
.description {
- color:rgba(0, 0, 0, 0.6);
+ color:rgba(0, 0, 0, 0.5) !important;
min-height: 20px;
margin-bottom: 10px;
}
@@ -28,11 +28,24 @@
#new-idea-input {
margin-bottom: 20px;
border: none;
- border-bottom: 1.5px dashed $main-color;
+ border-bottom: 1px dashed $main-color;
font-size: 18px;
background-color: $bg-color;
padding: 0px 0px 10px 0px;
font-weight: bold;
margin: 0px 0px 10px 0px;
+ border-radius: 0;
}
+
+ .login-message {
+ @media only screen and (min-width: 768px) and (max-width: 991px) {
+ span {
+ display: none;
+ }
+ i {
+ margin: 0 auto !important;
+ }
+ }
+ }
+
}
\ No newline at end of file
diff --git a/public/pages/site/SiteHomePage.tsx b/public/pages/site/SiteHomePage.tsx
index 6d4e4015e..6dacbdf52 100644
--- a/public/pages/site/SiteHomePage.tsx
+++ b/public/pages/site/SiteHomePage.tsx
@@ -71,7 +71,7 @@ export class SiteHomePage extends React.Component<{}, SiteHomePageState> {
We'd love to hear what you're thinking about. What can we do better? This is the place for you to vote, discuss and share ideas.`;
- return <div className="SiteHomePage">
+ return <div>
<Header />
<div className="page ui container">
diff --git a/public/tsd.d.ts b/public/tsd.d.ts
index e5da26ff2..d934c1492 100644
--- a/public/tsd.d.ts
+++ b/public/tsd.d.ts
@@ -1,5 +1,5 @@
interface JQuery {
- modal(action: string): any;
+ modal(ops: any): any;
popup(args: any): any;
dropdown(args?: any): any;
}
diff --git a/tests/pages/HomePage.ts b/tests/pages/HomePage.ts
index 9cacc2e71..901fe23a6 100644
--- a/tests/pages/HomePage.ts
+++ b/tests/pages/HomePage.ts
@@ -20,13 +20,13 @@ export class HomePage extends Page {
@findBy('.ui.button.primary')
public SubmitIdea: Button;
- @findBy('.signin')
+ @findBy('.login')
public UserMenu: WebComponent;
- @findBy('.fdr-profile-popup .button.google')
+ @findBy('#login-modal .button.google')
public GoogleSignIn: Button;
- @findBy('.fdr-profile-popup .button.facebook')
+ @findBy('#login-modal .button.facebook')
public FacebookSignIn: Button;
@findBy('.ui.form .ui.negative.message')