@@ -113,12 +113,12 @@ async function buildForm() {
input.setAttribute('aria-label', placeholder);
};
- const countrySelect = await buildCountrySelect(changeCountry);
- if (countrySelect) {
- form.querySelector('.search-suggester').prepend(countrySelect);
- }
- decorateIcons(form);
- observeForm();
+ buildCountrySelect(changeCountry).then((select) => {
+ if (select) {
+ form.querySelector('.search-country-select-parent').append(select);
+ }
+ });
+ window.setTimeout(observeForm, 3000);
return form;
}
diff --git a/blocks/shared/search-countries/search-countries.js b/blocks/shared/search-countries/search-countries.js
index eddb21ac..27fef4e5 100644
--- a/blocks/shared/search-countries/search-countries.js
+++ b/blocks/shared/search-countries/search-countries.js
@@ -108,7 +108,7 @@ export async function build(...callbacks) {
selected.classList.add('selected');
selected.setAttribute('aria-haspopup', 'listbox');
selected.setAttribute('aria-expanded', 'false');
- selected.setAttribute('aria-label', 'Select Country');
+ selected.setAttribute('aria-label', `${first.value} - Select Country`);
selected.setAttribute('role', 'button');
selected.setAttribute('tabIndex', '0');
selected.innerHTML = imgHTML(first.value);
diff --git a/fstab.yaml b/fstab.yaml
index 64975b70..1c552064 100644
--- a/fstab.yaml
+++ b/fstab.yaml
@@ -1,5 +1,5 @@
mountpoints:
- /: https://hsoa.sharepoint.com/:f:/r/sites/Franklin/Shared%20Documents/Website
+ /: https://hsoa.sharepoint.com/:f:/r/sites/Franklin/Shared%20Documents/Website/Common%20Moves
folders:
/blog/blog-detail/: /blog/blog-detail
diff --git a/icons/bhhs_seal_blk.svg b/icons/bhhs_seal_blk.svg
index 0e33facc..d1bdb900 100644
--- a/icons/bhhs_seal_blk.svg
+++ b/icons/bhhs_seal_blk.svg
@@ -1 +1,4 @@
-
\ No newline at end of file
+
+
diff --git a/icons/community.svg b/icons/community.svg
new file mode 100644
index 00000000..e0b7a281
--- /dev/null
+++ b/icons/community.svg
@@ -0,0 +1,11 @@
+
\ No newline at end of file
diff --git a/icons/estimate.svg b/icons/estimate.svg
new file mode 100644
index 00000000..f5c3ec89
--- /dev/null
+++ b/icons/estimate.svg
@@ -0,0 +1,11 @@
+
\ No newline at end of file
diff --git a/icons/heartempty.svg b/icons/heartempty.svg
index 08620870..5c92e930 100644
--- a/icons/heartempty.svg
+++ b/icons/heartempty.svg
@@ -1,9 +1,9 @@
-
diff --git a/icons/saved-properties.svg b/icons/saved-properties.svg
new file mode 100644
index 00000000..d2eed1c9
--- /dev/null
+++ b/icons/saved-properties.svg
@@ -0,0 +1,9 @@
+
diff --git a/scripts/google-maps/index.js b/scripts/google-maps/index.js
new file mode 100644
index 00000000..2838be5d
--- /dev/null
+++ b/scripts/google-maps/index.js
@@ -0,0 +1,21 @@
+import { getMetadata } from '../aem.js';
+
+let loaded = false;
+
+/* eslint-disable */
+const scriptFunc = (key) => {
+ (g=>{var h,a,k,p="The Google Maps JavaScript API",c="google",l="importLibrary",q="__ib__",m=document,b=window;b=b[c]||(b[c]={});var d=b.maps||(b.maps={}),r=new Set,e=new URLSearchParams,u=()=>h||(h=new Promise(async(f,n)=>{await (a=m.createElement("script"));e.set("libraries",[...r]+"");for(k in g)e.set(k.replace(/[A-Z]/g,t=>"_"+t[0].toLowerCase()),g[k]);e.set("callback",c+".maps."+q);a.src=`https://maps.${c}apis.com/maps/api/js?`+e;d[q]=f;a.onerror=()=>h=n(Error(p+" could not load."));a.nonce=m.querySelector("script[nonce]")?.nonce||"";m.head.append(a)}));d[l]?console.warn(p+" only loads once. Ignoring:",g):d[l]=(f,...n)=>r.add(f)&&u().then(()=>d[l](f,...n))})({
+ key,
+ v: "weekly",
+ // Use the 'v' parameter to indicate the version to use (weekly, beta, alpha, etc.).
+ // Add other bootstrap parameters as needed, using camel case.
+ });
+};
+/* eslint-enable */
+
+export default function loadMaps() {
+ if (!loaded) {
+ loaded = true;
+ scriptFunc(getMetadata('google-maps-api-key'));
+ }
+}
diff --git a/scripts/scripts.js b/scripts/scripts.js
index ea0427af..5e609450 100644
--- a/scripts/scripts.js
+++ b/scripts/scripts.js
@@ -11,6 +11,7 @@ import {
waitForLCP,
loadBlocks,
loadCSS,
+ loadScript,
getMetadata,
} from './aem.js';
@@ -113,6 +114,42 @@ function buildLiveByMetadata(main) {
}
}
+export function getYoutubeVideoId(url) {
+ if (url.includes('youtube.com/watch?v=')) {
+ return new URL(url).searchParams.get('v');
+ }
+ if (url.includes('youtube.com/embed/') || url.includes('youtu.be/')) {
+ return new URL(url).pathname.split('/').pop();
+ }
+ return null;
+}
+
+function decorateVideoLinks(main) {
+ [...main.querySelectorAll('a')]
+ .filter(({ href }) => !!href)
+ // only convert plain links
+ .filter((a) => a.textContent?.trim()?.toLowerCase().startsWith('http'))
+ // don't decorate if already in a block. unless it's `columns`.
+ .filter((a) => {
+ const block = a.closest('div.block');
+ if (!block) return true;
+ return block.classList.contains('columns');
+ })
+ .forEach((link) => {
+ const youtubeVideoId = getYoutubeVideoId(link.href);
+
+ if (youtubeVideoId) {
+ loadCSS('/blocks/embed/lite-yt-embed.css');
+ loadScript('/blocks/embed/lite-yt-embed.js');
+ const video = document.createElement('lite-youtube');
+ video.setAttribute('videoid', youtubeVideoId);
+ video.setAttribute('params', 'rel=0');
+ video.classList.add('youtube-video');
+ link.replaceWith(video);
+ }
+ });
+}
+
/**
* Build Floating image block
* @param {Element} main The container element
@@ -214,6 +251,7 @@ export function decorateMain(main) {
buildAutoBlocks(main);
decorateSections(main);
decorateBlocks(main);
+ decorateVideoLinks(main);
}
/**
@@ -279,7 +317,7 @@ async function loadLazy(doc) {
loadCSS(`${window.hlx.codeBasePath}/styles/lazy-styles.css`);
loadFonts();
- addFavIcon(`${window.hlx.codeBasePath}/styles/favicon.svg`);
+ addFavIcon(`${window.hlx.codeBasePath}/styles/bhhs_seal_favicon.ico`);
sampleRUM('lazy');
sampleRUM.observe(main.querySelectorAll('div[data-block-name]'));
sampleRUM.observe(main.querySelectorAll('picture > img'));
diff --git a/styles/bhhs_seal_favicon.ico b/styles/bhhs_seal_favicon.ico
new file mode 100644
index 00000000..563f4189
Binary files /dev/null and b/styles/bhhs_seal_favicon.ico differ