Initial setup of asphalt.com & pavementonline.com site.

.github/workflows/deploy-production.yml

@@ -53,11 +53,13 @@ jobs:
         #v# Make sure this matches the site matrix! #v#
         ###############################################
         site:
+          - { dir: asphalt.com, stack: tauron, id: 675738bf11878ad52d62f188, account: acbm, tenant: acbm_fcp, rancher_label: ac-business-media-asphalt.com }
           - { dir: foodlogistics.com, stack: tauron, id: 53c95f4a1784f8066eb2c86a, account: acbm, tenant: acbm_scn, rancher_label: ac-business-media-foodlogistics.com }
           - { dir: forconstructionpros.com, stack: tauron, id: 53ca8d671784f8066eb2c949, account: acbm, tenant: acbm_fcp, rancher_label: ac-business-media-forconstructionpros.com }
           - { dir: greenindustrypros.com, stack: tauron, id: 53c95fdd1784f8066eb2c891, account: acbm, tenant: acbm_gip, rancher_label: ac-business-media-greenindustrypros.com }
           - { dir: ironpros.com, stack: tauron, id: 65f8419f7985623e9ff46d6e, account: acbm, tenant: acbm_fcp, rancher_label: ac-business-media-ironpros.com }
           - { dir: oemoffhighway.com, stack: tauron, id: 54b5a261c99db54158ed0fc9, account: acbm, tenant: acbm_ooh, rancher_label: ac-business-media-oemoffhighway.com }
+          - { dir: pavementonline.com, stack: tauron, id: 6757395211878ad52d66131a, account: acbm, tenant: acbm_fcp, rancher_label: ac-business-media-pavementonline.com }
           - { dir: rentalproductnews.com, stack: tauron, id: 53ca8d671784f8066eb2c949, account: acbm, tenant: acbm_fcp, rancher_label: ac-business-media-rentalproductnews.com }
           - { dir: sdcexec.com, stack: tauron, id: 53c960451784f8066eb2c8a4, account: acbm, tenant: acbm_scn, rancher_label: ac-business-media-sdcexec.com }
         ###############################################
@@ -79,11 +81,13 @@ jobs:
         #v# Make sure this matches the site matrix! #v#
         ###############################################
         site:
+          - { dir: asphalt.com, stack: tauron, id: 675738bf11878ad52d62f188, account: acbm, tenant: acbm_fcp, rancher_label: ac-business-media-asphalt.com }
           - { dir: foodlogistics.com, stack: tauron, id: 53c95f4a1784f8066eb2c86a, account: acbm, tenant: acbm_scn, rancher_label: ac-business-media-foodlogistics.com }
           - { dir: forconstructionpros.com, stack: tauron, id: 53ca8d671784f8066eb2c949, account: acbm, tenant: acbm_fcp, rancher_label: ac-business-media-forconstructionpros.com }
           - { dir: greenindustrypros.com, stack: tauron, id: 53c95fdd1784f8066eb2c891, account: acbm, tenant: acbm_gip, rancher_label: ac-business-media-greenindustrypros.com }
           - { dir: ironpros.com, stack: tauron, id: 65f8419f7985623e9ff46d6e, account: acbm, tenant: acbm_fcp, rancher_label: ac-business-media-ironpros.com }
           - { dir: oemoffhighway.com, stack: tauron, id: 54b5a261c99db54158ed0fc9, account: acbm, tenant: acbm_ooh, rancher_label: ac-business-media-oemoffhighway.com }
+          - { dir: pavementonline.com, stack: tauron, id: 6757395211878ad52d66131a, account: acbm, tenant: acbm_fcp, rancher_label: ac-business-media-pavementonline.com }
           - { dir: rentalproductnews.com, stack: tauron, id: 53ca8d671784f8066eb2c949, account: acbm, tenant: acbm_fcp, rancher_label: ac-business-media-rentalproductnews.com }
           - { dir: sdcexec.com, stack: tauron, id: 53c960451784f8066eb2c8a4, account: acbm, tenant: acbm_scn, rancher_label: ac-business-media-sdcexec.com }
         ###############################################

