RubyGems - j1_template_mde - Versions diffs - 2018.4.31 → 2018.4.32 - Mend

j1_template_mde 2018.4.31 → 2018.4.32

Files changed (130) hide show

data/lib/j1_app/j1_auth_manager/config.rb CHANGED Viewed

@@ -47,8 +47,8 @@ module J1App
   def self.permissions
     permission_profile = {
-        :private   => [],
-        :premium   => []
+        :protected   => [],
+        :private   => []
     }
     active_providers = auth_config['providers']['activated']
@@ -88,11 +88,11 @@ module J1App
   # def self.provider_url(arg)
   #   provider_url = {
-  #     'patreon'   => auth_config['provider']['home_url']['patreon'],
-  #     'disqus'    => auth_config['provider']['home_url']['disqus'],
-  #     'facebook'  => auth_config['provider']['home_url']['facebook'],
-  #     'github'    => auth_config['provider']['home_url']['github'],
-  #     'twitter'   => auth_config['provider']['home_url']['twitter']
+  #     'patreon'   => auth_config['provider']['provider_url']['patreon'],
+  #     'disqus'    => auth_config['provider']['provider_url']['disqus'],
+  #     'facebook'  => auth_config['provider']['provider_url']['facebook'],
+  #     'github'    => auth_config['provider']['provider_url']['github'],
+  #     'twitter'   => auth_config['provider']['provider_url']['twitter']
   #   }
   #   provider_url[arg]
   # end
@@ -132,8 +132,8 @@ module J1App
   # def self.permissions_old
   #   permission_profile = {
-  #       :private   => [],
-  #       :premium   => []
+  #       :protected   => [],
+  #       :private   => []
   #   }
   #
   #   provider_permissions = auth_config['provider']['permission']

data/lib/j1_app/j1_auth_manager/helpers.rb CHANGED Viewed

@@ -80,5 +80,63 @@ module J1App
     #   end
     # end
-  end
-end
+    # --------------------------------------------------------------------------
+    #  merge: merge two hashes (input <- hash)
+    #
+    #  Example:
+    #   {% assign nav_bar_options = nav_bar_default | merge: nav_bar_config %}
+    # --------------------------------------------------------------------------
+    def merge(input, hash)
+      unless input.respond_to?(:to_hash)
+        raise ArgumentError.new("merge filter requires hash arguments: arg_input")
+      end
+      # if hash to merge is NOT a hash or empty return first hash (input)
+      unless hash.respond_to?(:to_hash)
+        input
+      end
+      if hash.nil? || hash.empty?
+        input
+      else
+        merged = input.dup
+        hash.each do |k, v|
+          merged[k] = v
+        end
+        merged
+      end
+    end
+    # --------------------------------------------------------------------------
+    #  writeCookie:
+    #
+    #  Example:
+    #
+    # --------------------------------------------------------------------------
+    def writeCookie(name, data)
+      session_encoded = Base64.encode64(data)
+      response.set_cookie(
+          name,
+          domain: false,
+          value: session_encoded.to_s,
+          path: '/'
+      )
+    end
+    # --------------------------------------------------------------------------
+    #  readCookie:
+    #
+    #  Example:
+    #
+    # --------------------------------------------------------------------------
+    def readCookie(name)
+      if env['HTTP_COOKIE'].include? name
+        session_encoded = request.cookies[name]
+        session_decoded = Base64.decode64(session_encoded)
+        session_data = JSON.parse(session_decoded)
+        return session_data
+      else
+        return {}
+      end
+    end
+  end # END helpers
+end # END module

data/lib/j1_app/j1_auth_manager/views/auth_manager_ui.erb CHANGED Viewed

@@ -2,9 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
     <title>AuthManager</title>
     <meta name="description" content="J1 Template">
     <meta name="author" content="jelyll-one">
@@ -13,27 +11,27 @@
     <link rel="stylesheet" type="text/css" href="/assets/themes/j1/core/css/vendor.css">
     <script src="/assets/themes/j1/core/js/template.js"></script>
     <script src="/assets/themes/j1/core/js/adapter/template.js"></script>
   </head>
   <body class="r-text-300">
-  <!-- Modal Central Success Demo -->
+  <!-- Modal Central Success -->
   <div id="centralModalInfo" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
     <div class="modal-dialog modal-notify modal-<%= @info_type %>" role="document">
       <!-- Content -->
       <div class="modal-content">
         <!--Header-->
         <div class="modal-header">
-          <p class="lead"><%= @modal_title %></p>
+          <p class="lead">
+            <i class="mdi mdi-2x mdi-dark mdi-<%= @modal_icon %>"></i>
+            <%= @modal_title %></p>
           <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-            <i class="mdi mdi-close mdi-light mdi-48px"></i>
