html, css changes, made settings functional

daveberrys · daveberrys · commit 073ebb5b28c1 · 2026-02-17T08:47:22.000+08:00
diff --git a/src/back/api/sendingFile.py b/src/back/api/sendingFile.py
@@ -2,6 +2,7 @@
 import os
 
 from src.back.system.history import History as his
+from src.back.system.settings import Settings
 
 # main reason why this is here:
 # 1. catbox for some reason need this
@@ -24,7 +25,8 @@ def catbox(file_path):
             if response.status_code == 200:
                 result = response.text.strip()
                 if result:
-                    his().storeHistory("catbox", os.path.basename(file_path), result, "")
+                    if Settings().readSet._history():
+                        his().storeHistory("catbox", os.path.basename(file_path), result, "")
                     return result
                 return "Error: Server returned empty response."
             return f"Server Error: {response.status_code}"
@@ -43,7 +45,8 @@ def litterbox(file_path, duration="1h"):
             if response.status_code == 200:
                 result = response.text.strip()
                 if result:
-                    his().storeHistory("litterbox", os.path.basename(file_path), result, duration)
+                    if Settings().readSet._history():
+                        his().storeHistory("litterbox", os.path.basename(file_path), result, duration)
                     return result
                 return "Error: Server returned empty response."
             return f"Server Error: {response.status_code}"
@@ -61,7 +64,8 @@ def buzzheavier(file_path):
                 data = response.json()
                 fileID = data.get("data", {}).get("id")
                 if fileID:
-                    his().storeHistory("buzzheavier", filename, f"https://buzzheavier.com/{fileID}", "")
+                    if Settings().readSet._history():
+                        his().storeHistory("buzzheavier", filename, f"https://buzzheavier.com/{fileID}", "")
                     return f"https://buzzheavier.com/{fileID}"
                 return "Error: Could not find file ID in response."
             return f"Server Error: {response.status_code}"
diff --git a/src/back/system/contact.py b/src/back/system/contact.py
@@ -21,7 +21,9 @@ def pickFile(self):
 
     def uploadTo(self, path, platform, duration="1h"):
         filename = os.path.basename(path)
-        notify("Upload Started", f"Sending {filename} to {platform}...")
+        
+        if Settings().readSet._notifyYou():
+            notify("Upload Started", f"Sending {filename} to {platform}...")
 
         result = ""
         if platform == "catbox":
@@ -34,13 +36,19 @@ def uploadTo(self, path, platform, duration="1h"):
             result = "Unknown platform"
 
         if result.startswith("http"):
-            notify("Upload Success!", f"Link: {result}")
+            if Settings().readSet._notifyYou():
+                notify("Upload Success!", f"Link: {result}")
         else:
-            notify("Upload Failed", f"Problem with {platform}: {result}")
+            if Settings().readSet._notifyYou():
+                notify("Upload Failed", f"Problem with {platform}: {result}")
 
         return result
 
     def checkForUpdates(self):
+        if not Settings().readSet._checkForUpdates():
+            print.debug("Updates disabled by user.")
+            return {"status": "disabled"}
+
         # checks if the local file exists
         try:
             if getattr(sys, 'frozen', False):
diff --git a/src/front/main/css/popupStyle.css b/src/front/main/css/popupStyle.css
@@ -64,4 +64,9 @@
 
 .secondary {
     margin-top: 20px !important;
+}
+
+.headerText {
+    font-weight: bold;
+    font-size: 25px;
 }
diff --git a/src/front/main/index.html b/src/front/main/index.html
@@ -32,10 +32,13 @@
         }
     }
 
