Merge branch 'master' into coy

parameter1 · Jul 9, 2024 · 9afd6ba · 9afd6ba
2 parents 58445c4 + 00c5811
commit 9afd6ba
Show file tree

Hide file tree

Showing 19 changed files with 87 additions and 105 deletions.
diff --git a/packages/global/graphql/fragments/dynamic-page.js b/packages/global/graphql/fragments/dynamic-page.js
@@ -0,0 +1,23 @@
+const gql = require('graphql-tag');
+
+module.exports = gql`
+fragment DynamicPageFragment on ContentPage {
+  id
+  type
+  name
+  body
+  primarySection {
+    id
+    name
+    alias
+  }
+  gating {
+    surveyType
+    surveyId
+  }
+  userRegistration {
+    isCurrentlyRequired
+    accessLevels
+  }
+}
+`;
diff --git a/...digital.com/server/routes/dynamic-page.js → packages/global/routes/dynamic-page.js b/...digital.com/server/routes/dynamic-page.js → packages/global/routes/dynamic-page.js
@@ -1,6 +1,6 @@
 const { withDynamicPage } = require('@parameter1/base-cms-marko-web/middleware');
-const queryFragment = require('@parameter1/base-cms-marko-web-theme-monorail/graphql/fragments/dynamic-page');
-const page = require('@randall-reilly/package-global/templates/dynamic-page');
+const queryFragment = require('../graphql/fragments/dynamic-page');
+const page = require('../templates/dynamic-page');
 
 module.exports = (app) => {
   app.get('/page/:alias(*)', withDynamicPage({

diff --git a/packages/global/routes/index.js b/packages/global/routes/index.js
@@ -3,6 +3,7 @@ const renderBlock = require('@parameter1/base-cms-marko-web-theme-monorail/route
 const search = require('@parameter1/base-cms-marko-web-theme-monorail/routes/search');
 const taxonomy = require('@parameter1/base-cms-marko-web-theme-monorail/routes/taxonomy');
 const omedaNewsletters = require('@parameter1/base-cms-marko-web-omeda/routes/omeda-newsletters');
+const dynamicPages = require('./dynamic-page');
 const feed = require('./feed');
 const nativeX = require('./native-x');
 const printContent = require('./print-content');
@@ -11,6 +12,9 @@ const redirects = require('./redirects');
 const staticPage = require('./static-page');
 
 module.exports = (app, siteConfig) => {
+  // Dynamic Pages
+  dynamicPages(app);
+
   // Feed
   feed(app);
 

diff --git a/packages/global/templates/dynamic-page/index.marko b/packages/global/templates/dynamic-page/index.marko
@@ -1,4 +1,13 @@
+import { getAsArray, getAsObject, get } from "@parameter1/base-cms-object-path";
+import hasOmedaId from "@parameter1/base-cms-marko-web-theme-monorail/utils/has-omeda-id";
+import getContentPreview from "@parameter1/base-cms-marko-web-theme-monorail/utils/get-content-preview";
+import { cmShowOverlay, cmRestrictContentByReg, cmTruncateBody } from "../../utils/content-meter-helpers";
+
+$ const { global: $global } = out;
+$ const { contentMeterState, req } = $global;
 $ const { id, type, pageNode } = input;
+$ const showOverlay = cmShowOverlay(contentMeterState);
+$ const bypassGate = hasOmedaId(req);
 
 <global-content-wrapper-layout
   id=id
@@ -29,8 +38,56 @@ $ const { id, type, pageNode } = input;
       <theme-page-contents|{ blockName }| attrs={ "data-gallery-id": id }>
 
         $ const bodyId = `content-body-${content.id}`;
-        <marko-web-content-body block-name=blockName obj=content attrs={ id: bodyId } />
 
+        $ const contentRequiresRegistration = get(content, "userRegistration.isCurrentlyRequired");
+        $ const requiresRegistration = !bypassGate && (contentRequiresRegistration || cmRestrictContentByReg(contentMeterState, content));
+        $ const accessLevels = getAsArray(content, "userRegistration.accessLevels");
+        $ console.log(contentRequiresRegistration, requiresRegistration, accessLevels)
+        <marko-web-identity-x-access|context|
+          enabled=requiresRegistration
+          required-access-level-ids=accessLevels
+        >
+          <if(cmTruncateBody(contentMeterState))>
+            $ const body = showOverlay ? getContentPreview({ body: content.body, selector: "p:lt(7)" }) : getContentPreview({ body: content.body, selector: "p:nth-of-type(1)" });
+            <marko-web-content-body block-name=blockName obj={ body } lazyload-first-image=lazyloadFirstImage />
+
+            <div class="content-page-preview-overlay" />
+            <if(!showOverlay)>
+              <theme-content-page-gate
+                can-access=context.canAccess
+                is-logged-in=context.isLoggedIn
+                has-required-access-level=context.hasRequiredAccessLevel
+                requires-access-level=context.requiresAccessLevel
+                requires-user-input=context.requiresUserInput
+                messages="context.messages"
+                user-input-title="Step 2 of 2"
+                profile-call-to-action=""
+                profile-button-label="Create Account"
+                profile-event-name="content_meter_profile"
+                title="Login to Access!"
+              />
+            </if>
+          </if>
+          <else-if(!context.canAccess || context.requiresUserInput)>
+            $ const body = getContentPreview({ body: content.body, selector: "p:lt(4)" });
+            <marko-web-content-body block-name=blockName obj={ body } />
+
+            <div class="content-page-preview-overlay" />
+            <theme-content-page-gate
+              can-access=context.canAccess
+              is-logged-in=context.isLoggedIn
+              has-required-access-level=context.hasRequiredAccessLevel
+              requires-access-level=context.requiresAccessLevel
+              requires-user-input=context.requiresUserInput
+              messages=context.messages
+              title="Login to Access!"
+            />
+            <marko-web-content-body block-name=blockName attrs={ style: "display: none;" }  obj=content modifiers=["ld-json"] />
+          </else-if>
+          <else>
+            <marko-web-content-body block-name=blockName obj=content attrs={ id: bodyId } />
+          </else>
+        </marko-web-identity-x-access>
       </theme-page-contents>
     </div>
   </@section>

diff --git a/sites/ccjdigital.com/server/routes/index.js b/sites/ccjdigital.com/server/routes/index.js
@@ -1,6 +1,5 @@
 const home = require('./home');
 const content = require('./content');
-const dynamicPages = require('./dynamic-page');
 const top250 = require('./top250');
 const websiteSections = require('./website-section');
 
@@ -11,9 +10,6 @@ module.exports = (app) => {
   // Spec Guides
   top250(app);
 
-  // Dynamic Pages
-  dynamicPages(app);
-
   // Content Pages
   content(app);
 

diff --git a/sites/cleantrucking.com/server/routes/dynamic-page.js b/sites/cleantrucking.com/server/routes/dynamic-page.js
diff --git a/sites/cleantrucking.com/server/routes/index.js b/sites/cleantrucking.com/server/routes/index.js
@@ -1,15 +1,11 @@
 const home = require('./home');
 const content = require('./content');
-const dynamicPages = require('./dynamic-page');
 const websiteSections = require('./website-section');
 
 module.exports = (app) => {
   // Homepage
   home(app);
 
-  // Dynamic Pages
-  dynamicPages(app);
-
   // Content Pages
   content(app);
 

diff --git a/sites/equipmentworld.com/server/routes/dynamic-page.js b/sites/equipmentworld.com/server/routes/dynamic-page.js
diff --git a/sites/equipmentworld.com/server/routes/index.js b/sites/equipmentworld.com/server/routes/index.js
@@ -1,7 +1,6 @@
 const EERouter = require('@randall-reilly/equipment-experts');
 const home = require('./home');
 const content = require('./content');
-const dynamicPages = require('./dynamic-page');
 const staticPages = require('./static');
 const websiteSections = require('./website-section');
 
@@ -13,9 +12,6 @@ module.exports = (app) => {
   const { parseEmbeddedMedia } = app.locals;
   app.use('/api/marketplace-articles', EERouter({ parseEmbeddedMedia, sectionAlias: 'equipment-experts' }));
 
-  // Dynamic Pages
-  dynamicPages(app);
-
   // Content Pages
   content(app);
 

diff --git a/sites/hardworkingtrucks.com/server/routes/dynamic-page.js b/sites/hardworkingtrucks.com/server/routes/dynamic-page.js
diff --git a/sites/hardworkingtrucks.com/server/routes/index.js b/sites/hardworkingtrucks.com/server/routes/index.js
@@ -1,15 +1,11 @@
 const home = require('./home');
 const content = require('./content');
-const dynamicPages = require('./dynamic-page');
 const websiteSections = require('./website-section');
 
 module.exports = (app) => {
   // Homepage
   home(app);
 
-  // Dynamic Pages
-  dynamicPages(app);
-
   // Content Pages
   content(app);
 

diff --git a/sites/overdriveonline.com/server/routes/dynamic-page.js b/sites/overdriveonline.com/server/routes/dynamic-page.js
diff --git a/sites/overdriveonline.com/server/routes/index.js b/sites/overdriveonline.com/server/routes/index.js
@@ -1,7 +1,6 @@
 const rigdig = require('@randall-reilly/package-rigdig');
 const home = require('./home');
 const content = require('./content');
-const dynamicPages = require('./dynamic-page');
 const websiteSections = require('./website-section');
 
 module.exports = (app) => {
@@ -11,9 +10,6 @@ module.exports = (app) => {
   // Homepage
   home(app);
 
-  // Dynamic Pages
-  dynamicPages(app);
-
   // Content Pages
   content(app);
 

diff --git a/sites/totallandscapecare.com/server/routes/dynamic-page.js b/sites/totallandscapecare.com/server/routes/dynamic-page.js
diff --git a/sites/totallandscapecare.com/server/routes/index.js b/sites/totallandscapecare.com/server/routes/index.js
@@ -1,15 +1,11 @@
 const home = require('./home');
 const content = require('./content');
-const dynamicPages = require('./dynamic-page');
 const websiteSections = require('./website-section');
 
 module.exports = (app) => {
   // Homepage
   home(app);
 
-  // Dynamic Pages
-  dynamicPages(app);
-
   // Content Pages
   content(app);
 

diff --git a/sites/truckersnews.com/server/routes/dynamic-page.js b/sites/truckersnews.com/server/routes/dynamic-page.js
diff --git a/sites/truckersnews.com/server/routes/index.js b/sites/truckersnews.com/server/routes/index.js
@@ -1,15 +1,11 @@
 const home = require('./home');
 const content = require('./content');
-const dynamicPages = require('./dynamic-page');
 const websiteSections = require('./website-section');
 
 module.exports = (app) => {
   // Homepage
   home(app);
 
-  // Dynamic Pages
-  dynamicPages(app);
-
   // Content Pages
   content(app);
 

diff --git a/sites/truckpartsandservice.com/server/routes/dynamic-page.js b/sites/truckpartsandservice.com/server/routes/dynamic-page.js
diff --git a/sites/truckpartsandservice.com/server/routes/index.js b/sites/truckpartsandservice.com/server/routes/index.js
@@ -1,16 +1,12 @@
 const home = require('./home');
 const content = require('./content');
-const dynamicPages = require('./dynamic-page');
 const websiteSections = require('./website-section');
 const staticPages = require('./static');
 
 module.exports = (app) => {
   // Homepage
   home(app);
 
-  // Dynamic Pages
-  dynamicPages(app);
-
   // Content Pages
   content(app);