From babd0d2617618c89f42759db4dbd223cf249051c Mon Sep 17 00:00:00 2001 From: nekobato Date: Wed, 23 Aug 2023 21:49:30 +0900 Subject: [PATCH] =?UTF-8?q?shared=E3=81=AB=E3=83=91=E3=82=B9=E9=80=9A?= =?UTF-8?q?=E3=81=97=E3=81=9F=E3=81=84=E3=81=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/main/db.ts | 8 +-- packages/main/tsconfig.json | 8 ++- packages/main/vite.config.ts | 2 +- packages/mutation-types.ts | 58 ------------------- packages/renderer/src/components/Post.vue | 17 +++--- .../renderer/src/pages/PostWindow/Create.vue | 3 +- packages/renderer/src/store/index.ts | 1 - packages/renderer/tsconfig.json | 11 +--- packages/shared/types/Store.ts | 14 +++++ packages/shared/types/hazy.ts | 9 --- 10 files changed, 36 insertions(+), 95 deletions(-) delete mode 100644 packages/mutation-types.ts create mode 100644 packages/shared/types/Store.ts delete mode 100644 packages/shared/types/hazy.ts diff --git a/packages/main/db.ts b/packages/main/db.ts index 145493a..7e9e724 100644 --- a/packages/main/db.ts +++ b/packages/main/db.ts @@ -1,14 +1,10 @@ import { safeStorage } from "electron"; import Store from "electron-store"; import { v4 as uuid } from "uuid"; +import { Timeline } from "../shared/types/Store"; export type StoreSchema = { - timeline: { - id: string; // uuid - userId: string; - channel: string; - options: string; - }[]; + timeline: Timeline[]; instance: { id: string; // uuid type: "misskey" | "mastodon"; diff --git a/packages/main/tsconfig.json b/packages/main/tsconfig.json index 4082f16..fd09a8b 100644 --- a/packages/main/tsconfig.json +++ b/packages/main/tsconfig.json @@ -1,3 +1,9 @@ { - "extends": "../../tsconfig.json" + "extends": "../../tsconfig.json", + "compilerOptions": { + "paths": { + "@/shared/*": ["../shared/*"] + } + }, + "include": ["**/*.ts"] } diff --git a/packages/main/vite.config.ts b/packages/main/vite.config.ts index 31695d2..0ccf502 100644 --- a/packages/main/vite.config.ts +++ b/packages/main/vite.config.ts @@ -15,7 +15,7 @@ export default defineConfig({ sourcemap: true, emptyOutDir: true, rollupOptions: { - external: ["electron", "sqlite3", ...builtinModules, ...Object.keys(pkg.dependencies || {})], + external: ["electron", ...builtinModules, ...Object.keys(pkg.dependencies || {})], }, commonjsOptions: { ignoreGlobal: false, diff --git a/packages/mutation-types.ts b/packages/mutation-types.ts deleted file mode 100644 index 7993a4f..0000000 --- a/packages/mutation-types.ts +++ /dev/null @@ -1,58 +0,0 @@ -export const CONNECT_STATE = 'CONNECT_STATE'; -export const CONNECT_COMMIT = 'CONNECT_COMMIT'; -export const CONNECT_SCREEN = 'CONNECT_SCREEN'; - -export const DROP_FILE = 'DROP_FILE'; - -export const VIDEO_SELECT = 'VIDEO_SELECT'; -export const PAUSE_FILE = 'PAUSE_FILE'; -export const RESUME_FILE = 'RESUME_FILE'; -export const REMOVE_QUEUE = 'REMOVE_QUEUE'; -export const CLEAR_QUEUES = 'CLEAR_QUEUES'; -export const SORT_QUEUE = 'SORT_QUEUE'; -export const VIDEO_TIMEUPDATE = 'VIDEO_TIMEUPDATE'; -export const VIDEO_CANPLAY = 'VIDEO_CANPLAY'; -export const VIDEO_SEEK = 'VIDEO_SEEK'; -export const VIDEO_PLAYED = 'VIDEO_PLAYED'; -export const VIDEO_PAUSED = 'VIDEO_PAUSED'; -export const VIDEO_ENDED = 'VIDEO_ENDED'; - -// Settings -export const SET_MODE = 'SET_MODE'; -export const SET_OPACITY = 'SET_OPACITY'; -export const SET_HIDE_ON_TASKBAR = 'SET_HIDE_ON_TASKBAR'; -export const SET_CLICKTHROUGH = 'SET_CLICKTHROUGH'; -export const TOGGLE_RESIZE = 'TOGGLE_RESIZE'; -export const START_RESIZE = 'START_RESIZE'; -export const END_RESIZE = 'END_RESIZE'; -export const SET_FULLSCREEN = 'SET_FULLSCREEN'; -export const TOGGLE_SETTINGS = 'TOGGLE_SETTINGS'; -export const OPEN_WEBVIEW = 'OPEN_WEBVIEW'; -export const CLOSE_WEBVIEW = 'CLOSE_WEBVIEW'; - -// Browser Actions -export const BROWSER_VIEW_EVENT = 'BROWSER_VIEW_EVENT'; -export const SET_URL = 'SET_URL'; -export const BROWSER_RELOAD = 'BROWSER_RELOAD'; -export const BROWSER_BACK = 'BROWSER_BACK'; -export const BROWSER_FORWARD = 'BROWSER_FORWARD'; -export const BROWSER_CAN_GO_BACK = 'BROWSER_FORWARD'; -export const BROWSER_CAN_GO_FORWARD = 'BROWSER_FORWARD'; - -export const RESET = 'RESET'; -export const QUIT = 'QUIT'; - -export const WINDOW_TRANSPARENT_ON = 'WINDOW_TRANSPARENT_ON'; -export const WINDOW_TRANSPARENT_OFF = 'WINDOW_TRANSPARENT_OFF'; - -// VideoList -export const VIDEO_LIST_TOGGLE = 'VIDEO_LIST_TOGGLE'; -export const VIDEO_LIST_ADD_FILES = 'VIDEO_LIST_ADD_FILE'; -export const VIDEO_VIEW_EVENT = 'VIDEO_VIEW_EVENT'; -export const VIDEO_BACK = 'VIDEO_BACK'; -export const VIDEO_PLAY = 'VIDEO_PLAY'; -export const VIDEO_PAUSE = 'VIDEO_PAUSE'; -export const VIDEO_FORWARD = 'VIDEO_FORWARD'; - -// Video Monitor -export const SET_VIDEO_SOURCE = 'SET_VIDEO_SOURCE'; diff --git a/packages/renderer/src/components/Post.vue b/packages/renderer/src/components/Post.vue index 081d08e..94dade4 100644 --- a/packages/renderer/src/components/Post.vue +++ b/packages/renderer/src/components/Post.vue @@ -39,6 +39,7 @@ const postAtttachments = computed(() => { }); const openPost = () => { + console.log(new URL(`/notes/${props.post.id}`, timelineStore.currentInstance?.url).toString()); ipcSend("open-url", { url: new URL(`/notes/${props.post.id}`, timelineStore.currentInstance?.url).toString() }); }; @@ -84,14 +85,6 @@ const isMyReaction = (reaction: string, myReaction?: string) => {
-
- - -
@@ -123,6 +116,14 @@ const isMyReaction = (reaction: string, myReaction?: string) => { {{ reaction.count }}
+
+ + +
diff --git a/packages/renderer/src/pages/PostWindow/Create.vue b/packages/renderer/src/pages/PostWindow/Create.vue index a9cc771..f206682 100644 --- a/packages/renderer/src/pages/PostWindow/Create.vue +++ b/packages/renderer/src/pages/PostWindow/Create.vue @@ -4,10 +4,9 @@ import { Icon } from "@iconify/vue"; import { computed, onMounted, reactive, ref } from "vue"; import HazyButton from "@/components/common/HazyButton.vue"; import hazyAlert from "@/components/common/HazyAlert.vue"; -import { User } from "@prisma/client"; const state = reactive({ - users: [] as User[], + users: [] as any, currentUserIndex: 0, post: { isSending: false, diff --git a/packages/renderer/src/store/index.ts b/packages/renderer/src/store/index.ts index b4ae385..f8d6551 100644 --- a/packages/renderer/src/store/index.ts +++ b/packages/renderer/src/store/index.ts @@ -1,5 +1,4 @@ import { ipcInvoke } from "@/utils/ipc"; -import { Instance as InstanceTable, User } from "@prisma/client"; import { Post } from "@/types/Post"; import { defineStore } from "pinia"; import { Emoji, MisskeyEntities } from "@/types/misskey"; diff --git a/packages/renderer/tsconfig.json b/packages/renderer/tsconfig.json index fc3222a..c21a381 100644 --- a/packages/renderer/tsconfig.json +++ b/packages/renderer/tsconfig.json @@ -1,19 +1,12 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "target": "esnext", "useDefineForClassFields": true, - "module": "esnext", - "moduleResolution": "node", - "strict": true, - "jsx": "preserve", - "resolveJsonModule": true, - "esModuleInterop": true, "lib": ["esnext", "dom"], - "baseUrl": ".", "allowJs": true, "paths": { - "@/*": ["src/*"] + "@/*": ["./src/*"], + "@@/*": ["../*"] } }, "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue"] diff --git a/packages/shared/types/Store.ts b/packages/shared/types/Store.ts new file mode 100644 index 0000000..82d3f93 --- /dev/null +++ b/packages/shared/types/Store.ts @@ -0,0 +1,14 @@ +export type Timeline = { + id: string; // uuid + userId: string; + channel: string; + options: string; +}; + +export type Instance = { + id: string; // uuid + type: "misskey" | "mastodon"; + name: string; + url: string; + iconUrl: string; +}; diff --git a/packages/shared/types/hazy.ts b/packages/shared/types/hazy.ts deleted file mode 100644 index 94bc35e..0000000 --- a/packages/shared/types/hazy.ts +++ /dev/null @@ -1,9 +0,0 @@ -export type User = { - id?: string; - userId: string; - instanceUrl: string; - token: string; - name: string; - username: string; - avatarUrl: string; -};