+            <i class="mdi mdi-dark mdi-48px mdi-close"></i>
           </button>
         </div>
         <!-- Body -->
         <div class="modal-body">
           <div class="text-center">
-            <i class="mdi mdi-4x mdi-<%= @modal_icon %> mdi-rotateIn mb-1"></i>
             <p style="text-align: justify"><%= @modal_description %></p>
           </div>
         </div>
@@ -45,7 +43,7 @@
       <!-- END Content -->
     </div>
   </div>
-  <!-- END Central Success Demo -->
+  <!-- END Central Success -->
   <!-- Modal TopInfo -->
@@ -53,6 +51,7 @@
     <div class="modal-dialog modal-frame modal-top modal-notify modal-info" role="document">
       <!-- Content -->
       <div class="modal-content">
         <!-- Body -->
         <div class="modal-body">
           <div class="row px-4">
@@ -61,7 +60,8 @@
           <div class="row px-4">
             <a type="button" id="okButton" class="btn btn-primary-modal mr-2" data-dismiss="modal"><%= @modal_ok_text %></a>
           </div>
-        </div>
+        </div> <!-- END Body -->
       </div>
       <!-- END Content -->
     </div>
@@ -73,76 +73,162 @@
       <div class="modal-dialog modal-lg modal-notify modal-info" role="document">
         <!-- Content -->
         <div class="modal-content">
           <!--Header-->
           <div class="modal-header">
-            <p class="lead"><%= @modal_title %></p>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-              <i class="mdi mdi-close mdi-light mdi-48px"></i>
-            </button>
+            <p class="lead">
+              <i class="mdi mdi-2x mdi-dark mdi-account"></i>
+              <%= @modal_title %>
+            </p>
+            <!-- <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+              <i class="mdi mdi-dark mdi-48px mdi-close"></i>
+            </button> -->
           </div>
           <!-- Body -->
           <div class="modal-body">
             <div class="text-center">
-              <i class="mdi mdi-4x mdi-<%= @modal_icon %> mdi-rotateIn mb-1"></i>
               <p style="text-align: justify"><%= @modal_description %></p>
             </div>
             <img src="<%= @modal_image %>" alt="<%= @modal_title %>" class="img-fluid">
           </div>
           <!-- Footer -->
-          <div class="modal-footer">
+          <div class="modal-footer justify-content-center">
             <a type="button" id="signInButton" class="btn btn-primary-modal mr-2" data-dismiss="modal">
               <i class="mdi mdi-18px mdi-dark mdi-login"></i>
               <%= @modal_agreed_text %>
             </a>
-            <a type="button" id="exitButton" class="btn btn-outline-secondary-modal" data-dismiss="modal">
+            <a type="button" id="exitButton" class="btn btn-outline-modal" data-dismiss="modal">
+              <i class="mdi mdi-18px mdi-dark mdi-close"></i>
               <%= @modal_disagreed_text %>
             </a>
           </div>
-        </div>
-        <!-- END Content -->
+        </div> <!-- END Content -->
       </div>
     </div>
     <!-- END Modal SignInProtectedContent -->
+  <!-- Modal Central CookieConsent -->
+  <div id="centralCookieConsent" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-notify modal-<%= @info_type %>" role="document">
+      <!-- Content -->
+      <div class="modal-content">
+        <!--Header-->
+        <div class="modal-header">
+          <p class="lead">
+            <i class="mdi mdi-2x mdi-dark mdi-account"></i>
+            <%= @modal_title %>
+          </p>
+          <!-- <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <i class="mdi mdi-dark mdi-48px mdi-close"></i>
+          </button> -->
+        </div>
+        <!-- Body -->
+        <div class="modal-body">
+          <div class="text-center">
+            <p style="text-align: justify"><%= @modal_description %></p>
+          </div>
+        </div>
+        <!-- Footer -->
+        <div class="modal-footer justify-content-center">
+          <a type="button" id="acceptCookiesButton" class="btn btn-primary-modal mr-2" data-dismiss="modal">
+            <i class="mdi mdi-18px mdi-dark mdi-<%= @modal_icon %>"></i>
+            <%= @modal_agreed_text %>
+          </a>
+          <a type="button" id="declineCookiesButton" class="btn btn-outline-modal" data-dismiss="modal">
+            <i class="mdi mdi-18px mdi-dark mdi-close"></i>
+            <%= @modal_disagreed_text %>
+          </a>
+        </div>
+      <!-- END Content -->
+    </div>
+  </div>
+  <!-- END Central CookieConsent -->
   </body>
   <script>
     var route;
     var provider;
