Commit cb48562f authored by Lucas Détré's avatar Lucas Détré

Merge branch 'vue-editor' of ssh://git.beta.pole-emploi.fr:23/open-source/trefle into new-simulator

parents add43a81 3151172b
......@@ -17,6 +17,7 @@ test:
only:
- branches
- master
- /^api-v[0-9.ab]+$/
except:
- /^WIP-.*$/
......
# Changelog
## 0.8.0
- new explorer in VueJS with iso fonctionalty with old one
- new explorer: possibility to modifiy rules
- api: new authentification endpoint, be authentify to process rules modification
- api: new remuneration endpoint /remuneration
- api: new source code endpoint, possibility to interact with gitlab to modifiy rules
- api: new certifinfo endpoint, to get label of one or more certifinfo
- api: new healthcheck endpoint
- change repo from framagit to gitlab PE
## 0.7.0
- switch to LBF json catalog instead of Intercarif XML
......
......@@ -70,14 +70,15 @@ Get a more detailed coverage report:
2. Add this env var:
```
VERSION api-vX.X.X
OLD_VERSION api-vX.X.X
BACK_VERSION backoffice-vX.X.X
LBF_CHARMAP "sA,4B,RC,cD,oE,gF,yG,wH,mI,HJ,7K,EL,aM,YN,XO,8P,GQ,BR,kS,iT,IU,AV,TW,DX,pY,JZ,2a,Lb,Mc, d,de,Cf,Qg,fh,ri,Pj,Nk,Vl,vm,0n,Ko,ep,jq,Zr,9s,ht,Fu,tv,-w,Ux,1y,xz,30,u1,52,q3,W4,S5,66,n7,b8,O9,_+,l/,z "
CATALOG_USER {ASK-YOUR-LBF-CATALOG-API-USER}
CATALOG_KEY {ASK-YOUR-LBF-CATALOG-API-KEY}
CATALOG_URL https://labonneformation.pole-emploi.fr/api/v1/detail
TREFLE_GIT https://git.beta.pole-emploi.fr/open-source/trefle.git
VERSION=api-vX.X.X
OLD_VERSION=api-vX.X.X
BACK_VERSION=backoffice-vX.X.X
LBF_CHARMAP="sA,4B,RC,cD,oE,gF,yG,wH,mI,HJ,7K,EL,aM,YN,XO,8P,GQ,BR,kS,iT,IU,AV,TW,DX,pY,JZ,2a,Lb,Mc, d,de,Cf,Qg,fh,ri,Pj,Nk,Vl,vm,0n,Ko,ep,jq,Zr,9s,ht,Fu,tv,-w,Ux,1y,xz,30,u1,52,q3,W4,S5,66,n7,b8,O9,_+,l/,z "
CATALOG_USER={ASK-YOUR-LBF-CATALOG-API-USER}
CATALOG_KEY={ASK-YOUR-LBF-CATALOG-API-KEY}
CATALOG_URL=https://labonneformation.pole-emploi.fr/api/v1/detail
TREFLE_GIT=https://git.beta.pole-emploi.fr/open-source/trefle.git
GITLAB_TOKEN={ASK-GITLAB-TOKEN}
```
......@@ -87,7 +88,7 @@ OLD_VERSION and BACK_VERSION must be compatible
3. Add email, password, and rule file authorized to be modified in docker/authorisations.csv
i.e: `myname@email.com, mypassord, Occitanie.rules`
4. docker-compose up --build -d
4. `docker-compose up --build -d` to use image from the gitlab registry or `docker-compose -f docker-compose.yml -f docker-compose.override-build.yml up -d --build` to build the image from scratch
## Update acces
......
......@@ -67,7 +67,7 @@
<ul id="ul-financement-results-list">
<li v-for="financement in this.filteredFinancements" :key="financement.id" class="mt-4 row">
<span class="col-md-3 col-sm-12">
<a :href="'/0.7/explorer/referentiel#'+financement.racine">
<a :href="'/0.8/explorer/referentiel#'+financement.racine">
<strong class="financement-fields">{{ financement.intitule }}</strong>
</a>
</span>
......
......@@ -41,7 +41,7 @@ const routes = [
const router = new VueRouter({
mode: 'history',
base: '0.7/explorer',
base: '/0.8/explorer',
routes:routes
});
......
module.exports = {
publicPath: "/0.7/explorer/",
publicPath: "/0.8/explorer/",
assetsDir: "src/assets/",
devServer: {
proxy: 'https://trefle.beta.pole-emploi.fr/0.7/'
proxy: 'https://trefle.beta.pole-emploi.fr/0.8/'
}
}
......@@ -16,34 +16,34 @@ server {
location = / {
root /srv/trefle/backoffice;
rewrite ^/$ /0.7/explorer last;
rewrite ^/$ /0.8/explorer last;
}
location /0.7 {
location /0.8 {
root /srv/trefle/backoffice;
error_log /var/log/nginx/error.log;
access_log /var/log/nginx/access.log;
location /0.7/explorer {
location /0.8/explorer {
alias /srv/trefle/backoffice;
index index.html;
try_files $uri /0.7/explorer/index.html;
try_files $uri /0.8/explorer/index.html;
}
rewrite /0.7/(.*) /$1 break;
rewrite /0.8/(.*) /$1 break;
try_files $uri @gunicorn-master;
}
location /api-moteur/0.7 {
rewrite /api-moteur/0.7/(.*) /$1 break;
location /api-moteur/0.8 {
rewrite /api-moteur/0.8/(.*) /$1 break;
try_files $uri @gunicorn-master;
}
location ^~ {