From 2f45e3be458733ecf44c01ea77feea8f8d19888a Mon Sep 17 00:00:00 2001 From: Alexandra Bucha Rasova <94905350+alex-cit@users.noreply.github.com> Date: Mon, 27 Jan 2025 08:17:21 +0100 Subject: [PATCH] Using MM app and plugin with a custom server - moved to the custom server section (#544) --- REDIRECTS | 1 + src/.vuepress/sidebar/en.js | 4 ++-- src/index.md | 2 +- src/manage/plugin/index.md | 4 ++-- .../plugin-mobile-app}/config_dialog.jpg | Bin .../plugin-mobile-app}/config_dialog.xcf | Bin .../plugin-mobile-app}/index.md | 13 ++++--------- .../mobile-app-change-server-url.jpg | Bin .../mobile-app-change-server-url.xcf | Bin .../mobile-app-custom-server-log-in.jpg | Bin .../mobile-app-custom-server-log-in.xcf | Bin .../plugin-mobile-app}/mobile-app-server.jpg | Bin .../plugin-mobile-app}/mobile-app-server.xcf | Bin .../plugin-mobile-app}/new_profile.jpg | Bin .../plugin-mobile-app}/new_profile.xcf | Bin 15 files changed, 10 insertions(+), 14 deletions(-) rename src/{manage/plugin-multi-server-use => server/plugin-mobile-app}/config_dialog.jpg (100%) rename src/{manage/plugin-multi-server-use => server/plugin-mobile-app}/config_dialog.xcf (100%) rename src/{manage/plugin-multi-server-use => server/plugin-mobile-app}/index.md (86%) rename src/{manage/plugin-multi-server-use => server/plugin-mobile-app}/mobile-app-change-server-url.jpg (100%) rename src/{manage/plugin-multi-server-use => server/plugin-mobile-app}/mobile-app-change-server-url.xcf (100%) rename src/{manage/plugin-multi-server-use => server/plugin-mobile-app}/mobile-app-custom-server-log-in.jpg (100%) rename src/{manage/plugin-multi-server-use => server/plugin-mobile-app}/mobile-app-custom-server-log-in.xcf (100%) rename src/{manage/plugin-multi-server-use => server/plugin-mobile-app}/mobile-app-server.jpg (100%) rename src/{manage/plugin-multi-server-use => server/plugin-mobile-app}/mobile-app-server.xcf (100%) rename src/{manage/plugin-multi-server-use => server/plugin-mobile-app}/new_profile.jpg (100%) rename src/{manage/plugin-multi-server-use => server/plugin-mobile-app}/new_profile.xcf (100%) diff --git a/REDIRECTS b/REDIRECTS index b7961ae0..2d9cf6eb 100644 --- a/REDIRECTS +++ b/REDIRECTS @@ -174,6 +174,7 @@ https://merginmaps.com/docs/layer/settingup_forms/ https://merginmaps.com/docs/l https://merginmaps.com/docs/layer/settingup_forms_photo/ https://merginmaps.com/docs/layer/photos/ https://merginmaps.com/docs/layer/settingup_forms_settings/ https://merginmaps.com/docs/layer/form-configuration/ https://merginmaps.com/docs/manage/data_sync/ https://merginmaps.com/docs/manage/plugin/ +https://merginmaps.com/docs/manage/plugin-multi-server-use/ https://merginmaps.com/docs/server/plugin-mobile-app/ https://merginmaps.com/docs/manage/plugin-sync-project/ https://merginmaps.com/docs/manage/plugin/ https://merginmaps.com/docs/misc/privacy/ N/A -- handled by https://merginmaps.com/privacy-policy/ https://merginmaps.com/docs/reference/licensing/ https://merginmaps.com/docs/misc/licensing/ diff --git a/src/.vuepress/sidebar/en.js b/src/.vuepress/sidebar/en.js index ab1d2836..050e4481 100644 --- a/src/.vuepress/sidebar/en.js +++ b/src/.vuepress/sidebar/en.js @@ -41,7 +41,6 @@ module.exports = { '/manage/delete-files/', '/manage/deploy-new-project/', '/manage/missing-data/', - '/manage/plugin-multi-server-use/', '/manage/plugin/', '/manage/dashboard/', '/manage/dashboard-maps/', @@ -127,7 +126,8 @@ module.exports = { '/server/install/', '/server/upgrade/', '/server/administer/', - '/server/troubleshoot/' + '/server/troubleshoot/', + '/server/plugin-mobile-app/' ] }, { diff --git a/src/index.md b/src/index.md index ac5064f2..73439051 100644 --- a/src/index.md +++ b/src/index.md @@ -48,7 +48,6 @@ The ecosystem consist of various components: - [How to Delete Files](./manage/delete-files) - [How to Deploy Revised Projects](./manage/deploy-new-project/) - [How to Recover Missing Data](./manage/missing-data/) -- [How to with a Custom Server](./manage/plugin-multi-server-use/) - [ Overview](./manage/plugin/) - [Home Page and Dashboard](./manage/dashboard/) - [Maps in Dashboard](./manage/dashboard-maps/) @@ -108,6 +107,7 @@ The ecosystem consist of various components: - [Upgrade](./server/upgrade/) - [Administer](./server/administer/) - [Troubleshoot Custom Servers](./server/troubleshoot/) +- [Using Mergin Maps Mobile App and QGIS Plugin with a Custom Server](./server/plugin-mobile-app/) ## Migrate - [From QField](./migrate/qfield/) diff --git a/src/manage/plugin/index.md b/src/manage/plugin/index.md index ae225d42..af1abf38 100644 --- a/src/manage/plugin/index.md +++ b/src/manage/plugin/index.md @@ -22,7 +22,7 @@ The toolbar contains following buttons: - the logo is a shortcut to ![A link to the Mergin Maps dashboard](./plugin-toolbar-logo.jpg "A link to the Mergin Maps dashboard") -- **Configure plugin** to [configure plugin](../../setup/install-mergin-maps-plugin-for-qgis/#plugin-configuration) to connect to or [a custom server](../plugin-multi-server-use/) +- **Configure plugin** to [configure plugin](../../setup/install-mergin-maps-plugin-for-qgis/#plugin-configuration) to connect to or [a custom server](../../server/plugin-mobile-app/) ![Configure Mergin Maps Plugin](../../setup/install-mergin-maps-plugin-for-qgis/qgis-configure-mergin-plugin.jpg "Configure Mergin Maps Plugin") ![](./plugin-configure.jpg "") @@ -139,6 +139,6 @@ Local changes of a specific layer can also be extracted using the **Extract loca ## Mergin Maps in QGIS Plugins menu bar **Plugins** menu bar in QGIS contains also options: - **** is a shortcut to -- **Configure plugin** can be used to [configure plugin](../../setup/install-mergin-maps-plugin-for-qgis/#plugin-configuration) to connect to or [a custom server](../plugin-multi-server-use/) +- **Configure plugin** can be used to [configure plugin](../../setup/install-mergin-maps-plugin-for-qgis/#plugin-configuration) to connect to or [a custom server](../../server/plugin-mobile-app/) - **Configure DB sync** can help you generate a initial configuration file for [DB sync](../../dev/dbsync/) ![Mergin Maps in QGIS Plugins menu bar](./plugins-menu-bar.jpg "Mergin Maps in QGIS Plugins menu bar") diff --git a/src/manage/plugin-multi-server-use/config_dialog.jpg b/src/server/plugin-mobile-app/config_dialog.jpg similarity index 100% rename from src/manage/plugin-multi-server-use/config_dialog.jpg rename to src/server/plugin-mobile-app/config_dialog.jpg diff --git a/src/manage/plugin-multi-server-use/config_dialog.xcf b/src/server/plugin-mobile-app/config_dialog.xcf similarity index 100% rename from src/manage/plugin-multi-server-use/config_dialog.xcf rename to src/server/plugin-mobile-app/config_dialog.xcf diff --git a/src/manage/plugin-multi-server-use/index.md b/src/server/plugin-mobile-app/index.md similarity index 86% rename from src/manage/plugin-multi-server-use/index.md rename to src/server/plugin-mobile-app/index.md index 49e7c270..edd50634 100644 --- a/src/manage/plugin-multi-server-use/index.md +++ b/src/server/plugin-mobile-app/index.md @@ -1,15 +1,10 @@ -# How to Use Mergin Maps with a Custom Server +# Using Mergin Maps Mobile App and QGIS Plugin with a Custom Server [[toc]] -There is a default server which is configured in and in the . However, you might want to use some custom server, e.g. when using [ Community Edition](../../server/) or [ Enterprise Edition](../../server/). +There is a default server which is configured in and in the . However, you might want to use some custom server, e.g. when using [ Community Edition](../index.md) or [ Enterprise Edition](../index.md). To do this, we need to set up the custom server in the [plugin](#custom-server-configuration-in-mergin-maps-qgis-plugin) as well as in the [mobile app](#custom-server-configuration-in-mergin-maps-mobile-app). -:::tip -The Community and Enterprise editions are private hosting solutions for those who would like to run their own deployment of . - -See the [overview and pricing](https://merginmaps.com/pricing-for-ce-and-ee) for more details. -::: ## Custom server configuration in Mergin Maps QGIS plugin To configure a custom server in the : @@ -32,7 +27,7 @@ You might have started working on one server (e.g. staging server, official clou ### Using multiple servers simultaneously -If you need to handle two different servers at the same time, you will first need to create two user profiles in QGIS and download for both. +If you need to handle two different servers at the same time, you will first need to create two user profiles in QGIS and download the for both. ![QGIS new profile](./new_profile.jpg "Create new profile in QGIS") @@ -56,4 +51,4 @@ To configure a custom server in : 3. Use the username and password that is associated with this server and **Sign in**. ![Custom server in Mergin Maps mobile app](./mobile-app-custom-server-log-in.jpg "Custom server in Mergin Maps mobile app") -Now you are all set to use with the custom server! +Now you are all set to use the with the custom server! diff --git a/src/manage/plugin-multi-server-use/mobile-app-change-server-url.jpg b/src/server/plugin-mobile-app/mobile-app-change-server-url.jpg similarity index 100% rename from src/manage/plugin-multi-server-use/mobile-app-change-server-url.jpg rename to src/server/plugin-mobile-app/mobile-app-change-server-url.jpg diff --git a/src/manage/plugin-multi-server-use/mobile-app-change-server-url.xcf b/src/server/plugin-mobile-app/mobile-app-change-server-url.xcf similarity index 100% rename from src/manage/plugin-multi-server-use/mobile-app-change-server-url.xcf rename to src/server/plugin-mobile-app/mobile-app-change-server-url.xcf diff --git a/src/manage/plugin-multi-server-use/mobile-app-custom-server-log-in.jpg b/src/server/plugin-mobile-app/mobile-app-custom-server-log-in.jpg similarity index 100% rename from src/manage/plugin-multi-server-use/mobile-app-custom-server-log-in.jpg rename to src/server/plugin-mobile-app/mobile-app-custom-server-log-in.jpg diff --git a/src/manage/plugin-multi-server-use/mobile-app-custom-server-log-in.xcf b/src/server/plugin-mobile-app/mobile-app-custom-server-log-in.xcf similarity index 100% rename from src/manage/plugin-multi-server-use/mobile-app-custom-server-log-in.xcf rename to src/server/plugin-mobile-app/mobile-app-custom-server-log-in.xcf diff --git a/src/manage/plugin-multi-server-use/mobile-app-server.jpg b/src/server/plugin-mobile-app/mobile-app-server.jpg similarity index 100% rename from src/manage/plugin-multi-server-use/mobile-app-server.jpg rename to src/server/plugin-mobile-app/mobile-app-server.jpg diff --git a/src/manage/plugin-multi-server-use/mobile-app-server.xcf b/src/server/plugin-mobile-app/mobile-app-server.xcf similarity index 100% rename from src/manage/plugin-multi-server-use/mobile-app-server.xcf rename to src/server/plugin-mobile-app/mobile-app-server.xcf diff --git a/src/manage/plugin-multi-server-use/new_profile.jpg b/src/server/plugin-mobile-app/new_profile.jpg similarity index 100% rename from src/manage/plugin-multi-server-use/new_profile.jpg rename to src/server/plugin-mobile-app/new_profile.jpg diff --git a/src/manage/plugin-multi-server-use/new_profile.xcf b/src/server/plugin-mobile-app/new_profile.xcf similarity index 100% rename from src/manage/plugin-multi-server-use/new_profile.xcf rename to src/server/plugin-mobile-app/new_profile.xcf