Skip to content

Commit 60564a3

Browse files
authored
Merge pull request #395 from MerginMaps/iss_359_new-products-name
Iss #359 new products name (cleanup)
2 parents ab6d387 + 6cfaaac commit 60564a3

File tree

64 files changed

+330
-298
lines changed

Some content is hidden

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

64 files changed

+330
-298
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<template>
2-
<span class="nospellcheck">Mergin Maps Input</span>
2+
<span class="nospellcheck">Mergin Maps mobile app</span>
33
</template>
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<template>
2+
<span class="nospellcheck">mobile app</span>
3+
</template>

src/.vuepress/components/QGIS.vue

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<template>
2+
<span>
3+
<a :href="`https://qgis.org/${link}`" target="_blank" rel="noopener noreferrer">
4+
<img alt="QGIS Documentation" :src="$withBase('/QGIS.svg')" />
5+
<span v-html="text"></span>
6+
<span>
7+
<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">
8+
<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>
9+
<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>
10+
</svg>
11+
<span class="sr-only">(opens new window)</span>
12+
</span>
13+
</a>
14+
</span>
15+
</template>
16+
17+
<script>
18+
export default {
19+
name: "qgishelp",
20+
props: {
21+
ver: String,
22+
link: String,
23+
text: String
24+
}
25+
}
26+
</script>
27+
28+
<style scoped>
29+
img {
30+
border: none;
31+
height: 15px;
32+
}
33+
</style>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<template>
2-
<span>Mergin Maps plugin for QGIS</span>
2+
<span>Mergin Maps QGIS plugin</span>
33
</template>
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<template>
2+
<span>QGIS plugin</span>
3+
</template>

src/.vuepress/components/SinceBadge.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<span>
3-
<span class="sincebadge" v-if="type === 'App'" >since Mobile {{ version }}</span>
4-
<span class="sincebadge" v-else-if="type === 'Plugin'">since Plugin {{ version }}</span>
3+
<span class="sincebadge" v-if="type === 'App'" >since Mobile app {{ version }}</span>
4+
<span class="sincebadge" v-else-if="type === 'Plugin'">since QGIS plugin {{ version }}</span>
55
<span class="sincebadge" v-else-if="type === 'Server'">since Server {{ version }}</span>
66
</span>
77
</template>

src/dev/ce-migration/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ $ docker-compose -f docker-compose.yml stop
3636
$ git pull
3737
```
3838

39-
6. Set environment variables (<GitHubRepo desc=".prod.env" id="MerginMaps/mergin/blob/master/.prod.env" /> file). **Important** ⚠️
39+
6. Set environment variables (<GitHubRepo desc=".prod.env" id="MerginMaps/server/blob/master/.prod.env" /> file). **Important** ⚠️
4040

4141
As mentioned earlier, CE operates with one global workspace. We will set it up now.
4242
Specify its name with the following environment variable:

src/dev/customapp.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ Our mobile app <MobileAppName /> provides seamless synchronisation of field data
44

55
The good news is that <MobileAppName /> is licensed as open source software, which means that anything is possible with a bit of development!
66

7-
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.
7+
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.
88

9-
The <GitHubRepo id="MerginMaps/input-sdk" desc="Input SDK repository" /> provides all the dependencies for various platforms (Android, iOS, macOS, Windows).
9+
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<YouTube id="4mWcaKs9jkw" />
66

7-
**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.
7+
**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.
88

99
:::tip Usage details
1010
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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ You can try these tools for free during the trial period.
1414
## Python client module
1515
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.
1616

17-
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.
17+
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.
1818

1919
Python client is available in the PyPI repository and can be installed with `pip`:
2020

@@ -45,14 +45,14 @@ For example, to download a <MainPlatformName /> project to a local folder:
4545
```
4646
mergin download john/project1 ~/mergin/project1
4747
```
48-
For more details, visit <GitHubRepo id="MerginMaps/mergin-py-client" />.
48+
For more details, visit <GitHubRepo id="MerginMaps/python-api-client" />.
4949

5050
## C++ standalone client
5151
C++ Client has advantage over Python that it is completely without any dependencies.
5252

53-
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.
53+
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.
5454

55-
Go to <GitHubRepo id="MerginMaps/mergin-cpp-client" /> repository for more information on how to use it.
55+
Go to <GitHubRepo id="MerginMaps/cpp-api-client" /> repository for more information on how to use it.
5656

5757
### C++ Command line tool
5858
When the client is installed, it comes with `mergin` command line tool.
@@ -77,4 +77,4 @@ Commands:
7777

7878
### C++ Mergin Maps API core library
7979

80-
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.
80+
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.

0 commit comments

Comments
 (0)