UJ: Pre-merge commit + push

somiibo · Sep 27, 2023 · 100252e · 100252e
2 parents 5adc2b2 + 643ef95
commit 100252e
Show file tree

Hide file tree

Showing 11 changed files with 103 additions and 19 deletions.
diff --git a/_config.yml b/_config.yml
@@ -207,7 +207,26 @@ settings:
           enabled: true,
           config: {
             dsn: '',
+<<<<<<< HEAD
             release: '',
+=======
+            release: 'ultimate-jekyll-website',
+            replaysSessionSampleRate: 0.1,
+            replaysOnErrorSampleRate: 1.0,
+          },
+        },
+      },
+      exitPopup: {
+        enabled: true,
+        config: {
+          timeout: 3600000,
+          handler: null,
+          title: 'Special Offer!',
+          message: 'Get 15% off your purchase of our <strong>Premium plans</strong>. <br><br> Get access to all features and unlimited usage.',
+          okButton: {
+            text: 'Claim 15% Discount',
+            link: '/pricing?utm_source=exitpopup&utm_medium=popup&utm_campaign=exitpopup',
+>>>>>>> template
           },
         },
       },

diff --git a/_includes/master/global/foot.html b/_includes/master/global/foot.html
@@ -43,7 +43,7 @@
 </div>
 
 <!-- Master - Chat Opener -->
-<a href="#" onclick="return false;" id="prechat-btn" style="display: none;">
+<a id="prechat-btn" class="animation-fade-in" href="#" onclick="return false;" style="display: none;">
   <svg height="100%" stroke-miterlimit="10" style="fill-rule:nonzero;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;" version="1.1" viewBox="0 0 700 700" width="100%" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <defs/>
     <g id="Untitled">
@@ -55,6 +55,30 @@
   </svg>
 </a>
 
