diff --git a/.env.example b/.env.example index 70896396..ba03d5ba 100644 --- a/.env.example +++ b/.env.example @@ -63,3 +63,8 @@ DRIVEBC_OPEN_511_API_BASE_URL= DRIVEBC_DIT_API_BASE_URL= DRIVEBC_ROUTE_PLANNER_API_BASE_URL= DRIVEBC_ROUTE_PLANNER_API_AUTH_KEY= +DRIVEBC_WEATHER_API_BASE_URL= +DRIVEBC_WEATHER_API_TOKEN_URL= +DRIVEBC_WEATHER_AREAS_API_BASE_URL= +WEATHER_CLIENT_ID= +WEATHER_CLIENT_SECRET= diff --git a/src/backend/apps/shared/enums.py b/src/backend/apps/shared/enums.py index 27d11f07..9054b2be 100644 --- 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 index 9164305e..38cd222e 100644 --- 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 index 82c680c5..538b44be 100644 --- a/src/frontend/src/Components/Map.js +++ b/src/frontend/src/Components/Map.js @@ -768,7 +768,7 @@ export default function MapWrapper({ )} {!isPreview && ( -
+
diff --git a/src/frontend/src/Components/Map.scss b/src/frontend/src/Components/Map.scss index 3d713bbb..c715eed4 100644 --- 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 index 638ae660..28b4a53f 100644 --- 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 index 86c407ae..a5a26326 100644 --- 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; } } -} \ No newline at end of file +}