Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

ui refactor

goenning65ac6b4504af
diff --git a/public/components/Header.tsx b/public/components/Header.tsx
index fd518443d..d8bf2f9d7 100644
--- a/public/components/Header.tsx
+++ b/public/components/Header.tsx
@@ -5,42 +5,40 @@ import { Gravatar } from "./Common";
import { SocialSignInButton } from "./SocialSignInButton";
export class Header extends React.Component<{}, {}> {
+ private dropdown: HTMLElement;
+ private list: HTMLElement;
+
+ public componentDidMount() {
+ $(this.dropdown).popup({
+ inline: true,
+ hoverable: true,
+ popup: this.list,
+ position : "bottom right"
+ });
+ }
+
public render() {
const user = getCurrentUser();
const tenant = get<Tenant>("tenant");
- const profile = user ?
- <a className="item right signin">
- <Gravatar email={user.email} />
- { user.name }
- <i className="dropdown icon"></i>
- </a> :
- <a className="item right signin">
- <Gravatar />
- Sign in
- <i className="dropdown icon"></i>
- </a>;
-
- const dropdown = user ?
- <div id="user-popup" className="ui popup top left transition hidden">
- <div className="ui">
+ const items = user ? <div className="ui list">
<div className="item">
- <a href="/logout?redirect=/">
- Sign out
- </a>
+ { user.email }
+ </div>
+ <div className="item right">
+ <a href="/logout?redirect=/">
+ Sign out
+ </a>
</div>
- </div>
- </div> :
- <div id="user-popup" className="ui popup top left transition hidden">
- <div className="ui list">
+ </div> :
+ <div className="ui list">
<div className="item">
<SocialSignInButton provider="facebook"/>
</div>
<div className="item">
<SocialSignInButton provider="google"/>
</div>
- </div>
- </div>;
+ </div>;
return <div>
<div className="ui menu">
@@ -48,10 +46,16 @@ export class Header extends React.Component<{}, {}> {
<a href="/" className="header item">
{ tenant.name }
</a>
- { profile }
+ <a ref={(e) => { this.dropdown = e; } } className="item right signin">
+ <Gravatar email={user.email} />
+ { user.name || "Sign in" }
+ <i className="dropdown icon"></i>
+ </a>
</div>
</div>
- { dropdown }
+ <div ref={(e) => { this.list = e; } } className="ui popup top left transition hidden">
+ { items }
+ </div>
</div>;
}
}
diff --git a/public/css/main.css b/public/css/main.css
index 5387fe457..38e4244bc 100644
--- a/public/css/main.css
+++ b/public/css/main.css
@@ -5,13 +5,20 @@
.ideas-list {
margin-top: 40px;
}
+
.ideas-list .vote-col {
text-align: center;
width: 140px;
}
+
.ideas-list .vote-col div {
display: block;
}
+
#footer {
margin-top: 50px;
+}
+
+.right {
+ text-align: right;
}
\ No newline at end of file
diff --git a/public/index.ts b/public/index.ts
index 2e6732513..92f488968 100644
--- a/public/index.ts
+++ b/public/index.ts
@@ -1,23 +1,7 @@
-import * as $ from "jquery";
import init from "./init";
-import * as storage from "./storage";
+import { setup } from "./storage";
import "./css/main.css";
-storage.setup();
-
-$(document).ready(() => {
- init();
-
- $(".ui.dropdown").dropdown();
-
- $(".menu .signin").popup({
- inline: true,
- hoverable: true,
- popup: "#user-popup",
- position : "bottom right",
- delay: {
- show: 300
- }
- });
-});
+setup();
+document.addEventListener("DOMContentLoaded", init);
diff --git a/public/init.tsx b/public/init.tsx
index ae0646369..57ceb6bfc 100644
--- a/public/init.tsx
+++ b/public/init.tsx
@@ -1,4 +1,3 @@
-// tslint:disable-next-line:no-unused-variable
import * as React from "react";
import * as ReactDOM from "react-dom";