Merge pull request #424 from hoppscotch/main

Create a new pull request by comparing changes across two branches

Author: GulajavaMinistudio

.github/workflows/deploy-netlify.yml

@@ -12,15 +12,15 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v3
 
+      - name: Setup Environment
+        run: mv packages/hoppscotch-app/.env.example packages/hoppscotch-app/.env
+
       - name: Setup and run pnpm install
         uses: pnpm/[email protected]
         with:
           version: 7
           run_install: true
 
-      - name: Setup Environment
-        run: mv packages/hoppscotch-app/.env.example packages/hoppscotch-app/.env
-
       - name: Build Site
         env:
           VITE_SENTRY_DSN: ${{ secrets.SENTRY_DSN }}

.github/workflows/deploy-staging-netlify.yml

@@ -15,6 +15,8 @@ jobs:
 
       - name: Setup and run pnpm install
         uses: pnpm/[email protected]
+        env:
+          VITE_BACKEND_GQL_URL: ${{ secrets.STAGING_BACKEND_GQL_URL }}
         with:
           version: 7
           run_install: true

.github/workflows/tests.yml

@@ -19,6 +19,8 @@ jobs:
       - uses: actions/setup-node@v2
       - name: Setup and run pnpm install
         uses: pnpm/[email protected]
+        env:
+          VITE_BACKEND_GQL_URL: ${{ secrets.BACKEND_GQL_URL }}
         with:
           version: 7
           run_install: true

Dockerfile

@@ -17,11 +17,13 @@ COPY . .
 
 RUN npm install -g pnpm
 
+RUN mv packages/hoppscotch-app/.env.example packages/hoppscotch-app/.env
+
 RUN pnpm i --unsafe-perm=true
 
 ENV HOST 0.0.0.0
 EXPOSE 3000
 
-RUN mv packages/hoppscotch-app/.env.example packages/hoppscotch-app/.env
+RUN pnpm run generate
 
-CMD ["pnpm", "run", "start", "--host", "0.0.0.0"]
+CMD ["pnpm", "run", "start"]

TRANSLATIONS.md

@@ -11,10 +11,10 @@ if there is no existing translation, you can create a new one by following these
 1. **[Fork the repository](https://github.com/hoppscotch/hoppscotch/fork).**
 2. **Checkout the `i18n` branch for latest translations.**
 3. **Create a new branch for your translation with base branch `i18n`.**
-4. **Create target language file in the [`locales`](https://github.com/hoppscotch/hoppscotch/tree/main/packages/hoppscotch-app/locales) directory.**
-5. **Copy the contents of the source file [`locales/en.json`](https://github.com/hoppscotch/hoppscotch/blob/main/packages/hoppscotch-app/locales/en.json) to the target language file.**
+4. **Create target language file in the [`/packages/hoppscotch-app/locales`](https://github.com/hoppscotch/hoppscotch/tree/main/packages/hoppscotch-app/locales) directory.**
+5. **Copy the contents of the source file [`/packages/hoppscotch-app/locales/en.json`](https://github.com/hoppscotch/hoppscotch/blob/main/packages/hoppscotch-app/locales/en.json) to the target language file.**
 6. **Translate the strings in the target language file.**
-7. **Add your language entry to [`languages.json`](https://github.com/hoppscotch/hoppscotch/blob/main/packages/hoppscotch-app/languages.json).**
+7. **Add your language entry to [`/packages/hoppscotch-app/languages.json`](https://github.com/hoppscotch/hoppscotch/blob/main/packages/hoppscotch-app/languages.json).**
 8. **Save & commit changes.**
 9. **Send a pull request.**
 

firebase.json

@@ -5,7 +5,7 @@
   },
   "hosting": {
     "predeploy": [
-      "cd packages/hoppscotch-app && mv .env.example .env && cd ../.. && npm install -g pnpm && pnpm i && pnpm run generate"
+      "mv packages/hoppscotch-app/.env.example packages/hoppscotch-app/.env && npm install -g pnpm && pnpm i && pnpm run generate"
     ],
     "public": "packages/hoppscotch-app/dist",
     "ignore": ["firebase.json", "**/.*", "**/node_modules/**"],

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hoppscotch-app",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "Open source API development ecosystem",
   "author": "Hoppscotch ([email protected])",
   "private": true,
@@ -10,7 +10,7 @@
     "prepare": "husky install",
     "dev": "pnpm -r do-dev",
     "generate": "pnpm -r do-build-prod",
-    "start": "pnpm -r do-prod-start",
+    "start": "http-server packages/hoppscotch-app/dist -p 3000",
     "lint": "pnpm -r do-lint",
     "typecheck": "pnpm -r do-typecheck",
     "lintfix": "pnpm -r do-lintfix",
@@ -27,6 +27,7 @@
   "devDependencies": {
     "@commitlint/cli": "^16.2.3",
     "@commitlint/config-conventional": "^16.2.1",
-    "@types/node": "^17.0.24"
+    "@types/node": "^17.0.24",
+    "http-server": "^14.1.1"
   }
 }

packages/hoppscotch-app/.env.example

@@ -14,8 +14,9 @@ VITE_MESSAGING_SENDER_ID=421993993223
 VITE_APP_ID=1:421993993223:web:ec0baa8ee8c02ffa1fc6a2
 VITE_MEASUREMENT_ID=G-BBJ3R80PJT
 
-# Base URL
+# Base URLs
 VITE_BASE_URL=https://hoppscotch.io
+VITE_SHORTCODE_BASE_URL=https://hopp.sh
 
 # Backend URLs
 VITE_BACKEND_GQL_URL=https://api.hoppscotch.io/graphql

packages/hoppscotch-app/assets/scss/styles.scss

@@ -455,6 +455,7 @@ pre.ace_editor {
   @apply px-1;
   @apply border border-dividerDark;
   @apply shadow-sm;
+  @apply <sm:hidden;
 }
 
 .capitalize-first {
@@ -469,6 +470,10 @@ details summary::-webkit-details-marker {
   @apply hidden;
 }
 
+details summary .indicator {
+  @apply transition;
+}
+
 details[open] summary .indicator {
   @apply transform;
   @apply rotate-90;

packages/hoppscotch-app/gql-codegen.yml

@@ -1,5 +1,6 @@
 overwrite: true
-schema: https://api.hoppscotch.io/graphql
+schema:
+  - ${VITE_BACKEND_GQL_URL}
 generates:
   src/helpers/backend/graphql.ts:
     documents: "src/**/*.graphql"