+    var user_state;
-    logger = log4javascript.getLogger("j1.Navigator"); // Setup logger
+    // Setup logger
+    var logger;
+    var allModalButtons = document.querySelectorAll('a.btn');
     var signIn = {
       provider:         "<%= @provider %>",
-      do:               false
+      do:               "unset"
     }
-    $(window).on('load', function(){
-      $("#<%= @modal %>").modal("show")
+    var cookiesAccepted = {
+      do:               "unset"
+    }
+    // Manage button click events for all modals
+    // See: https://www.nickang.com/add-event-listener-for-loop-problem-in-javascript/
+    // -----------------------------------------------------------------
+    $(document).on('shown.bs.modal','#<%= @modal %>', function () {
+      console.log('J1AuthManager: entered modal SHOWN from <%= @modal %>');
+      allModalButtons.forEach(function(button, index) {
+        button.addEventListener('click', function() {
+          // Modal topFullCookieConsent
+          // -----------------------------------------------------------
+          if (this.id === "acceptCookiesButton") {
+              cookiesAccepted.do = true;
+              user_state = j1.getWebSessionCookie();
+              user_state.cookies_accepted = 'accepted';
+              j1.setWebSessionCookie(user_state);
+          }
+          if (this.id === "declineCookiesButton") {
+              cookiesAccepted.do = false;
+          }
+          if (this.id === "okButton") {
+              signIn.do = true;
+          }
+          if (this.id === "signInButton") {
+            signIn.do = true;
+          } else {
+            signIn.do = false;
+          }
+        });
+      });
+      return;
     });
-    $("a.btn").click(function() {
-      if (this.id === "okButton") {
-          signIn.do = true;
-      }
-      if (this.id === "signInButton") {
-        signIn.do = true;
-      } else {
-        signIn.do = false;
-      }
+    $(window).on('load', function() {
+      $("#<%= @modal %>").modal("show")
     });
-    $("#<%= @modal %>").on('hidden.bs.modal', function() {
+    $(document).on('hide.bs.modal','#<%= @modal %>', function () {
+      console.log('J1AuthManager: entered modal HIDE from <%= @modal %>');
+      user_state = j1.getWebSessionCookie();
+      // Manage SignIn
+      // -----------------------------------------------------------------------
       if (signIn.do == true) {
+        var route = "<%= @route %>"
+        console.log('J1AuthManager: pass to ' + route);
+        window.location.href = route;
+      } else if (signIn.do == false) {
+        // TODO: How to manage page requested
+        // window.location.href = user_state.requested_page; // cause dead loop
+        window.location.href = '/';
+      }
+      // Cookies
+      // -----------------------------------------------------------------------
+      if (cookiesAccepted.do == true) {
         var route = "<%= @route %>"
         window.location.href = route;
-      } else {
-        // TODO: How to manage last/current page if protected
-        j1_user_state = j1.getUserStateCookie();
-        //window.location.href = j1_user_state.last_page;
-        //window.location.href = j1_user_state.current_page;
+      } else if (cookiesAccepted.do == false) {
         window.location.href = '/';
       }
+      // pass to "window.location.href"
+      return;
     });
   </script>

data/lib/starter_web/Gemfile CHANGED Viewed

@@ -46,7 +46,7 @@ gem 'jekyll', '~> 3.8.5'
 # Theme Rubies
 # Default: J1 Template
 #
-gem 'j1_template_mde', '~> 2018.4.31'
+gem 'j1_template_mde', '~> 2018.4.32'
 # --------------------------------------------------------------------
 # PRODUCTION: Gem needed for the Jekyll and J1 prod environment

data/lib/starter_web/_config.yml CHANGED Viewed

@@ -60,7 +60,7 @@ environment:                            development
 #   anything here because version information is bumped-in by
 #   the build process
 #
-version:                                2018.4.31
+version:                                2018.4.32
 # ==============================================================================
@@ -547,80 +547,82 @@ algolia:
 j1_auth:
   enabled:                              false
   ssl:                                  false
+  update_user_state:                    true
   content:
     public:
       - \W*((?i)assets(?-i))\W*
       - \W*((?i)public(?-i))\W*
+    protected:
+      - \W*((?i)protected(?-i))\W*
     private:
       - \W*((?i)private(?-i))\W*
-    premium:
-      - \W*((?i)premium(?-i))\W*
   providers:
     activated:                          [ disqus ]
     disqus:
-      home_url:                         https://disqus.com
-      product_url:                      http://localhost:5000
+      provider_url:                     https://disqus.com
       strategy:                         member
       scope:                            []
       users:                            [ all ]
-      permissions:                      [ private ]
+      permissions:                      [ protected, private ]
       data_fields:                      []
       conditions:
+        protected:
+          enabled:                      true
+          users:
+            blacklist:                  []
         private:
           enabled:                      true
           users:
+            whitelist:                  [ all ]
             blacklist:                  []
   # facebook:
-  #   home_url:                         https://facebook.com
-  #   product_url:                      http://localhost:5000
+  #   provider_url:                     https://facebook.com
   #   strategy:                         member
   #   scope:                            []
   #   users:                            [ all ]
-  #   permissions:                      [ private ]
+  #   permissions:                      [ protected ]
   #   data_fields:                      []
   #   conditions:
-  #     private:
+  #     protected:
   #       enabled:                      true
   #       users:
   #         whitelist:                  [ all ]
   #         blacklist:                  []
   #
   # github:
-  #   home_url:                         https://github.com
-  #   product_url:                      http://localhost:5000
+  #   provider_url:                     https://github.com
   #   strategy:                         member
   #   scope:                            []
   #   users:                            [ all ]
-  #   permissions:                      [ private ]
+  #   permissions:                      [ protected ]
   #   data_fields:                      []
   #   conditions:
-  #     private:
+  #     protected:
   #       enabled:                      true
   #       users:
   #         whitelist:                  [ all ]
   #         blacklist:                  []
   #
   # patreon:
-  #   home_url:                         https://patreon.com
-  #   product_url:                      http://localhost:5000
+  #   provider_url:                     https://patreon.com
   #   strategy:                         member
   #   scope:                            [ users, pledges-to-me ]
   #   users:                            [ all ]
-  #   permissions:                      [ private, premium ]
+  #   permissions:                      [ protected, private ]
   #   data_fields:                      [
   #                                       email, name, first_name, nickname,
   #                                       amount_cents, created_at, declined_since
   #                                     ]
   #   conditions:
-  #     private:
+  #     protected:
   #       enabled:                      true
   #       users:
   #         blacklist:                  []
-  #     premium:
+  #     private:
   #       enabled:                      true
   #       users:
   #         whitelist:                  [ juergen_adams ]
@@ -638,15 +640,14 @@ j1_auth:
   #               state:                paid
   #
   # twitter:
-  #   home_url:                         https://twitter.com
-  #   product_url:                      http://localhost:5000
+  #   provider_url:                     https://twitter.com
   #   strategy:                         member
   #   scope:                            []
   #   users:                            [ all ]
-  #   permissions:                      [ private, premium ]
+  #   permissions:                      [ protected ]
   #   data_fields:                      []
   #   conditions:
-  #     private:
+  #     protected:
   #       enabled:                      true
   #       users:
   #         blacklist:                  []
@@ -756,7 +757,8 @@ defaults:
       author:                           J1 Team
       toc:                              true
       resources:                        toccer
-      adsense:                          false
+      analytics:                        false
+      advertising:                      false
       comments:                         false
       scrollbar:                        false
       indexed:                          true
@@ -794,7 +796,8 @@ defaults:
       author:                           J1 Team
       toc:                              true
       resources:                        toccer
-      adsense:                          true
+      analytics:                        false
+      advertising:                      false
       comments:                         true
       robots:
@@ -828,7 +831,8 @@ defaults:
       author:                           J1 Team
       toc:                              true
       resources:                        toccer
-      adsense:                          true
+      analytics:                        false
+      advertising:                      false
       comments:                         true
       robots:
@@ -859,7 +863,8 @@ defaults:
       author:                           J1 Team
       toc:                              true
       resources:                        toccer
-      adsense:                          true
+      analytics:                        false
+      advertising:                      false
       comments:                         true
       robots:
@@ -891,7 +896,8 @@ defaults:
       resources:                        toccer
       toc:                              true
       resources:                        toccer
-      adsense:                          true
+      analytics:                        false
+      advertising:                      false
       comments:                         false
       robots:
@@ -921,7 +927,8 @@ defaults:
     values:
       layout:                           page
-      adsense:                          true
+      analytics:                        false
+      advertising:                      false
       scrollbar:                        false
       robots:
@@ -937,7 +944,8 @@ defaults:
     values:
       layout:                           page
-      adsense:                          true
+      analytics:                        false
+      advertising:                      false
       scrollbar:                        false
       robots:
@@ -953,7 +961,8 @@ defaults:
     values:
       layout:                           page
-      adsense:                          true
+      analytics:                        false
+      advertising:                      false
       scrollbar:                        false
   # --------------------------------------------------------
@@ -965,7 +974,8 @@ defaults:
     values:
       layout:                           page
-      adsense:                          true
+      analytics:                        false
+      advertising:                      false
       scrollbar:                        false
       robots: