diff --git a/src/app/models/Episode.php b/src/app/models/Episode.php index 37eb6738e56fa95f0f8ea5698685d33c728e52e4..3f6e4c2a492afd3182cf697df16652dd86e97778 100644 --- a/src/app/models/Episode.php +++ b/src/app/models/Episode.php @@ -50,7 +50,7 @@ class Episode { } public function findByIdEpisodeDetail($episode_id) { - $query = "SELECT episodes.episode_id, podcasts.podcast_id, podcasts.title AS podcast_title, episodes.category_id, episodes.image_url, episodes.title, episodes.duration, episodes.created_at, episodes.description, podcasts.image_url AS creator_img, podcasts.creator_name, episodes.audio_url FROM episodes, podcasts WHERE episodes.podcast_id = podcasts.podcast_id and episode_id = $episode_id"; + $query = "SELECT episodes.episode_id, podcasts.podcast_id, podcasts.title AS podcast_title, podcasts.image_url AS podcast_img, episodes.category_id, episodes.image_url, episodes.title, episodes.duration, episodes.created_at, episodes.description, podcasts.image_url AS creator_img, podcasts.creator_name, episodes.audio_url FROM episodes, podcasts WHERE episodes.podcast_id = podcasts.podcast_id and episode_id = $episode_id"; $this->db->query($query); $result = $this->db->fetchAll(); return $result; diff --git a/src/app/views/components/privates/episode/episode_detail.php b/src/app/views/components/privates/episode/episode_detail.php index 06adb5d91b18b851d25851fa364005ba8007c015..8944b7e3cf3ad59163f0f2f1b6d2754d2ce316d0 100644 --- a/src/app/views/components/privates/episode/episode_detail.php +++ b/src/app/views/components/privates/episode/episode_detail.php @@ -9,7 +9,7 @@ function episode_detail($episode = null) $upload_date = $episode ? formatDate($episode->created_at) : ''; $description = $episode ? $episode->description : ''; - $creator_img = $episode ? Storage::getFileUrl(Storage::EPISODE_IMAGE_PATH, $episode->creator_img) : ''; + $creator_img = $episode->podcast_img ? Storage::getFileUrl(Storage::EPISODE_IMAGE_PATH, $episode->creator_img) : IMAGES_DIR . "podcast-template.png"; $podcast_title = $episode ? $episode->podcast_title : ''; $audio_file = $episode->audio_url ? Storage::getFileUrl(Storage::EPISODE_AUDIO_PATH, $episode->audio_url) : "/src/public/assets/audio/spotify-ad.mp3"; diff --git a/src/public/js/episode/handle_upload.js b/src/public/js/episode/handle_upload.js index 19747a567e4ed3a153aebe1207098f05ab3e817d..8fbaa77f9b1f2f2670a3474a1b34fa6931d67216 100644 --- a/src/public/js/episode/handle_upload.js +++ b/src/public/js/episode/handle_upload.js @@ -124,13 +124,13 @@ handleFormSubmit("add-episode-form", function () { imgFormData.append("filename", fileField.files[0].name); imgFormData.append("data", fileField.files[0]); } else { - imgFormData.append("data", null); + imgFormData = null; } try { let xhrImg = uploadEpsFile(imgUrl, true, imgFormData); xhrImg.onload = () => { - const response = JSON.parse(xhrImg.responseText); + if (xhrImg.status === 200) { formData.append("preview-poster-filename", xhrImg.responseText); @@ -144,7 +144,7 @@ handleFormSubmit("add-episode-form", function () { let xhrAudio = uploadEpsFile(audioUrl, true, audioFormData); xhrAudio.onload = () => { - const response = JSON.parse(xhrAudio.responseText); + if (xhrAudio.status === 200) { formData.append("audio-filename", xhrAudio.responseText); @@ -160,7 +160,7 @@ handleFormSubmit("add-episode-form", function () { location.replace(response.redirect_url); }, 3000); } else { - showNotificationDanger(response.status_message); + showNotificationDanger(response.error_message); } } else { console.error("Request failed with status:", xhr.status); @@ -174,6 +174,7 @@ handleFormSubmit("add-episode-form", function () { console.error("Error creating episode:", error); } } else { + const response = JSON.parse(xhrAudio.responseText); showNotificationDanger(response.error_message); } }; @@ -181,6 +182,7 @@ handleFormSubmit("add-episode-form", function () { console.error("Error uploading audio:", error); } } else { + const response = JSON.parse(xhrImg.responseText); showNotificationDanger(response.error_message); } }; diff --git a/src/public/js/episode/handle_upload_edit.js b/src/public/js/episode/handle_upload_edit.js index a5a0d143e987cb6b177a2c1463d51157f3a1a70e..429b1a4f0d030ed84f57ef6937b8f399ab4b8f5e 100644 --- a/src/public/js/episode/handle_upload_edit.js +++ b/src/public/js/episode/handle_upload_edit.js @@ -105,7 +105,7 @@ handleFormSubmit("edit-episode-form", function () { xhr.onload = () => { const response = JSON.parse(xhr.responseText); - + if (xhr.status === 200) { // window.location.href = "/episode"; if (response.success) { @@ -114,7 +114,7 @@ handleFormSubmit("edit-episode-form", function () { location.replace(response.redirect_url); }, 3000); } else { - showNotificationDanger(response.status_message); + showNotificationDanger(response.error_message); } } else { console.error("Request failed with status:", xhr.status); @@ -157,7 +157,6 @@ handleFormSubmit("edit-episode-form", function () { try { let xhrImg = uploadEditedEpsFile(imgUrl, true, imgFormData); xhrImg.onload = () => { - const response = JSON.parse(xhrImg.responseText); if(xhrImg.status === 200) { formData.append( @@ -166,6 +165,7 @@ handleFormSubmit("edit-episode-form", function () { ); resolve(); } else { + const response = JSON.parse(xhrImg.responseText); showNotificationDanger(response.error_message); } }; @@ -190,12 +190,12 @@ handleFormSubmit("edit-episode-form", function () { try { let xhrAudio = uploadEditedEpsFile(audioUrl, true, audioFormData); xhrAudio.onload = () => { - const response = JSON.parse(xhrAudio.responseText); - console.log(xhrAudio.responseText); + if (xhrAudio.status === 200) { formData.append("edit-audio-filename", xhrAudio.responseText); resolve(); } else { + const response = JSON.parse(xhrAudio.responseText); showNotificationDanger(response.error_message); } };