Merge branch 'main' of https://github.com/Infisical/infisical

Infisical · Nov 30, 2022 · 1f63454 · 1f63454
2 parents 8e2794f + 6468b35
commit 1f63454
Show file tree

Hide file tree

Showing 14 changed files with 156 additions and 34 deletions.
diff --git a/README.md b/README.md
@@ -257,7 +257,7 @@ We're currently setting the foundation and building [integrations](https://infis
 
 ## Open-source vs. paid
 
-This repo is entirely MIT licensed, with the exception of the `ee` directory which will contain premium enterprise features requring a Infisical license in the future. We're currently focused on developing non-enterprise offerings first that should suit most use-cases.
+This repo is entirely MIT licensed, with the exception of the `ee` directory which will contain premium enterprise features requiring a Infisical license in the future. We're currently focused on developing non-enterprise offerings first that should suit most use-cases.
 
 ## Security
 
@@ -271,4 +271,4 @@ Looking to report a security vulnerability? Please don't post about it in GitHub
 <!-- prettier-ignore-start -->
 <!-- markdownlint-disable -->
 
-<a href="https://github.com/dangtony98"><img src="https://avatars.githubusercontent.com/u/25857006?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/mv-turtle"><img src="https://avatars.githubusercontent.com/u/78047717?s=96&v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/maidul98"><img src="https://avatars.githubusercontent.com/u/9300960?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/hanywang2"><img src="https://avatars.githubusercontent.com/u/44352119?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/tobias-mintlify"><img src="https://avatars.githubusercontent.com/u/110702161?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/gangjun06"><img src="https://avatars.githubusercontent.com/u/50910815?v=4" width="50" height="50" alt=""/></a>
+<a href="https://github.com/dangtony98"><img src="https://avatars.githubusercontent.com/u/25857006?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/mv-turtle"><img src="https://avatars.githubusercontent.com/u/78047717?s=96&v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/maidul98"><img src="https://avatars.githubusercontent.com/u/9300960?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/gangjun06"><img src="https://avatars.githubusercontent.com/u/50910815?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/hanywang2"><img src="https://avatars.githubusercontent.com/u/44352119?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/tobias-mintlify"><img src="https://avatars.githubusercontent.com/u/110702161?v=4" width="50" height="50" alt=""/></a> <a href="https://github.com/0xflotus"><img src="https://avatars.githubusercontent.com/u/26602940?v=4" width="50" height="50" alt=""/></a> 
diff --git a/docs/cli/overview.mdx b/docs/cli/overview.mdx
@@ -95,3 +95,9 @@ The Infisical CLI provides a way to inject environment variables from the platfo
 
    </Tab>
 </Tabs>
+
+## Log in to the Infisical CLI
+
+```bash
+infisical login
+```
diff --git a/docs/cli/usage.mdx b/docs/cli/usage.mdx
@@ -4,12 +4,6 @@ title: "Usage"
 
 Prerequisite: [Install the CLI](/cli/overview)
 
