Merge pull request #395 from MerginMaps/iss_359_new-products-name

Iss #359 new products name (cleanup)

Author: PeterPetrik

src/.vuepress/components/MobileAppName.vue

@@ -1,3 +1,3 @@
 <template>
-  <span class="nospellcheck">Mergin Maps Input</span>
+  <span class="nospellcheck">Mergin Maps mobile app</span>
 </template>

src/.vuepress/components/MobileAppNameShort.vue

@@ -0,0 +1,3 @@
+<template>
+  <span class="nospellcheck">mobile app</span>
+</template>

src/.vuepress/components/QGIS.vue

@@ -0,0 +1,33 @@
+<template>
+  <span>
+    <a :href="`https://qgis.org/${link}`" target="_blank" rel="noopener noreferrer">
+      <img alt="QGIS Documentation" :src="$withBase('/QGIS.svg')" />
+      <span v-html="text"></span>
+      <span>
+        <svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false" x="0px" y="0px" viewBox="0 0 100 100" width="15" height="15" class="icon outbound">
+          <path fill="currentColor" d="M18.8,85.1h56l0,0c2.2,0,4-1.8,4-4v-32h-8v28h-48v-48h28v-8h-32l0,0c-2.2,0-4,1.8-4,4v56C14.8,83.3,16.6,85.1,18.8,85.1z"></path>
+          <polygon fill="currentColor" points="45.7,48.7 51.3,54.3 77.2,28.5 77.2,37.2 85.2,37.2 85.2,14.9 62.8,14.9 62.8,22.9 71.5,22.9"></polygon>
+        </svg>
+        <span class="sr-only">(opens new window)</span>
+      </span>
+    </a>
+  </span>
+</template>
+
+<script>
+export default {
+  name: "qgishelp",
+  props: {
+    ver: String,
+    link: String,
+    text: String
+  }
+}
+</script>
+
+<style scoped>
+img {
+  border: none;
+  height: 15px;
+}
+</style>

src/.vuepress/components/QGISPluginName.vue

@@ -1,3 +1,3 @@
 <template>
-  <span>Mergin Maps plugin for QGIS</span>
+  <span>Mergin Maps QGIS plugin</span>
 </template>

src/.vuepress/components/QGISPluginNameShort.vue

@@ -0,0 +1,3 @@
+<template>
+  <span>QGIS plugin</span>
+</template>

src/.vuepress/components/SinceBadge.vue

@@ -1,7 +1,7 @@
 <template>
   <span>
-  <span class="sincebadge" v-if="type === 'App'" >since Mobile {{ version }}</span>
-  <span class="sincebadge" v-else-if="type === 'Plugin'">since Plugin {{ version }}</span>
+  <span class="sincebadge" v-if="type === 'App'" >since Mobile app {{ version }}</span>
+  <span class="sincebadge" v-else-if="type === 'Plugin'">since QGIS plugin {{ version }}</span>
   <span class="sincebadge" v-else-if="type === 'Server'">since Server {{ version }}</span>
   </span>
 </template>

src/dev/ce-migration/index.md

