Skip to content

Commit 4fdd93d

Browse files
qianmoQqianmoQ
authored
Merge pull request #16 from EdurtIO/1.2.0-SNAPSHOT
1.2.0 snapshot
2 parents 28ca04e + b479f48 commit 4fdd93d

Some content is hidden

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

51 files changed

+1170
-55
lines changed

‎.github/ISSUE_TEMPLATE/bug-report-on-component.md‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
---
2+
name: Bug report On xxxx about: Create a report to help us improve title: Bug report for xxxx On xxxx labels: bug
3+
assignees: ''
4+
5+
---
6+
7+
**Describe the bug**
8+
A clear and concise description of what the bug is.
9+
10+
**To Reproduce**
11+
Steps to reproduce the behavior:
12+
13+
1. Go to '...'
14+
2. Click on '....'
15+
3. Scroll down to '....'
16+
4. See error
17+
18+
**Expected behavior**
19+
A clear and concise description of what you expected to happen.
20+
21+
**Screenshots**
22+
If applicable, add screenshots to help explain your problem.
23+
24+
**Component (please set component name):**
25+
26+
- Component: [e.g. XXXXX]
27+
- Version [e.g. 1.0.2]
28+
29+
**Additional context**
30+
Add any other context about the problem here.

‎.github/ISSUE_TEMPLATE/feature_request.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
name: Feature request about: Suggest an idea for this project title: Feature request for XXXX labels: enhancement
3+
assignees: ''
4+
5+
---
6+
7+
**Is your feature request related to a problem? Please describe.**
8+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
9+
10+
**Describe the solution you'd like**
11+
A clear and concise description of what you want to happen.
12+
13+
**Describe alternatives you've considered**
14+
A clear and concise description of any alternative solutions or features you've considered.
15+
16+
**Additional context**
17+
Add any other context or screenshots about the feature request here.

‎.github/ISSUE_TEMPLATE/release-notes-for-version.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
name: Release notes for Version about: New version released title: Release notes for XXXX labels: release assignees: ''
3+
4+
---
5+
6+
**Release time**
7+
8+
`2021-01-01`
9+
10+
**Components involved**
11+
12+
- e.g: XXXXXX
13+
14+
**Check list**
15+
16+
- [x] check 1
17+
- [ ] check 2

‎.github/workflows/publish-to-release.yml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: Publish New Release
2+
3+
on:
4+
pull_request:
5+
branch:
6+
- 'master'
7+
8+
jobs:
9+
release:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Create Release
13+
id: create_release
14+
uses: actions/create-release@master
15+
env:
16+
GITHUB_TOKEN: ${{ secrets.TOKEN }}
17+
with:
18+
tag_name: 1.2.0-SNAPSHOT
19+
release_name: 1.2.0-SNAPSHOT
20+
draft: false
21+
prerelease: false
22+
outputs:
23+
upload_url: ${{ steps.create_release.outputs.upload_url }}

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Angular Electron Admin
22

3-
Bootstrap and package your project with Angular 12 and Electron 13 (Typescript + LESS + HMR) for creating Desktop applications.
3+
Bootstrap and package your project with Angular 12 and Electron 13 (Typescript + SCSS + HMR) for creating Desktop applications.
44

55
|Project|Version|
66
|---|---|

