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

wip bump

Browse source
This commit is contained in:
zeppi 2021-09-24 21:38:22 -04:00
parent 44a3cd160f
commit 41d05a0dd1
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -158,7 +158,7 @@
"json-loader": "^0.5.4", "json-loader": "^0.5.4",
"lbry-format": "https://github.com/lbryio/lbry-format.git", "lbry-format": "https://github.com/lbryio/lbry-format.git",
"lbry-redux": "lbryio/lbry-redux#32b578707116d45f5b51b7ab523d200e75668676", "lbry-redux": "lbryio/lbry-redux#32b578707116d45f5b51b7ab523d200e75668676",
"lbryinc": "lbryio/lbryinc#c9ced4f226e06f4f188cb8dc31b561e1c27c5266", "lbryinc": "lbryio/lbryinc#97fc74315c89580f9fa2408643b0f4feef42750a",
"lint-staged": "^7.0.2", "lint-staged": "^7.0.2",
"localforage": "^1.7.1", "localforage": "^1.7.1",
"lodash-es": "^4.17.14", "lodash-es": "^4.17.14",

9
ui/index.jsx
View file

@ -295,6 +295,7 @@ function AppWrapper() {
setKeycloakReady(true); setKeycloakReady(true);
} }
}; };
const isDev = process.env.NODE_ENV !== 'production';
return ( return (
<Provider store={store}> <Provider store={store}>
@ -304,11 +305,15 @@ function AppWrapper() {
loading={<div className="main--launching" />} loading={<div className="main--launching" />}
> >
<Fragment> <Fragment>
{readyToLaunch ? ( {readyToLaunch && keycloakReady ? (
<ReactKeycloakProvider <ReactKeycloakProvider
authClient={keycloak} authClient={keycloak}
onEvent={eventLogger} onEvent={eventLogger}
initOptions={{ onLoad: 'check-sso', silentCheckSsoFallback: false, redirectUri: `${SITE_URL}/` }} // from npmjs docs for @react-keycloak/web initOptions={{
onLoad: 'check-sso',
silentCheckSsoFallback: false,
redirectUri: isDev ? `http://localhost:9090/` : `${SITE_URL}/`,
}} // from npmjs docs for @react-keycloak/web
> >
<ConnectedRouter history={history}> <ConnectedRouter history={history}>
<ErrorBoundary> <ErrorBoundary>

4
yarn.lock
View file

@ -10186,9 +10186,9 @@ lbry-redux@lbryio/lbry-redux#32b578707116d45f5b51b7ab523d200e75668676:
reselect "^3.0.0" reselect "^3.0.0"
uuid "^8.3.1" uuid "^8.3.1"
lbryinc@lbryio/lbryinc#c9ced4f226e06f4f188cb8dc31b561e1c27c5266: lbryinc@lbryio/lbryinc#97fc74315c89580f9fa2408643b0f4feef42750a:
version "0.0.1" version "0.0.1"
resolved "https://codeload.github.com/lbryio/lbryinc/tar.gz/c9ced4f226e06f4f188cb8dc31b561e1c27c5266" resolved "https://codeload.github.com/lbryio/lbryinc/tar.gz/97fc74315c89580f9fa2408643b0f4feef42750a"
dependencies: dependencies:
reselect "^3.0.0" reselect "^3.0.0"