From f7d951d95e242725df71b335a3fce0405daf95d4 Mon Sep 17 00:00:00 2001 From: Lorenz Hilpert Date: Fri, 10 Jul 2020 13:04:20 +0200 Subject: [PATCH] Added Prettier and Husky --- .prettierignore | 10 ++++++ .prettierrc.json | 5 +++ display-addressee-dto.d.ts | 17 ---------- .../src/lib/oms/models/display-order-dto.ts | 32 ------------------- package.json | 10 ++++-- prod | 0 6 files changed, 22 insertions(+), 52 deletions(-) create mode 100644 .prettierignore create mode 100644 .prettierrc.json delete mode 100644 display-addressee-dto.d.ts delete mode 100644 libs/swagger/src/lib/oms/models/display-order-dto.ts delete mode 100644 prod diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 000000000..97b170394 --- /dev/null +++ b/.prettierignore @@ -0,0 +1,10 @@ +# Add files here to ignore them from prettier formatting + +/dist +/coverage +/helmvalues +/apps/swagger +/ng-swagger-gen + +*.json +*.yml diff --git a/.prettierrc.json b/.prettierrc.json new file mode 100644 index 000000000..cb3325358 --- /dev/null +++ b/.prettierrc.json @@ -0,0 +1,5 @@ +{ + "singleQuote": true, + "printWidth": 140 + } + \ No newline at end of file diff --git a/display-addressee-dto.d.ts b/display-addressee-dto.d.ts deleted file mode 100644 index 415a777b4..000000000 --- a/display-addressee-dto.d.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { Gender } from './dist/swagger/oms/lib/models/gender'; -import { OrganisationDTO } from './dist/swagger/oms/lib/models/organisation-dto'; -import { AddressDTO } from './dist/swagger/oms/lib/models/address-dto'; -import { CommunicationDetailsDTO } from './dist/swagger/oms/lib/models/communication-details-dto'; -import { ExternalReferenceDTO } from './dist/swagger/oms/lib/models/external-reference-dto'; -export interface DisplayAddresseeDTO { - number?: string; - locale?: string; - gender: Gender; - title?: string; - firstName?: string; - lastName?: string; - organisation?: OrganisationDTO; - address?: AddressDTO; - communicationDetails?: CommunicationDetailsDTO; - externalReference?: ExternalReferenceDTO; -} diff --git a/libs/swagger/src/lib/oms/models/display-order-dto.ts b/libs/swagger/src/lib/oms/models/display-order-dto.ts deleted file mode 100644 index f1f1cf336..000000000 --- a/libs/swagger/src/lib/oms/models/display-order-dto.ts +++ /dev/null @@ -1,32 +0,0 @@ -/* tslint:disable */ -import { EntityDTOOfDisplayOrderDTOAndIOrder } from './entity-dtoof-display-order-dtoand-iorder'; -import { DisplayAddresseeDTO } from './display-addressee-dto'; -import { OrderType } from './order-type'; -import { DisplayBranchDTO } from './display-branch-dto'; -import { DisplayOrderItemDTO } from './display-order-item-dto'; -import { EnvironmentChannel } from './environment-channel'; -import { DisplayOrderPaymentDTO } from './display-order-payment-dto'; -import { TermsOfDeliveryDTO } from './terms-of-delivery-dto'; -import { NotificationChannel } from './notification-channel'; -export interface DisplayOrderDTO extends EntityDTOOfDisplayOrderDTOAndIOrder { - shippingAddress?: DisplayAddresseeDTO; - orderType: OrderType; - orderNumber?: string; - orderDate?: string; - orderBranch?: DisplayBranchDTO; - completedDate?: string; - items?: Array; - buyerNumber?: string; - buyer?: DisplayAddresseeDTO; - buyerComment?: string; - clientChannel?: EnvironmentChannel; - targetBranch?: DisplayBranchDTO; - payerNumber?: string; - payer?: DisplayAddresseeDTO; - payment?: DisplayOrderPaymentDTO; - termsOfDelivery?: TermsOfDeliveryDTO; - notificationChannels?: NotificationChannel; - orderValue?: number; - orderValueCurrency?: string; - itemsCount?: number; -} diff --git a/package.json b/package.json index f1e82f576..074f407e3 100644 --- a/package.json +++ b/package.json @@ -34,9 +34,10 @@ "gen:swagger:print": "ng-swagger-gen --config ng-swagger-gen/print.json", "gen:swagger:eis": "ng-swagger-gen --config ng-swagger-gen/eis.json" }, - "prettier": { - "singleQuote": true, - "printWidth": 140 + "husky": { + "hooks": { + "pre-commit": "pretty-quick --staged" + } }, "private": true, "dependencies": { @@ -103,6 +104,7 @@ "@types/jasminewd2": "~2.0.3", "@types/node": "~8.9.4", "codelyzer": "~4.5.0", + "husky": "^4.2.3", "jasmine-core": "~2.99.1", "jasmine-marbles": "^0.6.0", "jasmine-spec-reporter": "~4.2.1", @@ -115,6 +117,8 @@ "ng-swagger-gen": "^1.5.0", "ngrx-store-freeze": "^0.2.4", "npm-run-all": "^4.1.5", + "prettier": "2.0.1", + "pretty-quick": "^2.0.1", "protractor": "~5.4.0", "ts-node": "~7.0.0", "tsickle": "^0.34.3", diff --git a/prod b/prod deleted file mode 100644 index e69de29bb..000000000