DBC22-1735: merge fixes, improvements for recent commits

bcgov · Feb 14, 2024 · f063a72 · f063a72
1 parent d73b9d3
commit f063a72
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 11 deletions.
diff --git a/.env.example b/.env.example
@@ -63,3 +63,8 @@ DRIVEBC_OPEN_511_API_BASE_URL=<open511 api url>
 DRIVEBC_DIT_API_BASE_URL=<CARS api url>
 DRIVEBC_ROUTE_PLANNER_API_BASE_URL=<route planner url>
 DRIVEBC_ROUTE_PLANNER_API_AUTH_KEY=<route planner auth key>
+DRIVEBC_WEATHER_API_BASE_URL=<weather api base url>
+DRIVEBC_WEATHER_API_TOKEN_URL=<weather api token url>
+DRIVEBC_WEATHER_AREAS_API_BASE_URL=<weather areas api base url>
+WEATHER_CLIENT_ID=<weather client id>
+WEATHER_CLIENT_SECRET=<weather client secret>
diff --git a/src/backend/apps/shared/enums.py b/src/backend/apps/shared/enums.py
@@ -46,7 +46,7 @@ class CacheTimeout:
     WEBCAM_LIST = 60*7  # 5min buffer + (2*1)min twice of task interval
     EVENT_LIST = 60 * 15  # 5min buffer + (2*5)min twice of task interval
     FERRY_LIST = 60*60*24  # 24hr
-    REGIONAL_WEATHER_LIST = 60 * 15 # 5min buffer + (2*5)min twice of task interval
+    REGIONAL_WEATHER_LIST = 60 * 15  # 5min buffer + (2*5)min twice of task interval
 
 
 class CacheKey:
@@ -70,3 +70,8 @@ class FeedbackSubject:
 SUBJECT_CHOICES = (
     (FeedbackSubject.WEBSITE_FEEDBACK, 'Website Feedback'),
 )
+
+
+SUBJECT_TITLE = {
+    FeedbackSubject.WEBSITE_FEEDBACK: 'Website Feedback',
+}
diff --git a/src/backend/apps/shared/views.py b/src/backend/apps/shared/views.py
@@ -6,6 +6,7 @@
 from apps.shared.enums import (
     ROUTE_FILTER_TOLERANCE,
     SUBJECT_CHOICES,
+    SUBJECT_TITLE,
     CacheKey,
     CacheTimeout,
 )
@@ -47,10 +48,9 @@ def post(self, request):
 
             # Currently unused but potentially important data
             # score = serializer.fields['recToken'].score
-            # subject = serializer.data['subject']
 
             send_mail(
-                "DriveBC Feedback message",
+                'DriveBC feedback received: ' + SUBJECT_TITLE[serializer.data['subject']],
                 serializer.data['message'],
                 serializer.data['email'],
                 [env("DRIVEBC_FEEDBACK_EMAIL_DEFAULT")],

diff --git a/src/frontend/src/Components/Map.js b/src/frontend/src/Components/Map.js
@@ -768,7 +768,7 @@ export default function MapWrapper({
         )}
 
         {!isPreview && (
-          <div>
+          <div className='routing-outer-container'>
             <RouteSearch routeEdit={true} />
             <AdvisoriesOnMap />
           </div>

diff --git a/src/frontend/src/Components/Map.scss b/src/frontend/src/Components/Map.scss
@@ -134,6 +134,11 @@
       height: 100%;
       overflow: hidden;
 
+      .routing-outer-container {
+        position: absolute;
+        z-index: 16;
+      }
+
       .ol-overlay-container:not(:has(> img)) {
         //overriding openlayers dynamic styles for mobile layout except for having img as a direct child
         @media (max-width: 575px) {

diff --git a/src/frontend/src/Components/map/RouteSearch.scss b/src/frontend/src/Components/map/RouteSearch.scss
@@ -2,7 +2,6 @@
 
 .routing-container {
   // background: white;
-  position: absolute;
   padding: 1rem 1rem 0;
   z-index: 5;
 

diff --git a/src/frontend/src/Header.scss b/src/frontend/src/Header.scss
@@ -5,7 +5,7 @@
 	left: 0;
 	right: 0;
 	top: 0;
-	z-index: 2;
+	z-index: 128;
 	background: white;
 	padding: 0;
 	box-shadow: rgb(169, 169, 169) 0px 2px 10px 0px;
@@ -33,13 +33,13 @@
 			transform-origin: 0% 0%;
 			transition: transform 100ms ease-in-out;
 		}
-	
+
 		.line3 {
 			transform-origin: 0% 100%;
 			transition: transform 100ms ease-in-out;
 		}
 
-		
+
 
 		&:not(.collapsed) {
 			.line {
@@ -50,11 +50,11 @@
 			display: block;
 			transform: rotate(45deg);
 			}
-		
+
 			.line2 {
 				opacity: 0;
 			}
-		
+
 			.line3 {
 				display: block;
 				transform: rotate(-45deg);
@@ -143,4 +143,4 @@
 			padding: 0;
 		}
 	}
-}
+}