AppKernel, ServiceContainer, eslinter fixes, m2mclient, report player…

… fixes and some minor issues

.editorconfig

@@ -5,7 +5,7 @@ root = true
 [*]
 end_of_line = lf
 charset = utf-8
-trim_trailing_whitespace = false
+trim_trailing_whitespace = true
 insert_final_newline = true
 indent_style = space
 indent_size = 4

.env.example

@@ -4,6 +4,8 @@ API_URL=https://api.test.faforever.com
 OAUTH_URL=https://hydra.test.faforever.com
 WP_URL=https://direct.faforever.com
 CALLBACK=auth
+OAUTH_M2M_CLIENT_ID=faf-website-public
+OAUTH_M2M_CLIENT_SECRET=banana
 OAUTH_CLIENT_ID=faf-website
 OAUTH_CLIENT_SECRET=banana
 SESSION_SECRET_KEY=banana

.env.faf-stack

@@ -20,7 +20,8 @@ OAUTH_PUBLIC_URL=http://localhost:4444
 
 # unsing the "xyz" wordpress because the faf-local-stack is just an empty instance without any news etc.
 WP_URL=https://direct.faforever.xyz
-
+OAUTH_M2M_CLIENT_ID=faf-website-public
+OAUTH_M2M_CLIENT_SECRET=banana
 OAUTH_CLIENT_ID=faf-website
 OAUTH_CLIENT_SECRET=banana
 SESSION_SECRET_KEY=banana

Dockerfile

@@ -19,5 +19,5 @@ COPY --from=builder --chown=node:node /code /code
 WORKDIR /code
 USER node
 
-CMD ["dumb-init", "node", "express.js"]
+CMD ["dumb-init", "node", "src/backend/index.js"]
 

README.md

@@ -35,9 +35,9 @@ Development-Container:
 `````bash
 cd ../website # replace path if needed
 cp -n .env.faf-stack .env
-docker compose build 
+docker compose build
 docker compose run website yarn install
-docker compose up 
+docker compose up
 `````
 
 this should start the express-server on http://localhost:8020/.
@@ -53,5 +53,3 @@ As of March 2022 the main 4 Languages that are set up on POEditor are:
 - Russian
 - French
 - German
-
-

grunt/concurrent.js

@@ -1,8 +1,8 @@
 module.exports = {
-	dev: {
-		tasks: [['run:webpack', 'sass:dev','nodemon'], 'watch'],
-		options: {
-			logConcurrentOutput: true
-		}
-	}
-};
+    dev: {
+        tasks: [['run:webpack', 'sass:dev', 'nodemon'], 'watch'],
+        options: {
+            logConcurrentOutput: true
+        }
+    }
+}

grunt/nodemon.js

@@ -1,15 +1,16 @@
-//Runs express script and sets default port to 3000 if environment is not set.
+// Runs express script and sets default port to 3000 if environment is not set.
 module.exports = {
-  debug: {
-    options: {
-      delay: 500,
-      ignore: [
-        'dist/js/*.js',
-        'sessions/**',
-        'node_modules/**',
-        'grunt/**',
-        'Gruntfile.js',
-      ]
+    debug: {
+        script: 'src/backend/index.js',
+        options: {
+            delay: 500,
+            ignore: [
+                'dist/js/*.js',
+                'sessions/**',
+                'node_modules/**',
+                'grunt/**',
+                'Gruntfile.js'
+            ]
+        }
     }
-  }
-};
+}

grunt/run.js

@@ -1,5 +1,5 @@
 module.exports = {
     webpack: {
-        args: ['node_modules/.bin/webpack'],
+        args: ['node_modules/.bin/webpack']
     }
-};
+}

grunt/sass.js

@@ -1,24 +1,24 @@
-const sass = require('dart-sass');
+const sass = require('dart-sass')
 
 module.exports = {
-  dev: {
-    options: {
-      implementation: sass,
-      style: 'expanded',
-      compass: true
+    dev: {
+        options: {
+            implementation: sass,
+            style: 'expanded',
+            compass: true
+        },
+        files: {
+            'public/styles/css/site.min.css': 'public/styles/site.sass'
+        }
     },
-    files: {
-      'public/styles/css/site.min.css': 'public/styles/site.sass',
+    dist: {
+        options: {
+            implementation: sass,
+            style: 'compressed',
+            compass: true
+        },
+        files: {
+            'public/styles/css/site.min.css': 'public/styles/site.sass'
+        }
     }
-  },
-  dist: {
-    options: {
-      implementation: sass,
-      style: 'compressed',
-      compass: true
-    },
-    files: {
-      'public/styles/css/site.min.css': 'public/styles/site.sass',
-    }
-  }
-};
+}

grunt/watch.js

@@ -3,8 +3,8 @@ module.exports = {
         files: ['src/frontend/**/*.js'],
         tasks: ['run:webpack']
     },
-	sass: {
-		files: ['public/styles/**/*.{scss,sass}'],
-		tasks: ['sass:dev']
-	}
-};
+    sass: {
+        files: ['public/styles/**/*.{scss,sass}'],
+        tasks: ['sass:dev']
+    }
+}