Skip to content

Commit

Permalink
Merge pull request #1384 from cambridge-cares/1383-add-authorization-…
Browse files Browse the repository at this point in the history
…header-to-getmap-requests

1383 add authorization header to getmap requests
  • Loading branch information
kok-foong authored Dec 5, 2024
2 parents 24b8ffa + f628835 commit d64ba65
Show file tree
Hide file tree
Showing 9 changed files with 458 additions and 375 deletions.
38 changes: 20 additions & 18 deletions web/twa-vis-platform/code/next.config.js
Original file line number Diff line number Diff line change
@@ -1,26 +1,28 @@
/**
Next.js can be configured through a next.config.js file in the
root of your project directory (for example, by package.json).
Next.js can be configured through a next.config.js file in the
root of your project directory (for example, by package.json).
next.config.js is a regular Node.js module, not a JSON file.
It gets used by the Next.js server and build phases, and it's
not included in the browser build.
next.config.js is a regular Node.js module, not a JSON file.
It gets used by the Next.js server and build phases, and it's
not included in the browser build.
**/

const nextConfig = {
reactStrictMode: true,
assetPrefix: process.env.ASSET_PREFIX ?? "",
compiler: { removeConsole: false },
images: {
loader: 'custom',
loaderFile: './image-loader.js',
},
env: {
KEYCLOAK: process.env.KEYCLOAK ?? "false",
ASSET_PREFIX: process.env.ASSET_PREFIX ?? "",
MAPBOX_USER: process.env.MAPBOX_USER,
MAPBOX_API_KEY: process.env.MAPBOX_API_KEY,
}
reactStrictMode: true,
assetPrefix: process.env.ASSET_PREFIX ?? "",
compiler: { removeConsole: false },
images: {
loader: 'custom',
loaderFile: './image-loader.js',
},
env: {
KEYCLOAK: process.env.KEYCLOAK ?? "false",
ASSET_PREFIX: process.env.ASSET_PREFIX ?? "",
MAPBOX_USER: process.env.MAPBOX_USER,
MAPBOX_API_KEY: process.env.MAPBOX_API_KEY,
REACT_APP_USE_GEOSERVER_PROXY: process.env.REACT_APP_USE_GEOSERVER_PROXY,
REACT_APP_SERVER_URL: process.env.REACT_APP_SERVER_URL // only used when REACT_APP_USE_GEOSERVER_PROXY is true
}
};


