diff --git a/package.json b/package.json index 8c4c7929..d7ff00f4 100644 --- a/package.json +++ b/package.json @@ -3,11 +3,11 @@ "version": "1.1.0", "description": "pear-rec is a cross platform screenshot, screen recording, audio recording, and video recording software.", "scripts": { - "dev:desktop": "concurrently --names \"WEB,DESKTOP\" -c \"red,blue\" \"pnpm run -C packages/web dev\" \"pnpm run -C packages/desktop dev\"", + "dev:desktop": "concurrently --names \"WEB,DESKTOP\" -c \"red,blue\" \"pnpm run -C packages/web dev\" \"wait-on tcp:9191 && pnpm run -C packages/desktop dev\"", "build:desktop": "pnpm run -C packages/desktop build && pnpm run project:desktop && pnpm run -C packages/desktop build:win", "project:desktop": "pnpm run -C packages/web build && node tools/copy-files-web2desktop.js", "rebuild:server": "pnpm run -C packages/server rebuild && pnpm run -C packages/desktop rebuild", - "dev:web": "concurrently --names \"SERVER,WEB\" -c \"red,auto\" \"pnpm run dev:server\" \"pnpm run -C packages/web dev\"", + "dev:web": "concurrently --names \"SERVER,WEB\" -c \"red,auto\" \"pnpm run dev:server\" \"wait-on tcp:9190 && pnpm run -C packages/web dev\"", "build:web": "concurrently -s \"pnpm run -C packages/server dev\" \"pnpm run project:web\"", "only-build:web": "pnpm run -C packages/web build", "watch:web": "pnpm run -C packages/web watch", @@ -39,7 +39,8 @@ "commitizen": "^4.3.0", "concurrently": "^8.2.1", "cz-conventional-changelog": "^3.3.0", - "typescript": "^5.2.2" + "typescript": "^5.2.2", + "wait-on": "^7.2.0" }, "keywords": [ "electron", @@ -62,4 +63,4 @@ "url": "https://github.com/027xiguapi/pear-rec/issues" }, "license": "Apache-2.0" -} \ No newline at end of file +} diff --git a/packages/server/src/api/local.ts b/packages/server/src/api/local.ts index 9d67dd5c..19ebbb26 100644 --- a/packages/server/src/api/local.ts +++ b/packages/server/src/api/local.ts @@ -19,7 +19,7 @@ const storage = multer.diskStorage({ const user = await userController._getUserById(userId); const setting = await settingController._getSettingByUserId(userId); try { - const filePath = join(setting.filePath || PEAR_FILES_PATH, `${user.uuid}/${type}`); + const filePath = join(setting?.filePath || PEAR_FILES_PATH, `${user.uuid}/${type}`); if (!fs.existsSync(filePath)) { fs.mkdirSync(filePath, { recursive: true }); } diff --git a/packages/web/src/pages/recorderVideo/index.module.scss b/packages/web/src/pages/recorderVideo/index.module.scss index 5e52d035..ff4e31bd 100644 --- a/packages/web/src/pages/recorderVideo/index.module.scss +++ b/packages/web/src/pages/recorderVideo/index.module.scss @@ -4,6 +4,12 @@ overflow: hidden; position: relative; :global { + .tip { + font-size: 25px; + color: red; + text-align: center; + margin-top: 160px; + } .content { width: 100%; height: 100%; diff --git a/packages/web/src/pages/recorderVideo/index.tsx b/packages/web/src/pages/recorderVideo/index.tsx index ce024987..df000319 100644 --- a/packages/web/src/pages/recorderVideo/index.tsx +++ b/packages/web/src/pages/recorderVideo/index.tsx @@ -183,7 +183,8 @@ const RecorderVideo = () => { return (