Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into electron
Browse files Browse the repository at this point in the history
  • Loading branch information
InfSein committed Feb 10, 2025
2 parents 2dac8ae + 05f33b0 commit 00db8d6
Show file tree
Hide file tree
Showing 150 changed files with 57,248 additions and 38,519 deletions.
43 changes: 43 additions & 0 deletions .github/ISSUE_TEMPLATE/01_bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: 错误报告 (バグ報告 / Bug Report)
description: 告知我们你在运行时遇到的问题 (実行時に発生した問題をお知らせる / Inform us of issues encountered during runtime)
labels: []
body:
- type: markdown
attributes:
value: |
请先确定你遇到的是一个错误。填写必要的信息,尽可能详细,以便我们定位和处理。
まずは、発生している問題がエラーであることを確認してください。必要な情報をできるだけ詳しく記載し、問題の特定と対処ができるようご協力ください。
Please first confirm that you have encountered an error. Fill in the necessary information as detailed as possible for us to locate and process.
- type: textarea
id: background
attributes:
label: 简述 (説明 / Description)
description: |
请分享一个清晰简洁的问题描述。
明確で簡潔な問題の説明を記入してください。
Please share a clear and concise description of the problem.
placeholder: Description
validations:
required: true
- type: textarea
id: related-versions
attributes:
label: 出现版本 (発生したバージョン / Related Versions)
description: |
请提供你遇到错误的网页/客户端版本。点击顶部菜单项 `关于本作` 可以检查当前所处版本。必要时请说明客户端和网页端是否会同样遇到问题。
エラーが発生したウェブページ/クライアントのバージョンを提供してください。現在のバージョンは、トップメニューの「本作について」をクリックすると確認できます。必要に応じて、クライアントとウェブ版で同じ問題が発生するかどうかも説明してください。
Please provide the version of the webpage/client you encountered the problem in. Click on the top menu item `About us` to check the current version. If necessary, please also indicate whether the problem occurs on both the webpage and the client.
placeholder: Related Versions
validations:
required: true
- type: textarea
id: repro-steps
attributes:
label: 复现步骤 (再現する手順 / Reproduction Steps)
description: |
如果可能的话,请包括重现问题的最小步骤。尽可能以文本形式发送,而非屏幕截图(这样它可以被其他人搜索到)。
可能であれば、問題を再現するための最小限の手順を記入してください。可能であれば、スクリーンショットではなく、テキストとして提供してください(他の人が検索できるため)。
Please include minimal steps to reproduce the problem if possible. If possible include text as text rather than screenshots (so it shows up in searches).
placeholder: Minimal Reproduction
validations:
required: true
32 changes: 32 additions & 0 deletions .github/ISSUE_TEMPLATE/02_feature_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: 新功能请求 (新機能のリクエスト / Feature Request)
description: 告知我们你还需要什么 (必要な機能があればお知らせください / Tell us what else you need)
labels: []
body:
- type: markdown
attributes:
value: |
不要感到有压力:对我们来说,有东西做总会比没有东西做要好。但是我们仍需要对请求进行评估,并非所有新功能请求都会被批准。
私たちにとっては、やれることがあることは進歩のもと。ただし、リクエストは仕様確認される必要がありますので、すべての新機能リクエストが開発リストに移されるわけではありません。
Don't feel pressured: For us, having something to do is always better than having nothing to do. But we still need to evaluate the requests, not all new feature requests will be approved.
- type: textarea
id: background
attributes:
label: 简述 (説明 / Description)
description: |
请分享一个清晰简洁的描述。
明確で簡潔な説明を記入してください。
Please share a clear and concise description.
placeholder: Description
validations:
required: true
- type: textarea
id: available-refers
attributes:
label: 可供参考 (参考になれるもの / Available References)
description: |
如果有其他类似的程序/网站已经实现了这个功能,请在这里分享。
もし他の類似のアプリやウェブサイトでこの機能がすでに実装されている場合は、ここに共有してください。
If there are other similar programs/websites that have already implemented this feature, please share it here.
placeholder: Related Versions
validations:
required: false
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
blank_issues_enabled: true
3 changes: 0 additions & 3 deletions .github/pull_request_template.md

This file was deleted.

9 changes: 4 additions & 5 deletions .github/workflows/gh-action-config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build Deploy
name: Build and Deploy
# 监听 master 分支上的 push 事件
on:
push:
Expand All @@ -23,10 +23,10 @@ jobs:
node-version: "20.8.1"

