From 4d516ac39f5a17e08fa15f4e0b4ba69ed93eca61 Mon Sep 17 00:00:00 2001 From: "DESKTOP-BC3NEC6\\chiefsoft" Date: Tue, 28 Feb 2023 09:06:05 -0500 Subject: [PATCH] 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}}