Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
74d6d45150
7 changed files with 15 additions and 15 deletions
|
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"name": "crimata-electron",
|
"name": "crimata-messenger",
|
||||||
"version": "0.1.0",
|
"version": "0.1.0",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
"electron:build": "vue-cli-service electron:build",
|
"electron:build": "vue-cli-service electron:build",
|
||||||
"electron:serve": "vue-cli-service electron:serve",
|
"electron:serve": "vue-cli-service electron:serve",
|
||||||
"postinstall": "electron-builder install-app-deps",
|
"postinstall": "electron-builder install-app-deps",
|
||||||
"postuninstall": "electron-builder install-app-deps"
|
"postuninstal": "electron-builder install-app-deps"
|
||||||
},
|
},
|
||||||
"main": "background.js",
|
"main": "background.js",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|
|
||||||
|
|
@ -33,8 +33,9 @@ protocol.registerSchemesAsPrivileged([
|
||||||
function createWindow() {
|
function createWindow() {
|
||||||
// Create the browser window.
|
// Create the browser window.
|
||||||
win = new BrowserWindow({
|
win = new BrowserWindow({
|
||||||
width: 650,
|
width: 350,
|
||||||
height: 1200,
|
height: 525,
|
||||||
|
resizable: false,
|
||||||
webPreferences: {
|
webPreferences: {
|
||||||
// Use pluginOptions.nodeIntegration, leave this alone
|
// Use pluginOptions.nodeIntegration, leave this alone
|
||||||
// See nklayman.github.io/vue-cli-plugin-electron-builder/guide/security.html#node-integration for more info
|
// 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) {
|
if (process.env.WEBPACK_DEV_SERVER_URL) {
|
||||||
// Load the url of the dev server if in development mode
|
// Load the url of the dev server if in development mode
|
||||||
win.loadURL(process.env.WEBPACK_DEV_SERVER_URL as string);
|
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 {
|
} else {
|
||||||
createProtocol("app");
|
createProtocol("app");
|
||||||
// Load the index.html when not in development
|
// Load the index.html when not in development
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,6 @@
|
||||||
data-name="Rectangle 410"
|
data-name="Rectangle 410"
|
||||||
width="350"
|
width="350"
|
||||||
height="500"
|
height="500"
|
||||||
rx="20"
|
|
||||||
fill="url(#radial-gradient)"
|
fill="url(#radial-gradient)"
|
||||||
/>
|
/>
|
||||||
</g>
|
</g>
|
||||||
|
|
|
||||||
|
|
@ -91,7 +91,7 @@ div[contenteditable] {
|
||||||
border: 0;
|
border: 0;
|
||||||
border-radius: 20px;
|
border-radius: 20px;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
background-color: #61b4f4;
|
background-color: #585858;
|
||||||
font-size: 14;
|
font-size: 14;
|
||||||
text-align: left;
|
text-align: left;
|
||||||
p {
|
p {
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@
|
||||||
<AI />
|
<AI />
|
||||||
<MessageRenderer />
|
<MessageRenderer />
|
||||||
<InputItem />
|
<InputItem />
|
||||||
<TitleBar />
|
<!-- <TitleBar /> -->
|
||||||
</svg>
|
</svg>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|
@ -54,6 +54,6 @@ export default defineComponent({
|
||||||
height: 500px;
|
height: 500px;
|
||||||
background-color: #e6e6e6;
|
background-color: #e6e6e6;
|
||||||
box-shadow: 0px 3px 10px 0px rgba(0, 0, 0, 0.3);
|
box-shadow: 0px 3px 10px 0px rgba(0, 0, 0, 0.3);
|
||||||
border-radius: 20px;
|
// border-radius: 20px;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
|
||||||
|
|
@ -33,10 +33,10 @@ export default function useMessageItemComp(m: string, id: string) {
|
||||||
|
|
||||||
const textFill = computed(() => {
|
const textFill = computed(() => {
|
||||||
switch (m) {
|
switch (m) {
|
||||||
case "fr":
|
case "sf":
|
||||||
return "#000";
|
|
||||||
default:
|
|
||||||
return "#fff";
|
return "#fff";
|
||||||
|
default:
|
||||||
|
return "#000";
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
@ -45,7 +45,7 @@ export default function useMessageItemComp(m: string, id: string) {
|
||||||
case "sf":
|
case "sf":
|
||||||
return "#61b4f4";
|
return "#61b4f4";
|
||||||
case "ai":
|
case "ai":
|
||||||
return "#585858";
|
return "#DDDDDD";
|
||||||
default:
|
default:
|
||||||
return "#fff";
|
return "#fff";
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -23,8 +23,8 @@ export default function useOffsetCalculator() {
|
||||||
|
|
||||||
const calculateMessageOffsets = (msg: HTMLElement) => {
|
const calculateMessageOffsets = (msg: HTMLElement) => {
|
||||||
const msgRect = msg.getBoundingClientRect();
|
const msgRect = msg.getBoundingClientRect();
|
||||||
setXoffset(msg)
|
setXoffset(msg);
|
||||||
setYoffset(msgRect.height)
|
setYoffset(msgRect.height);
|
||||||
const offsets = {
|
const offsets = {
|
||||||
x: xOffset.value as number,
|
x: xOffset.value as number,
|
||||||
y: yOffset.value as number
|
y: yOffset.value as number
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue