Merge pull request #268 from mviewer/develop

Version 4

Author: lecault

.github/workflows/build.yml

@@ -3,7 +3,6 @@ on:
     branches:
     - master
     - develop
-
 jobs:
   build_images:
     timeout-minutes: 10
@@ -14,27 +13,21 @@ jobs:
       - name: "Set up Python"
         uses: actions/setup-python@v1
         with:
-          python-version: '3.8'
+          python-version: '3.9'
 
-      - name: "python backend - Running unit tests"
+      - name: "python backend - install requirements"
         working-directory: srv/python
         run: |
           pip install -r requirements.txt -r dev-requirements.txt
           pip install -e .
-          pytest mviewerstudio_backend/test.py
-
-      - name: "python backend - Typechecking"
-        working-directory: srv/python
-        run: |
-          mypy --ignore-missing mviewerstudio_backend
 
       - name: "python backend - Checking format"
         working-directory: srv/python
         run: |
           black . --check    
         
       - name: "Calculating image tag"
-        if: github.repository == 'geobretagne/mviewerstudio'
+        if: github.repository == 'mviewer/mviewerstudio'
         id: version
         run: |
           if [[ $GITHUB_REF == 'refs/heads/master' ]]; then
@@ -54,19 +47,17 @@ jobs:
 
       - name: "Log in to docker hub"
         uses: azure/docker-login@v1
-        if: github.repository == 'geobretagne/mviewerstudio'
+        if: github.repository == 'mviewer/mviewerstudio'
         with:
           username: '${{ secrets.DOCKER_HUB_USERNAME }}'
           password: '${{ secrets.DOCKER_HUB_PASSWORD }}'
 
       - name: "Retag / push the docker images (not stable)"
-        if: github.repository == 'geobretagne/mviewerstudio'
+        if: github.repository == 'mviewer/mviewerstudio'
         run: |
             docker tag mviewer/mviewerstudio:python-latest mviewer/mviewerstudio:python-${{ steps.version.outputs.VERSION }}
             docker tag mviewer/mviewerstudio:php-latest    mviewer/mviewerstudio:php-${{ steps.version.outputs.VERSION }}
             docker push mviewer/mviewerstudio:python-${{ steps.version.outputs.VERSION }}
             docker push mviewer/mviewerstudio:php-${{ steps.version.outputs.VERSION }}
 
      
-
-

.github/workflows/prettier-check.yaml

@@ -0,0 +1,24 @@
+name: Code style checking
+on:
+  pull_request:
+  push:
+    branches: [develop]
+
+jobs:
+  prettier:
+    name: Prettier checking
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18
+      - run: npm install
+      - run: npm run prettier-check
+
+      - name: Prettier Output
+        if: ${{ failure() }}
+        shell: bash
+        run: |
+          echo "ERROR - Some files are note formated."
+          echo "Use 'npm run pretty' to format JS files !"

.gitignore

@@ -26,3 +26,8 @@ srv/python/mviewerstudio_backend/static
 # pyenv
 .python-version
 ?venv/
+pydocs*
+
+# store
+store/
+public/

.prettierignore

@@ -0,0 +1,13 @@
+*.min*
+*.css
+*.mst
+**/.git
+bootstrap/
+bootstrap-table/
+bootstrap5-tags/
+Font-awesome/
+i18njs/
+mustache-2.3.0/
+openlayers/
+moment.js
+Sortable.min.js

.prettierrc

@@ -0,0 +1,10 @@
+{
+  "trailingComma": "es5",
+  "tabWidth": 2,
+  "useTabs": false,
+  "semi": true,
+  "singleQuote": false,
+  "printWidth": 90,
+  "bracketSpacing": true,
+  "bracketSameLine": true
+}

config-sample.json config-php-sample.json

@@ -1,10 +1,17 @@
 {
     "app_conf": {
         "studio_title": "GéoBretagne mviewer studio",
-        "upload_service": "srv/store.php",
-        "delete_service": "srv/delete.php",
-        "list_service": "srv/list.php",
-        "store_style_service": "srv/store/style.php",
+        "mviewer_version":  "3.9",
+        "mviewerstudio_version":  "4",
+        "is_php": "true",
+        "php": {
+            "upload_service": "srv/php/store.php",
+            "delete_service": "srv/php/delete.php",
+            "list_service": "srv/php/list.php",
+            "store_style_service": "srv/php/store/style.php"
+        },
+        "api": "api/app",
+        "store_style_service": "api/style",
         "mviewer_instance": "http://172.16.10.30/mviewer/",
         "conf_path_from_mviewer": "apps/store/",
         "mviewer_short_url": {
@@ -15,7 +22,7 @@
             "used": false,
             "url": "https://geobretagne.fr/minicatalog/csv"
         },
-        "user_info": "srv/user_info.php",
+        "user_info": "api/user",
         "export_conf_folder": "/var/www/htdocs/mviewer/apps/store/",
         "proxy": "../proxy/?url=",
         "user_info_visible": false,
@@ -159,13 +166,8 @@
                 },
                 {
                     "title": "Catalogue de la Région Grand Est",
-                    "url": "https://www.geograndest.fr/geonetwork/srv/fre/csw",
-                    "baseref": "https://www.geograndest.fr/geonetwork/srv/eng/catalog.search?node=srv#/metadata/"
-                },
-                {
-                    "title": "Catalogue de la Région Pays de la Loire",
-                    "url": "https://www.geopal.org/geonetwork/srv/fre/csw",
-                    "baseref": "https://www.geopal.org/geonetwork/srv/eng/catalog.search?node=srv#/metadata/"
+                    "url": "https://datagrandest.fr/geonetwork/srv/fre/csw",
+                    "baseref": "https://datagrandest.fr/geonetwork/srv/eng/catalog.search?node=srv#/metadata/"
                 }
             ],
             "wms": [{
@@ -179,4 +181,4 @@
             }
         }
     }
-}
+}

config-python-sample.json

@@ -1,24 +1,25 @@
 {
     "app_conf": {
-        "studio_title": "Mviewer STudio Megalis",
-        "upload_service": "srv/store",
-        "delete_service": "srv/delete",
-        "list_service": "srv/list",
-        "store_style_service": "srv/store/style",
-        "mviewer_instance": "/mviewer/",
+        "studio_title": "Mviewer Studio",
+        "mviewer_version":  "3.9",
+        "mviewerstudio_version":  "4",
+        "api": "api/app",
+        "store_style_service": "api/style",
+        "mviewer_instance": "http://127.0.0.1:5051/",
+        "publish_url": "http://127.0.0.1:5051/?config=apps/public/{{config}}.xml",
         "conf_path_from_mviewer": "apps/store/",
         "mviewer_short_url": {
             "used": true,
-            "apps_folder": "store"
+            "apps_folder": "store",
+            "public_folder": "public"
         },
         "external_themes": {
             "used": true,
             "url": "https://geobretagne.fr/minicatalog/csv"
         },
-        "user_info": "srv/user_info",
-        "export_conf_folder": "/home/debian/mviewer/apps/store/",
-        "proxy": "",
-        "user_info_visible": false,
+        "user_info": "api/user",
+        "proxy": "proxy/?url=",
+        "user_info_visible": true,
         "app_form_placeholders": {
             "app_title": "Kartenn",
             "logo_url": "https://geobretagne.fr/pub/logo/region-bretagne.jpg",
@@ -159,13 +160,8 @@
                 },
                 {
                     "title": "Catalogue de la Région Grand Est",
-                    "url": "https://www.geograndest.fr/geonetwork/srv/fre/csw",
-                    "baseref": "https://www.geograndest.fr/geonetwork/srv/eng/catalog.search?node=srv#/metadata/"
-                },
-                {
-                    "title": "Catalogue de la Région Pays de la Loire",
-                    "url": "https://www.geopal.org/geonetwork/srv/fre/csw",
-                    "baseref": "https://www.geopal.org/geonetwork/srv/eng/catalog.search?node=srv#/metadata/"
+                    "url": "https://datagrandest.fr/geonetwork/srv/fre/csw",
+                    "baseref": "https://datagrandest.fr/geonetwork/srv/eng/catalog.search?node=srv#/metadata/"
                 }
             ],
             "wms": [{
@@ -179,4 +175,4 @@
             }
         }
     }
-}
+}