Merge branch 'main' into dependabot/npm_and_yarn/argparse-2.0.1

studiourbanna · Sep 18, 2023 · 38cc075 · 38cc075
2 parents 465983b + 08e196d
commit 38cc075
Show file tree

Hide file tree

Showing 5 changed files with 175 additions and 193 deletions.
diff --git a/.github/workflows/jekyll-gh-pages.yml b/.github/workflows/jekyll-gh-pages.yml
@@ -27,7 +27,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Pages
         uses: actions/configure-pages@v3
       - name: Build with Jekyll

diff --git a/.github/workflows/learn-github-actions.yml b/.github/workflows/learn-github-actions.yml
@@ -5,7 +5,7 @@ jobs:
   check-bats-version:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-node@v3
         with:
           node-version: '14'

diff --git a/assets/js/shorter.js b/assets/js/shorter.js
@@ -1,9 +1,35 @@
-//Encurtador
+/*
+ * Encurtador de links
+ * Autor: Camila Oliveira
+ * Data: 18/09/2023
+ */
+
+const brandLinks = /ourbanna\.com|portalurbanna\.com\.br/;
+var domain = "";
 
 document.getElementById("myinput").onclick = function () {
-    var link = document.getElementById("linkinput").value;
+  var link = document.getElementById("linkinput").value;
+  if (!link.trim() || link < "https://" || link < "http://") {
+    console.log("O link está vazio.");
+    document.getElementById("message").innerHTML =
+      "<div class='notification is-danger is-danger'>" +
+      "<div class='icon-text'>" +
+      "<span class='icon has-text-danger'><i class='fas fa-info-warning'></i></span>" +
+      "<span><strong>Hm, parece que o link não existe, vamos tentar novamente?</strong></span>" +
+      "</span>" +
+      "</div>" +
+      "</div>";
+  } else {
+    // Verifica se o link não contém os domínios permitidos
+    if (!brandLinks.test(link)) {
+      domain = "do.encurtai.com";
+      console.log("O link não contém os domínios permitidos.");
+    } else {
+      domain = "n.ourbanna.com";
+      console.log("O link contém um dos domínios permitidos.");
+    }
     var data = {
-      domain: "do.encurtai.com",
+      domain: domain,
       originalURL: link,
       allowDuplicates: false
     };
@@ -35,5 +61,5 @@ document.getElementById("myinput").onclick = function () {
           "</div>";
       });
     document.getElementById("linkinput").value = "";
-  };
-  
+  }
+};