From a36ad1757cd61a658d9c8f4d2b1f8a65dec1cb34 Mon Sep 17 00:00:00 2001 From: Kainoa Kanter Date: Sat, 21 Dec 2024 17:26:28 -0800 Subject: [PATCH 1/3] update download link, add .deb --- src/components/DownloadButton.tsx | 36 +++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/src/components/DownloadButton.tsx b/src/components/DownloadButton.tsx index 5ad7aae..9b5b7bf 100644 --- a/src/components/DownloadButton.tsx +++ b/src/components/DownloadButton.tsx @@ -15,17 +15,18 @@ import AppleIcon from "./icons/AppleIcon"; import LinuxIcon from "./icons/LinuxIcon"; import WindowsIcon from "./icons/WindowsIcon"; -const VERSION = "1.0.0-rc.6"; -export const GITHUB_URL = - "https://github.com/UnstoppableSwap/core"; +const VERSION = "1.0.0-rc.10"; +export const GITHUB_URL = "https://github.com/UnstoppableSwap/core"; const ALL_DOWNLOADS = `${GITHUB_URL}/releases/tag/v${VERSION}`; const DOWNLOAD_LINKS = { // https://github.com/UnstoppableSwap/core/releases/download/1.0.0-alpha.3/UnstoppableSwap_1.0.0-alpha.3_x64-setup.exe win: `https://github.com/UnstoppableSwap/core/releases/download/${VERSION}/UnstoppableSwap_${VERSION}_x64-setup.exe`, // https://github.com/UnstoppableSwap/core/releases/download/1.0.0-alpha.3/UnstoppableSwap_1.0.0-alpha.3_x64.dmg mac: `https://github.com/UnstoppableSwap/core/releases/download/${VERSION}/UnstoppableSwap_${VERSION}_x64.dmg`, + // https://github.com/UnstoppableSwap/core/releases/download/1.0.0-rc.10/UnstoppableSwap_1.0.0-rc.10_amd64.deb + linux_deb: `https://github.com/UnstoppableSwap/core/releases/download/${VERSION}/UnstoppableSwap_${VERSION}_amd64.deb`, // https://github.com/UnstoppableSwap/core/releases/download/1.0.0-alpha.3/UnstoppableSwap_1.0.0-alpha.3_amd64.AppImage - linux: `https://github.com/UnstoppableSwap/core/releases/download/${VERSION}/UnstoppableSwap_${VERSION}_amd64.AppImage`, + linux_appimage: `https://github.com/UnstoppableSwap/core/releases/download/${VERSION}/UnstoppableSwap_${VERSION}_amd64.AppImage`, // https://github.com/UnstoppableSwap/core/releases/download/1.0.0-alpha.3/UnstoppableSwap_1.0.0-alpha.3_aarch64.dmg mac_arm: `https://github.com/UnstoppableSwap/core/releases/download/${VERSION}/UnstoppableSwap_${VERSION}_aarch64.dmg`, }; @@ -85,14 +86,25 @@ export default function DownloadButton() { } } else if (platform.includes("Win")) { setOs("win"); + } else if ( + platform.includes("Debian") || + // Ubuntu, Xubuntu, Kubuntu, etc + platform + .toLowerCase() + .includes("buntu") || + platform.includes("Mint") + ) { + setOs("linux_deb"); } else { - setOs("linux"); + setOs("linux_appimage"); } }, []); useEffect(() => { setDownloadLink( - DOWNLOAD_LINKS[os as "mac" | "mac_arm" | "linux" | "win"] || DOWNLOAD_LINKS.win + DOWNLOAD_LINKS[ + os as "mac" | "mac_arm" | "linux_deb" | "linux_appimage" | "win" + ] || DOWNLOAD_LINKS.win, ); }, [os]); @@ -117,17 +129,19 @@ export default function DownloadButton() { onChange={(event) => setOs(event.target.value as string)} > {[ - { value: "linux", icon: , label: "AppImage" }, + { value: "linux_deb", icon: , label: "Deb" }, + { value: "linux_appimage", icon: , label: "AppImage" }, { value: "mac", icon: , label: "Intel" }, { value: "mac_arm", icon: , label: "Silicon" }, - { value: "win", icon: , label: "x64" } - ].map(item => ( + { value: "win", icon: , label: "x64" }, + ].map((item) => ( - {item.icon}{item.label} + {item.icon} + {item.label} ))} From aceef3c19fe58e9575a3aff586418f96b9ed3751 Mon Sep 17 00:00:00 2001 From: Kainoa Kanter Date: Sun, 22 Dec 2024 19:49:13 -0800 Subject: [PATCH 2/3] Update DownloadButton.tsx for rc11, add todo --- src/components/DownloadButton.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/DownloadButton.tsx b/src/components/DownloadButton.tsx index 9b5b7bf..4f9e2dd 100644 --- a/src/components/DownloadButton.tsx +++ b/src/components/DownloadButton.tsx @@ -15,7 +15,7 @@ import AppleIcon from "./icons/AppleIcon"; import LinuxIcon from "./icons/LinuxIcon"; import WindowsIcon from "./icons/WindowsIcon"; -const VERSION = "1.0.0-rc.10"; +const VERSION = "1.0.0-rc.11"; // TODO: fetch from Github API? export const GITHUB_URL = "https://github.com/UnstoppableSwap/core"; const ALL_DOWNLOADS = `${GITHUB_URL}/releases/tag/v${VERSION}`; const DOWNLOAD_LINKS = { From ba3aa569b1ec06e615fb935bb5d7f94c84006118 Mon Sep 17 00:00:00 2001 From: Kainoa Kanter Date: Mon, 23 Dec 2024 10:04:23 -0800 Subject: [PATCH 3/3] footer links - fix Github link (Closes #18) - adjust x/twitter link to avoid extra redirect - add small padding to bottom of footer --- src/components/DownloadDialog.tsx | 3 +-- src/components/Footer.tsx | 11 ++++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/DownloadDialog.tsx b/src/components/DownloadDialog.tsx index bc6713c..b1156a5 100644 --- a/src/components/DownloadDialog.tsx +++ b/src/components/DownloadDialog.tsx @@ -7,8 +7,7 @@ import { Button, } from "@material-ui/core"; -export const GITHUB_URL = - "https://github.com/UnstoppableSwap/unstoppableswap-gui"; +export const GITHUB_URL = "https://github.com/UnstoppableSwap/core"; export default function DownloadDialog({ open, diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx index 1e4aa54..db67b54 100644 --- a/src/components/Footer.tsx +++ b/src/components/Footer.tsx @@ -1,12 +1,12 @@ -import { Box, Icon, makeStyles } from "@material-ui/core"; +import { Box, makeStyles } from "@material-ui/core"; +import { GITHUB_URL } from "./DownloadDialog"; import GitHubIcon from "@material-ui/icons/GitHub"; import IconButton from "@material-ui/core/IconButton"; -import { GITHUB_URL } from "./DownloadDialog"; import TwitterIcon from "@material-ui/icons/Twitter"; import YouTubeIcon from "@material-ui/icons/YouTube"; import DiscordIcon from "./icons/DiscordIcon"; -const TWITTER_URL = "https://twitter.com/UnstoppableSwap"; +const TWITTER_URL = "https://x.com/UnstoppableSwap"; const YOUTUBE_URL = "https://www.youtube.com/@unstoppableswap6306"; const DISCORD_INVITE_URL = "https://discord.gg/Wpkffvbt"; @@ -18,6 +18,7 @@ const useStyles = makeStyles({ width: "100%", display: "flex", justifyContent: "center", + marginBottom: "2rem", }, }); @@ -33,9 +34,9 @@ export const Footer = () => { return ( - {links.map(([icon, link], i) => { + {links.map(([icon, link]) => { return ( - window.open(link, "_blank")}> + window.open(link, "_blank")}> {icon} );