diff --git a/.REMEMBER b/.REMEMBER index 64bf436..4cd1010 100644 --- a/.REMEMBER +++ b/.REMEMBER @@ -1,6 +1,6 @@ -THIS IS THE IONIC PROJECT +THIS IS THE IONIC PROJECT - ionic generate + ionic generate $ ionic generate page $ ionic generate page contact $ ionic generate component contact/form @@ -9,4 +9,7 @@ $ ionic generate directive ripple --skip-import $ ionic generate service api/user -ionic g service services/WrenchService \ No newline at end of file + ionic generate component user-footer + ionic generate component cards/home-card + +ionic g service services/WrenchService diff --git a/src/app/compo/menu-card/menu-card.component.html b/src/app/compo/menu-card/menu-card.component.html new file mode 100644 index 0000000..18b3275 --- /dev/null +++ b/src/app/compo/menu-card/menu-card.component.html @@ -0,0 +1,9 @@ + + + Card Subtitle + + + + Here's a small text description for the card content. Nothing more, nothing less. + + diff --git a/src/app/compo/menu-card/menu-card.component.scss b/src/app/compo/menu-card/menu-card.component.scss new file mode 100644 index 0000000..8b60ad6 --- /dev/null +++ b/src/app/compo/menu-card/menu-card.component.scss @@ -0,0 +1,7 @@ +.menu_card{ + //background-image: url('../../../assets/img/myfit_home.jpg'); + background-image: linear-gradient(to right, blue , green); + background-repeat: no-repeat; + background-size: cover; + height: 250px; +} diff --git a/src/app/compo/menu-card/menu-card.component.spec.ts b/src/app/compo/menu-card/menu-card.component.spec.ts new file mode 100644 index 0000000..762701f --- /dev/null +++ b/src/app/compo/menu-card/menu-card.component.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { MenuCardComponent } from './menu-card.component'; + +describe('MenuCardComponent', () => { + let component: MenuCardComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ MenuCardComponent ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(MenuCardComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/compo/menu-card/menu-card.component.ts b/src/app/compo/menu-card/menu-card.component.ts new file mode 100644 index 0000000..f0d7860 --- /dev/null +++ b/src/app/compo/menu-card/menu-card.component.ts @@ -0,0 +1,14 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-menu-card', + templateUrl: './menu-card.component.html', + styleUrls: ['./menu-card.component.scss'], +}) +export class MenuCardComponent implements OnInit { + + constructor() { } + + ngOnInit() {} + +} diff --git a/src/app/compo/user-footer/user-footer.component.html b/src/app/compo/user-footer/user-footer.component.html new file mode 100644 index 0000000..cbba926 --- /dev/null +++ b/src/app/compo/user-footer/user-footer.component.html @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/app/compo/user-footer/user-footer.component.scss b/src/app/compo/user-footer/user-footer.component.scss new file mode 100644 index 0000000..33fafd9 --- /dev/null +++ b/src/app/compo/user-footer/user-footer.component.scss @@ -0,0 +1,3 @@ +.footer-col{ + text-align: center; +} diff --git a/src/app/compo/user-footer/user-footer.component.spec.ts b/src/app/compo/user-footer/user-footer.component.spec.ts new file mode 100644 index 0000000..2459a65 --- /dev/null +++ b/src/app/compo/user-footer/user-footer.component.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { UserFooterComponent } from './user-footer.component'; + +describe('UserFooterComponent', () => { + let component: UserFooterComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ UserFooterComponent ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(UserFooterComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/compo/user-footer/user-footer.component.ts b/src/app/compo/user-footer/user-footer.component.ts new file mode 100644 index 0000000..eb94bd7 --- /dev/null +++ b/src/app/compo/user-footer/user-footer.component.ts @@ -0,0 +1,14 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-user-footer', + templateUrl: './user-footer.component.html', + styleUrls: ['./user-footer.component.scss'], +}) +export class UserFooterComponent implements OnInit { + + constructor() { } + + ngOnInit() {} + +} diff --git a/src/app/start-page/start-page.page.scss b/src/app/start-page/start-page.page.scss index 864acf0..a794707 100644 --- a/src/app/start-page/start-page.page.scss +++ b/src/app/start-page/start-page.page.scss @@ -6,13 +6,14 @@ background-size: cover; .home_card{ position: relative; + max-width: 400px; top:50%; .card_sec1{ - background-color:#1a3544; - color: white; + background-color:#1a3544; + color: white; ion-card-title{ color:white; - } + } ion-card-subtitle{ color: white; } @@ -24,7 +25,7 @@ font-weight: bold; } .start_login{ - + background-color: lightgreen; } .start_signup{ background-color: lightgreen; diff --git a/src/app/userpage/user-dash/user-dash.module.ts b/src/app/userpage/user-dash/user-dash.module.ts index 78204d8..f8a95f7 100644 --- a/src/app/userpage/user-dash/user-dash.module.ts +++ b/src/app/userpage/user-dash/user-dash.module.ts @@ -7,7 +7,8 @@ import { IonicModule } from '@ionic/angular'; import { UserDashPageRoutingModule } from './user-dash-routing.module'; import { UserDashPage } from './user-dash.page'; - +import { UserFooterComponent } from './../../compo/user-footer/user-footer.component'; +import { MenuCardComponent } from './../../compo/menu-card/menu-card.component'; @NgModule({ imports: [ CommonModule, @@ -15,6 +16,6 @@ import { UserDashPage } from './user-dash.page'; IonicModule, UserDashPageRoutingModule ], - declarations: [UserDashPage] + declarations: [UserDashPage,UserFooterComponent,MenuCardComponent] }) 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 index d1aee31..fec9a98 100644 --- a/src/app/userpage/user-dash/user-dash.page.html +++ b/src/app/userpage/user-dash/user-dash.page.html @@ -24,16 +24,7 @@ - - - Card Subtitle - - - - Here's a small text description for the card content. Nothing more, nothing less. - - - + @@ -102,7 +93,7 @@ - + THis is some contatnts to show for noe --> @@ -110,35 +101,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + diff --git a/src/app/userpage/user-dash/user-dash.page.scss b/src/app/userpage/user-dash/user-dash.page.scss index d2f89e6..2bef164 100644 --- a/src/app/userpage/user-dash/user-dash.page.scss +++ b/src/app/userpage/user-dash/user-dash.page.scss @@ -50,6 +50,3 @@ ion-card { margin: 10px 5px 5px 5px; } -.footer-col{ - text-align: center; -} \ No newline at end of file