From 0dfdba702dbd78a7b6654b36a08cdfe0d4c51dff Mon Sep 17 00:00:00 2001 From: MathieuG-P <40181755+Zagrios@users.noreply.github.com> Date: Wed, 19 Oct 2022 22:46:28 +0200 Subject: [PATCH] use link opener service everywhere --- .../available-version-item.component.tsx | 6 +++--- .../settings/supporters-view/supporter-item.component.tsx | 8 ++++---- .../version-viewer/slides/mods/mods-slide.component.tsx | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/renderer/components/available-versions/available-version-item.component.tsx b/src/renderer/components/available-versions/available-version-item.component.tsx index 6f0c5d19..900f5661 100644 --- a/src/renderer/components/available-versions/available-version-item.component.tsx +++ b/src/renderer/components/available-versions/available-version-item.component.tsx @@ -6,14 +6,14 @@ import { distinctUntilChanged } from "rxjs/operators"; import defaultImage from '../../../../assets/images/default-version-img.jpg' import dateFormat from "dateformat"; import { BsmImage } from "../shared/bsm-image.component"; -import { IpcService } from "renderer/services/ipc.service"; import { useTranslation } from "renderer/hooks/use-translation.hook"; import { BsmIcon } from "../svgs/bsm-icon.component"; +import { LinkOpenerService } from 'renderer/services/link-opener.service'; export const AvailableVersionItem = memo(function AvailableVersionItem(props: {version: BSVersion}) { const bsDownloaderService = BsDownloaderService.getInstance(); - const ipcService = IpcService.getInstance(); + const linkOpener = LinkOpenerService.getInstance(); const [selected, setSelected] = useState(false); const t = useTranslation(); @@ -26,7 +26,7 @@ export const AvailableVersionItem = memo(function AvailableVersionItem(props: {v else{ bsDownloaderService.selectedBsVersion$.next(props.version); } } - const openReleasePage = () => { ipcService.sendLazy("new-window", {args: props.version.ReleaseURL}); } + const openReleasePage = () => { linkOpener.open(props.version.ReleaseURL) } useEffect(() => { const sub = bsDownloaderService.selectedBsVersion$.pipe(distinctUntilChanged()).subscribe((version) => { diff --git a/src/renderer/components/settings/supporters-view/supporter-item.component.tsx b/src/renderer/components/settings/supporters-view/supporter-item.component.tsx index ac0902b7..fd27540e 100644 --- a/src/renderer/components/settings/supporters-view/supporter-item.component.tsx +++ b/src/renderer/components/settings/supporters-view/supporter-item.component.tsx @@ -1,16 +1,16 @@ -import React, { CSSProperties } from "react"; +import { CSSProperties } from "react"; import { Supporter } from "shared/models/supporters"; import { motion } from "framer-motion"; import txtBg from "../../../../../assets/images/gifs/txt-bg.gif" -import { IpcService } from "renderer/services/ipc.service"; +import { LinkOpenerService } from "renderer/services/link-opener.service"; interface Props { supporter: Supporter, delay?: number } export function SupporterItem({supporter, delay}: Props) { - const ipcService = IpcService.getInstance(); + const linkOpener = LinkOpenerService.getInstance(); - const openSupporterLink = () => supporter.link && ipcService.sendLazy("new-window", {args: supporter.link}); + const openSupporterLink = () => supporter.link && linkOpener.open(supporter.link); const additionnalStyles: CSSProperties = (() => { const commonStyles: CSSProperties = {backgroundImage: `url(${txtBg})`, backgroundRepeat: "no-repeat", backgroundPosition: "center"} diff --git a/src/renderer/components/version-viewer/slides/mods/mods-slide.component.tsx b/src/renderer/components/version-viewer/slides/mods/mods-slide.component.tsx index c1c07b17..9d088c4c 100644 --- a/src/renderer/components/version-viewer/slides/mods/mods-slide.component.tsx +++ b/src/renderer/components/version-viewer/slides/mods/mods-slide.component.tsx @@ -7,7 +7,6 @@ import { ModsGrid } from "./mods-grid.component"; import { ConfigurationService } from "renderer/services/configuration.service"; import { DefaultConfigKey } from "renderer/config/default-configuration.config"; import { BsmButton } from "renderer/components/shared/bsm-button.component"; -import { IpcService } from "renderer/services/ipc.service"; import BeatWaitingImg from "../../../../../../assets/images/apngs/beat-waiting.png" import { SpoilerClick } from "renderer/components/shared/UwU/spoiler-click.component"; import YuruYuriDance from "../../../../../../assets/images/gifs/yuruyuri-dance.gif" @@ -15,12 +14,13 @@ import { useObservable } from "renderer/hooks/use-observable.hook"; import { skip, filter } from "rxjs/operators"; import { Subscription } from "rxjs"; import { useTranslation } from "renderer/hooks/use-translation.hook"; +import { LinkOpenerService } from "renderer/services/link-opener.service"; export function ModsSlide({version}: {version: BSVersion}) { const modsManager = BsModsManagerService.getInstance(); const configService = ConfigurationService.getInstance(); - const ipcServive = IpcService.getInstance(); + const linkOpener = LinkOpenerService.getInstance(); const [isVisible, setIsVisible] = useState(false); const [modsAvailable, setModsAvailable] = useState(null as Map); @@ -54,7 +54,7 @@ export function ModsSlide({version}: {version: BSVersion}) { const handleOpenMoreInfo = () => { if(!moreInfoMod || !moreInfoMod.link){ return; } - ipcServive.sendLazy("new-window", {args: moreInfoMod.link}); + linkOpener.open(moreInfoMod.link); } const installMods = () => {