style: added icons to the custom prompts

afonsosousah · Jun 7, 2024 · 1711cdb · 1711cdb
1 parent ae30004
commit 1711cdb
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 27 deletions.
diff --git a/assets/style.css b/assets/style.css
@@ -2185,15 +2185,6 @@ input:-webkit-autofill:active{
  margin-top: 0.5rem;
  font-size: 0.8rem;
 }
-/* For landscape (useful for prompt in navigation) */
-@media screen and (orientation: landscape) {
- #alertBox {
- width: 40%;
- min-height: 10%;
- border-radius: 20px;
- background-color: #fff;
- }
- }
 /* #endregion */
 
 /* #region Trip history */
@@ -3172,4 +3163,26 @@ input:-webkit-autofill:active{
  margin-bottom: -12dvh;
  }
  /* #endregion */
+
+ /* #region Custom alert box */
+ #alertBox {
+ width: 40%;
+ min-height: 10%;
+ }
+ #alertBox #title {
+ color: var(--green);
+ font-weight: bold;
+ font-size: 1.2rem;
+ display: block;
+ margin-top: 1rem;
+ margin-left: 1.5rem;
+ margin-bottom: 0.75rem;
+ }
+ #alertBox p {
+ padding: 1.5rem;
+ margin: 0;
+ font-size: 0.9rem;
+ }
+ /* #endregion */
+
 }
diff --git a/index.html b/index.html
@@ -130,6 +130,15 @@
  navigator.storage.persist().then(isPersisted => console.log(`Persisted storage granted: ${isPersisted}`));
  }
 
+ // Import eruda on eruda flag set to true
+ if (/eruda=true/.test(window.location)) {
+ document.write("<scr" + 'ipt src="//cdn.jsdelivr.net/npm/eruda"></scr' + "ipt>");
+ document.write("<scr" + "ipt>eruda.init();</scr" + "ipt>");
+ //const erudaBtn = document.querySelector(".eruda-entry-btn");
+ //console.log(erudaBtn);
+ //erudaBtn?.style.top = "2vh";
+ }
+
  // Check if the user has set customProxy. if not, use default proxy
  const tempCustomProxy = getCookie("customProxy");
  if (tempCustomProxy) {

diff --git a/scripts/bikes.js b/scripts/bikes.js
@@ -514,7 +514,7 @@ async function rateTrip(tripCode, tripCost) {
  if (success) {
  ratedTripsList.push(tripCode); // store that this trip was already rated, to not prompt again
  payTrip(tripCode, tripCost); // Pay the trip after rating it
- alert("Agradecemos o feedback!"); // Thank the user for the feedback
+ alert("Agradecemos o feedback!", `<i class="bi bi-heart"></i>`); // Thank the user for the feedback
  } else {
  alert("Não foi possível avaliar a viagem."); // Error
  }
@@ -529,7 +529,7 @@ async function rateTrip(tripCode, tripCost) {
  if (success) {
  ratedTripsList.push(tripCode); // store that this trip was already rated, to not prompt again
  payTrip(tripCode, tripCost); // Pay the trip after rating it
- alert("Agradecemos o feedback!"); // Thank the user for the feedback
+ alert("Agradecemos o feedback!", `<i class="bi bi-heart"></i>`); // Thank the user for the feedback
  } else {
  alert("Não foi possível avaliar a viagem."); // Error
  }
@@ -541,7 +541,7 @@ async function rateTrip(tripCode, tripCost) {
  if (success) {
  ratedTripsList.push(tripCode); // store that this trip was already rated, to not prompt again
  payTrip(tripCode, tripCost); // Pay the trip after rating it
- alert("Agradecemos o feedback!"); // Thank the user for the feedback
+ alert("Agradecemos o feedback!", `<i class="bi bi-heart"></i>`); // Thank the user for the feedback
  } else {
  alert("Não foi possível avaliar a viagem.");
  }

diff --git a/scripts/dialogs.js b/scripts/dialogs.js
@@ -8,11 +8,9 @@ function createCustomAlert(message, title = null) {
  const alertObj = mObj.appendChild(document.createElement("div"));
  alertObj.id = "alertBox";
 
- if (title) {
- const titleObj = alertObj.appendChild(document.createElement("span"));
- titleObj.id = "title";
- titleObj.innerHTML = title;
- }
+ const titleObj = alertObj.appendChild(document.createElement("span"));
+ titleObj.id = "title";
+ titleObj.innerHTML = title ?? "";
 
  const msg = alertObj.appendChild(document.createElement("p"));
  msg.innerHTML = message;

diff --git a/scripts/requests.js b/scripts/requests.js
@@ -60,7 +60,10 @@ async function makePostRequest(url, body, accessToken = null) {
  alert("Já tem uma viagem a decorrer.");
  } else if (responseObject.errors[0].message === "no_bike_found") {
  alert("Bicicleta não encontrada.");
- } else if (responseObject.errors[0].message === "bike_on_repair") {
+ } else if (
+ responseObject.errors[0].message === "bike_on_repair" ||
+ responseObject.errors[0].message === "bike_in_repair"
+ ) {
  alert("Bicicleta a ser reparada.");
  } else if (responseObject.errors[0].message !== "Error executing document.") {
  // Show general error message for unknown errors

diff --git a/scripts/routing.js b/scripts/routing.js
@@ -494,13 +494,6 @@ function showSearchBar() {
  function doneTyping() {
  searchPlace();
  }
-
- // define a custom alert box
- if (document.getElementById) {
- window.alert = message =>
- // set timeout so that if the user clicks on the place where the button is, it doesn't get automatically clicked
- setTimeout(() => createCustomAlert(message), 50);
- }
 }
 
 async function searchPlace() {

diff --git a/scripts/user.js b/scripts/user.js
@@ -319,7 +319,7 @@ async function openUserSettings() {
  proxyURL = document.getElementById("proxyUrlInput").value;
  createCookie("customProxy", encodeURI(proxyURL), expiryDate);
 
- alert("O proxy foi definido.");
+ alert("O proxy foi definido.", `<i class="bi bi-info-circle"></i>`);
  });
 
  document.getElementById("resetProxyButton").addEventListener("click", () => {
@@ -330,7 +330,7 @@ async function openUserSettings() {
  // Update input
  document.getElementById("proxyUrlInput").value = proxyURL;
 
- alert("O proxy foi redefinido.");
+ alert("O proxy foi redefinido.", `<i class="bi bi-info-circle"></i>`);
  });
 
  // Handle value change on distance to station selector