# 下载依赖、打包项目
- name: Install Build
- name: Install and Build
run: |
yarn install
yarn build
npm install
npm run build
# 部署
- name: Deploy
Expand Down Expand Up @@ -81,7 +81,6 @@ jobs:
if [ "${{ env.exists }}" = "true" ]; then
gh release upload "v${{ env.VERSION }}" static-pages.zip --clobber
gh release edit "v${{ env.VERSION }}" --notes "$RELEASE_NOTES"
else
gh release create "v${{ env.VERSION }}" static-pages.zip --title "Release v${{ env.VERSION }}" --notes "$RELEASE_NOTES"
fi
Expand Down
9 changes: 4 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@
<a href="/docs/README.en.md">English</a>
</p>

![GitHub License](https://img.shields.io/github/license/InfSein/hqhelper-dawntrail?style=flat&logo=github) ![GitHub Repo stars](https://img.shields.io/github/stars/InfSein/hqhelper-dawntrail?style=flat&logo=github) ![Github Created At](https://img.shields.io/github/created-at/InfSein/hqhelper-dawntrail?style=flat&logo=github) <br>
![GitHub Release](https://img.shields.io/github/v/release/InfSein/hqhelper-dawntrail?style=flat&logo=github) ![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/InfSein/hqhelper-dawntrail/total?style=flat&logo=github)
[![GitHub License](https://img.shields.io/github/license/InfSein/hqhelper-dawntrail?style=flat&logo=github)](/LICENSE) ![GitHub Repo stars](https://img.shields.io/github/stars/InfSein/hqhelper-dawntrail?style=flat&logo=github) ![Github Created At](https://img.shields.io/github/created-at/InfSein/hqhelper-dawntrail?style=flat&logo=github) <br>
[![GitHub Release](https://img.shields.io/github/v/release/InfSein/hqhelper-dawntrail?style=flat&logo=github)](https://github.com/InfSein/hqhelper-dawntrail/releases) [![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/InfSein/hqhelper-dawntrail/total?style=flat&logo=github)](https://github.com/InfSein/hqhelper-dawntrail/releases) <br>
[![Based on Vite](https://img.shields.io/badge/Vite-5.4.2-646CFF?style=flat&logo=vite)](https://github.com/vitejs/vite) [![Based on Vue3](https://img.shields.io/badge/Vue-3.4.38-4FC08D?style=flat&logo=vue.js)](https://github.com/vuejs/core) [![Based on TypeScript](https://img.shields.io/badge/TypeScript-5.5.4-3178C6?style=flat&logo=typescript)](https://github.com/microsoft/TypeScript) [![Based on Naive UI](https://img.shields.io/badge/Naive%20UI-2.39.0-008080?style=flat&logo=npm)](https://github.com/tusen-ai/naive-ui)

面向生产采集玩家的黄金篇(7.0~7.4)秘籍配方制作计算器。

Expand All @@ -23,8 +24,6 @@

### 在浏览器中使用

第二代的 `HqHelper` 本质上只是一个静态网页。

#### 正式环境网站

* 主站点:https://infsein.github.io/hqhelper-dawntrail/#/
Expand All @@ -48,7 +47,7 @@

#### Windows 应用

参见 [Release Electron v3](https://github.com/InfSein/hqhelper-dawntrail/releases/tag/electron.v3)
参见 [Release Electron v5a](https://github.com/InfSein/hqhelper-dawntrail/releases/tag/electron.v5a)

#### iOS 应用

Expand Down
11 changes: 5 additions & 6 deletions docs/README.en.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@
<strong>English</strong>
</p>

![GitHub License](https://img.shields.io/github/license/InfSein/hqhelper-dawntrail?style=flat&logo=github) ![GitHub Repo stars](https://img.shields.io/github/stars/InfSein/hqhelper-dawntrail?style=flat&logo=github) ![Github Created At](https://img.shields.io/github/created-at/InfSein/hqhelper-dawntrail?style=flat&logo=github) <br>
![GitHub Release](https://img.shields.io/github/v/release/InfSein/hqhelper-dawntrail?style=flat&logo=github) ![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/InfSein/hqhelper-dawntrail/total?style=flat&logo=github)
[![GitHub License](https://img.shields.io/github/license/InfSein/hqhelper-dawntrail?style=flat&logo=github)](/LICENSE) ![GitHub Repo stars](https://img.shields.io/github/stars/InfSein/hqhelper-dawntrail?style=flat&logo=github) ![Github Created At](https://img.shields.io/github/created-at/InfSein/hqhelper-dawntrail?style=flat&logo=github) <br>
[![GitHub Release](https://img.shields.io/github/v/release/InfSein/hqhelper-dawntrail?style=flat&logo=github)](https://github.com/InfSein/hqhelper-dawntrail/releases) [![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/InfSein/hqhelper-dawntrail/total?style=flat&logo=github)](https://github.com/InfSein/hqhelper-dawntrail/releases) <br>
[![Based on Vite](https://img.shields.io/badge/Vite-5.4.2-646CFF?style=flat&logo=vite)](https://github.com/vitejs/vite) [![Based on Vue3](https://img.shields.io/badge/Vue-3.4.38-4FC08D?style=flat&logo=vue.js)](https://github.com/vuejs/core) [![Based on TypeScript](https://img.shields.io/badge/TypeScript-5.5.4-3178C6?style=flat&logo=typescript)](https://github.com/microsoft/TypeScript) [![Based on Naive UI](https://img.shields.io/badge/Naive%20UI-2.39.0-008080?style=flat&logo=npm)](https://github.com/tusen-ai/naive-ui)

Master formula calculator for FFXIV Dawntrail crafters.

Expand All @@ -23,8 +24,6 @@ We will provide you with information organization and formula calculation servic

### Use in browser

Essentially, it is just a static webpage.

#### Formal Sites

* Main:https://infsein.github.io/hqhelper-dawntrail/#/
Expand All @@ -44,7 +43,7 @@ We may provide various types of applications, but it is difficult to guarantee t

#### Windows APP

See [Release Electron v3](https://github.com/InfSein/hqhelper-dawntrail/releases/tag/electron.v3)
See [Release Electron v5a](https://github.com/InfSein/hqhelper-dawntrail/releases/tag/electron.v5a)

#### iOS APP

Expand Down Expand Up @@ -74,7 +73,7 @@ npm run dev

### Join in development

* **Find Problems**:If you find any errors/problems during use, or have suggestions for optimizing our interface/functionality/logic, please feel free to [new a issue](https://github.com/InfSein/hqhelper-dawntrail/issues/new)
* **Find Problems**:If you find any errors/problems during use, or have suggestions for optimizing our interface/functionality/logic, please feel free to [new a issue](https://github.com/InfSein/hqhelper-dawntrail/issues/new) .
* **Solve Problems**:If you have front-end programming skills, you can initiate a [Pull Request](https://github.com/InfSein/hqhelper-dawntrail/pulls) to join in the development of `HqHelper` through various means. The code may need to comply with general specifications and some additional rules, please refer to our [Wiki](https://github.com/InfSein/hqhelper-dawntrail/wiki) for more details.

### Donate us
Expand Down
9 changes: 4 additions & 5 deletions docs/README.ja.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@
<a href="/docs/README.en.md">English</a>
</p>

![GitHub License](https://img.shields.io/github/license/InfSein/hqhelper-dawntrail?style=flat&logo=github) ![GitHub Repo stars](https://img.shields.io/github/stars/InfSein/hqhelper-dawntrail?style=flat&logo=github) ![Github Created At](https://img.shields.io/github/created-at/InfSein/hqhelper-dawntrail?style=flat&logo=github) <br>
![GitHub Release](https://img.shields.io/github/v/release/InfSein/hqhelper-dawntrail?style=flat&logo=github) ![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/InfSein/hqhelper-dawntrail/total?style=flat&logo=github)
[![GitHub License](https://img.shields.io/github/license/InfSein/hqhelper-dawntrail?style=flat&logo=github)](/LICENSE) ![GitHub Repo stars](https://img.shields.io/github/stars/InfSein/hqhelper-dawntrail?style=flat&logo=github) ![Github Created At](https://img.shields.io/github/created-at/InfSein/hqhelper-dawntrail?style=flat&logo=github) <br>
[![GitHub Release](https://img.shields.io/github/v/release/InfSein/hqhelper-dawntrail?style=flat&logo=github)](https://github.com/InfSein/hqhelper-dawntrail/releases) [![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/InfSein/hqhelper-dawntrail/total?style=flat&logo=github)](https://github.com/InfSein/hqhelper-dawntrail/releases) <br>
[![Based on Vite](https://img.shields.io/badge/Vite-5.4.2-646CFF?style=flat&logo=vite)](https://github.com/vitejs/vite) [![Based on Vue3](https://img.shields.io/badge/Vue-3.4.38-4FC08D?style=flat&logo=vue.js)](https://github.com/vuejs/core) [![Based on TypeScript](https://img.shields.io/badge/TypeScript-5.5.4-3178C6?style=flat&logo=typescript)](https://github.com/microsoft/TypeScript) [![Based on Naive UI](https://img.shields.io/badge/Naive%20UI-2.39.0-008080?style=flat&logo=npm)](https://github.com/tusen-ai/naive-ui)

生産&採集プレイヤー向けの黄金編(パッチ7.0~7.4)秘伝書レシピ計算ツール。

Expand All @@ -23,8 +24,6 @@

### ブラウザで使う

第二世代の `HqHelper` は本質的に静的なウェブページです。

#### 本番環境サイト

* メインサイト: https://infsein.github.io/hqhelper-dawntrail/#/
Expand All @@ -45,7 +44,7 @@

#### Windows アプリ

[Release Electron v3](https://github.com/InfSein/hqhelper-dawntrail/releases/tag/electron.v3) をご覧ください。
[Release Electron v5a](https://github.com/InfSein/hqhelper-dawntrail/releases/tag/electron.v5a) をご覧ください。

#### iOS アプリ

Expand Down
43 changes: 39 additions & 4 deletions env.electron.d.ts
Original file line number Diff line number Diff line change
@@ -1,27 +1,62 @@
// env.electron.d.ts
export interface ElectronAPI {
/**
* @deprecated 此接口已被弃用且没有实际效果,请勿使用
*/
checkForUpdates: () => void;
/**
* @deprecated 此接口已被弃用且没有实际效果,请勿使用
*/
installUpdate: () => void;
/**
* @deprecated 此接口已被弃用且没有实际效果,请勿使用
*/
onUpdateReady: (callBack: Function) => void;

/** 令窗口最小化 */
minimize: () => void;
/** 令窗口最大化 */
maximize: () => void;
/** 令窗口取消最大化状态 */
restore: () => void;
/** 令窗口关闭 */
close: () => void;

/** 获取客户端的当前版本 (格式如 `v1`, `v5a`, `v6`) */
clientVersion: Promise<string>;

/** 向给定URL发送GET请求,成功时返回字符串格式的数据;失败时throw error */
httpGet: (url: string) => Promise<string>;
/** 检查给定域名的延迟,返回延迟时间(ms)或超时信息 */
simulatePing: (domain: string) => Promise<number | "error" | "timeout">;
/** 从给定URL下载WEB项目更新包,并在下载成功后自动替换-重启 */
downloadUpdatePack: (url: string) => Promise<string>;
/** 下载进度信息回调 */
onUpdateProgress: (callback: (progressData: ProgressData) => void) => void;
/** 调用默认浏览器打开给定URL */
openUrlByBrowser: (url: string) => void;
/** 复制给定字符串 */
copyText: (text: string) => Promise<string>;
/** 创建新窗口 */
createNewWindow: (id: string, url: string, defaultWidth: number, defaultHeight: number, title: string) => void;
/** 切换窗口置顶 */
toggleAlwaysOnTop: () => void;
/** 更新标题栏操作按钮的主题 */
updateTitleBarTheme: (isDarkMode: boolean) => void;
/** 打开开发者工具 */
openDevTools: () => void;
}

export interface ProgressData {
stage: "requesting" | "downloading" | "extracting" | "replacing" | "cleaning" | "relaunching" | "end"; // 当前阶段
/** 当前阶段 */
stage: "requesting" | "downloading" | "extracting" | "replacing" | "cleaning" | "relaunching" | "end";
progress?: {
total: string; // 总下载大小 (MB)
downloaded: string; // 已下载大小 (MB)
speed: string; // 下载速度 (MB/s)
/** 总下载大小 (MB) */
total: string;
/** 已下载大小 (MB) */
downloaded: string;
/** 下载速度 (MB/s) */
speed: string;
};
}

Expand Down
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta charset="UTF-8">
<meta name="viewport"
content="width=device-width, initial-scale=1.0, user-scalable=no, maximum-scale=1, minimum-scale=1">
<title>7.0 HQ Helper</title>
<title>7.x HQ Helper</title>
<link rel="icon" href="./icons/logo_v2_192x192.png">
<link rel="manifest" href="./manifest.json">
</head>
Expand Down
Loading

0 comments on commit 00db8d6

Please sign in to comment.