Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

更新 #7

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"rules": {
"no-unused-vars": ["warn"]
}
}
29,985 changes: 0 additions & 29,985 deletions package-lock.json

This file was deleted.

5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "funtabs",
"version": "1.2.5.3",
"version": "1.2.5.4",
"homepage": ".",
"private": true,
"dependencies": {
Expand Down Expand Up @@ -84,6 +84,9 @@
"webpack-manifest-plugin": "^5.0.0",
"workbox-webpack-plugin": "^7.0.0"
},
"engines": {
"node": "16.20.0"
},
"scripts": {
"start": "node scripts/start.js",
"build": "GENERATE_SOURCEMAP=false INLINE_RUNTIME_CHUNK=false node scripts/build.js",
Expand Down
7 changes: 7 additions & 0 deletions public/icons/yandex-ru.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/images/alipay.JPG
Binary file not shown.
Binary file removed public/images/homepage.jpg
Binary file not shown.
Binary file modified public/images/wallpaper.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/images/wx.JPG
Binary file not shown.
Binary file removed public/images/wxpay.JPG
Binary file not shown.
2 changes: 1 addition & 1 deletion public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
var _hmt = _hmt || [];
(function () {
var hm = document.createElement("script");
hm.src = "https://hm.baidu.com/hm.js?8dbb2654b60e3cf9dbd185ac7547f5c8";
hm.src = "https://hm.baidu.com/hm.js?da0a98a4e7541291c6b76fd8cbc0e3e7";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
})();
Expand Down
22 changes: 0 additions & 22 deletions src/module/data.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,6 @@ const funtabsData = {
backgroundColor: null,
id: 2,
},
{
label: "雨云-高性价比服务器",
type: "link",
link: "https://www.rainyun.com/funtabs_",
size: 11,
x: "80",
y: "20",
icon: "https://app.rainyun.com/favicon.ico",
backgroundColor: null,
id: 3,
},
{
label: "阿里云",
type: "link",
Expand Down Expand Up @@ -123,17 +112,6 @@ const funtabsData = {
backgroundColor: null,
id: 10,
},
{
label: "趣标签页官网",
type: "link",
link: "https://www.funtabs.cn",
size: 11,
x: "80",
y: "20",
icon: "https://funtabs.cn/logo.svg",
backgroundColor: null,
id: 11,
},
{
label: "京东",
type: "link",
Expand Down
81 changes: 9 additions & 72 deletions src/module/header.jsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import {
AppstoreFilled,
BellFilled,
// BellFilled,
FormatPainterFilled,
GithubFilled,
// GithubFilled,
HeartFilled,
HomeFilled,
// HomeFilled,
InteractionFilled,
LockFilled,
QqOutlined,
// LockFilled,
// QqOutlined,
RedoOutlined,
WarningFilled,
WechatOutlined,
// WechatOutlined,
} from "@ant-design/icons";
import {
Button,
Expand All @@ -32,7 +32,7 @@ import "../index.css";
import BackupData from "./backupData";
import Donate from "./donate";
import ResetData from "./resetData";
import UpdateList from "./updateList";
// import UpdateList from "./updateList";

const Header = (props) => {
const {
Expand Down Expand Up @@ -80,11 +80,6 @@ const Header = (props) => {
}, []);

const moreMenu = [
{
key: "notice",
label: <UpdateList />,
icon: <BellFilled />,
},
{
key: "BackupRecovery",
label: <BackupData />,
Expand All @@ -100,67 +95,9 @@ const Header = (props) => {
label: <Donate />,
icon: <HeartFilled />,
},
{
key: "home",
label: (
<a href="https://www.funtabs.cn" target={linkOpen} rel="noreferrer">
趣标签页官网
</a>
),
icon: <HomeFilled />,
},
{
key: "github",
label: (
<a
href="https://github.com/dengxiwang/funtabs"
target={linkOpen}
rel="noreferrer"
>
Github
</a>
),
icon: <GithubFilled />,
},
{
key: "wxqrCode",
label: (
<a href="./images/wx.JPG" target="_blank" rel="noreferrer">
关注我们
</a>
),
icon: <WechatOutlined />,
},
{
key: "privacyPolicy",
label: (
<a href="https://privacy.funtabs.cn" target={linkOpen} rel="noreferrer">
隐私权政策
</a>
),
icon: <LockFilled />,
},
{
key: "qq",
label: (
<a
href="https://qm.qq.com/cgi-bin/qm/qr?k=6N9Y0wlXF5txRjJcBqSYByj0fDsNwjIs&authKey=ziF+0yZBKLQB8GFFDJEHTXMaz35chgIPb88v98Vwdytvym5UlNMWOBOEwMAEHlMj&noverify=0"
target={linkOpen}
rel="noreferrer"
>
QQ群:727809499
</a>
),
icon: <QqOutlined />,
},
];

const [moreServe] = useState([
{
label: "官网",
link: "https://www.funtabs.cn",
icon: "https://www.funtabs.cn/logo.svg",
},
{
label: "雨云服务器",
link: "https://www.rainyun.com/funtabs_",
Expand Down Expand Up @@ -492,10 +429,10 @@ const Header = (props) => {
color: fontColor,
}}
onClick={() => {
window.open("https://txc.qq.com/products/501945", linkOpen);
window.open("https://star.hissac.com", linkOpen);
}}
>
反馈
星空导航
</Button>
<Dropdown
menu={{
Expand Down
29 changes: 22 additions & 7 deletions src/module/searchTools.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@ const SearchTools = (props) => {
: null;
const defaultSearchEngineList = [
{
label: "百度",
label: "必应",
key: "0",
link: "https://www.baidu.com/s?wd=",
icon: "/icons/baidu2.svg",
link: "https://cn.bing.com/search?q=",
icon: "/icons/bing2.svg",
use: true,
},
{
Expand All @@ -84,12 +84,27 @@ const SearchTools = (props) => {
use: true,
},
{
label: "必应",
label: "GitHub",
key: "2",
link: "https://cn.bing.com/search?q=",
icon: "/icons/bing2.svg",
link: "https://github.com/search?q=",
icon: "/icons/github.svg",
use: true,
},
{
label: "百度",
key: "3",
link: "https://www.baidu.com/s?wd=",
icon: "/icons/baidu2.svg",
use: true,
},
{
label: "Yandex",
key: "4",
link: "https://yandex.com/search/?text=",
icon: "/icons/yandex-ru.svg",
use: true,
},

];
const [searchEngineList, setSearchEngineList] = useState(() => {
try {
Expand Down Expand Up @@ -602,7 +617,7 @@ const SearchTools = (props) => {
? "按下Tab键可快速切换搜索引擎"
: edit === ""
? "tips:双击页面可快速切换卡片分类"
: "开发不易,如您喜欢,感谢捐赠支持!"
: "新的一天,新的开始!"
}
size="large"
onFocusCapture={() => {
Expand Down
Loading