-## Log in to the Infisical CLI
-
-```bash
-infisical login
-```
-
 ## Initialize Infisical for your project
 
 ```bash
@@ -29,11 +23,11 @@ infisical run -- [your application start command]
 
 Options you can specify:
 
-| Option         | Description                                                                                                 | Default value |
-| -------------  | ----------------------------------------------------------------------------------------------------------- | ------------- |
-| `--env`        | Used to set the environment that secrets are pulled from. Accepted values: `dev`, `staging`, `test`, `prod` | `dev`         |
-| `--projectId`  | Used to link a local project to the platform (required only if injecting via the service token method)      | `None`        |
-| `--expand`     | Parse shell parameter expansions in your secrets (e.g., `${DOMAIN}`)      | `true`        |
+| Option        | Description                                                                                                 | Default value |
+| ------------- | ----------------------------------------------------------------------------------------------------------- | ------------- |
+| `--env`       | Used to set the environment that secrets are pulled from. Accepted values: `dev`, `staging`, `test`, `prod` | `dev`         |
+| `--projectId` | Used to link a local project to the platform (required only if injecting via the service token method)      | `None`        |
+| `--expand`    | Parse shell parameter expansions in your secrets (e.g., `${DOMAIN}`)                                        | `true`        |
 
 ## Examples:
 

diff --git a/docs/integrations/frameworks/angular.mdx b/docs/integrations/frameworks/angular.mdx
diff --git a/docs/integrations/frameworks/django.mdx b/docs/integrations/frameworks/django.mdx
@@ -2,4 +2,20 @@
 title: "Django"
 ---
 
-Instructions coming soon.
+Prerequisite: [Install the CLI](/cli/overview)
+
+## Initialize Infisical for your [Django](https://www.djangoproject.com) project
+
+```bash
+# move to your Django project
+cd /path/to/project
+
+# initialize infisical
+infisical init
+```
+
+## Start your server with environment variables injected
+
+```bash
+infisical run -- python manage.py runserver
+```
diff --git a/docs/integrations/frameworks/fibre.mdx → docs/integrations/frameworks/fiber.mdx b/docs/integrations/frameworks/fibre.mdx → docs/integrations/frameworks/fiber.mdx
@@ -1,5 +1,5 @@
 ---
-title: "Fibre"
+title: "Fiber"
 ---
 
 Coming soon.
diff --git a/docs/integrations/frameworks/nextjs.mdx b/docs/integrations/frameworks/nextjs.mdx
@@ -4,7 +4,7 @@ title: "Next.js"
 
 Prerequisite: [Install the CLI](/cli/overview)
 
-## Initialize Infisical for your [Next.js](https://nextjs.org)
+## Initialize Infisical for your [Next.js](https://nextjs.org) app
 
 ```bash
 # move to your Next.js app

diff --git a/docs/integrations/frameworks/nuxt.mdx b/docs/integrations/frameworks/nuxt.mdx
@@ -2,4 +2,32 @@
 title: "Nuxt"
 ---
 
-Instructions coming soon.
+Prerequisite: [Install the CLI](/cli/overview)
+
+## Initialize Infisical for your [Nuxt](https://nuxtjs.org) app
+
+```bash
+# move to your Nuxt app
+cd /path/to/project
+
+# initialize infisical
+infisical init
+```
+
+## Modify the start script in your `package.json`
+
+```json
+...
+"scripts": {
+    "dev": "infisical run -- nuxt",
+    "build": "infisical run -- nuxt build",
+    "start": "infisical run -- nuxt start"
+}
+...
+```
+
+## Start your development server with environment variables injected
+
+```bash
+npm run dev
+```
diff --git a/docs/integrations/frameworks/rails.mdx b/docs/integrations/frameworks/rails.mdx
@@ -2,4 +2,20 @@
 title: "Ruby on Rails"
 ---
 
-Instructions coming soon.
+Prerequisite: [Install the CLI](/cli/overview)
+
+## Initialize Infisical for your [Rails](https://rubyonrails.org) app
+
+```bash
+# move to your Rails app
+cd /path/to/project
+
+# initialize infisical
+infisical init
+```
+
+## Start your server with environment variables injected
+
+```bash
+infisical run -- bin/rails server
+```
diff --git a/docs/integrations/frameworks/remix.mdx b/docs/integrations/frameworks/remix.mdx
@@ -2,4 +2,37 @@
 title: "Remix"
 ---
 
-Instructions coming soon.
+Prerequisite: [Install the CLI](/cli/overview)
+
+## Initialize Infisical for your [Remix](https://remix.run) app
+
+```bash
+# move to your Vue app
+cd /path/to/project
+
+# initialize infisical
+infisical init
+```
+
+## Modify the start script in your `package.json`
+
+```json
+...
+"scripts": {
+    ...
+    "dev": "infisical run -- run-p dev:*",
+    "start": "infisical run -- remix-serve build"
+    ...
+}
+...
+```
+
+## Start your server with environment variables injected
+
+```bash
+npm run build && npm run start
+
+# or start development server
+
+npm run dev
+```
diff --git a/docs/integrations/frameworks/vue.mdx b/docs/integrations/frameworks/vue.mdx
@@ -2,4 +2,38 @@
 title: "Vue"
 ---
 
