fix tray icons, download icons, and fix embed route

This commit is contained in:
Sean Yesmunt 2019-12-20 11:26:55 -05:00
parent f534d3548e
commit 662cf9c906
6 changed files with 16 additions and 7 deletions

View file

@ -19,6 +19,16 @@
"from": "./static/daemon/",
"to": "static/daemon/",
"filter": ["**/*"]
},
{
"from": "./static/img",
"to": "static/img",
"filter": ["**/*"]
},
{
"from": "./static/font",
"to": "static/font",
"filter": ["**/*"]
}
],
"publish": [

View file

@ -32,7 +32,7 @@ export default appState => {
// If state is undefined, create window as maximized.
width: windowState.width === undefined ? width : windowState.width,
height: windowState.height === undefined ? height : windowState.height,
icon: 'static/img/tray/windows/tray.png',
icon: 'static/img/tray/default/tray.png',
webPreferences: {
// Disable renderer process's webSecurity on development to enable CORS.
webSecurity: !isDev,
@ -133,8 +133,8 @@ export default appState => {
// A backup incase https://github.com/electron/electron/issues/7779 happens
window.webContents.once('dom-ready', () => {
startMinimized && window.hide()
})
startMinimized && window.hide();
});
window.webContents.on('did-finish-load', () => {
window.webContents.session.setUserAgent(`LBRY/${app.getVersion()}`);

View file

@ -6,7 +6,7 @@ const send = require('koa-send');
const router = new Router();
router.get(`/embed/:claimName/:claimId`, async ctx => {
router.get(`/$/embed/:claimName/:claimId`, async ctx => {
const { claimName, claimId } = ctx.params;
const streamUrl = generateStreamUrl(claimName, claimId, LBRY_TV_API);
ctx.redirect(streamUrl);

View file

@ -205,7 +205,7 @@
"yarn": "^1.3"
},
"lbrySettings": {
"lbrynetDaemonVersion": "0.50.0",
"lbrynetDaemonVersion": "0.50.1",
"lbrynetDaemonUrlTemplate": "https://github.com/lbryio/lbry/releases/download/vDAEMONVER/lbrynet-OSNAME.zip",
"lbrynetDaemonDir": "static/daemon",
"lbrynetDaemonFileName": "lbrynet"

View file

@ -7,7 +7,6 @@
.icon {
margin-bottom: -1px;
stroke: var(--color-subtitle);
}
& > *:not(:last-child) {

View file

@ -6,7 +6,7 @@ function generateStreamUrl(claimName, claimId, apiUrl) {
}
function generateEmbedUrl(claimName, claimId) {
return `${URL}/embed/${claimName}/${claimId}`;
return `${URL}/$/embed/${claimName}/${claimId}`;
}
// module.exports needed since the web server imports this function