Merge pull request #601 from danactive/snyk-fix-96f0ed4442b63f8460e24…

…5c495298311 [Snyk] Security upgrade styled-components from 6.0.7 to 6.1.0
danactive · Apr 7, 2024 · 3677d03 · 3677d03
2 parents b805a4e + 81df63d
commit 3677d03
Show file tree

Hide file tree

Showing 8 changed files with 148 additions and 1,592 deletions.
diff --git a/api/package.json b/api/package.json
@@ -107,8 +107,8 @@
   },
   "homepage": "https://github.com/danactive/history",
   "engines": {
-    "node": ">=12.18.1",
-    "npm": ">=6.14.5"
+    "node": "12.18.1",
+    "npm": "6.14.5"
   },
   "readmeFilename": "README.md",
   "tuxharness": "./tuxharness.js",

diff --git a/api/server/plugins/album/components/page.jsx b/api/server/plugins/album/components/page.jsx
@@ -13,8 +13,8 @@ function Page({ album }) {
         </title>
         <meta name="viewport" content="initial-scale=1,maximum-scale=1,user-scalable=no" />
         <link href="https://api.mapbox.com/mapbox-gl-js/v2.14.1/mapbox-gl.css" rel="stylesheet" />
-        <link href="./album/static/album.css" rel="stylesheet" />
-        <link href="./album/static/map.css" rel="stylesheet" />
+        <link href="./album/static/album-styles.css" rel="stylesheet" />
+        <link href="./album/static/map-styles.css" rel="stylesheet" />
       </head>
       <body>
         <div id="divToolbox">

diff --git a/api/server/plugins/album/public/album.css → ...ver/plugins/album/public/album-styles.css b/api/server/plugins/album/public/album.css → ...ver/plugins/album/public/album-styles.css
diff --git a/api/server/plugins/album/public/map.css → ...erver/plugins/album/public/map-styles.css b/api/server/plugins/album/public/map.css → ...erver/plugins/album/public/map-styles.css
diff --git a/api/server/plugins/editAlbum/components/page.jsx b/api/server/plugins/editAlbum/components/page.jsx
@@ -29,7 +29,7 @@ function Page(props) {
         <link rel="stylesheet" href="./album/static/lib/fluid960gs-reset.css" />
         <link rel="stylesheet" href="./album/static/lib/fluid960gs-text.css" />
         <link rel="stylesheet" href="./album/static/lib/fluid960gs-grid.css" />
-        <link rel="stylesheet" href="./album/static/album.css" />
+        <link rel="stylesheet" href="./album/static/album-styles.css" />
       </head>
       <body>
         <div className="container_16">