Skip to content

Commit 28ca04e

Browse files
qianmoQqianmoQ
authored
Merge pull request #11 from EdurtIO/1.1.0-SNAPSHOT
1.1.0-SNAPSHOT
2 parents 585b8ea + 567ded0 commit 28ca04e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+2627
-18
lines changed

‎package.json‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-electron-admin",
3-
"version": "1.0.0-SNAPSHOT",
3+
"version": "1.1.0-SNAPSHOT",
44
"description": "Angular Electron Admin Template",
55
"homepage": "https://aea.incubator.edurt.io",
66
"author": {
@@ -41,10 +41,15 @@
4141
"@angular/platform-browser-dynamic": "12.1.2",
4242
"@angular/router": "12.1.2",
4343
"bootstrap": "4.0.0-beta",
44+
"d3": "5",
45+
"font-awesome": "^4.7.0",
4446
"material-design-iconic-font": "^2.2.0",
47+
"moment": "^2.29.1",
4548
"ngx-bootstrap": "^7.1.0",
4649
"ngx-clipboard": "^14.0.1",
50+
"ngx-perfect-scrollbar": "^10.1.1",
4751
"rxjs": "~6.6.0",
52+
"simple-keyboard": "^3.3.22",
4853
"tslib": "^2.1.0",
4954
"zone.js": "~0.11.4"
5055
},

‎src/renderer/app/layout/layout.routing.ts‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ const LAYOUT_ROUTES: Routes = [
1919
{
2020
path: 'zmdi',
2121
loadChildren: () => import('../pages/icon/zmdi/zmdi.module').then(m => m.IconsZmdiModule)
22+
},
23+
{
24+
path: 'fa',
25+
loadChildren: () => import('../pages/icon/fa/fa.module').then(m => m.IconsFaModule)
2226
}
2327
]
2428
},
@@ -32,6 +36,35 @@ const LAYOUT_ROUTES: Routes = [
3236
{
3337
path: 'tooltips',
3438
loadChildren: () => import('../pages/component/tooltips/tooltips.module').then(m => m.TooltipsComponentModule)
39+
},
40+
{
41+
path: 'scrollbar',
42+
loadChildren: () => import('../pages/component/scrollbar/scrollbar.module').then(m => m.ScrollbarModule)
43+
},
44+
{
45+
path: 'datepicker',
46+
loadChildren: () => import('../pages/component/datepicker/datepicker.module').then(m => m.DatepickerModule)
47+
},
48+
{
49+
path: 'carousel',
50+
loadChildren: () => import('../pages/component/carousel/carousel.module').then(m => m.CarouselComponentModule)
51+
},
52+
{
53+
path: 'progressbar',
54+
loadChildren: () => import('../pages/component/progressbar/progressbar.module').then(m => m.ProgressbarComponentModule)
55+
},
56+
{
57+
path: 'keyboard',
58+
loadChildren: () => import('../pages/component/keyboard/keyboard.module').then(m => m.KeyboardModule)
59+
}
60+
]
61+
},
62+
{
63+
path: 'directive',
64+
children: [
65+
{
66+
path: 'contribution',
67+
loadChildren: () => import('../pages/directive/contribution/contribution.module').then(m => m.DirectiveContributionModule)
3568
}
3669
]
3770
}

