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..19d4edb
--- /dev/null
+++ b/src/app/compo/menu-card/menu-card.component.html
@@ -0,0 +1,11 @@
+
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..45f6226
--- /dev/null
+++ b/src/app/compo/menu-card/menu-card.component.scss
@@ -0,0 +1,10 @@
+.menu_card{
+ //background-image: url('../../../assets/img/myfit_home.jpg');
+ background-image: linear-gradient(to right, aliceblue , white);
+ background-repeat: no-repeat;
+ background-size: cover;
+ height: 250px;
+}
+ion-card {
+ margin: 0;
+}
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/services/wrench-service.service.spec.ts b/src/app/services/wrench-service.service.spec.ts
new file mode 100644
index 0000000..fab1309
--- /dev/null
+++ b/src/app/services/wrench-service.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { WrenchServiceService } from './wrench-service.service';
+
+describe('WrenchServiceService', () => {
+ let service: WrenchServiceService;
+
+ beforeEach(() => {
+ TestBed.configureTestingModule({});
+ service = TestBed.inject(WrenchServiceService);
+ });
+
+ it('should be created', () => {
+ expect(service).toBeTruthy();
+ });
+});
diff --git a/src/app/services/wrench-service.service.ts b/src/app/services/wrench-service.service.ts
new file mode 100644
index 0000000..340c64d
--- /dev/null
+++ b/src/app/services/wrench-service.service.ts
@@ -0,0 +1,33 @@
+//import { Injectable } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { environment } from 'src/environments/environment';
+
+export interface ApiResult {
+ page: number;
+ results: any[];
+ total_pages: number;
+ total_results: number;
+}
+
+
+@Injectable({
+ providedIn: 'root'
+})
+export class WrenchServiceService {
+
+ constructor(private http: HttpClient) {}
+
+ getTopRatedMovies(page = 1): Observable {
+ return this.http.get(
+ `${environment.baseUrl}/movie/popular?page=${page}&api_key=${environment.apiKey}`
+ );
+ }
+
+ getMovieDetails(id: string): Observable {
+ return this.http.get(
+ `${environment.baseUrl}/movie/${id}?api_key=${environment.apiKey}`
+ );
+ }
+}
diff --git a/src/app/start-page/start-page.page.html b/src/app/start-page/start-page.page.html
index de9ffdf..13fa3c9 100644
--- a/src/app/start-page/start-page.page.html
+++ b/src/app/start-page/start-page.page.html
@@ -11,7 +11,7 @@
myFit
- your Healty Fliestyle Assistant
+ your Healty LifeStyle Assistant
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/user-login/user-login.page.html b/src/app/user-login/user-login.page.html
index d086020..ae4036e 100644
--- a/src/app/user-login/user-login.page.html
+++ b/src/app/user-login/user-login.page.html
@@ -19,9 +19,12 @@
Password
-
- Sign In
-
+
+
+
+ Sign In
+
+
Forgot Password?
diff --git a/src/app/user-signup/user-signup.page.html b/src/app/user-signup/user-signup.page.html
index 0ec0058..bf20ef4 100644
--- a/src/app/user-signup/user-signup.page.html
+++ b/src/app/user-signup/user-signup.page.html
@@ -3,10 +3,43 @@
- Sign up
+ Sign Up
-
+
+
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 dab93d6..526145f 100644
--- a/src/app/userpage/user-dash/user-dash.page.html
+++ b/src/app/userpage/user-dash/user-dash.page.html
@@ -14,83 +14,44 @@
- {{x.name}}
+
-
-
-
- Card Subtitle
-
-
-
- Here's a small text description for the card content. Nothing more, nothing less.
-
-
-
+
-
-
- Card Subtitle
-
-
-
- Here's a small text description for the card content. Nothing more, nothing less.
-
-
+
-
-
- Card Subtitle
-
-
-
- Here's a small text description for the card content. Nothing more, nothing less.
-
-
+
-
-
- Card Subtitle
-
-
-
- Here's a small text description for the card content. Nothing more, nothing less.
-
-
+
-
-
+
{{what_is_below}}
-
+
-
+
{{item.post_title}}
@@ -105,9 +66,13 @@
-
+
THis is some contatnts to show for noe
-->
-
\ 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 4de0a84..c0d64b2 100644
--- a/src/app/userpage/user-dash/user-dash.page.scss
+++ b/src/app/userpage/user-dash/user-dash.page.scss
@@ -28,7 +28,7 @@ ion-slide {
margin: 0px;
}
.home_box_card {
- background-color: yellow;
+ //background-color: yellow;
margin: 0px;
// height: 280px;
}
@@ -38,7 +38,8 @@ ion-card {
}
.first_card{
- background-image: url('../../../assets/img/myfit_home.jpg');
+ //background-image: url('../../../assets/img/myfit_home.jpg');
+ background-image: linear-gradient(to right, red , yellow);
background-repeat: no-repeat;
background-size: cover;
height: 250px;
@@ -48,4 +49,4 @@ ion-card {
background-color: aliceblue;
margin: 10px 5px 5px 5px;
-}
\ No newline at end of file
+}
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 126f72c..3612073 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -1,6 +1,3 @@
export const environment = {
- production: true,
- apiKey: '', // <-- Enter your own key here!'
- baseUrl: 'https://devapi.mermsemr.com/en/mobile/api/v2/myfit',
- images: 'http://image.tmdb.org/t/p',
+ production: true
};
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 6e9404b..9654642 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -2,6 +2,7 @@
// `ng build` replaces `environment.ts` with `environment.prod.ts`.
// The list of file replacements can be found in `angular.json`.
+
export const environment = {
production: false,
apiKey: '', // <-- Enter your own key here!'