@@ -36,7 +36,7 @@ $ docker-compose -f docker-compose.yml stop
 $ git pull
 ```
 
- 6. Set environment variables (<GitHubRepo desc=".prod.env" id="MerginMaps/mergin/blob/master/.prod.env" /> file). **Important** ⚠️
+ 6. Set environment variables (<GitHubRepo desc=".prod.env" id="MerginMaps/server/blob/master/.prod.env" /> file). **Important** ⚠️
 
 As mentioned earlier, CE operates with one global workspace. We will set it up now.
 Specify its name with the following environment variable:

src/dev/customapp.md

@@ -4,6 +4,6 @@ Our mobile app <MobileAppName /> provides seamless synchronisation of field data
 
 The good news is that <MobileAppName /> is licensed as open source software, which means that anything is possible with a bit of development!
 
-If you are interested in building a custom app, you can start by going to <GitHubRepo id="MerginMaps/input"/> repository on GitHub and building it for your platform.
+If you are interested in building a custom app, you can start by going to <GitHubRepo id="MerginMaps/mobile"/> repository on GitHub and building it for your platform.
 
-The <GitHubRepo id="MerginMaps/input-sdk" desc="Input SDK repository" /> provides all the dependencies for various platforms (Android, iOS, macOS, Windows).
+The <GitHubRepo id="MerginMaps/mobile-sdk" desc="mobile app SDK repository" /> provides all the dependencies for various platforms (Android, iOS, macOS, Windows).

src/dev/dbsync.md

@@ -4,7 +4,7 @@
 
 <YouTube id="4mWcaKs9jkw" />
 
-**Interested in using DB Sync?** Go to <GitHubRepo id="MerginMaps/mergin-db-sync" /> repository for the source code and more details. Here, you will also find the Quick start guide that will show you how to set up one way synchronisation between your PostGIS database and a new <MainPlatformName /> project.
+**Interested in using DB Sync?** Go to <GitHubRepo id="MerginMaps/db-sync" /> repository for the source code and more details. Here, you will also find the Quick start guide that will show you how to set up one way synchronisation between your PostGIS database and a new <MainPlatformName /> project.
 
 :::tip Usage details
 DB Sync can be used with *Team*, *Academia* and *Non-profit* <MainDomainNameLink id="pricing" desc="subscription plans"/>, as well as in [<CommunityPlatformName />](./mergince/) and [<EnterprisePlatformName />](./merginmaps-ee/).

src/dev/integration.md

@@ -14,7 +14,7 @@ You can try these tools for free during the trial period.
 ## Python client module
 The Python client module is the easiest way to programmatically use <MainPlatformNameLink />. You can use Python API or a command-line tool to easily work with <MainPlatformName /> projects, such as to get project status, push and pull changes, or to download, create and delete projects.
 
-The <GitHubRepo id="MerginMaps/mergin-py-client" /> repository contains the source code of the Python client module and more information on how to use it.
+The <GitHubRepo id="MerginMaps/python-api-client" /> repository contains the source code of the Python client module and more information on how to use it.
 
 Python client is available in the PyPI repository and can be installed with `pip`:
 
@@ -45,14 +45,14 @@ For example, to download a <MainPlatformName /> project to a local folder:
 ```
 mergin download john/project1 ~/mergin/project1
 ```
-For more details, visit <GitHubRepo id="MerginMaps/mergin-py-client" />.
+For more details, visit <GitHubRepo id="MerginMaps/python-api-client" />.
 
 ## C++ standalone client
 C++ Client has advantage over Python that it is completely without any dependencies. 
 
-To install the C++ client, just download the binary for your platform from <GitHubRepo id="MerginMaps/mergin-cpp-client/releases"/> and use it from the command line.
+To install the C++ client, just download the binary for your platform from <GitHubRepo id="MerginMaps/cpp-api-client/releases"/> and use it from the command line.
 
-Go to <GitHubRepo id="MerginMaps/mergin-cpp-client" /> repository for more information on how to use it.
+Go to <GitHubRepo id="MerginMaps/cpp-api-client" /> repository for more information on how to use it.
 
 ### C++ Command line tool
 When the client is installed, it comes with `mergin` command line tool.
@@ -77,4 +77,4 @@ Commands:
 
 ### C++ Mergin Maps API core library 
 
-Client is based on the Qt-based <GitHubRepo id="MerginMaps/input/tree/master/core" desc="mergin maps api core library" /> used by the <MainDomainNameLink desc="Mergin Maps Input" /> to sync the projects in the mobile application.
+Client is based on the Qt-based <GitHubRepo id="MerginMaps/mobile/tree/master/core" desc="Mergin Maps API core library" /> used by the <MainDomainNameLink desc="Mergin Maps mobile app" /> to sync the projects in the mobile application.

src/dev/media-sync/index.md

@@ -7,7 +7,7 @@ Media Sync has two sync modes: in copy mode, media files are only copied the ext
 
 <YouTube id="jAElsCZRBdc" />
 
-**Interested in using Media Sync?** Go to <GitHubRepo id="MerginMaps/mergin-media-sync" /> repository for the source code and more details. Here, you will also find the Quick start guide that will show you how to set up one way synchronisation between a new <MainPlatformName /> project and your existing bucket (<NoSpellcheck id="MinIO" /> or S3).
+**Interested in using Media Sync?** Go to <GitHubRepo id="MerginMaps/media-sync" /> repository for the source code and more details. Here, you will also find the Quick start guide that will show you how to set up one way synchronisation between a new <MainPlatformName /> project and your existing bucket (<NoSpellcheck id="MinIO" /> or S3).
 
 :::tip Usage details
 Media Sync can be used with *Team*, *Academia* and *Non-profit* <MainDomainNameLink id="pricing" desc="subscription plans"/>, as well as in [<CommunityPlatformName />](../mergince/) and [<EnterprisePlatformName />](../merginmaps-ee/).

src/dev/mergince.md

@@ -3,7 +3,7 @@
 
 SaaS <MainPlatformName /> service is a web platform for storage and synchronisation of data between mobile devices, <MainPlatformNameLink /> service and QGIS Desktop. 
 
-There is also <MainPlatformName /> Community Edition (<CommunityPlatformNameLink />) that is licensed as open source software. The source code for <CommunityPlatformName /> can be modified and used for custom deployments. You can contribute your code to <GitHubRepo id="MerginMaps/mergin" />.
+There is also <MainPlatformName /> Community Edition (<CommunityPlatformNameLink />) that is licensed as open source software. The source code for <CommunityPlatformName /> can be modified and used for custom deployments. You can contribute your code to <GitHubRepo id="MerginMaps/server" />.
 
 [How to Use <MainPlatformName /> with a Custom Server](../manage/plugin-multi-server-use/) will explain how to use <QGISPluginName /> and <MobileAppName /> with your <CommunityPlatformName /> server.
 
@@ -14,14 +14,14 @@ Need more functionality than <CommunityPlatformNameLink /> offers? Explore our [
 :::
 
 ## How to deploy Mergin Maps CE
-**Interested in deploying <CommunityPlatformName />?** You can start by going to <GitHubRepo id="MerginMaps/mergin" /> on GitHub and read instructions on how to deploy it for your platform.
+**Interested in deploying <CommunityPlatformName />?** You can start by going to <GitHubRepo id="MerginMaps/server" /> on GitHub and read instructions on how to deploy it for your platform.
 
 :::tip
 Follow our [Migration Guides](./ce-migration/) to migrate from older versions to the latest version of <CommunityPlatformName />.
 :::
 ​
 ### Start docker containers
-Provided that `docker` and `docker-compose` are installed on your host, running Mergin Maps stack should be as simple as running `docker-compose`. However, before doing that you would need to [configure](#configure) your server setup via environment variables in <GitHubRepo desc=".prod.env" id="MerginMaps/mergin/blob/master/.prod.env" /> file. 
+Provided that `docker` and `docker-compose` are installed on your host, running Mergin Maps stack should be as simple as running `docker-compose`. However, before doing that you would need to [configure](#configure) your server setup via environment variables in <GitHubRepo desc=".prod.env" id="MerginMaps/server/blob/master/.prod.env" /> file. 
 
 Once configured, you can run:
 ```shell
