diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 2fd039a..076365c 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -29,12 +29,30 @@ const routes: Routes = [ { path: 'settings', loadChildren: () => import('./pages/settings/settings.module').then(m => m.SettingsPageModule) + }, + { + path: 'my-schedule', + loadChildren: () => import('./pages/my-schedule/my-schedule.module').then(m => m.MySchedulePageModule) + }, + { + path: 'my-reminders', + loadChildren: () => import('./pages/my-reminders/my-reminders.module').then(m => m.MyRemindersPageModule) + }, + { + path: 'my-tracking', + loadChildren: () => import('./pages/my-tracking/my-tracking.module').then(m => m.MyTrackingPageModule) + }, + { + path: 'my-find', + loadChildren: () => import('./pages/my-find/my-find.module').then(m => m.MyFindPageModule) } + + ]; @NgModule({ imports: [ diff --git a/src/app/components/choose-activity/choose-activity.component.html b/src/app/components/choose-activity/choose-activity.component.html index 6f3a35f..0057660 100644 --- a/src/app/components/choose-activity/choose-activity.component.html +++ b/src/app/components/choose-activity/choose-activity.component.html @@ -6,7 +6,7 @@ - + Track @@ -17,7 +17,7 @@ - + Calendar @@ -30,7 +30,7 @@ - + Alerts @@ -41,7 +41,7 @@ - + Find diff --git a/src/app/components/choose-activity/choose-activity.component.ts b/src/app/components/choose-activity/choose-activity.component.ts index 05bb65b..9cbf541 100644 --- a/src/app/components/choose-activity/choose-activity.component.ts +++ b/src/app/components/choose-activity/choose-activity.component.ts @@ -11,4 +11,13 @@ export class ChooseActivityComponent implements OnInit { ngOnInit() {} + selActivity(actiV:string){ + + dispatchEvent( + new CustomEvent("activity_buttons", { + bubbles: true, + detail: { activity_page: actiV }, + }), + ); + } } diff --git a/src/app/pages/dash/dash.page.ts b/src/app/pages/dash/dash.page.ts index 3409b32..4e48472 100644 --- a/src/app/pages/dash/dash.page.ts +++ b/src/app/pages/dash/dash.page.ts @@ -8,11 +8,38 @@ import {Router} from "@angular/router"; }) export class DashPage implements OnInit { - constructor(private router: Router) { } + constructor(private router: Router) { + addEventListener("activity_buttons", (e:any) => + { + //console.log("AMEYE", e.detail.activity_page); + this.activityPage(e.detail.activity_page); + }); + } ngOnInit() { } openSettings(){ this.router.navigate(['settings']); } + activityPage(actPage:string){ + var pageToNavigate = ''; + switch (actPage){ + case 'track': + pageToNavigate='my-tracking'; + break; + case 'calendar': + pageToNavigate='my-schedule'; + break; + case 'alerts': + pageToNavigate='my-reminders'; + break; + case 'find': + pageToNavigate='my-find'; + break; + } + if(pageToNavigate !=''){ + this.router.navigate([pageToNavigate],{state: {page_name:actPage}}); + } + + } } diff --git a/src/app/pages/my-find/my-find-routing.module.ts b/src/app/pages/my-find/my-find-routing.module.ts new file mode 100644 index 0000000..3289764 --- /dev/null +++ b/src/app/pages/my-find/my-find-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { MyFindPage } from './my-find.page'; + +const routes: Routes = [ + { + path: '', + component: MyFindPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class MyFindPageRoutingModule {} diff --git a/src/app/pages/my-find/my-find.module.ts b/src/app/pages/my-find/my-find.module.ts new file mode 100644 index 0000000..cd04485 --- /dev/null +++ b/src/app/pages/my-find/my-find.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 { MyFindPageRoutingModule } from './my-find-routing.module'; + +import { MyFindPage } from './my-find.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + MyFindPageRoutingModule + ], + declarations: [MyFindPage] +}) +export class MyFindPageModule {} diff --git a/src/app/pages/my-find/my-find.page.html b/src/app/pages/my-find/my-find.page.html new file mode 100644 index 0000000..1192422 --- /dev/null +++ b/src/app/pages/my-find/my-find.page.html @@ -0,0 +1,14 @@ + + + + + + + + Find + + + + + + diff --git a/src/app/pages/my-find/my-find.page.scss b/src/app/pages/my-find/my-find.page.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/pages/my-find/my-find.page.spec.ts b/src/app/pages/my-find/my-find.page.spec.ts new file mode 100644 index 0000000..0578a15 --- /dev/null +++ b/src/app/pages/my-find/my-find.page.spec.ts @@ -0,0 +1,17 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MyFindPage } from './my-find.page'; + +describe('MyFindPage', () => { + let component: MyFindPage; + let fixture: ComponentFixture; + + beforeEach(async(() => { + fixture = TestBed.createComponent(MyFindPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/pages/my-find/my-find.page.ts b/src/app/pages/my-find/my-find.page.ts new file mode 100644 index 0000000..0138ed3 --- /dev/null +++ b/src/app/pages/my-find/my-find.page.ts @@ -0,0 +1,18 @@ +import { Component, OnInit } from '@angular/core'; +import {NavController} from "@ionic/angular"; + +@Component({ + selector: 'app-my-find', + templateUrl: './my-find.page.html', + styleUrls: ['./my-find.page.scss'], +}) +export class MyFindPage implements OnInit { + + constructor(private navctr: NavController) { } + + ngOnInit() { + } + onBack(){ + this.navctr.back(); + } +} diff --git a/src/app/pages/my-reminders/my-reminders-routing.module.ts b/src/app/pages/my-reminders/my-reminders-routing.module.ts new file mode 100644 index 0000000..7b325d4 --- /dev/null +++ b/src/app/pages/my-reminders/my-reminders-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { MyRemindersPage } from './my-reminders.page'; + +const routes: Routes = [ + { + path: '', + component: MyRemindersPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class MyRemindersPageRoutingModule {} diff --git a/src/app/pages/my-reminders/my-reminders.module.ts b/src/app/pages/my-reminders/my-reminders.module.ts new file mode 100644 index 0000000..ee20ed5 --- /dev/null +++ b/src/app/pages/my-reminders/my-reminders.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 { MyRemindersPageRoutingModule } from './my-reminders-routing.module'; + +import { MyRemindersPage } from './my-reminders.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + MyRemindersPageRoutingModule + ], + declarations: [MyRemindersPage] +}) +export class MyRemindersPageModule {} diff --git a/src/app/pages/my-reminders/my-reminders.page.html b/src/app/pages/my-reminders/my-reminders.page.html new file mode 100644 index 0000000..822fb71 --- /dev/null +++ b/src/app/pages/my-reminders/my-reminders.page.html @@ -0,0 +1,15 @@ + + + + + + + + Reminders + + + + + + + diff --git a/src/app/pages/my-reminders/my-reminders.page.scss b/src/app/pages/my-reminders/my-reminders.page.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/pages/my-reminders/my-reminders.page.spec.ts b/src/app/pages/my-reminders/my-reminders.page.spec.ts new file mode 100644 index 0000000..8165441 --- /dev/null +++ b/src/app/pages/my-reminders/my-reminders.page.spec.ts @@ -0,0 +1,17 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MyRemindersPage } from './my-reminders.page'; + +describe('MyRemindersPage', () => { + let component: MyRemindersPage; + let fixture: ComponentFixture; + + beforeEach(async(() => { + fixture = TestBed.createComponent(MyRemindersPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/pages/my-reminders/my-reminders.page.ts b/src/app/pages/my-reminders/my-reminders.page.ts new file mode 100644 index 0000000..e1dbcad --- /dev/null +++ b/src/app/pages/my-reminders/my-reminders.page.ts @@ -0,0 +1,18 @@ +import { Component, OnInit } from '@angular/core'; +import {NavController} from "@ionic/angular"; + +@Component({ + selector: 'app-my-reminders', + templateUrl: './my-reminders.page.html', + styleUrls: ['./my-reminders.page.scss'], +}) +export class MyRemindersPage implements OnInit { + + constructor(private navctr: NavController) { } + + ngOnInit() { + } + onBack(){ + this.navctr.back(); + } +} diff --git a/src/app/pages/my-schedule/my-schedule-routing.module.ts b/src/app/pages/my-schedule/my-schedule-routing.module.ts new file mode 100644 index 0000000..f9efde4 --- /dev/null +++ b/src/app/pages/my-schedule/my-schedule-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { MySchedulePage } from './my-schedule.page'; + +const routes: Routes = [ + { + path: '', + component: MySchedulePage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class MySchedulePageRoutingModule {} diff --git a/src/app/pages/my-schedule/my-schedule.module.ts b/src/app/pages/my-schedule/my-schedule.module.ts new file mode 100644 index 0000000..fdaebcf --- /dev/null +++ b/src/app/pages/my-schedule/my-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 { MySchedulePageRoutingModule } from './my-schedule-routing.module'; + +import { MySchedulePage } from './my-schedule.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + MySchedulePageRoutingModule + ], + declarations: [MySchedulePage] +}) +export class MySchedulePageModule {} diff --git a/src/app/pages/my-schedule/my-schedule.page.html b/src/app/pages/my-schedule/my-schedule.page.html new file mode 100644 index 0000000..8d9ad12 --- /dev/null +++ b/src/app/pages/my-schedule/my-schedule.page.html @@ -0,0 +1,15 @@ + + + + + + + + Schedule + + + + + + + diff --git a/src/app/pages/my-schedule/my-schedule.page.scss b/src/app/pages/my-schedule/my-schedule.page.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/pages/my-schedule/my-schedule.page.spec.ts b/src/app/pages/my-schedule/my-schedule.page.spec.ts new file mode 100644 index 0000000..0e7fdc4 --- /dev/null +++ b/src/app/pages/my-schedule/my-schedule.page.spec.ts @@ -0,0 +1,17 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MySchedulePage } from './my-schedule.page'; + +describe('MySchedulePage', () => { + let component: MySchedulePage; + let fixture: ComponentFixture; + + beforeEach(async(() => { + fixture = TestBed.createComponent(MySchedulePage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/pages/my-schedule/my-schedule.page.ts b/src/app/pages/my-schedule/my-schedule.page.ts new file mode 100644 index 0000000..49e133d --- /dev/null +++ b/src/app/pages/my-schedule/my-schedule.page.ts @@ -0,0 +1,18 @@ +import { Component, OnInit } from '@angular/core'; +import {NavController} from "@ionic/angular"; + +@Component({ + selector: 'app-my-schedule', + templateUrl: './my-schedule.page.html', + styleUrls: ['./my-schedule.page.scss'], +}) +export class MySchedulePage implements OnInit { + + constructor(private navctr: NavController) { } + + ngOnInit() { + } + onBack(){ + this.navctr.back(); + } +} diff --git a/src/app/pages/my-tracking/my-tracking-routing.module.ts b/src/app/pages/my-tracking/my-tracking-routing.module.ts new file mode 100644 index 0000000..85c45ab --- /dev/null +++ b/src/app/pages/my-tracking/my-tracking-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { MyTrackingPage } from './my-tracking.page'; + +const routes: Routes = [ + { + path: '', + component: MyTrackingPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class MyTrackingPageRoutingModule {} diff --git a/src/app/pages/my-tracking/my-tracking.module.ts b/src/app/pages/my-tracking/my-tracking.module.ts new file mode 100644 index 0000000..04f7eb7 --- /dev/null +++ b/src/app/pages/my-tracking/my-tracking.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 { MyTrackingPageRoutingModule } from './my-tracking-routing.module'; + +import { MyTrackingPage } from './my-tracking.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + MyTrackingPageRoutingModule + ], + declarations: [MyTrackingPage] +}) +export class MyTrackingPageModule {} diff --git a/src/app/pages/my-tracking/my-tracking.page.html b/src/app/pages/my-tracking/my-tracking.page.html new file mode 100644 index 0000000..9791dd4 --- /dev/null +++ b/src/app/pages/my-tracking/my-tracking.page.html @@ -0,0 +1,14 @@ + + + + + + + + Tracking + + + + + + diff --git a/src/app/pages/my-tracking/my-tracking.page.scss b/src/app/pages/my-tracking/my-tracking.page.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/pages/my-tracking/my-tracking.page.spec.ts b/src/app/pages/my-tracking/my-tracking.page.spec.ts new file mode 100644 index 0000000..dbd165e --- /dev/null +++ b/src/app/pages/my-tracking/my-tracking.page.spec.ts @@ -0,0 +1,17 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MyTrackingPage } from './my-tracking.page'; + +describe('MyTrackingPage', () => { + let component: MyTrackingPage; + let fixture: ComponentFixture; + + beforeEach(async(() => { + fixture = TestBed.createComponent(MyTrackingPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/pages/my-tracking/my-tracking.page.ts b/src/app/pages/my-tracking/my-tracking.page.ts new file mode 100644 index 0000000..a331db2 --- /dev/null +++ b/src/app/pages/my-tracking/my-tracking.page.ts @@ -0,0 +1,18 @@ +import { Component, OnInit } from '@angular/core'; +import {NavController} from "@ionic/angular"; + +@Component({ + selector: 'app-my-tracking', + templateUrl: './my-tracking.page.html', + styleUrls: ['./my-tracking.page.scss'], +}) +export class MyTrackingPage implements OnInit { + + constructor(private navctr: NavController) { } + + ngOnInit() { + } + onBack(){ + this.navctr.back(); + } +}