+<!-- Master - Exit Popip -->
+<div id="modal-exit-popup" class="modal fade" tabindex="-1" hidden>
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title">
+          {title}
+        </h5>
+        <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+      </div>
+      <div class="modal-body">
+        <p>
+          {body}
+        </p>
+      </div>
+      <div class="modal-footer">
+        <a href="{okButton.link}" class="btn btn-primary">
+          {okButton.text}
+        </a>
+      </div>
+    </div>
+  </div>
+</div>
+
 <!-- Performance -->
 <script type="text/javascript">
   try {

diff --git a/_includes/master/modules/adunits/adsense-display.html b/_includes/master/modules/adunits/adsense-display.html
@@ -1,11 +1,12 @@
 {%- if page.advertising.google-adsense == false -%}
+{%- elsif layout.advertising.google-adsense == false -%}
 {%- elsif site.advertising.google-adsense != false -%}
   <!-- Adunit - Adsense Display Ad-->
   {%- if include.include-adsense-script == true -%}
     <script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=ca-{{ site.advertising.google-adsense }}" crossorigin="anonymous"></script>
   {%- endif -%}
 
-  <div class="uj-vert-unit">
+  <div class="uj-vert-unit" data-plan-id="basic" data-plan-visibility="visible">
     <ins class="adsbygoogle"
         style="display:block; {{ include.style }}"
         data-ad-client="ca-{{ site.advertising.google-adsense }}"

diff --git a/_includes/master/modules/adunits/adsense-in-article.html b/_includes/master/modules/adunits/adsense-in-article.html
@@ -1,11 +1,12 @@
 {%- if page.advertising.google-adsense == false -%}
+{%- elsif layout.advertising.google-adsense == false -%}
 {%- elsif site.advertising.google-adsense != false -%}
   <!-- Adunit - Adsense In-article Ad-->
   {%- if include.include-adsense-script == true -%}
     <script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=ca-{{ site.advertising.google-adsense }}" crossorigin="anonymous"></script>
   {%- endif -%}
 
-  <div class="uj-vert-unit">
+  <div class="uj-vert-unit" data-plan-id="basic" data-plan-visibility="visible">
     <ins class="adsbygoogle"
         style="display:block; text-align:center; {{ include.style }}"
         data-ad-layout="in-article"

diff --git a/_includes/master/modules/adunits/adsense-in-feed.html b/_includes/master/modules/adunits/adsense-in-feed.html
@@ -1,4 +1,5 @@
 {%- if page.advertising.google-adsense == false -%}
+{%- elsif layout.advertising.google-adsense == false -%}
 {%- elsif site.advertising.google-adsense != false -%}
   <!-- Adunit - Adsense In-feed Ad-->
   {%- if include.include-adsense-script == true -%}
@@ -13,7 +14,7 @@
     {% assign layout-key = '-fb+5w+4e-db+86' %}
   {%- endif -%}
 
-  <div class="uj-vert-unit">
+  <div class="uj-vert-unit" data-plan-id="basic" data-plan-visibility="visible">
     <ins class="adsbygoogle"
         style="display:block; {{ include.style }}"
         data-ad-format="fluid"

diff --git a/_includes/master/modules/adunits/adsense-multiplex.html b/_includes/master/modules/adunits/adsense-multiplex.html
@@ -1,11 +1,12 @@
 {%- if page.advertising.google-adsense == false -%}
+{%- elsif layout.advertising.google-adsense == false -%}
 {%- elsif site.advertising.google-adsense != false -%}
   <!-- Adunit - Adsense Multiplex Ad-->
   {%- if include.include-adsense-script == true -%}
     <script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=ca-{{ site.advertising.google-adsense }}" crossorigin="anonymous"></script>
   {%- endif -%}
 
-  <div class="uj-vert-unit">
+  <div class="uj-vert-unit" data-plan-id="basic" data-plan-visibility="visible">
     <ins class="adsbygoogle"
         style="display:block; {{ include.style }}"
         data-ad-format="autorelaxed"

diff --git a/_layouts/master/authentication/account.html b/_layouts/master/authentication/account.html
@@ -164,7 +164,7 @@
           <!-- End Navbar Toggle -->
 
           <!-- Navbar Collapse -->
-          <div id="navbarVerticalNavMenu" class="collapse navbar-collapse">
+          <div id="navbarVerticalNavMenu" class="collapse navbar-collapse animation-fade-in">
             <ul id="navbarSettings" class="js-sticky-block js-scrollspy card card-navbar-nav nav nav-tabs nav-lg nav-vertical" data-hs-sticky-block-options='{
                    "parentSelector": "#navbarVerticalNavMenu",
                    "targetSelector": "#header",
@@ -241,16 +241,17 @@
       </div>
 
       <div class="col-lg-9">
-        <div id="spinner-loader">
+        <div id="spinner-loader" class="animation-fade-in">
           <div class="card">
-            <div class="d-flex justify-content-center my-5">
+            <div class="d-flex flex-column align-items-center justify-content-center my-5">
+              <h4>Getting your account details ready...</h4>
               <div class="spinner-border text-primary" role="status">
                 <span class="visually-hidden">Loading...</span>
               </div>
             </div>
           </div>
         </div>
-        <div id="account-parent" hidden>
+        <div id="account-parent" class="animation-slide-up" hidden>
           <div class="d-grid gap-3 gap-lg-5">
 
             <!-- Card -->

diff --git a/_layouts/master/placeholder/global/default.html b/_layouts/master/placeholder/global/default.html
@@ -4,13 +4,13 @@
 
 ### REGULAR PAGES ###
 head:
-  post-bundle-css: '
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx" crossorigin="anonymous">
+  pre-bundle-css: '
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
   '
 
 foot:
-  post-bundle-script: '
-
+  pre-bundle-script: '
+    <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL" crossorigin="anonymous"></script>
   '
 
 settings:

diff --git a/_layouts/master/placeholder/legal/terms.md b/_layouts/master/placeholder/legal/terms.md
@@ -100,8 +100,8 @@ All sales are final. If you experience issues, please contact {{ brand }}.
 
 If you request a refund we will determine the eligibility of your refund. Upon approval, you will be refunded by the same method of payment you originally used. -->
 
-### Trial Period Eligibility
-The availability and duration of the trial period are subject to change and may not be available at all times. The current trial and pricing information is available on our [pricing page]({{ site.url }}/pricing).
+### Free Trial Period Eligibility
+The availability and duration of the free trial period are subject to change and may not be available at all times. The current trial and pricing information is available on our [pricing page]({{ site.url }}/pricing).
 
 If you have not previously benefited from a free trial of our service, you may be eligible to receive a trial period at no cost.
 
@@ -113,15 +113,15 @@ Upon the conclusion of the trial period, you will automatically be charged the a
 You will not receive a notice from us that your trial period has ended or that the paying portion of your subscription has begun.
 
 ### Cancellation and Refund
-You are eligible for a full refund of the subscription fee if you cancel your subscription within the trial period. Failure to cancel within the trial period will result in the forfeiture of your eligibility for a refund.
+You are eligible for a full refund of the subscription fee if you cancel your subscription within the free trial period. Cancelling your subscription after the trial period or failure to cancel within the trial period will result in the forfeiture of your eligibility for a refund.
 
 If your subscription plan did not include a free trial period, you are not eligible for a refund on your subscription fee.
 
 You may cancel your subscription at any time by visiting [{{ site.url }}/account]({{ site.url }}/account) and navigating to the Billing section of your account. Any other method of cancellation including email, phone, or other means will not be accepted unless otherwise stated or required by law.
 
 Upon cancellation you will not be charged any further subscription fees. No payments already made in respect of subscriptions will be refunded (wholly or partly).
 
-Any additional purchases, including one-time payments, add-ons, or other sales on our site, are final and non-refundable once processed.
+Any other purchases, including one-time payments, add-ons, or other sales on our site that do not include a free trial period are final and non-refundable once processed.
 
 Should you request a refund, we will determine the eligibility of your refund. If approved, you will be refunded via the same payment method you originally used.
 

diff --git a/package.json b/package.json
@@ -84,10 +84,11 @@
     "through2": "4.0.2",
     "ultimate-jekyll-poster": "0.0.15",
     "vinyl-named": "1.1.0",
-    "web-manager": "3.1.50",
+    "web-manager": "3.1.53",
     "webpack": "5.88.0",
     "webpack-stream": "6.1.2",
     "yargs": "16.2.0",
     "zzzzzzzzzz": "9.9.9"
-  }
+  },
+  "dependencies": {}
 }
diff --git a/special/master/pages/tools/ads.md b/special/master/pages/tools/ads.md
@@ -34,3 +34,38 @@ This is an `adsense-in-feed.html` ad:
 This is an `adsense-multiplex.html` ad:
 
 {% include /master/modules/adunits/adsense-multiplex.html index="1" %}
+
+
+<script>
+  Manager.ready(function () {
+    Manager.account().import()
+    .then(function (Account) {
+      var account = new Account();
+
+      account.resolve()
+      .then(function (properties) {
+        accountData = properties;
+
+        console.log('.account().resolve()', accountData);
+
+        console.log('-----1')
+        account.handleAccount({
+          plan: {
+            id: 'premium',
+          }
+        })
+        console.log('-----2')
+
+        return resolve(accountData)
+      })
+      .catch(function (e) {
+        console.log('--- 1', e)
+        return reject(e);
+      })
+    })
+    .catch(function (e) {
+        console.log('--- 2', e)
+      return reject(e);
+    })
+  })
+</script>