bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Pull in logo dynamically

Browse source
This commit is contained in:
Alex Gleason 2020-04-01 17:15:29 -05:00
parent 16a51fb56c
commit 25c028e541
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/gabsocial/features/ui/components/tabs_bar.js
View file

@ -4,7 +4,7 @@ import { NavLink, withRouter } from 'react-router-dom';
import { FormattedMessage, injectIntl } from 'react-intl'; import { FormattedMessage, injectIntl } from 'react-intl';
import { throttle } from 'lodash'; import { throttle } from 'lodash';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { me, logo } from '../../../initial_state'; import { me } from '../../../initial_state';
import classNames from 'classnames'; import classNames from 'classnames';
import NotificationsCounterIcon from './notifications_counter_icon'; import NotificationsCounterIcon from './notifications_counter_icon';
import SearchContainer from 'gabsocial/features/compose/containers/search_container'; import SearchContainer from 'gabsocial/features/compose/containers/search_container';
@ -13,7 +13,7 @@ import ActionBar from 'gabsocial/features/compose/components/action_bar';
import { openModal } from '../../../actions/modal'; import { openModal } from '../../../actions/modal';
import { openSidebar } from '../../../actions/sidebar'; import { openSidebar } from '../../../actions/sidebar';
export const privateLinks = [ export const privateLinks = ({ logo }) => { return [
<NavLink key='pr0' className='tabs-bar__link--logo' to='/home#' data-preview-title-id='column.home' style={{ padding: '0', backgroundImage: `url(${logo})` }}> <NavLink key='pr0' className='tabs-bar__link--logo' to='/home#' data-preview-title-id='column.home' style={{ padding: '0', backgroundImage: `url(${logo})` }}>
<FormattedMessage id='tabs_bar.home' defaultMessage='Home' /> <FormattedMessage id='tabs_bar.home' defaultMessage='Home' />
</NavLink>, </NavLink>,
@ -34,9 +34,9 @@ export const privateLinks = [
<i className='tabs-bar__link__icon tabs-bar__link__icon--search'/> <i className='tabs-bar__link__icon tabs-bar__link__icon--search'/>
<FormattedMessage id='tabs_bar.search' defaultMessage='Search' /> <FormattedMessage id='tabs_bar.search' defaultMessage='Search' />
</NavLink>, </NavLink>,
]; ]}
export const publicLinks = [ export const publicLinks = ({ logo }) => { return [
<a key='pl0' className='tabs-bar__link--logo' href='/#' data-preview-title-id='column.home' style={{ padding: '0', backgroundImage: `url(${logo})` }}> <a key='pl0' className='tabs-bar__link--logo' href='/#' data-preview-title-id='column.home' style={{ padding: '0', backgroundImage: `url(${logo})` }}>
<FormattedMessage id='tabs_bar.home' defaultMessage='Home' /> <FormattedMessage id='tabs_bar.home' defaultMessage='Home' />
</a>, </a>,
@ -48,7 +48,7 @@ export const publicLinks = [
<i className='tabs-bar__link__icon tabs-bar__link__icon--search'/> <i className='tabs-bar__link__icon tabs-bar__link__icon--search'/>
<FormattedMessage id='tabs_bar.search' defaultMessage='Search' /> <FormattedMessage id='tabs_bar.search' defaultMessage='Search' />
</NavLink>, </NavLink>,
]; ]}
@withRouter @withRouter
class TabsBar extends React.PureComponent { class TabsBar extends React.PureComponent {
@ -117,9 +117,9 @@ class TabsBar extends React.PureComponent {
}); });
render () { render () {
const { intl: { formatMessage }, account, onOpenCompose, onOpenSidebar } = this.props; const { intl: { formatMessage }, account, onOpenCompose, onOpenSidebar, logo } = this.props;
const { collapsed } = this.state; const { collapsed } = this.state;
const links = account ? privateLinks : publicLinks; const links = account ? privateLinks(this.props) : publicLinks(this.props);
const classes = classNames('tabs-bar', { const classes = classNames('tabs-bar', {
'tabs-bar--collapsed': collapsed, 'tabs-bar--collapsed': collapsed,
@ -181,6 +181,7 @@ class TabsBar extends React.PureComponent {
const mapStateToProps = state => { const mapStateToProps = state => {
return { return {
account: state.getIn(['accounts', me]), account: state.getIn(['accounts', me]),
logo: state.getIn(['soapbox', 'logo']),
}; };
}; };

3
public/soapbox/soapbox.json
View file

@ -1,5 +1,6 @@
{ {
"features": { "features": {
"patron": false "patron": false
} },
"logo": "https://media.gleasonator.com/site_uploads/files/000/000/002/original/logo.svg"
} }