Merge branch 'redmine-issue-11982' into 'develop'

REDMIN_ISSUE-11982 See merge request geocontrib/geocontrib-frontend!95

Merge branch 'redmine-issue-11982' into 'develop'
c7d753c9 · Sébastien DA ROCHA · 85ea8a85 · af155109 · c7d753c9 · c7d753c9
Commit c7d753c9 authored 3 years ago by Sébastien DA ROCHA
--- a/.dockerignore
+++ b/.dockerignore
+### macOS ###
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+package-lock.json
+.env
+.env.*
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### Vuejs ###
+# Recommended template: Node.gitignore
+
+node_modules/
+dist/
+npm-debug.log
+yarn-error.log
+
+*.swp
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,9 +35,15 @@ build stable docker image:
  script:
    - mkdir -p /kaniko/.docker
    - echo "{\"auths\":{\"https://index.docker.io/v1/\":{\"auth\":\"$DOCKER_AUTH\"}}}" > /kaniko/.docker/config.json
+
+    - rm $CI_PROJECT_DIR/.env
    - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination neogeo/geocontrib-front:latest
    - echo Image docker neogeo/geocontrib:latest livrée

+    - echo "BASE_URL=/geocontrib/" > $CI_PROJECT_DIR/.env
+    - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination neogeo/geocontrib-front:geocontrib-latest
+    - echo Image docker neogeo/geocontrib:-geocontrib-latest livrée
+
 build tagged docker image:
  stage: build
  only:
@@ -56,6 +62,9 @@ build tagged docker image:
    - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination neogeo/geocontrib-front:$CI_COMMIT_TAG
    - echo Image docker neogeo/geocontrib-front:$CI_COMMIT_TAG livrée

+    - echo "BASE_URL=/geocontrib/" > $CI_PROJECT_DIR/.env
+    - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination neogeo/geocontrib-front:geocontrib-CI_COMMIT_TAG
+    - echo Image docker neogeo/geocontrib:-geocontrib-latest livrée




--- a/Dockerfile
+++ b/Dockerfile
@@ -6,14 +6,14 @@ RUN npm install -g npm@latest
 COPY package*.json ./
 RUN npm install

-#COPY dist dist
 COPY . .
 RUN npm run build


 FROM nginx

-COPY --from=builder /app/dist /usr/share/nginx/html
+RUN mkdir /usr/share/nginx/html/geocontrib
+COPY --from=builder /app/dist /usr/share/nginx/html/geocontrib
 COPY nginx.conf /etc/nginx/conf.d/default.conf 

 EXPOSE 80

--- a/README.md
+++ b/README.md
@@ -10,20 +10,46 @@ Créer un fichier .env à la racine du projet puis ajouter les variables comme i


 ```
-DOMAIN=http://localhost:8010/
-
+BASE_URL=/geocontrib/
 NODE_ENV=development
-VUE_APP_LOCALE=fr-FR
-
-VUE_APP_APPLICATION_NAME=GéoContrib
-VUE_APP_APPLICATION_ABSTRACT=Application de saisie d'informations géographiques contributive
-VUE_APP_LOGO_PATH=@/assets/img/logo-neogeo-circle.png

-VUE_APP_DJANGO_API_BASE=${DOMAIN}api/
-VUE_APP_DJANGO_BASE=${DOMAIN}
+```

+### Configuration par le config.json
+
+``json`
+{
+    "BASE_URL":"/geocontrib/",
+    "DOMAIN":"/geocontrib/",
+    "VUE_APP_LOCALE":"fr-FR",
+    "VUE_APP_APPLICATION_NAME":"GéoContrib",
+    "VUE_APP_APPLICATION_ABSTRACT":"Application de saisie d'informations géographiques contributive",
+    "VUE_APP_LOGO_PATH":"@/assets/img/logo-neogeo-circle.png",
+    "VUE_APP_DJANGO_BASE":"",
+    "VUE_APP_DJANGO_API_BASE":"/geocontrib/api/",
+    "DEFAULT_BASE_MAP":{
+        "SERVICE": "https://{s}.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png",
+        "OPTIONS": {
+            "attribution": "&copy; contributeurs d'<a href='https://osm.org/copyright'>OpenStreetMap</a>",
+            "maxZoom": 20
+        }
+    },
+    "DEFAULT_MAP_VIEW" : {
+        "center": [47.0, 1.0],
+        "zoom": 4
+    },
+    "GEOCODER_PROVIDERS" : {
+        "ADDOK": "addok",
+        "NOMINATIM": "nominatim",
+        "PHOTON": "photon"
+    },
+    "SELECTED_GEOCODER" : {
+        "PROVIDER": "addok"
+    }
+}
 ```

