From d663709f335282708049fb6cbc3863450a161780 Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Sun, 6 Aug 2023 12:09:12 -0400 Subject: [PATCH] Family login --- src/app/pages/familylogin/familylogin.page.html | 5 +++++ src/app/pages/familylogin/familylogin.page.scss | 10 ++++++++++ src/app/pages/familylogin/familylogin.page.ts | 8 +++++++- src/app/pages/invite/invite.page.html | 4 ++-- src/app/pages/login/login.page.html | 4 ++-- src/app/pages/login/login.page.scss | 3 ++- 6 files changed, 28 insertions(+), 6 deletions(-) diff --git a/src/app/pages/familylogin/familylogin.page.html b/src/app/pages/familylogin/familylogin.page.html index 593d650..c66a7ac 100644 --- a/src/app/pages/familylogin/familylogin.page.html +++ b/src/app/pages/familylogin/familylogin.page.html @@ -1,4 +1,9 @@ +
+
+ +
+
diff --git a/src/app/pages/familylogin/familylogin.page.scss b/src/app/pages/familylogin/familylogin.page.scss index c96ea0d..c358bff 100644 --- a/src/app/pages/familylogin/familylogin.page.scss +++ b/src/app/pages/familylogin/familylogin.page.scss @@ -1,4 +1,14 @@ ion-content { + .back_image { + width: 100%; + height: 200px; + + .back { + font-size: 25px; + color: white; + } + } + .simp_lbl { margin-top: 20px; font-size: 30px; diff --git a/src/app/pages/familylogin/familylogin.page.ts b/src/app/pages/familylogin/familylogin.page.ts index 43ac07a..77369ce 100644 --- a/src/app/pages/familylogin/familylogin.page.ts +++ b/src/app/pages/familylogin/familylogin.page.ts @@ -3,6 +3,7 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { WrenchService } from 'src/app/services/wrench.service'; import { SessionDataProviderService } from 'src/app/store/session-data-provider.service'; import { BlogDataService } from 'src/app/store/blog-data.service'; +import {NavController} from "@ionic/angular"; @Component({ selector: 'app-familylogin', @@ -22,7 +23,8 @@ export class FamilyloginPage implements OnInit { private router: Router, private wrenchService: WrenchService, public sessionDataProviderService:SessionDataProviderService, - public blogDataService:BlogDataService + public blogDataService:BlogDataService, + private navctr: NavController, ) { } @@ -53,6 +55,10 @@ export class FamilyloginPage implements OnInit { ); } + onBack() { + this.navctr.back(); + } + showAlert(mtitle: string, amessage: string) { /* let alert = this.alertCtrl.create({ title: mtitle, diff --git a/src/app/pages/invite/invite.page.html b/src/app/pages/invite/invite.page.html index d12d549..e1047d0 100644 --- a/src/app/pages/invite/invite.page.html +++ b/src/app/pages/invite/invite.page.html @@ -24,8 +24,8 @@
- Card Title - Card Subtitle + Invite Friends + Enter email and name. diff --git a/src/app/pages/login/login.page.html b/src/app/pages/login/login.page.html index 948c9f9..aabb6ff 100644 --- a/src/app/pages/login/login.page.html +++ b/src/app/pages/login/login.page.html @@ -11,8 +11,8 @@ + + Go to Family Account diff --git a/src/app/pages/login/login.page.scss b/src/app/pages/login/login.page.scss index c96ea0d..f8943d9 100644 --- a/src/app/pages/login/login.page.scss +++ b/src/app/pages/login/login.page.scss @@ -2,13 +2,14 @@ ion-content { .simp_lbl { margin-top: 20px; font-size: 30px; - letter-spacing: 1.2; + letter-spacing: 1.2px; margin-bottom: 30px; font-family: 'semi-bold'; } .login-type{ background-color: #3dc2ff; border-radius: 10px; + height: 50px; } ion-item {