Refactor plugin card

client/src/app/+admin/admin.module.ts

@@ -41,11 +41,14 @@ import {
   VideoAdminService,
   VideoListComponent
 } from './overview'
-import { PluginListInstalledComponent } from './plugins/plugin-list-installed/plugin-list-installed.component'
+import {
-import { PluginSearchComponent } from './plugins/plugin-search/plugin-search.component'
+  PluginApiService,
-import { PluginShowInstalledComponent } from './plugins/plugin-show-installed/plugin-show-installed.component'
+  PluginCardComponent,
-import { PluginsComponent } from './plugins/plugins.component'
+  PluginListInstalledComponent,
-import { PluginApiService } from './plugins/shared/plugin-api.service'
+  PluginsComponent,
+  PluginSearchComponent,
+  PluginShowInstalledComponent
+} from './plugins'
 import { JobService, LogsComponent, LogsService } from './system'
 import { DebugComponent, DebugService } from './system/debug'
 import { JobsComponent } from './system/jobs/jobs.component'
@@ -99,6 +102,7 @@ import { JobsComponent } from './system/jobs/jobs.component'
     PluginListInstalledComponent,
     PluginSearchComponent,
     PluginShowInstalledComponent,
+    PluginCardComponent,
 
     JobsComponent,
     LogsComponent,

client/src/app/+admin/plugins/index.ts

@@ -1 +1,6 @@
 export * from './plugins.component'
+export * from './shared'
+export * from './plugin-list-installed'
+export * from './plugin-search'
+export * from './plugin-show-installed'
+

client/src/app/+admin/plugins/plugin-list-installed/index.ts

@@ -0,0 +1 @@
+export * from './plugin-list-installed.component'

client/src/app/+admin/plugins/plugin-list-installed/plugin-list-installed.component.html

@@ -7,22 +7,9 @@
 </div>
 
 <div class="plugins" myInfiniteScroller (nearOfBottom)="onNearOfBottom()" [dataObservable]="onDataSubject.asObservable()">
-  <div class="card plugin" *ngFor="let plugin of plugins">
+  <ng-container *ngFor="let plugin of plugins">
-    <div class="card-body">
+    <my-plugin-card [plugin]="plugin" [version]="plugin.version" [pluginType]="pluginType">
-      <div class="first-row">
+      <div ngProjectAs="buttons">
-        <span class="plugin-name">{{ plugin.name }}</span>
-
-        <span class="plugin-version">{{ plugin.version }}</span>
-
-        <a class="plugin-icon" target="_blank" rel="noopener noreferrer" [href]="plugin.homepage" i18n-title title="Plugin homepage (new window)">
-          <my-global-icon iconName="home"></my-global-icon>
-        </a>
-
-        <a class="plugin-icon" target="_blank" rel="noopener noreferrer" [href]="getPluginOrThemeHref(plugin.name)" i18n-title title="Plugin homepage (new window)">
-          <my-global-icon iconName="npm"></my-global-icon>
-        </a>
-
-        <div class="buttons">
         <my-edit-button
           *ngIf="!isTheme(plugin)" [routerLink]="getShowRouterLink(plugin)" label="Settings" i18n-label
           [responsiveLabel]="true"
@@ -35,11 +22,6 @@
 
         <my-delete-button (click)="uninstall(plugin)" label="Uninstall" i18n-label [responsiveLabel]="true"></my-delete-button>
       </div>
-      </div>
+    </my-plugin-card>
-
+  </ng-container>
-      <div class="second-row">
-        <div class="description">{{ plugin.description }}</div>
-      </div>
-    </div>
-  </div>
 </div>

client/src/app/+admin/plugins/plugin-list-installed/plugin-list-installed.component.scss

@@ -4,3 +4,8 @@
 .update-button[disabled=true] ::ng-deep .action-button {
   cursor: default !important;
 }
+
+my-edit-button,
+my-button {
+  @include margin-right(10px);
+}

client/src/app/+admin/plugins/plugin-list-installed/plugin-list-installed.component.ts

@@ -12,7 +12,6 @@ import { PeerTubePlugin, PluginType } from '@shared/models'
   templateUrl: './plugin-list-installed.component.html',
   styleUrls: [
     '../shared/toggle-plugin-type.scss',
-    '../shared/plugin-list.component.scss',
     './plugin-list-installed.component.scss'
   ]
 })

client/src/app/+admin/plugins/plugin-search/index.ts

@@ -0,0 +1 @@
+export * from './plugin-search.component'

client/src/app/+admin/plugins/plugin-search/plugin-search.component.html

@@ -30,29 +30,17 @@
 </div>
 
 <div class="plugins" myInfiniteScroller (nearOfBottom)="onNearOfBottom()" [dataObservable]="onDataSubject.asObservable()">
