diff --git a/.env b/.env index 51cea0e..a60922a 100644 --- a/.env +++ b/.env @@ -5,3 +5,6 @@ REACT_APP_VERSION=1.3.9 REACT_APP_HOMEPAGE=https://github.com/fishjar/kiss-translator REACT_APP_OPTIONSPAGE=https://kiss-translator.rayjar.com/options REACT_APP_OPTIONSPAGE2=https://fishjar.github.io/kiss-translator/options.html +REACT_APP_LOGOURL=https://raw.githubusercontent.com/fishjar/kiss-translator/master/public/images/logo192.png +REACT_APP_USERSCRIPT_DOWNLOADURL=https://kiss-translator.rayjar.com/kiss-translator.user.js +REACT_APP_USERSCRIPT_DOWNLOADURL2=https://raw.githubusercontent.com/fishjar/kiss-translator/master/dist/userscript/kiss-translator.user.js diff --git a/config-overrides.js b/config-overrides.js index 32b3bd9..619a5dd 100644 --- a/config-overrides.js +++ b/config-overrides.js @@ -79,9 +79,9 @@ const userscriptWebpack = (config, env) => { // @author Gabe // @homepageURL ${process.env.REACT_APP_HOMEPAGE} // @match *://*/* -// @icon https://raw.githubusercontent.com/fishjar/kiss-translator/master/public/images/logo192.png -// @downloadURL https://raw.githubusercontent.com/fishjar/kiss-translator/master/dist/userscript/kiss-translator.user.js -// @updateURL https://raw.githubusercontent.com/fishjar/kiss-translator/master/dist/userscript/kiss-translator.user.js +// @icon ${process.env.REACT_APP_LOGOURL} +// @downloadURL ${process.env.REACT_APP_USERSCRIPT_DOWNLOADURL} +// @updateURL ${process.env.REACT_APP_USERSCRIPT_DOWNLOADURL} // @grant GM_xmlhttpRequest // @grant GM.xmlhttpRequest // @grant GM_setValue diff --git a/src/views/Options/index.js b/src/views/Options/index.js index cc86bed..d5b2431 100644 --- a/src/views/Options/index.js +++ b/src/views/Options/index.js @@ -9,6 +9,7 @@ import ThemeProvider from "../../hooks/Theme"; import { useEffect, useState } from "react"; import { isGm } from "../../libs/browser"; import { sleep } from "../../libs/utils"; +import CircularProgress from "@mui/material/CircularProgress"; export default function Options() { const [error, setError] = useState(false); @@ -41,11 +42,13 @@ export default function Options() {

Please confirm whether to install or enable{" "} - KISS Translator{" "} + KISS Translator{" "} GreaseMonkey script?

- or click here for help + Click here{" "} + to install, or click here{" "} + for help.

); @@ -54,7 +57,7 @@ export default function Options() { if (isGm && !ready) { return (
-

loading...

+
); }