From 3ee8ee7061b1ed9c31d61a5fbf2a014996c499ee Mon Sep 17 00:00:00 2001
From: SpikeHD <spikegdofficial@gmail.com>
Date: Wed, 11 May 2022 19:47:44 -0700
Subject: [PATCH] fix commands and stylign

---
 src-tauri/src/main.rs                    |  9 ++++++---
 src/ui/App.tsx                           |  5 +++--
 src/ui/components/MiniDialog.css         | 16 ++++++++++++++++
 src/ui/components/MiniDialog.tsx         | 10 +++++++++-
 src/ui/components/common/ProgressBar.css |  4 ++--
 src/utils/download.ts                    |  3 +--
 6 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index e4d2336..5b4917f 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -10,9 +10,12 @@ mod proxy;
 
 fn main() {
   tauri::Builder::default()
-    .invoke_handler(tauri::generate_handler![downloader::download_file])
-    .invoke_handler(tauri::generate_handler![run_program])
-    .invoke_handler(tauri::generate_handler![connect, disconnect])
+    .invoke_handler(tauri::generate_handler![
+      connect,
+      disconnect,
+      run_program,
+      downloader::download_file
+    ])
     .run(tauri::generate_context!())
     .expect("error while running tauri application");
 }
diff --git a/src/ui/App.tsx b/src/ui/App.tsx
index 7155a32..e0c9fed 100644
--- a/src/ui/App.tsx
+++ b/src/ui/App.tsx
@@ -58,14 +58,15 @@ class App extends React.Component<IProps, IState> {
           }}
           downFunc={() => {
             this.setState({ miniDownloadsOpen: !this.state.miniDownloadsOpen })
-            console.log(this.state.miniDownloadsOpen)
           }}
         />
 
         {
           // Mini downloads section
           this.state.miniDownloadsOpen ? 
-            <MiniDialog>
+            <MiniDialog closeFn={() => {
+              this.setState({ miniDownloadsOpen: false })
+            }}>
               <DownloadList downloadManager={downloadHandler} />
             </MiniDialog> : null
         }
diff --git a/src/ui/components/MiniDialog.css b/src/ui/components/MiniDialog.css
index 215303b..f05d658 100644
--- a/src/ui/components/MiniDialog.css
+++ b/src/ui/components/MiniDialog.css
@@ -16,3 +16,19 @@
   border-radius: 10px;
 }
 
+.MiniDialogTop {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+
+  height: 20px;
+}
+
+.MiniDialogTop img {
+  height: 100%;
+}
+
+.MiniDialogTop:hover {
+  cursor: pointer;
+}
diff --git a/src/ui/components/MiniDialog.tsx b/src/ui/components/MiniDialog.tsx
index 3a1c7f4..fd83f23 100644
--- a/src/ui/components/MiniDialog.tsx
+++ b/src/ui/components/MiniDialog.tsx
@@ -1,9 +1,11 @@
 import React from 'react'
 
+import Close from '../../resources/icons/close.svg'
 import './MiniDialog.css'
 
 interface IProps {
   children: React.ReactNode[] | React.ReactNode;
+  closeFn: () => void;
 }
 
 export default class MiniDialog extends React.Component<IProps, never> {
@@ -14,7 +16,13 @@ export default class MiniDialog extends React.Component<IProps, never> {
   render() {
     return (
       <div className="MiniDialog">
-        {this.props.children}
+        <div className="MiniDialogTop" onClick={this.props.closeFn}>
+          <div></div>
+          <img src={Close} className="MiniDialogClose" />
+        </div>
+        <div className="MiniDialogInner">
+          {this.props.children}
+        </div>
       </div>
     )
   }
diff --git a/src/ui/components/common/ProgressBar.css b/src/ui/components/common/ProgressBar.css
index 2706597..63e1b0c 100644
--- a/src/ui/components/common/ProgressBar.css
+++ b/src/ui/components/common/ProgressBar.css
@@ -12,7 +12,7 @@
   height: 20px;
   width: 80%;
   background-color: #fff;
-  color: #fff;
+  color: #c5c5c5;
 
   border: 1px solid #ccc;
 }
@@ -23,5 +23,5 @@
 }
 
 .ProgressText {
-  color: #fff;
+  color: #c5c5c5;
 }
\ No newline at end of file
diff --git a/src/utils/download.ts b/src/utils/download.ts
index 3cd1c9d..6512e83 100644
--- a/src/utils/download.ts
+++ b/src/utils/download.ts
@@ -42,9 +42,8 @@ export default class DownloadHandler {
   }
   
   addDownload(url: string, path: string) {
-    // Begin download from rust backend
+    // Begin download from rust backend, don't add if the download addition fails
     invoke('download_file', { url, path })
-
     const obj = {
       path,
       progress: 0,