From 13273a88e0ad149d51fa0f2e1e036d27acda875d Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 23 Dec 2021 08:17:44 +0100 Subject: [PATCH 1/4] change api route to equilibrium --- src/environments/environment.prod.ts | 2 +- src/environments/environment.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index a8ccf00ce..1effa3995 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -1,6 +1,6 @@ export const environment = { production: true, - apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/', + apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V5/api/', apiChatUrl: 'https://www.tabularium.pt/api/v1/', domain: 'gabinetedigital.local', defaultuser: '', diff --git a/src/environments/environment.ts b/src/environments/environment.ts index d49e7715f..038fc3365 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,8 +4,8 @@ export const environment = { production: false, - //apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/', - apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/', + apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V5/api/', + //apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/', apiChatUrl: 'https://www.tabularium.pt/api/v1/', /* apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', */ domain: 'gabinetedigital.local', //gabinetedigital.local From 3f126377a634726b2a6b882f42f529c7e73b7b6e Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 23 Dec 2021 09:09:54 +0100 Subject: [PATCH 2/4] change API to gabinetedigital --- src/environments/environment.prod.ts | 2 +- src/environments/environment.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 1effa3995..a8ccf00ce 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -1,6 +1,6 @@ export const environment = { production: true, - apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V5/api/', + apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/', apiChatUrl: 'https://www.tabularium.pt/api/v1/', domain: 'gabinetedigital.local', defaultuser: '', diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 038fc3365..f87cd0d28 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,7 +4,7 @@ export const environment = { production: false, - apiURL: 'https://equilibrium.dyndns.info/GabineteDigital.Services/V5/api/', + apiURL: 'https://gabinetedigital.dyndns.info/GabineteDigital.Services/V5/api/', //apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V5/api/', apiChatUrl: 'https://www.tabularium.pt/api/v1/', /* apiChatUrl: 'http://chat.gabinetedigital.local:3000/api/v1/', */ From 8c8efeae9468782b9fae89cea7be2a2cb25f5474 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Mon, 27 Dec 2021 15:00:55 +0100 Subject: [PATCH 3/4] save --- src/app/pages/chat/chat.page.html | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html index 78cc92b1a..42ad111ad 100644 --- a/src/app/pages/chat/chat.page.html +++ b/src/app/pages/chat/chat.page.html @@ -72,8 +72,9 @@
{{dm.lastMessage.msg}} - - {{dm.lastMessage.file.name}} + + + {{dm.lastMessage.file.name || dm.lastMessage.file.subject }}
@@ -110,8 +111,9 @@
{{group.lastMessage.u.name}}: {{group.lastMessage.msg}}
- - {{group.lastMessage.file.name}} + + + {{group.lastMessage.file.name || group.lastMessage.file.subject}}
From f8498a7a52203c61745a0a357cea8d05ca08a3c6 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Mon, 27 Dec 2021 16:00:20 +0100 Subject: [PATCH 4/4] add ellipsis in groups --- src/app/pages/chat/chat.page.html | 4 ++-- src/app/pages/chat/chat.page.scss | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html index 42ad111ad..72a87cf89 100644 --- a/src/app/pages/chat/chat.page.html +++ b/src/app/pages/chat/chat.page.html @@ -110,10 +110,10 @@
{{group.lastMessage.u.name}}: {{group.lastMessage.msg}}
-
+
- {{group.lastMessage.file.name || group.lastMessage.file.subject}} + {{group.lastMessage.file.name || group.lastMessage.file.subject}}
diff --git a/src/app/pages/chat/chat.page.scss b/src/app/pages/chat/chat.page.scss index 2fc786346..e192f166b 100644 --- a/src/app/pages/chat/chat.page.scss +++ b/src/app/pages/chat/chat.page.scss @@ -126,6 +126,11 @@ ion-content{ } .item-files{ float: left; + overflow: auto; + + .item-files-title{ + width: 100%; + } } } .item-description-active{