LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

General fixes from routing/lbry.tv changes #2437

Merged
neb-b merged 12 commits from fixes into master 2019-04-24 16:01:18 +02:00
Conversation 0 Commits 12 Files changed 21 +8 -16
1 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit ac459120ca - Show all commits

24
src/ui/index.jsx
View file

@ -26,11 +26,13 @@ import pjson from 'package.json';
import app from './app'; import app from './app';
import analytics from './analytics'; import analytics from './analytics';
import doLogWarningConsoleMessage from './logWarningConsoleMessage'; import doLogWarningConsoleMessage from './logWarningConsoleMessage';
import { ConnectedRouter } from 'connected-react-router'; import { ConnectedRouter, push } from 'connected-react-router';
import cookie from 'cookie'; import cookie from 'cookie';
import { formatLbryUriForWeb } from 'util/uri';
import(/* webpackChunkName: "styles" */ import(/* webpackChunkName: "styles" */
/* webpackPrefetch: true */ /* webpackPrefetch: true */
'scss/all.scss'); 'scss/all.scss');
const APPPAGEURL = 'lbry://?'; const APPPAGEURL = 'lbry://?';
@ -47,16 +49,6 @@ if (process.env.SEARCH_API_URL) {
setSearchApi(process.env.SEARCH_API_URL); setSearchApi(process.env.SEARCH_API_URL);
} }
// @if TARGET='app'
ipcRenderer.on('navigate-backward', () => {
// app.store.dispatch(doHistoryBack());
});
ipcRenderer.on('navigate-forward', () => {
// app.store.dispatch(doHistoryForward());
});
// @endif
// @if TARGET='web' // @if TARGET='web'
const SDK_API_URL = process.env.SDK_API_URL || 'https://api.piratebay.com/api/proxy'; const SDK_API_URL = process.env.SDK_API_URL || 'https://api.piratebay.com/api/proxy';
Lbry.setDaemonConnectionString(SDK_API_URL); Lbry.setDaemonConnectionString(SDK_API_URL);
@ -66,7 +58,6 @@ Lbry.setDaemonConnectionString(SDK_API_URL);
// We interect with ipcRenderer to get the auth key from a users keyring // We interect with ipcRenderer to get the auth key from a users keyring
// We keep a local variable for authToken beacuse `ipcRenderer.send` does not // We keep a local variable for authToken beacuse `ipcRenderer.send` does not
// contain a response, so there is no way to know when it's been set // contain a response, so there is no way to know when it's been set
let authToken; let authToken;
Lbryio.setOverride( Lbryio.setOverride(
'setAuthToken', 'setAuthToken',
@ -141,9 +132,10 @@ ipcRenderer.on('open-uri-requested', (event, uri, newSession) => {
app.store.dispatch(doConditionalAuthNavigate(newSession)); app.store.dispatch(doConditionalAuthNavigate(newSession));
} else if (uri.startsWith(APPPAGEURL)) { } else if (uri.startsWith(APPPAGEURL)) {
const navpage = uri.replace(APPPAGEURL, '').toLowerCase(); const navpage = uri.replace(APPPAGEURL, '').toLowerCase();
// app.store.dispatch(doNavigate(`/${navpage}`)); app.store.dispatch(push(`/$/${navpage}`));
} else if (isURIValid(uri)) { } else if (isURIValid(uri)) {
// app.store.dispatch(doNavigate('/show', { uri })); const formattedUri = formatLbryUriForWeb(uri);
app.store.dispatch(push(formattedUri));
} else { } else {
app.store.dispatch( app.store.dispatch(
doToast({ doToast({
@ -156,7 +148,7 @@ ipcRenderer.on('open-uri-requested', (event, uri, newSession) => {
ipcRenderer.on('open-menu', (event, uri) => { ipcRenderer.on('open-menu', (event, uri) => {
if (uri && uri.startsWith('/help')) { if (uri && uri.startsWith('/help')) {
// app.store.dispatch(doNavigate('/help')); app.store.dispatch(push('/$/help'));
} }
}); });