PSForever/PSFPortal
1
0
Fork 0
mirror of https://github.com/psforever/PSFPortal.git synced 2026-01-19 18:14:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge f5f0ca9fd1 into b352041e1f

Browse source
This commit is contained in:
Resaec 2025-04-05 01:25:23 +00:00 committed by GitHub
parent b352041e1f f5f0ca9fd1
commit 587604a812
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 9811 additions and 6589 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -6,3 +6,4 @@ package-lock.json
yarn.lock yarn.lock
*swp *swp
*swo *swo
.idea

4
README.md
View file

@ -100,7 +100,7 @@ You should see similar output:
[0] Trusting proxy [0] Trusting proxy
[0] Connected to the psql database at localhost [0] Connected to the psql database at localhost
[0] Starting PSAdmin polling for 127.0.0.1:51002 [0] Starting PSAdmin polling for 127.0.0.1:51002
[0] [MODE development] PSFWeb now accepting requests at http://localhost:8080/ [0] [MODE development] PSFPortal now accepting requests at http://localhost:8080/
[1] ℹ ｢wds｣: Project is running at http://dev.psforever.net:8081/ [1] ℹ ｢wds｣: Project is running at http://dev.psforever.net:8081/
[1] ℹ ｢wds｣: webpack output is served from / [1] ℹ ｢wds｣: webpack output is served from /
[1] ℹ ｢wds｣: Content not from webpack is served from /home/chord/PSFPortal/public [1] ℹ ｢wds｣: Content not from webpack is served from /home/chord/PSFPortal/public
@ -128,7 +128,7 @@ You should see similar output:
(node:25327) ExperimentalWarning: The ESM module loader is experimental. (node:25327) ExperimentalWarning: The ESM module loader is experimental.
WARNING: development server simulated delay active WARNING: development server simulated delay active
Connected to the psql database at localhost Connected to the psql database at localhost
[MODE development] PSFWeb now accepting requests at http://localhost:8080/ [MODE development] PSFPortal now accepting requests at http://localhost:8080/
``` ```
Please note that Webpack (dev) will proxy all API requests (/api) to the host `http://localhost:8080` (see the `devServer` key in [webpack.config.cjs](webpack.config.cjs)). This MUST match your backend server's (dev-server) listening port, which is by default 8080. Please note that Webpack (dev) will proxy all API requests (/api) to the host `http://localhost:8080` (see the `devServer` key in [webpack.config.cjs](webpack.config.cjs)). This MUST match your backend server's (dev-server) listening port, which is by default 8080.

13707
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

66
package.json
View file

@ -23,42 +23,42 @@
}, },
"homepage": "https://github.com/psforever/PSFWeb#readme", "homepage": "https://github.com/psforever/PSFWeb#readme",
"dependencies": { "dependencies": {
"bcrypt": "^3.0.7", "bcrypt": "^5.1.0",
"connect-history-api-fallback": "^1.6.0", "connect-history-api-fallback": "^2.0.0",
"connect-pg-simple": "^6.0.1", "connect-pg-simple": "^9.0.0",
"dotenv": "^8.2.0", "dotenv": "^16.3.1",
"express": "^4.17.1", "express": "^4.18.2",
"express-session": "^1.17.0", "express-session": "^1.17.3",
"morgan": "^1.9.1", "morgan": "^1.10.0",
"page": "^1.11.5", "page": "^1.11.6",
"pg": "^8.2.0", "pg": "^8.11.2",
"pg-error-constants": "^1.0.0" "pg-error-constants": "^1.0.0"
}, },
"devDependencies": { "devDependencies": {
"autoprefixer": "^9.7.3", "autoprefixer": "^10.4.14",
"axios": "^0.19.0", "axios": "^1.4.0",
"bootstrap": "^4.4.1", "bootstrap": "^4.6.2",
"concurrently": "^5.2.0", "concurrently": "^8.2.0",
"cross-env": "^5.2.0", "cross-env": "^7.0.3",
"css-loader": "^2.1.1", "css-loader": "^3.6.0",
"eslint": "^6.8.0", "eslint": "^8.46.0",
"jquery": "^3.4.1", "jquery": "^3.7.0",
"mini-css-extract-plugin": "^0.6.0", "mini-css-extract-plugin": "^1.6.2",
"moment": "^2.24.0", "moment": "^2.29.4",
"nodemon": "^2.0.2", "nodemon": "^3.0.1",
"popper.js": "^1.16.0", "popper.js": "^1.16.1",
"postcss-loader": "^3.0.0", "postcss-loader": "^4.3.0",
"precss": "^4.0.0", "precss": "^4.0.0",
"sass": "^1.24.0", "sass": "^1.64.2",
"sass-loader": "^8.0.0", "sass-loader": "^10.4.1",
"serve": "^11.0.0", "serve": "^14.2.0",
"style-loader": "^0.23.1", "style-loader": "^2.0.0",
"svelte": "^3.0.0", "svelte": "^3.16.7",
"svelte-loader": "2.13.3", "svelte-loader": "2.13.6",
"webpack": "^4.30.0", "webpack": "^4.46.0",
"webpack-cli": "^3.3.0", "webpack-cli": "^3.3.12",
"webpack-dev-server": "^3.3.1", "webpack-dev-server": "^3.11.3",
"webpack-hot-middleware": "^2.25.0", "webpack-hot-middleware": "^2.25.4",
"webpack-hot-server-middleware": "^0.6.0" "webpack-hot-server-middleware": "^0.6.1"
} }
} }

2
webpack.config.cjs
View file

@ -53,6 +53,7 @@ module.exports = {
}, { }, {
loader: 'postcss-loader', // Run post css actions loader: 'postcss-loader', // Run post css actions
options: { options: {
postcssOptions: {
plugins: function () { // post css plugins, can be exported to postcss.config.js plugins: function () { // post css plugins, can be exported to postcss.config.js
return [ return [
require('precss'), require('precss'),
@ -60,6 +61,7 @@ module.exports = {
]; ];
} }
} }
}
}, { }, {
loader: 'sass-loader' // compiles Sass to CSS loader: 'sass-loader' // compiles Sass to CSS
}] }]