From f2e40819d3841eadf9027e826f0d53645519fbd9 Mon Sep 17 00:00:00 2001
From: nbitzz <77242831+nbitzz@users.noreply.github.com>
Date: Mon, 30 Jan 2023 14:23:47 -0800
Subject: [PATCH] COCK AND BALL TORTURE

---
 pages/download.html      | 94 ++++++----------------------------------
 src/server/index.ts      |  2 +-
 src/style/downloads.scss | 11 +++++
 3 files changed, 26 insertions(+), 81 deletions(-)
 create mode 100644 src/style/downloads.scss
diff --git a/pages/download.html b/pages/download.html
index 41fff40..b6f9314 100644
--- a/pages/download.html
+++ b/pages/download.html
@@ -10,92 +10,26 @@
     <meta name="title" content="$FileName">
     <meta name="description" content="ID: $FileId">
 
-    <style>
-
-        * {
-            font-family: sans-serif;
-        }
-        h1,h2 {
-            text-align:center;
-        }
-        #content {
-            position:fixed;
-            left:50%;
-            top:50%;
-            transform:translate(-50%,-50%);
-            background-color:white;
-            width:450px;
-            /*height:100%;*/
-        }
-        body {
-            background-color: darkgray;
-        }
-        #btnContainer {
-            width:calc( 100% - 50px );
-            height:50px;
-            position:relative;
-            left:50%;
-            transform:translate(-50%,0);
-        }
-        #dlbtn {
-            width:100%;
-            height:100%;
-            background-color: #66AAFF;
-            border:none;
-            position:absolute;
-            left:0px;
-            top:0px;
-            text-decoration: none;
-            display:flex; /* This is a mess but I give up. */
-            flex-direction: column;
-            justify-content: center;
-        }
-        #btnContainer:hover {
-            outline: 1px solid gray;
-        }
-        #dlbtn > p {
-            color:black;
-            font-weight:bold;
-            font-size:20px;
-            text-align: center;      
-            width:100%;
-            line-height:20px;
-        }
-        .note {
-            padding:5px;
-            position:relative;
-            width:calc( 100% - 60px );
-            left:25px;
-            border:1px solid #AAAAAAFF;
-            border-radius: 8px;
-            background-color: #AAAAAA66;
-        }
-
-        @media only screen and (max-width: 450px) {
-            #content {
-                position:fixed;
-                left:0%;
-                top:0%;
-                transform:translate(0%,0%);
-                background-color:white;
-                width:100%;
-                height:100%;
-            }
-        }
-
-    </style>
+    <link
+        rel="stylesheet"
+        href="/static/style/downloads.css"
+    >
 </head>
 <body>
-    <div id="content">
+    <div id="uploadWindow">
         <h1>
             $FileName
         </h1>
-        <h2 style="font-family:monospace">file id: $FileId</h2>
-        <div id="btnContainer"><a id="dlbtn" href="/file/$FileId" download="$FileName"><p>Download file</p></a></div>
-        <p style="font-family:monospace;position:relative;width:calc( 100% - 50px );left:25px;text-align: center;">
-            May take a while to download. Stay put.
+        <p style="color:#999999">
+            file id <span class="number">$FileId</span>
         </p>
-        <div style="width:100%;height:25px"></div>
+
+        <button style="position:relative;width:100%;top:10px;">
+            <a id="dlbtn" href="/file/$FileId" download="$FileName" style="position:absolute;left:0px;top:0px;height:100%;width:100%;"></a>
+            download
+        </button>
+        
+        <div style="min-height:20px" />
     </div>
 </body>
 
diff --git a/src/server/index.ts b/src/server/index.ts
index 6a4f961..07dffa7 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -106,7 +106,7 @@ app.get("/download/:fileId",(req,res) => {
     if (files.getFilePointer(req.params.fileId)) {
         let file = files.getFilePointer(req.params.fileId)
 
-        fs.readFile(__dirname+"/../pages/download.html",(err,buf) => {
+        fs.readFile(process.cwd()+"/pages/download.html",(err,buf) => {
             if (err) {res.sendStatus(500);console.log(err);return}
             res.send(
                 buf.toString()
diff --git a/src/style/downloads.scss b/src/style/downloads.scss
new file mode 100644
index 0000000..c1c88b5
--- /dev/null
+++ b/src/style/downloads.scss
@@ -0,0 +1,11 @@
+// probably dont need to import the entire
+// uploads css file
+// so i might just make a separate file with mixins
+// and import them
+
+@use "app/uploads";
+@use "base";
+
+body {
+    background-color: base.$Background;
+}
\ No newline at end of file
