From 0f3f1e08dc21608a08968f7ee147eb0eaa553528 Mon Sep 17 00:00:00 2001
From: Fergal Moran <fergal.moran@gmail.com>
Date: Sat, 12 May 2018 06:29:27 +0100
Subject: [PATCH] Most stuff appears to be working

---
 .../entry-list-item.component.css             |   4 +
 .../entry-list-item.component.html            | 110 ++++++------------
 server/Controllers/PodcastController.cs       |  11 +-
 3 files changed, 44 insertions(+), 81 deletions(-)

diff --git a/client/src/app/components/podcast/entry-list-item/entry-list-item.component.css b/client/src/app/components/podcast/entry-list-item/entry-list-item.component.css
index 3891beb..8c9c01a 100644
--- a/client/src/app/components/podcast/entry-list-item/entry-list-item.component.css
+++ b/client/src/app/components/podcast/entry-list-item/entry-list-item.component.css
@@ -6,3 +6,7 @@
 .tools-wrapper {
     margin-top: auto;
 }
+.modal-entry-image {
+    width: 64px;
+    height: 64px;
+}
diff --git a/client/src/app/components/podcast/entry-list-item/entry-list-item.component.html b/client/src/app/components/podcast/entry-list-item/entry-list-item.component.html
index 1d022e7..6fb4aac 100644
--- a/client/src/app/components/podcast/entry-list-item/entry-list-item.component.html
+++ b/client/src/app/components/podcast/entry-list-item/entry-list-item.component.html
@@ -60,81 +60,43 @@
         </div>
     </div>
 </td>
-<div class="modal fade" bsModal #entryDeleteDialog="bs-modal" tabindex="-1" role="dialog" aria-hidden="true">
-    <div class="modal-dialog modal-lg">
+<div class="modal fade" role="document" bsModal #entryDeleteDialog="bs-modal" aria-hidden="true">
+    <div class="modal-dialog">
         <div class="modal-content">
-            <div class="modal-header">
-                <h4 class="modal-title pull-left">Delete this podcast entry?</h4>
-                <button type="button" class="close pull-right" aria-label="Close" (click)="entryDeleteDialog.hide()">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
-                <button type="button" class="btn btn-primary pull-right" (click)="entryDeleteDialog.hide()">No</button>
-                <button type="button" class="btn btn-danger pull-right" (click)="deleteEntry(); entryDeleteDialog.hide()">Yes
-                </button>
+            <div class="block block-themed block-transparent mb-0">
+                <div class="block-header bg-primary-dark">
+                    <h3 class="block-title">Delete this podcast entry?</h3>
+                    <div class="block-options">
+                        <button type="button" class="btn-block-option" data-dismiss="modal" aria-label="Close" (click)="entryDeleteDialog.hide()">
+                            <i class="si si-close"></i>
+                        </button>
+                    </div>
+                </div>
+                <div class="block-content">
+                    <h3 class="mb-20">This operation cannot be undone!</h3>
+
+                    <div class="container-fluid cxt-padded bg-faded">
+                        <div class="container">
+                            <div class="row">
+                                <div class="col-md-2 text-md-left text-center">
+                                    <img class="modal-entry-image rounded-circle" [src]="entry.imageUrl" alt="Generic placeholder image">
+                                </div>
+                                <div class="col-md-10 text-md-left text-center font-w600">
+                                    {{entry.title}}
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <p class="mt-20">Deleting this entry will delete all associated audio with no opportunity to get it back. It will also
+                        be removed from any podcast applications subscribed to this feed..
+                    </p>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-alt-secondary" data-dismiss="modal" (click)="entryDeleteDialog.hide()">No</button>
+                    <button type="button" class="btn btn-alt-success" data-dismiss="modal" (click)="deleteEntry(); entryDeleteDialog.hide()">
+                        <i class="fa fa-check"></i> Yes
+                    </button>
+                </div>
             </div>
         </div>
     </div>
