From df5e7f9b070066014b9289b5a01adbc91aaf9087 Mon Sep 17 00:00:00 2001
From: Hygna <hygna@proton.me>
Date: Sat, 24 Sep 2022 11:44:18 +0100
Subject: Made most redirects work as expected

---
 src/pages/options/index.html          | 107 ++++++++++++++++++++++------------
 src/pages/options/widgets/general.ejs |   9 ++-
 src/pages/popup/popup.js              |   8 +--
 3 files changed, 82 insertions(+), 42 deletions(-)

(limited to 'src/pages')

diff --git a/src/pages/options/index.html b/src/pages/options/index.html
index b6ea1535..20592637 100644
--- a/src/pages/options/index.html
+++ b/src/pages/options/index.html
@@ -180,110 +180,145 @@
   </div>
   <div class="checklist-popup" id="popup-frontends-checklist">
     <div>
-      <div><img src="../../../assets/images/youtube-icon.png">
-        <x data-localise="__MSG_youtube__">youtube</x>
+  <div>
+    <img src="../../../assets/images/youtube-icon.png">
+    <x data-localise="__MSG_youtube__">Youtube</x>
       </div>
       <input id="youtube" type="checkbox">
     </div>
     <div>
-      <div><img src="../../../assets/images/youtubeMusic-icon.png">
-        <x data-localise="__MSG_youtubeMusic__">youtubeMusic</x>
+  <div>
+    <img src="../../../assets/images/youtubeMusic-icon.png">
+    <x data-localise="__MSG_youtubeMusic__">YT Music</x>
       </div>
       <input id="youtubeMusic" type="checkbox">
     </div>
     <div>
-      <div><img src="../../../assets/images/twitter-icon.png">
-        <x data-localise="__MSG_twitter__">twitter</x>
+  <div>
+    <img src="../../../assets/images/twitter-icon.png">
+    <x data-localise="__MSG_twitter__">Twitter</x>
       </div>
       <input id="twitter" type="checkbox">
     </div>
     <div>
-      <div><img src="../../../assets/images/instagram-icon.png">
-        <x data-localise="__MSG_instagram__">instagram</x>
+  <div>
+    <img src="../../../assets/images/instagram-icon.png">
+    <x data-localise="__MSG_instagram__">Instagram</x>
       </div>
       <input id="instagram" type="checkbox">
     </div>
     <div>
-      <div><img src="../../../assets/images/tiktok-icon.png">
-        <x data-localise="__MSG_tiktok__">tiktok</x>
+  <div>
+    <img src="../../../assets/images/tiktok-icon.png">
+    <x data-localise="__MSG_tiktok__">TikTok</x>
       </div>
       <input id="tiktok" type="checkbox">
     </div>
     <div>
-      <div><img src="../../../assets/images/reddit-icon.png">
-        <x data-localise="__MSG_reddit__">reddit</x>
+  <div>
+    <img src="../../../assets/images/reddit-icon.png">
+    <x data-localise="__MSG_reddit__">Reddit</x>
       </div>
       <input id="reddit" type="checkbox">
     </div>
     <div>
-      <div><img src="../../../assets/images/imgur-icon.png">
-        <x data-localise="__MSG_imgur__">imgur</x>
+  <div>
+    <img src="../../../assets/images/imgur-icon.png">
+    <x data-localise="__MSG_imgur__">Imgur</x>
       </div>
       <input id="imgur" type="checkbox">
     </div>
     <div>
-      <div><img src="../../../assets/images/wikipedia-icon.svg">
-        <x data-localise="__MSG_wikipedia__">wikipedia</x>
+  <div>
+    <img src="../../../assets/images/wikipedia-icon.svg">
+    <x data-localise="__MSG_wikipedia__">Wikipedia</x>
       </div>
       <input id="wikipedia" type="checkbox">
     </div>
     <div>
-      <div><img src="../../../assets/images/medium-icon.svgMono">
-        <x data-localise="__MSG_medium__">medium</x>
+  <div>
+    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1770 1000" fill="currentColor">
+  <circle cx="500" cy="500" r="500"></circle>
+  <ellipse ry="475" rx="250" cy="501" cx="1296"></ellipse>
+  <ellipse cx="1682" cy="502" rx="88" ry="424"></ellipse>
+</svg>
+
+    <x data-localise="__MSG_medium__">Medium</x>
       </div>
       <input id="medium" type="checkbox">
     </div>
     <div>
-      <div><img src="../../../assets/images/quora-icon.png">
-        <x data-localise="__MSG_quora__">quora</x>
+  <div>
+    <img src="../../../assets/images/quora-icon.png">
+    <x data-localise="__MSG_quora__">Quora</x>
       </div>
       <input id="quora" type="checkbox">
     </div>
     <div>
-      <div><img src="../../../assets/images/imdb-icon.svg">
-        <x data-localise="__MSG_imdb__">imdb</x>
+  <div>
+    <img src="../../../assets/images/imdb-icon.svg">
+    <x data-localise="__MSG_imdb__">IMDb</x>
       </div>
       <input id="imdb" type="checkbox">
     </div>
     <div>
-      <div><img src="../../../assets/images/reuters-icon.svg">
-        <x data-localise="__MSG_reuters__">reuters</x>
+  <div>
+    <img src="../../../assets/images/reuters-icon.svg">
+    <x data-localise="__MSG_reuters__">Reuters</x>
       </div>
       <input id="reuters" type="checkbox">
     </div>
     <div>
-      <div><img src="../../../assets/images/peertube-icon.svg">
-        <x data-localise="__MSG_peertube__">peertube</x>
+  <div>
+    <img src="../../../assets/images/peertube-icon.svg">
+    <x data-localise="__MSG_peertube__">PeerTube</x>
       </div>
       <input id="peertube" type="checkbox">
     </div>
     <div>
