mirror of
https://github.com/akveo/ngx-admin.git
synced 2025-12-17 07:50:12 +01:00
Merge branch 'develop/login'
This commit is contained in:
commit
f6f843f1e9
14 changed files with 381 additions and 0 deletions
|
|
@ -4,6 +4,8 @@ import {Component, ViewEncapsulation} from '@angular/core';
|
|||
import {RouteConfig} from '@angular/router-deprecated';
|
||||
|
||||
import {Pages} from './pages';
|
||||
import {Login} from './pages/login';
|
||||
import {Register} from './pages/register';
|
||||
import {AppState} from './app.state';
|
||||
import {BaThemeConfigProvider, BaThemeConfig} from './theme';
|
||||
import {BaThemeRun} from './theme/directives';
|
||||
|
|
@ -36,6 +38,16 @@ import {layoutPaths} from './theme/theme.constants';
|
|||
component: Pages,
|
||||
useAsDefault: true
|
||||
},
|
||||
{
|
||||
path: '/login',
|
||||
name: 'Login',
|
||||
component: Login
|
||||
},
|
||||
{
|
||||
path: '/register',
|
||||
name: 'Register',
|
||||
component: Register
|
||||
},
|
||||
// handle any non-registered route
|
||||
// and simply redirects back to dashboard page
|
||||
// you can specify any customer 404 page while it's not built in ito ng2-admin
|
||||
|
|
|
|||
|
|
@ -105,6 +105,23 @@ export const menuItems = [
|
|||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
title: 'Pages',
|
||||
icon: 'ion-ios-location-outline',
|
||||
selected: false,
|
||||
expanded: false,
|
||||
order: 650,
|
||||
subMenu: [
|
||||
{
|
||||
title: 'Login',
|
||||
url: '/#/login',
|
||||
},
|
||||
{
|
||||
title: 'Register',
|
||||
url: '/#/register',
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
title: 'Menu Level 1',
|
||||
icon: 'ion-ios-more',
|
||||
|
|
|
|||
1
src/app/pages/login/index.ts
Normal file
1
src/app/pages/login/index.ts
Normal file
|
|
@ -0,0 +1 @@
|
|||
export * from './login.component';
|
||||
35
src/app/pages/login/login.component.ts
Normal file
35
src/app/pages/login/login.component.ts
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
import {Component, ViewEncapsulation} from '@angular/core';
|
||||
import {FORM_DIRECTIVES, FormBuilder, ControlGroup, Validators, AbstractControl} from '@angular/common';
|
||||
|
||||
@Component({
|
||||
selector: 'login',
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
directives: [],
|
||||
styles: [require('./login.scss')],
|
||||
template: require('./login.html'),
|
||||
})
|
||||
export class Login {
|
||||
|
||||
public form:ControlGroup;
|
||||
public email:AbstractControl;
|
||||
public password:AbstractControl;
|
||||
public submitted:boolean = false;
|
||||
|
||||
constructor(fb:FormBuilder) {
|
||||
this.form = fb.group({
|
||||
'email': ['', Validators.compose([Validators.required, Validators.minLength(4)])],
|
||||
'password': ['', Validators.compose([Validators.required, Validators.minLength(4)])]
|
||||
});
|
||||
|
||||
this.email = this.form.controls['email'];
|
||||
this.password = this.form.controls['password'];
|
||||
}
|
||||
|
||||
public onSubmit(values:Object):void {
|
||||
this.submitted = true;
|
||||
if (this.form.valid) {
|
||||
// your code goes here
|
||||
// console.log(values);
|
||||
}
|
||||
}
|
||||
}
|
||||
39
src/app/pages/login/login.html
Normal file
39
src/app/pages/login/login.html
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
<div class="auth-main">
|
||||
<div class="auth-block">
|
||||
<h1>Sign in to ng2-admin</h1>
|
||||
<a [routerLink]="['Register']" class="auth-link">New to ng2-admin? Sign up!</a>
|
||||
|
||||
<form [ngFormModel]="form" (ngSubmit)="onSubmit(form.value)" class="form-horizontal">
|
||||
<div class="form-group row" [ngClass]="{'has-error': (!email.valid && email.touched), 'has-success': (email.valid && email.touched)}">
|
||||
<label for="inputEmail3" class="col-sm-2 control-label">Email</label>
|
||||
|
||||
<div class="col-sm-10">
|
||||
<input [ngFormControl]="email" type="email" class="form-control" id="inputEmail3" placeholder="Email">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row" [ngClass]="{'has-error': (!password.valid && password.touched), 'has-success': (password.valid && password.touched)}">
|
||||
<label for="inputPassword3" class="col-sm-2 control-label">Password</label>
|
||||
|
||||
<div class="col-sm-10">
|
||||
<input [ngFormControl]="password" type="password" class="form-control" id="inputPassword3" placeholder="Password">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<div class="col-sm-offset-2 col-sm-10">
|
||||
<button [disabled]="!form.valid" type="submit" class="btn btn-default btn-auth">Sign in</button>
|
||||
<a [routerLink]="['Login']" class="forgot-pass">Forgot password?</a>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<div class="auth-sep"><span><span>or Sign in with one click</span></span></div>
|
||||
|
||||
<div class="al-share-auth">
|
||||
<ul class="al-share clearfix">
|
||||
<li><i class="socicon socicon-facebook" title="Share on Facebook"></i></li>
|
||||
<li><i class="socicon socicon-twitter" title="Share on Twitter"></i></li>
|
||||
<li><i class="socicon socicon-google" title="Share on Google Plus"></i></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
1
src/app/pages/login/login.scss
Normal file
1
src/app/pages/login/login.scss
Normal file
|
|
@ -0,0 +1 @@
|
|||
@import '../../theme/sass/auth';
|
||||
1
src/app/pages/register/index.ts
Normal file
1
src/app/pages/register/index.ts
Normal file
|
|
@ -0,0 +1 @@
|
|||
export * from './register.component';
|
||||
48
src/app/pages/register/register.component.ts
Normal file
48
src/app/pages/register/register.component.ts
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
import {Component, ViewEncapsulation} from '@angular/core';
|
||||
import {FORM_DIRECTIVES, FormBuilder, ControlGroup, Validators, AbstractControl} from '@angular/common';
|
||||
import {EmailValidator, EqualPasswordsValidator} from '../../theme/validators';
|
||||
|
||||
@Component({
|
||||
selector: 'register',
|
||||
encapsulation: ViewEncapsulation.None,
|
||||
directives: [],
|
||||
styles: [require('./register.scss')],
|
||||
template: require('./register.html'),
|
||||
})
|
||||
export class Register {
|
||||
|
||||
public form:ControlGroup;
|
||||
public name:AbstractControl;
|
||||
public email:AbstractControl;
|
||||
public password:AbstractControl;
|
||||
public repeatPassword:AbstractControl;
|
||||
public passwords:ControlGroup;
|
||||
|
||||
public submitted:boolean = false;
|
||||
|
||||
constructor(fb:FormBuilder) {
|
||||
|
||||
this.form = fb.group({
|
||||
'name': ['', Validators.compose([Validators.required, Validators.minLength(4)])],
|
||||
'email': ['', Validators.compose([Validators.required, EmailValidator.validate])],
|
||||
'passwords': fb.group({
|
||||
'password': ['', Validators.compose([Validators.required, Validators.minLength(4)])],
|
||||
'repeatPassword': ['', Validators.compose([Validators.required, Validators.minLength(4)])]
|
||||
}, {validator: EqualPasswordsValidator.validate('password', 'repeatPassword')})
|
||||
});
|
||||
|
||||
this.name = this.form.controls['name'];
|
||||
this.email = this.form.controls['email'];
|
||||
this.passwords = <ControlGroup> this.form.controls['passwords'];
|
||||
this.password = this.passwords.controls['password'];
|
||||
this.repeatPassword = this.passwords.controls['repeatPassword'];
|
||||
}
|
||||
|
||||
public onSubmit(values:Object):void {
|
||||
this.submitted = true;
|
||||
if (this.form.valid) {
|
||||
// your code goes here
|
||||
// console.log(values);
|
||||
}
|
||||
}
|
||||
}
|
||||
53
src/app/pages/register/register.html
Normal file
53
src/app/pages/register/register.html
Normal file
|
|
@ -0,0 +1,53 @@
|
|||
<div class="auth-main">
|
||||
<div class="auth-block">
|
||||
<h1>Sign up to ng2-admin</h1>
|
||||
<a [routerLink]="['Login']" class="auth-link">Already have an ng2-admin account? Sign in!</a>
|
||||
|
||||
<form [ngFormModel]="form" (ngSubmit)="onSubmit(form.value)" class="form-horizontal">
|
||||
<div class="form-group row" [ngClass]="{'has-error': (!name.valid && name.touched), 'has-success': (name.valid && name.touched)}">
|
||||
<label for="inputName3" class="col-sm-2 control-label">Name</label>
|
||||
|
||||
<div class="col-sm-10">
|
||||
<input [ngFormControl]="name" type="text" class="form-control" id="inputName3" placeholder="Full Name">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row" [ngClass]="{'has-error': (!email.valid && email.touched), 'has-success': (email.valid && email.touched)}">
|
||||
<label for="inputEmail3" class="col-sm-2 control-label">Email</label>
|
||||
|
||||
<div class="col-sm-10">
|
||||
<input [ngFormControl]="email" type="email" class="form-control" id="inputEmail3" placeholder="Email">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row" [ngClass]="{'has-error': (!password.valid && password.touched), 'has-success': (password.valid && password.touched)}">
|
||||
<label for="inputPassword3" class="col-sm-2 control-label">Password</label>
|
||||
|
||||
<div class="col-sm-10">
|
||||
<input [ngFormControl]="password" type="password" class="form-control" id="inputPassword3" placeholder="Password">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row" [ngClass]="{'has-error': (!repeatPassword.valid && repeatPassword.touched), 'has-success': (repeatPassword.valid && repeatPassword.touched)}">
|
||||
<label for="inputPassword4" class="col-sm-2 control-label">Repeat</label>
|
||||
|
||||
<div class="col-sm-10">
|
||||
<input [ngFormControl]="repeatPassword" type="password" class="form-control" id="inputPassword4" placeholder="Repeat">
|
||||
<span *ngIf="!passwords.valid && (password.touched || repeatPassword.touched)" class="help-block sub-little-text">Password don't match.</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<div class="col-sm-offset-2 col-sm-10">
|
||||
<button [disabled]="!form.valid" type="submit" class="btn btn-default btn-auth">Sign up</button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<div class="auth-sep"><span><span>or Sign up with one click</span></span></div>
|
||||
|
||||
<div class="al-share-auth">
|
||||
<ul class="al-share clearfix">
|
||||
<li><i class="socicon socicon-facebook" title="Share on Facebook"></i></li>
|
||||
<li><i class="socicon socicon-twitter" title="Share on Twitter"></i></li>
|
||||
<li><i class="socicon socicon-google" title="Share on Google Plus"></i></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
1
src/app/pages/register/register.scss
Normal file
1
src/app/pages/register/register.scss
Normal file
|
|
@ -0,0 +1 @@
|
|||
@import '../../theme/sass/auth';
|
||||
141
src/app/theme/sass/_auth.scss
Normal file
141
src/app/theme/sass/_auth.scss
Normal file
|
|
@ -0,0 +1,141 @@
|
|||
@import 'conf/conf';
|
||||
|
||||
main {
|
||||
min-height: 520px;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
$text-color: #ffffff;
|
||||
|
||||
.form-control, .form-control:focus {
|
||||
@include placeholderStyle($text-color, 0.9);
|
||||
background-color: rgba(0, 0, 0, .4);
|
||||
border-radius: 5px;
|
||||
color: $text-color;
|
||||
}
|
||||
.form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control {
|
||||
@include placeholderStyle($text-color, 0.6);
|
||||
}
|
||||
|
||||
.auth-main {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.auth-block {
|
||||
width: 540px;
|
||||
margin: 0 auto;
|
||||
border-radius: 5px;
|
||||
@include bg-translucent-dark(0.55);
|
||||
color: #fff;
|
||||
padding: 32px;
|
||||
h1 {
|
||||
font-weight: $font-light;
|
||||
margin-bottom: 28px;
|
||||
text-align: center;
|
||||
}
|
||||
p {
|
||||
font-size: 16px;
|
||||
}
|
||||
a {
|
||||
text-decoration: none;
|
||||
outline: none;
|
||||
transition: all 0.2s ease;
|
||||
color: $primary;
|
||||
&:hover {
|
||||
color: $primary-dark;
|
||||
}
|
||||
}
|
||||
|
||||
.control-label {
|
||||
padding-top: 11px;
|
||||
color: $text-color;
|
||||
}
|
||||
|
||||
.form-group {
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
}
|
||||
|
||||
.auth-input {
|
||||
width: 300px;
|
||||
margin-bottom: 24px;
|
||||
input {
|
||||
display: block;
|
||||
width: 100%;
|
||||
border: none;
|
||||
font-size: 16px;
|
||||
padding: 4px 10px;
|
||||
outline: none;
|
||||
}
|
||||
}
|
||||
|
||||
a.forgot-pass {
|
||||
display: block;
|
||||
text-align: right;
|
||||
margin-bottom: -20px;
|
||||
float: right;
|
||||
z-index: 2;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.auth-link {
|
||||
display: block;
|
||||
font-size: 16px;
|
||||
text-align: center;
|
||||
margin-bottom: 33px;
|
||||
}
|
||||
|
||||
.auth-sep {
|
||||
margin-top: 36px;
|
||||
margin-bottom: 24px;
|
||||
line-height: 20px;
|
||||
font-size: 16px;
|
||||
text-align: center;
|
||||
display: block;
|
||||
position: relative;
|
||||
& > span {
|
||||
display: table-cell;
|
||||
width: 30%;
|
||||
white-space: nowrap;
|
||||
padding: 0 24px;
|
||||
color: $text-color;
|
||||
& > span {
|
||||
margin-top: -12px;
|
||||
display: block;
|
||||
}
|
||||
}
|
||||
&:before, &:after {
|
||||
border-top: solid 1px $text-color;
|
||||
content: "";
|
||||
height: 1px;
|
||||
width: 35%;
|
||||
display: table-cell;
|
||||
}
|
||||
}
|
||||
|
||||
.al-share-auth {
|
||||
text-align: center;
|
||||
.al-share {
|
||||
float: none;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
display: inline-block;
|
||||
li {
|
||||
margin-left: 24px;
|
||||
&:first-child {
|
||||
margin-left: 0;
|
||||
}
|
||||
i {
|
||||
font-size: 24px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.btn-auth {
|
||||
color: #ffffff!important;
|
||||
}
|
||||
14
src/app/theme/validators/email.validator.ts
Normal file
14
src/app/theme/validators/email.validator.ts
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
import {Control} from '@angular/common';
|
||||
|
||||
export class EmailValidator {
|
||||
|
||||
public static validate(c: Control) {
|
||||
let EMAIL_REGEXP = /^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i;
|
||||
|
||||
return EMAIL_REGEXP.test(c.value) ? null : {
|
||||
validateEmail: {
|
||||
valid: false
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
16
src/app/theme/validators/equalPasswords.validator.ts
Normal file
16
src/app/theme/validators/equalPasswords.validator.ts
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
import {Control, ControlGroup} from '@angular/common';
|
||||
|
||||
export class EqualPasswordsValidator {
|
||||
|
||||
public static validate(firstField, secondField) {
|
||||
|
||||
return (c: ControlGroup) => {
|
||||
|
||||
return (c.controls && c.controls[firstField].value == c.controls[secondField].value) ? null : {
|
||||
passwordsEqual: {
|
||||
valid: false
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
2
src/app/theme/validators/index.ts
Normal file
2
src/app/theme/validators/index.ts
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
export * from './email.validator';
|
||||
export * from './equalPasswords.validator';
|
||||
Loading…
Add table
Add a link
Reference in a new issue