-Coming soon.
+Prerequisite: [Install the CLI](/cli/overview)
+
+## Initialize Infisical for your [Vue](https://vuejs.org) app
+
+```bash
+# move to your Vue app
+cd /path/to/project
+
+# initialize infisical
+infisical init
+```
+
+## Modify the start script in your `package.json`
+
+```json
+...
+"scripts": {
+    "serve": "infisical run -- vue-cli-service serve",
+    "build": "infisical run -- vue-cli-service build",
+    "lint": "infisical run -- vue-cli-service lint"
+}
+...
+```
+
+## Start your development server with environment variables injected
+
+```bash
+npm run serve
+```
+
+<Note>
+  Note that for environment variables to be exposed to the client, you'll have
+  to prefix them with `VUE_APP` Read more about that
+  [here](https://cli.vuejs.org/guide/mode-and-env.html).
+</Note>
diff --git a/docs/integrations/overview.mdx b/docs/integrations/overview.mdx
@@ -23,17 +23,16 @@ Missing an integration? Throw in a [request](https://github.com/Infisical/infisi
 | GitHub Actions                                           | CI/CD     | Coming soon |
 | Jenkins                                                  | CI/CD     | Coming soon |
 | [React](/integrations/frameworks/react)                  | Framework | Available   |
-| [Vue](/integrations/frameworks/vue)                      | Framework | Coming soon |
-| [Angular](/integrations/frameworks/angular)              | Framework | Coming soon |
+| [Vue](/integrations/frameworks/vue)                      | Framework | Available   |
 | [Express](/integrations/frameworks/express)              | Framework | Available   |
 | [Next.js](/integrations/frameworks/nextjs)               | Framework | Available   |
 | [NestJS](/integrations/frameworks/nestjs)                | Framework | Available   |
-| [Nuxt](/integrations/frameworks/nuxt)                    | Framework | Coming soon |
+| [Nuxt](/integrations/frameworks/nuxt)                    | Framework | Available   |
 | [Gatsby](/integrations/frameworks/gatsby)                | Framework | Available   |
-| [Remix](/integrations/frameworks/remix)                  | Framework | Coming soon |
+| [Remix](/integrations/frameworks/remix)                  | Framework | Available   |
 | [Vite](/integrations/frameworks/vite)                    | Framework | Available   |
-| [Fibre](/integrations/frameworks/fibre)                  | Framework | Coming soon |
-| [Django](/integrations/)                                 | Framework | Coming soon |
+| [Fiber](/integrations/frameworks/fiber)                  | Framework | Coming soon |
+| [Django](/integrations/frameworks/django)                | Framework | Available   |
 | [Flask](/integrations/frameworks/flask)                  | Framework | Available   |
 | [Laravel](/integrations/frameworks/laravel)              | Framework | Coming soon |
-| [Ruby on Rails](/integrations/frameworks/rails)          | Framework | Coming soon |
+| [Ruby on Rails](/integrations/frameworks/rails)          | Framework | Available   |
diff --git a/docs/mint.json b/docs/mint.json
@@ -135,13 +135,14 @@
       "pages": [
         "integrations/frameworks/react",
         "integrations/frameworks/vue",
-        "integrations/frameworks/angular",
         "integrations/frameworks/express",
         "integrations/frameworks/nextjs",
         "integrations/frameworks/nestjs",
+        "integrations/frameworks/nuxt",
         "integrations/frameworks/gatsby",
         "integrations/frameworks/remix",
         "integrations/frameworks/vite",
+        "integrations/frameworks/fiber",
         "integrations/frameworks/django",
         "integrations/frameworks/flask",
         "integrations/frameworks/laravel",

diff --git a/frontend/pages/settings/billing/[id].js b/frontend/pages/settings/billing/[id].js
@@ -51,7 +51,7 @@ export default function SettingsBilling() {
       orgId: localStorage.getItem("orgData.id"),
     });
 
-    setCurrentPlan(subscriptions.data[0].plan.product);
+    setCurrentPlan(subscriptions.data[0].plan.id);
     const orgUsers = await getOrganizationUsers({
       orgId: localStorage.getItem("orgData.id"),
     });