Skip to content

Commit

Permalink
update config
Browse files Browse the repository at this point in the history
  • Loading branch information
xiandanin committed Nov 26, 2019
1 parent 14cd709 commit f59e7d8
Show file tree
Hide file tree
Showing 14 changed files with 47 additions and 15 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ thumbs.db
!.gitkeep
.idea
package-lock.json
build/icons/.icns.iconset
22 changes: 13 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
[![GitHub release](https://img.shields.io/github/release/dengyuhan/magnetW)](https://github.com/dengyuhan/magnetW/releases)
[![GitHub stars](https://img.shields.io/github/stars/dengyuhan/magnetW)](https://github.com/dengyuhan/magnetW/stars)
[![GitHub forks](https://img.shields.io/github/forks/dengyuhan/magnetW)](https://github.com/dengyuhan/magnetW/forks)
[![GitHub license](https://img.shields.io/github/license/dengyuhan/magnetW)](https://github.com/dengyuhan/magnetW/blob/master/LICENSE)
[![GitHub release](https://img.sxiandanin/hields.io/github/release/xiandanin/magnetW)](https://github.com/xiandanin/magnetW/releases)
[![GitHub stars](https://img.shields.io/github/stars/xiandanin/magnetW)](https://github.com/xiandanin/magnetW/stars)
[![GitHub forks](https://img.shields.io/github/forks/xiandanin/magnetW)](https://github.com/xiandanin/magnetW/forks)
[![GitHub license](https://img.shields.io/github/license/xiandanin/magnetW)](https://github.com/xiandanin/magnetW/blob/master/LICENSE)
![Support Platforms](https://camo.githubusercontent.com/a50c47295f350646d08f2e1ccd797ceca3840e52/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f706c6174666f726d2d6d61634f5325323025374325323057696e646f77732532302537432532304c696e75782d6c69676874677265792e737667)

[[中文文档]](http://magnetw.app/guide/)
<font size="4">[[中文文档]](http://magnetw.app/guide/)&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[https://magnetw.app](https://magnetw.app/)</font>

## 简介
`magnetW`基于[magnetX](https://github.com/youusername/magnetX)的规则原理,将各个磁力站的搜索结果统一格式化

magnetW全面升级3.x,网页版不再更新 [https://biedian.me](https://biedian.me/)(需要梯子)

## 安装
[Github Releases](https://github.com/dengyuhan/magnetW/releases)下载对应平台
[Github Releases](https://github.com/xiandanin/magnetW/releases)下载对应平台
或者
[文档页](http://magnetw.app/)下载对应平台
[文档页](https://magnetw.app/)下载对应平台
>Linux版未测试
## 截图
![](/screenshots/app.gif)
Expand All @@ -22,7 +25,7 @@
本应用开源且免费,仅用于爬虫技术交流学习,搜索结果均来自源站,亦不承担任何责任

## 版权说明
* 项目中所使用的图标分别来自[@玥月](https://www.iconfont.cn/user/detail?uid=8898)[@qqavh147](https://www.iconfont.cn/user/detail?uid=158352)[@Asam](https://www.iconfont.cn/user/detail?uid=600186)
* 项目中所使用的图标分别来自[@玥月](https://www.iconfont.cn/user/detail?uid=8898)[@qqavh147](https://www.iconfont.cn/user/detail?uid=158352)
* 项目中规则原理来自[magnetX](https://github.com/youusername/magnetX)

## 注意事项
Expand All @@ -38,4 +41,5 @@

## 相关项目
* [magnetX](https://github.com/youusername/magnetX)
* [磁力搜自动采集](https://github.com/dengyuhan/LardMonkeyScripts#%E7%A3%81%E5%8A%9B%E6%90%9C%E8%87%AA%E5%8A%A8%E9%87%87%E9%9B%86)
* [magnet_qt](https://github.com/youusername/magnet_qt)
* [磁力搜自动采集](https://github.com/xiandanin/LardMonkeyScripts#%E7%A3%81%E5%8A%9B%E6%90%9C%E8%87%AA%E5%8A%A8%E9%87%87%E9%9B%86)
Binary file modified build/icons/256x256.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified build/icons/icon.icns
Binary file not shown.
Binary file modified build/icons/icon.ico
Binary file not shown.
21 changes: 21 additions & 0 deletions icns.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
filepath=256x256.png
iconset=.icns.iconset

cd build/icons
if [ ! -d $iconset ];then
mkdir $iconset
fi

sips -z 16 16 $filepath --out $iconset/icon_16x16.png
sips -z 32 32 $filepath --out $iconset/[email protected]
sips -z 32 32 $filepath --out $iconset/icon_32x32.png
sips -z 64 64 $filepath --out $iconset/[email protected]
sips -z 128 128 $filepath --out $iconset/icon_128x128.png
sips -z 256 256 $filepath --out $iconset/[email protected]
sips -z 256 256 $filepath --out $iconset/icon_256x256.png
sips -z 512 512 $filepath --out $iconset/[email protected]
sips -z 512 512 $filepath --out $iconset/icon_512x512.png
sips -z 1024 1024 $filepath --out $iconset/[email protected]

iconutil -c icns $iconset -o icon.icns
icotool -c $iconset/icon_256x256.png -o icon.ico
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"build:clean": "cross-env BUILD_TARGET=clean node .electron-vue/build.js",
"mac": "node .electron-vue/build.js && electron-builder --platform=mac",
"win": "node .electron-vue/build.js && electron-builder --platform=win",
"linux": "node .electron-vue/build.js && electron-builder --platform=linux",
"dev": "node .electron-vue/dev-runner.js",
"lint": "eslint --ext .js,.vue -f ./node_modules/eslint-friendly-formatter src",
"lint:fix": "eslint --ext .js,.vue -f ./node_modules/eslint-friendly-formatter --fix src",
Expand Down
2 changes: 1 addition & 1 deletion src/main/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ function createWindow () {
width: width,
minWidth: 900,
minHeight: 550,
frame: false,
frame: true,
titleBarStyle: 'hidden'
})

Expand Down
2 changes: 1 addition & 1 deletion src/main/menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default function (mainWindow) {
label: '关于',
click: function () {
openAboutWindow({
open_devtools: true,
open_devtools: false,
icon_path: path.resolve(__dirname, 'static/logo.png'),
homepage: 'https://magnetw.app',
css_path: path.resolve(__dirname, 'static/about.css'),
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div id="app">
<el-container>
<div class="header-placeholder drag" @dblclick="handleClickMaxWindow"></div>
<el-header class="drag">
<el-header>
<pager-header :dblclick="handleClickMaxWindow"></pager-header>
</el-header>

Expand Down
Binary file modified src/renderer/assets/images/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/renderer/components/HeaderVersion.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</script>
<style lang="scss">
.header-version {
width: 280px;
}
.header-version-text {
Expand Down
9 changes: 7 additions & 2 deletions src/renderer/components/PagerHeader.vue
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<template>
<div class="header" @dblclick="dblclick">
<header-version></header-version>
<header-version class="drag"></header-version>
<div class="header-right">
<el-menu mode="horizontal" default-active="/" router>
<el-menu-item index="/">首页</el-menu-item>
<el-menu-item index="/setting">设置</el-menu-item>

<template v-for="menuItem in project.menu">
<el-submenu v-if="menuItem.submenu" :index="menuItem.index" popper-class="header-submenu">
<browser-link slot="title" :href="menuItem.link" :underline="false">{{menuItem.text}}</browser-link>
<browser-link slot="title" :href="menuItem.link" :underline="false">{{menuItem.text}}
</browser-link>
<el-menu-item v-for="subItem in menuItem.submenu">
<browser-link :href="subItem.link" :underline="false">{{subItem.text}}</browser-link>
</el-menu-item>
Expand Down Expand Up @@ -51,6 +52,10 @@
.el-link {
vertical-align: baseline !important;
}
.header-version {
flex: 1;
}
}
</style>
Binary file modified static/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit f59e7d8

Please sign in to comment.