This commit is contained in:
tiago.kayaya
2021-03-05 16:43:17 +01:00
parent d63c4fc8fa
commit 304151f2fd
13 changed files with 206 additions and 81 deletions
+37 -17
View File
@@ -1,13 +1,28 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { ChatPage } from './chat.page';
const routes: Routes = [
{
path: '',
component: ChatPage
},
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { ChatPage } from './chat.page';
import { GroupMessagesPage } from './group-messages/group-messages.page';
import { MessagesPage } from './messages/messages.page';
const routes: Routes = [
{
path: '',
component: ChatPage,
children: [
{
path:'messages',
outlet:'message',
component: MessagesPage
},
{
path:'groups',
outlet:'group',
component: GroupMessagesPage
},
]
},
{
path: 'conversation',
loadChildren: () => import('./conversation/conversation.module').then( m => m.ConversationPageModule)
},
@@ -30,12 +45,17 @@ const routes: Routes = [
{
path: 'edit-group',
loadChildren: () => import('./edit-group/edit-group.module').then( m => m.EditGroupPageModule)
},
{
path: 'test',
outlet:'test',
loadChildren: () => import('./test/test.module').then( m => m.TestPageModule)
}
];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule],
})
];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule],
})
export class ChatPageRoutingModule {}
+2
View File
@@ -8,6 +8,7 @@ import { ChatPageRoutingModule } from './chat-routing.module';
import { ChatPage } from './chat.page';
import { SharedModule } from 'src/app/shared/shared.module';
import { RouterModule } from '@angular/router';
@NgModule({
imports: [
@@ -16,6 +17,7 @@ import { SharedModule } from 'src/app/shared/shared.module';
IonicModule,
SharedModule,
ChatPageRoutingModule,
RouterModule,
],
declarations: [ChatPage],
schemas: [CUSTOM_ELEMENTS_SCHEMA]
+27 -38
View File
@@ -4,44 +4,35 @@ ion-content{
:host{
background: #0782c9;
}
.main-header{
width: 100%; /* 400px */
height: 100%;
font-family: Roboto;
border-top-left-radius: 25px;
border-top-right-radius: 25px;
background-color: #fff;
overflow:hidden;
padding: 30px 20px 0px 20px;
color:#000;
transform: translate3d(0, 1px, 0);
.title-content{
width: 360px;
margin: 0px auto;
width: 100%;
margin-bottom: 15px;
overflow: auto;
padding: 0 !important;
background: #fff;
.div-title{
padding: 0!important;
float: left;
}
.title{
font-size: 25px;
}
.div-icon{
width: 60%;
float: right;
font-size: 35px;
overflow: auto;
padding: 1px;
}
.div-icon ion-icon{
float: right;
padding-left: 20px;
}
}
.div-title{
padding: 0!important;
float: left;
}
.title{
font-size: 25px;
}
.div-icon{
width: 112px;
float: right;
font-size: 35px;
overflow: auto;
padding: 1px;
}
.div-icon ion-icon{
float: right;
padding-left: 20px;
}
}
.main-content{
width: 100%;
height: 100%;
@@ -49,12 +40,13 @@ ion-content{
margin: 0 auto;
background-color: #fff;
overflow:auto;
padding: 15px 20px 0 20px;
padding: 30px 20px 0 20px;
border-top-left-radius: 25px;
border-top-right-radius: 25px;
.aside-wrapper{
justify-content: flex-start !important;
padding: 0 !important;
margin: 0 !important;
}
.iconschatnew-group{
@@ -121,11 +113,8 @@ ion-content{
.aside-wrapper{
width: 40%;
border: 1px solid red;
.aside-title{
text-align: left;
font-size: 25px;
}
}
.aside{
@@ -0,0 +1,17 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { TestPage } from './test.page';
const routes: Routes = [
{
path: '',
component: TestPage
}
];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule],
})
export class TestPageRoutingModule {}
+20
View File
@@ -0,0 +1,20 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { IonicModule } from '@ionic/angular';
import { TestPageRoutingModule } from './test-routing.module';
import { TestPage } from './test.page';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
TestPageRoutingModule
],
declarations: [TestPage]
})
export class TestPageModule {}
+9
View File
@@ -0,0 +1,9 @@
<ion-header>
<ion-toolbar>
<ion-title>test</ion-title>
</ion-toolbar>
</ion-header>
<ion-content>
</ion-content>
+24
View File
@@ -0,0 +1,24 @@
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
import { IonicModule } from '@ionic/angular';
import { TestPage } from './test.page';
describe('TestPage', () => {
let component: TestPage;
let fixture: ComponentFixture<TestPage>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ TestPage ],
imports: [IonicModule.forRoot()]
}).compileComponents();
fixture = TestBed.createComponent(TestPage);
component = fixture.componentInstance;
fixture.detectChanges();
}));
it('should create', () => {
expect(component).toBeTruthy();
});
});
+15
View File
@@ -0,0 +1,15 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-test',
templateUrl: './test.page.html',
styleUrls: ['./test.page.scss'],
})
export class TestPage implements OnInit {
constructor() { }
ngOnInit() {
}
}