diff --git a/.github/ISSUE_TEMPLATE/--bug-report.yaml b/.github/ISSUE_TEMPLATE/--bug-report.yaml new file mode 100644 index 000000000..1ba4e015a --- /dev/null +++ b/.github/ISSUE_TEMPLATE/--bug-report.yaml @@ -0,0 +1,57 @@ +name: Bug report +description: Create a bug report to help us improve Hoppscotch +title: "[bug]: " +labels: [bug, need testing] +body: +- type: markdown + attributes: + value: | + Thank you for taking the time to fill out this bug report. +- type: checkboxes + attributes: + label: Is there an existing issue for this? + description: Please search to see if an issue already exists for the bug you encountered + options: + - label: I have searched the existing issues + required: true +- type: textarea + attributes: + label: Current behavior + description: A concise description of what you're experiencing and what you expect + placeholder: | + When I do , happens and I see the error message attached below: + ```...``` + What I expect is + validations: + required: true +- type: textarea + attributes: + label: Steps to reproduce + description: Add steps to reproduce this behaviour, include console or network logs and screenshots + placeholder: | + 1. Go to '...' + 2. Click on '....' + 3. Scroll down to '....' + 4. See error + validations: + required: true +- type: dropdown + id: env + attributes: + label: Environment + options: + - Production + - Release + - Deploy preview + validations: + required: true +- type: dropdown + id: version + attributes: + label: Version + options: + - Cloud + - Self-hosted + - Local + validations: + required: true diff --git a/.github/ISSUE_TEMPLATE/--feature-request.yaml b/.github/ISSUE_TEMPLATE/--feature-request.yaml new file mode 100644 index 000000000..9baddac7d --- /dev/null +++ b/.github/ISSUE_TEMPLATE/--feature-request.yaml @@ -0,0 +1,28 @@ +name: Feature request +description: Suggest a feature to improve Hoppscotch +title: "[feature]: " +labels: [feature] +body: +- type: markdown + attributes: + value: | + Thank you for taking the time to request a feature for Hoppscotch +- type: checkboxes + attributes: + label: Is there an existing issue for this? + description: Please search to see if an issue related to this feature request already exists + options: + - label: I have searched the existing issues + required: true +- type: textarea + attributes: + label: Summary + description: One paragraph description of the feature + validations: + required: true +- type: textarea + attributes: + label: Why should this be worked on? + description: A concise description of the problems or use cases for this feature request + validations: + required: true diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index dd84ea782..000000000 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,38 +0,0 @@ ---- -name: Bug report -about: Create a report to help us improve -title: '' -labels: '' -assignees: '' - ---- - -**Describe the bug** -A clear and concise description of what the bug is. - -**To Reproduce** -Steps to reproduce the behavior: -1. Go to '...' -2. Click on '....' -3. Scroll down to '....' -4. See error - -**Expected behavior** -A clear and concise description of what you expected to happen. - -**Screenshots** -If applicable, add screenshots to help explain your problem. - -**Desktop (please complete the following information):** - - OS: [e.g. iOS] - - Browser [e.g. chrome, safari] - - Version [e.g. 22] - -**Smartphone (please complete the following information):** - - Device: [e.g. iPhone6] - - OS: [e.g. iOS8.1] - - Browser [e.g. stock browser, safari] - - Version [e.g. 22] - -**Additional context** -Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 000000000..83bb3b57f --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,7 @@ +contact_links: + - name: Help and support + url: https://github.com/hoppscotch/hoppscotch#support + about: Reach out to us on our Discord server or Telegram group or GitHub discussions. + - name: Dedicated support + url: mailto:support@hoppscotch.io + about: Write to us if you'd like dedicated support using Hoppscotch diff --git a/.github/ISSUE_TEMPLATE/custom.md b/.github/ISSUE_TEMPLATE/custom.md deleted file mode 100644 index b894315f4..000000000 --- a/.github/ISSUE_TEMPLATE/custom.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: Custom issue template -about: Describe this issue template's purpose here. -title: '' -labels: '' -assignees: '' - ---- diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md deleted file mode 100644 index bbcbbe7d6..000000000 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ /dev/null @@ -1,20 +0,0 @@ ---- -name: Feature request -about: Suggest an idea for this project -title: '' -labels: '' -assignees: '' - ---- - -**Is your feature request related to a problem? Please describe.** -A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] - -**Describe the solution you'd like** -A clear and concise description of what you want to happen. - -**Describe alternatives you've considered** -A clear and concise description of any alternative solutions or features you've considered. - -**Additional context** -Add any other context or screenshots about the feature request here. diff --git a/README.md b/README.md index 44cb7f561..9173dd690 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ #### **Support** -[![Chat on Discord](https://img.shields.io/badge/chat-Discord-7289DA?logo=discord)](https://hoppscotch.io/discord) [![Chat on Telegram](https://img.shields.io/badge/chat-Telegram-2CA5E0?logo=Telegram)](https://hoppscotch.io/telegram) +[![Chat on Discord](https://img.shields.io/badge/chat-Discord-7289DA?logo=discord)](https://hoppscotch.io/discord) [![Chat on Telegram](https://img.shields.io/badge/chat-Telegram-2CA5E0?logo=telegram)](https://hoppscotch.io/telegram) [![Discuss on GitHub](https://img.shields.io/badge/discussions-GitHub-333333?logo=github)](https://github.com/hoppscotch/hoppscotch/discussions)
Table of contents diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 000000000..a1140ff21 --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,26 @@ +# Security Policy + +This document outlines security procedures and general policies for the Hoppscotch project. + +1. [Reporting a security vulnerability](#reporting-a-security-vulnerability) +3. [Incident response process](#incident-response-process) + +## Reporting a security vulnerability + +Report security vulnerabilities by emailing the Hoppscotch Support team at support@hoppscotch.io. + +The primary security point of contact from Hoppscotch Support team will acknowledge your email within 48 hours, and will send a more detailed response within 48 hours indicating the next steps in handling your report. After the initial reply to your report, the security team will endeavor to keep you informed of the progress towards a fix and full announcement, and may ask for additional information or guidance. + +**Do not create a GitHub issue ticket to report a security vulnerability.** + +The Hoppscotch team and community take all security vulnerability reports in Hoppscotch seriously. Thank you for improving the security of Hoppscotch. We appreciate your efforts and responsible disclosure and will make every effort to acknowledge your contributions. + +Report security bugs in third-party modules to the person or team maintaining the module. + +## Incident response process + +In case an incident is discovered or reported, we will follow the following process to contain, respond, and remediate: + +1. Confirm the problem and determine the affected versions. +2. Audit code to find any potential similar problems. +3. Prepare fixes for all releases still under maintenance. These fixes will be deployed as fast as possible to production. diff --git a/package.json b/package.json index e584efd3b..d18aa98e2 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,7 @@ "description": "Open source API development ecosystem", "author": "Hoppscotch (support@hoppscotch.io)", "private": true, + "license": "MIT", "scripts": { "preinstall": "npx only-allow pnpm", "prepare": "husky install", @@ -20,10 +21,10 @@ ], "dependencies": { "husky": "^7.0.4", - "lint-staged": "^12.0.2" + "lint-staged": "^12.0.3" }, "devDependencies": { - "@commitlint/cli": "^14.1.0", - "@commitlint/config-conventional": "^14.1.0" + "@commitlint/cli": "^15.0.0", + "@commitlint/config-conventional": "^15.0.0" } } diff --git a/packages/codemirror-lang-graphql/package.json b/packages/codemirror-lang-graphql/package.json index 7e5c7bbb0..5e76a0077 100644 --- a/packages/codemirror-lang-graphql/package.json +++ b/packages/codemirror-lang-graphql/package.json @@ -2,6 +2,7 @@ "name": "@hoppscotch/codemirror-lang-graphql", "version": "0.1.0", "description": "GraphQL language support for CodeMirror", + "author": "Hoppscotch (support@hoppscotch.io)", "scripts": { "prepare": "rollup -c" }, @@ -22,10 +23,10 @@ "devDependencies": { "@lezer/generator": "^0.15.0", "mocha": "^9.0.1", - "rollup": "^2.35.1", - "rollup-plugin-dts": "^3.0.2", - "rollup-plugin-ts": "^1.4.0", - "typescript": "^4.3.4" + "rollup": "^2.60.0", + "rollup-plugin-dts": "^4.0.1", + "rollup-plugin-ts": "^2.0.4", + "typescript": "^4.5.2" }, "license": "MIT" } diff --git a/packages/hoppscotch-app/assets/scss/styles.scss b/packages/hoppscotch-app/assets/scss/styles.scss index 6ab9329dd..342a09166 100644 --- a/packages/hoppscotch-app/assets/scss/styles.scss +++ b/packages/hoppscotch-app/assets/scss/styles.scss @@ -35,13 +35,8 @@ @apply bg-divider; } -.cm-focused { - @apply !outline-none; -} - input::placeholder, -textarea::placeholder, -.CodeMirror-empty { +textarea::placeholder { @apply text-secondary; @apply opacity-25; } @@ -318,7 +313,7 @@ pre.ace_editor { &.toasted-primary { @apply bg-tooltip; @apply text-primary; - @apply justify-start; + @apply justify-between; @apply shadow; @apply font-medium; @apply transition; @@ -391,7 +386,7 @@ pre.ace_editor { .smart-splitter .splitpanes__splitter::before { @apply absolute; @apply inset-0; - @apply bg-dividerLight; + @apply bg-accentLight; @apply opacity-0; @apply z-20; @apply transition; @@ -435,29 +430,16 @@ pre.ace_editor { @apply w-full; } -.CodeMirror { - @apply !h-auto; +.cm-focused { + @apply select-auto; + @apply !outline-none; - font-size: var(--body-font-size); - - &:not(.CodeMirror-focused) .CodeMirror-activeline-background { - background: transparent !important; - } - - .CodeMirror-dialog-top { + .cm-activeLine { @apply bg-primaryLight; - @apply border-dividerLight; - @apply px-4; - @apply py-2; - @apply z-5; } - .CodeMirror-scroll { - @apply min-h-64; - } - - * { - font-family: "Roboto Mono", monospace; + .cm-activeLineGutter { + @apply bg-primaryDark; } } diff --git a/packages/hoppscotch-app/assets/scss/themes.scss b/packages/hoppscotch-app/assets/scss/themes.scss index db587efd1..1422e34eb 100644 --- a/packages/hoppscotch-app/assets/scss/themes.scss +++ b/packages/hoppscotch-app/assets/scss/themes.scss @@ -53,17 +53,17 @@ } @mixin dark-editor-theme { - --editor-type-color: theme("colors.purple.500"); - --editor-name-color: theme("colors.blue.500"); - --editor-operator-color: theme("colors.indigo.500"); - --editor-invalid-color: theme("colors.red.500"); - --editor-separator-color: theme("colors.gray.500"); - --editor-meta-color: theme("colors.gray.500"); - --editor-variable-color: theme("colors.green.500"); - --editor-link-color: theme("colors.cyan.500"); - --editor-process-color: theme("colors.gray.400"); - --editor-constant-color: theme("colors.fuchsia.500"); - --editor-keyword-color: theme("colors.pink.500"); + --editor-type-color: theme("colors.purple.400"); + --editor-name-color: theme("colors.blue.400"); + --editor-operator-color: theme("colors.indigo.400"); + --editor-invalid-color: theme("colors.red.400"); + --editor-separator-color: theme("colors.gray.400"); + --editor-meta-color: theme("colors.gray.400"); + --editor-variable-color: theme("colors.green.400"); + --editor-link-color: theme("colors.cyan.400"); + --editor-process-color: theme("colors.fuchsia.400"); + --editor-constant-color: theme("colors.violet.400"); + --editor-keyword-color: theme("colors.pink.400"); } @mixin light-editor-theme { @@ -82,15 +82,15 @@ @mixin black-editor-theme { --editor-type-color: theme("colors.purple.400"); - --editor-name-color: theme("colors.gray.400"); + --editor-name-color: theme("colors.fuchsia.400"); --editor-operator-color: theme("colors.indigo.400"); --editor-invalid-color: theme("colors.red.400"); --editor-separator-color: theme("colors.gray.400"); --editor-meta-color: theme("colors.gray.400"); --editor-variable-color: theme("colors.green.400"); --editor-link-color: theme("colors.cyan.400"); - --editor-process-color: theme("colors.blue.400"); - --editor-constant-color: theme("colors.fuchsia.400"); + --editor-process-color: theme("colors.violet.400"); + --editor-constant-color: theme("colors.blue.400"); --editor-keyword-color: theme("colors.pink.400"); } diff --git a/packages/hoppscotch-app/components/app/Footer.vue b/packages/hoppscotch-app/components/app/Footer.vue index 5af66c1a4..9fdc06d7e 100644 --- a/packages/hoppscotch-app/components/app/Footer.vue +++ b/packages/hoppscotch-app/components/app/Footer.vue @@ -4,7 +4,7 @@
- +
- {{ `${$t("app.name")} ${$t("app.version")}` }} + {{ `${t("app.name")} ${t("app.version")}` }}
@@ -116,19 +116,19 @@ - diff --git a/packages/hoppscotch-app/components/app/Fuse.vue b/packages/hoppscotch-app/components/app/Fuse.vue index 0de11459d..c46e66b6a 100644 --- a/packages/hoppscotch-app/components/app/Fuse.vue +++ b/packages/hoppscotch-app/components/app/Fuse.vue @@ -15,7 +15,7 @@ > manage_search - {{ $t("state.nothing_found") }} "{{ search }}" + {{ t("state.nothing_found") }} "{{ search }}"
@@ -26,6 +26,9 @@ import { computed, onUnmounted, onMounted } from "@nuxtjs/composition-api" import Fuse from "fuse.js" import { useArrowKeysNavigation } from "~/helpers/powerSearchNavigation" import { HoppAction } from "~/helpers/actions" +import { useI18n } from "~/helpers/utils/composables" + +const t = useI18n() const props = defineProps<{ input: Record[] diff --git a/packages/hoppscotch-app/components/app/GitHubStarButton.vue b/packages/hoppscotch-app/components/app/GitHubStarButton.vue index 6d299d5fb..671144be9 100644 --- a/packages/hoppscotch-app/components/app/GitHubStarButton.vue +++ b/packages/hoppscotch-app/components/app/GitHubStarButton.vue @@ -18,19 +18,13 @@ - diff --git a/packages/hoppscotch-app/components/app/Header.vue b/packages/hoppscotch-app/components/app/Header.vue index 4f3614ff2..8566bd728 100644 --- a/packages/hoppscotch-app/components/app/Header.vue +++ b/packages/hoppscotch-app/components/app/Header.vue @@ -15,21 +15,21 @@
@@ -86,13 +86,13 @@ @@ -110,18 +110,20 @@ diff --git a/packages/hoppscotch-app/components/app/Share.vue b/packages/hoppscotch-app/components/app/Share.vue index 5ef47d9b2..72ba621c1 100644 --- a/packages/hoppscotch-app/components/app/Share.vue +++ b/packages/hoppscotch-app/components/app/Share.vue @@ -1,12 +1,12 @@