diff --git a/.gitignore b/.gitignore index 6697536..7cf9910 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,7 @@ node_modules .angular/cache/* ios andriod +www +www/* +.angular/cache +.angular/cache/14.2.0/* diff --git a/REMEMBER.txt b/REMEMBER.txt index 578886a..51a3d48 100644 --- a/REMEMBER.txt +++ b/REMEMBER.txt @@ -1,2 +1,5 @@ npm install @capacitor/assets --save-dev -npx capacitor-assets generate \ No newline at end of file +npx capacitor-assets generate + + +ionic generate page familylogin \ No newline at end of file diff --git a/resources/icon.png b/resources/icon.png index b1133a6..98bdfeb 100644 Binary files a/resources/icon.png and b/resources/icon.png differ diff --git a/resources/splash.png b/resources/splash.png index c9c2ebb..8bab40e 100644 Binary files a/resources/splash.png and b/resources/splash.png differ diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index fb83511..9442f2c 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -130,6 +130,10 @@ const routes: Routes = [ path: 'receipt', loadChildren: () => import('./pages/receipt/receipt.module').then(m => m.ReceiptPageModule) }, + { + path: 'familylogin', + loadChildren: () => import('./pages/familylogin/familylogin.module').then(m => m.FamilyloginPageModule) + }, ]; @NgModule({ diff --git a/src/app/pages/familylogin/familylogin-routing.module.ts b/src/app/pages/familylogin/familylogin-routing.module.ts new file mode 100644 index 0000000..e684b88 --- /dev/null +++ b/src/app/pages/familylogin/familylogin-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { FamilyloginPage } from './familylogin.page'; + +const routes: Routes = [ + { + path: '', + component: FamilyloginPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class FamilyloginPageRoutingModule {} diff --git a/src/app/pages/familylogin/familylogin.module.ts b/src/app/pages/familylogin/familylogin.module.ts new file mode 100644 index 0000000..027ad57 --- /dev/null +++ b/src/app/pages/familylogin/familylogin.module.ts @@ -0,0 +1,20 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; + +import { IonicModule } from '@ionic/angular'; + +import { FamilyloginPageRoutingModule } from './familylogin-routing.module'; + +import { FamilyloginPage } from './familylogin.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + FamilyloginPageRoutingModule + ], + declarations: [FamilyloginPage] +}) +export class FamilyloginPageModule {} diff --git a/src/app/pages/familylogin/familylogin.page.html b/src/app/pages/familylogin/familylogin.page.html new file mode 100644 index 0000000..2be4382 --- /dev/null +++ b/src/app/pages/familylogin/familylogin.page.html @@ -0,0 +1,68 @@ + +
+
+ + Family Login + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + Remember me +
+ + + Login + + + + + Or return to general accounts + + + + + + + + + + + + + + + + + + + + +
+
+ Have an account? login +
+
+ diff --git a/src/app/pages/familylogin/familylogin.page.scss b/src/app/pages/familylogin/familylogin.page.scss new file mode 100644 index 0000000..c96ea0d --- /dev/null +++ b/src/app/pages/familylogin/familylogin.page.scss @@ -0,0 +1,94 @@ +ion-content { + .simp_lbl { + margin-top: 20px; + font-size: 30px; + letter-spacing: 1.2; + margin-bottom: 30px; + font-family: 'semi-bold'; + } + .login-type{ + background-color: #3dc2ff; + border-radius: 10px; + } + + ion-item { + --background: #f7f7f7; + border-radius: 10px; + margin-bottom: 24px; + + ion-input { + --padding-start: 10px; + font-family: "regular"; + height: 50px; + } + + ion-icon { + font-size: 22px; + } + } + + .check { + margin-top: 2rem; + display: flex; + align-items: center; + + ion-label { + font-size: 14px; + margin-left: 10px; + color: var(--ion-color-primary); + } + } + + ion-button { + --border-radius: 10px; + margin-top: 1.5rem; + height: 50px; + } + + .forgot_lbl { + text-align: center; + margin-top: 10px; + font-size: 14px; + color: var(--ion-color-primary); + } + + .or { + display: flex; + justify-content: center; + margin-top: 10px; + color: grey; + font-size: 14px; + } + + .button { + display: flex; + flex-direction: row; + text-align: center; + justify-content: center; + margin-top: 1rem; + margin-bottom: 1rem; + + ion-buttons { + margin: 0 10px; + + ion-button { + box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.3); + border-radius: 10px; + width: 40px; + height: 40px; + } + } + } + + .last_lbl { + text-align: center; + margin-top: 16px; + font-size: 16px; + color: #c2c2cb; + + span { + color: var(--ion-color-primary); + font-family: "bold"; + } + } +} diff --git a/src/app/pages/familylogin/familylogin.page.spec.ts b/src/app/pages/familylogin/familylogin.page.spec.ts new file mode 100644 index 0000000..327cfeb --- /dev/null +++ b/src/app/pages/familylogin/familylogin.page.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { FamilyloginPage } from './familylogin.page'; + +describe('FamilyloginPage', () => { + let component: FamilyloginPage; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ FamilyloginPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(FamilyloginPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/pages/familylogin/familylogin.page.ts b/src/app/pages/familylogin/familylogin.page.ts new file mode 100644 index 0000000..473fe1c --- /dev/null +++ b/src/app/pages/familylogin/familylogin.page.ts @@ -0,0 +1,19 @@ +import { Component, OnInit } from '@angular/core'; +import {Router} from "@angular/router"; + +@Component({ + selector: 'app-familylogin', + templateUrl: './familylogin.page.html', + styleUrls: ['./familylogin.page.scss'], +}) +export class FamilyloginPage implements OnInit { + + constructor( private router: Router) { } + + ngOnInit() { + } + + userLogin(){ + this.router.navigate(['login']); + } +} diff --git a/src/app/pages/login/login.page.html b/src/app/pages/login/login.page.html index ff14e7b..948c9f9 100644 --- a/src/app/pages/login/login.page.html +++ b/src/app/pages/login/login.page.html @@ -4,6 +4,20 @@ Login to continue + + + + + + + + + + + + diff --git a/src/app/pages/login/login.page.scss b/src/app/pages/login/login.page.scss index 2c51cfa..c96ea0d 100644 --- a/src/app/pages/login/login.page.scss +++ b/src/app/pages/login/login.page.scss @@ -6,6 +6,10 @@ ion-content { margin-bottom: 30px; font-family: 'semi-bold'; } + .login-type{ + background-color: #3dc2ff; + border-radius: 10px; + } ion-item { --background: #f7f7f7; diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts index eb2eb35..e80b5c2 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -86,5 +86,7 @@ getBlogData(){ alert.present();*/ alert(amessage); } - + familyLogin(){ + this.router.navigate(['familylogin']); + } } diff --git a/src/app/pages/profile/profile.page.html b/src/app/pages/profile/profile.page.html index 7a476c2..a677dea 100644 --- a/src/app/pages/profile/profile.page.html +++ b/src/app/pages/profile/profile.page.html @@ -58,7 +58,7 @@ Dark Theme - --> + ii --> diff --git a/src/assets/icon/android-chrome-512x512.png b/src/assets/icon/android-chrome-512x512.png new file mode 100644 index 0000000..00ebe36 Binary files /dev/null and b/src/assets/icon/android-chrome-512x512.png differ diff --git a/src/assets/icon/apple-touch-icon.png b/src/assets/icon/apple-touch-icon.png new file mode 100644 index 0000000..105ee0a Binary files /dev/null and b/src/assets/icon/apple-touch-icon.png differ diff --git a/src/assets/icon/favicon-16x16.png b/src/assets/icon/favicon-16x16.png new file mode 100644 index 0000000..c6e2554 Binary files /dev/null and b/src/assets/icon/favicon-16x16.png differ diff --git a/src/assets/icon/favicon-32x32.png b/src/assets/icon/favicon-32x32.png new file mode 100644 index 0000000..e437db7 Binary files /dev/null and b/src/assets/icon/favicon-32x32.png differ diff --git a/src/assets/icon/favicon.ico b/src/assets/icon/favicon.ico new file mode 100644 index 0000000..9556081 Binary files /dev/null and b/src/assets/icon/favicon.ico differ diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 52d3249..3f812dd 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -1,7 +1,7 @@ export const environment = { production: false, apiKey: '', // <-- Enter your own key here!' - baseUrl: 'https://apigate.lotus.g1.wrenchboard.com/svs/user', - images: 'https://apigate.lotus.g1.wrenchboard.com/svs/user', + baseUrl: 'https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1', + images: 'https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1/', }; diff --git a/src/index.html b/src/index.html index feca5bf..602a53c 100644 --- a/src/index.html +++ b/src/index.html @@ -25,7 +25,7 @@ - +