Merge branch 'main' into feat/email-auth

.github/workflows/tests.yml

@@ -0,0 +1,26 @@
+name: Node.js CI
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [14.x]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+      - run: npm ci
+      - run: npm run build --if-present
+      - run: npm test

.travis.yml

@@ -1,34 +0,0 @@
-# == INSTRUCTIONS FOR SETTING UP TRAVIS ==
-#
-# 1. Find this repository in your Travis-CI dashboard.
-#    open settings and add an environment variable called
-#    GITHUB_ACCESS_TOKEN and set it to your personal access token.addons:
-#    See: https://help.github.com/en/articles/creating-a-personal-access-token-for-the-command-line
-#
-#    **DO NOT TURN ON 'Display value in build log'!!!!**
-#
-# 2. Push the code to the repository.
-
-language: node_js
-node_js:
-  - lts/*
-
-os: linux
-
-cache: npm
-
-branches:
-  only:
-    - main
-
-install:
-  - npm ci
-
-before_script:
-  - npm run build # use nuxt build and start to run tests
-
-script:
-  - npm test
-
-notifications:
-  webhooks: https://www.travisbuddy.com

README.md

@@ -10,7 +10,7 @@
   </p>
   <p>
 
-[![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen?logo=github)](CODE_OF_CONDUCT.md) [![Website](https://img.shields.io/website?url=https%3A%2F%2Fhoppscotch.io&logo=hoppscotch)](https://hoppscotch.io) [![Travis Build Status](https://img.shields.io/travis/com/hoppscotch/hoppscotch/main?logo=Travis)](https://travis-ci.com/hoppscotch/hoppscotch) [![Tweet](https://img.shields.io/twitter/url?url=https%3A%2F%2Fhoppscotch.io%2F)](https://twitter.com/share?text=%F0%9F%91%BD%20Hoppscotch%20%E2%80%A2%20Open%20source%20API%20development%20ecosystem%20-%20Helps%20you%20create%20requests%20faster,%20saving%20precious%20time%20on%20development.&url=https://hoppscotch.io&hashtags=hoppscotch&via=hoppscotch_io)
+[![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen?logo=github)](CODE_OF_CONDUCT.md) [![Website](https://img.shields.io/website?url=https%3A%2F%2Fhoppscotch.io&logo=hoppscotch)](https://hoppscotch.io) ![Tests](https://github.com/hoppscotch/hoppscotch/actions/workflows/tests.yml/badge.svg) [![Tweet](https://img.shields.io/twitter/url?url=https%3A%2F%2Fhoppscotch.io%2F)](https://twitter.com/share?text=%F0%9F%91%BD%20Hoppscotch%20%E2%80%A2%20Open%20source%20API%20development%20ecosystem%20-%20Helps%20you%20create%20requests%20faster,%20saving%20precious%20time%20on%20development.&url=https://hoppscotch.io&hashtags=hoppscotch&via=hoppscotch_io)
 
   </p>
   <p>
@@ -522,7 +522,7 @@ Please read [`CONTRIBUTING`](CONTRIBUTING.md) for details on our [`CODE OF CONDU
 
 ## **Continuous Integration**
 
-We use [Travis CI](https://travis-ci.com) for continuous integration. Check out our [Travis CI Status](https://travis-ci.com/hoppscotch/hoppscotch).
+We use [GitHub Actions](https://github.com/features/actions) for continuous integration. Check out our [Build Workflows](https://github.com/hoppscotch/hoppscotch/actions).
 
 ## **Changelog**
 

components/app/Header.vue

@@ -214,34 +214,34 @@ export default {
       })
     }
 
-    // let showAd = localStorage.getItem("showAd") === "no"
+    const showAd = localStorage.getItem("showAd") === "no"
-    // if (!showAd) {
+    if (!showAd) {
-    //   setTimeout(() => {
+      setTimeout(() => {
-    //     this.$toast.clear()
+        this.$toast.clear()
-    //     this.$toast.show(
+        this.$toast.show(
-    //       "<span><a href='https://github.com/sponsors/hoppscotch' target='_blank' rel='noopener'>Sponsor us to support Hoppscotch open source project 💖</a><br><sub>Whoosh this away to dismiss.</sub></span>",
+          "<span><a href='https://fundoss.org/collective/hoppscotch' target='_blank' rel='noopener'>Sponsor us to support Hoppscotch open source project 💖</a><br><sub>Whoosh this away to dismiss.</sub></span>",
-    //       {
+          {
-    //         icon: "",
+            icon: "",
-    //         duration: 0,
+            duration: 0,
-    //         theme: "toasted-ad",
+            theme: "toasted-ad",
-    //         action: [
+            action: [
-    //           {
+              {
-    //             text: "Sponsor",
+                text: "Donate",
-    //             icon: "chevron_right",
+                icon: "chevron_right",
-    //             onClick: (_, toastObject) => {
+                onClick: (_, toastObject) => {
-    //               localStorage.setItem("showAd", "no")
+                  localStorage.setItem("showAd", "no")
-    //               toastObject.goAway(0)
+                  toastObject.goAway(0)
-    //               window.open("https://github.com/sponsors/hoppscotch")
+                  window.open("https://fundoss.org/collective/hoppscotch")
-    //             },
+                },
-    //           },
+              },
-    //         ],
+            ],
-    //         onComplete() {
+            onComplete() {
-    //           localStorage.setItem("showAd", "no")
+              localStorage.setItem("showAd", "no")
-    //         },
+            },
-    //       }
+          }
-    //     )
+        )
-    //   }, 8000)
+      }, 6000)
-    // }
+    }
 
     // let showExtensionsToast = localStorage.getItem("showExtensionsToast") === "yes"
     // if (!showExtensionsToast) {