From 4d516ac39f5a17e08fa15f4e0b4ba69ed93eca61 Mon Sep 17 00:00:00 2001 From: "DESKTOP-BC3NEC6\\chiefsoft" Date: Tue, 28 Feb 2023 09:06:05 -0500 Subject: [PATCH 1/5] sign up added --- .REMEMBER | 5 ++- .../services/wrench-service.service.spec.ts | 16 ++++++++ src/app/services/wrench-service.service.ts | 33 +++++++++++++++++ src/app/start-page/start-page.page.html | 2 +- src/app/user-login/user-login.page.html | 9 +++-- src/app/user-signup/user-signup.page.html | 37 ++++++++++++++++++- .../userpage/user-dash/user-dash.page.html | 6 +-- 7 files changed, 97 insertions(+), 11 deletions(-) create mode 100644 src/app/services/wrench-service.service.spec.ts create mode 100644 src/app/services/wrench-service.service.ts diff --git a/.REMEMBER b/.REMEMBER index 4cab1d0..64bf436 100644 --- a/.REMEMBER +++ b/.REMEMBER @@ -6,4 +6,7 @@ $ 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 +$ ionic generate service api/user + + +ionic g service services/WrenchService \ No newline at end of file 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/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.page.html b/src/app/userpage/user-dash/user-dash.page.html index dab93d6..24ee014 100644 --- a/src/app/userpage/user-dash/user-dash.page.html +++ b/src/app/userpage/user-dash/user-dash.page.html @@ -14,7 +14,7 @@ - {{x.name}} @@ -24,11 +24,9 @@ - - Card Subtitle @@ -90,7 +88,7 @@ - + {{item.post_title}} {{item.post_title}} From ddbbc6884bc4cb4ef4b3479c14a9da9d75a3ab6d Mon Sep 17 00:00:00 2001 From: "DESKTOP-BC3NEC6\\chiefsoft" Date: Tue, 28 Feb 2023 10:45:05 -0500 Subject: [PATCH 2/5] Dash Formating --- .../userpage/user-dash/user-dash.page.html | 47 ++++++++++++++++--- .../userpage/user-dash/user-dash.page.scss | 6 ++- 2 files changed, 45 insertions(+), 8 deletions(-) diff --git a/src/app/userpage/user-dash/user-dash.page.html b/src/app/userpage/user-dash/user-dash.page.html index 24ee014..d1aee31 100644 --- a/src/app/userpage/user-dash/user-dash.page.html +++ b/src/app/userpage/user-dash/user-dash.page.html @@ -20,11 +20,8 @@
-
- -
- - +
+ @@ -81,11 +78,13 @@ + +
{{what_is_below}}
- + @@ -108,4 +107,38 @@ --> -
\ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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..d2f89e6 100644 --- a/src/app/userpage/user-dash/user-dash.page.scss +++ b/src/app/userpage/user-dash/user-dash.page.scss @@ -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,7 @@ ion-card { background-color: aliceblue; margin: 10px 5px 5px 5px; +} +.footer-col{ + text-align: center; } \ No newline at end of file From 454ff8abe20e17d7c8c2300a45c9a5f75c858e45 Mon Sep 17 00:00:00 2001 From: Olu Amey Date: Sat, 4 Mar 2023 21:00:42 -0500 Subject: [PATCH 3/5] Upd 4 --- .REMEMBER | 9 ++-- .../compo/menu-card/menu-card.component.html | 9 ++++ .../compo/menu-card/menu-card.component.scss | 7 +++ .../menu-card/menu-card.component.spec.ts | 24 ++++++++++ .../compo/menu-card/menu-card.component.ts | 14 ++++++ .../user-footer/user-footer.component.html | 31 ++++++++++++ .../user-footer/user-footer.component.scss | 3 ++ .../user-footer/user-footer.component.spec.ts | 24 ++++++++++ .../user-footer/user-footer.component.ts | 14 ++++++ src/app/start-page/start-page.page.scss | 9 ++-- .../userpage/user-dash/user-dash.module.ts | 5 +- .../userpage/user-dash/user-dash.page.html | 47 ++----------------- .../userpage/user-dash/user-dash.page.scss | 3 -- 13 files changed, 144 insertions(+), 55 deletions(-) create mode 100644 src/app/compo/menu-card/menu-card.component.html create mode 100644 src/app/compo/menu-card/menu-card.component.scss create mode 100644 src/app/compo/menu-card/menu-card.component.spec.ts create mode 100644 src/app/compo/menu-card/menu-card.component.ts create mode 100644 src/app/compo/user-footer/user-footer.component.html create mode 100644 src/app/compo/user-footer/user-footer.component.scss create mode 100644 src/app/compo/user-footer/user-footer.component.spec.ts create mode 100644 src/app/compo/user-footer/user-footer.component.ts 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 From 6ac4066b5aa85bd91fd20242d32d0771e3d7bc1e Mon Sep 17 00:00:00 2001 From: Olu Amey Date: Sat, 4 Mar 2023 21:02:02 -0500 Subject: [PATCH 4/5] env c --- src/environments/environment.prod.ts | 1 + src/environments/environment.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 3612073..c535518 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -1,3 +1,4 @@ export const environment = { 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!' From f29b9cbd05e93e3f07aa69432cc79463d7dcb57f Mon Sep 17 00:00:00 2001 From: Olu Amey Date: Sun, 5 Mar 2023 07:12:40 -0500 Subject: [PATCH 5/5] card format --- .../compo/menu-card/menu-card.component.html | 4 ++- .../compo/menu-card/menu-card.component.scss | 5 ++- .../userpage/user-dash/user-dash.page.html | 33 ++----------------- .../userpage/user-dash/user-dash.page.scss | 2 +- 4 files changed, 11 insertions(+), 33 deletions(-) diff --git a/src/app/compo/menu-card/menu-card.component.html b/src/app/compo/menu-card/menu-card.component.html index 18b3275..19d4edb 100644 --- a/src/app/compo/menu-card/menu-card.component.html +++ b/src/app/compo/menu-card/menu-card.component.html @@ -1,6 +1,8 @@ - Card Subtitle + + + diff --git a/src/app/compo/menu-card/menu-card.component.scss b/src/app/compo/menu-card/menu-card.component.scss index 8b60ad6..45f6226 100644 --- a/src/app/compo/menu-card/menu-card.component.scss +++ b/src/app/compo/menu-card/menu-card.component.scss @@ -1,7 +1,10 @@ .menu_card{ //background-image: url('../../../assets/img/myfit_home.jpg'); - background-image: linear-gradient(to right, blue , green); + 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/userpage/user-dash/user-dash.page.html b/src/app/userpage/user-dash/user-dash.page.html index fec9a98..526145f 100644 --- a/src/app/userpage/user-dash/user-dash.page.html +++ b/src/app/userpage/user-dash/user-dash.page.html @@ -28,51 +28,24 @@ - - - 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}}
diff --git a/src/app/userpage/user-dash/user-dash.page.scss b/src/app/userpage/user-dash/user-dash.page.scss index 2bef164..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; }