Skip to content

Commit

Permalink
fix: multiple fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
evereq committed Oct 23, 2021
1 parent 81d0a47 commit 6bbdbe4
Show file tree
Hide file tree
Showing 33 changed files with 114 additions and 97 deletions.
9 changes: 7 additions & 2 deletions ever.code-workspace
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,14 @@
],
"settings": {
"typescript.tsdk": "./node_modules/typescript/lib",
"debug.node.autoAttach": "on",
"debug.node.autoAttach": "off",
"search.usePCRE2": true,
"git.ignoreLimitWarning": true,
"checkpoints.showActiveFileOnly": true,
"deepscan.enable": true,
"cSpell.words": [
"toastr"
],
"vsicons.presets.nestjs": true
}
}
}
16 changes: 10 additions & 6 deletions lerna.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
{
"lerna": "3.11.1",
"lerna": "3.13.0",
"npmClient": "yarn",
"version": "0.3.0",
"concurrency": 8,
"version": "independent",
"changelog": {
"repo": "ever-co/ever",
"cacheDir": ".changelog",
"labels": {}
},
"stream": true,
"packages": ["packages/*"],
"useWorkspaces": true,
"command": {
"bootstrap": {},
"publish": {
Expand All @@ -17,9 +19,11 @@
},
"version": {
"push": false
},
"clean": {
"yes": true
}
},
"packages": ["packages/*"],
"npmClient": "yarn",
"useWorkspaces": true
"npmClientArgs": ["--no-package-lock"],
"stream": true
}
2 changes: 1 addition & 1 deletion packages/admin-web-angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"@angular/platform-browser-dynamic": "^12.2.10",
"@angular/router": "^12.2.10",
"@asymmetrik/ngx-leaflet": "^8.1.0",
"@ever-co/angular2-wizard": "^0.5.6",
"@ever-co/angular2-wizard": "^0.6.2",
"@ever-platform/common": "file:../common",
"@ever-platform/common-angular": "file:../common-angular",
"@fortawesome/fontawesome-free": "^5.15.4",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
<form-wizard
class="form-horizontal"
[formGroup]="form"
[buttonDone]="buttonDone"
[buttonNext]="buttonNext"
[buttonPrevious]="buttonPrevious"
[doneText]="buttonDone"
[nextText]="buttonNext"
[previousText]="buttonPrevious"
>
<wizard-step
[title]="'CARRIERS_VIEW.CREATE.BASIC_INFO' | translate"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { TranslateService } from '@ngx-translate/core';
styleUrls: ['./confirmation-modal.component.scss'],
templateUrl: './confirmation-modal.component.html',
})
export class ConfimationModalComponent implements OnInit, OnDestroy {
export class ConfirmationModalComponent implements OnInit, OnDestroy {
public ngDestroy$ = new Subject<void>();

public prefix: string = 'CONFIRM_MODAL.';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { ThemeModule } from '../../@theme';
import { TranslateModule } from '@ngx-translate/core';
import { ConfimationModalComponent } from './confirmation-modal.component';
import { ConfirmationModalComponent } from './confirmation-modal.component';
import { ToasterModule } from 'angular2-toaster';
import { NbSpinnerModule, NbButtonModule } from '@nebular/theme';

const COMPONENTS = [ConfimationModalComponent];
const COMPONENTS = [ConfirmationModalComponent];

@NgModule({
imports: [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { takeUntil } from 'rxjs/operators';
import { ProductLocalesService } from '@modules/client.common.angular2/locale/product-locales.service';
import { ILocaleMember } from '@modules/server.common/interfaces/ILocale';
import { NotifyService } from '@app/@core/services/notify/notify.service';
import { ConfimationModalComponent } from '@app/@shared/confirmation-modal/confirmation-modal.component';
import { ConfirmationModalComponent } from '@app/@shared/confirmation-modal/confirmation-modal.component';
import { CategoryImageComponent } from './category-image.component';

interface ProductViewModel {
Expand Down Expand Up @@ -95,12 +95,12 @@ export class CategoriesTableComponent implements OnInit, OnDestroy {
}

async deleteCategory(e) {
const activeModal = this.modalService.open(ConfimationModalComponent, {
const activeModal = this.modalService.open(ConfirmationModalComponent, {
size: 'sm',
container: 'nb-layout',
backdrop: 'static',
});
const modalComponent: ConfimationModalComponent =
const modalComponent: ConfirmationModalComponent =
activeModal.componentInstance;

this.confirmSub$ = await modalComponent.confirmEvent
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import { ProductCategoriesComponent } from '../../../render-component/product-ca
import { ProductsCategoryService } from '../../../../@core/data/productsCategory.service';
import { NotifyService } from '@app/@core/services/notify/notify.service';
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
import { ConfimationModalComponent } from '../../../confirmation-modal/confirmation-modal.component';
import { ConfirmationModalComponent } from '../../../confirmation-modal/confirmation-modal.component';
import { ProductCheckboxComponent } from '@app/@shared/render-component/product-checkbox/product-checkbox';
import { ProductTitleComponent } from '@app/@shared/render-component/product-title/product-title.component';
import { ProductImageComponent } from '@app/@shared/render-component/product-image/product-image.component';
Expand Down Expand Up @@ -84,12 +84,12 @@ export class ProductsTableComponent implements OnInit, OnDestroy {
}

async deleteProduct(event) {
const activeModal = this.modalService.open(ConfimationModalComponent, {
const activeModal = this.modalService.open(ConfirmationModalComponent, {
size: 'sm',
container: 'nb-layout',
backdrop: 'static',
});
const modalComponent: ConfimationModalComponent =
const modalComponent: ConfirmationModalComponent =
activeModal.componentInstance;

this.confirmSub$ = await modalComponent.confirmEvent
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<div>
<form-wizard
[formGroup]="form"
[buttonDone]="buttonDone"
[buttonNext]="buttonNext"
[buttonPrevious]="buttonPrevious"
[doneText]="buttonDone"
[nextText]="buttonNext"
[previousText]="buttonPrevious"
[nbSpinner]="loading"
#formWizard
class="form-horizontal"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { ToasterService } from 'angular2-toaster';
import { ProductLocalesService } from '@modules/client.common.angular2/locale/product-locales.service';
import { ILocaleMember } from '@modules/server.common/interfaces/ILocale';
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
import { ConfimationModalComponent } from '@app/@shared/confirmation-modal/confirmation-modal.component';
import { ConfirmationModalComponent } from '@app/@shared/confirmation-modal/confirmation-modal.component';
import { OrderRouter } from '@modules/client.common.angular2/routers/order-router.service';
import { takeUntil } from 'rxjs/operators';
import { Subject } from 'rxjs';
Expand Down Expand Up @@ -75,14 +75,14 @@ export class StoreOrderProductAmountComponent
async addProduct() {
if (this.availableProducts > 0) {
const activeModal = this.modalService.open(
ConfimationModalComponent,
ConfirmationModalComponent,
{
size: 'sm',
container: 'nb-layout',
backdrop: 'static',
}
);
const modalComponent: ConfimationModalComponent =
const modalComponent: ConfirmationModalComponent =
activeModal.componentInstance;

modalComponent.mainText = 'ARE_YOU_SURE_YOU_WANT_TO_INCREASE';
Expand Down Expand Up @@ -128,14 +128,14 @@ export class StoreOrderProductAmountComponent
async removeProduct() {
if (this.productAmount >= 1) {
const activeModal = this.modalService.open(
ConfimationModalComponent,
ConfirmationModalComponent,
{
size: 'sm',
container: 'nb-layout',
backdrop: 'static',
}
);
const modalComponent: ConfimationModalComponent =
const modalComponent: ConfirmationModalComponent =
activeModal.componentInstance;

modalComponent.mainText = 'ARE_YOU_SURE_YOU_WANT_TO_DECREASE';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
<form-wizard
class="form-horizontal"
[formGroup]="form"
[buttonDone]="buttonDone"
[buttonNext]="buttonNext"
[buttonPrevious]="buttonPrevious"
[doneText]="buttonDone"
[nextText]="buttonNext"
[previousText]="buttonPrevious"
>
<wizard-step
[title]="
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
#wizzardFrom
class="form-horizontal"
[formGroup]="form"
[buttonDone]="buttonDone"
[buttonNext]="buttonNext"
[buttonPrevious]="buttonPrevious"
[doneText]="buttonDone"
[nextText]="buttonNext"
[previousText]="buttonPrevious"
[nbSpinner]="loading"
>
<wizard-step
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,10 @@ export class WarehouseProductCreateComponent implements OnInit, OnDestroy {
return this.basicInfo && this.basicInfo.valid && this.isSetp2;
}

async createProduct() {
// TODO: implement (we have same method in other component already)
}

async addProducts() {
this.loading = true;
try {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
<form-wizard
class="form-horizontal"
[formGroup]="form"
[buttonDone]="buttonDone"
[buttonNext]="buttonNext"
[buttonPrevious]="buttonPrevious"
[doneText]="buttonDone"
[nextText]="buttonNext"
[previousText]="buttonPrevious"
>
<wizard-step
[title]="'WAREHOUSE_VIEW.MUTATION.WIZARD_TITLES.BASIC_INFO' | translate"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { StatusComponent } from '../../../../@shared/render-component/invites-re
import { InvitedDateComponent } from '../../../../@shared/render-component/invites-requests/invited-date.component';
import { NotifyService } from '@app/@core/services/notify/notify.service';
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
import { ConfimationModalComponent } from '../../../../@shared/confirmation-modal/confirmation-modal.component';
import { ConfirmationModalComponent } from '../../../../@shared/confirmation-modal/confirmation-modal.component';
import { InviteViewModel } from '../invites.component';

// import { ToasterService } from 'angular2-toaster';
Expand Down Expand Up @@ -178,13 +178,13 @@ export class InvitesRequestsComponent implements OnDestroy, AfterViewChecked {
}

async deleteConfirm(e): Promise<void> {
const activeModal = this.modalService.open(ConfimationModalComponent, {
const activeModal = this.modalService.open(ConfirmationModalComponent, {
size: 'sm',
container: 'nb-layout',
backdrop: 'static',
});

const modalComponent: ConfimationModalComponent =
const modalComponent: ConfirmationModalComponent =
activeModal.componentInstance;

await modalComponent.confirmEvent
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { CountryRenderComponent } from './country-render/country-render.componen
import { TranslateService } from '@ngx-translate/core';
import { NotifyService } from '@app/@core/services/notify/notify.service';
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
import { ConfimationModalComponent } from '../../../@shared/confirmation-modal/confirmation-modal.component';
import { ConfirmationModalComponent } from '../../../@shared/confirmation-modal/confirmation-modal.component';

export interface InviteViewModel {
id: string;
Expand Down Expand Up @@ -130,12 +130,12 @@ export class InvitesComponent implements OnInit, OnDestroy, AfterViewChecked {
}

async deleteConfirm(e) {
const activeModal = this.modalService.open(ConfimationModalComponent, {
const activeModal = this.modalService.open(ConfirmationModalComponent, {
size: 'sm',
container: 'nb-layout',
backdrop: 'static',
});
const modalComponent: ConfimationModalComponent =
const modalComponent: ConfirmationModalComponent =
activeModal.componentInstance;

await modalComponent.confirmEvent
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { TranslateService } from '@ngx-translate/core';
import { Observable, forkJoin, Subject } from 'rxjs';
import { takeUntil, first } from 'rxjs/operators';
import { NotifyService } from '../../@core/services/notify/notify.service';
import { ConfimationModalComponent } from '../../@shared/confirmation-modal/confirmation-modal.component';
import { ConfirmationModalComponent } from '../../@shared/confirmation-modal/confirmation-modal.component';

@Component({
selector: 'ea-device',
Expand Down Expand Up @@ -100,12 +100,12 @@ export class DeviceComponent implements OnDestroy, OnInit {
}

async deleteDevice(e) {
const activeModal = this._modalService.open(ConfimationModalComponent, {
const activeModal = this._modalService.open(ConfirmationModalComponent, {
size: 'sm',
container: 'nb-layout',
backdrop: 'static',
});
const modalComponent: ConfimationModalComponent =
const modalComponent: ConfirmationModalComponent =
activeModal.componentInstance;

await modalComponent.confirmEvent
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { OrderRouter } from '@modules/client.common.angular2/routers/order-route
import { Router } from '@angular/router';
import { TranslateService } from '@ngx-translate/core';
import { ToasterService } from 'angular2-toaster';
import { ConfimationModalComponent } from '../../../../@shared/confirmation-modal/confirmation-modal.component';
import { ConfirmationModalComponent } from '../../../../@shared/confirmation-modal/confirmation-modal.component';
import { StoreOrderProductAmountComponent } from '../../../../@shared/render-component/store-products-table/store-order-product-amount/store-order-product-amount.component';
import { ProductTitleRedirectComponent } from '../../../../@shared/render-component/product-title-redirect/product-title-redirect.component';
import { StoreProductPriceComponent } from '../../../../@shared/render-component/store-products-table/store-product-price.component';
Expand Down Expand Up @@ -196,12 +196,12 @@ export class OrderProductsComponent implements OnInit, OnChanges, OnDestroy {
}

async cancelOrder() {
const activeModal = this.modalService.open(ConfimationModalComponent, {
const activeModal = this.modalService.open(ConfirmationModalComponent, {
size: 'sm',
container: 'nb-layout',
backdrop: 'static',
});
const modalComponent: ConfimationModalComponent =
const modalComponent: ConfirmationModalComponent =
activeModal.componentInstance;

await modalComponent.confirmEvent
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

<form-wizard
#wizardForm
[buttonDone]="buttonDone"
[buttonNext]="buttonNext"
[buttonPrevious]="buttonPrevious"
[doneText]="buttonDone"
[nextText]="buttonNext"
[previousText]="buttonPrevious"
[nbSpinner]="loading"
>
<wizard-step
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ export class WarehouseProductsViewComponent
implements OnInit, OnDestroy, OnChanges {
private _ngDestroy$ = new Subject<void>();

protected warehouseID: string;
protected topWarehouseProducts: WarehouseProduct[];
public warehouseID: string;
public topWarehouseProducts: WarehouseProduct[];

public productTitle: string;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { WarehouseRouter } from '@modules/client.common.angular2/routers/warehou
import { Subscription } from 'apollo-client/util/Observable';
import { Router } from '@angular/router';
import { NotifyService } from '../../../../@core/services/notify/notify.service';
import { ConfimationModalComponent } from '../../../../@shared/confirmation-modal/confirmation-modal.component';
import { ConfirmationModalComponent } from '../../../../@shared/confirmation-modal/confirmation-modal.component';
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
import {
WarehouseProductViewModel,
Expand Down Expand Up @@ -58,12 +58,12 @@ export class ProductsTableComponent implements OnDestroy {
}

removeProduct(ev) {
const activeModal = this.modalService.open(ConfimationModalComponent, {
const activeModal = this.modalService.open(ConfirmationModalComponent, {
size: 'sm',
container: 'nb-layout',
backdrop: 'static',
});
const modalComponent: ConfimationModalComponent =
const modalComponent: ConfirmationModalComponent =
activeModal.componentInstance;

modalComponent.confirmEvent
Expand Down
Loading

0 comments on commit 6bbdbe4

Please sign in to comment.