Skip to content

Commit dc452aa

Browse files
ismcagdasismcagdas
committed
#14: login, about and home pages completed
1 parent d38a1a8 commit dc452aa

22 files changed

+267
-83
lines changed

‎angular/angular-cli.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
"../src/shared/core.less",
3030

31+
"../node_modules/bootstrap/dist/css/bootstrap.min.css",
3132
"../node_modules/bootswatch/cosmo/bootstrap.min.css"
3233
],
3334
"scripts": [

‎angular/obj/Debug/TypeScriptCompilerOutput.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,3 +226,7 @@ D:\Github\module-zero-core-template\angular\dist\out-tsc-e2e\app.po.js
226226
D:\Github\module-zero-core-template\angular\dist\out-tsc-e2e\app.po.js.map
227227
D:\Github\module-zero-core-template\angular\dist\out-tsc-e2e\app.e2e-spec.js
228228
D:\Github\module-zero-core-template\angular\dist\out-tsc-e2e\app.e2e-spec.js.map
229+
D:\Repositories\Github\module-zero-core-template\angular\dist\out-tsc-e2e\app.po.js
230+
D:\Repositories\Github\module-zero-core-template\angular\dist\out-tsc-e2e\app.po.js.map
231+
D:\Repositories\Github\module-zero-core-template\angular\dist\out-tsc-e2e\app.e2e-spec.js
232+
D:\Repositories\Github\module-zero-core-template\angular\dist\out-tsc-e2e\app.e2e-spec.js.map

‎angular/package.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
},
1414
"private": true,
1515
"dependencies": {
16-
"@angular/common": "~2.4.0",
17-
"@angular/compiler": "~2.4.0",
18-
"@angular/core": "~2.4.0",
19-
"@angular/forms": "~2.4.0",
20-
"@angular/http": "~2.4.0",
21-
"@angular/platform-browser": "~2.4.0",
22-
"@angular/platform-browser-dynamic": "~2.4.0",
23-
"@angular/router": "~3.4.0",
16+
"@angular/common": "2.4.7",
17+
"@angular/compiler": "2.4.7",
18+
"@angular/core": "2.4.7",
19+
"@angular/forms": "2.4.7",
20+
"@angular/http": "2.4.7",
21+
"@angular/platform-browser": "2.4.7",
22+
"@angular/platform-browser-dynamic": "2.4.7",
23+
"@angular/router": "3.4.7",
2424
"@types/bootstrap": "^3.3.32",
2525
"@types/jquery": "^2.0.33",
2626
"@types/jquery.blockui": "0.0.27",
@@ -45,7 +45,7 @@
4545
"moment": "^2.15.1",
4646
"moment-timezone": "^0.5.7",
4747
"ng2-bootstrap": "^1.3.3",
48-
"rxjs": "^5.0.1",
48+
"rxjs": "^5.0.3",
4949
"signalr": "^2.2.1",
5050
"simple-line-icons": "^2.4.1",
5151
"spin.js": "^2.3.2",

‎angular/src/account/account.component.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<topbar></topbar>
22

3-
43
<div class="content account-forms">
54
<div *ngIf="showTenantChange()" class="content tenant-change-box">
65
<tenant-change></tenant-change>

‎angular/src/account/account.module.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ import { AccountRoutingModule } from './account-routing.module';
1111
import { ServiceProxyModule } from '@shared/service-proxies/service-proxy.module';
1212

1313
import { AppConsts } from '@shared/AppConsts';
14-
import { SharedModule } from '@shared/common/shared.module';
14+
import { SharedModule } from '@shared/shared.module';
1515

1616
import { AccountComponent } from './account.component';
1717
import { TenantChangeComponent } from './tenant/tenant-change.component';
1818
import { TenantChangeModalComponent } from './tenant/tenant-change-modal.component';
1919
import { LoginComponent } from './login/login.component';
2020
import { RegisterComponent } from './register/register.component';
21+
2122
import { LoginService } from './login/login.service';
22-
import { TopBarComponent } from '@shared/layout/topbar.component';
2323

2424
@NgModule({
2525
imports: [
@@ -38,8 +38,7 @@ import { TopBarComponent } from '@shared/layout/topbar.component';
3838
TenantChangeComponent,
3939
TenantChangeModalComponent,
4040
LoginComponent,
41-
RegisterComponent,
42-
TopBarComponent
41+
RegisterComponent
4342
],
4443
providers: [
4544
LoginService

‎angular/src/account/login/login.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<h4>{{l("LoginWith")}}</h4>
4242
<ul class="social-icons">
4343
<li *ngFor="let provider of loginService.externalLoginProviders">
44-
<a class="social-login-icon social-icon-color {{provider.icon}}"
44+
<a class="btn btn-default btn-sm fa fa-{{provider.icon == 'googleplus' ? 'google-plus' : provider.icon}}"
4545
(click)="externalLogin(provider)"
4646
title="{{provider.name}}"></a>
4747
</li>

‎angular/src/account/login/login.component.less‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
11
#LoginArea {
2-
max-width: 400px;
3-
margin: 120px auto 10px auto;
2+
max-width: 400px;
3+
margin: 120px auto 10px auto;
44
}
5+
56
.social-icons {
6-
padding-left: 0px;
7-
}
7+
padding-left: 0px;
8+
9+
li {
10+
display: inline-block;
11+
margin-right: 5px;
12+
13+
a {
14+
width: 40px;
15+
}
16+
}
17+
}

‎angular/src/app/about/about.component.html‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
<div class="container">
2+
<div class="row">
3+
<div class="col-md-12">
4+
<h3>About This Template</h3>
5+
6+
<p>
7+
This is a simple startup template based on ASP.NET Boilerplate framework and module-zero.
8+
If you need an enterprise startup template, check <a href="http://aspnetzero.com?ref=abptmpl" target="_blank">ASP.NET ZERO</a>.
9+
</p>
10+
11+
<h3 id="DocIntro">What is Module Zero?</h3>
12+
13+
<p>
14+
ASP.NET Boilerplate framework is designed to be independent of any database
15+
schema and to be as generic as possible. Therefore, It leaves some concepts
16+
<strong>abstract</strong> and <strong>optional</strong> (like audit logging, session management and authorization)
17+
which requires some <strong>data store</strong>.
18+
</p>
19+
<p>
20+
<strong>Module Zero </strong>implements all fundamental concepts of ASP.NET
21+
Boilerplate framework such as <a href="http://www.aspnetboilerplate.com/Pages/Documents/Zero/Tenant-Management">tenant management</a> (<strong>multi-tenancy</strong>),
22+
<a href="http://www.aspnetboilerplate.com/Pages/Documents/Zero/Role-Management">
23+
role management
24+
</a>, <a href="http://www.aspnetboilerplate.com/Pages/Documents/Zero/User-Management">user management</a>, <a href="http://www.aspnetboilerplate.com/Pages/Documents/Abp-Session">session</a>,
25+
<a href="http://www.aspnetboilerplate.com/Pages/Documents/Authorization">authorization</a> (<a href="http://www.aspnetboilerplate.com/Pages/Documents/Zero/Permission-Management">
26+
permission management
27+
</a>),
28+
<a href="http://www.aspnetboilerplate.com/Pages/Documents/Setting-Management">setting management</a>, <a href="http://www.aspnetboilerplate.com/Pages/Documents/Zero/Language-Management">
29+
language management
30+
</a>, <a href="http://www.aspnetboilerplate.com/Pages/Documents/Audit-Logging">audit logging</a>
31+
and so on.
32+
</p>
33+
<p>
34+
Module-Zero defines entities and implements <strong>domain logic</strong>
35+
(domain layer) and leaves application and presentation layers to the
36+
application.
37+
</p>
38+
39+
<h4>Based on Microsoft ASP.NET Identity Framework</h4>
40+
41+
<p>
42+
Module Zero is based on Microsoft's
43+
<a href="http://www.asp.net/identity" target="_blank">ASP.NET Identity Framework</a>.
44+
It extends user and role managers and implements user and role stores using generic repositories.
45+
It supports any ORM that can be used with ASP.NET Boilerplate
46+
(like Entity Framework and NHibernate). While module zero extends Identity Framework, it has many unique features.
47+
</p>
48+
49+
<h3>Documentation</h3>
50+
51+
<p>See <a href="http://www.aspnetboilerplate.com/Pages/Documents">documentation</a> for ASP.NET Boilerplate framework and module-zero.</p>
52+
53+
<h3>Source code</h3>
54+
55+
<p>
56+
Module-Zero source code is seperated from ASP.NET Boilerplate and hosted on
57+
<a href="https://github.com/aspnetboilerplate/module-zero" target="_blank">https://github.com/aspnetboilerplate/module-zero</a>.
58+
It's distributed on <a href="http://www.aspnetboilerplate.com/Pages/Documents/Zero/Nuget-Packages">nuget</a> as
59+
the framework.
60+
</p>
61+
62+
</div>
63+
64+
</div>
65+
</div>

‎angular/src/app/about/about.component.ts‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import { Component, Injector, AfterViewInit } from '@angular/core';
2+
import { AppComponentBase } from '@shared/common/app-component-base';
3+
import { appModuleAnimation } from '@shared/animations/routerTransition';
4+
5+
@Component({
6+
templateUrl: './about.component.html',
7+
animations: [appModuleAnimation()]
8+
})
9+
export class AboutComponent extends AppComponentBase {
10+
11+
constructor(
12+
injector: Injector
13+
) {
14+
super(injector);
15+
}
16+
}

‎angular/src/app/app-routing.module.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ import { Routes, RouterModule } from '@angular/router';
33
import { AppComponent } from './app.component';
44
import { AppRouteGuard } from '@shared/common/auth/auth-route-guard';
55
import { HomeComponent } from './home/home.component';
6+
import { AboutComponent } from './about/about.component';
67

78
@NgModule({
89
imports: [
910
RouterModule.forChild([
1011
{
1112
path: '',
1213
component: AppComponent,
13-
canActivate: [AppRouteGuard],
14-
canActivateChild: [AppRouteGuard],
1514
children: [
16-
{ path: 'home', component: HomeComponent }
15+
{ path: 'home', component: HomeComponent, canActivate: [AppRouteGuard] },
16+
{ path: 'about', component: AboutComponent }
1717
]
1818
}
1919
])

0 commit comments

Comments
 (0)