@@ -2072,25 +2058,9 @@ var mv = (function () {
`;
}
$("#liste_applications").append(applications);
- // can't delete all with Python backend
- // delete all is available with first PHP backend only
- if (_conf.is_php) {
- document.querySelector("#deleteAllBtn").classList.remove("d-none");
- } else {
- document.querySelector("#deleteAllBtn").classList.add("d-none");
- }
},
getListeApplications(search = "") {
- // default python backend
- let url = `${_conf.api}?search=${search}`;
- // if backend is PHP
- if (_conf?.is_php && _conf?.php?.list_service) {
- if (document.querySelector("#searchBydescriptionInput")) {
- document.querySelector("#searchBydescriptionInput").remove();
- }
- // use php url file
- url = _conf.php.list_service;
- }
+ const url = `${_conf.api}?search=${search}`;
fetch(url)
.then((r) => (r.ok ? r.json() : Promise.reject(r)))
.catch((detail) => {
@@ -2806,12 +2776,6 @@ var mv = (function () {
}
},
openTemplateGenerator: () => {
- // not compliant with php backend
- if (_conf?.is_php) {
- liTemplateArea.classList.add("d-none");
- dismissTemplateGeneratorMsg.classList.remove("d-none");
- return;
- }
if (mv.templateGenerator) {
mv.destroyTemplateGenerator();
}
diff --git a/lib/ogc.js b/src/static/lib/ogc.js
similarity index 100%
rename from lib/ogc.js
rename to src/static/lib/ogc.js
diff --git a/lib/openlayers/7.1/ol.css b/src/static/lib/openlayers/7.1/ol.css
similarity index 100%
rename from lib/openlayers/7.1/ol.css
rename to src/static/lib/openlayers/7.1/ol.css
diff --git a/lib/openlayers/7.1/ol.js b/src/static/lib/openlayers/7.1/ol.js
similarity index 100%
rename from lib/openlayers/7.1/ol.js
rename to src/static/lib/openlayers/7.1/ol.js
diff --git a/lib/openlayers/7.1/ol.js.map b/src/static/lib/openlayers/7.1/ol.js.map
similarity index 100%
rename from lib/openlayers/7.1/ol.js.map
rename to src/static/lib/openlayers/7.1/ol.js.map
diff --git a/lib/slug.js b/src/static/lib/slug.js
similarity index 100%
rename from lib/slug.js
rename to src/static/lib/slug.js
diff --git a/lib/template-generator/ComponentsSelector.js b/src/static/lib/template-generator/ComponentsSelector.js
similarity index 100%
rename from lib/template-generator/ComponentsSelector.js
rename to src/static/lib/template-generator/ComponentsSelector.js
diff --git a/lib/template-generator/README.md b/src/static/lib/template-generator/README.md
similarity index 100%
rename from lib/template-generator/README.md
rename to src/static/lib/template-generator/README.md
diff --git a/lib/template-generator/TemplateGenerator.js b/src/static/lib/template-generator/TemplateGenerator.js
similarity index 100%
rename from lib/template-generator/TemplateGenerator.js
rename to src/static/lib/template-generator/TemplateGenerator.js
diff --git a/lib/template-generator/components/content/BottomPanelLocation.js b/src/static/lib/template-generator/components/content/BottomPanelLocation.js
similarity index 100%
rename from lib/template-generator/components/content/BottomPanelLocation.js
rename to src/static/lib/template-generator/components/content/BottomPanelLocation.js
diff --git a/lib/template-generator/components/content/RightPanelLocation.js b/src/static/lib/template-generator/components/content/RightPanelLocation.js
similarity index 100%
rename from lib/template-generator/components/content/RightPanelLocation.js
rename to src/static/lib/template-generator/components/content/RightPanelLocation.js
diff --git a/lib/template-generator/components/forms/ColorSelector.js b/src/static/lib/template-generator/components/forms/ColorSelector.js
similarity index 100%
rename from lib/template-generator/components/forms/ColorSelector.js
rename to src/static/lib/template-generator/components/forms/ColorSelector.js
diff --git a/lib/template-generator/components/forms/IconSelector.js b/src/static/lib/template-generator/components/forms/IconSelector.js
similarity index 100%
rename from lib/template-generator/components/forms/IconSelector.js
rename to src/static/lib/template-generator/components/forms/IconSelector.js
diff --git a/lib/template-generator/components/forms/InputFieldListComponent.js b/src/static/lib/template-generator/components/forms/InputFieldListComponent.js
similarity index 100%
rename from lib/template-generator/components/forms/InputFieldListComponent.js
rename to src/static/lib/template-generator/components/forms/InputFieldListComponent.js
diff --git a/lib/template-generator/components/forms/InputFieldValueComponent.js b/src/static/lib/template-generator/components/forms/InputFieldValueComponent.js
similarity index 100%
rename from lib/template-generator/components/forms/InputFieldValueComponent.js
rename to src/static/lib/template-generator/components/forms/InputFieldValueComponent.js
diff --git a/lib/template-generator/components/forms/InputStaticValueComponent.js b/src/static/lib/template-generator/components/forms/InputStaticValueComponent.js
similarity index 100%
rename from lib/template-generator/components/forms/InputStaticValueComponent.js
rename to src/static/lib/template-generator/components/forms/InputStaticValueComponent.js
diff --git a/lib/template-generator/components/forms/InputTagsComponent.js b/src/static/lib/template-generator/components/forms/InputTagsComponent.js
similarity index 100%
rename from lib/template-generator/components/forms/InputTagsComponent.js
rename to src/static/lib/template-generator/components/forms/InputTagsComponent.js
diff --git a/lib/template-generator/components/forms/InputTextComponent.js b/src/static/lib/template-generator/components/forms/InputTextComponent.js
similarity index 100%
rename from lib/template-generator/components/forms/InputTextComponent.js
rename to src/static/lib/template-generator/components/forms/InputTextComponent.js
diff --git a/lib/template-generator/components/forms/StyleCustom.js b/src/static/lib/template-generator/components/forms/StyleCustom.js
similarity index 100%
rename from lib/template-generator/components/forms/StyleCustom.js
rename to src/static/lib/template-generator/components/forms/StyleCustom.js
diff --git a/lib/template-generator/components/forms/TextArea.js b/src/static/lib/template-generator/components/forms/TextArea.js
similarity index 100%
rename from lib/template-generator/components/forms/TextArea.js
rename to src/static/lib/template-generator/components/forms/TextArea.js
diff --git a/lib/template-generator/components/forms/TypeFieldSelector.js b/src/static/lib/template-generator/components/forms/TypeFieldSelector.js
similarity index 100%
rename from lib/template-generator/components/forms/TypeFieldSelector.js
rename to src/static/lib/template-generator/components/forms/TypeFieldSelector.js
diff --git a/lib/template-generator/components/forms/tags.js b/src/static/lib/template-generator/components/forms/tags.js
similarity index 100%
rename from lib/template-generator/components/forms/tags.js
rename to src/static/lib/template-generator/components/forms/tags.js
diff --git a/lib/template-generator/components/library/ButtonComponent.js b/src/static/lib/template-generator/components/library/ButtonComponent.js
similarity index 100%
rename from lib/template-generator/components/library/ButtonComponent.js
rename to src/static/lib/template-generator/components/library/ButtonComponent.js
diff --git a/lib/template-generator/components/library/FreeComponent.js b/src/static/lib/template-generator/components/library/FreeComponent.js
similarity index 100%
rename from lib/template-generator/components/library/FreeComponent.js
rename to src/static/lib/template-generator/components/library/FreeComponent.js
diff --git a/lib/template-generator/components/library/IframeComponent.js b/src/static/lib/template-generator/components/library/IframeComponent.js
similarity index 100%
rename from lib/template-generator/components/library/IframeComponent.js
rename to src/static/lib/template-generator/components/library/IframeComponent.js
diff --git a/lib/template-generator/components/library/ImageComponent.js b/src/static/lib/template-generator/components/library/ImageComponent.js
similarity index 100%
rename from lib/template-generator/components/library/ImageComponent.js
rename to src/static/lib/template-generator/components/library/ImageComponent.js
diff --git a/lib/template-generator/components/library/ListComponent.js b/src/static/lib/template-generator/components/library/ListComponent.js
similarity index 100%
rename from lib/template-generator/components/library/ListComponent.js
rename to src/static/lib/template-generator/components/library/ListComponent.js
diff --git a/lib/template-generator/components/library/NumbersComponent.js b/src/static/lib/template-generator/components/library/NumbersComponent.js
similarity index 100%
rename from lib/template-generator/components/library/NumbersComponent.js
rename to src/static/lib/template-generator/components/library/NumbersComponent.js
diff --git a/lib/template-generator/components/library/TemplateComponent.js b/src/static/lib/template-generator/components/library/TemplateComponent.js
similarity index 100%
rename from lib/template-generator/components/library/TemplateComponent.js
rename to src/static/lib/template-generator/components/library/TemplateComponent.js
diff --git a/lib/template-generator/components/library/TextComponent.js b/src/static/lib/template-generator/components/library/TextComponent.js
similarity index 100%
rename from lib/template-generator/components/library/TextComponent.js
rename to src/static/lib/template-generator/components/library/TextComponent.js
diff --git a/lib/template-generator/components/library/TextH1Component.js b/src/static/lib/template-generator/components/library/TextH1Component.js
similarity index 100%
rename from lib/template-generator/components/library/TextH1Component.js
rename to src/static/lib/template-generator/components/library/TextH1Component.js
diff --git a/lib/template-generator/components/library/TextH3Component.js b/src/static/lib/template-generator/components/library/TextH3Component.js
similarity index 100%
rename from lib/template-generator/components/library/TextH3Component.js
rename to src/static/lib/template-generator/components/library/TextH3Component.js
diff --git a/lib/template-generator/main.js b/src/static/lib/template-generator/main.js
similarity index 100%
rename from lib/template-generator/main.js
rename to src/static/lib/template-generator/main.js
diff --git a/lib/template-generator/style.css b/src/static/lib/template-generator/style.css
similarity index 100%
rename from lib/template-generator/style.css
rename to src/static/lib/template-generator/style.css
diff --git a/lib/template-generator/utils.js b/src/static/lib/template-generator/utils.js
similarity index 100%
rename from lib/template-generator/utils.js
rename to src/static/lib/template-generator/utils.js
diff --git a/mviewerstudio.i18n.json b/src/static/mviewerstudio.i18n.json
similarity index 99%
rename from mviewerstudio.i18n.json
rename to src/static/mviewerstudio.i18n.json
index 926cadb9..af64c3d7 100644
--- a/mviewerstudio.i18n.json
+++ b/src/static/mviewerstudio.i18n.json
@@ -236,7 +236,6 @@
"modal.layer.customtemplate.create": "Créer",
"modal.layer.customtemplate.new": "Créer une fiche d'information personnalisée",
"modal.layer.customtemplate.subtitle": "SĂ©lectionner les champs Ă afficher et leurs aspects",
- "modal.layer.customtemplate.phpmsg": "Le générateur de template n'est pas disponible. Veuillez contacter un administrateur.",
"modal.layer.featurecount": "Limitation du nombre de réponses",
"modal.layer.featurecount.ph": "Nombre max d'entités retournées",
"modal.layer.query.useexternaltemplate": "Utiliser un template externe",
@@ -938,7 +937,6 @@
"modal.layer.displayoptions.title": "Display options",
"modal.layer.customtemplate.create": "Create",
"modal.layer.customtemplate.new": "Create a personalised information sheet",
- "modal.layer.customtemplate.phpmsg": "The template generator is not available. Please contact an administrator.",
"template.text.color": "Text color",
"template.bg.color": "Background color",
"template.input.static.ph": "Input value...",
diff --git a/src/static/package.json b/src/static/package.json
new file mode 100644
index 00000000..2e3a0223
--- /dev/null
+++ b/src/static/package.json
@@ -0,0 +1,27 @@
+{
+ "name": "mviewerstudio",
+ "version": "4.0.0",
+ "description": "mviewerstudio",
+ "main": "index.html",
+ "directories": {
+ "doc": "docs",
+ "lib": "lib"
+ },
+ "scripts": {
+ "pretty": "prettier --write \"./mviewerstudio.i18n.json\" \"./js/**/*.{js,json}\" \"./lib/mv.js\"",
+ "prettier-check": "prettier --check \"./mviewerstudio.i18n.json\" \"./js/**/*.{js,json}\" \"./lib/mv.js\""
+ },
+ "repository": {
+ "type": "git",
+ "url": "git+https://github.com/mviewer/mviewerstudio.git"
+ },
+ "author": "psc mviewer",
+ "license": "GPLv3",
+ "bugs": {
+ "url": "https://github.com/mviewer/mviewerstudio/issues"
+ },
+ "homepage": "https://github.com/mviewer/mviewerstudio#readme",
+ "devDependencies": {
+ "prettier": "^3.0.3"
+ }
+}
diff --git a/srv/python/mviewerstudio_backend/swagger.yaml b/src/swagger.yaml
similarity index 100%
rename from srv/python/mviewerstudio_backend/swagger.yaml
rename to src/swagger.yaml
diff --git a/srv/python/mviewerstudio_backend/test.py b/src/test.py
similarity index 100%
rename from srv/python/mviewerstudio_backend/test.py
rename to src/test.py
diff --git a/src/utils/__pycache__/commons.cpython-312.pyc b/src/utils/__pycache__/commons.cpython-312.pyc
new file mode 100644
index 00000000..ecb29ab9
Binary files /dev/null and b/src/utils/__pycache__/commons.cpython-312.pyc differ
diff --git a/src/utils/__pycache__/config_utils.cpython-312.pyc b/src/utils/__pycache__/config_utils.cpython-312.pyc
new file mode 100644
index 00000000..d7800a50
Binary files /dev/null and b/src/utils/__pycache__/config_utils.cpython-312.pyc differ
diff --git a/src/utils/__pycache__/git_utils.cpython-312.pyc b/src/utils/__pycache__/git_utils.cpython-312.pyc
new file mode 100644
index 00000000..04176c71
Binary files /dev/null and b/src/utils/__pycache__/git_utils.cpython-312.pyc differ
diff --git a/src/utils/__pycache__/login_utils.cpython-312.pyc b/src/utils/__pycache__/login_utils.cpython-312.pyc
new file mode 100644
index 00000000..57682d59
Binary files /dev/null and b/src/utils/__pycache__/login_utils.cpython-312.pyc differ
diff --git a/src/utils/__pycache__/register_utils.cpython-312.pyc b/src/utils/__pycache__/register_utils.cpython-312.pyc
new file mode 100644
index 00000000..aa635583
Binary files /dev/null and b/src/utils/__pycache__/register_utils.cpython-312.pyc differ
diff --git a/srv/python/mviewerstudio_backend/utils/commons.py b/src/utils/commons.py
similarity index 90%
rename from srv/python/mviewerstudio_backend/utils/commons.py
rename to src/utils/commons.py
index f82a48de..7c5b1428 100644
--- a/srv/python/mviewerstudio_backend/utils/commons.py
+++ b/src/utils/commons.py
@@ -94,10 +94,9 @@ def create_zip(dir, name):
def custom_make_archive(source, destination):
- base = path.basename(destination)
- name = base.split(".")[0]
- format = base.split(".")[1]
+ base_name, ext = path.splitext(destination)
+ archive_format = ext.lstrip(".")
archive_from = path.dirname(source)
- archive_to = path.basename(source.strip(sep))
- make_archive(name, format, archive_from, archive_to)
- move("%s.%s" % (name, format), destination)
+ archive_to = path.basename(source.rstrip(sep))
+
+ make_archive(base_name, archive_format, archive_from, archive_to)
diff --git a/srv/python/mviewerstudio_backend/utils/config_utils.py b/src/utils/config_utils.py
similarity index 100%
rename from srv/python/mviewerstudio_backend/utils/config_utils.py
rename to src/utils/config_utils.py
diff --git a/srv/python/mviewerstudio_backend/utils/git_utils.py b/src/utils/git_utils.py
similarity index 100%
rename from srv/python/mviewerstudio_backend/utils/git_utils.py
rename to src/utils/git_utils.py
diff --git a/srv/python/mviewerstudio_backend/utils/login_utils.py b/src/utils/login_utils.py
similarity index 100%
rename from srv/python/mviewerstudio_backend/utils/login_utils.py
rename to src/utils/login_utils.py
diff --git a/srv/python/mviewerstudio_backend/utils/register_utils.py b/src/utils/register_utils.py
similarity index 100%
rename from srv/python/mviewerstudio_backend/utils/register_utils.py
rename to src/utils/register_utils.py
diff --git a/srv/README.md b/srv/README.md
deleted file mode 100644
index 874648cf..00000000
--- a/srv/README.md
+++ /dev/null
@@ -1,77 +0,0 @@
- ### user_info.php
-
-Ce service retourne les informations liées à l'utilisateur connecté. Il sert d'intermédiaire entre un backend spécifique gérant l'authentification et mviewerstudio
-
-**Propriétés**
- | Method | Parameter | Content-Type |
-| --- | --- | --- |
-| GET | - | `application/json`
-
-**Exemple de réponse**
-
-Selon mviewerstudio.js, on devrait avoir :
-
- {
- "first_name": "",
- "last_name":"",
- "user_groups": [{"full_name":""}]
- }
-
- A la place, nous avons :
-
- {
- "first_name": "",
- "last_name":"",
- "organisation": {"legal_name":""}
- }
-
-
-### srv/list.php
-Ce service retourne la liste des applications (config.xml) créées par l'utilisateur courant (utlisateur connecté ou anonymous)
-
-**Propriétés**
- | Method | Parameter | Content-Type |
-| --- | --- | --- |
-| GET | - | `application/json`
-
-**Exemple de réponse**
-
- [{
- "url":"apps/store/f212c672d9e3968e39cffad5caf26426.xml",
- "creator":"anonymous",
- "date":"2020-02-18T14:42:35.667Z",
- "title":"DĂ©mo GĂ©oBretagne",
- "subjects":["Randonnée","Supervision"]
- }]
-
-
-
-### srv/store.php
-Enregistrement d'un fichier de configuration pour l'utilisateur courant
-
-**Propriétés**
- | Method | Parameter | Content-Type |
-| --- | --- | --- |
-| POST | config.xml | `application/json`
-
-**Exemple de réponse**
-
- {
- "success":true,
- "filepath":"06c143f8760b2392a1637c8dd3c6aef2.xml"
- }
-
-
-### srv/delete.php
-Supprime toutes les applications de l'utilisateur connecté
-
-**Propriétés**
- | Method | Parameter | Content-Type |
-| --- | --- | --- |
-| GET | - | `application/json`
-
-**Exemple de réponse**
-
- {
- "deleted_files": 13
- }
diff --git a/srv/php/delete.php b/srv/php/delete.php
deleted file mode 100644
index 3e57c000..00000000
--- a/srv/php/delete.php
+++ /dev/null
@@ -1,29 +0,0 @@
- $counter));
-}
-?>
diff --git a/srv/php/list.php b/srv/php/list.php
deleted file mode 100644
index c8c23edb..00000000
--- a/srv/php/list.php
+++ /dev/null
@@ -1,40 +0,0 @@
- !empty($url) ? $url : '',
- "creator" => !empty($description["creator"]) ? $description["creator"] : '',
- "date" => !empty($description["date"]) ? $description["date"] : '',
- "title" => !empty($description["title"]) ? $description["title"] : '',
- "subjects" => !empty($description["subject"]) ? $description["subject"] : '',
- );
- array_push( $data , $metadata);
- }
- }
-
- }
-
- header('Content-type: application/json',true);
- echo json_encode($data);
-
-}
-?>
diff --git a/srv/php/store.php b/srv/php/store.php
deleted file mode 100755
index 2b7ccffd..00000000
--- a/srv/php/store.php
+++ /dev/null
@@ -1,13 +0,0 @@
-
diff --git a/srv/php/store/style.php b/srv/php/store/style.php
deleted file mode 100644
index 351c018b..00000000
--- a/srv/php/store/style.php
+++ /dev/null
@@ -1,13 +0,0 @@
-
\ No newline at end of file
diff --git a/srv/php/user_info.php b/srv/php/user_info.php
deleted file mode 100644
index d2900932..00000000
--- a/srv/php/user_info.php
+++ /dev/null
@@ -1,6 +0,0 @@
-
\ No newline at end of file
diff --git a/srv/php/who.php b/srv/php/who.php
deleted file mode 100644
index 5f70cead..00000000
--- a/srv/php/who.php
+++ /dev/null
@@ -1,46 +0,0 @@
- $value) {
- if (substr($name, 0, 5) == "HTTP_") {
- $headers[str_replace(" ", "-", ucwords(strtolower(str_replace("_", " ", substr($name, 5)))))] = $value;
- }
- }
- return $headers;
- }
-}
-
-function getUser() {
- $user = "anonymous";
- foreach (getallheaders() as $name => $value) {
- if (substr( $name, 0, 4 ) === "sec-") {
- if ($name === "sec-username") {
- $user=$value;
- }
- }
- }
- return $user;
-}
-
-function getUserInfos() {
- $firstname = "";
- $lastname = "";
- $orgname = "";
- foreach (getallheaders() as $name => $value) {
- if (substr( $name, 0, 4 ) === "sec-") {
- if ($name === "sec-firstname") {
- $firstname=utf8_encode($value);
- }
- if ($name === "sec-lastname") {
- $lastname=utf8_encode($value);
- }
- if ($name === "sec-orgname") {
- $orgname=utf8_encode($value);
- }
-
- }
- }
- return array( $firstname, $lastname, $orgname );
-}
diff --git a/srv/python/install_backend_python.sh b/srv/python/install_backend_python.sh
deleted file mode 100644
index 16170dca..00000000
--- a/srv/python/install_backend_python.sh
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/bash
-
-#==========================================================================================
-# Script name : install_backend_python.sh
-# Autor : PSC mviewer
-# Description : This script ease mviewerstudio install
-# Usage : ./install_backend_python.sh [parent_directory] [branch] [directory_name]
-# Documentation : https://mviewerstudio.readthedocs.io/fr/stable/doc_tech/install_python.html
-#==========================================================================================
-
-# Install required packages
-apt install libxslt1-dev libxml2-dev python3 python3-pip python3-venv
-pip install virtualenv
-
-# FULL PATH - WILL CLONE REPO TO THIS LOCATION
-# EX : /home/
/git
-WORKING_PATH="$1"
-
-# To use a specific branch - will use master if no set
-BRANCH="$2"
-
-MVIEWERSTUDIO_DIR="$3"
-
-# Adapt this repo URL to get source from your own Git space
-REPO_URL="https://github.com/mviewer/mviewerstudio.git"
-
-# use default mviewerstudio dir name if not set from param
-if [ -z "${MVIEWERSTUDIO_DIR}" ]; then
- MVIEWERSTUDIO_DIR="mviewerstudio"
-fi
-
-# custom install path
-if [ "${WORKING_PATH}" ]; then
- cd "${WORKING_PATH}"
- MVIEWERSTUDIO_DIR="${WORKING_PATH}/${MVIEWERSTUDIO_DIR}"
-else
- MVIEWERSTUDIO_DIR="$(pwd)/${MVIEWERSTUDIO_DIR}"
-fi
-
-STATIC_DIR="${MVIEWERSTUDIO_DIR}/srv/python/mviewerstudio_backend/static"
-
-# Clone repo and change branch if needed
-
-if [ ! -d "${MVIEWERSTUDIO_DIR}" ]; then
- git clone "${REPO_URL}" "${MVIEWERSTUDIO_DIR}"
- if [ "${BRANCH}" ]; then
- cd "${MVIEWERSTUDIO_DIR}"
- git checkout "${BRANCH}"
- fi
-fi
-
-# Copy front resources
-
-mkdir -p "${MVIEWERSTUDIO_DIR}/srv/python/mviewerstudio_backend/static/apps"
-cp -r "${MVIEWERSTUDIO_DIR}/css" "${STATIC_DIR}"
-cp -r "${MVIEWERSTUDIO_DIR}/img" "${STATIC_DIR}"
-cp -r "${MVIEWERSTUDIO_DIR}/js" "${STATIC_DIR}"
-cp -r "${MVIEWERSTUDIO_DIR}/lib" "${STATIC_DIR}"
-cp -r "${MVIEWERSTUDIO_DIR}/index.html" "${STATIC_DIR}"
-
-cp "${MVIEWERSTUDIO_DIR}/mviewerstudio.i18n.json" "${STATIC_DIR}/mviewerstudio.i18n.json"
-cp "${MVIEWERSTUDIO_DIR}/config-python-sample.json" "${STATIC_DIR}/apps/config.json"
-
-cd "${MVIEWERSTUDIO_DIR}/srv/python"
-
-# install python venv and requirements
-
-python3 -m venv .venv
-. "${MVIEWERSTUDIO_DIR}/srv/python/.venv/bin/activate"
-pip install -r requirements.txt -r dev-requirements.txt
-pip install -e .
diff --git a/srv/python/mviewerstudio_backend/__init__.py b/srv/python/mviewerstudio_backend/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/srv/python/mviewerstudio_backend/store/a.txt b/srv/python/mviewerstudio_backend/store/a.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/srv/python/setup.py b/srv/python/setup.py
deleted file mode 100644
index 0c94bcda..00000000
--- a/srv/python/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-from setuptools import setup, find_packages
-
-with open("requirements.txt") as f:
- REQUIREMENTS = f.read().split("\n")
-
-setup(
- name="mviewerstudio_backend",
- version="0.2",
- description="A simple API for mviewerstudio",
- author="mviewer community",
- author_email="",
- url="https://github.com/mviewer/mviewerstudio",
- packages=find_packages(),
- install_requires=REQUIREMENTS,
- python_requires=">=3.11",
- classifiers=[
- "Programming Language :: Python",
- "Programming Language :: Python :: 3",
- "Programming Language :: Python :: 3.11",
- "Framework :: Flask",
- "Topic :: Internet :: WWW/HTTP",
- "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
- ],
-)
diff --git a/srv/python/sync.sh b/srv/python/sync.sh
deleted file mode 100644
index 087e8bb4..00000000
--- a/srv/python/sync.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/bash
-
-# =====================
-# THIS SCRIPT EASE SYNC BETWEEN ROOT FOLDER AND PYTHON'S SRV DIRECTORY.
-# USE ONE PARAM : action
-# VALUE: pull or push
-#
-# EXAMPLE TO SYNC AFTER GIT PULL:
-# sh ./sync.sh pull
-#
-# EXAMPLE TO SYNC BEFORE GIT PUSH:
-# sh ./sync.sh push
-# =====================
-
-echo "START...."
-
-if [ -z "$1" ]
-then
- echo "No action param | First arg value 'push' or 'pull' missing"
- echo "Exemple : echo sh ./sync.sh pull /home/user/git/mviewerstudio"
- echo "....END."
- exit 0
-fi
-
-if [ -z "$2" ]
-then
- echo "No root path param | second arg missing"
- echo "Exemple : echo sh ./sync.sh pull /home/user/git/mviewerstudio"
- echo "....END."
- exit 0
-fi
-
-root_path="$2"
-srv_path="${root_path}/srv/python/"
-srv_static_path="${srv_path}/mviewerstudio_backend/static"
-action="$1"
-
-if [ "${action}" = "pull" ]
-then
- src="${root_path}"
- target="${srv_static_path}"
-elif [ "${action}" = "push" ]
-then
- src="${srv_static_path}"
- target="${root_path}"
-fi
-
-echo "Copy files...."
-cp -pr "${src}/index.html" "${target}/index.html"
-cp -pr "${src}/lib" "${target}"
-cp -pr "${src}/js" "${target}"
-cp -pr "${src}/css/mviewerstudio.css" "${target}/css/mviewerstudio.css"
-cp -pr "${src}/mviewerstudio.i18n.json" "${target}/mviewerstudio.i18n.json"
-
-echo "....END."
-#exit 0
-
-
-
diff --git a/start.sh b/start.sh
new file mode 100755
index 00000000..10efc0a1
--- /dev/null
+++ b/start.sh
@@ -0,0 +1,51 @@
+#!/bin/bash
+
+set -euo pipefail
+
+ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+VENV_DIR="${ROOT_DIR}/.venv"
+FRONT_CONFIG="${ROOT_DIR}/src/static/config.json"
+
+needs_install=false
+
+if [ ! -d "${VENV_DIR}" ]; then
+ needs_install=true
+fi
+
+if [ ! -f "${FRONT_CONFIG}" ]; then
+ needs_install=true
+fi
+
+if [ "${needs_install}" = true ]; then
+ echo "Environment not ready. Installing local dependencies..."
+ sudo apt install -y libxslt1-dev libxml2-dev python3 python3-pip python3-venv git
+ python3 -m venv "${VENV_DIR}"
+ . "${VENV_DIR}/bin/activate"
+ pip install -r "${ROOT_DIR}/install/requirements.txt" -r "${ROOT_DIR}/install/dev-requirements.txt"
+ pip install -e "${ROOT_DIR}/src"
+else
+ . "${VENV_DIR}/bin/activate"
+fi
+
+if ! command -v flask >/dev/null 2>&1; then
+ echo "Flask not available in the current virtualenv. Reinstalling local dependencies..."
+ pip install -r "${ROOT_DIR}/install/requirements.txt" -r "${ROOT_DIR}/install/dev-requirements.txt"
+ pip install -e "${ROOT_DIR}/src"
+fi
+
+if [ ! -f "${FRONT_CONFIG}" ]; then
+ echo "Missing front config: ${FRONT_CONFIG}"
+ exit 1
+fi
+
+export CONF_PATH_FROM_MVIEWER="${CONF_PATH_FROM_MVIEWER:-apps/store}"
+export CONF_PUBLISH_PATH_FROM_MVIEWER="${CONF_PUBLISH_PATH_FROM_MVIEWER:-apps/public}"
+export EXPORT_CONF_FOLDER="${EXPORT_CONF_FOLDER:-${ROOT_DIR}/apps/store}"
+export MVIEWERSTUDIO_PUBLISH_PATH="${MVIEWERSTUDIO_PUBLISH_PATH:-${ROOT_DIR}/apps/public}"
+export DEFAULT_ORG="${DEFAULT_ORG:-public}"
+export LOG_LEVEL="${LOG_LEVEL:-INFO}"
+export FLASK_DEBUG="${FLASK_DEBUG:-1}"
+
+mkdir -p "${EXPORT_CONF_FOLDER}" "${MVIEWERSTUDIO_PUBLISH_PATH}"
+
+exec flask --app "${ROOT_DIR}/src/app.py" run -p "${FLASK_PORT:-5007}"
",
- "style": "normal",
- "matrixset": "PM",
- "maxzoom": "22"
- }
- },
- "data_providers" : {
- "csw" : [
- {
- "title" : "Catalogue GĂ©oBretagne",
- "url": "https://geobretagne.fr/geonetwork/srv/fre/csw",
- "baseref": "https://geobretagne.fr/geonetwork/srv/eng/catalog.search?node=srv#/metadata/"
- },
- {
- "title" : "Catalogue RĂ©gion Bretagne",
- "url": "https://applications.region-bretagne.fr/geonetwork/srv/fre/csw",
- "baseref": "https://applications.region-bretagne.fr/geonetwork/srv/fre/catalog.search#/metadata/"
- },
- {
- "title" : "Catalogue de la RĂ©gion Grand Est",
- "url": "https://geobretagne.fr/geonetwork/srv/fre/csw",
- "baseref": "https://www.cigalsace.org/geonetwork/"
- },
- {
- "title" : "Catalogue de la RĂ©gion Pays de la Loire",
- "url": "../proxy/?url=https://www.geopal.org/geonetwork/srv/fre/csw",
- "baseref": "https://www.geopal.org/geonetwork/"
- }
- ],
- "wms" : [
- {
- "title" : "Serveur WMS de la RĂ©gion",
- "url": "https://ows.region-bretagne.fr/geoserver/rb/wms"
- }
- ]
- },
- "default_params" : {
- "layer": {
- "info_format": "text/html"
- }
- }
- }
-}
diff --git a/docker/nginx/default.conf.template b/docker/nginx/default.conf.template
index c0e216ac..2a7988ec 100644
--- a/docker/nginx/default.conf.template
+++ b/docker/nginx/default.conf.template
@@ -2,8 +2,16 @@ server {
listen 80;
server_name ${NGINX_HOST};
+ location = /mviewer {
+ return 302 /mviewer/$is_args$args;
+ }
+
location /mviewer/ {
- proxy_pass http://mviewer:8080/;
+ proxy_pass http://mviewer/;
+ }
+
+ location /apps/ {
+ alias /usr/share/nginx/html/apps/;
}
location /${MVIEWERSTUDIO_URL_PATH_PREFIX}/ {
@@ -20,7 +28,6 @@ server {
location / {
server_name_in_redirect off;
- return 302 /${MVIEWERSTUDIO_URL_PATH_PREFIX};
+ return 302 /${MVIEWERSTUDIO_URL_PATH_PREFIX}/;
}
}
-
diff --git a/docker/readme.md b/docker/readme.md
index 36c85dd8..2cdd05b5 100644
--- a/docker/readme.md
+++ b/docker/readme.md
@@ -1,7 +1,7 @@
# mviewerstudio Dockerfile
-## Which one ?
-The maintained dockerfile is the python one. The php one is there for historical reasons and will probably soon be dropped.
+## Image
+Only python Dockerfile will be maintained (PHP backend is fully deprecated).
## Environment variables
@@ -13,10 +13,17 @@ The maintained dockerfile is the python one. The php one is there for historical
## Default configuration
-The default configuration (env vars defined in the dockerfile and json config file copied) assume that:
+The default configuration (env vars defined in the dockerfile and json config file present in `src/static/config.json`) assume that:
- the mviewer _apps_ folder is mounted at EXPORT_CONF_FOLDER=/home/apprunner/apps
- /home/apprunner/apps/store and /home/apprunner/apps/prod are existing folders (you might need to create them manually beforehand)
-- it is using config-python-sample.json, which at some point you will probably want to override with your own config.
+- it is using `src/static/config.json`, which you will probably want to adapt to your own environment.
It is also configured to serve the frontend (static files) with gunicorn, which is usually not recommended. Later versions might use an nginx container to serve the frontend.
+
+## Build mviewerstudio image
+
+Use docker compose to build image :
+
+`docker compose build mviewerstudio`
+
diff --git a/docs/doc_tech/config_front.rst b/docs/doc_tech/config_front.rst
index 581f44af..5ece8269 100644
--- a/docs/doc_tech/config_front.rst
+++ b/docs/doc_tech/config_front.rst
@@ -9,11 +9,11 @@ Configurer le frontend mviewerstudio
Structure du fichier de configuration
----------------------------------------------
-La configuration s'effectue dans le fichier config-python-sample.json localisé à la racine du projet. Ce fichier de configuration sera copié automatiquement via le script d'installation (ou à copier manuellement) dans le répertoire ``srv/python/mviewerstudiobackend/static/apps`` sous le nom ``config.json``.
+La configuration du frontend s'effectue dans le fichier ``src/static/config.json`` localisĂ© dans le projet. Ce fichier pilote l'interface web de mviewerstudio et doit ĂȘtre adaptĂ© selon votre environnement.
-Voici le fichier d'exemple Ă utiliser et Ă adapter selon votre environnement :
+Voici le fichier de configuration frontend Ă utiliser et Ă adapter selon votre environnement :
-https://github.com/mviewer/mviewerstudio/blob/master/config-python-sample.json
+https://github.com/mviewer/mviewerstudio/blob/master/src/static/config.json
ParamĂštres du fichier de configuration
@@ -32,7 +32,7 @@ Ces paramĂštres sont Ă renseigner dans tous les cas.
- ``mviewer_short_url`` : Utilisation du systĂšme d'URL courtes (mviewer/#monappli au lieu de mviewer/?config=apps/monappli.xml).
- ``used`` : true | false.
- ``apps_folder`` : chemin d'accÚs depuis le répertoire apps (exemple store pour apps/store).
- - ``public_folder`` : (pour backend Python seulement) - chemin d'accÚs depuis le répertoire apps pour les éléments publiés (exemple store pour apps/public).
+ - ``public_folder`` : chemin d'accÚs depuis le répertoire apps pour les éléments publiés (exemple store pour apps/public).
- ``external_themes`` : Utilisation du mécanisme d'import de thématiques externes (présentes dans d'autres mviewers).
- ``proxy`` : Chemin du proxy par lequel les requĂȘtes envoyĂ©es par mviewerstudio passeront si cette valeur est dĂ©finie.
- ``used`` : Booléen -> Utiliser ``"true"`` pour permettre le chargement et l'utilisation des thématiques externes.
@@ -51,7 +51,7 @@ Ces paramĂštres sont Ă renseigner dans tous les cas.
ParamĂštres obligatoires
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Ces paramĂštres sont obligatoires avec un backend Python.
+Ces paramĂštres sont obligatoires.
- ``api``: URL vers le service (API) du backend Python. Valeur par défaut : ``api/app``.
- ``user_info``: URL vers le service (API) permettant de récupérer les informations de l'utilisateur connecté. Valeur par défaut ``api/user``.
diff --git a/docs/doc_tech/dev_corner.rst b/docs/doc_tech/dev_corner.rst
index c8c01d2b..38722fde 100644
--- a/docs/doc_tech/dev_corner.rst
+++ b/docs/doc_tech/dev_corner.rst
@@ -24,7 +24,7 @@ Prérequis
Généralités
-----------
-Le debugger VS Code permet d'utiliser le virtualenv (répertoire .venv) installé dans le répertoire `srv/python`.
+Le debugger VS Code permet d'utiliser le virtualenv (répertoire `.venv`) installé à la racine du projet.
Vous pouvez suivre cette documentation Ă propos des virtualenv dans VS code :
@@ -39,9 +39,9 @@ https://code.visualstudio.com/docs/python/tutorial-flask
Synchronisation API / Swagger
-----------------------------
-Toute modification des routes backend (fichier ``srv/python/mviewerstudio_backend/route.py``)
+Toute modification des routes backend (fichier ``src/route.py``)
doit ĂȘtre synchronisĂ©e dans la spĂ©cification Swagger/OpenAPI
-(``srv/python/mviewerstudio_backend/swagger.yaml``).
+(``src/swagger.yaml``).
AccĂšs Ă Swagger
---------------
@@ -61,13 +61,13 @@ les URLs deviennent :
Configuration du debugger VS Code
---------------------------------
-1. Ouvrir le répertoire /srv/python/ dans VS Code.
+1. Ouvrir la racine du projet dans VS Code.
2. Ouvrir le fichier .vscode/launch.json (voir la section suivante si non existant)
3. Modifier les variables d'environnement (aidez-vous de la page :ref:`install_python`) selon votre environnement
.. code-block:: sh
- "FLASK_APP": "mviewerstudio_backend/app.py",
+ "FLASK_APP": "src/app.py",
"FLASK_DEBUG": "1",
"CONF_PATH_FROM_MVIEWER":"apps/store",
"EXPORT_CONF_FOLDER":"/home/user/git/mviewer/apps/store/",
@@ -78,7 +78,7 @@ Configuration du debugger VS Code
4. Dans VS Code assurez-vous de sélectionner le bon virtualenv (voir les documentations précédentes)
-5. Ouvrir le fichier `/srv/python/mviewerstudio_backend/static/apps/config.json` et adapter les bonnes valeurs
+5. Ouvrir le fichier ``src/static/config.json`` et adapter les bonnes valeurs
Ici, mviewer est accessible en local sur http://localhost:5051 (via NodeJs) et les répertoires `apps/store` et `apps/public` ont été créés à la main, et accessible en lecture / écriture par l'utilisateur qui exécute le backend via VS Code.
@@ -105,7 +105,7 @@ Si le fichier n'est pas disponible, vous pouvez le créer via le générateur VS
1. Création manuelle
-Dans `/srv/python`, vous devrez créer un répertoire (si inexistant) `.vscode` et un fichier `launch.json`.
+à la racine du projet, vous devrez créer un répertoire (si inexistant) `.vscode` et un fichier `launch.json`.
.. warning::
Le type `python` semble déprécié mais fonctionne encore. Le type `debugpy` n'est pas compatible avec cette documentation.
@@ -126,7 +126,7 @@ Dans le fichier launch.json, collez ce fichier et reprenez la section `Configura
"request": "launch",
"module": "flask",
"env": {
- "FLASK_APP": "mviewerstudio_backend/app.py",
+ "FLASK_APP": "src/app.py",
"FLASK_DEBUG": "1",
"CONF_PATH_FROM_MVIEWER":"apps/store",
"EXPORT_CONF_FOLDER":"/home/user/git/mviewer/apps/store/",
@@ -148,7 +148,7 @@ Dans le fichier launch.json, collez ce fichier et reprenez la section `Configura
2. Création via l'outil VS Code
-Ouvrez le répertoire srv/python dans VS Code.
+Ouvrez la racine du projet dans VS Code.
- A gauche, cliquez sur `Run and Debug`.
@@ -160,5 +160,5 @@ Ouvrez le répertoire srv/python dans VS Code.
- Dans la 3Ăš Ă©tape, cliquez sur `Default`
-- Dans le nouveau fichier `.vscode/launch.json`, modifier les valeurs et surtout la valeur de "FLASK_APP" pour pointer vers le fichier `srv/python/mviewer_backend/app.py`
+- Dans le nouveau fichier `.vscode/launch.json`, modifier les valeurs et surtout la valeur de "FLASK_APP" pour pointer vers le fichier `src/app.py`
diff --git a/docs/doc_tech/install_other.rst b/docs/doc_tech/install_docker.rst
similarity index 65%
rename from docs/doc_tech/install_other.rst
rename to docs/doc_tech/install_docker.rst
index 37be0391..67a5dffa 100644
--- a/docs/doc_tech/install_other.rst
+++ b/docs/doc_tech/install_docker.rst
@@ -1,21 +1,12 @@
.. Authors :
.. mviewer team
-.. _install_other:
+.. _install_docker:
-Autres types d'installations possibles
-======================================
+Installation avec Docker
+========================
-Installer avec le Backend PHP
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. warning:: PHP est officiellement annoncé en fin de vie, n'est plus maintenue et sera supprimé dans une prochaine version.
-
-A partir de la version 4, veuillez suivre la documentation d'installation du backend Python (maintenu) pour disposer des nouvelles fonctionnalités.
-Pour plus d'informations sur PHP, vous devrez consulter la documentation de la version que vous souhaiter installer.
-
-Docker
-~~~~~~~
+Cette page complÚte la procédure d'installation du backend Python avec un déploiement conteneurisé.
Vous devez avoir installé docker au préalable.
@@ -28,7 +19,7 @@ https://github.com/mviewer/mviewerstudio/edit/master/docker/readme.md
2. Composition docker
-Vous pouvez Ă©galement utiliser la composition docker disponible Ă la racine du projet afin d'obtenir mviewer, mviewerstudio et le backend python :
+Vous pouvez Ă©galement utiliser la composition docker disponible Ă la racine du projet afin d'obtenir mviewer, mviewerstudio et le backend Python :
https://github.com/mviewer/mviewerstudio/blob/master/docker-compose.yml
diff --git a/docs/doc_tech/install_python.rst b/docs/doc_tech/install_python.rst
index 6e3f75c7..d00098cb 100644
--- a/docs/doc_tech/install_python.rst
+++ b/docs/doc_tech/install_python.rst
@@ -7,7 +7,7 @@
Installer mviewerstudio avec Python
###################################
-Mviewerstudio est une application web dĂ©veloppĂ©e en HTML / CSS / PHP / Python. Elle nĂ©cessite simplement d'ĂȘtre dĂ©ployĂ©e sur un serveur WEB qui peut ĂȘtre APACHE, NGINX, TOMCATâŠ
+Mviewerstudio est une application web dĂ©veloppĂ©e en HTML / CSS / JavaScript avec un backend Python. Elle nĂ©cessite simplement d'ĂȘtre dĂ©ployĂ©e sur un serveur WEB qui peut ĂȘtre APACHE, NGINX, TOMCATâŠ
Installation
************
@@ -22,24 +22,13 @@ Vous aurez besoin :
.. code-block:: sh
sudo apt install libxslt1-dev libxml2-dev python3 python3-pip python3-venv
- pip install virtualenv
-- d'une version Python >= 3.11
+- d'une version Python >= 3.9
- d'une instance mviewer fonctionnelle (/mviewer)
Procédures d'installation
=========================
-.. note::
- Avant de réaliser l'installation, vous devez avoir connaissance de la différence entre un environnement de
- ``production`` et un environnement de ``développements``.
-
- ``Lâenvironnement de production`` est la destination finale dâune application web ou dâun site web.
- C'est l'environnement final qui sera accessible par vos utilisateurs.
-
- ``Lâenvironnement de dĂ©veloppement`` reprĂ©sente le contexte dans lequel vous allez rĂ©aliser des dĂ©veloppements, des modifications du code ou des tests
- avant de réaliser le passage de l'application dans l'environnement de production final.
-
Installation manuelle
---------------------
@@ -47,20 +36,12 @@ Installation manuelle
#Récupération des sources
git clone https://github.com/mviewer/mviewerstudio.git
- #Positionnement sur la branche ou la version choisie
cd mviewerstudio
- git checkout develop
- STATIC_DIR=srv/python/mviewerstudio_backend/static
- #Création du dossier apps
- mkdir -p "${STATIC_DIR}/apps"
- #Copie des dossiers ressources dans le dossier static
- cp -r css img js lib index.html mviewerstudio.i18n.json "${STATIC_DIR}"
#Création de l'environnement virtuel Python et installation des dépendances
- cd srv/python
python3 -m venv .venv
source .venv/bin/activate
- pip install -r requirements.txt -r dev-requirements.txt
- pip install -e .
+ pip install -r install/requirements.txt -r install/dev-requirements.txt
+ pip install -e src
@@ -68,24 +49,23 @@ Installation manuelle
Installation scriptée
---------------------
-Téléchargez le script d'installation
-
.. code-block:: sh
- sudo apt install curl
- curl -O https://raw.githubusercontent.com/mviewer/mviewerstudio/master/srv/python/install_backend_python.sh
+ git clone https://github.com/mviewer/mviewerstudio.git
+ cd mviewerstudio
+ bash ./install/install.sh
-Le script utilise 3 paramĂštres :
+Le script peut utiliser 3 paramĂštres :
- ``