diff --git a/.REMEMBER b/.REMEMBER new file mode 100644 index 0000000..45990a0 --- /dev/null +++ b/.REMEMBER @@ -0,0 +1,7 @@ +$ ionic generate +$ ionic generate page +$ ionic generate page contact +$ ionic generate component contact/form +$ ionic generate component login-form --change-detection=OnPush +$ ionic generate directive ripple --skip-import +$ ionic generate service api/user \ No newline at end of file diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index a2b2e0f..f5b29bc 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -4,7 +4,8 @@ import { PreloadAllModules, RouterModule, Routes } from '@angular/router'; const routes: Routes = [ { path: 'home', - loadChildren: () => import('./home/home.module').then( m => m.HomePageModule) + /* loadChildren: () => import('./home/home.module').then( m => m.HomePageModule)*/ + loadChildren: () => import('./start-page/start-page.module').then( m => m.StartPagePageModule) }, { path: 'message/:id', @@ -15,6 +16,22 @@ const routes: Routes = [ redirectTo: 'home', pathMatch: 'full' }, + { + path: 'start-page', + loadChildren: () => import('./start-page/start-page.module').then( m => m.StartPagePageModule) + }, + { + path: 'user-login', + loadChildren: () => import('./user-login/user-login.module').then( m => m.UserLoginPageModule) + }, + { + path: 'user-signup', + loadChildren: () => import('./user-signup/user-signup.module').then( m => m.UserSignupPageModule) + }, + { + path: 'user-dash', + loadChildren: () => import('./userpage/user-dash/user-dash.module').then( m => m.UserDashPageModule) + }, ]; @NgModule({ diff --git a/src/app/start-page/start-page-routing.module.ts b/src/app/start-page/start-page-routing.module.ts new file mode 100644 index 0000000..472f8e2 --- /dev/null +++ b/src/app/start-page/start-page-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { StartPagePage } from './start-page.page'; + +const routes: Routes = [ + { + path: '', + component: StartPagePage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class StartPagePageRoutingModule {} diff --git a/src/app/start-page/start-page.module.ts b/src/app/start-page/start-page.module.ts new file mode 100644 index 0000000..dce23a2 --- /dev/null +++ b/src/app/start-page/start-page.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 { StartPagePageRoutingModule } from './start-page-routing.module'; + +import { StartPagePage } from './start-page.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + StartPagePageRoutingModule + ], + declarations: [StartPagePage] +}) +export class StartPagePageModule {} diff --git a/src/app/start-page/start-page.page.html b/src/app/start-page/start-page.page.html new file mode 100644 index 0000000..f102e67 --- /dev/null +++ b/src/app/start-page/start-page.page.html @@ -0,0 +1,33 @@ + + + +
+
+ + + myFit + + your Healty Fliestyle Assistant + + + + + + + + Login + + + Start + + + + + +
+
+ diff --git a/src/app/start-page/start-page.page.scss b/src/app/start-page/start-page.page.scss new file mode 100644 index 0000000..b9b1561 --- /dev/null +++ b/src/app/start-page/start-page.page.scss @@ -0,0 +1,14 @@ +.home_back{ + height: 100%; + width: 100%; + color:rgb(17, 7, 62); + background-image: url(../../assets/img/myfit_home.jpg); + background-size: cover; + .home_card{ + position: relative; + top:50%; + .card_sec1{ + background-color: rgb(144, 197, 214); + } + } +} diff --git a/src/app/start-page/start-page.page.spec.ts b/src/app/start-page/start-page.page.spec.ts new file mode 100644 index 0000000..1cdbfe7 --- /dev/null +++ b/src/app/start-page/start-page.page.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { StartPagePage } from './start-page.page'; + +describe('StartPagePage', () => { + let component: StartPagePage; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ StartPagePage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(StartPagePage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/start-page/start-page.page.ts b/src/app/start-page/start-page.page.ts new file mode 100644 index 0000000..c343a17 --- /dev/null +++ b/src/app/start-page/start-page.page.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; +import { Router } from '@angular/router'; + +@Component({ + selector: 'app-start-page', + templateUrl: './start-page.page.html', + styleUrls: ['./start-page.page.scss'], +}) +export class StartPagePage implements OnInit { + constructor(private router:Router) {} + + ngOnInit() {} + startLogin() {this.router.navigate(['user-login'])} + startSignUp() {this.router.navigate(['user-signup'])} +} diff --git a/src/app/user-login/user-login-routing.module.ts b/src/app/user-login/user-login-routing.module.ts new file mode 100644 index 0000000..d80c901 --- /dev/null +++ b/src/app/user-login/user-login-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { UserLoginPage } from './user-login.page'; + +const routes: Routes = [ + { + path: '', + component: UserLoginPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class UserLoginPageRoutingModule {} diff --git a/src/app/user-login/user-login.module.ts b/src/app/user-login/user-login.module.ts new file mode 100644 index 0000000..3d82c8d --- /dev/null +++ b/src/app/user-login/user-login.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 { UserLoginPageRoutingModule } from './user-login-routing.module'; + +import { UserLoginPage } from './user-login.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + UserLoginPageRoutingModule + ], + declarations: [UserLoginPage] +}) +export class UserLoginPageModule {} diff --git a/src/app/user-login/user-login.page.html b/src/app/user-login/user-login.page.html new file mode 100644 index 0000000..955a643 --- /dev/null +++ b/src/app/user-login/user-login.page.html @@ -0,0 +1,36 @@ + + + + + + Log In + + + + + + diff --git a/src/app/user-login/user-login.page.scss b/src/app/user-login/user-login.page.scss new file mode 100644 index 0000000..f3c76af --- /dev/null +++ b/src/app/user-login/user-login.page.scss @@ -0,0 +1,6 @@ +.login_box{ + position: relative; + top:100px; + padding: 1px; + font-size: 10px; +} \ No newline at end of file diff --git a/src/app/user-login/user-login.page.spec.ts b/src/app/user-login/user-login.page.spec.ts new file mode 100644 index 0000000..2606577 --- /dev/null +++ b/src/app/user-login/user-login.page.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { UserLoginPage } from './user-login.page'; + +describe('UserLoginPage', () => { + let component: UserLoginPage; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ UserLoginPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(UserLoginPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/user-login/user-login.page.ts b/src/app/user-login/user-login.page.ts new file mode 100644 index 0000000..aa8a1a0 --- /dev/null +++ b/src/app/user-login/user-login.page.ts @@ -0,0 +1,19 @@ +import { Component, OnInit } from '@angular/core'; +import { Router } from '@angular/router'; +@Component({ + selector: 'app-user-login', + templateUrl: './user-login.page.html', + styleUrls: ['./user-login.page.scss'], +}) +export class UserLoginPage implements OnInit { + + constructor(private router: Router) { } + + ngOnInit() { + } + + completeLogin(){ + // alert('10000'); + this.router.navigate(['/user-dash']); + } +} diff --git a/src/app/user-signup/user-signup-routing.module.ts b/src/app/user-signup/user-signup-routing.module.ts new file mode 100644 index 0000000..331fb61 --- /dev/null +++ b/src/app/user-signup/user-signup-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { UserSignupPage } from './user-signup.page'; + +const routes: Routes = [ + { + path: '', + component: UserSignupPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class UserSignupPageRoutingModule {} diff --git a/src/app/user-signup/user-signup.module.ts b/src/app/user-signup/user-signup.module.ts new file mode 100644 index 0000000..6609592 --- /dev/null +++ b/src/app/user-signup/user-signup.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 { UserSignupPageRoutingModule } from './user-signup-routing.module'; + +import { UserSignupPage } from './user-signup.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + UserSignupPageRoutingModule + ], + declarations: [UserSignupPage] +}) +export class UserSignupPageModule {} diff --git a/src/app/user-signup/user-signup.page.html b/src/app/user-signup/user-signup.page.html new file mode 100644 index 0000000..e1a172d --- /dev/null +++ b/src/app/user-signup/user-signup.page.html @@ -0,0 +1,9 @@ + + + UserSignup + + + + + + diff --git a/src/app/user-signup/user-signup.page.scss b/src/app/user-signup/user-signup.page.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/user-signup/user-signup.page.spec.ts b/src/app/user-signup/user-signup.page.spec.ts new file mode 100644 index 0000000..6e11472 --- /dev/null +++ b/src/app/user-signup/user-signup.page.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { UserSignupPage } from './user-signup.page'; + +describe('UserSignupPage', () => { + let component: UserSignupPage; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ UserSignupPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(UserSignupPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/user-signup/user-signup.page.ts b/src/app/user-signup/user-signup.page.ts new file mode 100644 index 0000000..76f85df --- /dev/null +++ b/src/app/user-signup/user-signup.page.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-user-signup', + templateUrl: './user-signup.page.html', + styleUrls: ['./user-signup.page.scss'], +}) +export class UserSignupPage implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/userpage/user-dash/user-dash-routing.module.ts b/src/app/userpage/user-dash/user-dash-routing.module.ts new file mode 100644 index 0000000..6a065fd --- /dev/null +++ b/src/app/userpage/user-dash/user-dash-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { UserDashPage } from './user-dash.page'; + +const routes: Routes = [ + { + path: '', + component: UserDashPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class UserDashPageRoutingModule {} diff --git a/src/app/userpage/user-dash/user-dash.module.ts b/src/app/userpage/user-dash/user-dash.module.ts new file mode 100644 index 0000000..78204d8 --- /dev/null +++ b/src/app/userpage/user-dash/user-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 { UserDashPageRoutingModule } from './user-dash-routing.module'; + +import { UserDashPage } from './user-dash.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + UserDashPageRoutingModule + ], + declarations: [UserDashPage] +}) +export class UserDashPageModule {} diff --git a/src/app/userpage/user-dash/user-dash.page.html b/src/app/userpage/user-dash/user-dash.page.html new file mode 100644 index 0000000..4cbcefc --- /dev/null +++ b/src/app/userpage/user-dash/user-dash.page.html @@ -0,0 +1,51 @@ + + + UserDash + + + + +
+ + + + + + Silhouette of a person's head + + + Avatar Item + + + + + + + + + Menu Item 11 + + + Menu Item 22 + + + Menu Item 33 + + + Menu Item 44 + + + + + +
+ + diff --git a/src/app/userpage/user-dash/user-dash.page.scss b/src/app/userpage/user-dash/user-dash.page.scss new file mode 100644 index 0000000..52211a4 --- /dev/null +++ b/src/app/userpage/user-dash/user-dash.page.scss @@ -0,0 +1,14 @@ +.dash_top{ + position: relative; + top:50px; +} +.slide_c { + //width: 150px; + //background-color: red; + font-size: 11px; + text-transform: uppercase; + +} +ion-slide { + width: unset !important; +} diff --git a/src/app/userpage/user-dash/user-dash.page.spec.ts b/src/app/userpage/user-dash/user-dash.page.spec.ts new file mode 100644 index 0000000..68adfa4 --- /dev/null +++ b/src/app/userpage/user-dash/user-dash.page.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { UserDashPage } from './user-dash.page'; + +describe('UserDashPage', () => { + let component: UserDashPage; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ UserDashPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(UserDashPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/userpage/user-dash/user-dash.page.ts b/src/app/userpage/user-dash/user-dash.page.ts new file mode 100644 index 0000000..3eb1fa7 --- /dev/null +++ b/src/app/userpage/user-dash/user-dash.page.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-user-dash', + templateUrl: './user-dash.page.html', + styleUrls: ['./user-dash.page.scss'], +}) +export class UserDashPage implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/assets/img/myfit_home.jpg b/src/assets/img/myfit_home.jpg new file mode 100644 index 0000000..78c506b Binary files /dev/null and b/src/assets/img/myfit_home.jpg differ