Expand Down
103 changes: 52 additions & 51 deletions web/twa-vis-platform/code/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "twa-visualisation-platform",
"version": "5.11.1",
"version": "5.12.0",
"private": true,
"type": "module",
"eslintConfig": {
Expand All @@ -12,73 +12,74 @@
"engines": {
"node": ">=22.0.0"
},
"scripts": {
"dev": "NODE_ENV=development node --env-file='.env.local' server.js",
"dev-docker": "NODE_ENV=development node server.js",
"scripts": {
"dev": "NODE_ENV=development node --env-file='.env.local' server.js",
"dev-docker": "NODE_ENV=development node server.js",
"build": "NODE_OPTIONS='--trace-warnings --trace-deprecation' next build",
"start": "NODE_ENV=production node --env-file='.env.local' server.js",
"start-docker": "NODE_ENV=production node server.js",
"lint": "next lint",
"test": "jest"
},
"dependencies": {
"start": "NODE_ENV=production node --env-file='.env.local' server.js",
"start-docker": "NODE_ENV=production node server.js",
"lint": "next lint",
"test": "jest"
},
"dependencies": {
"@emotion/react": "^11.13.5",
"@emotion/styled": "^11.13.5",
"@mui/icons-material": "^6.1.8",
"@mui/material": "^6.1.8",
"@mui/x-data-grid": "^7.22.2",
"@reduxjs/toolkit": "^2.3.0",
"@types/markdown-it": "^14.1.2",
"@reduxjs/toolkit": "^2.3.0",
"@types/markdown-it": "^14.1.2",
"@types/node": "^22.9.1",
"@types/react": "^18.3.12",
"@types/react-modal": "^3.16.3",
"@types/react": "^18.3.12",
"@types/react-modal": "^3.16.3",
"@typescript-eslint/eslint-plugin": "^8.14.0",
"@typescript-eslint/parser": "8.14.0",
"chart.js": "^4.4.6",
"chartjs-adapter-moment": "^1.0.1",
"connect-redis": "^7.1.1",
"express": "^4.21.1",
"express-session": "^1.18.1",
"chart.js": "^4.4.6",
"axios": "^1.7.7",
"chartjs-adapter-moment": "^1.0.1",
"connect-redis": "^7.1.1",
"express": "^4.21.1",
"express-session": "^1.18.1",
"framer-motion": "^11.11.17",
"github-markdown-css": "^5.8.0",
"gray-matter": "^4.0.3",
"keycloak-connect": "^26.0.5",
"gray-matter": "^4.0.3",
"keycloak-connect": "^26.0.5",
"mapbox-gl": "3.8.0",
"markdown-it": "^14.1.0",
"markdown-it": "^14.1.0",
"material-symbols": "^0.27.0",
"moment": "^2.30.1",
"moment": "^2.30.1",
"next": "^14.2.18",
"react": "^18.3.1",
"react-confetti": "^6.1.0",
"react-dom": "^18.3.1",
"react": "^18.3.1",
"react-confetti": "^6.1.0",
"react-dom": "^18.3.1",
"react-hook-form": "^7.53.2",
"react-inlinesvg": "^4.1.5",
"react-konami-code": "^2.3.0",
"react-map-gl": "^7.1.7",
"react-markdown": "^9.0.1",
"react-modal": "^3.16.1",
"react-redux": "^9.1.2",
"react-konami-code": "^2.3.0",
"react-map-gl": "^7.1.7",
"react-markdown": "^9.0.1",
"react-modal": "^3.16.1",
"react-redux": "^9.1.2",
"react-router-dom": "^6.28.0",
"react-select": "^5.8.3",
"react-toastify": "^10.0.6",
"redis": "^4.7.0",
"redux": "^5.0.1",
"redux-persist": "^6.0.0",
"typescript": "^5.6.3"
},
"devDependencies": {
"@types/express": "^5.0.0",
"@types/jest": "^29.5.14",
"@types/mapbox": "^1.6.45",
"@types/mapbox-gl": "^3.4.1",
"@types/react-dom": "^18.3.1",
"eslint": "^8.57.1",
"react-toastify": "^10.0.6",
"redis": "^4.7.0",
"redux": "^5.0.1",
"redux-persist": "^6.0.0",
"typescript": "^5.6.3"
},
"devDependencies": {
"@types/express": "^5.0.0",
"@types/jest": "^29.5.14",
"@types/mapbox": "^1.6.45",
"@types/mapbox-gl": "^3.4.1",
"@types/react-dom": "^18.3.1",
"eslint": "^8.57.1",
"eslint-config-next": "^14.2.18",
"eslint-plugin-react": "^7.37.2",
"fs": "0.0.1-security",
"jest": "^29.7.0",
"ts-jest": "^29.2.5",
"ts-typed-json": "^0.3.2"
},
"packageManager": "[email protected]+sha512.38dc6fba8dba35b39340b9700112c2fe1e12f10b17134715a4aa98ccf7bb035e76fd981cf0bb384dfa98f8d6af5481c2bef2f4266a24bfa20c34eb7147ce0b5e"
"eslint-plugin-react": "^7.37.2",
"fs": "0.0.1-security",
"jest": "^29.7.0",
"ts-jest": "^29.2.5",
"ts-typed-json": "^0.3.2"
},
"packageManager": "[email protected]+sha512.38dc6fba8dba35b39340b9700112c2fe1e12f10b17134715a4aa98ccf7bb035e76fd981cf0bb384dfa98f8d6af5481c2bef2f4266a24bfa20c34eb7147ce0b5e"
}
Loading

0 comments on commit d64ba65

Please sign in to comment.