.github/workflows/deploy-staging.yml

@@ -52,11 +52,13 @@ jobs:
         #v# Make sure this matches the site matrix! #v#
         ###############################################
         site:
+          - { dir: asphalt.com, stack: tauron, id: 675738bf11878ad52d62f188, account: acbm, tenant: acbm_fcp, rancher_label: ac-business-media-asphalt.com }
           - { dir: foodlogistics.com, stack: tauron, id: 53c95f4a1784f8066eb2c86a, account: acbm, tenant: acbm_scn, rancher_label: ac-business-media-foodlogistics.com }
           - { dir: forconstructionpros.com, stack: tauron, id: 53ca8d671784f8066eb2c949, account: acbm, tenant: acbm_fcp, rancher_label: ac-business-media-forconstructionpros.com }
           - { dir: greenindustrypros.com, stack: tauron, id: 53c95fdd1784f8066eb2c891, account: acbm, tenant: acbm_gip, rancher_label: ac-business-media-greenindustrypros.com }
           - { dir: ironpros.com, stack: tauron, id: 65f8419f7985623e9ff46d6e, account: acbm, tenant: acbm_fcp, rancher_label: ac-business-media-ironpros.com }
           - { dir: oemoffhighway.com, stack: tauron, id: 54b5a261c99db54158ed0fc9, account: acbm, tenant: acbm_ooh, rancher_label: ac-business-media-oemoffhighway.com }
+          - { dir: pavementonline.com, stack: tauron, id: 6757395211878ad52d66131a, account: acbm, tenant: acbm_fcp, rancher_label: ac-business-media-pavementonline.com }
           - { dir: rentalproductnews.com, stack: tauron, id: 53ca8d671784f8066eb2c949, account: acbm, tenant: acbm_fcp, rancher_label: ac-business-media-rentalproductnews.com }
           - { dir: sdcexec.com, stack: tauron, id: 53c960451784f8066eb2c8a4, account: acbm, tenant: acbm_scn, rancher_label: ac-business-media-sdcexec.com }
         ###############################################
@@ -78,11 +80,13 @@ jobs:
         #v# Make sure this matches the site matrix! #v#
         ###############################################
         site:
+          - { dir: asphalt.com, stack: tauron, id: 675738bf11878ad52d62f188, account: acbm, tenant: acbm_fcp, rancher_label: ac-business-media-asphalt.com }
           - { dir: foodlogistics.com, stack: tauron, id: 53c95f4a1784f8066eb2c86a, account: acbm, tenant: acbm_scn, rancher_label: ac-business-media-foodlogistics.com }
           - { dir: forconstructionpros.com, stack: tauron, id: 53ca8d671784f8066eb2c949, account: acbm, tenant: acbm_fcp, rancher_label: ac-business-media-forconstructionpros.com }
           - { dir: greenindustrypros.com, stack: tauron, id: 53c95fdd1784f8066eb2c891, account: acbm, tenant: acbm_gip, rancher_label: ac-business-media-greenindustrypros.com }
           - { dir: ironpros.com, stack: tauron, id: 65f8419f7985623e9ff46d6e, account: acbm, tenant: acbm_fcp, rancher_label: ac-business-media-ironpros.com }
           - { dir: oemoffhighway.com, stack: tauron, id: 54b5a261c99db54158ed0fc9, account: acbm, tenant: acbm_ooh, rancher_label: ac-business-media-oemoffhighway.com }
+          - { dir: pavementonline.com, stack: tauron, id: 6757395211878ad52d66131a, account: acbm, tenant: acbm_fcp, rancher_label: ac-business-media-pavementonline.com }
           - { dir: rentalproductnews.com, stack: tauron, id: 53ca8d671784f8066eb2c949, account: acbm, tenant: acbm_fcp, rancher_label: ac-business-media-rentalproductnews.com }
           - { dir: sdcexec.com, stack: tauron, id: 53c960451784f8066eb2c8a4, account: acbm, tenant: acbm_scn, rancher_label: ac-business-media-sdcexec.com }
         ###############################################

.github/workflows/integration-tests.yml

