change to YTGo

nxrmqlly · Nov 21, 2024 · 34f1185 · 34f1185
1 parent 502d34c
commit 34f1185
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 16 deletions.
diff --git a/backend/controllers/download.go b/backend/controllers/download.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 	"unicode"
 
-	"youtube-downloader-go/backend/models"
-	"youtube-downloader-go/backend/utils"
+	"YTGo/backend/models"
+	"YTGo/backend/utils"
 
 	"github.com/wailsapp/wails/v2/pkg/runtime"
 )
@@ -86,4 +86,5 @@ func (a *App) DownloadVideo(videoInfo models.VideoInfo, opts models.DownloadOpti
 	}
 
 	return "Done downloading", nil
+
 }
diff --git a/backend/controllers/get.go b/backend/controllers/get.go
@@ -6,8 +6,8 @@ import (
 	"net/url"
 	"os/exec"
 
-	"youtube-downloader-go/backend/models"
-	"youtube-downloader-go/backend/utils"
+	"YTGo/backend/models"
+	"YTGo/backend/utils"
 )
 
 func (a *App) GetVideoInfo(videoURL string) (models.VideoInfo, error) {

diff --git a/frontend/src/components/VideoModal.svelte b/frontend/src/components/VideoModal.svelte
@@ -2,6 +2,7 @@
 import { onAccesibilityKeydown } from "../utils/accessibility.js";
 import { DownloadVideo } from "../../wailsjs/go/controllers/App.js";
 import "@fortawesome/fontawesome-free/css/all.min.css";
+  import { preventDefault } from "svelte/legacy";
 
 /** @type {{onClose: any, videoInfo: any}} */
 let { onClose, videoInfo } = $props();
@@ -47,8 +48,7 @@ const audioOptions = audioExtOptions.map((ext) => ({
 }));
 
 // Switch between video and audio tab and reset the selected option
-function switchTab(event, tab) {
-	event.preventDefault();
+function switchTab(tab) {
 	currentTab = tab;
 	selectedOption = ""; // Reset the selected option when tab changes
 }
@@ -160,39 +160,47 @@ function switchTab(event, tab) {
     }
     
     .tab {
+        background-color: var(--duo-bg-color);
+        color: var(--fg-color);
         cursor: pointer;
         padding: 0.5rem 1rem;
-        border-bottom: 2px solid transparent;
+        border: 0;
+        padding-bottom: 1em;
+        overflow: hidden;
     }
     
     .tab.active {
+        border-bottom: 2px solid transparent;
         border-color: var(--accent);
-        font-weight: bold;
     }
 </style>
 
 <div
     class="modal"
     role="button"
     tabindex="0"
-    onclick={onClose}
+
     onkeydown={onAccesibilityKeydown}
 >
     <div class="modal-content">
         <h2>{videoInfo.title}</h2>
         <div class="video-desc">
-            <p><i class="fa-regular fa-user"></i> {videoInfo.uploader}</p>
-            <p><i class="fa-regular fa-clock"></i> {formatDuration(videoInfo.duration)}</p>
-            <p><i class="fa-regular fa-eye"></i> {videoInfo.view_count.toLocaleString()}</p>
+            <p><i class="fa-regular fa-user"></i> {videoInfo.uploader || "N/A"}</p>
+            <p><i class="fa-regular fa-clock"></i> {formatDuration(videoInfo.duration) || "N/A"}</p>
+            <p><i class="fa-regular fa-eye"></i> {videoInfo.view_count.toLocaleString() || "N/A"}</p>
         </div>
-        <img class="thumbnail" src={videoInfo.thumbnail} alt="Video thumbnail" />
+        {#if videoInfo.thumbnail}
+            <img class="thumbnail" src={videoInfo.thumbnail} alt="Video thumbnail" />
+        {:else}
+            <p>No thumbnail available</p>
+        {/if}
 
         <!-- Tab Bar -->
         <div class="tab-bar">
-            <button class="tab {currentTab === 'video' ? 'active' : ''}" onkeydown={onAccesibilityKeydown} onclick={(e) => switchTab(e, 'video')}>
+            <button class="tab {currentTab === 'video' ? 'active' : ''}" onclick={(e) => {e.preventDefault(); switchTab('video')}}>
                 Video
             </button>
-            <button class="tab {currentTab === 'audio' ? 'active' : ''}" onkeydown={onAccesibilityKeydown} onclick={(e) => switchTab(e, 'audio')}>
+            <button class="tab {currentTab === 'audio' ? 'active' : ''}" onclick={(e) => {e.preventDefault(); switchTab('audio')}}>
                 Audio
             </button>
         </div>

diff --git a/frontend/tailwind.config.js b/frontend/tailwind.config.js
@@ -0,0 +1,19 @@
+/** @type {import('tailwindcss').Config} */
+module.exports = {
+  content: ['./src/**/*.{html,js,svelte}'],
+  theme: {
+    extend: {
+      colors: {
+        accent: '#99667a',
+        'duo-accent': '#744457',
+        'confirm-color': '#5aa071',
+        'duo-confirm-color': '#518060',
+        'deny-color': '#b33a3a',
+        'duo-deny-color': '#8a3434',
+      },
+      fontFamily: {
+        satoshi: ['Satoshi', 'sans-serif'],
+      },
+    },
+  },
+};
diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module youtube-downloader-go
+module YTGo
 
 go 1.21