Merge branch 'Infisical:main' into feat/translation-fr

.github/workflows/docker-image.yml

@@ -1,4 +1,4 @@
-name: Push to Docker Hub
+name: Push frontend and backend to Dockerhub
 
 on: [workflow_dispatch]
 
@@ -17,6 +17,13 @@ jobs:
         uses: docker/setup-qemu-action@v2
       - name: 🔧 Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
+      - name: Cache Docker layers
+        uses: actions/cache@v3
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
       - name: 🐋 Login to Docker Hub
         uses: docker/login-action@v2
         with:
@@ -28,6 +35,8 @@ jobs:
           load: true
           context: backend
           tags: infisical/backend:test
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
       - name: ⏻ Spawn backend container and dependencies
         run: |
           docker compose -f .github/resources/docker-compose.be-test.yml up --wait --quiet-pull
@@ -45,6 +54,15 @@ jobs:
           tags: infisical/backend:${{ steps.commit.outputs.short }}, 
                 infisical/backend:latest
           platforms: linux/amd64,linux/arm64
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+      - # Temp fix
+        # https://github.com/docker/build-push-action/issues/252
+        # https://github.com/moby/buildkit/issues/1896
+        name: Move cache
+        run: |
+          rm -rf /tmp/.buildx-cache
+          mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
   frontend-image:
     name: Build frontend image
@@ -60,6 +78,13 @@ jobs:
         uses: docker/setup-qemu-action@v2
       - name: 🔧 Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
+      - name: Cache Docker layers
+        uses: actions/cache@v3
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
       - name: 🐋 Login to Docker Hub
         uses: docker/login-action@v2
         with:
@@ -71,6 +96,8 @@ jobs:
           load: true
           context: frontend
           tags: infisical/frontend:test
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
           build-args: |
             POSTHOG_API_KEY=${{ secrets.PUBLIC_POSTHOG_API_KEY }}
       - name: ⏻ Spawn frontend container
@@ -90,5 +117,14 @@ jobs:
           tags: infisical/frontend:${{ steps.commit.outputs.short }}, 
                 infisical/frontend:latest
           platforms: linux/amd64,linux/arm64
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
           build-args: |
             POSTHOG_API_KEY=${{ secrets.PUBLIC_POSTHOG_API_KEY }}
+      - # Temp fix
+        # https://github.com/docker/build-push-action/issues/252
+        # https://github.com/moby/buildkit/issues/1896
+        name: Move cache
+        run: |
+          rm -rf /tmp/.buildx-cache
+          mv /tmp/.buildx-cache-new /tmp/.buildx-cache

.github/workflows/release_build.yml

@@ -1,4 +1,4 @@
-name: Go releaser
+name: Build and release CLI
 
 on:
   push:

README.md

@@ -337,6 +337,6 @@ Infisical officially launched as v.1.0 on November 21st, 2022. There are a lot o
 
 ## 🌎 Translations
 
-Infisical is currently aviable in English and Korean. Help us translate Infisical to your language! 
+Infisical is currently available in English and Korean. Help us translate Infisical to your language! 
 
 You can find all the info in [this issue](https://github.com/Infisical/infisical/issues/181).

frontend/components/basic/Layout.tsx

@@ -211,9 +211,11 @@ export default function Layout({ children }: LayoutProps) {
         const intendedWorkspaceId = router.asPath
           .split("/")
           [router.asPath.split("/").length - 1].split("?")[0];
+        
+        localStorage.setItem("projectData.id", intendedWorkspaceId);
         // If a user is not a member of a workspace they are trying to access, just push them to one of theirs
         if (
-          intendedWorkspaceId != "heroku" &&
+          !["heroku", "vercel", "github", "netlify"].includes(intendedWorkspaceId) &&
           !userWorkspaces
             .map((workspace: { _id: string }) => workspace._id)
             .includes(intendedWorkspaceId)
@@ -259,14 +261,14 @@ export default function Layout({ children }: LayoutProps) {
             .split("/")
             [router.asPath.split("/").length - 1].split("?")[0]
       ) {
-        router.push(
-          "/dashboard/" +
-            workspaceMapping[workspaceSelected as any]
-        );
         localStorage.setItem(
           "projectData.id",
           `${workspaceMapping[workspaceSelected as any]}`
         );
+        router.push(
+          "/dashboard/" +
+            workspaceMapping[workspaceSelected as any]
+        );
       }
     } catch (error) {
       console.log(error);

frontend/public/locales/en/integrations.json

@@ -4,7 +4,7 @@
   "no-integrations1": "You don't have any integrations set up yet. When you do, they will appear here.",
   "no-integrations2": "To start, click on any of the options below. It takes 5 clicks to set up.",
   "available": "Platform & Cloud Integrations",
-  "available-text1": "Click on the itegration you want to connect. This will let your environment variables flow automatically into selected third-party services.",
+  "available-text1": "Click on the integration you want to connect. This will let your environment variables flow automatically into selected third-party services.",
   "available-text2": "Note: during an integration with Heroku, for security reasons, it is impossible to maintain end-to-end encryption. In theory, this lets Infisical decrypt yor environment variables. In practice, we can assure you that this will never be done, and it allows us to protect your secrets from bad actors online. The core Infisical service will always stay end-to-end encrypted. With any questions, reach out support@infisical.com.",
   "cloud-integrations": "Cloud Integrations",
   "framework-integrations": "Framework Integrations",

frontend/public/locales/en/settings-members.json

@@ -1,4 +1,4 @@
 {
   "title": "Project Members",
-  "description": "This pages shows the members of the selected project."
+  "description": "This page shows the members of the selected project."
 }

frontend/public/locales/en/signup.json

@@ -1,7 +1,7 @@
 {
   "title": "Sign Up",
   "og-title": "Replace .env files with 1 line of code. Sign Up for Infisical in 3 minutes.",
-  "og-description": "Infisical a simple end-to-end encrypted platform that enables teams to sync and manage API-keys and environemntal variables.  Works with Node.js, Next.js, Gatsby, Nest.js...",
+  "og-description": "Infisical a simple end-to-end encrypted platform that enables teams to sync and manage API-keys and environemntal variables. Works with Node.js, Next.js, Gatsby, Nest.js...",
   "signup": "Sign Up",
   "already-have-account": "Have an account? Log in",
   "forgot-password": "Forgot your password?",

i18n/README.en.md

@@ -325,6 +325,6 @@ Infisical officially launched as v.1.0 on November 21st, 2022. However, a lot of
 
 ## 🌎 Translations
 
-Infisical is currently aviable in English and Korean. Help us translate Infisical to your language! 
+Infisical is currently available in English and Korean. Help us translate Infisical to your language! 
 
 You can find all the info in [this issue](https://github.com/Infisical/infisical/issues/181).