‎src/renderer/app/layout/navigation/navigation.component.html‎

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
<i class="zmdi zmdi-share"></i> Icon</a>
66
<ul [@toggleHeight]="navigationSubState.Icon">
77
<li routerLinkActive="navigation__active">
8-
<a [routerLink]="['/icon/zmdi']">ZMDI</a>
8+
<a [routerLink]="['/icon/zmdi']"><i class="fa fa-id-card-o"></i> Material Icon</a>
9+
</li>
10+
<li routerLinkActive="navigation__active">
11+
<a [routerLink]="['/icon/fa']"><i class="fa fa-fax"></i> Fa Icon</a>
912
</li>
1013
</ul>
1114
</li>
@@ -14,10 +17,34 @@
1417
<i class="zmdi zmdi-nature"></i> Component</a>
1518
<ul [@toggleHeight]="navigationSubState.Component">
1619
<li routerLinkActive="navigation__active">
17-
<a [routerLink]="['/component/clipboard']">Clipboard</a>
20+
<a [routerLink]="['/component/clipboard']"><i class="fa fa-clipboard"></i> Clipboard</a>
1821
</li>
1922
<li routerLinkActive="navigation__active">
20-
<a [routerLink]="['/component/tooltips']">Tooltips</a>
23+
<a [routerLink]="['/component/tooltips']"><i class="fa fa-tripadvisor"></i> Tooltips</a>
24+
</li>
25+
<li routerLinkActive="navigation__active">
26+
<a [routerLink]="['/component/scrollbar']"><i class="fa fa-bars"></i> Scrollbar</a>
27+
</li>
28+
<li routerLinkActive="navigation__active">
29+
<a [routerLink]="['/component/datepicker']"><i class="fa fa-clock-o"></i> Datepicker</a>
30+
</li>
31+
<li routerLinkActive="navigation__active">
32+
<a [routerLink]="['/component/carousel']"><i class="fa fa-calculator"></i> Carousel</a>
33+
</li>
34+
<li routerLinkActive="navigation__active">
35+
<a [routerLink]="['/component/progressbar']"><i class="fa fa-pagelines"></i> Progressbar</a>
36+
</li>
37+
<li routerLinkActive="navigation__active">
38+
<a [routerLink]="['/component/keyboard']"><i class="fa fa-keyboard-o"></i> Keyboard</a>
39+
</li>
40+
</ul>
41+
</li>
42+
<li routerLinkActive="navigation__sub--active" class="navigation__sub">
43+
<a (click)="toggleNavigationSub('Directive', $event)">
44+
<i class="zmdi zmdi-chart"></i> Directive</a>
45+
<ul [@toggleHeight]="navigationSubState.Directive">
46+
<li routerLinkActive="navigation__active">
47+
<a [routerLink]="['/directive/contribution']"><i class="fa fa-connectdevelop"></i> Contribution</a>
2148
</li>
2249
</ul>
2350
</li>

‎src/renderer/app/layout/navigation/navigation.component.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
@include font-icon('\f26d', 6px);
153153
position: absolute;
154154
left: 1rem;
155-
top: 0.7rem;
155+
top: 1rem;
156156
}
157157
}
158158
}

