diff --git a/package.json b/package.json index 899e611..03c6669 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "crimata-electron", + "name": "crimata-messenger", "version": "0.1.0", "private": true, "scripts": { @@ -11,7 +11,7 @@ "electron:build": "vue-cli-service electron:build", "electron:serve": "vue-cli-service electron:serve", "postinstall": "electron-builder install-app-deps", - "postuninstall": "electron-builder install-app-deps" + "postuninstal": "electron-builder install-app-deps" }, "main": "background.js", "dependencies": { diff --git a/src/background.ts b/src/background.ts index 9eec2fc..c14b71f 100644 --- a/src/background.ts +++ b/src/background.ts @@ -33,8 +33,9 @@ protocol.registerSchemesAsPrivileged([ function createWindow() { // Create the browser window. win = new BrowserWindow({ - width: 650, - height: 1200, + width: 350, + height: 525, + resizable: false, webPreferences: { // Use pluginOptions.nodeIntegration, leave this alone // See nklayman.github.io/vue-cli-plugin-electron-builder/guide/security.html#node-integration for more info @@ -47,7 +48,7 @@ function createWindow() { if (process.env.WEBPACK_DEV_SERVER_URL) { // Load the url of the dev server if in development mode win.loadURL(process.env.WEBPACK_DEV_SERVER_URL as string); - if (!process.env.IS_TEST) win.webContents.openDevTools(); + // if (!process.env.IS_TEST) win.webContents.openDevTools(); } else { createProtocol("app"); // Load the index.html when not in development diff --git a/src/components/AI/index.vue b/src/components/AI/index.vue index eed2b0a..87a2aa0 100644 --- a/src/components/AI/index.vue +++ b/src/components/AI/index.vue @@ -26,7 +26,6 @@ data-name="Rectangle 410" width="350" height="500" - rx="20" fill="url(#radial-gradient)" /> diff --git a/src/components/UI/UIDetails/inputItem.vue b/src/components/UI/UIDetails/inputItem.vue index 9420185..693f1df 100644 --- a/src/components/UI/UIDetails/inputItem.vue +++ b/src/components/UI/UIDetails/inputItem.vue @@ -91,7 +91,7 @@ div[contenteditable] { border: 0; border-radius: 20px; color: #fff; - background-color: #61b4f4; + background-color: #585858; font-size: 14; text-align: left; p { diff --git a/src/components/UI/index.vue b/src/components/UI/index.vue index 0133306..d1e5655 100644 --- a/src/components/UI/index.vue +++ b/src/components/UI/index.vue @@ -9,7 +9,7 @@ - + @@ -54,6 +54,6 @@ export default defineComponent({ height: 500px; background-color: #e6e6e6; box-shadow: 0px 3px 10px 0px rgba(0, 0, 0, 0.3); - border-radius: 20px; + // border-radius: 20px; } diff --git a/src/composables/messageItem/useMessageItemComp.ts b/src/composables/messageItem/useMessageItemComp.ts index 9038549..341cc3f 100644 --- a/src/composables/messageItem/useMessageItemComp.ts +++ b/src/composables/messageItem/useMessageItemComp.ts @@ -33,10 +33,10 @@ export default function useMessageItemComp(m: string, id: string) { const textFill = computed(() => { switch (m) { - case "fr": - return "#000"; - default: + case "sf": return "#fff"; + default: + return "#000"; } }); @@ -45,7 +45,7 @@ export default function useMessageItemComp(m: string, id: string) { case "sf": return "#61b4f4"; case "ai": - return "#585858"; + return "#DDDDDD"; default: return "#fff"; } diff --git a/src/composables/messageRenderer/useMessageRenderer.ts b/src/composables/messageRenderer/useMessageRenderer.ts index 6a01d34..052788a 100644 --- a/src/composables/messageRenderer/useMessageRenderer.ts +++ b/src/composables/messageRenderer/useMessageRenderer.ts @@ -6,7 +6,6 @@ export default function useMessageRenderer() { const { shiftAnimate, stackAnimate } = useRendererAnims(); let messageList: NodeList; - let modifier: string; let message: HTMLElement | null; let messageOffset = { x: 0, y: 0 }; let shift = false; @@ -21,7 +20,6 @@ export default function useMessageRenderer() { } function beforeEnter(el: SVGGElement): void { - modifier = el.className.baseVal.substring(0, 2); const queryResult = document.querySelectorAll(".messageList"); if (queryResult.length) messageList = queryResult; } diff --git a/src/composables/messageRenderer/useOffsetCalculator.ts b/src/composables/messageRenderer/useOffsetCalculator.ts index e0436c7..dcbbe20 100644 --- a/src/composables/messageRenderer/useOffsetCalculator.ts +++ b/src/composables/messageRenderer/useOffsetCalculator.ts @@ -23,8 +23,8 @@ export default function useOffsetCalculator() { const calculateMessageOffsets = (msg: HTMLElement) => { const msgRect = msg.getBoundingClientRect(); - setXoffset(msg) - setYoffset(msgRect.height) + setXoffset(msg); + setYoffset(msgRect.height); const offsets = { x: xOffset.value as number, y: yOffset.value as number diff --git a/src/composables/scroller/useScroller.ts b/src/composables/scroller/useScroller.ts index 302ff60..6bf195e 100644 --- a/src/composables/scroller/useScroller.ts +++ b/src/composables/scroller/useScroller.ts @@ -7,9 +7,8 @@ export default function useScroller({ targetId }: {targetId: string}) { let topBound: number; const clampedScroll = computed(() => { - const test = targetHeight.value; - if (test === 0) { return 0; } - topBound = -test + 440; + if (targetHeight.value === 0) { return 0; } + topBound = -targetHeight.value + 440; return Math.max(topBound, Math.min(scroll.value, 0)) as number; }) @@ -22,24 +21,34 @@ export default function useScroller({ targetId }: {targetId: string}) { return `0 ${clampedScroll.value} 350 500`; }); - onMounted(() => { - scrollTarget = document.getElementById(targetId); - }); + const getHeight = () => { + if (scrollTarget) { + return scrollTarget.getBoundingClientRect().height as number; + } + } - window.addEventListener( - "wheel", - (e) => { + const handleScrollEvent = (verticalScroll: number) => { if (scrollTarget) { - // get renderer height - targetHeight.value = scrollTarget.getBoundingClientRect().height; // only scroll if renderer height is greater than main window - if (targetHeight.value > 500) { - scroll.value += e.deltaY * 0.25; + const heightResult = getHeight(); + if (heightResult) { + if (heightResult > 500) { + targetHeight.value = heightResult; + scroll.value += verticalScroll; + } } } - }, - { passive: true } - ); + } + + onMounted(() => { + scrollTarget = document.getElementById(targetId); + if (scrollTarget) { + window.addEventListener("wheel", (e) => { + const verticalScroll = e.deltaY * 0.25; + handleScrollEvent(verticalScroll); + }) + } + }); return { scrollView