diff --git a/ui/src/app/pages/loader/loader.page.scss b/ui/src/app/pages/loader/loader.page.scss
index 5bf5e06..e69de29 100644
--- a/ui/src/app/pages/loader/loader.page.scss
+++ b/ui/src/app/pages/loader/loader.page.scss
@@ -1,10 +0,0 @@
-.flex-center {
- display: flex;
- justify-content: center;
- align-items: center;
-}
-
-div {
- width: 100%;
- height: 100%;
-}
\ No newline at end of file
diff --git a/ui/src/app/pages/loader/loader.page.spec.ts b/ui/src/app/pages/loader/loader.page.spec.ts
index aadd5c5..955d4f7 100644
--- a/ui/src/app/pages/loader/loader.page.spec.ts
+++ b/ui/src/app/pages/loader/loader.page.spec.ts
@@ -1,24 +1,33 @@
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { Router } from '@angular/router';
import { IonicModule } from '@ionic/angular';
+import { AppRoutingModule } from 'src/app/app-routing.module';
import { LoaderPage } from './loader.page';
describe('LoaderPage', () => {
let component: LoaderPage;
let fixture: ComponentFixture
;
+ let router: Router;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ LoaderPage ],
- imports: [IonicModule.forRoot()]
+ imports: [
+ IonicModule.forRoot(),
+ AppRoutingModule
+ ]
}).compileComponents();
fixture = TestBed.createComponent(LoaderPage);
+ router = TestBed.get(Router);
component = fixture.componentInstance;
fixture.detectChanges();
}));
- it('should create', () => {
- expect(component).toBeTruthy();
+ it('should go to login page after load', () => {
+ spyOn(router, 'navigate');
+ component.ngOnInit();
+ expect(router.navigate).toHaveBeenCalledWith(['login']);
});
});
diff --git a/ui/src/app/pages/loader/loader.page.ts b/ui/src/app/pages/loader/loader.page.ts
index e2b875d..5e7b181 100644
--- a/ui/src/app/pages/loader/loader.page.ts
+++ b/ui/src/app/pages/loader/loader.page.ts
@@ -1,4 +1,5 @@
import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router'
@Component({
selector: 'app-loader',
@@ -7,9 +8,10 @@ import { Component, OnInit } from '@angular/core';
})
export class LoaderPage implements OnInit {
- constructor() { }
+ constructor(private router: Router) { }
ngOnInit() {
+ // setTimeout(() => { this.router.navigate(['login']); }, 500); < Could be used if connection would be tested
+ this.router.navigate(['login']);
}
-
}
diff --git a/ui/src/app/pages/login/login.page.html b/ui/src/app/pages/login/login.page.html
index cc1535f..8783dcb 100644
--- a/ui/src/app/pages/login/login.page.html
+++ b/ui/src/app/pages/login/login.page.html
@@ -1,9 +1,35 @@
-
-
- login
-
-
-
-
+
+
+
+ Login
+ Please sign in with your credentials
+
+
+
+ Email
+
+ Enter a valid email
+ Invalid email
+ Valid email
+
+
+ Password
+
+ Choose a secure password
+
+
+ Forgot Email/Password
+
+
+ Login
+
+
+
+ Register
+
+
+
+
+
diff --git a/ui/src/app/pages/login/login.page.scss b/ui/src/app/pages/login/login.page.scss
index e69de29..b2c3653 100644
--- a/ui/src/app/pages/login/login.page.scss
+++ b/ui/src/app/pages/login/login.page.scss
@@ -0,0 +1,3 @@
+ion-button[fill="clear"]{
+ text-transform: initial;
+}
\ No newline at end of file
diff --git a/ui/src/app/pages/register/register-routing.module.ts b/ui/src/app/pages/register/register-routing.module.ts
new file mode 100644
index 0000000..ec4af6e
--- /dev/null
+++ b/ui/src/app/pages/register/register-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { RegisterPage } from './register.page';
+
+const routes: Routes = [
+ {
+ path: '',
+ component: RegisterPage
+ }
+];
+
+@NgModule({
+ imports: [RouterModule.forChild(routes)],
+ exports: [RouterModule],
+})
+export class RegisterPageRoutingModule {}
diff --git a/ui/src/app/pages/register/register.module.ts b/ui/src/app/pages/register/register.module.ts
new file mode 100644
index 0000000..0b18f97
--- /dev/null
+++ b/ui/src/app/pages/register/register.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 { RegisterPageRoutingModule } from './register-routing.module';
+
+import { RegisterPage } from './register.page';
+
+@NgModule({
+ imports: [
+ CommonModule,
+ FormsModule,
+ IonicModule,
+ RegisterPageRoutingModule
+ ],
+ declarations: [RegisterPage]
+})
+export class RegisterPageModule {}
diff --git a/ui/src/app/pages/register/register.page.html b/ui/src/app/pages/register/register.page.html
new file mode 100644
index 0000000..a79548e
--- /dev/null
+++ b/ui/src/app/pages/register/register.page.html
@@ -0,0 +1,52 @@
+
+
+ Register
+
+
+
+
+
+
+
+
+ Create an Account
+ Please enter your Information
+
+
+
+
+ First Name
+
+ Last Name
+
+
+
+
+
+ Email
+
+ Enter a valid email
+ Invalid email
+ Valid email
+
+
+
+
+ Password
+
+ Choose a secure password
+ Password Confirmation
+
+
+
+
+
+ Create Account
+
+
+
+
+
+
+
+
diff --git a/ui/src/app/pages/register/register.page.scss b/ui/src/app/pages/register/register.page.scss
new file mode 100644
index 0000000..e69de29
diff --git a/ui/src/app/pages/register/register.page.spec.ts b/ui/src/app/pages/register/register.page.spec.ts
new file mode 100644
index 0000000..ddf913b
--- /dev/null
+++ b/ui/src/app/pages/register/register.page.spec.ts
@@ -0,0 +1,24 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { IonicModule } from '@ionic/angular';
+
+import { RegisterPage } from './register.page';
+
+describe('RegisterPage', () => {
+ let component: RegisterPage;
+ let fixture: ComponentFixture;
+
+ beforeEach(waitForAsync(() => {
+ TestBed.configureTestingModule({
+ declarations: [ RegisterPage ],
+ imports: [IonicModule.forRoot()]
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(RegisterPage);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ }));
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/ui/src/app/pages/register/register.page.ts b/ui/src/app/pages/register/register.page.ts
new file mode 100644
index 0000000..528680f
--- /dev/null
+++ b/ui/src/app/pages/register/register.page.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+ selector: 'app-register',
+ templateUrl: './register.page.html',
+ styleUrls: ['./register.page.scss'],
+})
+export class RegisterPage implements OnInit {
+
+ constructor() { }
+
+ ngOnInit() {
+ }
+
+}
diff --git a/ui/src/global.scss b/ui/src/global.scss
index d854de8..0663bbb 100644
--- a/ui/src/global.scss
+++ b/ui/src/global.scss
@@ -24,3 +24,10 @@
@import "~@ionic/angular/css/text-alignment.css";
@import "~@ionic/angular/css/text-transformation.css";
@import "~@ionic/angular/css/flex-utils.css";
+
+.flex-center {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 100%;
+}
\ No newline at end of file