diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html index 715a66e53..1393d6477 100644 --- a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html +++ b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html @@ -34,7 +34,7 @@
Contactos selecção:
- +

{{user.name}}

@@ -43,7 +43,7 @@ Apagar -
+
diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.scss b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.scss index c0a1068d7..be6c59607 100644 --- a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.scss +++ b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.scss @@ -136,7 +136,7 @@ .item-checkbox p, .members-checkbox p{ display: block; margin: 0 !important; - width: 330px; + padding-left: 10px; font-size: rem(15); color: var(--title-text-color); @@ -165,4 +165,9 @@ } } - \ No newline at end of file + .inactive { + opacity: 0.7; + ion-item-options { + display: none !important; + } + } \ No newline at end of file diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts index 8bf7aa9ab..f8199b81f 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.ts +++ b/src/app/pages/chat/group-messages/group-messages.page.ts @@ -894,7 +894,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { componentProps: { isCreated: this.isGroupCreated, room: this.room, - members: this.members, + members: this.ChatSystemService.getGroupRoom(this.roomId).members, name: this.room.name, }, cssClass: 'contacts', diff --git a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts index 7e411f677..94359aed8 100644 --- a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts +++ b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; -import { AnimationController, ModalController } from '@ionic/angular'; +import { ActivatedRoute } from '@angular/router'; +import { ModalController } from '@ionic/angular'; import { Publication } from 'src/app/models/publication'; import { PublicationsService } from 'src/app/services/publications.service'; import { ToastService } from 'src/app/services/toast.service'; diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html index 97e77ffd0..e4fefa8e3 100644 --- a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html +++ b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html @@ -38,9 +38,9 @@
Contactos selecção: -
+
-

{{user.name}}

+

{{user.name }}

-
diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.scss b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.scss index b46583944..79ec7b8fc 100644 --- a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.scss +++ b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.scss @@ -176,4 +176,9 @@ } } - \ No newline at end of file +.inactive { + opacity: 0.7; + button { + display: none !important; + } +} \ No newline at end of file diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts index 2934ebd5f..c6e20fd9b 100644 --- a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts +++ b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts @@ -39,7 +39,7 @@ export class GroupContactsPage implements OnInit { objectUserSingleStone = [] userContainer = {} - + constructor( private modalController: ModalController, private chatService: ChatService, diff --git a/src/app/shared/chat/new-group/group-contacts/group-contacts-routing.module.ts b/src/app/shared/chat/new-group/group-contacts/group-contacts-routing.module.ts deleted file mode 100644 index c998741ed..000000000 --- a/src/app/shared/chat/new-group/group-contacts/group-contacts-routing.module.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -import { GroupContactsPage } from './group-contacts.page'; - -const routes: Routes = [ - { - path: '', - component: GroupContactsPage - } -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule], -}) -export class GroupContactsPageRoutingModule {} diff --git a/src/app/shared/chat/new-group/group-contacts/group-contacts.module.ts b/src/app/shared/chat/new-group/group-contacts/group-contacts.module.ts deleted file mode 100644 index 2946bd28c..000000000 --- a/src/app/shared/chat/new-group/group-contacts/group-contacts.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { IonicModule } from '@ionic/angular'; - -import { GroupContactsPageRoutingModule } from './group-contacts-routing.module'; - -import { GroupContactsPage } from './group-contacts.page'; - -@NgModule({ - imports: [ - CommonModule, - FormsModule, - IonicModule, - GroupContactsPageRoutingModule - ], - declarations: [GroupContactsPage] -}) -export class GroupContactsPageModule {} diff --git a/src/app/shared/chat/new-group/group-contacts/group-contacts.page.html b/src/app/shared/chat/new-group/group-contacts/group-contacts.page.html deleted file mode 100644 index 7cca9b8cf..000000000 --- a/src/app/shared/chat/new-group/group-contacts/group-contacts.page.html +++ /dev/null @@ -1,9 +0,0 @@ - - - group-contacts - - - - - - diff --git a/src/app/shared/chat/new-group/group-contacts/group-contacts.page.scss b/src/app/shared/chat/new-group/group-contacts/group-contacts.page.scss deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/app/shared/chat/new-group/group-contacts/group-contacts.page.spec.ts b/src/app/shared/chat/new-group/group-contacts/group-contacts.page.spec.ts deleted file mode 100644 index 5d3e2033f..000000000 --- a/src/app/shared/chat/new-group/group-contacts/group-contacts.page.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { IonicModule } from '@ionic/angular'; - -import { GroupContactsPage } from './group-contacts.page'; - -describe('GroupContactsPage', () => { - let component: GroupContactsPage; - let fixture: ComponentFixture; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [ GroupContactsPage ], - imports: [IonicModule.forRoot()] - }).compileComponents(); - - fixture = TestBed.createComponent(GroupContactsPage); - component = fixture.componentInstance; - fixture.detectChanges(); - })); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/shared/chat/new-group/group-contacts/group-contacts.page.ts b/src/app/shared/chat/new-group/group-contacts/group-contacts.page.ts deleted file mode 100644 index 7cb431b9a..000000000 --- a/src/app/shared/chat/new-group/group-contacts/group-contacts.page.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-group-contacts', - templateUrl: './group-contacts.page.html', - styleUrls: ['./group-contacts.page.scss'], -}) -export class GroupContactsPage implements OnInit { - - constructor() { } - - ngOnInit() { - } - -} diff --git a/src/app/shared/chat/new-group/new-group-routing.module.ts b/src/app/shared/chat/new-group/new-group-routing.module.ts index 1ea3fb565..7800e505c 100644 --- a/src/app/shared/chat/new-group/new-group-routing.module.ts +++ b/src/app/shared/chat/new-group/new-group-routing.module.ts @@ -11,12 +11,7 @@ const routes: Routes = [ { path: 'contacts', loadChildren: () => import('./contacts/contacts.module').then( m => m.ContactsPageModule) - }, - { - path: 'group-contacts', - loadChildren: () => import('./group-contacts/group-contacts.module').then( m => m.GroupContactsPageModule) } - ]; @NgModule({ diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.html b/src/app/shared/popover/chat-popover/chat-popover.page.html index b47f7dcf8..340f70792 100644 --- a/src/app/shared/popover/chat-popover/chat-popover.page.html +++ b/src/app/shared/popover/chat-popover/chat-popover.page.html @@ -10,7 +10,7 @@
-
diff --git a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts index 14a2b5491..415f070f4 100644 --- a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts +++ b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts @@ -134,6 +134,7 @@ export class PublicationDetailPage implements OnInit { if(error.status == 404) { this.publicationFolderService.deletePost(this.folderId, this.publicationId) + this.goBackToViewPublications.emit(); } this.httpErrorHandle.httpStatusHandle(error) diff --git a/version/git-version.ts b/version/git-version.ts index cd4d9ff6a..5b6fd60e5 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "a06bc4a40", - "SHA": "a06bc4a409dab223870433cd26d557b78ea5a8d3", + "shortSHA": "b81e876dd", + "SHA": "b81e876dde292253892cf233ec9b38a1c211a385", "branch": "developer-prod", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Tue Aug 22 17:50:18 2023 +0100'", - "lastCommitMessage": "s", - "lastCommitNumber": "5204", + "lastCommitTime": "'Wed Aug 23 09:55:14 2023 +0100'", + "lastCommitMessage": "Publication", + "lastCommitNumber": "5205", "change": "", - "changeStatus": "On branch developer-prod\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/events/events.page.scss\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.ts\n\tmodified: src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts\n\tmodified: src/app/shared/publication/new-publication/new-publication.page.ts\n\tmodified: src/app/store/publication-folder.service.ts", + "changeStatus": "On branch developer-prod\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html\n\tmodified: src/app/pages/chat/group-messages/group-contacts/group-contacts.page.scss\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts\n\tmodified: src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html\n\tmodified: src/app/shared/chat/group-messages/group-contacts/group-contacts.page.scss\n\tmodified: src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts\n\tdeleted: src/app/shared/chat/new-group/group-contacts/group-contacts-routing.module.ts\n\tdeleted: src/app/shared/chat/new-group/group-contacts/group-contacts.module.ts\n\tdeleted: src/app/shared/chat/new-group/group-contacts/group-contacts.page.html\n\tdeleted: src/app/shared/chat/new-group/group-contacts/group-contacts.page.scss\n\tdeleted: src/app/shared/chat/new-group/group-contacts/group-contacts.page.spec.ts\n\tdeleted: src/app/shared/chat/new-group/group-contacts/group-contacts.page.ts\n\tmodified: src/app/shared/chat/new-group/new-group-routing.module.ts\n\tmodified: src/app/shared/popover/chat-popover/chat-popover.page.html\n\tmodified: src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file