@@ -39,7 +39,7 @@ $ docker exec merginmaps-server flask user create <username> <password> --is-adm
 ```
 ​
 ### Configure
-There are several application settings which can be changed via <GitHubRepo desc="config variables" id="MerginMaps/mergin/blob/master/.prod.env" />. Some of them have defaults and some of them needs to be modified, particularly those with `fixme` placeholder (marked with asterisks below).
+There are several application settings which can be changed via <GitHubRepo desc="config variables" id="MerginMaps/server/blob/master/.prod.env" />. Some of them have defaults and some of them needs to be modified, particularly those with `fixme` placeholder (marked with asterisks below).
 ​
 #### Server basics
 Settings about your deployment. Variables marked with star ⭐️ need to be modified.

src/dev/work-packages/index.md

@@ -8,7 +8,7 @@ The **Work Packages** tool is designed to manage field surveys for multiple team
 
 The main <MainPlatformNameLink/> project (*Survey*) contains all data. The admin of the main project can assign some of the data to working package projects (*Survey Team A*, *Survey Team B*). The teams can see and modify only the data that are assigned to them.
 
-**Interested in using Work Packages?** Go to <GitHubRepo id="MerginMaps/mergin-work-packages" /> repository for the source code, more details and a quick start with a simple project.
+**Interested in using Work Packages?** Go to <GitHubRepo id="MerginMaps/work-packages" /> repository for the source code, more details and a quick start with a simple project.
 
 :::tip Usage details
 Work Packages can be used with *Team*, *Academia* and *Non-profit* <MainDomainNameLink id="pricing" desc="subscription plans"/>, as well as in [<CommunityPlatformName />](../mergince/) and [<EnterprisePlatformName />](../merginmaps-ee/).

src/field/autosync/index.md

@@ -1,5 +1,4 @@
-# Synchronisation in Mergin Maps Input
-<SinceBadge type="App" version="1.4.0" />
+# Synchronisation in Mergin Maps Mobile App
 [[toc]]
 
 Changes in your project can be synchronised during the survey manually by using the sync button or automatically by allowing the automatic synchronisation in <MobileAppName />. 
@@ -11,7 +10,7 @@ To be able to synchronise a project, you need to:
 
 The sync button is displayed in the map window.
 
-![Sync button in Mergin Maps Input](../input-autosync.jpg "Sync button")
+![Sync button in Mergin Maps mobile app](../input-autosync.jpg "Sync button")
 
 :::tip
 Are you missing some data after synchronisation? [How to Recover Missing Data](../../manage/missing-data/) will show you how to deal with [conflict files](../../manage/missing-data/#there-are-conflict-files-in-the-folder) and how to [manually download](../../manage/missing-data/#there-are-no-conflict-files-in-the-folder) data from your mobile device.

src/field/broken-project/index.md

@@ -1,5 +1,4 @@
 # How to Fix a Broken Project
-<SinceBadge type="App" version="2.0.0" />
 [[toc]]
 
 Do you get an error message when trying to open a project in <MobileAppName />? There can be multiple reasons for what went wrong. Here we will try to guide you through some basic steps that can help you.

src/field/external_gps.md

@@ -1,6 +1,6 @@
 # External GPS
 
-<!--- IMPORTANT: This permalink is referenced from Mergin Maps Input -->
+<!--- IMPORTANT: This permalink is referenced from Mergin Maps mobile app -->
 
 [[toc]]
 
@@ -37,7 +37,7 @@ In Android, there are two ways how to use an external GPS device in <MobileAppNa
 
 It is strongly recommended to use the direct connection in <MobileAppName />. It is easier, quicker, provides more data, such as HDOP and fix quality. The app will report which device is used and take care of reconnecting in case of lost connection. Using mock location should be used only when it is not possible to connect the GPS receiver directly via <MobileAppName />.
 
-### How to connect external GPS receiver in Android via Mergin Maps Input (recommended)
+### How to connect external GPS receiver in Android via Mergin Maps mobile app (recommended)
 1. Connect the GPS receiver to your mobile device via Bluetooth.
 2. Open <MobileAppName /> and navigate **Select GPS receiver** in Settings:
 ![Select GPS receiver](./input-external-gps.jpg "Select GPS receiver")

src/field/gps_accuracy.md

@@ -5,7 +5,7 @@ Your GPS accuracy depends on several parameters, such as:
 - View of the clear sky that affects the number of satellites visible from your position 
 
 When doing the survey, it is essential to be aware of the limitations of your GPS accuracy at the time of recording. Current GPS accuracy is displayed above the bottom navigation panel in <MobileAppName />. Also, there is a circle with the size of the accuracy value around the position marker.
-![GPS accuracy displayed in Mergin Maps Input](./input-gps2.jpg "GPS accuracy displayed in Mergin Maps Input")
+![GPS accuracy displayed in Mergin Maps mobile app](./input-gps2.jpg "GPS accuracy displayed in Mergin Maps mobile app")
 
 A warning will appear, if your accuracy is outside the GPS accuracy threshold. To get rid of this warning, you can increase your **Accuracy threshold** or turn off these warnings in [Settings](./input_ui.md#gps-settings).
 ![Low GPS position accuracy warning](./input-gps-warning.jpg "Low GPS position accuracy warning")