-</div>
-<!--
-<td class="text-center" (click)="goto(entry)">
-    <div *ngIf="entry.processingStatus === 'Accepted'">
-        <i class="fa fa-cog fa-spin fa-3x fa-fw"></i>
-    </div>
-    <div class="avatar" *ngIf="entry.processingStatus !== 'Accepted'">
-        <img [src]="entry.imageUrl" class="img-avatar img-avatar48" alt="">
-        <span class="avatar-status badge-success"></span>
-    </div>
-</td>
-<td>
-    <p class="font-w600 mb-10">
-        <inline-editor type="text" [(ngModel)]="entry.title" (onSave)="updateTitle($event)" name="title" size="32"></inline-editor>
-    </p>
-    <p class="font-w600 mb-0" [ngClass]="entry.processingStatus==='Failed' ? 'text-danger' : 'text-muted'">
-        <span>{{entry.processingStatus}}</span>| {{entry.createDate | amTimeAgo}}
-    </p>
-</td>
-<td class="d-none d-sm-table-cell">
-    <em class="text-muted">
-        <span *ngIf="entry.processingStatus === 'Accepted'" style="width: 100%">
-            <i class="fa fa-cog fa-spin fa-3x fa-fw"></i>
-        </span>
-        <span *ngIf="entry.processingStatus === 'Failed'">
-            <button class="btn btn-hero btn-lg btn-outline-success text-uppercase mb-10" (click)="retry(entry)">Retry</button>
-        </span>
-        <span *ngIf="entry.processingStatus!=='Processed' && entry.processingStatus !== 'Accepted' && entry.processingStatus !== 'Failed'"
-            style="width: 100%">
-            <div class="clearfix">
-                <div class="float-left">
-                    <strong>{{percentageProcessed}}%</strong>
-                </div>
-                <div class="float-right">
-                    <small class="text-muted">{{entry.processingStatus}}: {{currentSpeed}}</small>
-                </div>
-            </div>
-            <div class="progress progress-xs">
-                <div class="progress-bar bg-success" role="progressbar" [style.width]="percentageProcessed + '%'" [attr.aria-valuenow]="percentageProcessed"
-                    aria-valuemin="0" aria-valuemax="100"></div>
-            </div>
-        </span>
-        <span *ngIf="entry.processingStatus==='Processed'" style="width: 100%" class="mt-25">
-
-
-        </span>
-    </em>
-</td>
-<td class="text-center">
-    <div class="btn-group">
-        <button type="button" class="btn btn-sm btn-secondary" (click)="playAudio(entry.audioUrl)">
-            <i class="si  text-success" [ngClass]="playing ? 'si-control-pause' : 'si-control-play'"></i>
-        </button>
-        <button type="button" class="btn btn-sm btn-secondary" (click)="downloadAudio(entry)">
-            <i class="si si-cloud-download text-success"></i>
-        </button>
-        <button type="button" class="btn btn-sm btn-secondary" (click)="entryDeleteDialog.show()">
-            <i class="si si-close"></i>
-        </button>
-    </div>
-</td>
--->
diff --git a/server/Controllers/PodcastController.cs b/server/Controllers/PodcastController.cs
index 29c7f9a..bab8369 100644
--- a/server/Controllers/PodcastController.cs
+++ b/server/Controllers/PodcastController.cs
@@ -68,13 +68,10 @@ namespace PodNoms.Api.Controllers {
         [HttpPut]
         public async Task<IActionResult> Put([FromBody] PodcastViewModel vm) {
             if (ModelState.IsValid) {
-                var podcast = await _repository.GetAsync(vm.Id);
-                if (podcast != null) {
-                    var item = _mapper.Map<PodcastViewModel, Podcast>(vm, podcast);
-
-                    await _uow.CompleteAsync();
-                    return new OkObjectResult(_mapper.Map<Podcast, PodcastViewModel>(podcast));
-                }
+                var podcast = _mapper.Map<PodcastViewModel, Podcast>(vm);
+                _repository.AddOrUpdate(podcast);
+                await _uow.CompleteAsync();
+                return new OkObjectResult(_mapper.Map<Podcast, PodcastViewModel>(podcast));
             }
             return BadRequest("Invalid request data");
         }