Skip to content

Commit

Permalink
upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
abadakhshan committed Nov 23, 2020
1 parent 98a0df4 commit 2b3bd90
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 31 deletions.
38 changes: 19 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@
},
"private": true,
"dependencies": {
"@angular/animations": "~10.2.1",
"@angular/cdk": "~10.2.6",
"@angular/common": "~10.2.1",
"@angular/compiler": "~10.2.1",
"@angular/core": "~10.2.1",
"@angular/flex-layout": "~10.0.0-beta.32",
"@angular/forms": "~10.2.1",
"@angular/material": "~10.2.6",
"@angular/platform-browser": "~10.2.1",
"@angular/platform-browser-dynamic": "~10.2.1",
"@angular/router": "~10.2.1",
"@angular/animations": "~11.0.1",
"@angular/cdk": "~11.0.0",
"@angular/common": "~11.0.1",
"@angular/compiler": "~11.0.1",
"@angular/core": "~11.0.1",
"@angular/flex-layout": "~11.0.0-beta.33",
"@angular/forms": "~11.0.1",
"@angular/material": "~11.0.0",
"@angular/platform-browser": "~11.0.1",
"@angular/platform-browser-dynamic": "~11.0.1",
"@angular/router": "~11.0.1",
"@aspnet/signalr": "^1.1.4",
"@fortawesome/fontawesome-free": "^5.15.1",
"@nebular/eva-icons": "^6.2.1",
Expand All @@ -35,7 +35,7 @@
"eva-icons": "^1.1.3",
"localforage": "^1.9.0",
"lodash": "^4.17.20",
"material-community-components": "^9.0.3",
"material-community-components": "^10.0.0",
"@narik/app-core": "^4.0.1",
"@narik/client-storage": "^4.0.1",
"@narik/common": "^4.0.1",
Expand All @@ -53,18 +53,18 @@
"rxjs": "~6.6.3",
"tslib": "^2.0.3",
"typeface-exo": "^1.1.13",
"zone.js": "~0.11.2"
"zone.js": "~0.11.3"
},
"devDependencies": {
"@angular-builders/custom-webpack": "^10.0.1",
"@angular-devkit/build-angular": "~0.1002.0",
"@angular/cli": "~10.2.0",
"@angular/compiler-cli": "~10.2.1",
"@angular/language-service": "~10.2.1",
"@angular-devkit/build-angular": "~0.1100.2",
"@angular/cli": "~11.0.2",
"@angular/compiler-cli": "~11.0.1",
"@angular/language-service": "~11.0.1",
"@narik/webpack-tools": "4.1.0",
"@types/jasmine": "~3.6.0",
"@types/jasmine": "~3.6.1",
"@types/jasminewd2": "~2.0.8",
"@types/node": "^14.14.6",
"@types/node": "^14.14.8",
"cheerio": "^1.0.0-rc.3",
"codelyzer": "^6.0.1",
"jasmine-core": "~3.6.0",
Expand Down
6 changes: 3 additions & 3 deletions proxy.config.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"/api": {
"target": "http://localhost:53517/",
"target": "http://185.2.100.176:1166",
"secure": false
},
"/odata": {
"target": "http://localhost:53517/",
"target": "http://185.2.100.176:1166",
"secure": false
},
"/signalr": {
"target": "http://localhost:53517",
"target": "http://185.2.100.176:1166",
"secure": false
}
}
11 changes: 5 additions & 6 deletions src/app/layouts/edit-layout.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<narik-busy-indicator>
<narik-mat-toolbar toolbarKey="{{config && config.toolbarKey ? config.toolbarKey : 'editToolBar'}}"> </narik-mat-toolbar>
<narik-mat-toolbar
toolbarKey="{{config && config.toolbarKey ? config.toolbarKey : 'editToolBar'}}"
>
</narik-mat-toolbar>
<mat-card>
<form
#form="ngForm"
novalidate
name="frmEdit"
>
<form #form="ngForm" novalidate name="frmEdit">
<div narik-section="formContent"></div>
</form>
</mat-card>
Expand Down
13 changes: 10 additions & 3 deletions src/app/layouts/list-layout.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
<narik-busy-indicator>
<narik-mat-toolbar toolbarKey="{{config && config.toolbarKey ? config.toolbarKey : 'listToolBar'}}"></narik-mat-toolbar>
<narik-data-table [fields]="fields" [pagingInfo]="config?.pagingInfo" [dataSource]="dataSource"
<narik-mat-toolbar
toolbarKey="{{config && config.toolbarKey ? config.toolbarKey : 'listToolBar'}}"
></narik-mat-toolbar>
<narik-data-table
[fields]="fields"
[pagingInfo]="config?.pagingInfo"
[dataSource]="dataSource"
selectMode="Multiple"
(rowDoubleClick)="editEntity($event)"
(rowCommandClick)="rowCommandClick($event)"
[rowCommands]="config?.rowCommands"
[rowCommandType]="config?.rowCommandType"
[(selectedItem)]="selectedEntity" [(selectedItems)]="selectedItems">
[(selectedItem)]="selectedEntity"
[(selectedItems)]="selectedItems"
>
</narik-data-table>
</narik-busy-indicator>

0 comments on commit 2b3bd90

Please sign in to comment.