Merge branch 'dev' into main

warengonzaga · warengonzaga · commit b2470c8a4253 · 2022-04-01T04:13:03.000+08:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,6 +1,6 @@
-version: '2.1'
+version: 2.1
 orbs:
-    node: circleci/node@4.2.1
+    node: circleci/node@5.0.2
 jobs:
     build-and-test:
         docker:
diff --git a/.github/ISSUE_TEMPLATE/BUG.yml b/.github/ISSUE_TEMPLATE/BUG.yml
@@ -0,0 +1,60 @@
+name: 🐛 Bug Report
+description: Found a bug? Let us know!
+labels: ["bug","pending"]
+assignees:
+  - warengonzaga
+body:
+
+  # not existing bug block
+  - type: checkboxes
+    id: bug-confirm
+    attributes:
+      label: 🤔 Not Existing Bug?
+      description: Please search to see if an issue already exists for the bug you encountered.
+      options:
+      - label: Yes, I'm sure that this is a bug!
+        required: true
+
+  # current results block
+  - type: textarea
+    id: bug-current-behavior
+    attributes:
+      label: 👀 Current Behavior
+      description: A concise description of what you're experiencing.
+      placeholder: I see bugs flying around ewww... please help! 😭
+    validations:
+      required: true
+
+  # expected behavior block
+  - type: textarea
+    id: bug-expected-behavior
+    attributes:
+      label: 🎯 Expected Behavior
+      description: A concise description of what you expected to happen.
+      placeholder: Bugs supposed to crawl not fly... peaceful life! 🥰
+    validations:
+      required: true
+
+  # steps to reproduce block
+  - type: textarea
+    id: bug-steps-to-reproduce
+    attributes:
+      label: 📋 Steps To Reproduce
+      description: Steps to reproduce the behavior.
+      placeholder: |
+        1. I go outside and see a bug. 😁
+        2. The bug starts to crawl and fly, like wtf! 😱
+        3. Run!!! 🏃
+        4. Bugs chasing me while flying! 😫
+    validations:
+      required: false
+
+  # terms block
+  - type: checkboxes
+    id: bug-terms
+    attributes:
+      label: 📜 Code of Conduct
+      description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/wareneutron/covid19-tracker-cli/blob/main/CODE_OF_CONDUCT.md).
+      options:
+        - label: I agree to follow this project's [Code of Conduct](https://github.com/wareneutron/covid19-tracker-cli/blob/main/CODE_OF_CONDUCT.md).
+          required: true
diff --git a/.github/ISSUE_TEMPLATE/CONFIG.yml b/.github/ISSUE_TEMPLATE/CONFIG.yml
@@ -0,0 +1,11 @@
+blank_issues_enabled: false
+contact_links:
+  - name: 🙏 Q&A Forum
+    url: https://github.com/wareneutron/covid19-tracker-cli/discussions/new?category=q-a
+    about: Have a question? Let us know!
+  - name: 🧠 Suggestions
+    url: https://github.com/wareneutron/covid19-tracker-cli/discussions/new?category=brainstorm
+    about: Have an idea or suggestion? Let us know!
+  - name: 📚 Documentation
+    url: https://docs.wareneutron.com/covid19-tracker-cli
+    about: Official Documentation for COVID-19 Tracker & CLI
diff --git a/.github/ISSUE_TEMPLATE/FEATURE.yml b/.github/ISSUE_TEMPLATE/FEATURE.yml
@@ -0,0 +1,48 @@
+name: 🚀 Feature Request
+description: Have a feature request? Let us know!
+labels: ["feature","pending"]
+assignees:
+  - warengonzaga
+body:
+
+  # new feature request block
+  - type: checkboxes
+    id: feature-confirm-notexist
+    attributes:
+      label: 🤔 Not Existing Feature Request?
+      description: Please search to see if your feature request already exist.
+      options:
+      - label: Yes, I'm sure, this is a new requested feature!
+        required: true
+
+  # not idea or suggestion block
+  - type: checkboxes
+    id: feature-confirm-notsuggestion
+    attributes:
+      label: 🤔 Not an Idea or Suggestion?
+      description: |
+        Please make sure that you're submitting a request not just an idea or suggestion.
+        If this is an idea or suggestion I would recommend going [here](https://github.com/wareneutron/covid19-tracker-cli/discussions/new?category=brainstorm) first before submitting a request.
+      options:
+      - label: Yes, I'm sure, this is not idea or suggestion!
+        required: true
+
+  # details block
+  - type: textarea
+    id: feature-details
+    attributes:
+      label: 📋 Request Details
+      description: A concise description of your feature request.
+      placeholder: Add some rainbows and unicorns to it! 🌈🦄
+    validations:
+      required: true
+
+  # terms block
+  - type: checkboxes
+    id: feature-terms
+    attributes:
+      label: 📜 Code of Conduct
+      description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/wareneutron/covid19-tracker-cli/blob/main/CODE_OF_CONDUCT.md).
+      options:
+        - label: I agree to follow this project's [Code of Conduct](https://github.com/wareneutron/covid19-tracker-cli/blob/main/CODE_OF_CONDUCT.md).
+          required: true
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,16 @@ dist/
 .DS_Store
 .now
 .env
