Skip to content

Commit

Permalink
Merge branch 'main' into beta
Browse files Browse the repository at this point in the history
  • Loading branch information
chenfan0 committed Oct 29, 2024
2 parents 26fe43e + 7cf68e2 commit ca40bb1
Show file tree
Hide file tree
Showing 66 changed files with 3,610 additions and 371 deletions.
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
"[json]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"cSpell.words": ["shadcn", "weibo"]
"cSpell.words": ["authtoken", "Frpc", "shadcn", "weibo"]
}
2 changes: 2 additions & 0 deletions README-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
## ✋🏻 简介
这是一个基于`React` `Ffmpeg` `Electron` `Shadcn`**直播录制软件**。支持监控直播,可以帮助用户简单便捷的对直播进行录制并保存为MP4格式的视频。

Fideo 官方网站:[https://www.fideo.site/cn](https://www.fideo.site/cn)

## 已支持平台
- [x] [YouTube](https://www.youtube.com/)
- [x] [Twitch](https://www.twitch.tv/)
Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@

[中文文档](https://github.com/chenfan0/fideo-live-record/blob/main/README-CN.md)


## ✋🏻Introduction
This is a **live recording software** based on `React`, `Ffmpeg`, `Electron`, `Shadcn`. It supports monitoring live streams, making it simple and convenient for users to record live streams and save them as MP4 videos.

Fideo official website: [https://www.fideo.site/en](https://www.fideo.site/en)

## Supported Platforms
- [x] [YouTube](https://www.youtube.com/)
- [x] [Twitch](https://www.twitch.tv/)
Expand Down
8 changes: 8 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,36 +39,44 @@
"base-64": "^1.0.0",
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.1",
"cross-spawn": "^7.0.3",
"crypto-js": "^4.2.0",
"dayjs": "^1.11.11",
"debug": "^4.3.5",
"download": "^8.0.0",
"electron-updater": "^6.1.7",
"execa": "5.1.1",
"fastify": "^5.0.0",
"fluent-ffmpeg": "^2.1.3",
"i18next": "^23.11.5",
"localforage": "^1.10.0",
"lucide-react": "^0.383.0",
"mitt": "^3.0.1",
"nanoid": "^5.0.7",
"react-confetti": "^6.1.0",
"react-hook-form": "^7.51.5",
"react-i18next": "^14.1.2",
"react-use": "^17.5.0",
"semver": "^7.6.2",
"tailwind-merge": "^2.3.0",
"tailwindcss-animate": "^1.0.7",
"utf8": "^3.0.0",
"validator": "^13.12.0",
"ws": "^8.18.0",
"zod": "^3.23.8",
"zustand": "^4.5.2"
},
"devDependencies": {
"@electron-toolkit/eslint-config-prettier": "^2.0.0",
"@electron-toolkit/eslint-config-ts": "^1.0.1",
"@electron-toolkit/tsconfig": "^1.0.1",
"@types/cross-spawn": "^6.0.6",
"@types/download": "^8.0.5",
"@types/fluent-ffmpeg": "^2.1.24",
"@types/node": "^18.19.9",
"@types/react": "^18.2.48",
"@types/react-dom": "^18.2.18",
"@types/ws": "^8.5.12",
"@vitejs/plugin-react": "^4.2.1",
"autoprefixer": "^10.4.19",
"bumpp": "^9.4.1",
Expand Down
Loading

0 comments on commit ca40bb1

Please sign in to comment.