From ab7fdc231da8327670ea1f6fbc82b9aae23affc9 Mon Sep 17 00:00:00 2001 From: Anduin Xue Date: Mon, 27 Jan 2020 18:00:17 +0800 Subject: [PATCH 01/12] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c629d004..59a722dd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "kahla", - "version": "3.8.8", + "version": "3.9.0", "description": "Kahla is a cross-platform business messaging app.", "author": "Aiursoft (https://www.aiursoft.com/)", "build": { From d256f00281febd3ab68f9b14cf25b32fffc14e1c Mon Sep 17 00:00:00 2001 From: Anduin2017 Date: Wed, 29 Jan 2020 13:24:23 +0800 Subject: [PATCH 02/12] Support Json for IIS. --- src/web.config | 1 + 1 file changed, 1 insertion(+) diff --git a/src/web.config b/src/web.config index fde40d98..73548241 100644 --- a/src/web.config +++ b/src/web.config @@ -23,6 +23,7 @@ + From c615e46a34e1e5bf74f1e3ec49f8ae8e0060ceca Mon Sep 17 00:00:00 2001 From: Anduin2017 Date: Wed, 29 Jan 2020 16:14:09 +0800 Subject: [PATCH 03/12] Support json and woff2. --- src/web.config | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/web.config b/src/web.config index 73548241..653e2374 100644 --- a/src/web.config +++ b/src/web.config @@ -22,7 +22,11 @@ + + + + From c7b462beab99c419265431adeb35ddd8dfeed91b Mon Sep 17 00:00:00 2001 From: EdgeNeko Date: Thu, 30 Jan 2020 21:15:42 +0800 Subject: [PATCH 04/12] feat: display a notice when no files in file-history --- src/app/Controllers/file-history.component.ts | 5 ++++- src/app/Styles/file-list.scss | 6 ++++++ src/app/Views/file-history.html | 12 +++++++++++- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/app/Controllers/file-history.component.ts b/src/app/Controllers/file-history.component.ts index 631db38d..2efc6e9a 100644 --- a/src/app/Controllers/file-history.component.ts +++ b/src/app/Controllers/file-history.component.ts @@ -16,6 +16,7 @@ import { ProbeService } from '../Services/ProbeService'; export class FileHistoryComponent implements OnInit { public files: FileHistoryApiModel; + public loaded = false; constructor( private route: ActivatedRoute, @@ -26,11 +27,13 @@ export class FileHistoryComponent implements OnInit { } ngOnInit(): void { + this.loaded = false; this.route.params.pipe(switchMap(param => { return this.conversationApiService.FileHistory(param.id); })).subscribe(t => { + this.loaded = true; if (t.code === 0) { - t.items.reverse(); + t.items = t.items.filter(x => (x.files && x.files.length > 0)).reverse(); this.files = t; } }); diff --git a/src/app/Styles/file-list.scss b/src/app/Styles/file-list.scss index a9301022..fe17eb49 100644 --- a/src/app/Styles/file-list.scss +++ b/src/app/Styles/file-list.scss @@ -56,3 +56,9 @@ } } } + +.empty-notice { + margin-top: 40px; + text-align: center; + font-size: 14px; +} diff --git a/src/app/Views/file-history.html b/src/app/Views/file-history.html index 28cc9482..4b04d6ec 100644 --- a/src/app/Views/file-history.html +++ b/src/app/Views/file-history.html @@ -1,5 +1,5 @@ -
+
{{calcSummary()}}
{{dir.folderName}}
@@ -48,3 +48,13 @@
+ +
+

No files.

+

Files uploaded to the conversation will be shown here.

+
+ +
+ Loading... +
+ From a9e9d7d56ca25b9dd7c5855a8bf0ec49c8cb2ec6 Mon Sep 17 00:00:00 2001 From: Anduin2017 Date: Sat, 1 Feb 2020 22:44:15 +0800 Subject: [PATCH 05/12] Update lock. --- package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 241b11b0..b48da726 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "kahla", - "version": "3.8.8", + "version": "3.9.0", "lockfileVersion": 1, "requires": true, "dependencies": { From 8a1dc1c60c107347d482fd95a6f85ec375deeb4f Mon Sep 17 00:00:00 2001 From: Anduin Xue Date: Mon, 3 Feb 2020 10:16:39 +0800 Subject: [PATCH 06/12] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e0625a17..5804b3ac 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ ------

-screenshot +screenshot

Try it here: [web.kahla.app](https://web.kahla.app) From 387b4f9b59372fbc5a3bbbd625b74283cb883e72 Mon Sep 17 00:00:00 2001 From: EdgeNeko Date: Fri, 14 Feb 2020 20:43:59 +0800 Subject: [PATCH 07/12] Allow combine and group messages --- src/app/Models/Message.ts | 1 + src/app/Styles/talking.scss | 50 ++++++++++++++++++------------------- src/app/Views/talking.html | 25 +++++++++++-------- 3 files changed, 41 insertions(+), 35 deletions(-) diff --git a/src/app/Models/Message.ts b/src/app/Models/Message.ts index b79703bd..d59a091b 100644 --- a/src/app/Models/Message.ts +++ b/src/app/Models/Message.ts @@ -7,6 +7,7 @@ export class Message { public sender: KahlaUser; public sendTime: string; public content: string; + public groupWithPrevious: boolean; public resend: boolean; public contentRaw: string; diff --git a/src/app/Styles/talking.scss b/src/app/Styles/talking.scss index fef22a90..97786e3b 100644 --- a/src/app/Styles/talking.scss +++ b/src/app/Styles/talking.scss @@ -29,14 +29,18 @@ height: 40px; display: inline-block; text-align: center; - cursor: pointer; img { + cursor: pointer; width: 100%; height: 100%; border-radius: 4px; user-select: none; } + + &:focus { + outline: none; + } } .left .chat-avatar { @@ -47,11 +51,11 @@ float: right; } - .chat-text { + .message-block { display: block; font-size: 12px; width: 70%; - margin-bottom: 1.5%; + margin-bottom: 8px; * { vertical-align: middle; @@ -67,13 +71,13 @@ } } - .left .chat-text { + .left .message-block { float: left; text-align: left; margin-left: 12px; } - .right .chat-text { + .right .message-block { float: right; text-align: right; margin-right: 12px; @@ -87,7 +91,7 @@ user-select: none; } - .chat-content { + .message-balloon { border-radius: 8px; color: white; padding: 10px; @@ -102,14 +106,14 @@ white-space: pre-wrap; } + &.balloon-grouped:after, &.single-emoji:after { + border-left: unset !important; + border-right: unset !important; + } + &.single-emoji { background: transparent !important; - &:after { - border-left: unset !important; - border-right: unset !important; - } - p { font-size: 64px; } @@ -134,7 +138,7 @@ } } - .left .chat-content { + .left .message-balloon { border-color: var(--talking-chat-bg); color: var(--default-textcolor); background: var(--talking-chat-bg); @@ -146,7 +150,7 @@ } } - .right .chat-content { + .right .message-balloon { background: linear-gradient(120deg, var(--primary-color-depth3) 0%, var(--primary-color-depth2) 100%); &::after { @@ -193,10 +197,6 @@ color: var(--minor-textcolor); } -.chat-avatar:focus { - outline: none; -} - .image-container { position: relative; max-height: 1000px; @@ -207,7 +207,7 @@ } } -.message-list .chat-content video { +.message-list .message-balloon video { width: 100%; } @@ -396,25 +396,25 @@ i { right: 20px; } -.chat-text a { +.message-block a { text-decoration: none; } .left { - .chat-text a, - .chat-content .voicemsg span { + .message-block a, + .message-balloon .voicemsg span { color: #9baec8; } } .right { - .chat-text a, - .chat-content .voicemsg span { + .message-block a, + .message-balloon .voicemsg span { color: #d9e1e8; } } -.right .chat-content span { +.right .message-balloon span { color: #fff; } @@ -452,7 +452,7 @@ i { } } -.message-list .chat-content .voicemsg { +.message-list .message-balloon .voicemsg { align-items: center; display: grid; grid-template-columns: 40px 2fr; diff --git a/src/app/Views/talking.html b/src/app/Views/talking.html index 3bcf5100..82f5bdf7 100644 --- a/src/app/Views/talking.html +++ b/src/app/Views/talking.html @@ -7,26 +7,31 @@
  • + [ngClass]="{'left': cacheService.cachedData.me && message.senderId != cacheService.cachedData.me.id, + 'right': cacheService.cachedData.me && message.senderId == cacheService.cachedData.me.id}">
    --- LAST READ ---
    -
    - -
    +
    +
    + +
    +
    -
    +
    -
    +
    {{ message.sender.nickName }} @@ -117,7 +122,7 @@
    {{message.content.split('|')[1]}}

  • --- LAST READ ---
    -
    +
    + --- {{message.sendTimeDate.toLocaleDateString()}} --- +
    +
    @@ -33,7 +37,7 @@
    {{ message.sender.nickName }} @@ -106,7 +110,7 @@
    {{message.content.split('|')[1]}}
    - -

    - - -

    -

    +

    Send failed

    +

    + + +