Skip to content

Commit

Permalink
change: 修改登录页面等页面
Browse files Browse the repository at this point in the history
  • Loading branch information
@stone-jin
stone-jin committed May 29, 2018
1 parent b1aa35d commit 17dbe55
Show file tree
Hide file tree
Showing 65 changed files with 52 additions and 1,986 deletions.
3 changes: 2 additions & 1 deletion dist/demo/default/.gitignore
View file
@@ -1 +1,2 @@
node_modules
node_modules
dist
2 changes: 1 addition & 1 deletion dist/demo/default/src/app/app-routing.module.ts
View file
Expand Up @@ -9,7 +9,7 @@ const routes: Routes = [
]

@NgModule({
imports: [RouterModule.forRoot(routes)],
imports: [RouterModule.forRoot(routes, {useHash: true})],
exports: [RouterModule],
})
export class AppRoutingModule {}
6 changes: 3 additions & 3 deletions dist/demo/default/src/app/auth/_helpers/fake-backend.ts
View file
Expand Up @@ -23,11 +23,11 @@ export function mockBackEndFactory(backend: MockBackend, options: BaseRequestOpt
});

// default account
if (params.email === 'demo@demo.com' && params.password === 'demo') {
if (params.email === 'spring@spring.com' && params.password === 'spring') {
filteredUsers[0] = {
fullName: 'Demo',
email: 'demo@demo.com',
password: 'demo',
email: 'spring@spring.com',
password: 'spring',
};
}

Expand Down
1 change: 1 addition & 0 deletions dist/demo/default/src/app/auth/auth.component.ts
View file
Expand Up @@ -20,6 +20,7 @@ declare let mUtil: any
@Component({
selector: '.m-grid.m-grid--hor.m-grid--root.m-page',
templateUrl: './templates/login-1.component.html',
styleUrls: ['./templates/login-1.component.scss'],
encapsulation: ViewEncapsulation.None,
})
export class AuthComponent implements OnInit {
Expand Down
70 changes: 38 additions & 32 deletions dist/demo/default/src/app/auth/templates/login-1.component.html
View file
@@ -1,4 +1,5 @@
<div class="m-grid__item m-grid__item--fluid m-grid m-grid--ver-desktop m-grid--desktop m-grid--tablet-and-mobile m-grid--hor-tablet-and-mobile m-login m-login--1 m-login--signin" id="m_login">
<div class="m-grid__item m-grid__item--fluid m-grid m-grid--ver-desktop m-grid--desktop m-grid--tablet-and-mobile m-grid--hor-tablet-and-mobile m-login m-login--1 m-login--signin"
id="m_login">
<div class="m-grid__item m-grid__item--order-tablet-and-mobile-2 m-login__aside">
<div class="m-stack m-stack--hor m-stack--desktop">
<div class="m-stack__item m-stack__item--fluid">
Expand All @@ -11,56 +12,58 @@
<div class="m-login__signin">
<div class="m-login__head">
<h3 class="m-login__title">
Sign In To Admin
登录spring-cloud-config-admin
</h3>
<div class="m--margin-top-40 m-alert m-alert--outline m-alert--outline-2x alert alert-success fade show" role="alert">
Use username
账号:
<span style="font-weight: 500;">
demo@demo.com
spring@spring.com
</span>
and password
<br/> 密码:
<span style="font-weight: 500;">
demo
spring
</span>
to continue or singup.
来进行登录
</div>
</div>
<form (ngSubmit)="f.form.valid && signin()" #f="ngForm" class="m-login__form m-form" action="">
<ng-template #alertSignin></ng-template>
<div class="form-group m-form__group">
<input class="form-control m-input" type="text" placeholder="Email" name="email" [(ngModel)]="model.email" #email="ngModel" autocomplete="off">
<input class="form-control m-input" type="text" placeholder="Email" name="email" [(ngModel)]="model.email" #email="ngModel"
autocomplete="off">
</div>
<div class="form-group m-form__group">
<input class="form-control m-input m-login__form-input--last" type="password" placeholder="Password" name="password" [(ngModel)]="model.password" #password="ngModel">
<input class="form-control m-input m-login__form-input--last" type="password" placeholder="Password" name="password" [(ngModel)]="model.password"
#password="ngModel">
</div>
<div class="row m-login__form-sub">
<div class="col m--align-left">
<label class="m-checkbox m-checkbox--focus">
<input type="checkbox" name="remember" [(ngModel)]="model.remember" #remember="ngModel">
Remember me
<input type="checkbox" name="remember" [(ngModel)]="model.remember" #remember="ngModel"> Remember me
<span></span>
</label>
</div>
<div class="col m--align-right">
<div class="col m--align-right" style="display: none;">
<a href="javascript:;" id="m_login_forget_password" class="m-link">
Forget Password ?
</a>
</div>
</div>
<div class="m-login__form-action">
<button [disabled]="loading" [ngClass]="{'m-loader m-loader--right m-loader--light': loading}" id="m_login_signin_submit" class="btn btn-focus m-btn m-btn--pill m-btn--custom m-btn--air">
Sign In
<button [disabled]="loading" [ngClass]="{'m-loader m-loader--right m-loader--light': loading}" id="m_login_signin_submit"
class="btn btn-focus m-btn m-btn--pill m-btn--custom m-btn--air">
登录
</button>
</div>
</form>
</div>
<div class="m-login__signup">
<div class="m-login__head">
<h3 class="m-login__title">
Sign Up
注册
</h3>
<div class="m-login__desc">
Enter your details to create your account:
填写你的信息进行注册
</div>
</div>
<form (ngSubmit)="f.form.valid && signup()" #f="ngForm" class="m-login__form m-form" action="">
Expand All @@ -69,19 +72,20 @@ <h3 class="m-login__title">
<input class="form-control m-input" type="text" placeholder="Fullname" name="fullname" [(ngModel)]="model.fullname" #fullname="ngModel">
</div>
<div class="form-group m-form__group">
<input class="form-control m-input" type="text" placeholder="Email" name="email" [(ngModel)]="model.email" #email="ngModel" autocomplete="off">
<input class="form-control m-input" type="text" placeholder="Email" name="email" [(ngModel)]="model.email" #email="ngModel"
autocomplete="off">
</div>
<div class="form-group m-form__group">
<input class="form-control m-input" type="password" placeholder="Password" name="password" [(ngModel)]="model.password" #password="ngModel">
</div>
<div class="form-group m-form__group">
<input class="form-control m-input m-login__form-input--last" type="password" placeholder="Confirm Password" name="rpassword" [(ngModel)]="model.rpassword" #rpassword="ngModel">
<input class="form-control m-input m-login__form-input--last" type="password" placeholder="Confirm Password" name="rpassword"
[(ngModel)]="model.rpassword" #rpassword="ngModel">
</div>
<div class="row form-group m-form__group m-login__form-sub">
<div class="col m--align-left">
<label class="m-checkbox m-checkbox--focus">
<input type="checkbox" name="agree" [(ngModel)]="model.agree" #agree="ngModel">
I Agree the
<input type="checkbox" name="agree" [(ngModel)]="model.agree" #agree="ngModel"> I Agree the
<a href="#" class="m-link m-link--focus">
terms and conditions
</a>
Expand All @@ -92,10 +96,11 @@ <h3 class="m-login__title">
</div>
</div>
<div class="m-login__form-action">
<button [disabled]="loading" [ngClass]="{'m-loader m-loader--right m-loader--light': loading}" id="m_login_signup_submit" class="btn btn-focus m-btn m-btn--pill m-btn--custom m-btn--air">
<button [disabled]="loading" [ngClass]="{'m-loader m-loader--right m-loader--light': loading}" id="m_login_signup_submit"
class="btn btn-focus m-btn m-btn--pill m-btn--custom m-btn--air">
Sign Up
</button>
<button [disabled]="loading" id="m_login_signup_cancel" class="btn btn-outline-focus m-btn m-btn--pill m-btn--custom">
<button [disabled]="loading" id="m_login_signup_cancel" class="btn btn-outline-focus m-btn m-btn--pill m-btn--custom">
Cancel
</button>
</div>
Expand All @@ -113,21 +118,23 @@ <h3 class="m-login__title">
<form (ngSubmit)="f.form.valid && forgotPass()" #f="ngForm" class="m-login__form m-form" action="">
<ng-template #alertForgotPass></ng-template>
<div class="form-group m-form__group">
<input class="form-control m-input" type="text" placeholder="Email" name="email" [(ngModel)]="model.email" #email="ngModel" id="m_email" autocomplete="off">
<input class="form-control m-input" type="text" placeholder="Email" name="email" [(ngModel)]="model.email" #email="ngModel"
id="m_email" autocomplete="off">
</div>
<div class="m-login__form-action">
<button [disabled]="loading" [ngClass]="{'m-loader m-loader--right m-loader--light': loading}" id="m_login_forget_password_submit" class="btn btn-focus m-btn m-btn--pill m-btn--custom m-btn--air">
<button [disabled]="loading" [ngClass]="{'m-loader m-loader--right m-loader--light': loading}" id="m_login_forget_password_submit"
class="btn btn-focus m-btn m-btn--pill m-btn--custom m-btn--air">
Request
</button>
<button [disabled]="loading" id="m_login_forget_password_cancel" class="btn btn-outline-focus m-btn m-btn--pill m-btn--custom">
<button [disabled]="loading" id="m_login_forget_password_cancel" class="btn btn-outline-focus m-btn m-btn--pill m-btn--custom">
Cancel
</button>
</div>
</form>
</div>
</div>
</div>
<div class="m-stack__item m-stack__item--center">
<div class="m-stack__item m-stack__item--center" style="display: none;">
<div class="m-login__account">
<span class="m-login__account-msg">
Don't have an account yet ?
Expand All @@ -140,16 +147,15 @@ <h3 class="m-login__title">
</div>
</div>
</div>
<div class="m-grid__item m-grid__item--fluid m-grid m-grid--center m-grid--hor m-grid__item--order-tablet-and-mobile-1 m-login__content" style="background-image: url(./assets/app/media/img//bg/bg-4.jpg)">
<div class="m-grid__item m-grid__item--fluid m-grid m-grid--center m-grid--hor m-grid__item--order-tablet-and-mobile-1 m-login__content"
style="background-image: url(./assets/app/media/img/bg/bg-4.jpg)">
<div class="m-grid__item m-grid__item--middle">
<h3 class="m-login__welcome">
Join Our Community
Spring-cloud-config-admin
</h3>
<p class="m-login__msg">
Lorem ipsum dolor sit amet, coectetuer adipiscing
<br>
elit sed diam nonummy et nibh euismod
SPring Cloud Config配置中心的可视化管理系统
</p>
</div>
</div>
</div>
</div>
Empty file added dist/demo/default/src/app/auth/templates/login-1.component.scss
View file
Empty file.
128 changes: 0 additions & 128 deletions dist/demo/default/src/app/auth/templates/login-2.component.html
View file

This file was deleted.

0 comments on commit 17dbe55

Please sign in to comment.