diff options
4 files changed, 77 insertions, 72 deletions
diff --git a/cds-ui/client/package.json b/cds-ui/client/package.json index 158a822b8..796bf3aa6 100644 --- a/cds-ui/client/package.json +++ b/cds-ui/client/package.json @@ -1,61 +1,62 @@ { - "name": "cds-ui", - "version": "0.0.0", - "scripts": { - "ng": "ng", - "start": "ng serve", - "build": "ng build", - "test": "ng test", - "lint": "ng lint", - "e2e": "ng e2e" - }, - "private": true, - "dependencies": { - "@angular/animations": "~7.1.0", - "@angular/cdk": "^7.1.1", - "@angular/common": "~7.1.0", - "@angular/compiler": "~7.1.0", - "@angular/core": "~7.1.0", - "@angular/forms": "~7.1.0", - "@angular/material": "^7.1.1", - "@angular/platform-browser": "~7.1.0", - "@angular/platform-browser-dynamic": "~7.1.0", - "@angular/router": "~7.1.0", - "@material/chips": "^0.43.0", - "@ngrx/core": "^1.2.0", - "@ngrx/effects": "^6.1.2", - "@ngrx/router-store": "^6.1.2", - "@ngrx/store": "^6.1.2", - "@ngrx/store-devtools": "^6.1.2", - "@types/d3": "^5.7.0", - "core-js": "^2.5.4", - "d3": "^5.9.1", - "font-awesome": "^4.7.0", - "hammerjs": "^2.0.8", - "material-design-icons": "^3.0.1", - "rxjs": "~6.3.3", - "tslib": "^1.9.0", - "zone.js": "~0.8.26" - }, - "devDependencies": { - "@angular-devkit/build-angular": "~0.11.0", - "@angular/cli": "~7.1.0", - "@angular/compiler-cli": "~7.1.0", - "@angular/language-service": "~7.1.0", - "@types/node": "~8.9.4", - "@types/jasmine": "~2.8.8", - "@types/jasminewd2": "~2.0.3", - "codelyzer": "~4.5.0", - "jasmine-core": "~2.99.1", - "jasmine-spec-reporter": "~4.2.1", - "karma": "~3.1.1", - "karma-chrome-launcher": "~2.2.0", - "karma-coverage-istanbul-reporter": "~2.0.1", - "karma-jasmine": "~1.1.2", - "karma-jasmine-html-reporter": "^0.2.2", - "protractor": "~5.4.0", - "ts-node": "~7.0.0", - "tslint": "~5.11.0", - "typescript": "~3.1.6" - } -} + "name": "cds-ui", + "version": "0.0.0", + "scripts": { + "ng": "ng", + "start": "ng serve", + "build": "ng build", + "test": "ng test", + "lint": "ng lint", + "e2e": "ng e2e" + }, + "private": true, + "dependencies": { + "@angular/animations": "7.1.0", + "@angular/cdk": "^7.1.1", + "@angular/common": "7.1.0", + "@angular/compiler": "7.1.0", + "@angular/core": "7.1.0", + "@angular/forms": "7.1.0", + "@angular/material": "^7.1.1", + "@angular/platform-browser": "7.1.0", + "@angular/platform-browser-dynamic": "7.1.0", + "@angular/router": "7.1.0", + "@material/chips": "^0.43.0", + "@ngrx/core": "^1.2.0", + "@ngrx/effects": "^6.1.2", + "@ngrx/router-store": "^6.1.2", + "@ngrx/store": "^6.1.2", + "@ngrx/store-devtools": "^6.1.2", + "@types/d3": "^5.7.0", + "core-js": "^2.5.4", + "d3": "^5.9.1", + "font-awesome": "^4.7.0", + "hammerjs": "^2.0.8", + "material-design-icons": "^3.0.1", + "ng2-ace-editor": "^0.3.9", + "rxjs": "6.3.3", + "tslib": "^1.9.0", + "zone.js": "0.8.26" + }, + "devDependencies": { + "@angular-devkit/build-angular": "0.11.0", + "@angular/cli": "7.1.0", + "@angular/compiler-cli": "7.1.0", + "@angular/language-service": "7.1.0", + "@types/node": "8.9.4", + "@types/jasmine": "2.8.8", + "@types/jasminewd2": "2.0.3", + "codelyzer": "4.5.0", + "jasmine-core": "2.99.1", + "jasmine-spec-reporter": "4.2.1", + "karma": "3.1.1", + "karma-chrome-launcher": "2.2.0", + "karma-coverage-istanbul-reporter": "2.0.1", + "karma-jasmine": "1.1.2", + "karma-jasmine-html-reporter": "^0.2.2", + "protractor": "5.4.0", + "ts-node": "7.0.0", + "tslint": "5.11.0", + "typescript": "3.1.6" + } +}
\ No newline at end of file diff --git a/cds-ui/client/src/app/feature-modules/blueprint/select-template/select-template.component.html b/cds-ui/client/src/app/feature-modules/blueprint/select-template/select-template.component.html index a9c604224..f0a38324b 100644 --- a/cds-ui/client/src/app/feature-modules/blueprint/select-template/select-template.component.html +++ b/cds-ui/client/src/app/feature-modules/blueprint/select-template/select-template.component.html @@ -21,25 +21,29 @@ limitations under the License. <mat-vertical-stepper linear> <mat-step [stepControl]="step1FormGroup"> <ng-template matStepLabel>Choose CBA Template file</ng-template> - <app-template-options></app-template-options> - <br> - <div> - <button mat-button matStepperNext class="matStepNextBtn">Proceed</button> + <div class="matStepContent"> + <app-template-options></app-template-options> + <br> + <div> + <button mat-button matStepperNext class="matStepNextBtn">Proceed</button> + </div> </div> </mat-step> <mat-step [stepControl]="step2FormGroup"> <ng-template matStepLabel>Browse CBA Template file</ng-template> - <app-search-template (cbaFile)="fileChange($event)"></app-search-template> - <br> - <div> - <button mat-button matStepperNext class="matStepNextBtn">Upload</button> + <div class="matStepContent"> + <app-search-template (cbaFile)="fileChange($event)"></app-search-template> + <!-- <div> + <button mat-button matStepperNext class="matStepNextBtn">Upload</button> + </div>--> </div> </mat-step> <mat-step [stepControl]="step3FormGroup"> <ng-template matStepLabel>Enter Metadata details</ng-template> - <app-metadata (metadataform)="metaDataDetail($event)"></app-metadata> - <br> + <div class="matStepContent"> + <app-metadata (metadataform)="metaDataDetail($event)"></app-metadata> + </div> </mat-step> </mat-vertical-stepper> <button mat-button matStepperNext class="matStepNextBtn" (click)="saveBlueprintModel()">Next</button>
\ No newline at end of file diff --git a/cds-ui/client/src/app/feature-modules/blueprint/select-template/select-template.component.scss b/cds-ui/client/src/app/feature-modules/blueprint/select-template/select-template.component.scss index c0e3dfb99..64c816477 100644 --- a/cds-ui/client/src/app/feature-modules/blueprint/select-template/select-template.component.scss +++ b/cds-ui/client/src/app/feature-modules/blueprint/select-template/select-template.component.scss @@ -27,7 +27,7 @@ limitations under the License. margin-bottom: 5px; } -.matStep { +.matStepContent { margin-top: 15px !important; margin-bottom: 20px !important; } diff --git a/cds-ui/client/src/app/feature-modules/blueprint/select-template/select-template.component.ts b/cds-ui/client/src/app/feature-modules/blueprint/select-template/select-template.component.ts index 091dd35b2..431b734e9 100644 --- a/cds-ui/client/src/app/feature-modules/blueprint/select-template/select-template.component.ts +++ b/cds-ui/client/src/app/feature-modules/blueprint/select-template/select-template.component.ts @@ -40,7 +40,7 @@ export class SelectTemplateComponent implements OnInit { importModel: IImportModel; constructor(private store: Store<IBlueprintState>) { - this.importModel.file = ''; + // this.importModel.file = ''; } ngOnInit() { |