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

develop => master #3

Merged
merged 36 commits into from
Aug 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
e7f0184
fix: change CPU 使用率を整数に変更
shm11C3 Jun 3, 2024
850913f
add: メモリ使用率取得APIの追加
shm11C3 Jun 3, 2024
22606e7
refactor: コメント追加
shm11C3 Jun 3, 2024
d94a011
add: ハードウェアの過去の履歴で取得できる関数を追加
shm11C3 Jun 8, 2024
36ea01a
fix: ts エラーを修正
shm11C3 Jun 8, 2024
f82109c
refactor: 不要なコードを削除
shm11C3 Jun 8, 2024
93ff62b
refactor: パスエイリアスの追加
shm11C3 Jun 8, 2024
9dc60be
refactor: サンプルコードのリファクタ
shm11C3 Jun 8, 2024
7ad8f8e
add: ハードウェア使用率のグラフを追加
shm11C3 Jun 8, 2024
1e67789
fix: config 周りの見直し
shm11C3 Jun 8, 2024
9ddab9c
fix: typo修正
shm11C3 Jun 8, 2024
3a90191
chore: GH Actions のアプリ名を仮のものに変更
shm11C3 Jun 8, 2024
b279273
fix: ファイル名修正
shm11C3 Jun 8, 2024
4b927d0
fix: デバッグできない問題を修正
shm11C3 Jun 10, 2024
884f73e
feat: グラフの見た目を調整
shm11C3 Jun 10, 2024
c0f8f17
feat: GPU 使用率取得処理を追加
shm11C3 Jun 10, 2024
0de0759
add: get_windows_theme
shm11C3 Jun 11, 2024
59ae1dd
refactor: フォーマット実行
shm11C3 Jun 11, 2024
b429ab2
change: svelte => react
shm11C3 Aug 24, 2024
203954a
add: plugin_window_state
shm11C3 Aug 24, 2024
1441268
refactor: 未使用のコードを削除
shm11C3 Aug 24, 2024
d2240a8
refactor: LineChart の分割
shm11C3 Aug 24, 2024
75de23a
update: 凡例をカスタマイズ
shm11C3 Aug 24, 2024
25a8646
add tailwind
shm11C3 Aug 24, 2024
69b7fb7
refactor: `src-tauri`
shm11C3 Aug 24, 2024
bc0f261
feat: 状態管理機能をバックエンドに追加
shm11C3 Aug 24, 2024
ce29286
add: dark mode
shm11C3 Aug 24, 2024
ebd698f
fix: GPU使用率取得処理を修正
shm11C3 Aug 25, 2024
68bba2f
add: jotai
shm11C3 Aug 25, 2024
6d64bfb
update: npm
shm11C3 Aug 25, 2024
de28632
update: npm
shm11C3 Aug 25, 2024
878f2ed
fix: `npm run format` コマンドを修正
shm11C3 Aug 25, 2024
24841fc
Merge branch 'develop' of https://github.com/shm11C3/hardware-monitor…
shm11C3 Aug 25, 2024
7fd3756
update: setting によって表示するグラフを変えれるよう変更
shm11C3 Aug 25, 2024
c1a31a8
add: logger
shm11C3 Aug 25, 2024
15e157b
add: ci
shm11C3 Aug 25, 2024
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
40 changes: 40 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: "ci"

on:
pull_request:
branches:
- master
- develop

jobs:
test-tauri:
strategy:
fail-fast: false
matrix:
include:
- platform: "windows-latest"
args: ""

runs-on: ${{ matrix.platform }}
steps:
- uses: actions/checkout@v4

- name: setup node
uses: actions/setup-node@v4
with:
node-version: lts/*

- name: install Rust stable
uses: dtolnay/rust-toolchain@stable

- name: install frontend dependencies
run: npm ci

- name check front end Lint
run: npm run lint:ci

- uses: tauri-apps/tauri-action@v0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
args: ${{ matrix.args }}
10 changes: 1 addition & 9 deletions .github/workflows/build.yaml → .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,6 @@ jobs:
# Those targets are only used on macos runners so it's in an `if` to slightly speed up windows and linux builds.
targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}

- name: install dependencies (ubuntu only)
if: matrix.platform == 'ubuntu-22.04' # This must match the platform value defined above.
run: |
sudo apt-get update
sudo apt-get install -y libwebkit2gtk-4.0-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
# webkitgtk 4.0 is for Tauri v1 - webkitgtk 4.1 is for Tauri v2.
# You can remove the one that doesn't apply to your app to speed up the workflow a bit.

- name: install frontend dependencies
run: npm ci # change this to npm, pnpm or bun depending on which one you use.

Expand All @@ -49,7 +41,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tagName: app-v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version.
releaseName: "App v__VERSION__"
releaseName: "Hardware Monitor v__VERSION__"
releaseBody: "See the assets to download this version and install."
releaseDraft: true
prerelease: false
Expand Down
34 changes: 23 additions & 11 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,24 @@
.DS_Store
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*

node_modules
/build
/.svelte-kit
/package
.env
.env.*
!.env.example
.vercel
.output
vite.config.js.timestamp-*
vite.config.ts.timestamp-*
dist
dist-ssr
*.local

# Editor directories and files
.vscode/*
!.vscode/extensions.json
.idea
.DS_Store
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?
4 changes: 2 additions & 2 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
"isBackground": true,
// change this to your `beforeDevCommand`:
"command": "npm",
"args": ["run", "tauri", "dev"]
"args": ["run", "dev"]
},
{
"label": "ui:build",
"type": "shell",
// change this to your `beforeBuildCommand`:
"command": "npm",
"args": ["run", "tauri", "build"]
"args": ["run", "build"]
}
]
}
14 changes: 14 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Tauri + React + Typescript</title>
</head>

<body>
<div id="root"></div>
<script type="module" src="/src/main.tsx"></script>
</body>
</html>
Loading