LBRYCommunity/lbry-redux
1
0
Fork 0
Code Issues 5 Pull requests 6 Projects Releases Packages Wiki Activity

Merge pull request #28 from lbryio/nav

Browse source 
Update nav links
This commit is contained in:
Sean Yesmunt 2018-05-21 22:09:59 -04:00 committed by GitHub
commit c41899e784
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
dist/bundle.js vendored
View file

@ -3014,11 +3014,11 @@ var selectPageTitle = exports.selectPageTitle = (0, _reselect.createSelector)(se
var selectNavLinks = exports.selectNavLinks = (0, _reselect.createSelector)(selectCurrentPage, selectHistoryStack, function (currentPage, historyStack) { var selectNavLinks = exports.selectNavLinks = (0, _reselect.createSelector)(selectCurrentPage, selectHistoryStack, function (currentPage, historyStack) {
var isWalletPage = function isWalletPage(page) { var isWalletPage = function isWalletPage(page) {
return page === 'wallet' || page === 'send' || page === 'getcredits' || page === 'rewards' || page === 'history' || page === 'invite'; return page === 'wallet' || page === 'send' || page === 'getcredits' || page === 'rewards' || page === 'history' || page === 'invite' || page === 'backup';
}; };
var isMyLbryPage = function isMyLbryPage(page) { var isMyLbryPage = function isMyLbryPage(page) {
return page === 'downloaded' || page === 'published' || page === 'settings'; return page === 'downloaded' || page === 'published';
}; };
var previousStack = historyStack.slice().reverse(); var previousStack = historyStack.slice().reverse();
@ -3061,6 +3061,10 @@ var selectNavLinks = exports.selectNavLinks = (0, _reselect.createSelector)(sele
label: 'Send & Recieve', label: 'Send & Recieve',
path: '/send', path: '/send',
active: currentPage === 'send' active: currentPage === 'send'
}, {
label: 'Transactions',
path: '/history',
active: currentPage === 'history'
}, { }, {
label: 'Get Credits', label: 'Get Credits',
path: '/getcredits', path: '/getcredits',
@ -3074,9 +3078,9 @@ var selectNavLinks = exports.selectNavLinks = (0, _reselect.createSelector)(sele
path: '/invite', path: '/invite',
active: currentPage === 'invite' active: currentPage === 'invite'
}, { }, {
label: 'Transactions', label: 'Backup',
path: '/history', path: '/backup',
active: currentPage === 'history' active: currentPage === 'backup'
}]; }];
var myLbrySubLinks = [{ var myLbrySubLinks = [{
@ -3087,14 +3091,6 @@ var selectNavLinks = exports.selectNavLinks = (0, _reselect.createSelector)(sele
label: 'Publishes', label: 'Publishes',
path: '/published', path: '/published',
active: currentPage === 'published' active: currentPage === 'published'
}, {
label: 'Settings',
path: '/settings',
active: currentPage === 'settings'
}, {
label: 'Backup',
path: '/backup',
active: currentPage === 'backup'
}]; }];
var navLinks = { var navLinks = {
@ -3117,7 +3113,7 @@ var selectNavLinks = exports.selectNavLinks = (0, _reselect.createSelector)(sele
active: isWalletPage(currentPage) active: isWalletPage(currentPage)
}, { }, {
label: 'My LBRY', label: 'My LBRY',
icon: 'Settings', icon: 'Folder',
subLinks: myLbrySubLinks, subLinks: myLbrySubLinks,
path: isCurrentlyMyLbryPage ? '/downloaded' : getActiveSublink('myLbry'), path: isCurrentlyMyLbryPage ? '/downloaded' : getActiveSublink('myLbry'),
active: isMyLbryPage(currentPage) active: isMyLbryPage(currentPage)
@ -3126,11 +3122,16 @@ var selectNavLinks = exports.selectNavLinks = (0, _reselect.createSelector)(sele
icon: 'UploadCloud', icon: 'UploadCloud',
path: '/publish', path: '/publish',
active: currentPage === 'publish' active: currentPage === 'publish'
}, {
label: 'Settings',
icon: 'Settings',
path: '/settings',
active: currentPage === 'settings'
}, { }, {
label: 'Help', label: 'Help',
path: '/help', path: '/help',
active: currentPage === 'help', icon: 'HelpCircle',
icon: 'HelpCircle' active: currentPage === 'help'
}] }]
}; };

37
src/redux/selectors/navigation.js
View file

@ -59,10 +59,10 @@ export const selectNavLinks = createSelector(
page === 'getcredits' || page === 'getcredits' ||
page === 'rewards' || page === 'rewards' ||
page === 'history' || page === 'history' ||
page === 'invite'; page === 'invite' ||
page === 'backup';
const isMyLbryPage = page => const isMyLbryPage = page => page === 'downloaded' || page === 'published';
page === 'downloaded' || page === 'published' || page === 'settings';
const previousStack = historyStack.slice().reverse(); const previousStack = historyStack.slice().reverse();
@ -107,6 +107,11 @@ export const selectNavLinks = createSelector(
path: '/send', path: '/send',
active: currentPage === 'send', active: currentPage === 'send',
}, },
{
label: 'Transactions',
path: '/history',
active: currentPage === 'history',
},
{ {
label: 'Get Credits', label: 'Get Credits',
path: '/getcredits', path: '/getcredits',
@ -123,9 +128,9 @@ export const selectNavLinks = createSelector(
active: currentPage === 'invite', active: currentPage === 'invite',
}, },
{ {
label: 'Transactions', label: 'Backup',
path: '/history', path: '/backup',
active: currentPage === 'history', active: currentPage === 'backup',
}, },
]; ];
@ -140,16 +145,6 @@ export const selectNavLinks = createSelector(
path: '/published', path: '/published',
active: currentPage === 'published', active: currentPage === 'published',
}, },
{
label: 'Settings',
path: '/settings',
active: currentPage === 'settings',
},
{
label: 'Backup',
path: '/backup',
active: currentPage === 'backup',
},
]; ];
const navLinks = { const navLinks = {
@ -177,7 +172,7 @@ export const selectNavLinks = createSelector(
}, },
{ {
label: 'My LBRY', label: 'My LBRY',
icon: 'Settings', icon: 'Folder',
subLinks: myLbrySubLinks, subLinks: myLbrySubLinks,
path: isCurrentlyMyLbryPage ? '/downloaded' : getActiveSublink('myLbry'), path: isCurrentlyMyLbryPage ? '/downloaded' : getActiveSublink('myLbry'),
active: isMyLbryPage(currentPage), active: isMyLbryPage(currentPage),
@ -188,11 +183,17 @@ export const selectNavLinks = createSelector(
path: '/publish', path: '/publish',
active: currentPage === 'publish', active: currentPage === 'publish',
}, },
{
label: 'Settings',
icon: 'Settings',
path: '/settings',
active: currentPage === 'settings',
},
{ {
label: 'Help', label: 'Help',
path: '/help', path: '/help',
active: currentPage === 'help',
icon: 'HelpCircle', icon: 'HelpCircle',
active: currentPage === 'help',
}, },
], ],
}; };