Skip to content

Commit 7d65c54

Browse files
pwizlapwizla
committed
Port #1961 
1 parent ef1bec0 commit 7d65c54

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+392
-265
lines changed

‎docusaurus/docs/cloud/account/settings.md renamed to ‎docusaurus/docs/cloud/account/account-billing.md

Lines changed: 12 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,19 @@
11
---
2-
title: Account Settings
2+
title: Account billing details
33
displayed_sidebar: cloudSidebar
4-
description: View and manage your projects on Strapi Cloud.
5-
canonicalUrl: https://docs.strapi.io/cloud/account/settings.html
4+
description: Manage billing details for Strapi Cloud account.
5+
canonicalUrl: https://docs.strapi.io/cloud/account/account-billing.html
66
---
77

8-
# Account profile
8+
# Account billing details
99

10-
The *Profile* page enables you to manage your account details and preferences. It is accessible by clicking on your profile picture, on the top right hand corner of the interface, and **Profile**. There are 3 tabs available in the *Profile* interface: *General*, *Preferences* and *Billing*.
10+
Through the *Profile* page, accessible by clicking on your profile picture on the top right hand corner of the interface then clicking on **Profile**, you can access the *Billing* tab.
1111

12-
## General
12+
The *Billing* tab displays and enables you to modify the billing details and payment method set for the account. This information will by default be reused for every new project created with your Strapi Cloud account.
1313

14-
The *General* tab enables you to edit the following details for your account profile:
15-
16-
- Details: to see the name associated with your account.
17-
- Connected accounts: to manage Google and GitHub accounts connected with your Strapi Cloud account.
18-
- Delete account: to permanently delete your Strapi Cloud account (see [Deleting Strapi Cloud account](#deleting-strapi-cloud-account)).
19-
20-
<!-- TODO: replace with screenshot with connected accounts -->
21-
22-
<ThemedImage
23-
alt="General tab of Profile page"
24-
sources={{
25-
light: '/img/assets/cloud/settings-general.png',
26-
dark: '/img/assets/cloud/settings-general_DARK.png',
27-
}}
28-
/>
29-
30-
### Managing connected accounts
31-
32-
You can connect a Google account and a GitHub account to your Strapi Cloud account. The _Connected accounts_ section lists accounts that are currently connected to your Strapi Cloud account. From there you can also connect a new Google or GitHub account if one is not already connected.
33-
34-
To connect a new Google or GitHub account to your Strapi Cloud account, click on the **Connect account** button and follow the next steps on the corresponding website.
35-
36-
You can also click on the three dots button of a connected account and click on the "Manage on" button to manage your GitHub or Google account directly on the corresponding website.
37-
38-
### Deleting Strapi Cloud account
39-
40-
You can delete your Strapi Cloud account, but it will be permanent and irreversible. All associated projects and their data will be deleted as well and the subscriptions for the projects will automatically be canceled.
41-
42-
1. In the *Delete account* section of the *General* tab, click on the **Delete account** button.
43-
2. In the dialog, type `DELETE` in the textbox.
44-
3. Confirm the deletion of your account by clicking on the **Delete** button.
45-
46-
## Preferences
47-
48-
The *Preferences* tab enables you to choose the appearance of your Strapi Cloud dashboard: either the Light or Dark theme.
49-
50-
<ThemedImage
51-
alt="Preferences tab of Profile page"
52-
sources={{
53-
light: '/img/assets/cloud/account-preferences.png',
54-
dark: '/img/assets/cloud/account-preferences_DARK.png',
55-
}}
56-
/>
57-
58-
## Billing
59-
60-
The *Billing* tab displays your billing information and enables you to update your payment method.
14+
:::note
15+
The Payment method section can only be accessible once the mandatory fields of the Billing details section have been filled in.
16+
:::
6117

6218
<ThemedImage
6319
alt="Billing tab of Profile page"
@@ -67,7 +23,7 @@ The *Billing* tab displays your billing information and enables you to update yo
6723
}}
6824
/>
6925