-    window.addEventListener('DOMContentLoaded', () => {
-        loadPopups().then(() => {
-            checkUpdates(); // Call this AFTER popups are loaded
-        });
+    window.addEventListener('DOMContentLoaded', async () => {
+        await loadPopups();
+        if (window.pywebview) {
+            checkUpdates();
+        } else {
+            window.addEventListener('pywebviewready', checkUpdates);
+        }
     });
 
     async function chooseFile() {
@@ -224,7 +227,6 @@
         }
     }
 
-    // I don't even wanna explain how this works dude
     async function checkUpdates() {
         try {
             const result = await window.pywebview.api.checkForUpdates();
@@ -243,15 +245,15 @@
                 showPopup('newUpdateAvailablePopup');
             }
         } catch (e) {
-            console.error("Javascript failed to call update check:", e);
+            console.error("Failed to check for updates:", e);
         }
     }
 
     async function currentLocalVersion() {
         try {
             const result = await window.pywebview.api.localCurrentVersion();
             const versionText = document.getElementById('localCurrentVersion');
-            if (versionText) {
+            if (versionText && result) {
                 versionText.innerText = `Current Local Version: ${result}`;
             }
         } catch (e) {
diff --git a/src/front/main/popup/credits.html b/src/front/main/popup/credits.html
@@ -1,15 +1,15 @@
 <div id="creditsPopup" class="popup-overlay" onclick="if(event.target == this) closePopup('creditsPopup')">
     <div class="popup-content">
         <div class="overflow" style="height: 375px;">
-            <h2>Credits</h2>
+            <span class="headerText" style="padding-bottom: 10px;">Credits</span> <br/>
         
             <a href="https://codedave.pages.dev/" target="_blank">
                 <div class="item">
                     <img src="https://codedave.pages.dev/assets/misc/Daveberry%20Wave.png" width="50" height="50" alt="Daveberry"/>
 
                     <div class="info">
                         <span class="bigText">Daveberry</span> <br/>
-                        <span class="role"> Lead Dev </span> <br/>
+                        <span class="role"> Lead Developer </span> <br/>
                         <span> The guy who did everything in this native app </span>
                     </div>
                 </div>
@@ -21,13 +21,13 @@ <h2>Credits</h2>
 
                     <div class="info">
                         <span class="bigText">Runyra</span> <br/>
-                        <span class="role"> Lead Dev </span> <br/>
+                        <span class="role"> Lead Developer </span> <br/>
                         <span> Basically nothing, but working on the Vencord/Equicord plugin in discord.</span>
                     </div>
                 </div>
             </a>
 
-            <h2 style="padding-top: 10px;">Service Providers</h2>
+            <span class="headerText" style="padding-top: 10px; padding-bottom: 10px;">Service Providers</span> <br/>
             
             <a href="https://catbox.moe/" target="_blank">
                 <div class="item">
diff --git a/src/front/main/popup/extra/limiter/catbox.html b/src/front/main/popup/extra/limiter/catbox.html
@@ -1,6 +1,6 @@
 <div id="catboxLimiterPopup" class="popup-overlay" onclick="if(event.target == this) closePopup('catboxLimiterPopup')">
     <div class="popup-content">
-        <h3>File too big for Catbox!</h3>
+        <span class="headerText" style="padding-bottom: 10px;">File too big for Catbox!</span> <br/>
         <p>Limit: 200MB</p>
         <div class="button secondary" onclick="closePopup('catboxLimiterPopup')">Cancel</div>
     </div>
diff --git a/src/front/main/popup/extra/limiter/litterbox.html b/src/front/main/popup/extra/limiter/litterbox.html
@@ -1,6 +1,6 @@
 <div id="litterboxLimiterPopup" class="popup-overlay" onclick="if(event.target == this) closePopup('litterboxLimiterPopup')">
     <div class="popup-content">
-        <h3>File too big for Litterbox!</h3>
+        <span class="headerText" style="padding-bottom: 10px;">File too big for Litterbox!</span> <br/>
         <p>Limit: 1GB</p>
         <div class="button secondary" onclick="closePopup('litterboxLimiterPopup')">Cancel</div>
     </div>
diff --git a/src/front/main/popup/extra/litterboxTime.html b/src/front/main/popup/extra/litterboxTime.html
@@ -1,6 +1,6 @@
 <div id="litterboxTimePopup" class="popup-overlay" onclick="if(event.target == this) closePopup('litterboxTimePopup')">
     <div class="popup-content">
-        <h3>Expire After...</h3>
+        <span class="headerText" style="padding-bottom: 10px;">Expire After...</span> <br/>
         <div class="button" onclick="litterBoxExpire('1 Hours')">1 Hour</div>
         <div class="button" onclick="litterBoxExpire('12 Hours')">12 Hours</div>
         <div class="button" onclick="litterBoxExpire('24 Hours')">24 Hours</div>
diff --git a/src/front/main/popup/extra/sendTo-Fallback.html b/src/front/main/popup/extra/sendTo-Fallback.html
@@ -1,6 +1,6 @@
 <div id="fallbackPopup" class="popup-overlay" onclick="if(event.target == this) closePopup('fallbackPopup')">
     <div class="popup-content">
-        <h3>Please select a file!</h3>
+        <span class="headerText" style="padding-bottom: 10px;">Please select a file!</span> <br/>
         <p>You can't upload a file if you don't select one. That would turn a n͇̹̩͔͉͉͙̘͊͆̀̔̀̊ų̻̼͇̫̤̼̓̀̚͡l̨̛̬͕̂͊̌͘ͅḷ̶̟̺͉̬̓̒́̂͞͠</p>
         <div class="button secondary" onclick="closePopup('fallbackPopup')">Close</div>
     </div>
diff --git a/src/front/main/popup/extra/updaters/failedToFetch.html b/src/front/main/popup/extra/updaters/failedToFetch.html
@@ -1,6 +1,6 @@
 <div id="failedToFetchPopup" class="popup-overlay" onclick="if(event.target == this) closePopup('failedToFetchPopup')">
     <div class="popup-content">
-        <h3>Uh oh! Failed to fetch!</h3>
+        <span class="headerText" style="padding-bottom: 10px;">Uh oh! Failed to fetch!</span> <br/>
         <p>Something somewhere in the code failed to fetch. Maybe check your connection or is the website down?</p>
         <p>Let us know if we made a problem at
             <a href="https://github.com/daveberrys/SendYourFiles/issues" target="_blank">
diff --git a/src/front/main/popup/extra/updaters/newUpdateAvailable.html b/src/front/main/popup/extra/updaters/newUpdateAvailable.html
@@ -1,6 +1,6 @@
 <div id="newUpdateAvailablePopup" class="popup-overlay" onclick="if(event.target == this) closePopup('newUpdateAvailablePopup')">
     <div class="popup-content">
-        <h3>New Update Available!</h3>
+        <span class="headerText" style="padding-bottom: 10px;">New Update Available!</span> <br/>
         <p>A new update is available! We'd recommend downloading the latest for better stability.</p>
         <p id="updateVersionText"></p>
 
diff --git a/src/front/main/popup/sendTo.html b/src/front/main/popup/sendTo.html
@@ -1,6 +1,6 @@
 <div id="platformPopup" class="popup-overlay" onclick="if(event.target == this) closePopup('platformPopup')">
     <div class="popup-content">
-        <h3>Upload To...</h3>
+        <span class="headerText" style="padding-bottom: 10px;">Upload To...</span> <br/>
         <div class="button" onclick="triggerUpload('catbox')">Catbox</div>
         <div class="button" onclick="triggerUpload('litterbox')">Litterbox</div>
         <div class="button" onclick="triggerUpload('buzzheavier')">Buzzheavier</div>
diff --git a/src/front/main/popup/settings.html b/src/front/main/popup/settings.html
@@ -1,7 +1,8 @@
 <div id="settingsPopup" class="popup-overlay" onclick="if(event.target == this) closePopup('settingsPopup')">
     <div class="popup-content">
-        <h3>Settings</h3>
-        <pre id="localCurrentVersion">Current Local Version: ???</pre>
+        <span class="headerText">Settings</span> <br/>
+        <code id="localCurrentVersion">Current Local Version: ...</code> <br/>
+        <span class="smallText">Some of the options may require a restart!</span>
 
         <div class="overflow" style="height: 300px;">
             <!-- Settings will be loaded here -->
diff --git a/src/front/window.py b/src/front/window.py
@@ -7,6 +7,7 @@
 
 import src.back.util.print as print
 from src.back.system.contact import API
+from src.back.system.settings import Settings
 
 class WindowManager:
     def __init__(self):
@@ -44,7 +45,8 @@ def createWindow(self):
             height=600,
         )
 
-        self.window.events.closing += self.onWindowClosing
+        if Settings().readSet._minimizeToTray():
+            self.window.events.closing += self.onWindowClosing
 
     def onWindowClosing(self):
         print.debug("X clicked! Hiding to tray and clearing RAM...")
@@ -86,8 +88,9 @@ def start(self, debugMode):
         if self.debugMode:
             print.success("Debug mode is active.")
 
-        trayThread = threading.Thread(target=self.setupTray, daemon=True)
-        trayThread.start()
+        if Settings().readSet._minimizeToTray():
+            trayThread = threading.Thread(target=self.setupTray, daemon=True)
+            trayThread.start()
 
         self.createWindow()
         wv.start(
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-0.2.0
+0.3.0

Original file line number	Diff line number	Diff line change
`@@ -64,4 +64,9 @@`
`64`	`64`
`65`	`65`	`.secondary {`
`66`	`66`	`margin-top: 20px !important;`
	`67`	`+}`
	`68`	`+`
	`69`	`+.headerText {`
	`70`	`+ font-weight: bold;`
	`71`	`+ font-size: 25px;`
`67`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,10 +32,13 @@`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`
`35`		`- window.addEventListener('DOMContentLoaded', () => {`
`36`		`- loadPopups().then(() => {`
`37`		`- checkUpdates(); // Call this AFTER popups are loaded`
`38`		`- });`
	`35`	`+ window.addEventListener('DOMContentLoaded', async () => {`
	`36`	`+ await loadPopups();`
	`37`	`+ if (window.pywebview) {`
	`38`	`+ checkUpdates();`
	`39`	`+ } else {`
	`40`	`+ window.addEventListener('pywebviewready', checkUpdates);`
	`41`	`+ }`
`39`	`42`	`});`
`40`	`43`
`41`	`44`	`async function chooseFile() {`
`@@ -224,7 +227,6 @@`
`224`	`227`	`}`
`225`	`228`	`}`
`226`	`229`
`227`		`- // I don't even wanna explain how this works dude`
`228`	`230`	`async function checkUpdates() {`
`229`	`231`	`try {`
`230`	`232`	`const result = await window.pywebview.api.checkForUpdates();`
`@@ -243,15 +245,15 @@`
`243`	`245`	`showPopup('newUpdateAvailablePopup');`
`244`	`246`	`}`
`245`	`247`	`} catch (e) {`
`246`		`- console.error("Javascript failed to call update check:", e);`
	`248`	`+ console.error("Failed to check for updates:", e);`
`247`	`249`	`}`
`248`	`250`	`}`
`249`	`251`
`250`	`252`	`async function currentLocalVersion() {`
`251`	`253`	`try {`
`252`	`254`	`const result = await window.pywebview.api.localCurrentVersion();`
`253`	`255`	`const versionText = document.getElementById('localCurrentVersion');`
`254`		`- if (versionText) {`
	`256`	`+ if (versionText && result) {`
`255`	`257`	versionText.innerText = `Current Local Version: ${result}`;
`256`	`258`	`}`
`257`	`259`	`} catch (e) {`