Skip to content
This repository was archived by the owner on Mar 10, 2025. It is now read-only.

Ui tweaks + dev:db script #139

Merged
beeman merged 3 commits into from
Mar 23, 2021
Merged

Ui tweaks + dev:db script #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b3d2c91
fix: remove overflow from ui-page
beeman Mar 16, 2021
1c614af
fix: don't use an input called routerLink
beeman Mar 16, 2021
cebde13
feat: add dev:db script to the generated projects
beeman Mar 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/stack/src/schematics/init/__snapshots__/schematic-init.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2026,6 +2026,7 @@ exports[`init schematic should run successfully 4`] = `
\\"docker:build\\": \\"docker build . -t nxpm/api\\",
\\"docker:run\\": \\"docker run -it -p 8000:3000 nxpm/api\\",
\\"docker:push\\": \\"docker push nxpm/api\\",
\\"dev:db\\": \\"docker-compose up\\",
\\"postinstall\\": \\"ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points\\",
\\"e2e\\": \\"ng e2e\\"
},
Expand Down
1 change: 1 addition & 0 deletions packages/stack/src/schematics/init/schematic-init.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ export default function (options: InitSchematicSchema): Rule {
mobile: { tech: mobileTech, project: mobileName },
web: { tech: webTech, project: webName },
}),
addRunScript('dev:db', `docker-compose up`, true),
addRunScript('docker:push', `docker push ${normalizedOptions.npmScope}/${apiName}`, true),
addRunScript('docker:run', `docker run -it -p 8000:3000 ${normalizedOptions.npmScope}/${apiName}`, true),
addRunScript('docker:build', `docker build . -t ${normalizedOptions.npmScope}/${apiName}`, true),
Expand Down
10 changes: 5 additions & 5 deletions ...s/stack/src/schematics/mobile-ui-libs/__snapshots__/schematic-mobile-ui-libs.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,18 @@ exports[`mobile-ui-libs schematic should run successfully 2`] = `
@Component({
selector: 'ui-button',
template: \`
<ng-container *ngIf=\\"routerLink\\">
<ion-button [routerLink]=\\"routerLink\\" fill=\\"outline\\" [class]=\\"classes\\">{{ label }}</ion-button>
<ng-container *ngIf=\\"link\\">
<ion-button [routerLink]=\\"link\\" fill=\\"outline\\" [class]=\\"classes\\">{{ label }}</ion-button>
</ng-container>
<ng-container *ngIf=\\"!routerLink\\">
<ng-container *ngIf=\\"!link\\">
<ion-button (click)=\\"handler.emit($event)\\" [disabled]=\\"disabled\\" [type]=\\"type\\" [class]=\\"classes\\" fill=\\"outline\\">{{
label
}}</ion-button>
</ng-container>
\`,
})
export class TestUiButtonComponent {
@Input() routerLink?: string
@Input() link?: string
@Input() disabled?: boolean
@Input() label: string
@Input() type = 'button'
Expand Down Expand Up @@ -431,7 +431,7 @@ exports[`mobile-ui-libs schematic should run successfully 15`] = `
<div class=\\"\\">
{{ title }}
</div>
<ui-button [label]=\\"linkTitle\\" [routerLink]=\\"linkPath\\"></ui-button>
<ui-button [label]=\\"linkTitle\\" [link]=\\"linkPath\\"></ui-button>
</div>
\`,
})
Expand Down
8 changes: 4 additions & 4 deletions ...cs/mobile-ui-libs/files/button/ionic-angular/src/lib/__projectName__.component.ts__tmpl__
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'
@Component({
selector: 'ui-button',
template: `
<ng-container *ngIf="routerLink">
<ion-button [routerLink]="routerLink" fill="outline" [class]="classes">{{label}}</ion-button>
<ng-container *ngIf="link">
<ion-button [routerLink]="link" fill="outline" [class]="classes">{{label}}</ion-button>
</ng-container>
<ng-container *ngIf="!routerLink">
<ng-container *ngIf="!link">
<ion-button (click)="handler.emit($event)" [disabled]="disabled" [type]="type" [class]="classes" fill="outline">{{label}}</ion-button>
</ng-container>
`,
})
export class <%= classify(projectName) %>Component {
@Input() routerLink?: string
@Input() link?: string
@Input() disabled?: boolean
@Input() label: string
@Input() type = 'button'
Expand Down
2 changes: 1 addition & 1 deletion ...bile-ui-libs/files/page-header/ionic-angular/src/lib/__projectName__.component.ts__tmpl__
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { Component, Input } from '@angular/core'
<div class="">
{{ title }}
</div>
<ui-button [label]="linkTitle" [routerLink]="linkPath"></ui-button>
<ui-button [label]="linkTitle" [link]="linkPath"></ui-button>
</div>
`
})
Expand Down
2 changes: 1 addition & 1 deletion ...-__modelName__/admin-__modelName__-detail/admin-__modelName__-detail.component.ts__tmpl__
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import { Admin<%= classify(modelName) %>DetailStore } from './admin-<%= dasheriz
</div>
</div>
<div class="flex space-x-2">
<ui-button routerLink="edit" label="Edit"></ui-button>
<ui-button link="edit" label="Edit"></ui-button>
<ui-button (handler)="deleteItem(vm.item)" label="Delete"></ui-button>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion ...dmin-__modelName__/admin-__modelName__-list/admin-__modelName__-list.component.ts__tmpl__
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import { Admin<%= classify(modelName) %>ListStore } from './admin-<%= modelName
</div>
</div>
<div class="flex space-x-2">
<ui-button [routerLink]="[item?.id, 'edit']" label="Edit"></ui-button>
<ui-button [link]="[item?.id, 'edit']" label="Edit"></ui-button>
</div>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions ...files/feature/src/lib/admin-user/admin-user-detail/admin-user-detail.component.ts__tmpl__
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import { AdminUserDetailStore } from './admin-user-detail.store'
</div>
</div>
<div class="flex space-x-2">
<ui-button routerLink="password" label="Change Password"></ui-button>
<ui-button routerLink="edit" label="Edit"></ui-button>
<ui-button link="password" label="Change Password"></ui-button>
<ui-button link="edit" label="Edit"></ui-button>
</div>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions ...hematics/web-feature-dashboard/files/feature/src/lib/__projectName__.component.ts__tmpl__
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import { map } from 'rxjs/operators'
</div>
</div>
<div class="flex space-x-3">
<ui-button routerLink="/account" label="Manage Account"></ui-button>
<ui-button *ngIf="user.role == 'Admin'" routerLink="/admin" label="Admin"></ui-button>
<ui-button link="/account" label="Manage Account"></ui-button>
<ui-button *ngIf="user.role == 'Admin'" link="/admin" label="Admin"></ui-button>
</div>
</div>
</ng-container>
Expand Down
12 changes: 6 additions & 6 deletions packages/stack/src/schematics/web-ui-libs/__snapshots__/schematic-web-ui-libs.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,20 @@ exports[`web-ui-libs schematic should run successfully 2`] = `
@Component({
selector: 'ui-button',
template: \`
<ng-container *ngIf=\\"routerLink\\">
<a [routerLink]=\\"routerLink\\" [class]=\\"classes\\">
<ng-container *ngIf=\\"link\\">
<a [routerLink]=\\"link\\" [class]=\\"classes\\">
{{ label }}
</a>
</ng-container>
<ng-container *ngIf=\\"!routerLink\\">
<ng-container *ngIf=\\"!link\\">
<button (click)=\\"handler.emit($event)\\" [class]=\\"classes\\" [disabled]=\\"disabled\\" [type]=\\"type\\">
{{ label }}
</button>
</ng-container>
\`,
})
export class TestUiButtonComponent {
@Input() routerLink?: string
@Input() link?: string
@Input() disabled?: boolean
@Input() label: string
@Input() type = 'button'
Expand Down Expand Up @@ -421,7 +421,7 @@ exports[`web-ui-libs schematic should run successfully 13`] = `
</div>
</header>
<div class=\\"flex-grow h-full\\">
<div class=\\"max-w-7xl mx-auto py-3 md:py-6 lg:py-12 px-3 md:px-6 lg:px-8 h-full overflow-auto\\">
<div class=\\"max-w-7xl mx-auto py-3 md:py-6 lg:py-12 px-3 md:px-6 lg:px-8 h-full\\">
<ng-content></ng-content>
</div>
</div>
Expand Down Expand Up @@ -460,7 +460,7 @@ exports[`web-ui-libs schematic should run successfully 15`] = `
<div class=\\"text-lg font-semibold\\">
{{ title }}
</div>
<ui-button [label]=\\"linkTitle\\" [routerLink]=\\"linkPath\\"></ui-button>
<ui-button [label]=\\"linkTitle\\" [link]=\\"linkPath\\"></ui-button>
</div>
\`,
})
Expand Down
8 changes: 4 additions & 4 deletions ...chematics/web-ui-libs/files/button/bootstrap/src/lib/__projectName__.component.ts__tmpl__
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@ import { Component, EventEmitter, Input } from '@angular/core'
@Component({
selector: 'ui-button',
template: `
<ng-container *ngIf="routerLink">
<a [routerLink]="routerLink" [class]="classes">
<ng-container *ngIf="link">
<a [routerLink]="link" [class]="classes">
{{ label }}
</a>
</ng-container>
<ng-container *ngIf="!routerLink">
<ng-container *ngIf="!link">
<button (click)="click.emit($event)" [class]="classes" [disabled]="disabled" [type]="type">
{{ label }}
</button>
</ng-container>
`,
})
export class <%= classify(projectName) %>Component {
@Input() routerLink?: string
@Input() link?: string
@Input() disabled?: boolean
@Input() label: string
@Input() type = 'button'
Expand Down
8 changes: 4 additions & 4 deletions ...schematics/web-ui-libs/files/button/tailwind/src/lib/__projectName__.component.ts__tmpl__
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'
@Component({
selector: 'ui-button',
template: `
<ng-container *ngIf="routerLink">
<a [routerLink]="routerLink" [class]="classes">
<ng-container *ngIf="link">
<a [routerLink]="link" [class]="classes">
{{ label }}
</a>
</ng-container>
<ng-container *ngIf="!routerLink">
<ng-container *ngIf="!link">
<button (click)="handler.emit($event)" [class]="classes" [disabled]="disabled" [type]="type">
{{ label }}
</button>
</ng-container>
`,
})
export class <%= classify(projectName) %>Component {
@Input() routerLink?: string
@Input() link?: string
@Input() disabled?: boolean
@Input() label: string
@Input() type = 'button'
Expand Down
2 changes: 1 addition & 1 deletion ...atics/web-ui-libs/files/page-header/tailwind/src/lib/__projectName__.component.ts__tmpl__
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { Component, Input } from '@angular/core'
<div class="text-lg font-semibold">
{{ title }}
</div>
<ui-button [label]="linkTitle" [routerLink]="linkPath"></ui-button>
<ui-button [label]="linkTitle" [link]="linkPath"></ui-button>
</div>
`
})
Expand Down
2 changes: 1 addition & 1 deletion ...c/schematics/web-ui-libs/files/page/tailwind/src/lib/__projectName__.component.ts__tmpl__
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { Component, Input } from '@angular/core'
</div>
</header>
<div class="flex-grow h-full">
<div class="max-w-7xl mx-auto py-3 md:py-6 lg:py-12 px-3 md:px-6 lg:px-8 h-full overflow-auto">
<div class="max-w-7xl mx-auto py-3 md:py-6 lg:py-12 px-3 md:px-6 lg:px-8 h-full">
<ng-content></ng-content>
</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions ...schematics/web-ui-libs/files/table/bootstrap/src/lib/__projectName__.component.ts__tmpl__
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@ import { Component, EventEmitter, Input } from '@angular/core'
@Component({
selector: 'ui-button',
template: `
<ng-container *ngIf="routerLink">
<a [routerLink]="routerLink" [class]="classes">
<ng-container *ngIf="link">
<a [routerLink]="link" [class]="classes">
{{ label }}
</a>
</ng-container>
<ng-container *ngIf="!routerLink">
<ng-container *ngIf="!link">
<button (click)="click.emit($event)" [class]="classes" [disabled]="disabled" [type]="type">
{{ label }}
</button>
</ng-container>
`,
})
export class <%= classify(projectName) %>Component {
@Input() routerLink?: string
@Input() link?: string
@Input() disabled?: boolean
@Input() label: string
@Input() type = 'button'
Expand Down