‎src/renderer/app/layout/navigation/navigation.component.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ export class NavigationComponent implements OnInit {
2525
sidebarVisible: boolean;
2626
navigationSubState: any = {
2727
Icon: 'inactive',
28-
Component: 'inactive'
28+
Component: 'inactive',
29+
Directive: 'inactive'
2930
};
3031

3132
constructor(private navigationService: NavigationService) {

‎src/renderer/app/pages/component/carousel/carousel.component.html‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<section class="content--row">
2+
<header class="content__title">
3+
<h1>Carousel</h1>
4+
<small>This template is built using <code>ngx-bootstrap/carousel</code> and provides some usage examples</small>
5+
</header>
6+
<div class="card">
7+
<div class="card-body">
8+
<h4 class="card-title">Default</h4>
9+
<carousel>
10+
<slide *ngFor="let img of defaultCarousels">
11+
<img src="{{img.url}}" alt="{{img.title}}" style="height: 200px;">
12+
</slide>
13+
</carousel>
14+
</div>
15+
</div>
16+
<div class="card">
17+
<div class="card-body">
18+
<h4 class="card-title">Description</h4>
19+
<carousel>
20+
<slide *ngFor="let img of defaultCarousels">
21+
<img src="{{img.url}}" alt="{{img.title}}" style="height: 200px;">
22+
<div class="carousel-caption">
23+
<h3>{{img.title}}</h3>
24+
<p>{{img.description}}</p>
25+
</div>
26+
</slide>
27+
</carousel>
28+
</div>
29+
</div>
30+
</section>

‎src/renderer/app/pages/component/carousel/carousel.component.ts‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import { Component, OnInit } from '@angular/core';
2+
import { CarouselService } from '@renderer/services/component/carousel.service';
3+
4+
@Component({
5+
selector: 'app-component-carousel',
6+
templateUrl: './carousel.component.html'
7+
})
8+
export class CarouselComponent implements OnInit {
9+
public defaultCarousels: any = [];
10+
11+
constructor(private carouselService: CarouselService) {
12+
this.defaultCarousels = this.carouselService.builderCarousels();
13+
}
14+
15+
ngOnInit() {
16+
}
17+
}

‎src/renderer/app/pages/component/carousel/carousel.module.ts‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
import { CommonModule } from '@angular/common';
2+
import { NgModule } from '@angular/core';
3+
import { RouterModule } from '@angular/router';
4+
import { BsDropdownModule } from 'ngx-bootstrap/dropdown';
5+
import { CarouselModule } from 'ngx-bootstrap/carousel';
6+
import { CarouselComponent } from './carousel.component';
7+
import { CarouselService } from '@renderer/services/component/carousel.service';
8+
9+
const CAROUSEL_ROUTES = [
10+
{path: '', component: CarouselComponent}
11+
];
12+
13+
@NgModule({
14+
declarations: [
15+
CarouselComponent
16+
],
17+
imports: [
18+
CommonModule,
19+
BsDropdownModule.forRoot(),
20+
CarouselModule.forRoot(),
21+
RouterModule.forChild(CAROUSEL_ROUTES)
22+
],
23+
providers: [
24+
CarouselService
25+
]
26+
})
27+
export class CarouselComponentModule {
28+
}

‎src/renderer/app/pages/component/datepicker/datepicker.component.html‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
<section class="content--row">
2+
<header class="content__title">
3+
<h1>Datepicker</h1>
4+
<small>This template is built using <code>ngx-bootstrap/datepicker</code> and provides some usage examples</small>
5+
</header>
6+
<div class="card-demo">
7+
<div class="card">
8+
<div class="card-body">
9+
<h4 class="card-title">Basic Datepicker</h4>
10+
<div class="form-group">
11+
<input type="text" class="form-control" [minDate]="minDate" [maxDate]="maxDate" #dp="bsDatepicker"
12+
bsDatepicker [(bsValue)]="bsValue">
13+
</div>
14+
<div class="form-group">
15+
<button class="btn btn-success" (click)="dp.toggle()">Basic Datepicker</button>
16+
</div>
17+
</div>
18+
</div>
19+
</div>
20+
<div class="card-demo">
21+
<div class="card">
22+
<div class="card-body">
23+
<h4 class="card-title">Range Datepicker</h4>
24+
<div class="form-group">
25+
<input class="form-control" #drp="bsDaterangepicker" bsDaterangepicker>
26+
</div>
27+
<div class="form-group">
28+
<button class="btn btn-success" (click)="drp.toggle()">Range Datepicker</button>
29+
</div>
30+
</div>
31+
</div>
32+
</div>
33+
<div class="card-demo">
34+
<div class="card">
35+
<div class="card-body">
36+
<h4 class="card-title">Theme Datepicker</h4>
37+
<div class="form-group">
38+
<select class="custom-select form-control " [(ngModel)]="colorTheme" (ngModelChange)="applyTheme(dpTheme);">
39+
<option *ngFor="let theme of colorThemes" value="{{theme}}">{{theme}}</option>
40+
</select>
41+
</div>
42+
<div class="form-group">
43+
<div class="input-group">
44+
<input type="text" class="form-control" bsDatepicker #dpTheme="bsDatepicker" [bsConfig]="bsConfig">
45+
<div class="input-group-btn">
46+
<button class="btn btn-success" (click)="dpTheme.show() ">Theme Datepicker</button>
47+
</div>
48+
</div>
49+
</div>
50+
</div>
51+
</div>
52+
</div>
53+
</section>

‎src/renderer/app/pages/component/datepicker/datepicker.component.ts‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
import { Component, OnInit } from '@angular/core';
2+
import { BsDatepickerConfig } from 'ngx-bootstrap/datepicker';
3+
import { DatepickerService } from '@renderer/services/component/datepicker.service';
4+
5+
@Component({
6+
selector: 'app-component-datepicker',
7+
templateUrl: './datepicker.component.html'
8+
})
9+
export class DatepickerComponent implements OnInit {
10+
minDate = new Date(2017, 5, 10);
11+
maxDate = new Date(2018, 9, 15);
12+
bsValue: Date = new Date();
13+
colorTheme = 'theme-green';
14+
colorThemes = [];
15+
bsConfig: Partial<BsDatepickerConfig>;
16+
17+
constructor(private datepickerService: DatepickerService) {
18+
this.colorThemes = this.datepickerService.themes;
19+
}
20+
21+
applyTheme(pop: any) {
22+
this.bsConfig = Object.assign({}, {containerClass: this.colorTheme});
23+
setTimeout(() => {
24+
pop.show();
25+
});
26+
}
27+
28+
ngOnInit() {
29+
}
30+
}

0 commit comments

Comments
 (0)