From 9958bad9ec7fcdab3491c67a9ef1b273d68a75cd Mon Sep 17 00:00:00 2001
From: royendo <67675319+royendo@users.noreply.github.com>
Date: Thu, 24 Oct 2024 08:41:59 +0900
Subject: [PATCH 01/12] trial info and User Management UI
---
.../deploy/deploy-dashboard/trial-accounts.md | 6 +++
docs/docs/explore/bookmarks.md | 3 +-
docs/docs/home/FAQ.md | 50 +++++++++++++-----
docs/docs/manage/user-management.md | 20 ++++++-
.../manage/user-management/add-user-cloud.png | Bin 0 -> 391135 bytes
.../img/manage/user-management/domain.png | Bin 0 -> 544933 bytes
.../user-management/user-management.png | Bin 0 -> 325351 bytes
7 files changed, 64 insertions(+), 15 deletions(-)
create mode 100644 docs/docs/deploy/deploy-dashboard/trial-accounts.md
create mode 100644 docs/static/img/manage/user-management/add-user-cloud.png
create mode 100644 docs/static/img/manage/user-management/domain.png
create mode 100644 docs/static/img/manage/user-management/user-management.png
diff --git a/docs/docs/deploy/deploy-dashboard/trial-accounts.md b/docs/docs/deploy/deploy-dashboard/trial-accounts.md
new file mode 100644
index 00000000000..dc20ec3e13a
--- /dev/null
+++ b/docs/docs/deploy/deploy-dashboard/trial-accounts.md
@@ -0,0 +1,6 @@
+---
+title: "Trials Deployments"
+description: Deploying Trials in Rill Cloud
+sidebar_label: "Trial Deployments"
+sidebar_position: 30
+---
\ No newline at end of file
diff --git a/docs/docs/explore/bookmarks.md b/docs/docs/explore/bookmarks.md
index 02623989a62..f88039afd5f 100644
--- a/docs/docs/explore/bookmarks.md
+++ b/docs/docs/explore/bookmarks.md
@@ -19,7 +19,8 @@ Common use cases for Bookmarks include:
On the top right portion of the screen, you will see the Bookmark icon to bring up the option to save a bookmark. Clicking that icon brings up options to save the current page as your homescreen, create a new bookmark page, or to see your list of bookmarks (and shared bookmarks).
-
+
+
On the bookmark screen, you'll then be able to set the options related to the saved view:
diff --git a/docs/docs/home/FAQ.md b/docs/docs/home/FAQ.md
index 46967fd8521..422431cc297 100644
--- a/docs/docs/home/FAQ.md
+++ b/docs/docs/home/FAQ.md
@@ -50,21 +50,13 @@ rill uninstall
## Rill Developer
### What is Rill Developer?
-Please review [our documentation](https://docs.rilldata.com/concepts/developerVsCloud#rill-developer).
+Rill Developer is a local application used to preview your project and make any necessary changes before deploying to Rill Cloud. For more information, please review [our documentation](https://docs.rilldata.com/concepts/developerVsCloud#rill-developer).
### I'm having issues with Rill Developer...
-Please refer to our tutorials to get started using Rill! (coming soon!)
+Please refer to [our tutorials](/tutorials) to get started using Rill. If you still have any questions, please [contact us!](/contact)
-import ComingSoon from '@site/src/components/ComingSoon';
-
-
-
-
-a
-
-
### How do I start more than one instance of Rill Developer?
If you try to start two instances of Rill Developer, you will hit the following error:
@@ -84,7 +76,7 @@ You need to [deploy your dashboard to Rill Cloud](https://docs.rilldata.com/depl
## Rill Cloud
### What is Rill Cloud?
-Please review [our documentation](https://docs.rilldata.com/concepts/developerVsCloud#rill-cloud).
+Rill Cloud is where your deployed Rill project exists and can be shared to your colleagues, or end-users. For more information, please review [our documentation](https://docs.rilldata.com/concepts/developerVsCloud#rill-cloud).
### How do I deploy to Rill Cloud?
You can deploy your project directly from the UI by selecting [the Deploy button](https://docs.rilldata.com/deploy/existing-project/#deploying-a-project-via-the-ui).
@@ -95,8 +87,42 @@ You can deploy your project directly from the UI by selecting [the Deploy button
### How do I make changes to my dashboard in Rill Cloud?
-You can follow the same steps as above. The button will have changed from `deploy` to `update`. After selecting this, the objects in your Rill project will be updated.
+You can follow the same steps as above. The button will have changed from `deploy` to `update`. After selecting this, the objects in your Rill project will be updated. Or, after syncing your Rill project to Github, simply push changes directly to the repository and this will automatically update your project on Rill Cloud.
### How do I share my dashboard to other users?
You will need to [invite users to your organization/project](https://docs.rilldata.com/manage/user-management#option-1---admin-invites-user) or send them a URL for them to [request access to your dashboard](https://docs.rilldata.com/manage/user-management#option-2---user-requests-access). If you just want them to see the contents of your dashboard, you can look into using [public URLs](https://docs.rilldata.com/explore/share-url).
+
+
+## Rill Cloud Trial
+
+### What is Rill Cloud Trial?
+
+We now offer a self serve option for our users using Rill Cloud to get started. Before signing up for a [Teams plan](https://www.rilldata.com/pricing), you can create an account and start your free trial.
+
+### When does my trial start?
+
+Your trial will start when you deploy a project to Rill Cloud.
+
+### How long does my Rill Cloud Trial last?
+
+Currently, a Rill Cloud Trial lasts for 30 days. If you have any comments or concerns, please reach out to us on our [various platforms](../contact.md)!
+
+### What is included in the free trial?
+
+The free trial is locked at 2 projects and up to 10GB of data each. You can invite as many users as required.
+
+### What happens to my project if I do not pay on time?
+
+Your projects will hibernate. Your project metadata will still be available once you've activated your team plan.
+
+### What is project hibernation?
+
+When a project is inactive for a specific number of days, we automatically hibernate the project. What this means is that all of your information and metadata is saved and resource consumption will be zero. You will need to unhibernate the project to gain access to the dashboard again. If the project is hibernated due to payment issues, the project will stay in this state until payment is confirmed.
+
+## Rill Cloud Team Plan
+
+### How do I activate my Team Plan?
+
+### What does the Team Plan include?
+
diff --git a/docs/docs/manage/user-management.md b/docs/docs/manage/user-management.md
index a0b0f058b89..15e1bb343fb 100644
--- a/docs/docs/manage/user-management.md
+++ b/docs/docs/manage/user-management.md
@@ -33,7 +33,12 @@ When you invite a user to an organization on Rill Cloud, they automatically get
For a detailed list of permissions, please refer to the [Roles and Permissions](roles-permissions.md).
### How to add an Organization User
-Administrators can be invited to an organization via the CLI directly or via a user group.
+Administrators can be invited to an organization from the *users* page, or via the CLI.
+
+### Administrator adds from Rill Cloud User page
+From the organization page, you can manage users under the *Users* tab. Adding users from this page will add the user to the organization.
+
+
### Administrator invites user via the CLI
@@ -57,9 +62,15 @@ rill user add --group
User "" added to the user group ""
```
+![] add image here
+
### Automatically add members by email domain
-You can automatically add users to your organization by their email domain. For example, if you whitelist `yourdomain.com`, new and existing users with an email address ending on `@yourdomain.com` will automatically be added to your organization.
+You can automatically add users to your organization by their email domain. During the deployment process and in the Organization settings page, you can input the domain to whitelist.
+
+
+
+ For example, if you whitelist `yourdomain.com`, new and existing users with an email address ending on `@yourdomain.com` will automatically be added to your organization.
:::info Interested in whitelisting a different domain?
@@ -135,8 +146,13 @@ There are two ways to add a user to a user group.
2. Administrator adds them via the CLI
### Administrator adds from Rill Cloud
+From the organization page, you can manage users under the *Users* tab. Adding users from this page will add the user to the organizat
+
import ComingSoon from '@site/src/components/ComingSoon';
+
+![img] Update this image
+
+