diff --git a/locales/en/common.json b/locales/en/common.json index c2efed1..c97f429 100644 --- a/locales/en/common.json +++ b/locales/en/common.json @@ -23,7 +23,7 @@ "remark": "※Some browsers(e.g. safari、chrome on mobile)don't provide the feature of creating a new bookmark. In that case you can add a bookmark for any site first, then edit it and replace the URL address with the below script.", "imgDesc1": "The bookmark name doesn't matter. Put whatever you like.", "imgDesc2": "Paste the script on the URL input", - "currentVersion": "For current version: FUZZ-UP", + "currentVersion": "For current version: ", "currentVersionDesc": "(This script is always getting data from the latest version. No need to update the script when next version comes)", "oldVersion": "For old version:" }, diff --git a/locales/ja/common.json b/locales/ja/common.json index 2484328..18c83ec 100644 --- a/locales/ja/common.json +++ b/locales/ja/common.json @@ -23,7 +23,7 @@ "remark": "一部のブラウザ(Safari、スマホのChromeとか)ではブックマークの新規作成ができませんが、
  1. とりあえず任意のウェブサイトをブックマークに登録
  2. 登録したブックマークを編集
  3. URLアドレスのところに、登録したURLを消してスクリプトを入れる
の手順でもスクリプトをブックマークに登録することができます。", "imgDesc1": "名前は適当でいい", "imgDesc2": "URLのところにスクリプトをペーストして", - "currentVersion": "現行バージョン FUZZ-UP", + "currentVersion": "現行バージョン", "currentVersionDesc": "(このスクリプトは常に現行バージョンに対応しています。新しいバージョンになってもスクリプトを更新する必要がありません。)", "oldVersion": "古いバージョン" }, diff --git a/locales/ko/common.json b/locales/ko/common.json index 77f17d3..d034b08 100644 --- a/locales/ko/common.json +++ b/locales/ko/common.json @@ -23,7 +23,7 @@ "remark": "※일부 브라우저(예: 사파리, 크롬 모바일)는 북마크를 직접 새로 만드는 기능을 제공하지 않습니다. 그런 경우에는 아무 사이트나 북마크에 등록한 뒤, 해당 북마크의 URL을 아래 스크립트로 바꾸시면 됩니다.", "imgDesc1": "북마크의 이름은 원하시는 이름으로 넣으세요", "imgDesc2": "URL란에 스크립트를 붙여넣으세요", - "currentVersion": "현행 버전용 스크립트: (FUZZ-UP)", + "currentVersion": "현행 버전용 스크립트:", "currentVersionDesc": "(이 스크립트는 항상 현행 버전으로부터 스킬 데이터를 가져옵니다. 버전이 바뀌었을 때 별도로 북마크를 수정하지 않아도 됩니다.)", "oldVersion": "구 버전용 스크립트:" }, diff --git a/locales/zh/common.json b/locales/zh/common.json index fb0a3e6..68ffcb8 100644 --- a/locales/zh/common.json +++ b/locales/zh/common.json @@ -23,7 +23,7 @@ "remark": "※有些浏览器(比如Safari、手机上的Chrome)上没有办法新建书签,可以先随便添加一个任意网站的书签,然后选择编辑,把URL地址栏的内容换成下面的代码就好了。", "imgDesc1": "书签的名字可以随便填", "imgDesc2": "把代码粘贴到URL这里", - "currentVersion": "当前版本 FUZZ-UP", + "currentVersion": "当前版本", "currentVersionDesc": "(这个代码一直对应最新版本,即使换代也不用来更新代码)", "oldVersion": "旧版本" }, diff --git a/src/constants.js b/src/constants.js index 3237c46..96a01b1 100644 --- a/src/constants.js +++ b/src/constants.js @@ -1,4 +1,4 @@ -const APP_VERSION = "v1.39.1"; +const APP_VERSION = "v1.39.2"; const ALL_VERSIONS = ["galaxywave", "fuzzup", "highvoltage", "nextage", "exchain", "matixx", "tbre", "tb"]; diff --git a/src/react/BookmarkletScript.jsx b/src/react/BookmarkletScript.jsx deleted file mode 100644 index 08eb6e7..0000000 --- a/src/react/BookmarkletScript.jsx +++ /dev/null @@ -1,70 +0,0 @@ -import React, { useState } from "react"; -import styled from "styled-components"; -import Select from "@material-ui/core/Select"; -import MenuItem from "@material-ui/core/MenuItem"; -import { FormattedMessage } from "react-intl"; -import { ON_SERVICE_VERSIONS, VERSION_NAME } from "../constants"; - -function BookmarkletScript() { - const [select, setSelect] = useState(ON_SERVICE_VERSIONS[1]); - return ( - <> - - { - "javascript:void(!function(d){var s=d.createElement('script');s.type='text/javascript';s.src='//gitadora-skill-viewer.herokuapp.com/js/uploaddata_latest.js';d.head.appendChild(s);}(document));" - } - - -
- - { - setSelect(event.target.value); - }} - > - {ON_SERVICE_VERSIONS.slice(1).map(version => ( - - {VERSION_NAME[version]} - - ))} - -
- - - {`javascript:void(!function(d){var s=d.createElement('script');s.type='text/javascript';s.src='//gitadora-skill-viewer.herokuapp.com/js/uploaddata_${select}.js';d.head.appendChild(s);}(document));`} - - - ); -} - -const ScriptDiv = styled.div` - background: ${({ theme }) => theme.index.scriptBg}; - padding: 16px; - border-radius: 6px; - font-size: 80%; - word-break: break-all; - margin: 16px; -`; - -const MuiSelect = styled(Select)` - &&& { - color: ${({ theme }) => theme.main}; - - > svg { - color: ${({ theme }) => theme.main}; - } - - ::before { - border-bottom: 1px solid ${({ theme }) => theme.main}; - } - - ::after { - border-bottom: 2px solid ${({ theme }) => theme.main}; - } - } -`; - -export default BookmarkletScript; diff --git a/src/react/IndexPage/BookmarkletScript.jsx b/src/react/IndexPage/BookmarkletScript.jsx index b98c0c0..e1ae489 100644 --- a/src/react/IndexPage/BookmarkletScript.jsx +++ b/src/react/IndexPage/BookmarkletScript.jsx @@ -6,7 +6,7 @@ import { FormattedMessage } from "react-intl"; import FileCopyIcon from "@material-ui/icons/FileCopy"; import IconButton from "@material-ui/core/IconButton"; -import { ON_SERVICE_VERSIONS, VERSION_NAME } from "../../constants"; +import { CURRENT_VERSION, ON_SERVICE_VERSIONS, VERSION_NAME } from "../../constants"; import { Snackbar } from "@material-ui/core"; function BookmarkletScript() { @@ -29,6 +29,7 @@ function BookmarkletScript() { <>
+ {" " + VERSION_NAME[CURRENT_VERSION] + " "} @@ -149,6 +150,6 @@ const Desc = styled.span` @media (max-width: 742px) { font-size: 12px; } -` +`; export default BookmarkletScript;