From 4bfa7b12085868e39474315694cb21853624c030 Mon Sep 17 00:00:00 2001 From: Matt Raible Date: Tue, 5 Oct 2021 07:00:54 -0600 Subject: [PATCH 1/2] Formatting --- .../crud-module/files/bootstrap/__name@dasherize__-filter.ts | 2 +- .../src/crud-module/files/material/__name@dasherize__-filter.ts | 2 +- .../files/paper-dashboard/__name@dasherize__-filter.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/angular-crud/src/crud-module/files/bootstrap/__name@dasherize__-filter.ts b/angular-crud/src/crud-module/files/bootstrap/__name@dasherize__-filter.ts index dc6f57cd5..dc9a07741 100644 --- a/angular-crud/src/crud-module/files/bootstrap/__name@dasherize__-filter.ts +++ b/angular-crud/src/crud-module/files/bootstrap/__name@dasherize__-filter.ts @@ -1,3 +1,3 @@ export class <%= classify(name) %>Filter {<% for (let field of getFilterFields(model)) { %> - <%=field.name%> = '';<% } %> + <%=field.name%> = '';<% } %> } diff --git a/angular-crud/src/crud-module/files/material/__name@dasherize__-filter.ts b/angular-crud/src/crud-module/files/material/__name@dasherize__-filter.ts index dc6f57cd5..dc9a07741 100644 --- a/angular-crud/src/crud-module/files/material/__name@dasherize__-filter.ts +++ b/angular-crud/src/crud-module/files/material/__name@dasherize__-filter.ts @@ -1,3 +1,3 @@ export class <%= classify(name) %>Filter {<% for (let field of getFilterFields(model)) { %> - <%=field.name%> = '';<% } %> + <%=field.name%> = '';<% } %> } diff --git a/angular-crud/src/crud-module/files/paper-dashboard/__name@dasherize__-filter.ts b/angular-crud/src/crud-module/files/paper-dashboard/__name@dasherize__-filter.ts index dc6f57cd5..dc9a07741 100644 --- a/angular-crud/src/crud-module/files/paper-dashboard/__name@dasherize__-filter.ts +++ b/angular-crud/src/crud-module/files/paper-dashboard/__name@dasherize__-filter.ts @@ -1,3 +1,3 @@ export class <%= classify(name) %>Filter {<% for (let field of getFilterFields(model)) { %> - <%=field.name%> = '';<% } %> + <%=field.name%> = '';<% } %> } From 31a78ea69130217435164377561d51c972a4f659 Mon Sep 17 00:00:00 2001 From: Matt Raible Date: Tue, 5 Oct 2021 07:12:00 -0600 Subject: [PATCH 2/2] Fix Unknown option: '--style' when using `ng g` --- README.md | 4 ++-- angular-crud/package-lock.json | 16 ++++------------ angular-crud/src/crud-module/schema.json | 4 ++++ 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index dc88c3fd8..151596d35 100644 --- a/README.md +++ b/README.md @@ -109,10 +109,10 @@ This library supports Bootstrap, Angular Material, and Paper Dashboard templates - `--style material`: forces Angular Material templates - `--style paper-dashboard`: forces Paper Dashboard templates -You need to use the Schematics CLI to pass in this option: +For example: ```shell -npx @angular-devkit/schematics-cli angular-crud:crud-module note --style bootstrap +ng g angular-crud:crud-module note --style bootstrap ``` Paper Dashboard is the default if you don't specify a `--style` parameter and no Bootstrap or Angular Material dependencies are found in `package.json`. diff --git a/angular-crud/package-lock.json b/angular-crud/package-lock.json index eb5d27398..1afc0df72 100644 --- a/angular-crud/package-lock.json +++ b/angular-crud/package-lock.json @@ -542,20 +542,12 @@ "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" }, "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", + "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", "dev": true, "requires": { - "minimist": "0.0.8" - }, - "dependencies": { - "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true - } + "minimist": "^1.2.5" } }, "neo-async": { diff --git a/angular-crud/src/crud-module/schema.json b/angular-crud/src/crud-module/schema.json index 22c0c4176..4d8b89bdb 100644 --- a/angular-crud/src/crud-module/schema.json +++ b/angular-crud/src/crud-module/schema.json @@ -46,6 +46,10 @@ "type": "string", "default": "model.json", "description": "Model describing the crud form" + }, + "style": { + "type": "string", + "default": "paper-dashboard" } } }