diff --git a/.gitignore b/.gitignore index b773762a23dbfa45703bc3768e67918b0504aa9f..2ff2621baa8911c4fe92b60a827ecee77bd92171 100644 --- a/.gitignore +++ b/.gitignore @@ -69,4 +69,5 @@ typings/ # Generated files doc/ build/ -ldap_config.json \ No newline at end of file +ldap_config.json +sigma-back.service \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f24be0302fa8290575a0427afd9af0dbdfba1255..6c59f25f73c657c52a7e2a02566d2b4f853c9e21 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,7 +32,7 @@ build: paths: - build/ - node_modules/ - expire_in: 40 min + expire_in: 240 min tags: - database - build @@ -48,8 +48,8 @@ test:lint: deploy_staging: stage: deploy script: - - npm start & sleep 5 - - exit 0 + - npm run build + - cp --parents -r build/ /opt/sigma-back/build/ environment: name: staging url: http://129.104.210.10:3000 diff --git a/sigma-back-dev.service b/sigma-back-dev.service new file mode 100644 index 0000000000000000000000000000000000000000..118eacbb61a3fab935a2a8129acf3264f68dc82e --- /dev/null +++ b/sigma-back-dev.service @@ -0,0 +1,13 @@ +[Unit] +Description=Sigma-back +Wants=network-online.target +After=network-online.target + +[Service] +Environment=NODE_ENV=development +WorkingDirectory=/opt/sigma-back +ExecStart=/usr/bin/node app.js +Restart=always + +[Install] +WantedBy=multi-user.target \ No newline at end of file diff --git a/src/graphql/schema.js b/src/graphql/schema.js index eaa9baba1efc01f4373ee0037a26b30b87b6392e..ca3ad8005f2ba51238876d470b8aa896d7129c5e 100644 --- a/src/graphql/schema.js +++ b/src/graphql/schema.js @@ -111,7 +111,6 @@ const getAvailableGroupUID = (initialUID) => { return(getAvailableGroupUID(rasUID + 'n')); } }); - return rasUID; }; const createGroupIfLegal = (user, args) => { @@ -136,7 +135,7 @@ const createGroupIfLegal = (user, args) => { description : args.description, school : args.school }).then( res => { - return getGroupIfVisible(user, rasUID); + return getGroupIfVisible(user, rasUID); }); })); }); diff --git a/src/ldap/ldap_data.js b/src/ldap/ldap_data.js index a0be107e9cc015b464b361a8f867a8c89cbea56e..801a5652f912edf7ac0ba622722558e577aebda7 100644 --- a/src/ldap/ldap_data.js +++ b/src/ldap/ldap_data.js @@ -293,6 +293,6 @@ function creerGroupe(param) { //rechercheLDAP(user, "uid=quentin.chevalier,ou=eleves,dc=frankiz,dc=net","(displayName=${cn})",{ cn: "Sire hawkspar" }, ["jpegPhoto"]).then(res => console.log(res)); /* Partage pour le reste du monde ; même remarque synthaxe que pour l'import */ -export { listGroups, listMembers, TOL }; +export { rens, listAdmins, listGroups, listMembers, TOL }; /*module.exports ={ listGroups, listMembers, listAdmins, rens, idTOL, TOL }; */ diff --git a/webpack.config.js b/webpack.config.js index 9ccf107546edc59c9578bf719082671d96a6f780..eb89149a2ae7cb850e9071bfd68a5003c01ebb95 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -8,7 +8,14 @@ var config = { filename: 'bundle.js', path: path.resolve(__dirname, 'build') }, - externals: [nodeExternals()] + externals: [nodeExternals()], + module: { + loaders: [{ + test: /\.(png|jpg|ico)/, + exclude: /node_modules/, + loader: 'url-loader' + }] + } }; module.exports = config; \ No newline at end of file