+
 ### Compiles and hot-reloads for development

 Pour éviter les problèmes de Cors en dév, (car backend sur serveur différent de frontend, différent en prod car même serveur), on utilise un proxy qui s'occupe de renseigner les CORS: https://github.com/garmeeh/local-cors-proxy#local-cors-proxy  

--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -2,8 +2,10 @@
 version: "3"
 services:
  geocontrib-front:
-    image: neogeo/geocontrib-front
+    image: neogeo/geocontrib-front:geocontrib-latest
    build: .
+    environment:
+      - BASE_URL=${BASE_URL}
    ports:
      - 8080:80
    volumes:

--- a/nginx.conf
+++ b/nginx.conf
@@ -6,10 +6,11 @@ server {
    listen 80;
    charset utf-8;
    server_name  127.0.0.1;
+    root /usr/share/nginx/html;

    client_max_body_size 4G;

-    location /api {
+    location /geocontrib/api {
        proxy_pass_header Set-Cookie;
        proxy_set_header X-NginX-Proxy true;
        proxy_set_header X-Real-IP $remote_addr;
@@ -21,7 +22,7 @@ server {
        proxy_pass http://geocontrib_site;
    }

-    location /admin {
+    location /geocontrib/admin {
        proxy_pass_header Set-Cookie;
        proxy_set_header X-NginX-Proxy true;
        proxy_set_header X-Real-IP $remote_addr;
@@ -33,18 +34,17 @@ server {
        proxy_pass http://geocontrib_site;
    }

-    location /static/ {
+    location /geocontrib/static/ {
        alias /opt/geocontrib/static/;
    }

-    location /media/ {
+    location /geocontrib/media/ {
        alias /opt/geocontrib/media/;
    }

-    location / {
-        root /usr/share/nginx/html;
+    location /geocontrib/ {
        index index.html;
-        try_files $uri $uri/ /index.html;
+        try_files $uri $uri/ /geocontrib/index.html;
    }
   


--- a/package.json
+++ b/package.json
 {
  "name": "geocontrib-frontend",
-  "version": "2.1.0",
+  "version": "2.1.1",
  "private": true,
  "scripts": {
    "serve": "npm run init-proxy & npm run init-serve",
@@ -33,6 +33,7 @@
    "eslint-plugin-vue": "^6.2.2",
    "less": "^3.0.4",
    "less-loader": "^5.0.0",
+    "local-cors-proxy": "^1.1.0",
    "vue-template-compiler": "^2.6.11"
  }
 }
--- a/public/index.html
+++ b/public/index.html
@@ -7,6 +7,7 @@
    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
    <!-- import not working for roboto condensed inside component style, only in head https://stackoverflow.com/questions/36724268/roboto-condensed-google-font-falls-back-in-all-browsers -->
    <style>@import url('https://fonts.googleapis.com/css?family=Roboto Condensed:400,700,400italic,700italic&subset=latin');</style>
+    <base href="<%= htmlWebpackPlugin.files.publicPath %>">
    <title><%= htmlWebpackPlugin.options.title %></title>
  </head>
  <body>

--- a/src/main.js
+++ b/src/main.js
@@ -11,7 +11,7 @@ import '@/assets/resources/leaflet-control-geocoder-1.13.0/Control.Geocoder.css'
 Vue.config.productionTip = false


-axios.get("/config/config.json")
+axios.get("./config/config.json")
  .then((response) => {
    if (response && response.status === 200) {
      store.commit("SET_CONFIG", response.data);

--- a/vue.config.js
+++ b/vue.config.js
@@ -14,4 +14,4 @@ module.exports = {
    ]
  },
  // the rest of your original module.exports code goes here
-}
\ No newline at end of file
+}