@@ -15,11 +15,13 @@ jobs:
         #v# Make sure this matches the site matrix! #v#
         ###############################################
         site:
+          - { dir: asphalt.com, stack: tauron, id: 675738bf11878ad52d62f188, account: acbm, tenant: acbm_fcp, rancher_label: ac-business-media-asphalt.com }
           - { dir: foodlogistics.com, stack: tauron, id: 53c95f4a1784f8066eb2c86a, account: acbm, tenant: acbm_scn, rancher_label: ac-business-media-foodlogistics.com }
           - { dir: forconstructionpros.com, stack: tauron, id: 53ca8d671784f8066eb2c949, account: acbm, tenant: acbm_fcp, rancher_label: ac-business-media-forconstructionpros.com }
           - { dir: greenindustrypros.com, stack: tauron, id: 53c95fdd1784f8066eb2c891, account: acbm, tenant: acbm_gip, rancher_label: ac-business-media-greenindustrypros.com }
           - { dir: ironpros.com, stack: tauron, id: 65f8419f7985623e9ff46d6e, account: acbm, tenant: acbm_fcp, rancher_label: ac-business-media-ironpros.com }
           - { dir: oemoffhighway.com, stack: tauron, id: 54b5a261c99db54158ed0fc9, account: acbm, tenant: acbm_ooh, rancher_label: ac-business-media-oemoffhighway.com }
+          - { dir: pavementonline.com, stack: tauron, id: 6757395211878ad52d66131a, account: acbm, tenant: acbm_fcp, rancher_label: ac-business-media-pavementonline.com }
           - { dir: rentalproductnews.com, stack: tauron, id: 53ca8d671784f8066eb2c949, account: acbm, tenant: acbm_fcp, rancher_label: ac-business-media-rentalproductnews.com }
           - { dir: sdcexec.com, stack: tauron, id: 53c960451784f8066eb2c8a4, account: acbm, tenant: acbm_scn, rancher_label: ac-business-media-sdcexec.com }
         ###############################################

docker-compose.yml

@@ -201,6 +201,36 @@ services:
     depends_on:
       - mongodb
 
