Skip to content

Commit

Permalink
links to faq in footer, menu and welcome, actual core team #810 #776 #…
Browse files Browse the repository at this point in the history 
…669
  • Loading branch information
@beautyfree
beautyfree committed Sep 14, 2018
1 parent 3130848 commit 1ecb05a
Show file tree
Hide file tree
Showing 4 changed files with 101 additions and 113 deletions.
26 changes: 0 additions & 26 deletions app/components/elements/about/LandingTeam/core-team.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,32 +70,6 @@
"github": "maslenitsa93"
}
},
{
"name": "Ростислав Величко",
"role": "С++ dev",
"avatar": "rostislav",
"contacts": {
"golos": "rostislav.vel"
}
},
{
"name": "Тимур Купаев",
"role": "Блокчейн аналитик",
"avatar": "timur",
"contacts": {
"golos": "timurku",
"github": "timurkupaev"
}
},
{
"name": "Ерлан Шиндаулетов",
"avatar": "erlan",
"role": "Инженер-программист",
"contacts": {
"golos": "epexa",
"github": "epexa"
}
},
{
"name": "Анна Чемерицкая",
"role": "Community manager",
Expand Down
169 changes: 91 additions & 78 deletions app/components/modules/Footer.jsx
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
import React from 'react';
import {connect} from 'react-redux';
import { connect } from 'react-redux';
import tt from 'counterpart';
import {api} from 'golos-js';
import { api } from 'golos-js';
import Icon from 'app/components/elements/Icon';
import LocalizedCurrency from 'app/components/elements/LocalizedCurrency';
import { TERMS_OF_SERVICE_URL } from 'app/client_config';

class Footer extends React.Component {
state = {
currentSupply: 0
currentSupply: 0,
};

async componentDidMount() {
const {pricePerGolos} = this.props;
const { pricePerGolos } = this.props;

const res = await api.getDynamicGlobalProperties();
this.setState({
currentSupply: Math.floor(parseInt(res.current_supply) / pricePerGolos)
currentSupply: Math.floor(parseInt(res.current_supply) / pricePerGolos),
});
}

Expand All @@ -27,7 +27,7 @@ class Footer extends React.Component {
<li className="social-icons">
{items.map((item, i) => (
<a key={i} href={item.url} target="blank">
<Icon name={item.icon} size={item.size}/>
<Icon name={item.icon} size={item.size} />
</a>
))}
</li>
Expand Down Expand Up @@ -67,7 +67,7 @@ class Footer extends React.Component {
}

render() {
const {currentSupply} = this.state;
const { currentSupply } = this.state;

const menuItems = [];

Expand All @@ -78,79 +78,93 @@ class Footer extends React.Component {
width: 'medium-3',
items: [
{
name: (<LocalizedCurrency amount={currentSupply} short/>),
name: <LocalizedCurrency amount={currentSupply} short />,
url: 'https://explorer.golos.io',
className: 'big'
}
]
className: 'big',
},
],
});
}

