diff --git a/.AMEYE b/.AMEYE index bf9c367..014337d 100644 --- a/.AMEYE +++ b/.AMEYE @@ -17,4 +17,6 @@ 18 git push -u origin master ionic serve --external -git remote add origin https://gitlab.chiefsoft.net/IONIC/eRx.git \ No newline at end of file +git remote add origin https://gitlab.chiefsoft.net/IONIC/eRx.git + +ionic generate page users/dash \ No newline at end of file diff --git a/angular.json b/angular.json index 3210f83..fb52144 100755 --- a/angular.json +++ b/angular.json @@ -148,7 +148,8 @@ "cli": { "schematicCollections": [ "@ionic/angular-toolkit" - ] + ], + "analytics": false }, "schematics": { "@ionic/angular-toolkit:component": { diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index e7b0d5a..c4c7062 100755 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,22 +1,42 @@ -import { NgModule } from '@angular/core'; -import { PreloadAllModules, RouterModule, Routes } from '@angular/router'; - -const routes: Routes = [ - { - path: 'home', - loadChildren: () => import('./home/home.module').then( m => m.HomePageModule) +import { NgModule } from '@angular/core'; +import { PreloadAllModules, RouterModule, Routes } from '@angular/router'; + +const routes: Routes = [ + { + path: 'home', + loadChildren: () => import('./home/home.module').then( m => m.HomePageModule) + }, + { + path: '', + redirectTo: 'home', + pathMatch: 'full' + }, { + path: 'dash', + loadChildren: () => import('./users/dash/dash.module').then( m => m.DashPageModule) }, { - path: '', - redirectTo: 'home', - pathMatch: 'full' + path: 'schedule', + loadChildren: () => import('./users/schedule/schedule.module').then( m => m.SchedulePageModule) + }, + { + path: 'profile', + loadChildren: () => import('./users/profile/profile.module').then( m => m.ProfilePageModule) + }, + { + path: 'erx', + loadChildren: () => import('./users/erx/erx.module').then( m => m.ErxPageModule) + }, + { + path: 'encounter', + loadChildren: () => import('./users/encounter/encounter.module').then( m => m.EncounterPageModule) }, -]; -@NgModule({ - imports: [ - RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules }) - ], - exports: [RouterModule] -}) -export class AppRoutingModule { } +]; + +@NgModule({ + imports: [ + RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules }) + ], + exports: [RouterModule] +}) +export class AppRoutingModule { } diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html index 93d119b..c14fac8 100755 --- a/src/app/home/home.page.html +++ b/src/app/home/home.page.html @@ -27,7 +27,7 @@ - Sign In + Sign In diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index 83522d5..62ce122 100755 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -9,4 +9,8 @@ export class HomePage { constructor() {} + + startLogin(){ + alert(1000); + } } diff --git a/src/app/users/dash/dash-routing.module.ts b/src/app/users/dash/dash-routing.module.ts new file mode 100644 index 0000000..a5ec3bb --- /dev/null +++ b/src/app/users/dash/dash-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { DashPage } from './dash.page'; + +const routes: Routes = [ + { + path: '', + component: DashPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class DashPageRoutingModule {} diff --git a/src/app/users/dash/dash.module.ts b/src/app/users/dash/dash.module.ts new file mode 100644 index 0000000..6c97d71 --- /dev/null +++ b/src/app/users/dash/dash.module.ts @@ -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 { DashPageRoutingModule } from './dash-routing.module'; + +import { DashPage } from './dash.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + DashPageRoutingModule + ], + declarations: [DashPage] +}) +export class DashPageModule {} diff --git a/src/app/users/dash/dash.page.html b/src/app/users/dash/dash.page.html new file mode 100644 index 0000000..cf068dd --- /dev/null +++ b/src/app/users/dash/dash.page.html @@ -0,0 +1,9 @@ + + + dash + + + + + + diff --git a/src/app/users/dash/dash.page.scss b/src/app/users/dash/dash.page.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/users/dash/dash.page.spec.ts b/src/app/users/dash/dash.page.spec.ts new file mode 100644 index 0000000..3531f6f --- /dev/null +++ b/src/app/users/dash/dash.page.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { DashPage } from './dash.page'; + +describe('DashPage', () => { + let component: DashPage; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ DashPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(DashPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/users/dash/dash.page.ts b/src/app/users/dash/dash.page.ts new file mode 100644 index 0000000..1f8da6d --- /dev/null +++ b/src/app/users/dash/dash.page.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-dash', + templateUrl: './dash.page.html', + styleUrls: ['./dash.page.scss'], +}) +export class DashPage implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/users/encounter/encounter-routing.module.ts b/src/app/users/encounter/encounter-routing.module.ts new file mode 100644 index 0000000..3f244f1 --- /dev/null +++ b/src/app/users/encounter/encounter-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { EncounterPage } from './encounter.page'; + +const routes: Routes = [ + { + path: '', + component: EncounterPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class EncounterPageRoutingModule {} diff --git a/src/app/users/encounter/encounter.module.ts b/src/app/users/encounter/encounter.module.ts new file mode 100644 index 0000000..e385d1c --- /dev/null +++ b/src/app/users/encounter/encounter.module.ts @@ -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 { EncounterPageRoutingModule } from './encounter-routing.module'; + +import { EncounterPage } from './encounter.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + EncounterPageRoutingModule + ], + declarations: [EncounterPage] +}) +export class EncounterPageModule {} diff --git a/src/app/users/encounter/encounter.page.html b/src/app/users/encounter/encounter.page.html new file mode 100644 index 0000000..6609e67 --- /dev/null +++ b/src/app/users/encounter/encounter.page.html @@ -0,0 +1,9 @@ + + + encounter + + + + + + diff --git a/src/app/users/encounter/encounter.page.scss b/src/app/users/encounter/encounter.page.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/users/encounter/encounter.page.spec.ts b/src/app/users/encounter/encounter.page.spec.ts new file mode 100644 index 0000000..b2c2d4c --- /dev/null +++ b/src/app/users/encounter/encounter.page.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { EncounterPage } from './encounter.page'; + +describe('EncounterPage', () => { + let component: EncounterPage; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ EncounterPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(EncounterPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/users/encounter/encounter.page.ts b/src/app/users/encounter/encounter.page.ts new file mode 100644 index 0000000..953a8b6 --- /dev/null +++ b/src/app/users/encounter/encounter.page.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-encounter', + templateUrl: './encounter.page.html', + styleUrls: ['./encounter.page.scss'], +}) +export class EncounterPage implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/users/erx/erx-routing.module.ts b/src/app/users/erx/erx-routing.module.ts new file mode 100644 index 0000000..aa8b3d3 --- /dev/null +++ b/src/app/users/erx/erx-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { ErxPage } from './erx.page'; + +const routes: Routes = [ + { + path: '', + component: ErxPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class ErxPageRoutingModule {} diff --git a/src/app/users/erx/erx.module.ts b/src/app/users/erx/erx.module.ts new file mode 100644 index 0000000..bf0dbce --- /dev/null +++ b/src/app/users/erx/erx.module.ts @@ -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 { ErxPageRoutingModule } from './erx-routing.module'; + +import { ErxPage } from './erx.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + ErxPageRoutingModule + ], + declarations: [ErxPage] +}) +export class ErxPageModule {} diff --git a/src/app/users/erx/erx.page.html b/src/app/users/erx/erx.page.html new file mode 100644 index 0000000..c6e2184 --- /dev/null +++ b/src/app/users/erx/erx.page.html @@ -0,0 +1,9 @@ + + + erx + + + + + + diff --git a/src/app/users/erx/erx.page.scss b/src/app/users/erx/erx.page.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/users/erx/erx.page.spec.ts b/src/app/users/erx/erx.page.spec.ts new file mode 100644 index 0000000..649e5db --- /dev/null +++ b/src/app/users/erx/erx.page.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { ErxPage } from './erx.page'; + +describe('ErxPage', () => { + let component: ErxPage; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ ErxPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(ErxPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/users/erx/erx.page.ts b/src/app/users/erx/erx.page.ts new file mode 100644 index 0000000..56fa82f --- /dev/null +++ b/src/app/users/erx/erx.page.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-erx', + templateUrl: './erx.page.html', + styleUrls: ['./erx.page.scss'], +}) +export class ErxPage implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/users/profile/profile-routing.module.ts b/src/app/users/profile/profile-routing.module.ts new file mode 100644 index 0000000..a7052f8 --- /dev/null +++ b/src/app/users/profile/profile-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { ProfilePage } from './profile.page'; + +const routes: Routes = [ + { + path: '', + component: ProfilePage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class ProfilePageRoutingModule {} diff --git a/src/app/users/profile/profile.module.ts b/src/app/users/profile/profile.module.ts new file mode 100644 index 0000000..f87f01c --- /dev/null +++ b/src/app/users/profile/profile.module.ts @@ -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 { ProfilePageRoutingModule } from './profile-routing.module'; + +import { ProfilePage } from './profile.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + ProfilePageRoutingModule + ], + declarations: [ProfilePage] +}) +export class ProfilePageModule {} diff --git a/src/app/users/profile/profile.page.html b/src/app/users/profile/profile.page.html new file mode 100644 index 0000000..428d7d1 --- /dev/null +++ b/src/app/users/profile/profile.page.html @@ -0,0 +1,9 @@ + + + profile + + + + + + diff --git a/src/app/users/profile/profile.page.scss b/src/app/users/profile/profile.page.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/users/profile/profile.page.spec.ts b/src/app/users/profile/profile.page.spec.ts new file mode 100644 index 0000000..8027310 --- /dev/null +++ b/src/app/users/profile/profile.page.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { ProfilePage } from './profile.page'; + +describe('ProfilePage', () => { + let component: ProfilePage; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ ProfilePage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(ProfilePage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/users/profile/profile.page.ts b/src/app/users/profile/profile.page.ts new file mode 100644 index 0000000..e24f8f6 --- /dev/null +++ b/src/app/users/profile/profile.page.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-profile', + templateUrl: './profile.page.html', + styleUrls: ['./profile.page.scss'], +}) +export class ProfilePage implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/users/schedule/schedule-routing.module.ts b/src/app/users/schedule/schedule-routing.module.ts new file mode 100644 index 0000000..f0a6b7f --- /dev/null +++ b/src/app/users/schedule/schedule-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { SchedulePage } from './schedule.page'; + +const routes: Routes = [ + { + path: '', + component: SchedulePage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class SchedulePageRoutingModule {} diff --git a/src/app/users/schedule/schedule.module.ts b/src/app/users/schedule/schedule.module.ts new file mode 100644 index 0000000..8fb96c8 --- /dev/null +++ b/src/app/users/schedule/schedule.module.ts @@ -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 { SchedulePageRoutingModule } from './schedule-routing.module'; + +import { SchedulePage } from './schedule.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + SchedulePageRoutingModule + ], + declarations: [SchedulePage] +}) +export class SchedulePageModule {} diff --git a/src/app/users/schedule/schedule.page.html b/src/app/users/schedule/schedule.page.html new file mode 100644 index 0000000..8b9743a --- /dev/null +++ b/src/app/users/schedule/schedule.page.html @@ -0,0 +1,9 @@ + + + schedule + + + + + + diff --git a/src/app/users/schedule/schedule.page.scss b/src/app/users/schedule/schedule.page.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/users/schedule/schedule.page.spec.ts b/src/app/users/schedule/schedule.page.spec.ts new file mode 100644 index 0000000..41cd57f --- /dev/null +++ b/src/app/users/schedule/schedule.page.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { SchedulePage } from './schedule.page'; + +describe('SchedulePage', () => { + let component: SchedulePage; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ SchedulePage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(SchedulePage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/users/schedule/schedule.page.ts b/src/app/users/schedule/schedule.page.ts new file mode 100644 index 0000000..121d32b --- /dev/null +++ b/src/app/users/schedule/schedule.page.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-schedule', + templateUrl: './schedule.page.html', + styleUrls: ['./schedule.page.scss'], +}) +export class SchedulePage implements OnInit { + + constructor() { } + + ngOnInit() { + } + +}