merge and resolve conflicts

godofredoninja · Mar 17, 2021 · bd4e94e · bd4e94e
2 parents 82d30be + f99297e
commit bd4e94e
Show file tree

Hide file tree

Showing 25 changed files with 38 additions and 40 deletions.
diff --git a/amp.hbs b/amp.hbs
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html amp lang="{{@site.lang}}">
+<html amp lang="{{@site.locale}}">
 <head>
     <meta charset="utf-8">
     <title>{{meta_title}}</title>

diff --git a/assets/scripts/kusi-doc-post.js b/assets/scripts/kusi-doc-post.js
diff --git a/assets/scripts/main.js b/assets/scripts/main.js
diff --git a/assets/scripts/pagination.js b/assets/scripts/pagination.js
diff --git a/assets/scripts/prismjs.js b/assets/scripts/prismjs.js
diff --git a/assets/scripts/search.js b/assets/scripts/search.js
diff --git a/assets/styles/amp.css b/assets/styles/amp.css
diff --git a/assets/styles/main.css b/assets/styles/main.css
diff --git a/default.hbs b/default.hbs
@@ -7,7 +7,7 @@
         ✎ @GodoFredoNinja
         ✈ Lima - Perú
 -->
-<html lang="{{@site.lang}}" class="light">
+<html lang="{{@site.locale}}" class="light">
 <head>
     {{!-- Document Settings --}}
     <meta charset="utf-8" />
@@ -80,7 +80,7 @@
     {{ghost_foot}}
 
     {{!-- Notifications ./partials/notifications.hbs --}}
