diff --git a/src/components/SettingsTablist.astro b/src/components/SettingsTablist.astro
index e1eb309..c6c1f31 100644
--- a/src/components/SettingsTablist.astro
+++ b/src/components/SettingsTablist.astro
@@ -297,6 +297,7 @@ const t = useTranslations(lang);
let selectedProxyDropdown = document.getElementById("dropdown__selected-proxy-menu");
let searchEngineDropdown = document.getElementById("dropdown__search-engine-menu");
let openWithDropdown = document.getElementById("dropdown__open-with-menu");
+ let currentTransportDropdown = document.getElementById("dropdown__transport-menu");
let bareUrlInput = document.getElementById("bare-url-input");
let searxngUrlInput = document.getElementById("searxng-url-input");
let savedSearxngUrl = localStorage.getItem("alu__searxngUrl");
@@ -308,22 +309,31 @@ const t = useTranslations(lang);
// Proxy settings
applyInputListeners(bareUrlInput, "alu__bareUrl");
applyInputListeners(searxngUrlInput, "alu__searxngUrl");
+ [selectedProxyDropdown, openWithDropdown, currentTransportDropdown].forEach((dropdown) => {
+ let dropdownButton = document.getElementById(dropdown.id.replace("-menu", ""))
+ console.log(dropdownButton)
+ applyDropdownEventListeners(
+ dropdown,
+ dropdownButton.id,
+ dropdownButton.dataset.localStorageKey
+ );
+ });
applyDropdownEventListeners(
searchEngineDropdown,
"dropdown__search-engine",
- "alu__search_engine",
+ "alu__searchEngine",
checkSearxng
);
- applyDropdownEventListeners(
- selectedProxyDropdown,
- "dropdown__selected-proxy",
- "alu__selectedProxy"
- );
- applyDropdownEventListeners(
- openWithDropdown,
- "dropdown__open-with",
- "alu__selectedOpenWith"
- );
+ // applyDropdownEventListeners(
+ // selectedProxyDropdown,
+ // "dropdown__selected-proxy",
+ // "alu__selectedProxy"
+ // );
+ // applyDropdownEventListeners(
+ // openWithDropdown,
+ // "dropdown__open-with",
+ // "alu__selectedOpenWith"
+ // );
if (localStorage.getItem("bareUrl")) {
bareUrlInput.value = localStorage.getItem("bareUrl");
} else {
@@ -339,8 +349,8 @@ const t = useTranslations(lang);
function checkSearxng() {
// This function checks if the "searxng" option was clicked, display an additional option if so.
- if (localStorage.getItem("alu__search_engine")) {
- if (JSON.parse(localStorage.getItem("alu__search_engine")).value.toLowerCase() == "searx") {
+ if (localStorage.getItem("alu__searchEngine")) {
+ if (JSON.parse(localStorage.getItem("alu__searchEngine")).value.toLowerCase() == "searx") {
document.getElementsByClassName("setting__searxng-url")[0].style.opacity = "1";
} else {
document.getElementsByClassName("setting__searxng-url")[0].style.opacity = "0";
@@ -461,7 +471,7 @@ const t = useTranslations(lang);
position: relative;
gap: 25px;
}
- @media (max-width: 880px) {
+ @media (max-width: 1116px) {
.popup {
flex-direction: column;
min-height: 80%;
@@ -517,7 +527,7 @@ const t = useTranslations(lang);
height: calc(50% - 72px);
border-radius: 0 32px 0 0;
}
- @media (min-width: 880px) {
+ @media (min-width: 1116px) {
#setting-tab-proxy:checked ~ .marker {
transform: translateY(0%);
}
diff --git a/src/components/TransportManager.astro b/src/components/TransportManager.astro
index 547c467..49966b4 100644
--- a/src/components/TransportManager.astro
+++ b/src/components/TransportManager.astro
@@ -3,12 +3,19 @@
const wispURLDefault =
(location.protocol === "https:" ? "wss://" : "ws://") + location.host + "/wisp/";
class TransportManager {
- private transport = localStorage.getItem("alu__currentTransport") || "EpxMod.EpoxyClient";
+ private transport = "EpxMod.EpoxyClient";
constructor(transport?: string) {
if (transport) {
this.transport = transport;
}
+ if (localStorage.getItem("alu__selectedTransport") != null && !transport) {
+ this.transport = JSON.parse(localStorage.getItem("alu__selectedTransport")!).value;
+ }
+ if (localStorage.getItem("alu__selectedTransport") == null) {
+ // Set the default transport for the next reload.
+ localStorage.setItem("alu__selectedTransport", JSON.stringify({ value: this.transport }));
+ }
}
getTransport() {
return this.transport;
@@ -20,6 +27,6 @@
}
}
const TransportMgr = new TransportManager();
- registerRemoteListener(navigator.serviceWorker.controller);
+ registerRemoteListener(navigator.serviceWorker.controller!);
TransportMgr.setTransport(TransportMgr.getTransport());
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 0b5c433..b4b1361 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -40,6 +40,7 @@
"settings.proxy.openPageWith": "Open With",
"settings.proxy.openPageWith.embed": "Embed",
"settings.proxy.openPageWith.newTab": "New Tab",
+ "settings.proxy.selectedTransport": "Transport",
"settings.proxy.searxngURL": "Searx URL",
"settings.proxy.bareURL": "Bare URL",
diff --git a/src/pages/[lang]/index.astro b/src/pages/[lang]/index.astro
index 336a536..6a4f224 100644
--- a/src/pages/[lang]/index.astro
+++ b/src/pages/[lang]/index.astro
@@ -15,6 +15,12 @@ export function getStaticPaths() {
+
+
+
{t("menu.welcome")}