Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DBC22-1941: Styling for rest stops #353

Merged
merged 1 commit into from
Apr 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 3 additions & 20 deletions src/frontend/src/Components/Filters.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,23 +92,6 @@ export default function Filters(props) {
</Tooltip>
);

// const tooltipReststops = (
// <Tooltip id="tooltip" className="tooltip-content">
// <p>Locations of rest stops run by the province.</p>
// </Tooltip>
// );

// const tooltipWeather = (
// <Tooltip id="tooltip" className="tooltip-content">
// <p>Learn about weather conditions that could affect your route including:
// <ul>
// <li>Current weather for a region from Environment Canada</li>
// <li>Find out how the road is at the moment at nearby weather stations in this specific location</li>
// </ul>
// </p>
// </Tooltip>
// );

// States for toggles
const [closures, setClosures] = useState(mapContext.visible_layers.closures);
const [majorEvents, setMajorEvents] = useState(mapContext.visible_layers.majorEvents);
Expand All @@ -120,8 +103,6 @@ export default function Filters(props) {
const [weather, setWeather] = useState(mapContext.visible_layers.weather);
const [restStops, setRestStops] = useState(mapContext.visible_layers.restStops);



return (
<div className="filters-component">
<Button
Expand Down Expand Up @@ -355,7 +336,9 @@ export default function Filters(props) {
/>
<label htmlFor="filter--rest-stops">
<span className="filter-item__icon">
<FontAwesomeIcon icon={faRestroom} alt="rest stops" />
<svg width="20" height="16" viewBox="0 0 20 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path className="filter-item__icon__path" d="M19 3C19 3.1875 18.9688 3.34375 18.9375 3.5C19.5625 3.9375 20 4.6875 20 5.5C20 6.90625 18.875 8 17.5 8H17L17 15C17 15.5625 16.5312 16 16 16C15.4375 16 15 15.5625 15 15V8H14.5C13.0937 8 12 6.90625 12 5.5C12 4.6875 12.4062 3.9375 13.0312 3.5C13 3.34375 13 3.1875 13 3C13 1.34375 14.3438 0 16 0C17.6562 0 19 1.34375 19 3ZM1 7C1 6.46875 1.4375 6 2 6L10 6C10.5312 6 11 6.46875 11 7V9C11 9.5625 10.5312 10 10 10L2 10C1.4375 10 1 9.5625 1 9L1 7ZM1 11L11 11C11.5312 11 12 11.4688 12 12C12 12.5625 11.5312 13 11 13V15C11 15.5625 10.5312 16 10 16C9.4375 16 9 15.5625 9 15V13L3 13L3 15C3 15.5625 2.53125 16 2 16C1.4375 16 1 15.5625 1 15L1 13C0.4375 13 0 12.5625 0 12C0 11.4688 0.4375 11 1 11Z"/>
</svg>
</span>
Rest stops
</label>
Expand Down
22 changes: 15 additions & 7 deletions src/frontend/src/Components/Map.scss
Original file line number Diff line number Diff line change
Expand Up @@ -126,21 +126,29 @@
}
}

.close-panel:has(+ .panel-content .popup.popup--camera),
.close-panel:has(+ .panel-content .popup.popup--camera)
{
color: $BC-Blue;
&:hover {
background: lighten($BC-Blue, 70%);
}
}

.close-panel:has(+ .panel-content .popup.popup--ferry),
{
color: #2E8540;
&:hover {
background: lighten(#2E8540, 60%);
}
.close-panel:has(+ .panel-content .popup.popup--ferry)
{
color: #2E8540;
&:hover {
background: lighten(#2E8540, 60%);
}
}

.close-panel:has(+ .panel-content .popup.popup--reststop)
{
color: #273F94;
&:hover {
background: lighten(#273F94, 60%);
}
}

.panel-content {
flex: 1;
Expand Down
16 changes: 16 additions & 0 deletions src/frontend/src/Components/MonthDayFormat.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// React
import React from 'react';

const datetimeFormat = {
month: 'short',
day: 'numeric'
};
const formatter = new Intl.DateTimeFormat('en-US', datetimeFormat);

export default function MonthDayFormat({ date }) {

const year = new Date().getFullYear();
const dateFormatted = formatter.format(new Date(date.toString() + "-" + year.toString()));

return dateFormatted;
}
20 changes: 17 additions & 3 deletions src/frontend/src/Components/data/featureStyleDefinitions.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,23 @@ import regionalWeatherIconHover from '../../images/mapIcons/regional-weather-hov
import regionalWeatherIconStatic from '../../images/mapIcons/regional-weather-static.png';

// Rest Stops
import restStopIconActive from '../../images/mapIcons/rest-active.png';
import restStopIconHover from '../../images/mapIcons/rest-hover.png';
import restStopIconStatic from '../../images/mapIcons/rest-static.png';
import restStopIconActive from '../../images/mapIcons/restarea-open-active.png';
import restStopIconHover from '../../images/mapIcons/restarea-open-hover.png';
import restStopIconStatic from '../../images/mapIcons/restarea-open-static.png';

// import restStopIconActiveClosed from '../../images/mapIcons/restarea-closed-active.png';
// import restStopIconHoverClosed from '../../images/mapIcons/restarea-closed-hover.png';
// import restStopIconStaticClosed from '../../images/mapIcons/restarea-closed-static.png';

// import restStopIconActiveTruck from '../../images/mapIcons/restarea-truck-open-active.png';
// import restStopIconHoverTruck from '../../images/mapIcons/restarea-truck-open-hover.png';
// import restStopIconStaticTruck from '../../images/mapIcons/restarea-truck-open-static.png';

// import restStopIconActiveTruckClosed from '../../images/mapIcons/restarea-truck-closed-active.png';
// import restStopIconHoverTruckClosed from '../../images/mapIcons/restarea-truck-closed-hover.png';
// import restStopIconStaticTruckClosed from '../../images/mapIcons/restarea-truck-closed-static.png';



// Events
// Closures
Expand Down
Loading
Loading