Fixed ES6 exports

.gitignore

@@ -69,4 +69,5 @@ typings/
 # Generated files
 doc/
 build/
-ldap_config.json
+ldap_config.json
\ No newline at end of file
+sigma-back.service
\ No newline at end of file

.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

sigma-back-dev.service

+[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

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);
             });
         })); 
     });

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 }; */

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