‎package.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-electron-admin",
3-
"version": "1.1.0-SNAPSHOT",
3+
"version": "1.2.0-SNAPSHOT",
44
"description": "Angular Electron Admin Template",
55
"homepage": "https://aea.incubator.edurt.io",
66
"author": {
@@ -43,11 +43,13 @@
4343
"bootstrap": "4.0.0-beta",
4444
"d3": "5",
4545
"font-awesome": "^4.7.0",
46+
"html2canvas": "^1.3.2",
4647
"material-design-iconic-font": "^2.2.0",
4748
"moment": "^2.29.1",
4849
"ngx-bootstrap": "^7.1.0",
4950
"ngx-clipboard": "^14.0.1",
5051
"ngx-perfect-scrollbar": "^10.1.1",
52+
"ngx-toastr": "^14.2.0",
5153
"rxjs": "~6.6.0",
5254
"simple-keyboard": "^3.3.22",
5355
"tslib": "^2.1.0",

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

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,15 @@ import { ThemeService } from '@renderer/services/layout/theme.service';
1010
import { BsDropdownModule } from 'ngx-bootstrap/dropdown';
1111
import { ButtonsModule } from 'ngx-bootstrap/buttons';
1212
import { CommonModule } from '@angular/common';
13+
import {
14+
PERFECT_SCROLLBAR_CONFIG,
15+
PerfectScrollbarConfigInterface,
16+
PerfectScrollbarModule
17+
} from 'ngx-perfect-scrollbar';
18+
19+
const DEFAULT_PERFECT_SCROLLBAR_CONFIG: PerfectScrollbarConfigInterface = {
20+
suppressScrollX: true
21+
};
1322

1423
@NgModule({
1524
declarations: [
@@ -23,9 +32,14 @@ import { CommonModule } from '@angular/common';
2332
FormsModule,
2433
BsDropdownModule.forRoot(),
2534
ButtonsModule,
26-
CommonModule
35+
CommonModule,
36+
PerfectScrollbarModule
2737
],
2838
providers: [
39+
{
40+
provide: PERFECT_SCROLLBAR_CONFIG,
41+
useValue: DEFAULT_PERFECT_SCROLLBAR_CONFIG
42+
},
2943
NavigationService,
3044
ThemeService
3145
]

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

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import { RouterModule, Routes } from '@angular/router';
22
import { LayoutComponent } from './layout.component';
3+
import { ForbiddenComponent } from '@renderer/app/pages/error/forbidden/forbidden.component';
4+
import { NotfoundComponent } from '@renderer/app/pages/error/notfound/notfound.component';
35

46
const LAYOUT_ROUTES: Routes = [
57
{
@@ -56,6 +58,34 @@ const LAYOUT_ROUTES: Routes = [
5658
{
5759
path: 'keyboard',
5860
loadChildren: () => import('../pages/component/keyboard/keyboard.module').then(m => m.KeyboardModule)
61+
},
62+
{
63+
path: 'sortable',
64+
loadChildren: () => import('../pages/component/sortable/sortable.module').then(m => m.SortableComponentModule)
65+
},
66+
{
67+
path: 'rating',
68+
loadChildren: () => import('../pages/component/rating/rating.module').then(m => m.RatingComponentModule)
69+
},
70+
{
71+
path: 'alert',
72+
loadChildren: () => import('../pages/component/alert/alert.module').then(m => m.AlertsComponentModule)
73+
},
74+
{
75+
path: 'tabs',
76+
loadChildren: () => import('../pages/component/tabs/tabs.module').then(m => m.TabsComponentModule)
77+
},
78+
{
79+
path: 'toasty',
80+
loadChildren: () => import('../pages/component/toasty/toasty.module').then(m => m.ToastyComponentModule)
81+
},
82+
{
83+
path: 'typeahead',
84+
loadChildren: () => import('../pages/component/typeahead/typeahead.module').then(m => m.TypeaheadComponentModule)
85+
},
86+
{
87+
path: 'timepicker',
88+
loadChildren: () => import('../pages/component/timepicker/timepicker.module').then(m => m.TimepickerComponentModule)
5989
}
6090
]
6191
},
@@ -65,6 +95,23 @@ const LAYOUT_ROUTES: Routes = [
6595
{
6696
path: 'contribution',
6797
loadChildren: () => import('../pages/directive/contribution/contribution.module').then(m => m.DirectiveContributionModule)
98+
},
99+
{
100+
path: 'screenshot',
101+
loadChildren: () => import('../pages/directive/screenshot/screenshot.module').then(m => m.DirectiveScreenshotModule)
102+
}
103+
]
104+
},
105+
{
106+
path: 'error',
107+
children: [
108+
{
109+
path: '403',
110+
component: ForbiddenComponent
111+
},
112+
{
113+
path: '404',
114+
component: NotfoundComponent
68115
}
69116
]
70117
}

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

Lines changed: 88 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,90 @@
11
<aside class="sidebar" [class.toggled]="sidebarVisible">
2-
<ul class="navigation">
3-
<li routerLinkActive="navigation__sub--active" class="navigation__sub">
4-
<a (click)="toggleNavigationSub('Icon', $event)">
5-
<i class="zmdi zmdi-share"></i> Icon</a>
6-
<ul [@toggleHeight]="navigationSubState.Icon">
7-
<li routerLinkActive="navigation__active">
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>
12-
</li>
13-
</ul>
14-
</li>
15-
<li routerLinkActive="navigation__sub--active" class="navigation__sub">
16-
<a (click)="toggleNavigationSub('Component', $event)">
17-
<i class="zmdi zmdi-nature"></i> Component</a>
18-
<ul [@toggleHeight]="navigationSubState.Component">
19-
<li routerLinkActive="navigation__active">
20-
<a [routerLink]="['/component/clipboard']"><i class="fa fa-clipboard"></i> Clipboard</a>
21-
</li>
22-
<li routerLinkActive="navigation__active">
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>
48-
</li>
49-
</ul>
50-
</li>
51-
</ul>
2+
<perfect-scrollbar>
3+
<ul class="navigation">
4+
<li routerLinkActive="navigation__sub--active" class="navigation__sub">
5+
<a (click)="toggleNavigationSub('Icon', $event)">
6+
<i class="zmdi zmdi-share"></i> Icon</a>
7+
<ul [@toggleHeight]="navigationSubState.Icon">
8+
<li routerLinkActive="navigation__active">
9+
<a [routerLink]="['/icon/zmdi']"><i class="fa fa-id-card-o"></i> Material Icon</a>
10+
</li>
11+
<li routerLinkActive="navigation__active">
12+
<a [routerLink]="['/icon/fa']"><i class="fa fa-fax"></i> Fa Icon</a>
13+
</li>
14+
</ul>
15+
</li>
16+
<li routerLinkActive="navigation__sub--active" class="navigation__sub">
17+
<a (click)="toggleNavigationSub('Component', $event)">
18+
<i class="zmdi zmdi-nature"></i> Component</a>
19+
<ul [@toggleHeight]="navigationSubState.Component">
20+
<li routerLinkActive="navigation__active">
21+
<a [routerLink]="['/component/clipboard']"><i class="fa fa-clipboard"></i> Clipboard</a>
22+
</li>
23+
<li routerLinkActive="navigation__active">
24+
<a [routerLink]="['/component/tooltips']"><i class="fa fa-tripadvisor"></i> Tooltips</a>
25+
</li>
26+
<li routerLinkActive="navigation__active">
27+
<a [routerLink]="['/component/scrollbar']"><i class="fa fa-bars"></i> Scrollbar</a>
28+
</li>
29+
<li routerLinkActive="navigation__active">
30+
<a [routerLink]="['/component/datepicker']"><i class="fa fa-clock-o"></i> Datepicker</a>
31+
</li>
32+
<li routerLinkActive="navigation__active">
33+
<a [routerLink]="['/component/carousel']"><i class="fa fa-calculator"></i> Carousel</a>
34+
</li>
35+
<li routerLinkActive="navigation__active">
36+
<a [routerLink]="['/component/progressbar']"><i class="fa fa-pagelines"></i> Progressbar</a>
37+
</li>
38+
<li routerLinkActive="navigation__active">
39+
<a [routerLink]="['/component/keyboard']"><i class="fa fa-keyboard-o"></i> Keyboard</a>
40+
</li>
41+
<li routerLinkActive="navigation__active">
42+
<a [routerLink]="['/component/sortable']"><i class="fa fa-sort"></i> Sortable</a>
43+
</li>
44+
<li routerLinkActive="navigation__active">
45+
<a [routerLink]="['/component/rating']"><i class="fa fa-random"></i> Rating</a>
46+
</li>
47+
<li routerLinkActive="navigation__active">
48+
<a [routerLink]="['/component/alert']"><i class="fa fa-warning"></i> Alert</a>
49+
</li>
50+
<li routerLinkActive="navigation__active">
51+
<a [routerLink]="['/component/tabs']"><i class="fa fa-tag"></i> Tabs</a>
52+
</li>
53+
<li routerLinkActive="navigation__active">
54+
<a [routerLink]="['/component/toasty']"><i class="fa fa-newspaper-o"></i> Toasty</a>
55+
</li>
56+
<li routerLinkActive="navigation__active">
57+
<a [routerLink]="['/component/typeahead']"><i class="fa fa-tty"></i> Typeahead</a>
58+
</li>
59+
<li routerLinkActive="navigation__active">
60+
<a [routerLink]="['/component/timepicker']"><i class="fa fa-times-circle"></i> Timepicker</a>
61+
</li>
62+
</ul>
63+
</li>
64+
<li routerLinkActive="navigation__sub--active" class="navigation__sub">
65+
<a (click)="toggleNavigationSub('Directive', $event)">
66+
<i class="zmdi zmdi-chart"></i> Directive</a>
67+
<ul [@toggleHeight]="navigationSubState.Directive">
68+
<li routerLinkActive="navigation__active">
69+
<a [routerLink]="['/directive/contribution']"><i class="fa fa-connectdevelop"></i> Contribution</a>
70+
</li>
71+
<li routerLinkActive="navigation__active">
72+
<a [routerLink]="['/directive/screenshot']"><i class="fa fa-camera"></i> Screenshot</a>
73+
</li>
74+
</ul>
75+
</li>
76+
<li routerLinkActive="navigation__sub--active" class="navigation__sub">
77+
<a (click)="toggleNavigationSub('Error', $event)">
78+
<i class="zmdi zmdi-smartphone-erase"></i> Error</a>
79+
<ul [@toggleHeight]="navigationSubState.Error">
80+
<li routerLinkActive="navigation__active">
81+
<a [routerLink]="['/error/403']"><i class="fa fa-navicon"></i> Forbidden(403)</a>
82+
</li>
83+
<li routerLinkActive="navigation__active">
84+
<a [routerLink]="['/error/404']"><i class="fa fa-newspaper-o"></i> NotFound(404)</a>
85+
</li>
86+
</ul>
87+
</li>
88+
</ul>
89+
</perfect-scrollbar>
5290
</aside>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ export class NavigationComponent implements OnInit {
2626
navigationSubState: any = {
2727
Icon: 'inactive',
2828
Component: 'inactive',
29-
Directive: 'inactive'
29+
Directive: 'inactive',
30+
Error: 'inactive'
3031
};
3132

3233
constructor(private navigationService: NavigationService) {

0 commit comments

Comments
 (0)