70-
### Managing subscriptions
26+
## Managing subscriptions
7127

7228
Using the **Manage subscriptions** button, you can view and manage your subscriptions, account and billing information, and payment method.
7329

@@ -91,7 +47,7 @@ Using the **Manage subscriptions** button, you can view and manage your subscrip
9147
}}
9248
/>
9349

94-
### Edit subscription
50+
## Edit subscription
9551

9652
From the subscription management modal, you can view and modify any current subscription.
9753

@@ -109,7 +65,7 @@ From the subscription management modal, you can view and modify any current subs
10965
4. If you want to change plan (e.g. from Pro plan to Team plan), click on **Change** and select a new plan.
11066
5. Confirm your modifications by clicking on the **Update Subscription** button at the bottom of the modal.
11167

112-
### Cancel subscription
68+
## Cancel subscription
11369

11470
<ThemedImage
11571
alt="Subscription cancellation modal"

‎docusaurus/docs/cloud/account/account-settings.md

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
---
2+
title: Profile settings
3+
displayed_sidebar: cloudSidebar
4+
description: Manage Strapi Cloud account settings.
5+
canonicalUrl: https://docs.strapi.io/cloud/account/account-settings.html
6+
---
7+
8+
# Profile settings
9+
10+
The *Profile* page enables you to manage your account details and preferences. It is accessible by clicking on your profile picture, on the top right hand corner of the interface, and **Profile**.
11+
12+
There are 3 tabs available in the *Profile* interface: [*General*](#general), [*Preferences*](#preferences) and *Billing* (the latter is documented in the [Account billing details](/cloud/account/account-billing) section of this documentation).
13+
14+
## General
15+
16+
The *General* tab enables you to edit the following details for your account profile:
17+
18+
- Details: to see the name associated with your account.
19+
- Connected accounts: to manage Google, GitHub and GitLab accounts connected with your Strapi Cloud account (see [Managing connected accounts](#managing-connected-accounts)).
20+
- Delete account: to permanently delete your Strapi Cloud account (see [Deleting Strapi Cloud account](#deleting-strapi-cloud-account)).
21+
22+
<ThemedImage
23+
alt="General tab of Profile page"
24+
sources={{
25+
light: '/img/assets/cloud/settings-general.png',
26+
dark: '/img/assets/cloud/settings-general_DARK.png',
27+
}}
28+
/>
29+
30+
### Managing connected accounts
31+
32+
You can connect a Google, GitLab and GitHub account to your Strapi Cloud account. The _Connected accounts_ section lists accounts that are currently connected to your Strapi Cloud account. From there you can also connect a new Google, GitLab and GitHub account if one is not already connected.
33+
34+
To connect a new Google, GitLab or GitHub account to your Strapi Cloud account, click on the **Connect account** button and follow the next steps on the corresponding website.
35+
36+
You can also click on the three dots button of a connected account and click on the "Manage on" button to manage your GitHub, GitLab or Google account directly on the corresponding website.
37+
38+
### Deleting Strapi Cloud account
39+
40+
You can delete your Strapi Cloud account, but it will be permanent and irreversible. All associated projects and their data will be deleted as well and the subscriptions for the projects will automatically be canceled.
41+
42+
1. In the *Delete account* section of the *General* tab, click on the **Delete account** button.
43+
2. In the dialog, type `DELETE` in the textbox.
44+
3. Confirm the deletion of your account by clicking on the **Delete** button.
45+
46+
## Preferences
47+
48+
The *Preferences* tab enables you to choose the appearance of your Strapi Cloud dashboard: either the Light or Dark theme.
49+
50+
<ThemedImage
51+
alt="Preferences tab of Profile page"
52+
sources={{
53+
light: '/img/assets/cloud/account-preferences.png',
54+
dark: '/img/assets/cloud/account-preferences_DARK.png',
55+
}}
56+
/>

‎docusaurus/docs/cloud/advanced/email.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,10 @@ export default ({ env }) => ({
7777

7878
</Tabs>
7979

80+
:::caution
81+
The file structure must match the above path exactly, or the configuration will not be applied to Strapi Cloud.
82+
:::
83+
8084
Each provider will have different configuration settings available. Review the respective entry for that provider in the [Marketplace](https://market.strapi.io/providers).
8185

8286
**Example:**

‎docusaurus/docs/cloud/advanced/upload.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Using either `npm` or `yarn`, install the provider plugin in your local Strapi p
3535

3636
### Configure the Provider
3737

38-
>To configure a 3rd-party upload provider in your Strapi project, create or edit the plugins configuration file for your production environment `./config/env/production/plugins.js|ts` by adding upload configuration options as follows:
38+
To configure a 3rd-party upload provider in your Strapi project, create or edit the plugins configuration file for your production environment `./config/env/production/plugins.js|ts` by adding upload configuration options as follows:
3939

4040
<Tabs groupId="js-ts">
4141
<TabItem value="js" label="JavaScript">
@@ -76,6 +76,10 @@ upload: {
7676
</TabItem>
7777
</Tabs>
7878

79+
:::caution
80+
The file structure must match the above path exactly, or the configuration will not be applied to Strapi Cloud.
81+
:::
82+
7983
Each provider will have different configuration settings available. Review the respective entry for that provider in the [Marketplace](https://market.strapi.io/providers).
8084

8185
**Example:**

‎docusaurus/docs/cloud/getting-started/caching.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
sidebar_label: 'Caching for App Performance'
2+
sidebar_label: 'Caching for app performance'
33
displayed_sidebar: cloudSidebar
44
sidebar_position: 4
55
---

‎docusaurus/docs/cloud/getting-started/deployment.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
---
2-
title: Project Creation
2+
title: Project creation
33
displayed_sidebar: cloudSidebar
44
description: Learn how to deploy your Strapi application on Strapi Cloud.
55
canonicalUrl: https://docs.strapi.io/cloud/getting-started/deployment.html
66
sidebar_position: 2
77
---
88

9-
import NotV5 from '/docs/snippets/_not-updated-to-v5.md'
10-
119
# Project creation & deployment
1210

13-
<NotV5 />
1411
This is a step-by-step guide for creating and deploying your first project on Strapi Cloud.
1512

1613
:::prerequisites
@@ -160,7 +157,8 @@ Before you can deploy your Strapi application on Strapi Cloud, you need to have
160157
| Setting name | Instructions |
161158
|--------------|---------------------------------------------------------------------------------------------------------|
162159
| Base directory | Write the name of the directory where your Strapi app is located in the repository. This is useful if you have multiple Strapi apps in the same repository or if you have a monorepo. |
163-
| Variables | Click on **Add variable** to add environment variables used to configure your Strapi app (see [Environment variables](/dev-docs/configurations/environment/) for more information). You can also add environment variables to your Strapi application by adding a `.env` file to the root of your Strapi app directory. The environment variables defined in the `.env` file will be used by Strapi Cloud. |
160+
| Environment variables | Click on **Add variable** to add environment variables used to configure your Strapi app (see [Environment variables](/dev-docs/configurations/environment/) for more information). You can also add environment variables to your Strapi application by adding a `.env` file to the root of your Strapi app directory. The environment variables defined in the `.env` file will be used by Strapi Cloud. |
161+
| Node version | Choose a Node version from the drop-down. Default Node version will automatically be chosen to best match the version of your Strapi project. If you manually choose a version that doesn't match with your Strapi project, the build will fail but the explanation will be displayed in the build logs. |
164162

165163
:::strapi Using Environment Variables
166164
You can use environment variable to connect your project to an external database rather than the default one used by Strapi Cloud (see [database configuration](/dev-docs/configurations/database#environment-variables-in-database-configurations) for more details). If you would like to revert and use Strapi's default database again, you have to remove your `DATABASE_` environment variables (no automatic migration implied).

‎docusaurus/docs/cloud/getting-started/intro.md

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,6 @@ sidebar_position: 1
77

88
# Welcome to the Strapi Cloud Docs!
99

10-
<SubtleCallout title="Developer Docs, User Guide, and Strapi Cloud documentation" emoji="📍">
11-
12-
The documentation for Strapi contains 3 main sections, accessible from the top navigation bar:
13-
14-
- 🧑‍💻 The **[Developer Docs](/dev-docs/intro)** contain all the technical information related to the setup, advanced usage, customization, and update of your Strapi v5 application.
15-
- 🧑‍🏫 The **[User Guide](/user-docs/intro)** is all about using Strapi's admin panel.
16-
- ☁️ The **Strapi Cloud** documentation that you're currently reading is about deploying your Strapi application to Strapi Cloud and managing your Strapi Cloud projects and settings.
17-
18-
</SubtleCallout>
19-
2010
This documentation contains all technical documentation related to the setup, deployment, update and customization of your Strapi Cloud account and applications.
2111

2212
## What is Strapi Cloud

‎docusaurus/docs/cloud/getting-started/usage-billing.md

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,48 +6,47 @@ sidebar_position: 3
66

77
# Usage & Billing
88

9-
This page contains general information related to the usage and billing of your Strapi Cloud account and applications. Strapi Cloud offers a free 7-day trial for all new accounts and two paid plans: **Pro** and **Team**.
9+
This page contains general information related to the usage and billing of your Strapi Cloud account and projects.
1010

11-
The usage-based pricing for Strapi Cloud is based on the following criteria and limits:
11+
Strapi Cloud offers a free 14 days trial for all new accounts, and 2 paid plans: Pro and Team (see [Pricing page](https://strapi.io/pricing-cloud)). The usage-based pricing for Strapi Cloud is based on the following criteria and limits:
1212

1313
| Feature | Free Trial | Pro | Team |
1414
| --- | --- | --- | --- |
1515
| **Seats** | 10 | 10 | 20 |
16-
| **Database Entries** | 100,000 | 100,000 | 1,000,000 |
16+
| **Database Entries** | 100,000 | 100,000 | 1,000,000 |
1717
| **Assets Storage** | 5GB | 150GB | 500GB |
18-
| **Assets Bandwidth** | 100GB | 500GB | 1,000GB |
18+
| **Assets Bandwidth** | 100GB | 500GB per month | 1,000GB per month |
1919
| **API Requests** | 10,000 | 1,000,000 | 2,000,000 |
2020
| **Audit Logs** | 7 days retention | N/A | 7 days retention |
2121
| **Releases** | 3 pending releases | N/A | 3 pending releases |
2222

23-
Where:
24-
25-
- **Seats** are the maximum number of users that can access the Strapi Admin Panel.
26-
- **Database Entries** are the number of entries in your database.
27-
- **Assets Storage** is the amount of storage used by your assets.
28-
- **Assets Bandwidth** is the amount of bandwidth used by your assets.
29-
- **API Requests** are the number of requests made to your APIs. This includes requests made to the GraphQL and REST APIs.
30-
- **Releases** are the maximum number of pending [releases](/user-docs/releases/introduction) that can be created.
23+
:::strapi Additional information on Strapi Cloud features
24+
- Seats are the maximum number of users that can access the Strapi admin panel.
25+
- Database entries are the number of entries in your database.
26+
- Assets storage is the amount of storage used by your assets.
27+
- Assets bandwidth is the amount of bandwidth used by your assets.
28+
- API requests are the number of requests made to your APIs. This includes requests made to the GraphQL and REST APIs.
29+
- Releases are the maximum number of pending [releases](/user-docs/releases/introduction) that can be created.
30+
:::
3131

3232
## Seats management
3333

34-
Seats represent the maximum number of users that can access the Strapi Admin Panel. Each plan comes with a default number of seats.
34+
Seats represent the maximum number of users that can access the Strapi admin panel. Each plan comes with a default number of seats.
3535

36-
You can add more seats either by upgrading to a higher plan, or manually adding individual seats as desired. Seat can be added from the **Account Settings** -> **Manage Subscription** menu as detailed [here](../account/settings#managing-subscriptions).
36+
You can add more seats either by upgrading to a higher plan, or manually adding individual seats as desired. Seats can be added from the **Account Settings** (see [Edit subscription](/cloud/account/account-billing#edit-subscription)).
3737

38-
### Maximum seats
39-
40-
Each plan has a maximum number of seats that can be added. The maximum number of seats for each plan is as follows:
38+
There is however a maximum number of seats that can be added per plan:
4139

4240
| Plan | Maximum Seats |
4341
| --- | --- |
4442
| **Free Trial** | 10 |
4543
| **Pro** | 30 |
4644
| **Team** | 50 |
4745

46+
4847
## Billing
4948

50-
Billing is based on the usage of your Strapi Cloud account and applications. You will be billed monthly for the usage of your account and applications. You can view your usage and billing information in the [Billing](https://cloud.strapi.io/profile/billing) section of your Strapi Cloud account.
49+
Billing is based on the usage of your Strapi Cloud account and projects. You will be billed monthly for the usage of your account and applications. You can view your usage and billing information in the [Billing](https://cloud.strapi.io/profile/billing) section of your Strapi Cloud account.
5150

5251
### Overages
5352

@@ -58,7 +57,7 @@ For example, if you exceed the 500GB limit in asset bandwidth of the Pro plan, y
5857
Overages are charged according to the following rates:
5958

6059
| Feature | Rate |
61-
| :--- | ---: |
60+
| --- | --- |
6261
| **API Requests** | $1.50 / 25k requests |
6362
| **Asset Bandwidth** | $25.00 / 100GB |
6463
| **Asset Storage** | $2.00/GB per month |
@@ -67,17 +66,17 @@ Overages are charged according to the following rates:
6766

6867
Projects may end up in a **Suspended** state for various reasons, including: not paying the invoice, exceeding the limits of your free trial plan, or violating the [terms of service](https://strapi.io/cloud-legal).
6968

70-
If your project is suspended, you will no longer be able to access the application or trigger new deployments. You will also be unable to access the Strapi Admin Panel.
69+
If your project is suspended, you will no longer be able to access the application or trigger new deployments. You will also be unable to access the Strapi admin panel.
7170

7271
You can view the status of your project in the [Projects](https://cloud.strapi.io/projects) section of your Strapi Cloud account and you will be notified by email.
7372

7473
:::warning
75-
If you do not resolve the issue within 10 days, your suspended project will be deleted and all data will be permanently lost.
74+
If you do not resolve the issue within 30 days, your suspended project will be deleted and all data will be permanently lost. To avoid this situation, you will be sent a first email when your project becomes suspended, then another email every 5 days until one week left, to remind you to solve the issue. The last week before the deletion of the project, you will be sent 3 more emails: 6 days, 3 days and 1 day before your project is finally deleted.
7675
:::
7776

7877
#### Project suspension after subscription cancellation
7978

80-
If you don't pay the invoice, the subscription of your project will automatically be cancelled and the project will be suspended. You can reactivate the subscription through the billing modal (see [Edit subscription](https://docs.strapi.io/cloud/account/settings#edit-subscription)).
79+
If you don't pay the invoice, the subscription of your project will automatically be cancelled and the project will be suspended. You can reactivate the subscription through the billing modal (see [Edit subscription](/cloud/account/account-billing#edit-subscription)).
8180

8281
1. Log into the billing modal and go to the *Subscription details* of the subscription associated with the suspended project. You should see a warning message confirming that the subscription was canceled for the following reason: "Not Paid".
8382
2. Go back to the homepage of the billing modal, listing subscriptions and billing options.

0 commit comments

Comments
 (0)