Skip to content

Commit f93ad32

Browse files
teoglteogl
committed
feat: update packerge
1 parent 38a19e8 commit f93ad32

File tree

91 files changed

+2711
-1896
lines changed

Some content is hidden

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

91 files changed

+2711
-1896
lines changed

‎README.md‎

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,3 @@
11
# Craftsjs
22

3-
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 9.0.7.
4-
5-
## Development server
6-
7-
Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
8-
9-
## Code scaffolding
10-
11-
Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.
12-
13-
## Build
14-
15-
Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `--prod` flag for a production build.
16-
17-
## Running unit tests
18-
19-
Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
20-
21-
## Running end-to-end tests
22-
23-
Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
24-
25-
## Further help
26-
27-
To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
3+
Craftsjs boilerplate

‎angular.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@
3232
"projects/craftsjs-app/src/styles/font-awesome/css/all.min.css"
3333
],
3434
"scripts": [],
35-
"preserveSymlinks": true
35+
"preserveSymlinks": true,
36+
"allowedCommonJsDependencies": [
37+
"lodash"
38+
]
3639
},
3740
"configurations": {
3841
"production": {

‎package.json‎

Lines changed: 39 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "craftsjs",
33
"version": "0.0.1",
44
"author": "craftsjs",
5-
"description": "Boilerplate",
5+
"description": "Crafts Boilerplate",
66
"license": "MIT",
77
"homepage": "https://github.com/addapptables/angular-boilerplate",
88
"scripts": {
@@ -19,23 +19,33 @@
1919
},
2020
"private": false,
2121
"dependencies": {
22-
"@angular/animations": "^9.1.0",
23-
"@angular/cdk": "^9.2.0",
24-
"@angular/common": "^9.1.0",
25-
"@angular/compiler": "^9.1.0",
26-
"@angular/core": "^9.1.0",
27-
"@angular/forms": "^9.1.0",
28-
"@angular/localize": "^9.1.0",
29-
"@angular/material": "^9.2.0",
30-
"@angular/platform-browser": "^9.1.0",
31-
"@angular/platform-browser-dynamic": "^9.1.0",
32-
"@angular/router": "^9.1.0",
22+
"@angular/animations": "^10.0.2",
23+
"@angular/cdk": "^10.0.1",
24+
"@angular/common": "^10.0.2",
25+
"@angular/compiler": "^10.0.2",
26+
"@angular/core": "^10.0.2",
27+
"@angular/forms": "^10.0.2",
28+
"@angular/localize": "^10.0.2",
29+
"@angular/material": "^10.0.1",
30+
"@angular/platform-browser": "^10.0.2",
31+
"@angular/platform-browser-dynamic": "^10.0.2",
32+
"@angular/router": "^10.0.2",
33+
"@craftsjs/alert": "^1.0.0",
34+
"@craftsjs/card": "^1.0.0",
35+
"@craftsjs/core": "^1.0.0",
36+
"@craftsjs/menu-admin": "^1.0.0",
37+
"@craftsjs/modal": "^1.0.0",
38+
"@craftsjs/ngrx-action": "^1.0.0",
39+
"@craftsjs/notifier": "^1.0.0",
40+
"@craftsjs/perfect-scrollbar": "^1.0.0",
3341
"@ngrx/effects": "^9.0.0",
3442
"@ngrx/entity": "^9.0.0",
3543
"@ngrx/router-store": "^9.0.0",
3644
"@ngrx/store": "^9.0.0",
3745
"@ngrx/store-devtools": "^9.0.0",
38-
"angular-l10n": "^9.1.0",
46+
"@ngx-translate/core": "^13.0.0",
47+
"@ngx-translate/http-loader": "^6.0.0",
48+
"lodash": "^4.17.15",
3949
"materialize-css": "^1.0.0",
4050
"moment": "^2.24.0",
4151
"ng2-file-upload": "^1.4.0",
@@ -44,32 +54,32 @@
4454
"normalize-scss": "^7.0.1",
4555
"perfect-scrollbar": "^1.5.0",
4656
"rxjs": "~6.5.4",
47-
"tslib": "^1.10.0",
57+
"tslib": "^2.0.0",
4858
"zone.js": "~0.10.2"
4959
},
5060
"devDependencies": {
51-
"@angular-devkit/build-angular": "^0.901.0",
52-
"@angular-devkit/build-ng-packagr": "^0.901.0",
53-
"@angular/cli": "^9.1.0",
54-
"@angular/compiler-cli": "^9.1.0",
55-
"@angular/language-service": "^9.1.0",
61+
"@angular-devkit/build-angular": "^0.1000.1",
62+
"@angular-devkit/build-ng-packagr": "^0.1000.1",
63+
"@angular/cli": "^10.0.1",
64+
"@angular/compiler-cli": "^10.0.2",
65+
"@angular/language-service": "^10.0.2",
5666
"@types/jasmine": "~3.5.0",
5767
"@types/jasminewd2": "~2.0.3",
58-
"@types/lodash": "^4.14.149",
68+
"@types/lodash": "4.14.157",
5969
"@types/node": "^12.11.1",
6070
"codelyzer": "^5.1.2",
6171
"jasmine-core": "~3.5.0",
62-
"jasmine-spec-reporter": "~4.2.1",
63-
"karma": "~4.3.0",
72+
"jasmine-spec-reporter": "~5.0.0",
73+
"karma": "~5.0.0",
6474
"karma-chrome-launcher": "~3.1.0",
65-
"karma-coverage-istanbul-reporter": "~2.1.0",
66-
"karma-jasmine": "~2.0.1",
67-
"karma-jasmine-html-reporter": "^1.4.2",
68-
"ng-packagr": "^9.0.0",
69-
"protractor": "~5.4.3",
75+
"karma-coverage-istanbul-reporter": "~3.0.2",
76+
"karma-jasmine": "~3.3.0",
77+
"karma-jasmine-html-reporter": "^1.5.0",
78+
"ng-packagr": "^10.0.0",
79+
"protractor": "~7.0.0",
7080
"ts-node": "~8.3.0",
71-
"tslint": "~5.18.0",
72-
"typescript": "3.8.3"
81+
"tslint": "~6.1.0",
82+
"typescript": "3.9.6"
7383
},
7484
"repository": {
7585
"type": "git",

‎projects/craftsjs-app/browserslist‎ renamed to ‎projects/craftsjs-app/.browserslistrc‎

File renamed without changes.

‎projects/craftsjs-app/e2e/tsconfig.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"extends": "../../../tsconfig.json",
2+
"extends": "../../../tsconfig.base.json",
33
"compilerOptions": {
44
"outDir": "../../../out-tsc/e2e",
55
"module": "commonjs",
6-
"target": "es5",
6+
"target": "es2018",
77
"types": [
88
"jasmine",
99
"jasminewd2",

‎projects/craftsjs-app/src/app/admin/edition/components/edition-form-modal/edition-form-modal.component.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<craftsjs-modal>
22
<modal-header>
3-
<h3 class="text-accent">{{'edition.create' | translateAsync}}</h3>
3+
<h3 class="text-accent">{{'edition.create' | translate}}</h3>
44
<button mat-icon-button (click)="close()">
55
<mat-icon suffix>close</mat-icon>
66
</button>
@@ -10,8 +10,8 @@ <h3 class="text-accent">{{'edition.create' | translateAsync}}</h3>
1010
</modal-body>
1111
<modal-footer>
1212
<button type="submit" form="edition-form" mat-raised-button color="accent" [disabled]="editionForm.loadingAction$ | async">
13-
{{'general.save' | translateAsync}}
13+
{{'general.save' | translate}}
1414
</button>
15-
<button type="button" mat-raised-button (click)="close()">{{'general.close' | translateAsync}}</button>
15+
<button type="button" mat-raised-button (click)="close()">{{'general.close' | translate}}</button>
1616
</modal-footer>
1717
</craftsjs-modal>

‎projects/craftsjs-app/src/app/admin/edition/components/edition-form/edition-form.component.html‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,50 +3,50 @@
33
<!-- name Field -->
44
<div class="col-12 col-md-6">
55
<mat-form-field>
6-
<input matInput [placeholder]="'edition.name' | translateAsync" formControlName="name" required>
6+
<input matInput [placeholder]="'edition.name' | translate" formControlName="name" required>
77
<mat-error *ngIf="formGroup.controls.name.invalid">
8-
<span *ngIf="formGroup.controls.name.errors.required">{{'general.required' | translateAsync}}</span>
8+
<span *ngIf="formGroup.controls.name.errors.required">{{'general.required' | translate}}</span>
99
</mat-error>
1010
</mat-form-field>
1111
</div>
1212

1313
<div class="col-12 col-md-6 edition-isfree">
14-
<mat-checkbox #isFree formControlName="isFree" (change)="changeIsFree($event)">{{'edition.isFree' | translateAsync}}</mat-checkbox>
14+
<mat-checkbox #isFree formControlName="isFree" (change)="changeIsFree($event)">{{'edition.isFree' | translate}}</mat-checkbox>
1515
</div>
1616

1717
<div formGroupName="groupEdition" class="col-12" *ngIf="!(isFree$ | async)">
1818
<div class="row">
1919
<!-- price Field -->
2020
<div class="col-12 col-md-6">
2121
<mat-form-field class="form-full-width">
22-
<input type="number" matInput [placeholder]="'edition.price' | translateAsync" formControlName="price" required>
22+
<input type="number" matInput [placeholder]="'edition.price' | translate" formControlName="price" required>
2323
<mat-error *ngIf="formGroup.controls.groupEdition.get('price').invalid">
24-
<span *ngIf="formGroup.controls.groupEdition.get('price').errors.required">{{'general.required' | translateAsync}}</span>
24+
<span *ngIf="formGroup.controls.groupEdition.get('price').errors.required">{{'general.required' | translate}}</span>
2525
</mat-error>
2626
</mat-form-field>
2727
</div>
2828

2929
<!-- editionType Field -->
3030
<div class="col-12 col-md-6">
3131
<mat-form-field class="form-full-width">
32-
<app-edition-type-pay-select [placeholder]="'edition.editionType' | translateAsync" formControlName="editionType" required></app-edition-type-pay-select>
32+
<app-edition-type-pay-select [placeholder]="'edition.editionType' | translate" formControlName="editionType" required></app-edition-type-pay-select>
3333
<mat-error *ngIf="formGroup.controls.groupEdition.get('editionType').invalid">
34-
<span *ngIf="formGroup.controls.groupEdition.get('editionType').errors.required">{{'general.required' | translateAsync}}</span>
34+
<span *ngIf="formGroup.controls.groupEdition.get('editionType').errors.required">{{'general.required' | translate}}</span>
3535
</mat-error>
3636
</mat-form-field>
3737
</div>
3838

3939
<!-- trialDayCount Field -->
4040
<div class="col-12 col-md-6">
4141
<mat-form-field class="form-full-width">
42-
<input type="number" matInput [placeholder]="'edition.trialDayCount' | translateAsync" formControlName="trialDayCount">
42+
<input type="number" matInput [placeholder]="'edition.trialDayCount' | translate" formControlName="trialDayCount">
4343
</mat-form-field>
4444
</div>
4545

4646
<!-- numberOfUsers Field -->
4747
<div class="col-12 col-md-6">
4848
<mat-form-field class="form-full-width">
49-
<input type="number" matInput [placeholder]="'edition.numberOfUsers' | translateAsync" formControlName="numberOfUsers">
49+
<input type="number" matInput [placeholder]="'edition.numberOfUsers' | translate" formControlName="numberOfUsers">
5050
</mat-form-field>
5151
</div>
5252
</div>

‎projects/craftsjs-app/src/app/admin/edition/components/edition-layout/edition-layout.component.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
<card>
1+
<craftsjs-card>
22
<card-header>
33
<card-header-oval>
44
<card-title>
55
<mat-icon suffix>library_books</mat-icon>
6-
<h4>{{'edition.title' | translateAsync}}</h4>
6+
<h4>{{'edition.title' | translate}}</h4>
77
</card-title>
88
</card-header-oval>
99
<card-header-subtitle *ngIf="'Page.Edition.Create' | isGranted">
1010
<button type="button" color="accent" mat-raised-button (click)="createEdition()">
1111
<mat-icon suffix>add</mat-icon>
12-
{{'edition.create' | translateAsync}}
12+
{{'edition.create' | translate}}
1313
</button>
1414
</card-header-subtitle>
1515
</card-header>
1616
<card-body>
1717
<app-edition-list></app-edition-list>
1818
</card-body>
19-
</card>
19+
</craftsjs-card>

‎projects/craftsjs-app/src/app/admin/edition/components/edition-list/edition-list.component.html‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<!-- Actions Column -->
99
<ng-container matColumnDef="actions">
1010
<mat-header-cell *matHeaderCellDef>
11-
{{'general.actions' | translateAsync}}
11+
{{'general.actions' | translate}}
1212
</mat-header-cell>
1313
<mat-cell class="text-light-gray" *matCellDef="let edition">
1414
<button mat-icon-button (click)="editEdition(edition)" *ngIf="'Page.Edition.Update' | isGranted">
@@ -22,21 +22,21 @@
2222

2323
<!-- name Column -->
2424
<ng-container matColumnDef="name">
25-
<mat-header-cell *matHeaderCellDef>{{'edition.name' | translateAsync}}</mat-header-cell>
26-
<mat-cell *matCellDef="let edition" title="{{'edition.name' | translateAsync}}"> {{edition.name}} </mat-cell>
25+
<mat-header-cell *matHeaderCellDef>{{'edition.name' | translate}}</mat-header-cell>
26+
<mat-cell *matCellDef="let edition" title="{{'edition.name' | translate}}"> {{edition.name}} </mat-cell>
2727
</ng-container>
2828
<!-- name Column -->
2929

3030
<!-- isFree Column -->
3131
<ng-container matColumnDef="isFree">
32-
<mat-header-cell *matHeaderCellDef>{{'edition.isFree' | translateAsync}}</mat-header-cell>
33-
<mat-cell *matCellDef="let edition" title="{{'edition.isFree' | translateAsync}}">
32+
<mat-header-cell *matHeaderCellDef>{{'edition.isFree' | translate}}</mat-header-cell>
33+
<mat-cell *matCellDef="let edition" title="{{'edition.isFree' | translate}}">
3434
<ng-container [ngSwitch]="edition.isFree">
3535
<span *ngSwitchCase="true">
36-
{{'general.yes' | translateAsync}}
36+
{{'general.yes' | translate}}
3737
</span>
3838
<span *ngSwitchCase="false">
39-
{{'general.no' | translateAsync}}
39+
{{'general.no' | translate}}
4040
</span>
4141
</ng-container>
4242
</mat-cell>
@@ -45,24 +45,24 @@
4545

4646
<!-- price Column -->
4747
<ng-container matColumnDef="price">
48-
<mat-header-cell *matHeaderCellDef>{{'edition.price' | translateAsync}}</mat-header-cell>
49-
<mat-cell *matCellDef="let edition" title="{{'edition.price' | translateAsync}}"> {{edition.price | number: '1.'}} </mat-cell>
48+
<mat-header-cell *matHeaderCellDef>{{'edition.price' | translate}}</mat-header-cell>
49+
<mat-cell *matCellDef="let edition" title="{{'edition.price' | translate}}"> {{edition.price | number: '1.'}} </mat-cell>
5050
</ng-container>
5151
<!-- price Column -->
5252

5353
<!-- editionType Column -->
5454
<ng-container matColumnDef="editionType">
55-
<mat-header-cell *matHeaderCellDef>{{'edition.editionType' | translateAsync}}</mat-header-cell>
56-
<mat-cell *matCellDef="let edition" title="{{'edition.editionType' | translateAsync}}">
55+
<mat-header-cell *matHeaderCellDef>{{'edition.editionType' | translate}}</mat-header-cell>
56+
<mat-cell *matCellDef="let edition" title="{{'edition.editionType' | translate}}">
5757
<ng-container [ngSwitch]="edition.editionType">
5858
<span *ngSwitchCase="1">
59-
{{'general.monthly' | translateAsync}}
59+
{{'general.monthly' | translate}}
6060
</span>
6161
<span *ngSwitchCase="2">
62-
{{'general.biannual' | translateAsync}}
62+
{{'general.biannual' | translate}}
6363
</span>
6464
<span *ngSwitchCase="3">
65-
{{'general.annual' | translateAsync}}
65+
{{'general.annual' | translate}}
6666
</span>
6767
</ng-container>
6868
</mat-cell>
@@ -71,15 +71,15 @@
7171

7272
<!-- trialDayCount Column -->
7373
<ng-container matColumnDef="trialDayCount">
74-
<mat-header-cell *matHeaderCellDef>{{'edition.trialDayCount' | translateAsync}}</mat-header-cell>
75-
<mat-cell *matCellDef="let edition" title="{{'edition.trialDayCount' | translateAsync}}"> {{edition.trialDayCount}} </mat-cell>
74+
<mat-header-cell *matHeaderCellDef>{{'edition.trialDayCount' | translate}}</mat-header-cell>
75+
<mat-cell *matCellDef="let edition" title="{{'edition.trialDayCount' | translate}}"> {{edition.trialDayCount}} </mat-cell>
7676
</ng-container>
7777
<!-- trialDayCount Column -->
7878

7979
<!-- numberOfUsers Column -->
8080
<ng-container matColumnDef="numberOfUsers">
81-
<mat-header-cell *matHeaderCellDef>{{'edition.numberOfUsers' | translateAsync}}</mat-header-cell>
82-
<mat-cell *matCellDef="let edition" title="{{'edition.numberOfUsers' | translateAsync}}"> {{edition.numberOfUsers}} </mat-cell>
81+
<mat-header-cell *matHeaderCellDef>{{'edition.numberOfUsers' | translate}}</mat-header-cell>
82+
<mat-cell *matCellDef="let edition" title="{{'edition.numberOfUsers' | translate}}"> {{edition.numberOfUsers}} </mat-cell>
8383
</ng-container>
8484
<!-- numberOfUsers Column -->
8585

‎projects/craftsjs-app/src/app/admin/edition/services/edition-action.service.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ export class EditionActionService extends ActionBaseService {
2222

2323
deleteEdition(edition: EditionDto) {
2424
this.delete(
25-
this._translateService.translate('general.delete'),
26-
this._translateService.translate('edition.areYouSure', { title: edition.name }),
25+
this._translateService.instant('general.delete'),
26+
this._translateService.instant('edition.areYouSure', { title: edition.name }),
2727
EditionActions.deleteEdition({ payload: { id: edition.id } })
2828
);
2929
}

0 commit comments

Comments
 (0)