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

修复workflow,改善CSS,改善目录样式,改善index #12

Open
wants to merge 12 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
12 changes: 9 additions & 3 deletions .github/workflows/sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,22 @@ jobs:
echo "SKIP_SYNC=false" >> $GITHUB_ENV
fi

- name: Configure Git User
if: env.SKIP_SYNC != 'true'
run: |
git config user.name "GitHub Action"
git config user.email "[email protected]"

- name: Fetch and Merge Upstream
if: env.SKIP_SYNC != 'true'
run: |
git fetch upstream
git checkout main
git merge upstream/main --allow-unrelated-histories
git checkout master
git merge upstream/master --allow-unrelated-histories

- name: Push Changes
if: env.SKIP_SYNC != 'true'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
git push origin main
git push origin master
48 changes: 48 additions & 0 deletions .github/workflows/sync_manual.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: Sync Fork Manual

on:
workflow_dispatch: # 仅手动触发

jobs:
sync:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Setup Git
run: |
git remote add upstream https://github.com/yoyodadada/haoruanfenxiang.git
# 获取上游仓库 URL
UPSTREAM_URL=$(git remote get-url upstream)
# 获取当前仓库 URL
ORIGIN_URL=$(git remote get-url origin)
echo "Upstream URL: $UPSTREAM_URL"
echo "Origin URL: $ORIGIN_URL"
# 检查是否相同,并设置环境变量
if [ "$UPSTREAM_URL" = "$ORIGIN_URL" ]; then
echo "Skipping sync because the upstream is the same as origin."
echo "SKIP_SYNC=true" >> $GITHUB_ENV
else
echo "SKIP_SYNC=false" >> $GITHUB_ENV
fi

- name: Configure Git User
if: env.SKIP_SYNC != 'true'
run: |
git config user.name "GitHub Action"
git config user.email "[email protected]"

- name: Fetch and Merge Upstream
if: env.SKIP_SYNC != 'true'
run: |
git fetch upstream
git checkout master
git merge upstream/master --allow-unrelated-histories

- name: Push Changes
if: env.SKIP_SYNC != 'true'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
git push origin master
13 changes: 11 additions & 2 deletions List.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,15 @@ layout: default

# 目录

### [A](#a) [B](#b) [C](#c) [D](#d) [E](#e) [F](#f) [G](#g) [H](#h) [I](#i) [J](#j) [K](#k) [L](#l) [M](#m) [N](#n) [O](#o) [P](#p) [Q](#q) [R](#r) [S](#s) [T](#t) [U](#u) [V](#v) [W](#w) [X](#x) [Y](#y) [Z](#z) [未归类、合集](#未归类合集)
## [A](#a) [B](#b) [C](#c) [D](#d) [E](#e) [F](#f) [G](#g)

## [H](#h) [I](#i) [J](#j) [K](#k) [L](#l) [M](#m) [N](#n)

## [O](#o) [P](#p) [Q](#q) [R](#r) [S](#s) [T](#t) [U](#u)

## [V](#v) [W](#w) [X](#x) [Y](#y) [Z](#z)

## [未归类、合集](#未归类合集)

---

Expand Down Expand Up @@ -100,7 +108,8 @@ AfuseKtV-TV版:https://yoyodadada.lanzn.com/b0mb4d71e#3e2r 密码:3e2r

百度网盘:https://yoyodadada.lanzouw.com/b07pspid

- 超过100MB文件下载地址::https://zijieyunpan.com/6No033RJMU1
- 超过100MB文件下载地址:
+ https://zijieyunpan.com/6No033RJMU1
+ https://www.123pan.com/s/JceA-LhBi.html

哔哩哔哩:https://yoyodadada.lanzouw.com/b07pspyj
Expand Down
9 changes: 4 additions & 5 deletions _layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
<div class="wrapper">
<header>
<h1>好软分享</h1>
<h2><a href="https://github.com/yoyodadada/haoruanfenxiang">项目地址</a></h2>

</header>
<section>
Expand All @@ -37,7 +36,7 @@ <h2><a href="https://github.com/yoyodadada/haoruanfenxiang">项目地址</a></h2
<footer>
<a href="https://github.com/yoyodadada/haoruanfenxiang">好软分享</p></a>

<p>&copy;2024 好软分享.<span>All rights reserved</span>.</p>
<p>&copy;2024 好软分享. All rights reserved.</p>
</footer>
</div>

Expand All @@ -50,11 +49,11 @@ <h2><a href="https://github.com/yoyodadada/haoruanfenxiang">项目地址</a></h2
if (node.nodeType === Node.TEXT_NODE) {
const text = node.nodeValue;
if (regex.test(text)) {
const span = document.createElement("span");
span.innerHTML = text.replace(regex, function (url) {
const p = document.createElement("p");
p.innerHTML = text.replace(regex, function (url) {
return `<a href="${url}" target="_blank" rel="noopener">${url}</a>`;
});
node.replaceWith(span);
node.replaceWith(p);
}
} else if (node.nodeType === Node.ELEMENT_NODE && node.tagName !== "A") {
// 遍历子节点,避免修改 <a> 标签中的内容
Expand Down
5 changes: 2 additions & 3 deletions assets/css/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ ul {
}

li {
padding: 10px 15px;
border-bottom: 1px solid #eee;
padding: 0px 20px;
transition: background-color 0.2s ease-in-out;
}

Expand All @@ -46,7 +45,7 @@ li:last-child {

/* 鼠标悬停效果 */
li:hover {
background-color: #f5f5f5;
background-color: #f3f4f5;
}

/* 链接样式 */
Expand Down
18 changes: 9 additions & 9 deletions index.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,31 @@
layout: default
---

# 好软分享
### https://haoruanfenxiang.pages.dev

### https://yoyodadada.github.io/haoruanfenxiang

## 项目地址
## 项目地址

GitHub:https://github.com/yoyodadada/haoruanfenxiang

## 下载地址(按更新时间倒序排列)
## 下载地址(按更新时间倒序排列)

蓝奏主页:https://yoyodadada.lanzouw.com/u/yoyodadada

## 软件列表(按软件名首字母归类):

GitHub:https://github.com/yoyodadada/haoruanfenxiang/blob/master/List.md
## 软件列表(按软件名首字母归类)

pages.dev(免翻):https://haoruanfenxiang.pages.dev/List

## TG频道及群组:
GitHub:https://github.com/yoyodadada/haoruanfenxiang/blob/master/List.md

## TG频道及群组

Telegram频道:https://t.me/haoruanfenxiang

Telegram群组:https://t.me/haoruanfenxianggroup

## 说明
## 说明

2021年3月19日:酷安账号被封,已卸载酷安,日后更新内容和下载地址将不会在酷安上通知。

Expand All @@ -38,7 +38,7 @@ Telegram群组:https://t.me/haoruanfenxianggroup

注3:因受蓝奏限制,2023年9月19日以后分享的apk和ipa文件需要将手机浏览器UA调成电脑模式后才能下载,电脑浏览器下载不受影响。

## 版权声明
## 版权声明

①根据二〇〇二年一月一日《计算机软件保护条例》规定:为了学习和研究软件内含的设计思想和原理,通过安装、显示、传输或者存储软件等方式使用软件的,可以不经软件著作权人许可,不向其支付报酬!

Expand Down