diff --git a/.yarnrc.yml b/.yarnrc.yml index f03163f4..f3ee3c4f 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -1,3 +1,4 @@ nodeLinker: node-modules +nmHoistingLimits: workspaces yarnPath: .yarn/releases/yarn-4.0.2.cjs diff --git a/enjoy/package.json b/enjoy/package.json index 93c808fd..018ba990 100644 --- a/enjoy/package.json +++ b/enjoy/package.json @@ -124,6 +124,7 @@ "react-activity-calendar": "^2.2.1", "react-dom": "^18.2.0", "react-hook-form": "^7.49.2", + "react-hotkeys-hook": "^4.4.3", "react-i18next": "^14.0.0", "react-markdown": "^9.0.1", "react-router-dom": "^6.21.1", @@ -134,6 +135,7 @@ "sequelize-typescript": "^2.1.6", "sqlite3": "^5.1.7", "tailwind-scrollbar-hide": "^1.1.7", + "ts-key-enum": "^2.0.12", "umzug": "^3.5.0", "wavesurfer.js": "^7.6.1", "zod": "^3.22.4" diff --git a/enjoy/src/i18n/en.json b/enjoy/src/i18n/en.json index 6f9ab3b2..69fccef2 100644 --- a/enjoy/src/i18n/en.json +++ b/enjoy/src/i18n/en.json @@ -153,6 +153,7 @@ "autoScroll": "auto scroll", "detail": "detail", "remove": "remove", + "share": "share", "loadMore": "Load more", "databaseError": "Failed to connect to database {{url}}", "somethingWentWrong": "Something went wrong", diff --git a/enjoy/src/i18n/zh-CN.json b/enjoy/src/i18n/zh-CN.json index 86e6bc6e..6870f263 100644 --- a/enjoy/src/i18n/zh-CN.json +++ b/enjoy/src/i18n/zh-CN.json @@ -153,6 +153,7 @@ "autoScroll": "自动滚动", "detail": "详情", "remove": "删除", + "share": "分享", "loadMore": "加载更多", "databaseError": "数据库错误 {{url}}", "somethingWentWrong": "出错了", diff --git a/enjoy/src/main.ts b/enjoy/src/main.ts index db8ef45b..53944ae6 100644 --- a/enjoy/src/main.ts +++ b/enjoy/src/main.ts @@ -1,4 +1,4 @@ -import { app, BrowserWindow, protocol, net } from "electron"; +import { app, BrowserWindow, globalShortcut, protocol, net } from "electron"; import path from "path"; import settings from "@main/settings"; import "@main/i18n"; @@ -50,6 +50,10 @@ app.on("ready", async () => { }); mainWindow.init(); + + globalShortcut.register("CommandOrControl+Shift+I", () => { + mainWindow.win.webContents.toggleDevTools(); + }); }); // Quit when all windows are closed, except on macOS. There, it's common diff --git a/enjoy/src/main/db/models/audio.ts b/enjoy/src/main/db/models/audio.ts index c2dc410b..751d24ce 100644 --- a/enjoy/src/main/db/models/audio.ts +++ b/enjoy/src/main/db/models/audio.ts @@ -37,7 +37,7 @@ const logger = log.scope("db/models/audio"); timestamps: true, }) export class Audio extends Model