Skip to content

Commit

Permalink
AppKernel, ServiceContainer, eslinter fixes, m2mclient, report player…
Browse files Browse the repository at this point in the history
… fixes and some minor issues
  • Loading branch information
fcaps committed Dec 1, 2023
1 parent 1b76c3e commit 2a14a6e
Show file tree
Hide file tree
Showing 193 changed files with 3,626 additions and 3,422 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion .env.faf-stack
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]

4 changes: 0 additions & 4 deletions ExpressApp.js

This file was deleted.

6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/.
Expand All @@ -53,5 +53,3 @@ As of March 2022 the main 4 Languages that are set up on POEditor are:
- Russian
- French
- German


9 changes: 0 additions & 9 deletions express.js

This file was deleted.

144 changes: 0 additions & 144 deletions fafApp.js

This file was deleted.

14 changes: 7 additions & 7 deletions grunt/concurrent.js
Original file line number Diff line number Diff line change
@@ -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
}
}
}
27 changes: 14 additions & 13 deletions grunt/nodemon.js
Original file line number Diff line number Diff line change
@@ -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'
]
}
}
}
};
}
4 changes: 2 additions & 2 deletions grunt/run.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module.exports = {
webpack: {
args: ['node_modules/.bin/webpack'],
args: ['node_modules/.bin/webpack']
}
};
}
40 changes: 20 additions & 20 deletions grunt/sass.js
Original file line number Diff line number Diff line change
@@ -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',
}
}
};
}
10 changes: 5 additions & 5 deletions grunt/watch.js
Original file line number Diff line number Diff line change
Expand Up @@ -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']
}
}
69 changes: 0 additions & 69 deletions lib/JavaApiClientFactory.js

This file was deleted.

Loading

0 comments on commit 2a14a6e

Please sign in to comment.