random-mirrors/gab-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added trends.gab.com to header, tabs bar, sidebar, promo panel

Browse Source
This commit is contained in:
mgabdev 2019-10-21 20:03:09 -04:00
parent 8a9e73521e
commit 8088b9951a
6 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/javascript/gabsocial/components/sidebar_menu.js
View File

@ -32,6 +32,7 @@ const messages = defineMessages({
more: { id: 'sidebar.more', defaultMessage: 'More' },
partners: { id: 'promo.partners', defaultMessage: 'Affiliate Partners' },
pro: { id: 'promo.gab_pro', defaultMessage: 'Upgrade to GabPRO' },
trends: { id: 'promo.trends', defaultMessage: 'Trends' },
})
const mapStateToProps = state => {
@ -150,6 +151,10 @@ class SidebarMenu extends ImmutablePureComponent {
<span className='sidebar-menu-item__title'>{intl.formatMessage(messages.pro)}</span>
</a>
}
<a className='sidebar-menu-item' href='https://trends.gab.com'>
<Icon id='signal' fixedWidth />
<span className='sidebar-menu-item__title'>{intl.formatMessage(messages.trends)}</span>
</a>
<a className='sidebar-menu-item' href='https://news.gab.com'>
<Icon id='align-left' fixedWidth />
<span className='sidebar-menu-item__title'>{intl.formatMessage(messages.news)}</span>

7
app/javascript/gabsocial/features/ui/components/promo_panel.js
View File

@ -41,6 +41,13 @@ class PromoPanel extends React.PureComponent {
</a>
</div>
<div className='promo-panel-item'>
<a className='promo-panel-item__btn' href='https://trends.gab.com'>
<Icon id='signal' className='promo-panel-item__icon' fixedWidth />
<FormattedMessage id='promo.trends' defaultMessage='Trends' />
</a>
</div>
<div className='promo-panel-item'>
<a className='promo-panel-item__btn' href='https://news.gab.com/support-gab'>
<Icon id='users' className='promo-panel-item__icon' fixedWidth />

12
app/javascript/gabsocial/features/ui/components/tabs_bar.js
View File

@ -30,10 +30,10 @@ export const privateLinks = [
<i className='tabs-bar__link__icon groups'/>
<FormattedMessage id='tabs_bar.groups' defaultMessage='Groups' />
</NavLink>,
<NavLink key='pr5' className='tabs-bar__link tabs-bar__link--search' to='/search' data-preview-title-id='tabs_bar.search' >
<i className='tabs-bar__link__icon tabs-bar__link__icon--search'/>
<FormattedMessage id='tabs_bar.search' defaultMessage='Search' />
</NavLink>,
<a key='pl4' className='tabs-bar__link tabs-bar__link--trends' href='https://trends.gab.com' data-preview-title-id='tabs_bar.trends' >
<i className='tabs-bar__link__icon trends'/>
<FormattedMessage id='tabs_bar.trends' defaultMessage='Trends' />
</a>,
];
export const publicLinks = [
@ -48,6 +48,10 @@ export const publicLinks = [
<i className='tabs-bar__link__icon tabs-bar__link__icon--search'/>
<FormattedMessage id='tabs_bar.search' defaultMessage='Search' />
</NavLink>,
<a key='pl3' className='tabs-bar__link tabs-bar__link--trends' href='https://trends.gab.com' data-preview-title-id='tabs_bar.trends' >
<i className='tabs-bar__link__icon trends'/>
<FormattedMessage id='tabs_bar.trends' defaultMessage='Trends' />
</a>,
];
@withRouter

BIN
app/javascript/images/sprite-main-navigation-links.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.6 KiB

After

Width:  |  Height:  |  Size: 8.0 KiB

6
app/javascript/styles/gabsocial/components/tabs-bar.scss
View File

@ -275,6 +275,12 @@
&.apps {
background-position: -825px 18px;
}
&.trends {
background-position: -850px 18px;
@media screen and (max-width: 895px) {
background-position: -1208px 8px;
}
}
&.tabs-bar__link__icon--search {
background-position: -697px 18px;
@media screen and (max-width: 895px) {

1
app/views/layouts/public.html.haml
View File

@ -13,6 +13,7 @@
= link_to t('home'), root_url, class: 'nav-link optional'
= link_to t('about.about_this'), about_path, class: 'nav-link'
= link_to 'Apps', 'https://apps.gab.com', class: 'nav-link'
= link_to 'Trends', 'https://trends.gab.com', class: 'nav-link'
.nav-center
.nav-right
- if user_signed_in?