Skip to content

Commit

Permalink
Merge branch 'develop' into 42-feature/walk-realtime
Browse files Browse the repository at this point in the history
  • Loading branch information
ruehan authored Dec 4, 2024
2 parents de25fec + bf6f54e commit 48f3a25
Show file tree
Hide file tree
Showing 5 changed files with 113 additions and 189 deletions.
12 changes: 0 additions & 12 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,4 @@
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true,
"typescript.preferences.importModuleSpecifier": "non-relative",
"editor.tokenColorCustomizations": {
"textMateRules": [
{
"scope": ["comment", "comment punctuation.definition.comment"],
"settings": {
"foreground": "#EFDC05",
"fontStyle": ""
}
}
],
"comments": ""
}
}
147 changes: 42 additions & 105 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
"@emotion/styled": "^11.13.5",
"@mui/material": "^6.1.9",
"@mui/styled-engine-sc": "^6.1.9",
"@tanstack/react-query": "^5.62.2",
"d3": "^7.9.0",
"ios-style-picker": "^0.0.6",
"ol": "^10.2.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-helmet-async": "^2.0.5",
"react-icons": "^5.3.0",
"react-query": "^3.39.3",
"react-router-dom": "^6.28.0",
"react-textarea-autosize": "^8.5.5",
"sockjs-client": "^1.6.1",
Expand All @@ -35,14 +35,14 @@
"zustand": "^5.0.1"
},
"devDependencies": {
"@types/d3": "^7.4.3",
"@types/ol": "^7.0.0",
"@types/react-textarea-autosize": "^8.0.0",
"@eslint/js": "^9.13.0",
"@types/d3": "^7.4.3",
"@types/node": "^22.9.0",
"@types/ol": "^7.0.0",
"@types/react": "^18.3.1",
"@types/react-dom": "^18.3.0",
"@types/sockjs-client": "^1.5.4",
"@types/react-textarea-autosize": "^8.0.0",
"@types/styled-components": "^5.1.34",
"@typescript-eslint/eslint-plugin": "^7.8.0",
"@typescript-eslint/parser": "^7.8.0",
Expand Down
Loading

0 comments on commit 48f3a25

Please sign in to comment.