Skip to content

Commit 87265e0

Browse files
authored
Iss 262 workspaces (#267)
* workspaces draft page * add workspaces to spellcheck * workspaces - subscriptions * workspaces-permissions * workspace-share-transfer-delete * broken links * link fix * workspaces-tutorial-working-collab * workspaces-warning-deprecated-content * web-dashboard * checks fix * workspaces-link-to-blog * workspaces-update * links fix
1 parent fbe8b36 commit 87265e0

File tree

122 files changed

+407
-184
lines changed

Some content is hidden

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

122 files changed

+407
-184
lines changed

scripts/wordlist.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,5 +220,7 @@ xcf
220220
xyz
221221
yml
222222
webp
223+
Workspaces
224+
workspaces
223225
zlib
224226
zoomstack

src/.vuepress/sidebar/en.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ module.exports = {
2323
'/setup/sign-up-to-mergin-maps/',
2424
'/setup/install-qgis/',
2525
'/setup/install-mergin-maps-plugin-for-qgis/',
26-
'/setup/working-with-organisations/',
2726
'/setup/subscriptions/'
2827
]
2928
},
@@ -33,6 +32,7 @@ module.exports = {
3332
collapsable: true, // optional, defaults to true
3433
sidebarDepth: 0, // optional, defaults to 1
3534
children: [
35+
'/manage/workspaces/',
3636
'/manage/permissions',
3737
'/manage/synchronisation',
3838
'/manage/project/',

src/field/input_features.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
If you are new to <MobileAppName />, follow our [tutorials](../tutorials/capturing-first-data/) to get familiar with the app.
77
:::
88

9-
Open a project you want to work with in <MobileAppName />. This can be a project you own or a project that is shared with you, in which case you need to have [write permission](../manage/permissions/#project-permissions) to add or edit features.
9+
Open a project you want to work with in <MobileAppName />. This can be a project you own or a project that is shared with you, in which case you need to have [write permission](../manage/permissions/) to add or edit features.
1010

1111
::: tip
1212
To be able to transfer your data to your mobile/tablet device, share your project and track changes, you will need to [sign up to Mergin Maps](../setup/sign-up-to-mergin-maps/).

src/field/input_ui.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# Mergin Maps Input Interface
22
[[toc]]
33

4+
:::danger
5+
This content may differ from what you encounter when working with <MainPlatformNameLink />. It will be updated soon to include recent changes in <MainPlatformNameLink />, <MobileAppName /> and <QGISPluginName />.
6+
:::
7+
48
Below is a description of various items within the user interface.
59

610
The map can be moved by dragging around and zoomed in/out by pinching open/close. Tapping on a feature displays the attributes form.

src/index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ home: false
1515
The ecosystem consist of various components:
1616
- [QGIS](https://qgis.org/) > Powerful GIS Desktop application
1717
- [<QGISPluginName />](https://plugins.qgis.org/plugins/Mergin/) > QGIS plugin
18-
- <MainDomainNameLink desc="Mergin Maps Cloud" /> > SaaS Cloud Service (available also as <MainPlatformName /> CE)
18+
- <AppDomainNameLink desc="Mergin Maps Cloud" /> > SaaS Cloud Service (available also as <MainPlatformName /> CE)
1919
- <MainDomainNameLink desc="Mergin Maps Input" /> > iOS and Android mobile app
2020

2121
## Get started
@@ -34,15 +34,15 @@ The ecosystem consist of various components:
3434
- [How to Sign Up to Mergin Maps](./setup/sign-up-to-mergin-maps/)
3535
- [How to Install QGIS](./setup/install-qgis/)
3636
- [How to Install QGIS Plugin](./setup/install-mergin-maps-plugin-for-qgis/)
37-
- [Working with Organisations](./setup/working-with-organisations/)
3837
- [Subscriptions and Invoicing](./setup/subscriptions/)
3938

4039
## Manage Account & Project
40+
- [Workspaces](./manage/workspaces/)
4141
- [Permissions](./manage/permissions/)
4242
- [Behind Data Synchronisation](./manage/synchronisation/)
4343
- [Mergin Maps Project](./manage/project/)
4444
- [How to Create a New Project](./manage/create-project/)
45-
- [How to Share, Transfer or Delete a Project](./manage/project-advanced/)
45+
- [How to Share, Transfer or Delete Projects](./manage/project-advanced/)
4646
- [How to Delete Files](./manage/delete-files)
4747
- [How to Deploy Revised Projects](./manage/deploy-new-project/)
4848
- [How to Recover Missing Data](./manage/missing-data/)

src/manage/create-project/index.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# How to Create a New Project
22
[[toc]]
33

4+
:::danger
5+
This content may differ from what you encounter when working with <MainPlatformNameLink />. It will be updated soon to include recent changes in <MainPlatformNameLink />, <MobileAppName /> and <QGISPluginName />.
6+
:::
7+
48
There are several methods of creating a new <MainPlatformName /> project:
59
- [<MobileAppName /> ](./index.md#create-a-project-in-mergin-maps-input) offers the quickest (albeit limited) way of creating a <MainPlatformName /> project.
610
- If you want to take full advantage of <MainPlatformNameLink />, use [QGIS](./index.md#create-a-project-in-qgis) to prepare new projects.

src/manage/dashboard.md

Lines changed: 40 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,58 @@
11
# Home Page and Dashboard
22
[[toc]]
33

4-
When you log in to <AppDomainNameLink desc="Mergin Maps"/>, you will be presented with a dashboard for quick access to your recent active projects. Here, you can also manage your projects, organisations, profile and subscription plan.
4+
When you log in to <AppDomainNameLink desc="Mergin Maps"/>, you will be presented with a dashboard for quick access to your recent active projects. Here, you can also manage your projects, [workspaces](./workspaces/), profile and [subscriptions](../setup/subscriptions/).
55

66
![left panel - dashboard](./web-dashboard-panel.png)
77

8-
**Home** takes you back to the homepage with the list of the most recent projects.
8+
Current workspace and your username are displayed in the upper right corner of the screen.
99

10-
## User profile
11-
The left navigation panel shows the name of the current profile. Clicking on the name will open a drop-down menu, where you can switch between your profile and your organisation profile.
12-
13-
![profile switch](./mergin-switch-profile.png)
14-
15-
You can access your account details in the **Settings** section under **Profile**. Here you can change your password, verify your email or close your account. Use **Edit profile** to enter your name or turn on/off email notifications.
16-
17-
You will also see the list of organisations you belong to and pending invitations to join an organisation.
18-
19-
![profile](./mergin-user-profile.png)
20-
21-
## Organisations
22-
The organisation profile can be also accessed by clicking on the organisation name in the **Organisations** section.
23-
![organisation](./mergin-organisation.png)
24-
25-
The organisation profile contains the list of organisation's projects. The account details can be found under **Profile** in the **Setting** sections. The **Members** tab provides the overview of users and their permissions within the team.
26-
![organisation profile](./mergin-organisation-profile.png)
10+
Click **Home** in the left panel to go back to the homepage with the list of the most recent projects.
2711

28-
:::tip
29-
Visit [Working with organisations](../setup/working-with-organisations/index.md) to learn more about organisations.
30-
:::
31-
3212
## Projects
33-
- To create a new project, select **+ Create** in front of **Projects**
34-
- **My projects** lists all projects you have created
35-
- **Shared with me** lists other users' projects shared with you (including your organisation projects)
36-
- **Explore** lists all the public projects
13+
**Projects** tab in the left panel displays the list overview of the projects that are available to you in this workspace.
14+
![projects](./web-projects-tab.png)
3715

38-
Click on a project to download it, [clone it](./create-project/#clone-an-existing-project-through-merginmaps-com) and to see its details.
16+
- click on **+ Create** to [create a new project](./create-project/#create-a-project-through-merginmaps-com),
17+
- use **Find Public Projects** to browse public projects
18+
- select a project to see its details
19+
20+
When you open a project, there is an option to [share it](./project-advanced/), download it and [clone it](./create-project/#clone-an-existing-project-through-merginmaps-com).
3921
![project](./mergin-project.png)
4022

41-
- **FILES** lists files associated with the project
23+
- in **FILES** you will find all files associated with the project. Click on a file to see the details, download it or delete it.
4224
- **MAP (beta)** contains the map overview of the project. It is available if you have [professional or team subscription](https://merginmaps.com/pricing). The content is updated when the project is synchronised - if you see the message "Map config does not exist, please try to update the project", sync the project and the map overview should be generated.
4325
![map](./mergin-map.png)
44-
4526
- **HISTORY** contains all [project versions](./project-details/). Here you can see what was changed by which user and download a previous version of the project to your computer.
46-
- in **SETTINGS** you can manage access to your project, e.g. if you want to [share it](./project-advanced/#share-a-project)
27+
- in **SETTINGS** you can manage [access](./project-advanced/) to the project
4728

29+
## Members
30+
The **Members** tab provides the overview of the [members and guests](./permissions/#workspace-members-and-guests) of the workspace. Here, you can [add users](./project-advanced/#add-users-to-a-workspace) to your workspace and manage their [permissions](./permissions/).
31+
![members](./web-members.png)
4832

4933
## Subscription
50-
**Subscription** section contains information about your subscription and billing:
51-
- **DETAIL** contains details about your current subscription and data usage. Here you can also change your plan and the frequency of your subscription billing.
52-
- **HISTORY** includes the list of events related to your account, such as changing the plan or the payment history.
53-
- **INVOICES** contains the list of your previous payments and invoices
54-
![subscription](./mergin-subscription.png)
34+
The **Subscription** tab contains information about your [subscription and invoicing](../setup/subscriptions/).
35+
- **DETAIL** contains details about your current data usage and subscription. Here you can also change your plan and the frequency of your subscription billing.
36+
- **HISTORY** includes the list of events related to your account, such as changing the plan or the payment history.
37+
- **INVOICES** contains the list of your previous payments and invoices
38+
![subscription](../setup/subscriptions/subscriptions.png)
39+
40+
## Settings
41+
In the **Settings** tab, you will find information about the current workspace.
42+
![settings](./web-settings.png)
43+
- use **Edit Workspace** to change the description of the workspace
44+
- use **Close Workspace** to [delete the workspace](./workspaces/#how-to-delete-a-workspace)
45+
46+
## User profile
47+
The **User profile** tab contains information about your current profile.
48+
49+
Here you can change your password, verify your email or close your account. Use **Edit profile** to enter your name or turn on/off email notifications.
50+
51+
![profile](./mergin-user-profile.png)
52+
53+
## Manage workspaces
54+
In the upper right corner of the screen, you can see the current workspace and your username. Click on it to [switch between workspaces](./workspaces/#how-to-switch-between-workspaces) and to **Manage workspaces**.
55+
![profile menu](./workspaces/web-switch-workspace.png)
56+
57+
Click on **Manage workspaces** to see the overview of workspaces to which you have access as a guest, member or owner. Here you can [create a new workspace](./workspaces/#how-to-create-a-new-workspace), leave a workspace and accept/decline invitations to other users' workspaces.
58+
![manage workspaces](./web-manage-workspaces.png)

src/manage/deploy-new-project/index.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ One way how to make sure the modified project is distributed correctly is to cre
2222
5. Push the revised project to <MainPlatformNameLink /> as a **new project**
2323
6. Ask your team members to **use the new project**
2424

25-
::: tip
26-
You can change [permissions](../permissions/) for the old project to *read-only* to make sure that nobody will contribute to it by mistake.
27-
:::
28-
2925
## Using the same project after change in database schema
3026
If you want to use the same project after modifications of data schema, make sure to follow these steps:
3127
1. Synchronise **all devices** before you change the schema
-25.8 KB
Binary file not shown.

src/manage/mergin-organisation.png

-13.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)