+  acon:
+    <<: *site-cmd
+    working_dir: /root/sites/asphalt.com
+    environment:
+      <<: *env
+      PORT: 80
+      EXPOSED_PORT: 9722
+      LIVERELOAD_PORT: 19722
+      OMEDA_INPUT_ID: ${ACON_OMEDA_INPUT_ID-(unset)}
+      HOST: www-acbm-acon.dev.parameter1.com
+    hostname: www-acbm-acon.dev.parameter1.com
+    ports:
+      - "9722:80"
+      - "19722:19722"
+
+  pvm:
+    <<: *site-cmd
+    working_dir: /root/sites/pavementonline.com
+    environment:
+      <<: *env
+      PORT: 80
+      EXPOSED_PORT: 9723
+      LIVERELOAD_PORT: 19723
+      OMEDA_INPUT_ID: ${PVM_OMEDA_INPUT_ID-(unset)}
+      HOST: www-acbm-pvm.dev.parameter1.com
+    hostname: www-acbm-pvm.dev.parameter1.com
+    ports:
+      - "9723:80"
+      - "19723:19723"
+
   mongodb:
     tty: true
     image: mongo:5

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.17.0",
+  "version": "2.17.4",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "command": {

package.json

@@ -20,9 +20,9 @@
     "test": "lerna run test"
   },
   "devDependencies": {
-    "@parameter1/base-cms-eslint": "^4.5.12",
-    "@parameter1/base-cms-marko-compiler": "^4.40.3",
-    "@parameter1/browserslist-config-base-cms": "^4.5.12",
+    "@parameter1/base-cms-eslint": "^4.74.0",
+    "@parameter1/base-cms-marko-compiler": "^4.74.0",
+    "@parameter1/browserslist-config-base-cms": "^4.74.0",
     "lerna": "^6.5.1"
   },
   "engines": {

packages/common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ac-business-media/package-common",
-  "version": "2.16.6",
+  "version": "2.17.4",
   "author": "Brandon Krigbaum <[email protected]>",
   "repository": "https://github.com/parameter1/ac-business-media-websites/tree/master/packages/common",
   "license": "MIT",
@@ -13,15 +13,15 @@
     "test": "yarn lint && yarn compile --no-clean"
   },
   "dependencies": {
-    "@parameter1/base-cms-env": "^4.5.12",
-    "@parameter1/base-cms-marko-core": "^4.55.4",
-    "@parameter1/base-cms-marko-web": "^4.71.2",
-    "@parameter1/base-cms-marko-web-gtm": "^4.73.0",
-    "@parameter1/base-cms-marko-web-search": "^4.55.4",
-    "@parameter1/base-cms-marko-web-theme-default": "^4.40.3",
-    "@parameter1/base-cms-object-path": "^4.40.3",
-    "@parameter1/base-cms-utils": "^4.40.3",
-    "@parameter1/base-cms-web-cli": "^4.57.1",
+    "@parameter1/base-cms-env": "^4.74.0",
+    "@parameter1/base-cms-marko-core": "^4.80.0",
+    "@parameter1/base-cms-marko-web": "^4.80.0",
+    "@parameter1/base-cms-marko-web-gtm": "^4.74.0",
+    "@parameter1/base-cms-marko-web-search": "^4.80.4",
+    "@parameter1/base-cms-marko-web-theme-default": "^4.80.4",
+    "@parameter1/base-cms-object-path": "^4.74.0",
+    "@parameter1/base-cms-utils": "^4.74.0",
+    "@parameter1/base-cms-web-cli": "^4.74.0",
     "@sendgrid/mail": "^6.4.0",
     "@trevoreyre/autocomplete-vue": "^2.2.0",
     "body-parser": "^1.19.0",

packages/directory/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ac-business-media/package-directory",
-  "version": "2.16.6",
+  "version": "2.17.4",
   "author": "Jacob Bare <[email protected]>",
   "repository": "https://github.com/parameter1/ac-business-media-websites/tree/master/packages/directory",
   "license": "MIT",
@@ -13,10 +13,10 @@
     "test": "yarn lint && yarn compile --no-clean"
   },
   "dependencies": {
-    "@parameter1/base-cms-marko-core": "^4.55.4",
-    "@parameter1/base-cms-marko-web": "^4.71.2",
-    "@parameter1/base-cms-marko-web-theme-default": "^4.40.3",
-    "@parameter1/base-cms-object-path": "^4.40.3"
+    "@parameter1/base-cms-marko-core": "^4.80.0",
+    "@parameter1/base-cms-marko-web": "^4.80.0",
+    "@parameter1/base-cms-marko-web-theme-default": "^4.80.4",
+    "@parameter1/base-cms-object-path": "^4.74.0"
   },
   "engines": {
     "node": ">=14.15"

packages/global/components/blocks/recommended-content.marko

@@ -10,7 +10,7 @@ $ const title = defaultValue(input.title, "Recommended");
   <if(hasUser)>
     $ const answeredQuestions = user.customSelectFieldAnswers.filter((answers) => answers.hasAnswered);
     $ const { assignedRecommendContentSections } = personasHandler({ answeredQuestions });
-    $ const sectionIdForRecommendedContent = assignedRecommendContentSections[Math.floor(Math.random() * assignedRecommendContentSections.length)];
+    $ const sectionIdForRecommendedContent = assignedRecommendContentSections ? assignedRecommendContentSections[Math.floor(Math.random() * assignedRecommendContentSections.length)] : null;
     <if(sectionIdForRecommendedContent)>
       $ const queryParams = {
         sectionId: sectionIdForRecommendedContent,

packages/global/components/document.marko

@@ -6,6 +6,7 @@ $ const {
   req,
   nativeX,
   GAM,
+  contentMeterState,
 } = out.global;
 
 $ const omedaConfig = site.get('omeda');
@@ -120,6 +121,15 @@ $ const omedaConfig = site.get('omeda');
     <else>
       <global-site-footer />
     </else>
+    <if(contentMeterState && !contentMeterState.isLoggedIn)>
+      <theme-content-meter-block
+        views=contentMeterState.views
+        view-limit=contentMeterState.viewLimit
+        display-overlay=contentMeterState.displayOverlay
+        display-gate=contentMeterState.displayGate
+        dynamic-title="We hope you’ve enjoyed your articles."
+      />
+    </if>
   </@below-container>
   <@below-wrapper>
     <marko-web-deferred-script-loader-load />

packages/global/components/layouts/content/wrapper.marko

@@ -130,25 +130,27 @@ $ const fixedAdBottom = defaultValue(input.fixedAdBottom, true);
               </@section>
             </marko-web-page-wrapper>
           </if>
-          <if(withAds && !isSponsored)>
-            <theme-reveal-ad-handler
-              select-all-targets=true
-              path=GAM.getAdUnit({ name: "reskin", aliases }).path
-              id="reveal-ad"
-            />
-            <theme-fixed-ad-bottom aliases=aliases />
-            <if(contentMeterState && !contentMeterState.isLoggedIn)>
-              <theme-content-meter-block
-                views=contentMeterState.views
-                view-limit=contentMeterState.viewLimit
-                display-overlay=contentMeterState.displayOverlay
-                display-gate=contentMeterState.displayGate
-                dynamic-title="We hope you’ve enjoyed your articles."
-              />
-            </if>
-          </if>
+
         </marko-web-resolve-page>
       </marko-web-page-container>
     </if>
   </@below-page>
+  <@belowContainer>
+    <if(type !== "page")>
+      <marko-web-resolve-page|{ data: content, resolved }| node=pageNode>
+        $ const section = content.primarySection;
+        $ const labels = getAsArray(content, "labels");
+        $ const isSponsored = labels.includes("Sponsored");
+        $ const aliases = hierarchyAliases(section);
+        <if(withAds && !isSponsored)>
+          <theme-reveal-ad-handler
+            select-all-targets=true
+            path=GAM.getAdUnit({ name: "reskin", aliases }).path
+            id="reveal-ad"
+          />
+          <theme-fixed-ad-bottom aliases=aliases />
+        </if>
+      </marko-web-resolve-page>
+    </if>
+  </@belowContainer>
 </theme-content-page>

sites/forconstructionpros.com/config/identity-x/asphalt.js → packages/global/config/identity-x/asphalt.js

@@ -1,4 +1,4 @@
-const formDefault = require('@ac-business-media/package-global/config/identity-x/default');
+const formDefault = require('./default');
 
 const form = {
   title: 'Asphalt Content Form',

sites/forconstructionpros.com/config/identity-x/concrete.js → packages/global/config/identity-x/concrete.js

@@ -1,4 +1,4 @@
-const formDefault = require('@ac-business-media/package-global/config/identity-x/default');
+const formDefault = require('./default');
 
 const form = {
   title: 'Concrete Content Form',

packages/global/config/identity-x/default.js

@@ -42,7 +42,7 @@ module.exports = {
         label: 'Mobile Number',
         key: 'mobileNumber',
         type: 'built-in',
-        required: true,
+        required: false,
         width: 0.5,
       },
       {

sites/forconstructionpros.com/config/identity-x/equipment.js → packages/global/config/identity-x/equipment.js

@@ -1,4 +1,4 @@
-const formDefault = require('@ac-business-media/package-global/config/identity-x/default');
+const formDefault = require('./default');
 
 const form = {
   title: 'Equipment Content Form',

sites/forconstructionpros.com/config/identity-x/pavement.js → packages/global/config/identity-x/pavement.js

@@ -1,4 +1,4 @@
-const formDefault = require('@ac-business-media/package-global/config/identity-x/default');
+const formDefault = require('./default');
 
 const form = {
   title: 'Pavement Content Form',

sites/forconstructionpros.com/config/identity-x/rental.js → packages/global/config/identity-x/rental.js

@@ -1,4 +1,4 @@
-const formDefault = require('@ac-business-media/package-global/config/identity-x/default');
+const formDefault = require('./default');
 
 const form = {
   title: 'Rental Content Form',