Merge pull request #12 from tillias/dev

merge dev to master

.travis.yml

@@ -47,10 +47,10 @@ script:
     ./mvnw -ntp clean verify &&
     ./mvnw -ntp com.github.eirslett:frontend-maven-plugin:npm -Dfrontend.npm.arguments='run test' -Dmaven.repo.local=$MAVEN_USER_HOME &&
     ./mvnw -ntp verify -Pprod -DskipTests &&
+    if [ "$BRANCH" = "master" ]; then
     docker build -t tillias/microcatalog . &&
     echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin &&
     docker push tillias/microcatalog &&
-    if [ "$BRANCH" = "master" ]; then
     ./mvnw -ntp com.heroku.sdk:heroku-maven-plugin:2.0.5:deploy-only -Pheroku -Dheroku.buildpacks=heroku/jvm -Dheroku.appName=microcatalog; fi
 
 notifications:

src/main/webapp/app/entities/microservice/microservice-dashboard/microservice-card/microservice-card.component.html

@@ -0,0 +1,32 @@
+<div class="card mb-4">
+    <div class="card-header border-0">
+        <h3 class="h3 d-inline-block">{{microservice.name}}</h3>
+        <span class="badge badge-secondary align-top">{{microservice.status?.name}}</span>
+    </div>
+    <div class="card-body">
+        <div class="d-flex flex-row mb-3">
+
+            <img [src]="microservice.imageUrl"
+                 (error)="microservice.imageUrl = '../../../../content/images/jhipster_family_member_1.svg'"
+                 alt="IMAGE"/>
+            <div class="d-flex flex-column ml-2">
+                <span class="font-weight-bold">Team: {{microservice.team?.name}}</span>
+                <span class="text-black-50">{{microservice.team?.productOwner}} (PO)</span>
+                <span class="text-black-50">{{microservice.team?.teamLead}} (TL)</span>
+            </div>
+        </div>
+        <h6>{{microservice.description}}</h6>
+
+        <div class="d-flex justify-content-between install mt-3">
+            <div>
+                <span><a href="{{microservice.gitUrl}}">GIT</a> </span>
+                <span class="px-1">|</span>
+                <span><a href="{{microservice.swaggerUrl}}">API</a> </span>
+            </div>
+            <span class="text-primary">
+                    <a [routerLink]="['/microservice', microservice.id, 'view']">Details</a>
+                    <i class="fa fa-angle-right"></i>
+                </span>
+        </div>
+    </div>
+</div>

src/main/webapp/app/entities/microservice/microservice-dashboard/microservice-card/microservice-card.component.ts

@@ -0,0 +1,15 @@
+import { Component, Input, OnInit } from '@angular/core';
+import { IMicroservice } from 'app/shared/model/microservice.model';
+
+@Component({
+  selector: 'jhi-microservice-card',
+  templateUrl: './microservice-card.component.html',
+  styleUrls: ['./microservice-card.component.scss'],
+})
+export class MicroserviceCardComponent implements OnInit {
+  @Input() microservice!: IMicroservice;
+
+  constructor() {}
+
+  ngOnInit(): void {}
+}

src/main/webapp/app/entities/microservice/microservice-dashboard/microservice-dashboard.component.html

@@ -1,36 +1,3 @@
 <div class="card-columns">
-    <div class="card mb-4" *ngFor="let microservice of microservices">
-        <div class="card-header border-0">
-            <h3>
-                <span>{{microservice.name}}</span>
-                <span class="badge badge-secondary float-right">{{microservice.status?.name}}</span>
-            </h3>
-        </div>
-        <div class="card-body">
-            <div class="d-flex flex-row mb-3">
-
-                <img [src]="microservice.imageUrl"
-                     onerror="this.src='../../../../content/images/jhipster_family_member_1.svg';" width="70"
-                     alt="IMAGE"/>
-                <div class="d-flex flex-column ml-2">
-                    <span class="font-weight-bold">Team: {{microservice.team?.name}}</span>
-                    <span class="text-black-50">{{microservice.team?.productOwner}} (PO)</span>
-                    <span class="text-black-50">{{microservice.team?.teamLead}} (TL)</span>
-                </div>
-            </div>
-            <h6>{{microservice.description}}</h6>
-
-            <div class="d-flex justify-content-between install mt-3">
-                <div>
-                    <span><a href="{{microservice.gitUrl}}">GIT</a> </span>
-                    <span class="px-1">|</span>
-                    <span><a href="{{microservice.swaggerUrl}}">API</a> </span>
-                </div>
-                <span class="text-primary">
-                    <a [routerLink]="['/microservice', microservice.id, 'view']">Details</a>
-                    <i class="fa fa-angle-right"></i>
-                </span>
-            </div>
-        </div>
-    </div>
+    <jhi-microservice-card *ngFor="let microservice of microservices" [microservice]="microservice"></jhi-microservice-card>
 </div>

src/main/webapp/app/entities/microservice/microservice-dashboard/microservice-dashboard.module.ts

@@ -2,9 +2,10 @@ import { NgModule } from '@angular/core';
 import { MicroserviceDashboardComponent } from './microservice-dashboard.component';
 import { MicrocatalogSharedModule } from '../../../shared/shared.module';
 import { RouterModule } from '@angular/router';
+import { MicroserviceCardComponent } from './microservice-card/microservice-card.component';
 
 @NgModule({
-  declarations: [MicroserviceDashboardComponent],
+  declarations: [MicroserviceDashboardComponent, MicroserviceCardComponent],
   imports: [MicrocatalogSharedModule, RouterModule],
   exports: [MicroserviceDashboardComponent],
 })