-  <div class="card plugin" *ngFor="let plugin of plugins">
+  <ng-container *ngFor="let plugin of plugins" >
-    <div class="card-body">
+    <my-plugin-card [plugin]="plugin" [version]="plugin.latestVersion" [pluginType]="pluginType">
-      <div class="first-row">
+      <div ngProjectAs="badges">
-        <span class="plugin-name">{{ plugin.name }}</span>
+        <span i18n *ngIf="plugin.installed" class="badge badge-success">Installed</span>
-
-        <span class="plugin-version">{{ plugin.latestVersion }}</span>
-
-        <a class="plugin-icon" target="_blank" rel="noopener noreferrer" [href]="plugin.homepage" i18n-title title="Plugin homepage (new window)">
-          <my-global-icon iconName="home"></my-global-icon>
-        </a>
-
-        <a class="plugin-icon" target="_blank" rel="noopener noreferrer" [href]="getPluginOrThemeHref(plugin.name)" i18n-title title="Plugin npm package (new window)">
-          <my-global-icon iconName="npm"></my-global-icon>
-        </a>
-
-        <span *ngIf="plugin.installed" class="badge badge-success">Installed</span>
-
 
         <span *ngIf="plugin.official" class="badge badge-primary" i18n i18n-title title="This plugin is developed by Framasoft">
           Official
         </span>
+      </div>
 
-        <div class="buttons">
+      <div ngProjectAs="buttons">
         <my-edit-button
           *ngIf="plugin.installed === true && !isThemeSearch()" [routerLink]="getShowRouterLink(plugin)"
           label="Settings" i18n-label [responsiveLabel]="true"
@@ -64,11 +52,7 @@
           icon="cloud-download" [attr.disabled]="isInstalling(plugin)"
         ></my-button>
       </div>
-      </div>
 
-      <div class="second-row">
+    </my-plugin-card>
-        <div class="description">{{ plugin.description }}</div>
+  </ng-container>
-      </div>
-    </div>
-  </div>
 </div>

client/src/app/+admin/plugins/plugin-search/plugin-search.component.ts

@@ -11,7 +11,6 @@ import { PeerTubePluginIndex, PluginType } from '@shared/models'
   templateUrl: './plugin-search.component.html',
   styleUrls: [
     '../shared/toggle-plugin-type.scss',
-    '../shared/plugin-list.component.scss',
     './plugin-search.component.scss'
   ]
 })
@@ -115,10 +114,6 @@ export class PluginSearchComponent implements OnInit {
     return !!this.installing[plugin.npmName]
   }
 
-  getPluginOrThemeHref (name: string) {
-    return this.pluginApiService.getPluginOrThemeHref(this.pluginType, name)
-  }
-
   getShowRouterLink (plugin: PeerTubePluginIndex) {
     return [ '/admin', 'plugins', 'show', this.pluginService.nameToNpmName(plugin.name, this.pluginType) ]
   }

client/src/app/+admin/plugins/plugin-show-installed/index.ts

@@ -0,0 +1 @@
+export * from './plugin-show-installed.component'

client/src/app/+admin/plugins/shared/index.ts

@@ -0,0 +1,2 @@
+export * from './plugin-api.service'
+export * from './plugin-card.component'

client/src/app/+admin/plugins/shared/plugin-card.component.html

@@ -0,0 +1,27 @@
+<div class="card plugin">
+  <div class="card-body">
+    <div class="first-row">
+      <span class="plugin-name">{{ plugin.name }}</span>
+
+      <span class="plugin-version">{{ version }}</span>
+
+      <a class="plugin-icon" target="_blank" rel="noopener noreferrer" [href]="plugin.homepage" i18n-title title="Plugin homepage (new window)">
+        <my-global-icon iconName="home"></my-global-icon>
+      </a>
+
+      <a class="plugin-icon" target="_blank" rel="noopener noreferrer" [href]="getPluginOrThemeHref(plugin.name)" i18n-title title="Plugin homepage (new window)">
+        <my-global-icon iconName="npm"></my-global-icon>
+      </a>
+
+      <ng-content select="badges"></ng-content>
+
+      <div class="buttons">
+        <ng-content select="buttons"></ng-content>
+      </div>
+    </div>
+
+    <div class="second-row">
+      <div class="description">{{ plugin.description }}</div>
+    </div>
+  </div>
+</div>

client/src/app/+admin/plugins/shared/plugin-card.component.scss

@@ -36,11 +36,8 @@
 
   .buttons {
     @include margin-left(auto);
-    width: max-content;
 
-    > *:not(:last-child) {
+    width: max-content;
-      @include margin-right(10px);
-    }
   }
 }
 

client/src/app/+admin/plugins/shared/plugin-card.component.ts

@@ -0,0 +1,24 @@
+import { Component, Input } from '@angular/core'
+import { PeerTubePlugin, PeerTubePluginIndex, PluginType } from '@shared/models'
+import { PluginApiService } from './plugin-api.service'
+
+@Component({
+  selector: 'my-plugin-card',
+  templateUrl: './plugin-card.component.html',
+  styleUrls: [ './plugin-card.component.scss' ]
+})
+
+export class PluginCardComponent {
+  @Input() plugin: PeerTubePluginIndex | PeerTubePlugin
+  @Input() version: string
+  @Input() pluginType: PluginType
+
+  constructor (
+    private pluginApiService: PluginApiService
+  ) {
+  }
+
+  getPluginOrThemeHref (name: string) {
+    return this.pluginApiService.getPluginOrThemeHref(this.pluginType, name)
+  }
+}