Skip to content

Commit 2c69472

Browse files
qianmoQqianmoQ
authored
Merge ce146c1 into 4fdd93d 
2 parents 4fdd93d + ce146c1 commit 2c69472

40 files changed

+1298
-62
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
**Changelog category (leave one)**
2+
3+
- New Feature
4+
- Bug Fix
5+
- Documentation (changelog entry is not required)
6+
- Other
7+
8+
**Changelog entry (Details of this change)**
9+
10+
> If there is an issue connection, write it to the end of the question
11+
> e.g: [issue-7](issues-7)
12+
> Please delete this information when submitting
13+
14+
- e.g: Support xxxx
15+
16+
**Affected version**
17+
18+
- e.g: latest version

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ jobs:
1515
env:
1616
GITHUB_TOKEN: ${{ secrets.TOKEN }}
1717
with:
18-
tag_name: 1.2.0-SNAPSHOT
19-
release_name: 1.2.0-SNAPSHOT
18+
tag_name: 1.3.0-SNAPSHOT
19+
release_name: 1.3.0-SNAPSHOT
2020
draft: false
2121
prerelease: false
2222
outputs:

‎CHANGELOG.md‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
## 1.3.0-SNAPSHOT (2021-11-23)
2+
3+
* [Bug] Fix the blank screen caused by sub-page loading ([4265d8e](https://github.com/qianmoQ/angular-electron-admin/commit/4265d8e))
4+
* [Bug] Fixed file not found in package ([2ee9253](https://github.com/qianmoQ/angular-electron-admin/commit/2ee9253))
5+
* [Bug] Fixed some of the sample button style squeeze effects ([cf354d9](https://github.com/qianmoQ/angular-electron-admin/commit/cf354d9))
6+
* [CI] Add auto changelog cli ([3c3609a](https://github.com/qianmoQ/angular-electron-admin/commit/3c3609a))
7+
* [CI] Add issues template ([ca8e1a1](https://github.com/qianmoQ/angular-electron-admin/commit/ca8e1a1))
8+
* [CI] Add publish ci script ([a90fad2](https://github.com/qianmoQ/angular-electron-admin/commit/a90fad2))
9+
* [CI] Add PULL_REQUEST_TEMPLATE ([5d4e4c3](https://github.com/qianmoQ/angular-electron-admin/commit/5d4e4c3))
10+
* [Component] Add Accordion component ([b777c97](https://github.com/qianmoQ/angular-electron-admin/commit/b777c97))
11+
* [Component] Add Alert component ([c372b02](https://github.com/qianmoQ/angular-electron-admin/commit/c372b02))
12+
* [Component] Add Collapse component ([b3fff83](https://github.com/qianmoQ/angular-electron-admin/commit/b3fff83))
13+
* [Component] Add component for carousel ([840ea41](https://github.com/qianmoQ/angular-electron-admin/commit/840ea41))
14+
* [Component] Add component for clipboard ([2457f12](https://github.com/qianmoQ/angular-electron-admin/commit/2457f12))
15+
* [Component] Add component for datepicker ([c2ea384](https://github.com/qianmoQ/angular-electron-admin/commit/c2ea384))
16+
* [Component] Add component for keyboard ([d455fb6](https://github.com/qianmoQ/angular-electron-admin/commit/d455fb6))
17+
* [Component] Add component for Progressbar ([d661f3e](https://github.com/qianmoQ/angular-electron-admin/commit/d661f3e))
18+
* [Component] Add component for scrollbar ([ec9a395](https://github.com/qianmoQ/angular-electron-admin/commit/ec9a395))
19+
* [Component] Add component for tooltips ([f202e70](https://github.com/qianmoQ/angular-electron-admin/commit/f202e70))
20+
* [Component] Add Dropdown component ([ab8070d](https://github.com/qianmoQ/angular-electron-admin/commit/ab8070d))
21+
* [Component] Add Popover component ([b74626c](https://github.com/qianmoQ/angular-electron-admin/commit/b74626c))
22+
* [Component] Add Rating component ([064e712](https://github.com/qianmoQ/angular-electron-admin/commit/064e712))
23+
* [Component] Add Sortable component ([4a08047](https://github.com/qianmoQ/angular-electron-admin/commit/4a08047))
24+
* [Component] Add Tabs component ([08b4176](https://github.com/qianmoQ/angular-electron-admin/commit/08b4176))
25+
* [Component] Add Timepicker component ([08b85e0](https://github.com/qianmoQ/angular-electron-admin/commit/08b85e0))
26+
* [Component] Add Toasty component ([9823f13](https://github.com/qianmoQ/angular-electron-admin/commit/9823f13))
27+
* [Component] Add Typeahead component ([aa5a5f4](https://github.com/qianmoQ/angular-electron-admin/commit/aa5a5f4))
28+
* [Directive] Add contribution chart ([3326ed9](https://github.com/qianmoQ/angular-electron-admin/commit/3326ed9))
29+
* [Directive] Add screenshot ([12c5d65](https://github.com/qianmoQ/angular-electron-admin/commit/12c5d65))
30+
* [Directive] Custom macros use the version specified in package.json ([8b37cb4](https://github.com/qianmoQ/angular-electron-admin/commit/8b37cb4))
31+
* [Error] Add Forbidden(403) page ([c32006a](https://github.com/qianmoQ/angular-electron-admin/commit/c32006a))
32+
* [Error] Add NotFound(404) page ([bee29dc](https://github.com/qianmoQ/angular-electron-admin/commit/bee29dc))
33+
* [Feature] Rebuild the Form element ([f34a527](https://github.com/qianmoQ/angular-electron-admin/commit/f34a527))
34+
* [Icon] Add font-awesome ([d91c00b](https://github.com/qianmoQ/angular-electron-admin/commit/d91c00b))
35+
* [Icon] Add material-design-iconic-font ([bf537e3](https://github.com/qianmoQ/angular-electron-admin/commit/bf537e3))
36+
* [Init] Add CODE_OF_CONDUCT and LICENSE ([26d136e](https://github.com/qianmoQ/angular-electron-admin/commit/26d136e))
37+
* [Init] Add yarn.lock ([260b7ad](https://github.com/qianmoQ/angular-electron-admin/commit/260b7ad))
38+
* [Init] Init aea(angular-electron-admin) project ([f3a42b1](https://github.com/qianmoQ/angular-electron-admin/commit/f3a42b1))
39+
* [Layout] Add a left menu scroll bar ([7384602](https://github.com/qianmoQ/angular-electron-admin/commit/7384602))
40+
* [Layout] Add basic layout ([56e2318](https://github.com/qianmoQ/angular-electron-admin/commit/56e2318))
41+
* [Layout] Add left navigation layout ([4a90c8b](https://github.com/qianmoQ/angular-electron-admin/commit/4a90c8b))
42+
* [Layout] Add small screen menu control ([74d93ce](https://github.com/qianmoQ/angular-electron-admin/commit/74d93ce))
43+
* [Layout] Add theme ([8f33cd0](https://github.com/qianmoQ/angular-electron-admin/commit/8f33cd0))
44+
* [Optimize] Fixed SCSS file compilation warning prompt ([6badda5](https://github.com/qianmoQ/angular-electron-admin/commit/6badda5))
45+
* [Optimize] Optimize README ([bcf6faa](https://github.com/qianmoQ/angular-electron-admin/commit/bcf6faa))
46+
47+
48+

‎package.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-electron-admin",
3-
"version": "1.2.0-SNAPSHOT",
3+
"version": "1.3.0-SNAPSHOT",
44
"description": "Angular Electron Admin Template",
55
"homepage": "https://aea.incubator.edurt.io",
66
"author": {
@@ -27,7 +27,8 @@
2727
"release": "npm run build && electron-builder build --publish never",
2828
"pack:main": "npm run script:tsc && cross-env NODE_ENV=production webpack --progress --config scripts/app-runner/webpack.main.config.js",
2929
"pack:renderer": "ng build --configuration production",
30-
"script:tsc": "tsc -p scripts/tsconfig.json"
30+
"script:tsc": "tsc -p scripts/tsconfig.json",
31+
"version": "conventional-changelog -i CHANGELOG.md -s -r 0"
3132
},
3233
"private": true,
3334
"dependencies": {
@@ -41,6 +42,7 @@
4142
"@angular/platform-browser-dynamic": "12.1.2",
4243
"@angular/router": "12.1.2",
4344
"bootstrap": "4.0.0-beta",
45+
"conventional-changelog-cli": "^2.1.1",
4446
"d3": "5",
4547
"font-awesome": "^4.7.0",
4648
"html2canvas": "^1.3.2",

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

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,6 @@ const LAYOUT_ROUTES: Routes = [
4343
path: 'scrollbar',
4444
loadChildren: () => import('../pages/component/scrollbar/scrollbar.module').then(m => m.ScrollbarModule)
4545
},
46-
{
47-
path: 'datepicker',
48-
loadChildren: () => import('../pages/component/datepicker/datepicker.module').then(m => m.DatepickerModule)
49-
},
5046
{
5147
path: 'carousel',
5248
loadChildren: () => import('../pages/component/carousel/carousel.module').then(m => m.CarouselComponentModule)
@@ -63,10 +59,6 @@ const LAYOUT_ROUTES: Routes = [
6359
path: 'sortable',
6460
loadChildren: () => import('../pages/component/sortable/sortable.module').then(m => m.SortableComponentModule)
6561
},
66-
{
67-
path: 'rating',
68-
loadChildren: () => import('../pages/component/rating/rating.module').then(m => m.RatingComponentModule)
69-
},
7062
{
7163
path: 'alert',
7264
loadChildren: () => import('../pages/component/alert/alert.module').then(m => m.AlertsComponentModule)
@@ -83,9 +75,38 @@ const LAYOUT_ROUTES: Routes = [
8375
path: 'typeahead',
8476
loadChildren: () => import('../pages/component/typeahead/typeahead.module').then(m => m.TypeaheadComponentModule)
8577
},
78+
{
79+
path: 'accordion',
80+
loadChildren: () => import('../pages/component/accordion/accordion.module').then(m => m.AccordionComponentModule)
81+
},
82+
{
83+
path: 'collapse',
84+
loadChildren: () => import('../pages/component/collapse/collapse.module').then(m => m.CollapseComponentModule)
85+
},
86+
{
87+
path: 'popover',
88+
loadChildren: () => import('../pages/component/popover/popover.module').then(m => m.PopoverComponentModule)
89+
}
90+
]
91+
},
92+
{
93+
path: 'form',
94+
children: [
95+
{
96+
path: 'datepicker',
97+
loadChildren: () => import('../pages/form/datepicker/datepicker.module').then(m => m.DatepickerModule)
98+
},
8699
{
87100
path: 'timepicker',
88-
loadChildren: () => import('../pages/component/timepicker/timepicker.module').then(m => m.TimepickerComponentModule)
101+
loadChildren: () => import('../pages/form/timepicker/timepicker.module').then(m => m.TimepickerComponentModule)
102+
},
103+
{
104+
path: 'rating',
105+
loadChildren: () => import('../pages/form/rating/rating.module').then(m => m.RatingComponentModule)
106+
},
107+
{
108+
path: 'dropdown',
109+
loadChildren: () => import('../pages/form/dropdown/dropdown.module').then(m => m.DropdownComponentModule)
89110
}
90111
]
91112
},

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

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@
2626
<li routerLinkActive="navigation__active">
2727
<a [routerLink]="['/component/scrollbar']"><i class="fa fa-bars"></i> Scrollbar</a>
2828
</li>
29-
<li routerLinkActive="navigation__active">
30-
<a [routerLink]="['/component/datepicker']"><i class="fa fa-clock-o"></i> Datepicker</a>
31-
</li>
3229
<li routerLinkActive="navigation__active">
3330
<a [routerLink]="['/component/carousel']"><i class="fa fa-calculator"></i> Carousel</a>
3431
</li>
@@ -41,9 +38,6 @@
4138
<li routerLinkActive="navigation__active">
4239
<a [routerLink]="['/component/sortable']"><i class="fa fa-sort"></i> Sortable</a>
4340
</li>
44-
<li routerLinkActive="navigation__active">
45-
<a [routerLink]="['/component/rating']"><i class="fa fa-random"></i> Rating</a>
46-
</li>
4741
<li routerLinkActive="navigation__active">
4842
<a [routerLink]="['/component/alert']"><i class="fa fa-warning"></i> Alert</a>
4943
</li>
@@ -57,7 +51,31 @@
5751
<a [routerLink]="['/component/typeahead']"><i class="fa fa-tty"></i> Typeahead</a>
5852
</li>
5953
<li routerLinkActive="navigation__active">
60-
<a [routerLink]="['/component/timepicker']"><i class="fa fa-times-circle"></i> Timepicker</a>
54+
<a [routerLink]="['/component/accordion']"><i class="fa fa-universal-access"></i> Accordion</a>
55+
</li>
56+
<li routerLinkActive="navigation__active">
57+
<a [routerLink]="['/component/collapse']"><i class="fa fa-columns"></i> Collapse</a>
58+
</li>
59+
<li routerLinkActive="navigation__active">
60+
<a [routerLink]="['/component/popover']"><i class="fa fa-podcast"></i> Popover</a>
61+
</li>
62+
</ul>
63+
</li>
64+
<li routerLinkActive="navigation__sub--active" class="navigation__sub">
65+
<a (click)="toggleNavigationSub('Form', $event)">
66+
<i class="zmdi zmdi-text-format"></i> Form</a>
67+
<ul [@toggleHeight]="navigationSubState.Form">
68+
<li routerLinkActive="navigation__active">
69+
<a [routerLink]="['/form/timepicker']"><i class="fa fa-times-circle"></i> Timepicker</a>
70+
</li>
71+
<li routerLinkActive="navigation__active">
72+
<a [routerLink]="['/form/datepicker']"><i class="fa fa-clock-o"></i> Datepicker</a>
73+
</li>
74+
<li routerLinkActive="navigation__active">
75+
<a [routerLink]="['/form/rating']"><i class="fa fa-random"></i> Rating</a>
76+
</li>
77+
<li routerLinkActive="navigation__active">
78+
<a [routerLink]="['/form/dropdown']"><i class="fa fa-dribbble"></i> Dropdown</a>
6179
</li>
6280
</ul>
6381
</li>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ export class NavigationComponent implements OnInit {
2727
Icon: 'inactive',
2828
Component: 'inactive',
2929
Directive: 'inactive',
30-
Error: 'inactive'
30+
Error: 'inactive',
31+
Form: 'inactive'
3132
};
3233

3334
constructor(private navigationService: NavigationService) {

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

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<section class="content--row">
2+
<header class="content__title">
3+
<h1>Accordion</h1>
4+
<small>This template is built using <code>ngx-bootstrap/accordion</code> and provides some usage examples</small>
5+
</header>
6+
<div class="card">
7+
<div class="card-body">
8+
<h4 class="card-title">Basic Accordion</h4>
9+
<accordion class="accordion">
10+
<accordion-group *ngFor="let accordion of accordions" heading="{{accordion.title}}">
11+
{{accordion.description}}
12+
</accordion-group>
13+
</accordion>
14+
</div>
15+
</div>
16+
<div class="card">
17+
<div class="card-body">
18+
<h4 class="card-title">Disable the Accordion</h4>
19+
<h6 class="card-subtitle">Usage <code>isDisabled</code> option to disable the function</h6>
20+
<accordion class="accordion">
21+
<accordion-group *ngFor="let accordion of accordions" heading="{{accordion.title}}"
22+
[isDisabled]="accordion.isDisabled">
23+
{{accordion.description}}
24+
</accordion-group>
25+
</accordion>
26+
</div>
27+
</div>
28+
<div class="card">
29+
<div class="card-body">
30+
<h4 class="card-title">Limit the number of accordions opened</h4>
31+
<h6 class="card-subtitle">Usage <code>closeOthers</code> option to limit the number of openings</h6>
32+
<accordion class="accordion" [closeOthers]="true">
33+
<accordion-group *ngFor="let accordion of accordions" heading="{{accordion.title}}">
34+
{{accordion.description}}
35+
</accordion-group>
36+
</accordion>
37+
</div>
38+
</div>
39+
</section>

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import { Component, OnInit } from '@angular/core';
2+
import { AccordionService } from '@renderer/services/component/accordion.service';
3+
import { AccordionModel } from '@renderer/model/component/accordion.model';
4+
5+
@Component({
6+
selector: 'app-component-accordion',
7+
templateUrl: './accordion.component.html'
8+
})
9+
export class AccordionComponent implements OnInit {
10+
accordions: AccordionModel[];
11+
12+
constructor(private accordionService: AccordionService) {
13+
this.accordions = this.accordionService.builderMockData();
14+
}
15+
16+
ngOnInit() {
17+
}
18+
}

‎src/renderer/app/pages/component/accordion/accordion.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 { AccordionModule } from 'ngx-bootstrap/accordion';
6+
import { AccordionComponent } from './accordion.component';
7+
import { AccordionService } from '@renderer/services/component/accordion.service';
8+
9+
const ACCORDION_ROUTES = [
10+
{path: '', component: AccordionComponent}
11+
];
12+
13+
@NgModule({
14+
declarations: [
15+
AccordionComponent
16+
],
17+
imports: [
18+
CommonModule,
19+
BsDropdownModule.forRoot(),
20+
AccordionModule.forRoot(),
21+
RouterModule.forChild(ACCORDION_ROUTES)
22+
],
23+
providers: [
24+
AccordionService
25+
]
26+
})
27+
export class AccordionComponentModule {
28+
}

0 commit comments

Comments
 (0)