aboutsummaryrefslogtreecommitdiffstats
path: root/packages/renderer
diff options
context:
space:
mode:
authorLibravatar Kristóf Marussy <kristof@marussy.com>2022-03-15 00:15:31 +0100
committerLibravatar Kristóf Marussy <kristof@marussy.com>2022-05-16 00:54:56 +0200
commitd425435c290a7e63c4e30a469da51f43be4db5cc (patch)
tree73b1cfed3ad81bc987312a9093b654ca4bc37c1f /packages/renderer
parentfeat(renderer): Show service error on service icon (diff)
downloadsophie-d425435c290a7e63c4e30a469da51f43be4db5cc.tar.gz
sophie-d425435c290a7e63c4e30a469da51f43be4db5cc.tar.zst
sophie-d425435c290a7e63c4e30a469da51f43be4db5cc.zip
feat: Open in external browser
Signed-off-by: Kristóf Marussy <kristof@marussy.com>
Diffstat (limited to 'packages/renderer')
-rw-r--r--packages/renderer/src/components/locationBar/ExtraButtons.tsx52
-rw-r--r--packages/renderer/src/components/locationBar/LocationBar.tsx2
-rw-r--r--packages/renderer/src/components/locationBar/NavigationButtons.tsx2
-rw-r--r--packages/renderer/src/env/RendererEnv.ts25
-rw-r--r--packages/renderer/src/stores/GlobalSettings.ts3
-rw-r--r--packages/renderer/src/stores/RendererEnv.ts (renamed from packages/renderer/src/env/getEnv.ts)11
-rw-r--r--packages/renderer/src/stores/RendererStore.ts3
-rw-r--r--packages/renderer/src/stores/Service.ts8
8 files changed, 70 insertions, 36 deletions
diff --git a/packages/renderer/src/components/locationBar/ExtraButtons.tsx b/packages/renderer/src/components/locationBar/ExtraButtons.tsx
new file mode 100644
index 0000000..4eaee29
--- /dev/null
+++ b/packages/renderer/src/components/locationBar/ExtraButtons.tsx
@@ -0,0 +1,52 @@
1/*
2 * Copyright (C) 2022 Kristóf Marussy <kristof@marussy.com>
3 *
4 * This file is part of Sophie.
5 *
6 * Sophie is free software: you can redistribute it and/or modify
7 * it under the terms of the GNU Affero General Public License as
8 * published by the Free Software Foundation, version 3.
9 *
10 * This program is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU Affero General Public License for more details.
14 *
15 * You should have received a copy of the GNU Affero General Public License
16 * along with this program. If not, see <https://www.gnu.org/licenses/>.
17 *
18 * SPDX-License-Identifier: AGPL-3.0-only
19 */
20
21import IconOpenInBrowser from '@mui/icons-material/OpenInBrowser';
22import Box from '@mui/material/Box';
23import IconButton from '@mui/material/IconButton';
24import { observer } from 'mobx-react-lite';
25import React from 'react';
26
27import type Service from '../../stores/Service';
28
29function ExtraButtons({
30 service,
31}: {
32 service: Service | undefined;
33}): JSX.Element {
34 return (
35 <Box
36 sx={{
37 display: 'flex',
38 flexDirection: 'row',
39 }}
40 >
41 <IconButton
42 aria-label="Open in browser"
43 disabled={service?.currentUrl === undefined}
44 onClick={() => service?.openCurrentURLInExternalBrowser()}
45 >
46 <IconOpenInBrowser />
47 </IconButton>
48 </Box>
49 );
50}
51
52export default observer(ExtraButtons);
diff --git a/packages/renderer/src/components/locationBar/LocationBar.tsx b/packages/renderer/src/components/locationBar/LocationBar.tsx
index 0debaab..fc9c147 100644
--- a/packages/renderer/src/components/locationBar/LocationBar.tsx
+++ b/packages/renderer/src/components/locationBar/LocationBar.tsx
@@ -24,6 +24,7 @@ import React from 'react';
24 24
25import { useStore } from '../StoreProvider'; 25import { useStore } from '../StoreProvider';
26 26
27import ExtraButtons from './ExtraButtons';
27import LocationTextField from './LocationTextField'; 28import LocationTextField from './LocationTextField';
28import NavigationButtons from './NavigationButtons'; 29import NavigationButtons from './NavigationButtons';
29 30
@@ -49,6 +50,7 @@ function LocationBar(): JSX.Element {
49 <LocationBarRoot id={LOCATION_BAR_ID} hidden={!showLocationBar}> 50 <LocationBarRoot id={LOCATION_BAR_ID} hidden={!showLocationBar}>
50 <NavigationButtons service={selectedService} /> 51 <NavigationButtons service={selectedService} />
51 <LocationTextField service={selectedService} /> 52 <LocationTextField service={selectedService} />
53 <ExtraButtons service={selectedService} />
52 </LocationBarRoot> 54 </LocationBarRoot>
53 ); 55 );
54} 56}
diff --git a/packages/renderer/src/components/locationBar/NavigationButtons.tsx b/packages/renderer/src/components/locationBar/NavigationButtons.tsx
index 5c5c959..9995a21 100644
--- a/packages/renderer/src/components/locationBar/NavigationButtons.tsx
+++ b/packages/renderer/src/components/locationBar/NavigationButtons.tsx
@@ -29,7 +29,7 @@ import IconButton from '@mui/material/IconButton';
29import { observer } from 'mobx-react-lite'; 29import { observer } from 'mobx-react-lite';
30import React from 'react'; 30import React from 'react';
31 31
32import Service from '../../stores/Service'; 32import type Service from '../../stores/Service';
33 33
34function NavigationButtons({ 34function NavigationButtons({
35 service, 35 service,
diff --git a/packages/renderer/src/env/RendererEnv.ts b/packages/renderer/src/env/RendererEnv.ts
deleted file mode 100644
index ba4c43e..0000000
--- a/packages/renderer/src/env/RendererEnv.ts
+++ /dev/null
@@ -1,25 +0,0 @@
1/*
2 * Copyright (C) 2021-2022 Kristóf Marussy <kristof@marussy.com>
3 *
4 * This file is part of Sophie.
5 *
6 * Sophie is free software: you can redistribute it and/or modify
7 * it under the terms of the GNU Affero General Public License as
8 * published by the Free Software Foundation, version 3.
9 *
10 * This program is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU Affero General Public License for more details.
14 *
15 * You should have received a copy of the GNU Affero General Public License
16 * along with this program. If not, see <https://www.gnu.org/licenses/>.
17 *
18 * SPDX-License-Identifier: AGPL-3.0-only
19 */
20
21import type { Action } from '@sophie/shared';
22
23export default interface RendererEnv {
24 dispatchMainAction(action: Action): void;
25}
diff --git a/packages/renderer/src/stores/GlobalSettings.ts b/packages/renderer/src/stores/GlobalSettings.ts
index 79815ba..52971d4 100644
--- a/packages/renderer/src/stores/GlobalSettings.ts
+++ b/packages/renderer/src/stores/GlobalSettings.ts
@@ -21,8 +21,7 @@
21import { defineGlobalSettingsModel, ThemeSource } from '@sophie/shared'; 21import { defineGlobalSettingsModel, ThemeSource } from '@sophie/shared';
22import { Instance } from 'mobx-state-tree'; 22import { Instance } from 'mobx-state-tree';
23 23
24import getEnv from '../env/getEnv'; 24import { getEnv } from './RendererEnv';
25
26import Service from './Service'; 25import Service from './Service';
27 26
28const GlobalSettings = defineGlobalSettingsModel(Service).actions((self) => ({ 27const GlobalSettings = defineGlobalSettingsModel(Service).actions((self) => ({
diff --git a/packages/renderer/src/env/getEnv.ts b/packages/renderer/src/stores/RendererEnv.ts
index 4f7357a..496ede6 100644
--- a/packages/renderer/src/env/getEnv.ts
+++ b/packages/renderer/src/stores/RendererEnv.ts
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2022 Kristóf Marussy <kristof@marussy.com> 2 * Copyright (C) 2021-2022 Kristóf Marussy <kristof@marussy.com>
3 * 3 *
4 * This file is part of Sophie. 4 * This file is part of Sophie.
5 * 5 *
@@ -18,10 +18,9 @@
18 * SPDX-License-Identifier: AGPL-3.0-only 18 * SPDX-License-Identifier: AGPL-3.0-only
19 */ 19 */
20 20
21import type { Action } from '@sophie/shared';
21import { getEnv as getAnyEnv, IAnyStateTreeNode } from 'mobx-state-tree'; 22import { getEnv as getAnyEnv, IAnyStateTreeNode } from 'mobx-state-tree';
22 23
23import type RendererEnv from './RendererEnv';
24
25/** 24/**
26 * Gets a well-typed environment from `model`. 25 * Gets a well-typed environment from `model`.
27 * 26 *
@@ -29,6 +28,10 @@ import type RendererEnv from './RendererEnv';
29 * 28 *
30 * @param model The state tree node. 29 * @param model The state tree node.
31 */ 30 */
32export default function getEnv(model: IAnyStateTreeNode): RendererEnv { 31export function getEnv(model: IAnyStateTreeNode): RendererEnv {
33 return getAnyEnv<RendererEnv>(model); 32 return getAnyEnv<RendererEnv>(model);
34} 33}
34
35export default interface RendererEnv {
36 dispatchMainAction(action: Action): void;
37}
diff --git a/packages/renderer/src/stores/RendererStore.ts b/packages/renderer/src/stores/RendererStore.ts
index 8f424f6..f48d484 100644
--- a/packages/renderer/src/stores/RendererStore.ts
+++ b/packages/renderer/src/stores/RendererStore.ts
@@ -21,11 +21,10 @@
21import { BrowserViewBounds, SophieRenderer } from '@sophie/shared'; 21import { BrowserViewBounds, SophieRenderer } from '@sophie/shared';
22import { applySnapshot, applyPatch, Instance, types } from 'mobx-state-tree'; 22import { applySnapshot, applyPatch, Instance, types } from 'mobx-state-tree';
23 23
24import RendererEnv from '../env/RendererEnv';
25import getEnv from '../env/getEnv';
26import { getLogger } from '../utils/log'; 24import { getLogger } from '../utils/log';
27 25
28import GlobalSettings from './GlobalSettings'; 26import GlobalSettings from './GlobalSettings';
27import RendererEnv, { getEnv } from './RendererEnv';
29import Service from './Service'; 28import Service from './Service';
30import SharedStore from './SharedStore'; 29import SharedStore from './SharedStore';
31 30
diff --git a/packages/renderer/src/stores/Service.ts b/packages/renderer/src/stores/Service.ts
index 695cff4..c50e5bd 100644
--- a/packages/renderer/src/stores/Service.ts
+++ b/packages/renderer/src/stores/Service.ts
@@ -21,8 +21,7 @@
21import { defineServiceModel, ServiceAction } from '@sophie/shared'; 21import { defineServiceModel, ServiceAction } from '@sophie/shared';
22import { Instance } from 'mobx-state-tree'; 22import { Instance } from 'mobx-state-tree';
23 23
24import getEnv from '../env/getEnv'; 24import { getEnv } from './RendererEnv';
25
26import ServiceSettings from './ServiceSettings'; 25import ServiceSettings from './ServiceSettings';
27 26
28const Service = defineServiceModel(ServiceSettings).actions((self) => { 27const Service = defineServiceModel(ServiceSettings).actions((self) => {
@@ -76,6 +75,11 @@ const Service = defineServiceModel(ServiceSettings).actions((self) => {
76 fingerprint: self.state.certificate.fingerprint, 75 fingerprint: self.state.certificate.fingerprint,
77 }); 76 });
78 }, 77 },
78 openCurrentURLInExternalBrowser(): void {
79 dispatch({
80 action: 'open-current-url-in-external-browser',
81 });
82 },
79 }; 83 };
80}); 84});
81 85