-    {{#if @labs.members}}{{> "notifications"}}{{/if}}
+    {{> "notifications"}}
 
     {{!-- script --}}
     {{{block "scripts"}}}

diff --git a/error-404.hbs b/error-404.hbs
@@ -15,7 +15,7 @@
     <div class="container mx-auto">
         <div class="max-w-1100 mx-auto pb-8">
             <div class="row">
-                {{#foreach recents visibility="all"}}
+                {{#foreach recents}}
                 <div class="col s12 m6 l4">
                     {{> "story/story-card-small"}}
                 </div>

diff --git a/godo-podcast.hbs b/godo-podcast.hbs
@@ -21,6 +21,6 @@
 
 <div class="feed-entry-content py-12 bg-gray-100 px-4">
     <div class="mx-auto max-w-4xl feed-entry-wrap">
-        {{#foreach posts visibility="all"}} {{>"story/story-podcast"}} {{/foreach}}
+        {{#foreach posts}} {{>"story/story-podcast"}} {{/foreach}}
     </div>
 </div>
diff --git a/godo-template-featured.hbs b/godo-template-featured.hbs
@@ -6,13 +6,13 @@
 
 {{!-- Featured Story --}}
 {{#get "posts" limit="1" filter="featured:true" as |godo_featured_post| }}
-    {{#if godo_featured_post}} {{#foreach godo_featured_post visibility="all"}}{{> "story/story-featured"}} {{/foreach}}{{/if}}
+    {{#if godo_featured_post}} {{#foreach godo_featured_post}}{{> "story/story-featured"}} {{/foreach}}{{/if}}
 {{/get}}
 
 <div class="site-post feed-entry-content container mx-auto pt-10">
     <div class="feed-entry-wrap max-w-1100 mx-auto">
         <div class="row">
-            {{#foreach posts visibility="all"}}
+            {{#foreach posts}}
                 {{#has number="1"}}
                     <div class="col s12 m6 l12 ss1">{{> "story/story-grid"}}</div>
                 {{else has number="5, 6, 17, 18"}}

diff --git a/godo-template-grid.hbs b/godo-template-grid.hbs
@@ -2,7 +2,7 @@
 
 {{!-- Featured Story --}}
 {{#get "posts" limit="1" filter="featured:true" as |godo_featured_post| }}
-    {{#if godo_featured_post}} {{#foreach godo_featured_post visibility="all"}}{{> "story/story-featured"}} {{/foreach}}{{/if}}
+    {{#if godo_featured_post}} {{#foreach godo_featured_post}}{{> "story/story-featured"}} {{/foreach}}{{/if}}
 {{/get}}
 
 {{> "loop"}}
diff --git a/godo-template-medium.hbs b/godo-template-medium.hbs
@@ -9,7 +9,7 @@
 <div class="site-post feed-entry-content container mx-auto pt-12">
     <div class="feed-entry-wrap max-w-1100 mx-auto">
         <div class="row">
-            {{#foreach posts visibility="all"}}
+            {{#foreach posts}}
                 {{#has number="7, 8"}}
                     <div class="col s12 m6 ss2">{{> "story/story-grid"}}</div>
                 {{else}}
@@ -26,22 +26,22 @@
     <div class="homeHero-container container mx-auto flex flex-col items-stretch md:flex-row md:flex-wrap lg: lg:flex-nowrap">
 
         {{!-- Fisrt Large Post - partials/home/home-first-post.hbs --}}
-        {{#foreach posts limit="1" visibility="all"}} {{> "home/home-first-post"}} {{/foreach}}
+        {{#foreach posts limit="1"}} {{> "home/home-first-post"}} {{/foreach}}
 
         {{!-- Post small - partials/home/home-small-post.hbs --}}
         <div class="homeHero-smallCardWrap flex flex-col md:w-3/6 lg:w-full">
-            {{#foreach posts from="2" to="4" visibility="all"}} {{> "home/home-small-post"}} {{/foreach}}
+            {{#foreach posts from="2" to="4"}} {{> "home/home-small-post"}} {{/foreach}}
         </div>
 
         {{!-- Post medium - partials/home/home-medium-post.hbs --}}
-        {{#foreach posts from="5" to="5" visibility="all"}} {{> "home/home-medium-post"}} {{/foreach}}
+        {{#foreach posts from="5" to="5"}} {{> "home/home-medium-post"}} {{/foreach}}
     </div>
 </section>
 
 <div class="site-post feed-entry-content container mx-auto pt-12">
     <div class="feed-entry-wrap max-w-1100 mx-auto">
         <div class="row">
-            {{#foreach posts from="6" to="14" visibility="all"}}
+            {{#foreach posts from="6" to="14"}}
                 {{#has number="12, 13"}}
                     <div class="col s12 m6 ss2">{{> "story/story-grid" }}</div>
                 {{else has number="14"}}

diff --git a/godo-template-sidebar.hbs b/godo-template-sidebar.hbs
@@ -6,7 +6,7 @@
             <div class="col s12 l7">
                 <div class="feed-entry-content">
                     <div class="feed-entry-wrap slist">
-                        {{#foreach posts visibility="all"}}
+                        {{#foreach posts}}
                             {{!-- Story - partials/story/story-grid.hbs --}}
                             {{>"story/story-post"}}
                         {{/foreach}}

diff --git a/index.hbs b/index.hbs
@@ -7,7 +7,7 @@
 <div class="site-post feed-entry-content container mx-auto pt-10">
     <div class="feed-entry-wrap max-w-1100 mx-auto">
         <div class="row">
-            {{#foreach posts visibility="all"}}
+            {{#foreach posts}}
                 {{#has number="1"}}
                     <div class="col s12 m6 l12 ss1">{{> "story/story-grid"}}</div>
                 {{else has number="5, 6, 17, 18"}}

diff --git a/members/account.hbs b/members/account.hbs
@@ -45,7 +45,7 @@
 
                     <div class=" col s12 m6 pb-5 subscriber-detail">
                         <label class="uppercase text-sm font-semibold block pb-1">Your plan</label>
-                        <span class="subscriber-detail-content text-gray-700 text-sm">{{plan.currency_symbol}}{{price plan.amount}}/{{plan.interval}}</span>
+                        <span class="subscriber-detail-content text-gray-700 text-sm">{{price plan}} / {{plan.interval}}</span>
                     </div>
 
                     <div class="col s12 m6 pb-5 subscriber-detail">

diff --git a/members/membership.hbs b/members/membership.hbs
@@ -46,7 +46,7 @@
                 <h3 class="text-base font-semibold uppercase mb-2 text-gray-800 tracking-wide">Yearly</h3>
                 <p class="text-gray-500">1 simple payment instead of 12, save on bank fees </p>
                 <div class="text-44 font-bold my-8 leading-none text-primary">
-                    <span>{{@price.currency_symbol}}{{@price.yearly}}</span>
+                    <span>{{price currency=@price.currency}} {{@price.yearly}}</span>
                     <span class="text-lg font-medium">/ year</span>
                 </div>
 
@@ -85,7 +85,7 @@
                 <h3 class="text-base font-semibold uppercase mb-2 text-gray-800 tracking-wide">Monthly</h3>
                 <p class="text-gray-500">Get access to everything and lock in early adopter pricing for life</p>
                 <div class="text-44 font-bold my-8 leading-none">
-                    <span>{{@price.currency_symbol}}{{@price.monthly}}</span>
+                    <span>{{price currency=@price.currency}} {{@price.monthly}}</span>
                     <span class="text-lg text-gray-500 font-medium">/ month</span>
                 </div>