Skip to content

Commit

Permalink
Merge pull request #18 from EdurtIO/1.3.0-SNAPSHOT
Browse files Browse the repository at this point in the history
1.3.0 snapshot
  • Loading branch information
qianmoQ authored Nov 23, 2021
2 parents 4fdd93d + ce146c1 commit 69589f9
Show file tree
Hide file tree
Showing 40 changed files with 1,298 additions and 62 deletions.
18 changes: 18 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
**Changelog category (leave one)**

- New Feature
- Bug Fix
- Documentation (changelog entry is not required)
- Other

**Changelog entry (Details of this change)**

> If there is an issue connection, write it to the end of the question
> e.g: [issue-7](issues-7)
> Please delete this information when submitting
- e.g: Support xxxx

**Affected version**

- e.g: latest version
4 changes: 2 additions & 2 deletions .github/workflows/publish-to-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.TOKEN }}
with:
tag_name: 1.2.0-SNAPSHOT
release_name: 1.2.0-SNAPSHOT
tag_name: 1.3.0-SNAPSHOT
release_name: 1.3.0-SNAPSHOT
draft: false
prerelease: false
outputs:
Expand Down
48 changes: 48 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
## 1.3.0-SNAPSHOT (2021-11-23)

* [Bug] Fix the blank screen caused by sub-page loading ([4265d8e](https://github.com/qianmoQ/angular-electron-admin/commit/4265d8e))
* [Bug] Fixed file not found in package ([2ee9253](https://github.com/qianmoQ/angular-electron-admin/commit/2ee9253))
* [Bug] Fixed some of the sample button style squeeze effects ([cf354d9](https://github.com/qianmoQ/angular-electron-admin/commit/cf354d9))
* [CI] Add auto changelog cli ([3c3609a](https://github.com/qianmoQ/angular-electron-admin/commit/3c3609a))
* [CI] Add issues template ([ca8e1a1](https://github.com/qianmoQ/angular-electron-admin/commit/ca8e1a1))
* [CI] Add publish ci script ([a90fad2](https://github.com/qianmoQ/angular-electron-admin/commit/a90fad2))
* [CI] Add PULL_REQUEST_TEMPLATE ([5d4e4c3](https://github.com/qianmoQ/angular-electron-admin/commit/5d4e4c3))
* [Component] Add Accordion component ([b777c97](https://github.com/qianmoQ/angular-electron-admin/commit/b777c97))
* [Component] Add Alert component ([c372b02](https://github.com/qianmoQ/angular-electron-admin/commit/c372b02))
* [Component] Add Collapse component ([b3fff83](https://github.com/qianmoQ/angular-electron-admin/commit/b3fff83))
* [Component] Add component for carousel ([840ea41](https://github.com/qianmoQ/angular-electron-admin/commit/840ea41))
* [Component] Add component for clipboard ([2457f12](https://github.com/qianmoQ/angular-electron-admin/commit/2457f12))
* [Component] Add component for datepicker ([c2ea384](https://github.com/qianmoQ/angular-electron-admin/commit/c2ea384))
* [Component] Add component for keyboard ([d455fb6](https://github.com/qianmoQ/angular-electron-admin/commit/d455fb6))
* [Component] Add component for Progressbar ([d661f3e](https://github.com/qianmoQ/angular-electron-admin/commit/d661f3e))
* [Component] Add component for scrollbar ([ec9a395](https://github.com/qianmoQ/angular-electron-admin/commit/ec9a395))
* [Component] Add component for tooltips ([f202e70](https://github.com/qianmoQ/angular-electron-admin/commit/f202e70))
* [Component] Add Dropdown component ([ab8070d](https://github.com/qianmoQ/angular-electron-admin/commit/ab8070d))
* [Component] Add Popover component ([b74626c](https://github.com/qianmoQ/angular-electron-admin/commit/b74626c))
* [Component] Add Rating component ([064e712](https://github.com/qianmoQ/angular-electron-admin/commit/064e712))
* [Component] Add Sortable component ([4a08047](https://github.com/qianmoQ/angular-electron-admin/commit/4a08047))
* [Component] Add Tabs component ([08b4176](https://github.com/qianmoQ/angular-electron-admin/commit/08b4176))
* [Component] Add Timepicker component ([08b85e0](https://github.com/qianmoQ/angular-electron-admin/commit/08b85e0))
* [Component] Add Toasty component ([9823f13](https://github.com/qianmoQ/angular-electron-admin/commit/9823f13))
* [Component] Add Typeahead component ([aa5a5f4](https://github.com/qianmoQ/angular-electron-admin/commit/aa5a5f4))
* [Directive] Add contribution chart ([3326ed9](https://github.com/qianmoQ/angular-electron-admin/commit/3326ed9))
* [Directive] Add screenshot ([12c5d65](https://github.com/qianmoQ/angular-electron-admin/commit/12c5d65))
* [Directive] Custom macros use the version specified in package.json ([8b37cb4](https://github.com/qianmoQ/angular-electron-admin/commit/8b37cb4))
* [Error] Add Forbidden(403) page ([c32006a](https://github.com/qianmoQ/angular-electron-admin/commit/c32006a))
* [Error] Add NotFound(404) page ([bee29dc](https://github.com/qianmoQ/angular-electron-admin/commit/bee29dc))
* [Feature] Rebuild the Form element ([f34a527](https://github.com/qianmoQ/angular-electron-admin/commit/f34a527))
* [Icon] Add font-awesome ([d91c00b](https://github.com/qianmoQ/angular-electron-admin/commit/d91c00b))
* [Icon] Add material-design-iconic-font ([bf537e3](https://github.com/qianmoQ/angular-electron-admin/commit/bf537e3))
* [Init] Add CODE_OF_CONDUCT and LICENSE ([26d136e](https://github.com/qianmoQ/angular-electron-admin/commit/26d136e))
* [Init] Add yarn.lock ([260b7ad](https://github.com/qianmoQ/angular-electron-admin/commit/260b7ad))
* [Init] Init aea(angular-electron-admin) project ([f3a42b1](https://github.com/qianmoQ/angular-electron-admin/commit/f3a42b1))
* [Layout] Add a left menu scroll bar ([7384602](https://github.com/qianmoQ/angular-electron-admin/commit/7384602))
* [Layout] Add basic layout ([56e2318](https://github.com/qianmoQ/angular-electron-admin/commit/56e2318))
* [Layout] Add left navigation layout ([4a90c8b](https://github.com/qianmoQ/angular-electron-admin/commit/4a90c8b))
* [Layout] Add small screen menu control ([74d93ce](https://github.com/qianmoQ/angular-electron-admin/commit/74d93ce))
* [Layout] Add theme ([8f33cd0](https://github.com/qianmoQ/angular-electron-admin/commit/8f33cd0))
* [Optimize] Fixed SCSS file compilation warning prompt ([6badda5](https://github.com/qianmoQ/angular-electron-admin/commit/6badda5))
* [Optimize] Optimize README ([bcf6faa](https://github.com/qianmoQ/angular-electron-admin/commit/bcf6faa))



6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angular-electron-admin",
"version": "1.2.0-SNAPSHOT",
"version": "1.3.0-SNAPSHOT",
"description": "Angular Electron Admin Template",
"homepage": "https://aea.incubator.edurt.io",
"author": {
Expand All @@ -27,7 +27,8 @@
"release": "npm run build && electron-builder build --publish never",
"pack:main": "npm run script:tsc && cross-env NODE_ENV=production webpack --progress --config scripts/app-runner/webpack.main.config.js",
"pack:renderer": "ng build --configuration production",
"script:tsc": "tsc -p scripts/tsconfig.json"
"script:tsc": "tsc -p scripts/tsconfig.json",
"version": "conventional-changelog -i CHANGELOG.md -s -r 0"
},
"private": true,
"dependencies": {
Expand All @@ -41,6 +42,7 @@
"@angular/platform-browser-dynamic": "12.1.2",
"@angular/router": "12.1.2",
"bootstrap": "4.0.0-beta",
"conventional-changelog-cli": "^2.1.1",
"d3": "5",
"font-awesome": "^4.7.0",
"html2canvas": "^1.3.2",
Expand Down
39 changes: 30 additions & 9 deletions src/renderer/app/layout/layout.routing.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,6 @@ const LAYOUT_ROUTES: Routes = [
path: 'scrollbar',
loadChildren: () => import('../pages/component/scrollbar/scrollbar.module').then(m => m.ScrollbarModule)
},
{
path: 'datepicker',
loadChildren: () => import('../pages/component/datepicker/datepicker.module').then(m => m.DatepickerModule)
},
{
path: 'carousel',
loadChildren: () => import('../pages/component/carousel/carousel.module').then(m => m.CarouselComponentModule)
Expand All @@ -63,10 +59,6 @@ const LAYOUT_ROUTES: Routes = [
path: 'sortable',
loadChildren: () => import('../pages/component/sortable/sortable.module').then(m => m.SortableComponentModule)
},
{
path: 'rating',
loadChildren: () => import('../pages/component/rating/rating.module').then(m => m.RatingComponentModule)
},
{
path: 'alert',
loadChildren: () => import('../pages/component/alert/alert.module').then(m => m.AlertsComponentModule)
Expand All @@ -83,9 +75,38 @@ const LAYOUT_ROUTES: Routes = [
path: 'typeahead',
loadChildren: () => import('../pages/component/typeahead/typeahead.module').then(m => m.TypeaheadComponentModule)
},
{
path: 'accordion',
loadChildren: () => import('../pages/component/accordion/accordion.module').then(m => m.AccordionComponentModule)
},
{
path: 'collapse',
loadChildren: () => import('../pages/component/collapse/collapse.module').then(m => m.CollapseComponentModule)
},
{
path: 'popover',
loadChildren: () => import('../pages/component/popover/popover.module').then(m => m.PopoverComponentModule)
}
]
},
{
path: 'form',
children: [
{
path: 'datepicker',
loadChildren: () => import('../pages/form/datepicker/datepicker.module').then(m => m.DatepickerModule)
},
{
path: 'timepicker',
loadChildren: () => import('../pages/component/timepicker/timepicker.module').then(m => m.TimepickerComponentModule)
loadChildren: () => import('../pages/form/timepicker/timepicker.module').then(m => m.TimepickerComponentModule)
},
{
path: 'rating',
loadChildren: () => import('../pages/form/rating/rating.module').then(m => m.RatingComponentModule)
},
{
path: 'dropdown',
loadChildren: () => import('../pages/form/dropdown/dropdown.module').then(m => m.DropdownComponentModule)
}
]
},
Expand Down
32 changes: 25 additions & 7 deletions src/renderer/app/layout/navigation/navigation.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@
<li routerLinkActive="navigation__active">
<a [routerLink]="['/component/scrollbar']"><i class="fa fa-bars"></i> Scrollbar</a>
</li>
<li routerLinkActive="navigation__active">
<a [routerLink]="['/component/datepicker']"><i class="fa fa-clock-o"></i> Datepicker</a>
</li>
<li routerLinkActive="navigation__active">
<a [routerLink]="['/component/carousel']"><i class="fa fa-calculator"></i> Carousel</a>
</li>
Expand All @@ -41,9 +38,6 @@
<li routerLinkActive="navigation__active">
<a [routerLink]="['/component/sortable']"><i class="fa fa-sort"></i> Sortable</a>
</li>
<li routerLinkActive="navigation__active">
<a [routerLink]="['/component/rating']"><i class="fa fa-random"></i> Rating</a>
</li>
<li routerLinkActive="navigation__active">
<a [routerLink]="['/component/alert']"><i class="fa fa-warning"></i> Alert</a>
</li>
Expand All @@ -57,7 +51,31 @@
<a [routerLink]="['/component/typeahead']"><i class="fa fa-tty"></i> Typeahead</a>
</li>
<li routerLinkActive="navigation__active">
<a [routerLink]="['/component/timepicker']"><i class="fa fa-times-circle"></i> Timepicker</a>
<a [routerLink]="['/component/accordion']"><i class="fa fa-universal-access"></i> Accordion</a>
</li>
<li routerLinkActive="navigation__active">
<a [routerLink]="['/component/collapse']"><i class="fa fa-columns"></i> Collapse</a>
</li>
<li routerLinkActive="navigation__active">
<a [routerLink]="['/component/popover']"><i class="fa fa-podcast"></i> Popover</a>
</li>
</ul>
</li>
<li routerLinkActive="navigation__sub--active" class="navigation__sub">
<a (click)="toggleNavigationSub('Form', $event)">
<i class="zmdi zmdi-text-format"></i> Form</a>
<ul [@toggleHeight]="navigationSubState.Form">
<li routerLinkActive="navigation__active">
<a [routerLink]="['/form/timepicker']"><i class="fa fa-times-circle"></i> Timepicker</a>
</li>
<li routerLinkActive="navigation__active">
<a [routerLink]="['/form/datepicker']"><i class="fa fa-clock-o"></i> Datepicker</a>
</li>
<li routerLinkActive="navigation__active">
<a [routerLink]="['/form/rating']"><i class="fa fa-random"></i> Rating</a>
</li>
<li routerLinkActive="navigation__active">
<a [routerLink]="['/form/dropdown']"><i class="fa fa-dribbble"></i> Dropdown</a>
</li>
</ul>
</li>
Expand Down
3 changes: 2 additions & 1 deletion src/renderer/app/layout/navigation/navigation.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ export class NavigationComponent implements OnInit {
Icon: 'inactive',
Component: 'inactive',
Directive: 'inactive',
Error: 'inactive'
Error: 'inactive',
Form: 'inactive'
};

constructor(private navigationService: NavigationService) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<section class="content--row">
<header class="content__title">
<h1>Accordion</h1>
<small>This template is built using <code>ngx-bootstrap/accordion</code> and provides some usage examples</small>
</header>
<div class="card">
<div class="card-body">
<h4 class="card-title">Basic Accordion</h4>
<accordion class="accordion">
<accordion-group *ngFor="let accordion of accordions" heading="{{accordion.title}}">
{{accordion.description}}
</accordion-group>
</accordion>
</div>
</div>
<div class="card">
<div class="card-body">
<h4 class="card-title">Disable the Accordion</h4>
<h6 class="card-subtitle">Usage <code>isDisabled</code> option to disable the function</h6>
<accordion class="accordion">
<accordion-group *ngFor="let accordion of accordions" heading="{{accordion.title}}"
[isDisabled]="accordion.isDisabled">
{{accordion.description}}
</accordion-group>
</accordion>
</div>
</div>
<div class="card">
<div class="card-body">
<h4 class="card-title">Limit the number of accordions opened</h4>
<h6 class="card-subtitle">Usage <code>closeOthers</code> option to limit the number of openings</h6>
<accordion class="accordion" [closeOthers]="true">
<accordion-group *ngFor="let accordion of accordions" heading="{{accordion.title}}">
{{accordion.description}}
</accordion-group>
</accordion>
</div>
</div>
</section>
18 changes: 18 additions & 0 deletions src/renderer/app/pages/component/accordion/accordion.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import { Component, OnInit } from '@angular/core';
import { AccordionService } from '@renderer/services/component/accordion.service';
import { AccordionModel } from '@renderer/model/component/accordion.model';

@Component({
selector: 'app-component-accordion',
templateUrl: './accordion.component.html'
})
export class AccordionComponent implements OnInit {
accordions: AccordionModel[];

constructor(private accordionService: AccordionService) {
this.accordions = this.accordionService.builderMockData();
}

ngOnInit() {
}
}
28 changes: 28 additions & 0 deletions src/renderer/app/pages/component/accordion/accordion.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { BsDropdownModule } from 'ngx-bootstrap/dropdown';
import { AccordionModule } from 'ngx-bootstrap/accordion';
import { AccordionComponent } from './accordion.component';
import { AccordionService } from '@renderer/services/component/accordion.service';

const ACCORDION_ROUTES = [
{path: '', component: AccordionComponent}
];

@NgModule({
declarations: [
AccordionComponent
],
imports: [
CommonModule,
BsDropdownModule.forRoot(),
AccordionModule.forRoot(),
RouterModule.forChild(ACCORDION_ROUTES)
],
providers: [
AccordionService
]
})
export class AccordionComponentModule {
}
17 changes: 17 additions & 0 deletions src/renderer/app/pages/component/collapse/collapse.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<section class="content--row">
<header class="content__title">
<h1>Collapse</h1>
<small>This template is built using <code>ngx-bootstrap/collapse</code> and provides some usage examples</small>
</header>
<div class="card">
<div class="card-body">
<h4 class="card-title">Collapse</h4>
<button type="button" class="btn btn-primary" (click)="isCollapsed = !isCollapsed">Point I fold
</button>
<hr class="mt-4 mb-4">
<div [collapse]="isCollapsed">
I'm Collapse content
</div>
</div>
</div>
</section>
12 changes: 12 additions & 0 deletions src/renderer/app/pages/component/collapse/collapse.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { Component } from '@angular/core';

@Component({
selector: 'app-component-collapse',
templateUrl: './collapse.component.html'
})
export class CollapseComponent {
isCollapsed = false;

constructor() {
}
}
24 changes: 24 additions & 0 deletions src/renderer/app/pages/component/collapse/collapse.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { BsDropdownModule } from 'ngx-bootstrap/dropdown';
import { CollapseModule } from 'ngx-bootstrap/collapse';
import { CollapseComponent } from './collapse.component';

const COLLAPSE_ROUTES = [
{path: '', component: CollapseComponent}
];

@NgModule({
declarations: [
CollapseComponent
],
imports: [
CommonModule,
BsDropdownModule.forRoot(),
CollapseModule.forRoot(),
RouterModule.forChild(COLLAPSE_ROUTES)
]
})
export class CollapseComponentModule {
}
Loading

0 comments on commit 69589f9

Please sign in to comment.