Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into 77-design-base-layout
Browse files Browse the repository at this point in the history
  • Loading branch information
Type-Style committed Jul 16, 2024
2 parents f0d70df + ef310ad commit e9879a6
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 53 deletions.
84 changes: 37 additions & 47 deletions package-lock.json

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

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,18 +64,18 @@
"dependencies": {
"@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.5",
"@mui/icons-material": "^5.15.18",
"@mui/icons-material": "^5.15.20",
"@mui/material": "^5.15.16",
"axios": "^1.7.1",
"axios": "^1.7.2",
"bcrypt": "^5.1.1",
"chalk": "^4.1.2",
"compression": "^1.7.4",
"dotenv": "^16.4.5",
"ejs": "^3.1.10",
"express": "^4.19.2",
"express-rate-limit": "^7.2.0",
"express-rate-limit": "^7.3.0",
"express-slow-down": "^2.0.3",
"express-validator": "^7.0.1",
"express-validator": "^7.1.0",
"helmet": "^7.1.0",
"hpp": "^0.2.3",
"jsonwebtoken": "^9.0.2",
Expand All @@ -85,7 +85,7 @@
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-leaflet": "^4.2.1",
"react-router-dom": "^6.23.1",
"react-router-dom": "^6.24.0",
"toobusy-js": "^0.5.1"
},
"_moduleAliases": {
Expand Down
2 changes: 1 addition & 1 deletion src/client/components/Status.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react'
import * as css from "../css/status.module.css";
//import * as css from "../css/status.module.css";

function Map({ entries }: { entries: Models.IEntry[] }) {
if(!entries?.length) {
Expand Down

0 comments on commit e9879a6

Please sign in to comment.