+.dccache
+
+# yarn
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+
+# vercel
+.vercel
diff --git a/.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs b/.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
diff --git a/.yarn/releases/yarn-3.2.0.cjs b/.yarn/releases/yarn-3.2.0.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -0,0 +1,7 @@
+nodeLinker: node-modules
+
+plugins:
+  - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
+    spec: "@yarnpkg/plugin-interactive-tools"
+
+yarnPath: .yarn/releases/yarn-3.2.0.cjs
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -4,7 +4,7 @@ Any contributions are welcome, encouraged, and valued. See the following informa
 
 ## 📋 Code of Conduct
 
-This project and everyone participating in it is governed by the COVID-19 Tracker & CLI [Code of Conduct](https://github.com/wareneutron/covid19-tracker-cli/blob/main/code_of_conduct.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to <opensource@wareneutron.com>.
+This project and everyone participating in it is governed by the COVID-19 Tracker & CLI [Code of Conduct](https://github.com/wareneutron/covid19-tracker-cli/blob/main/CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to <opensource@wareneutron.com>.
 
 ## 💖 How to Contribute
 
@@ -24,7 +24,7 @@ Answering a question in [Discussions](https://github.com/wareneutron/covid19-tra
 
 ### 🐞 Reporting Bugs
 
-For any security bugs or issues, please read the [security policy](./security.md).
+For any security bugs or issues, please read the [security policy](./SECURITY.md).
 
 ---
 
diff --git a/README.md b/README.md
@@ -1,6 +1,8 @@
 # COVID-19 Tracker & CLI [![mentioned in awesome coronavirus](https://awesome.re/mentioned-badge-flat.svg)](https://github.com/soroushchehresa/awesome-coronavirus) [![huntr](https://cdn.huntr.dev/huntr_security_badge_mono.svg)](https://huntr.dev)
 
-[![created by](https://img.shields.io/badge/created%20by-Waren%20Gonzaga-blue.svg?longCache=true&style=flat-square)](https://github.com/warengonzaga) [![maintained by](https://img.shields.io/badge/maintained%20by-Wareneutron%20Developers-blue.svg?longCache=true&style=flat-square)](https://wareneutron.com) [![Build](https://img.shields.io/circleci/build/github/wareneutron/covid19-tracker-cli/main?style=flat-square)](https://github.com/wareneutron/covid19-tracker-cli) [![Release](https://img.shields.io/github/release/wareneutron/covid19-tracker-cli.svg?style=flat-square)](https://github.com/wareneutron/covid19-tracker-cli/releases) [![Star](https://img.shields.io/github/stars/wareneutron/covid19-tracker-cli.svg?style=flat-square)](https://github.com/wareneutron/covid19-tracker-cli/stargazers) [![License](https://img.shields.io/github/license/wareneutron/covid19-tracker-cli.svg?style=flat-square)](https://github.com/wareneutron/covid19-tracker-cli/blob/main/LICENSE)
+[![created by](https://img.shields.io/badge/created%20by-Waren%20Gonzaga-blue.svg?longCache=true&style=flat-square)](https://github.com/warengonzaga) [![maintained by](https://img.shields.io/badge/maintained%20by-Wareneutron%20Developers-blue.svg?longCache=true&style=flat-square)](https://wareneutron.com) ![status](https://img.shields.io/badge/status-Maintenance-yellow.svg?longCache=true&style=flat-square) [![Build](https://img.shields.io/circleci/build/github/wareneutron/covid19-tracker-cli/main?style=flat-square)](https://github.com/wareneutron/covid19-tracker-cli) [![Release](https://img.shields.io/github/release/wareneutron/covid19-tracker-cli.svg?style=flat-square)](https://github.com/wareneutron/covid19-tracker-cli/releases) [![Star](https://img.shields.io/github/stars/wareneutron/covid19-tracker-cli.svg?style=flat-square)](https://github.com/wareneutron/covid19-tracker-cli/stargazers) [![License](https://img.shields.io/github/license/wareneutron/covid19-tracker-cli.svg?style=flat-square)](https://github.com/wareneutron/covid19-tracker-cli/blob/main/LICENSE)
+
+> 📢 Nominate ([@WarenGonzaga](https://warengonzaga.com)) as **[GitHub Star](https://stars.github.com/nominate)**. If you appreciate his hardwork and dedication to open source.
 
 [![Banner](.github/wareneutron_covid19_tracker_cli_github_banner.png)](https://docs.wareneutron.com/covid19-tracker-cli)
 
@@ -20,31 +22,29 @@ The complete documentation can be found here:
 
 ## 🎯 Contributing
 
-Contributions are welcome, create a pull request to this repo and we'll review your code. Please consider submitting your pull request to the ```dev``` branch. Thank you!
+Contributions are welcome, create a pull request to this repo and we will review your code. Please consider to submit your pull request to the ```dev``` branch. Thank you!
 
-Read the project's [contributing guide](./contributing.md) for more info.
+Read the project's [contributing guide](./CONTRIBUTING.md) for more info.
 
-## 🐛 Issues
+## 💬 Discussions
 
-If you're facing a problem in using COVID-19 Tracker & CLI please let us know by [creating an issue here](https://github.com/wareneutron/covid19-tracker-cli/issues/new). We are happy to help you! Don't forget to provide us some screenshot or errors of it, thank you!
+For any questions, suggestions, ideas, or simply you want to share your experience in using this project, feel free to share and discuss it to the [community](https://github.com/wareneutron/covid19-tracker-cli/discussions)!
 
-## 🏆 Sponsors and Supporters
+## 🐛 Issues
 
-[![vercel](https://wrngnz.ga/badge-vercel)](https://vercel.com) [![circleci](https://wrngnz.ga/badge-circleci)](https://circleci.com) [![gitbook](https://wrngnz.ga/badge-gitbook)](https://gitbook.io) [![digital ocean](https://wrngnz.ga/badge-digitalocean)](https://digitalocean.com) [![netlify](https://wrngnz.ga/badge-netlify)](https://netlify.com)
+Please report any issues and bugs by [creating a new issue here](https://github.com/wareneutron/covid19-tracker-cli/issues/new/choose), also make sure you're reporting an issue that doesn't exist. Any help to improve the project would be appreciated. Thanks! 🙏✨
 
-> Love what we do? **[Send us some coffees](https://buymeacoff.ee/wareneutron)**!
->
-> Your coffee donation and support will help us to continue working on open-source projects like this.
+## 🍀 Sponsors and Supporters
 
-## 🌏 Community
+[![Vercel](https://img.shields.io/badge/Vercel-%23000.svg?&style=for-the-badge&logo=vercel&logoColor=white)](https://vercel.com) [![CircleCI](https://img.shields.io/badge/CircleCI-%23000.svg?&style=for-the-badge&logo=CircleCI&logoColor=white)](https://vercel.com) [![GitBook](https://img.shields.io/badge/GitBook-%233884FF.svg?&style=for-the-badge&logo=gitbook&logoColor=white)](https://gitbook.io) [![Digital Ocean](https://img.shields.io/badge/Digital%20Ocean-%230080ff.svg?&style=for-the-badge&logo=digitalocean&logoColor=white)](https://digitalocean.com) [![StackHawk](https://img.shields.io/badge/Stackhawk-%2300CBC6.svg?&style=for-the-badge&logoColor=white)](https://stackhawk.com)
 
-Wanna become one of us? Join today and contribute!
-
-[![community](https://discordapp.com/api/guilds/694612151444439081/widget.png?style=banner2)](https://wareneutron.com/discord) [![community](https://discordapp.com/api/guilds/659684980137656340/widget.png?style=banner2)](https://wrngnz.ga/discord)
+> Love what we do? **[Send me some coffees](https://buymeacoff.ee/wareneutron)**! ☕☕☕
+>
+> Your coffee donation and support will us to continue working on open-source projects like this. 🙏😇
 
 ## 📋 Code of Conduct
 
-Read the project's [code of conduct](./code_of_conduct.md).
+Read the project's [code of conduct](./CODE_OF_CONDUCT.md).
 
 ## 📃 License
 
@@ -54,6 +54,8 @@ COVID-19 Tracker & CLI is licensed under [GNU General Public License v3.0](https
 
 COVID-19 Tracker & CLI is created by **[Waren Gonzaga](https://github.com/warengonzaga)**, developed and maintained by [Wareneutron Developers](https://wareneutron.com) with the help of awesome [contributors](https://github.com/wareneutron/covid19-tracker-cli/graphs/contributors).
 
+[![contributors](https://contrib.rocks/image?repo=wareneutron/covid19-tracker-cli)](https://github.com/wareneutron/covid19-tracker-cli/graphs/contributors)
+
 ---
 
 💻 Made with 💖 and ☕ by [Wareneutron Developers](https://wareneutron.com)
diff --git a/SECURITY.md b/SECURITY.md
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "covid19trackercli",
-    "version": "4.1.1",
+    "version": "4.1.2",
     "description": "Track global COVID-19 cases from command line interface.",
     "main": "dist/api.js",
     "scripts": {
@@ -29,28 +29,29 @@
     "author": "Waren Gonzaga",
     "license": "GPL-3.0",
     "devDependencies": {
-        "@types/asciichart": "^1.5.4",
-        "@types/blessed": "^0.1.17",
-        "@types/express": "^4.17.11",
-        "@types/minimist": "^1.2.1",
-        "@types/morgan": "^1.9.2",
-        "@types/node": "^14.14.35",
-        "nodemon": "^2.0.7",
-        "ts-node": "^9.1.1"
+        "@types/asciichart": "^1.5.6",
+        "@types/blessed": "^0.1.19",
+        "@types/express": "^4.17.13",
+        "@types/minimist": "^1.2.2",
+        "@types/morgan": "^1.9.3",
+        "@types/node": "15.9.0",
+        "nodemon": "^2.0.15",
+        "ts-node": "^10.7.0"
     },
     "bin": {
         "covid": "./dist/cli.js"
     },
     "dependencies": {
         "asciichart": "^1.5.25",
-        "axios": "^0.21.2",
+        "axios": "^0.26.1",
         "blessed": "^0.1.81",
-        "blessed-contrib": "^4.8.21",
+        "blessed-contrib": "^4.11.0",
         "colors": "^1.4.0",
-        "express": "^4.17.1",
+        "express": "^4.17.3",
         "minimist": "^1.2.6",
         "morgan": "^1.10.0",
-        "typescript": "^4.2.3",
+        "typescript": "^4.6.3",
         "world-countries": "^4.0.0"
-    }
+    },
+    "packageManager": "yarn@3.2.0"
 }
diff --git a/src/api.ts b/src/api.ts
@@ -10,7 +10,7 @@ import { lines } from "./utils/libs/getResponses";
 const port = parseInt(process.env.PORT!) || 7070;
 
 const app = express();
-app.use(morgan("common"));
+app.use(morgan("tiny"));
 app.use("/history/web/charts", dashboardRouter);
 
 app.use(userAgentMiddleware);
diff --git a/src/utils/libs/getResponses.ts b/src/utils/libs/getResponses.ts
@@ -10,7 +10,7 @@ export const lines = {
     helpMessage: `Help: Try to append the URL with /help to learn more...`,
     sponsorMessage: `Love this project? Help us to help others by means of coffee!\n`,
     BMCLink: `Buy Us a Coffee - wareneutron.com/donate`,
-    twitterPlug: `Follow the lead dev on twitter for more updates!\n`,
+    twitterPlug: `Follow the lead maintainer on twitter for more updates!\n`,
     handleHashtag: ["@warengonzaga", "#covid19trackercli"],
     docsLink: "Docs: docs.wareneutron.com/covid19-tracker-cli",
     WNrepoLink: "Repo: repo.wareneutron.com/covid19-tracker-cli",
diff --git a/vercel.json b/vercel.json
@@ -10,7 +10,7 @@
         {
             "headers": {
                 "Access-Control-Allow-Origin": "*",
-                "Access-Control-Allow-Methods": "GET, POST, PUT, DELETE, OPTIONS",
+                "Access-Control-Allow-Methods": "GET",
                 "Access-Control-Allow-Headers": "X-Requested-With, Content-Type, Accept"
             },
             "src": "/.*",
@@ -21,4 +21,4 @@
         "VERSION": "1",
         "FORCE_COLOR": "1"
     }
-}
+}
diff --git a/yarn.lock b/yarn.lock