menuItems.push({
name: 'Golos.io',
columnAlign: 'left',
width: 'medium-4 space-between-columns',
items: [
[
menuItems.push(
{
name: 'Golos.io',
columnAlign: 'left',
width: 'medium-4 space-between-columns',
items: [
[
{
name: tt('navigation.welcome'),
url: '/welcome',
},
{
name: tt('g.golos_fest'),
url: '/@golosio',
},
// { name: 'Подписка на рассылку', url: '' },
{
name: tt('g.team'),
url: '/about#team',
},
{
name: tt('navigation.faq'),
url: '/faq',
},
],
[
{
name: tt('navigation.feedback'),
url: '/submit?type=submit_feedback',
},
{
name: tt('navigation.privacy_policy'),
url: '/ru--konfidenczialxnostx/@golos/politika-konfidencialnosti',
},
{
name: tt('navigation.terms_of_service'),
url: TERMS_OF_SERVICE_URL,
},
],
],
},
{
name: 'Социальные сети',
columnAlign: 'left',
width: 'medium-3',
items: [
{
name: tt('navigation.welcome'),
url: '/welcome'
}, {
name: tt('g.golos_fest'),
url: '/@golosio'
},
// { name: 'Подписка на рассылку', url: '' },
name: 'Facebook',
url: 'https://www.facebook.com/www.golos.io',
icon: 'new/facebook',
size: '1_5x',
},
{
name: tt('g.team'),
url: '/about#team'
}
name: 'VK',
url: 'https://vk.com/goloschain',
icon: 'new/vk',
size: '2x',
},
{
name: 'Telegram',
url: 'https://t.me/golos_support',
icon: 'new/telegram',
size: '1_5x',
},
],
[
},
{
name: 'Приложения',
columnAlign: 'left',
width: 'medium-2',
items: [
// { name: 'IOS', url: '' },
{
name: tt('navigation.feedback'),
url: '/submit?type=submit_feedback'
}, {
name: tt('navigation.privacy_policy'),
url: '/ru--konfidenczialxnostx/@golos/politika-konfidencialnosti'
}, {
name: tt('navigation.terms_of_service'),
url: TERMS_OF_SERVICE_URL,
}
]
]
}, {
name: 'Социальные сети',
columnAlign: 'left',
width: 'medium-3',
items: [
{
name: 'Facebook',
url: 'https://www.facebook.com/www.golos.io',
icon: 'new/facebook',
size: '1_5x'
}, {
name: 'VK',
url: 'https://vk.com/goloschain',
icon: 'new/vk',
size: '2x'
}, {
name: 'Telegram',
url: 'https://t.me/golos_support',
icon: 'new/telegram',
size: '1_5x'
}
]
}, {
name: 'Приложения',
columnAlign: 'left',
width: 'medium-2',
items: [// { name: 'IOS', url: '' },
{
name: 'Android',
url: 'https://play.google.com/store/apps/details?id=io.golos.golos'
}
]
});
name: 'Android',
url: 'https://play.google.com/store/apps/details?id=io.golos.golos',
},
],
}
);

return (
<section className="Footer">
Expand All @@ -163,8 +177,9 @@ class Footer extends React.Component {
<div className="row">
<div className="small-12 medium-12 columns">
<span className="text-left">
© 2018 Golos.io - социальная платформа, сообщество блогеров, медиасеть,
разработанная на Медиаблокчейне ГОЛОС</span>
© 2018 Golos.io - социальная платформа, сообщество блогеров,
медиасеть, разработанная на Медиаблокчейне ГОЛОС
</span>
</div>
</div>
</div>
Expand All @@ -174,9 +189,7 @@ class Footer extends React.Component {

_renderMenus(menuItems) {
return menuItems.map((menu, index) => (
<div
key={index}
className={`small-12 ${menu.width} columns text-${menu.columnAlign}`}>
<div key={index} className={`small-12 ${menu.width} columns text-${menu.columnAlign}`}>
<strong>{menu.name}</strong>
{this.renderItems(menu.items)}
</div>
Expand All @@ -188,4 +201,4 @@ export default connect(state => {
return {
pricePerGolos: state.global.getIn(['rates', 'GBG', 'GOLOS']),
};
},)(Footer);
})(Footer);
3 changes: 2 additions & 1 deletion app/components/modules/TopRightMenu.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,8 @@ function TopRightMenu({account, savings_withdraws, price_per_golos, globalprops,
{ link: '/market', value: tt('userwallet_jsx.market') },
{ link: '/~witnesses', value: tt("navigation.witnesses") },
{ link: 'http://golostools.com/', value: tt('navigation.APP_NAME_app_center', { APP_NAME }), target: 'blank' },
{ link: '/recover_account_step_1', value: tt('header_jsx.stolen_account_recovery')}
{ link: '/recover_account_step_1', value: tt('header_jsx.stolen_account_recovery')},
{ link: '/faq', value: tt("navigation.faq") },
);
const navAdditional = <LinkWithDropdown
closeOnClickOutside
Expand Down
16 changes: 8 additions & 8 deletions src/app/components/welcome/Questions.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,14 @@ export default class Questions extends PureComponent {
<div className="row">
<div className="columns small-12 medium-12 large-2">
<div className="row small-up-2 medium-up-2 large-up-1">
<div className="columns">
<Link href="/faq">
<Icon
name="new/monitor"
size="2x"
/>Остались вопросы?
</Link>
</div>
<div className="columns">
<Link href="https://t.me/golos_support">
<Icon
Expand All @@ -107,14 +115,6 @@ export default class Questions extends PureComponent {
/>Напишите на почту
</Link>
</div>
<div className="columns">
<Link href="/submit?type=submit_feedback">
<Icon
name="new/monitor"
size="2x"
/>Уточните через сайт
</Link>
</div>
</div>
</div>
{questionsLoading ? (
Expand Down

0 comments on commit 1ecb05a

Please sign in to comment.