Skip to content
This repository has been archived by the owner on Jun 4, 2023. It is now read-only.

feat: notify user about updates #410

Merged
merged 2 commits into from
Feb 29, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/dialogs/extension-popup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export class ExtensionPopup extends Dialog {
bounds: {
width: 512,
height: 512,
y: 34,
y: 30,
},
devtools: false,
webPreferences: {
Expand Down
19 changes: 15 additions & 4 deletions src/main/services/auto-updater.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,28 @@ import { ipcMain } from 'electron';
import { WindowsManager } from '../windows-manager';

export const runAutoUpdaterService = (windowsManager: WindowsManager) => {
ipcMain.on('update-install', () => {
autoUpdater.quitAndInstall();
let updateAvailable = false;

ipcMain.on('install-update', () => {
if (process.env.NODE_ENV !== 'development') {
autoUpdater.quitAndInstall(true, true);
}
});

ipcMain.handle('is-update-available', () => {
return updateAvailable;
});

ipcMain.on('update-check', () => {
autoUpdater.checkForUpdates();
});

autoUpdater.on('update-downloaded', ({ version }) => {
autoUpdater.on('update-downloaded', () => {
updateAvailable = true;

for (const window of windowsManager.list) {
window.webContents.send('update-available', version);
window.webContents.send('update-available');
window.dialogs.menuDialog.webContents.send('update-available');
}
});
};
9 changes: 8 additions & 1 deletion src/renderer/views/app/components/Toolbar/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,14 @@ const RightButtons = observer(() => {
)}
<Separator />
{store.isIncognito && <ToolbarButton icon={icons.incognito} size={18} />}
<ToolbarButton onMouseDown={onMenuClick} icon={icons.more} size={18} />
<ToolbarButton
badge={store.updateAvailable}
badgeRight={10}
badgeTop={8}
onMouseDown={onMenuClick}
icon={icons.more}
size={18}
/>
</Buttons>
);
});
Expand Down
11 changes: 3 additions & 8 deletions src/renderer/views/app/store/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { AddTabStore } from './add-tab';
import { ipcRenderer } from 'electron';
import { ExtensionsStore } from './extensions';
import { SettingsStore } from './settings';
import { extensionsRenderer } from 'electron-extensions/renderer';
import { getCurrentWindow } from '../utils/windows';
import { StartupTabsStore } from './startup-tabs';
import { getTheme } from '~/utils/themes';
Expand Down Expand Up @@ -39,10 +38,7 @@ export class Store {
public isHTMLFullscreen = false;

@observable
public updateInfo = {
available: false,
version: '',
};
public updateAvailable = false;

@observable
public navigationState = {
Expand Down Expand Up @@ -104,9 +100,8 @@ export class Store {
this.isHTMLFullscreen = fullscreen;
});

ipcRenderer.on('update-available', (e, version: string) => {
this.updateInfo.version = version;
this.updateInfo.available = true;
ipcRenderer.on('update-available', () => {
this.updateAvailable = true;
});

ipcRenderer.on('download-started', (e, item) => {
Expand Down
13 changes: 13 additions & 0 deletions src/renderer/views/menu/components/QuickMenu/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ const goToWebUIPage = (name: string) => () => {
store.hide();
};

const onUpdateClick = () => {
ipcRenderer.send('install-update');
};

export const QuickMenu = observer(() => {
return (
<div
Expand All @@ -72,6 +76,15 @@ export const QuickMenu = observer(() => {
>
<Content>
<MenuItems>
{store.updateAvailable && (
<>
<MenuItem onClick={onUpdateClick}>
<Icon icon={icons.fire}></Icon>
<MenuItemTitle>Update {remote.app.name}</MenuItemTitle>
</MenuItem>
<Line />
</>
)}
<MenuItem onClick={onDarkClick}>
<Icon icon={icons.night} />
<MenuItemTitle>Night mode</MenuItemTitle>
Expand Down
10 changes: 9 additions & 1 deletion src/renderer/views/menu/store/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,19 @@ export class Store extends DialogStore {
@observable
public alwaysOnTop = false;

@observable
public updateAvailable = false;

public constructor() {
super();
ipcRenderer.on('visible', (e, flag) => {
ipcRenderer.on('visible', async (e, flag) => {
this.visible = flag;
this.alwaysOnTop = remote.getCurrentWindow().isAlwaysOnTop();
this.updateAvailable = await ipcRenderer.invoke('is-update-available');
});

ipcRenderer.on('update-available', () => {
this.updateAvailable = true;
});
}

Expand Down
4 changes: 2 additions & 2 deletions src/renderer/views/search/components/App/style.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import { ITheme } from '~/interfaces';
import { DialogStyle } from '~/renderer/mixins/dialogs';

export const StyledApp = styled(DialogStyle)`
${({ visible, theme }: { visible: boolean; theme?: ITheme }) => css`
transform: translateY(${visible ? 0 : -5}px);
margin-top: 10px;
${({ theme }: { theme?: ITheme }) => css`
box-shadow: 0 0 0 2px
${theme['searchBox.input.lightForeground'] ? BLUE_500 : BLUE_300},
${shadows(4)};
Expand Down
1 change: 1 addition & 0 deletions src/renderer/views/tabgroup/components/App/style.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { ITheme } from '~/interfaces';
import { DialogStyle } from '~/renderer/mixins/dialogs';

export const StyledApp = styled(DialogStyle)`
margin-top: 10px;
padding: 16px;
`;

Expand Down
5 changes: 2 additions & 3 deletions static/pages/extension-popup.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,11 @@

.app {
margin: 8px;
margin-top: 3px;
margin-top: 10px;
box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
overflow: hidden;
position: relative;
transition: 0.35s opacity,
0.35s transform cubic-bezier(0.1, 0.9, 0.2, 1);
transition: 0.3s opacity, 0.3s transform;
background-color: white;
width: fit-content;
transform: translateY(-10px);
Expand Down
14 changes: 8 additions & 6 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,15 @@ if (process.env.START === '1') {
apply: compiler => {
compiler.hooks.afterEmit.tap('AfterEmitPlugin', () => {
if (electronProcess) {
if (process.platform === 'win32') {
execSync(`taskkill /pid ${electronProcess.pid} /f /t`);
} else {
electronProcess.kill();
}
try {
if (process.platform === 'win32') {
execSync(`taskkill /pid ${electronProcess.pid} /f /t`);
} else {
electronProcess.kill();
}

electronProcess = null;
electronProcess = null;
} catch (e) {}
}

electronProcess = spawn('npm', ['start'], {
Expand Down