-      <div><img src="../../../assets/images/lbry-icon.png">
-        <x data-localise="__MSG_lbry__">lbry</x>
+  <div>
+    <img src="../../../assets/images/lbry-icon.png">
+    <x data-localise="__MSG_lbry__">LBRY</x>
       </div>
       <input id="lbry" type="checkbox">
     </div>
     <div>
-      <div><img src="../../../assets/images/search-icon.svgMono">
-        <x data-localise="__MSG_search__">search</x>
+  <div>
+    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor">
+  <path d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"></path>
+</svg>
+
+    <x data-localise="__MSG_search__">Search</x>
       </div>
       <input id="search" type="checkbox">
     </div>
     <div>
-      <div><img src="../../../assets/images/translate-icon.svgMono">
-        <x data-localise="__MSG_translate__">translate</x>
+  <div>
+    <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor">
+  <path d="M12.87 15.07l-2.54-2.51.03-.03c1.74-1.94 2.98-4.17 3.71-6.53H17V4h-7V2H8v2H1v1.99h11.17C11.5 7.92 10.44 9.75 9 11.35 8.07 10.32 7.3 9.19 6.69 8h-2c.73 1.63 1.73 3.17 2.98 4.56l-5.09 5.02L4 19l5-5 3.11 3.11.76-2.04zM18.5 10h-2L12 22h2l1.12-3h4.75L21 22h2l-4.5-12zm-2.62 7l1.62-4.33L19.12 17h-3.24z"></path>
+</svg>
+
+    <x data-localise="__MSG_translate__">Translate</x>
       </div>
       <input id="translate" type="checkbox">
     </div>
     <div>
-      <div><img src="../../../assets/images/maps-icon.svgMono">
-        <x data-localise="__MSG_maps__">maps</x>
+  <div>
+    <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor">
+  <path d="M20.5 3l-.16.03L15 5.1 9 3 3.36 4.9c-.21.07-.36.25-.36.48V20.5c0 .28.22.5.5.5l.16-.03L9 18.9l6 2.1 5.64-1.9c.21-.07.36-.25.36-.48V3.5c0-.28-.22-.5-.5-.5zM10 5.47l4 1.4v11.66l-4-1.4V5.47zm-5 .99l3-1.01v11.7l-3 1.16V6.46zm14 11.08l-3 1.01V6.86l3-1.16v11.84z"></path>
+</svg>
+
+    <x data-localise="__MSG_maps__">Maps</x>
       </div>
       <input id="maps" type="checkbox">
     </div>
     <div>
-      <div><img src="../../../assets/images/sendTargets-icon.svgMono">
-        <x data-localise="__MSG_sendTargets__">sendTargets</x>
+  <div>
+    <svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="currentColor">
+  <path d="M19.35 10.04C18.67 6.59 15.64 4 12 4 9.11 4 6.6 5.64 5.35 8.04 2.34 8.36 0 10.91 0 14c0 3.31 2.69 6 6 6h13c2.76 0 5-2.24 5-5 0-2.64-2.05-4.78-4.65-4.96zM14 13v4h-4v-4H7l5-5 5 5h-3z"></path>
+</svg>
+
+    <x data-localise="__MSG_sendTargets__">Send Files</x>
       </div>
       <input id="sendTargets" type="checkbox">
     </div>
diff --git a/src/pages/options/widgets/general.ejs b/src/pages/options/widgets/general.ejs
index e306ba4b..fa85e8bc 100644
--- a/src/pages/options/widgets/general.ejs
+++ b/src/pages/options/widgets/general.ejs
@@ -86,8 +86,13 @@
   <div class="checklist-popup" id="popup-frontends-checklist">
     <% for (const service in config.services) { -%>
 <div>
-      <div><img src="../../../assets/images/<%= service %>-icon.<%= config.services[service].imageType %>">
-        <x data-localise="__MSG_<%= service %>__"><%= service %></x>
+  <div>
+  <% if (config.services[service].imageType != "svgMono") { _%>
+  <img src="../../../assets/images/<%= service %>-icon.<%= config.services[service].imageType %>">
+  <% } else { _%>
+  <%- include ('src/assets/images/' + service + '-icon.svg') %>
+  <% } _%>
+  <x data-localise="__MSG_<%= service %>__"><%= config.services[service].name %></x>
       </div>
       <input id="<%= service %>" type="checkbox">
     </div>
diff --git a/src/pages/popup/popup.js b/src/pages/popup/popup.js
index fa269e6d..a2e001d3 100644
--- a/src/pages/popup/popup.js
+++ b/src/pages/popup/popup.js
@@ -77,22 +77,22 @@ browser.storage.local.get("popupFrontends", r => {
 			currSite.getElementsByClassName(frontend)[0].classList.add("hide")
 		}
 
+		await getEnabled()
+
 		let url
 		try {
 			url = new URL(tabs[0].url)
-			console.log(url.href)
 		} catch {
 			currentSiteIsFrontend.classList.add("hide")
+			document.getElementById("unify_div").style.display = "none"
 			return
 		}
 
-		await getEnabled()
-
 		const currentService = serviceHelper.computeService(url)
 		if (currentService != null) {
 			divs[currentService].current.classList.remove("hide")
 			divs[currentService].all.classList.add("hide")
-			if (config.services[currentService].preferences != {}) {
+			if (config.services[currentService].preferences != undefined) {
 				const unify = document.getElementById("unify")
 				const textElement = document.getElementById("unify").getElementsByTagName("h4")[0]
 				unify.addEventListener("click", () => {
-- 
cgit 1.4.1