lemonstand · jennbrewer · Aug 10, 2018 · Sep 7, 2018
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,5 @@ desktop.ini
 Thumbs.db
 .sass-cache
 *.cfg
-node_modules
+node_modules
+package.json
diff --git a/.sass-cache/.DS_Store b/.sass-cache/.DS_Store
diff --git a/content/review-response-8.htm b/content/review-response-8.htm
@@ -0,0 +1,7 @@
+---
+name: 'Review Response 8'
+content_type: html
+---
+<p><span style="color: #ff6600;"><strong>Store Response:&nbsp;</strong></span></p>
+<p style="padding-left: 30px;">Hi there,&nbsp;</p>
+<p style="padding-left: 30px;">Sorry to hear you had a bad experience with the Ionic Band.&nbsp;We're sending you a replacement&nbsp;:)</p>
diff --git a/package.json b/package.json
@@ -1,4 +1,10 @@
 {
+<<<<<<< HEAD
+  "name": "lscloud-theme-ventro",
+  "version": "1.0.0",
+  "description": "A theme for LemonStand 2",
+  "main": "theme.yaml",
+=======
   "name": "Ventro",
   "version": "1.0.0",
   "description": "Ventro is a modern responsive theme with clean lines, and minimal color. It is full-width, allowing you to use large hero images to express your value proposition and highlight your latest product. The homepage also has space for three featured categories, with a focus on imagery for visual appeal. The product pages continue with the modern layout with product images on the left, a description on the right, and then a section below for further details or product specifications.",
@@ -15,14 +21,19 @@
       "full": "https://raw.githubusercontent.com/lemonstand/lscloud-theme-ventro/master/resources/screenshots/full-size.png"
     }
   },
+>>>>>>> 323673364813ac849fc3de1bbd80e44aefee256e
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/lemonstand/lscloud-theme-ventro.git"
   },
+<<<<<<< HEAD
+  "author": "Daniel Park",
+=======
   "author": "LemonStand <[email protected]> (http://docs.lemonstand.com)",
+>>>>>>> 323673364813ac849fc3de1bbd80e44aefee256e
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/lemonstand/lscloud-theme-ventro/issues"
@@ -34,11 +45,15 @@
     "gulp-notify": "^2.2.0",
     "gulp-rename": "^1.2.2",
     "gulp-uglify": "^1.2.0"
+<<<<<<< HEAD
+  }
+=======
   },
   "keywords": [
     "1-page-checkout",
     "hero-image",
     "responsive",
     "electronics"
   ]
+>>>>>>> 323673364813ac849fc3de1bbd80e44aefee256e
 }
diff --git a/pages/.DS_Store b/pages/.DS_Store
diff --git a/pages/blog-categories/code-breadcrumbs.htm b/pages/blog-categories/code-breadcrumbs.htm
@@ -0,0 +1,5 @@
+<ul class="breadcrumb list-inline">
+  <li><a href="/">Home</a></li>
+  <li><a href="/archives/blog">Blog</a></li>
+  <li>{{ category }}</li>
+</ul>
diff --git a/pages/blog-categories/code-setup.htm b/pages/blog-categories/code-setup.htm
@@ -0,0 +1 @@
+{% global active_page = 'blog' %}
diff --git a/pages/blog-categories/page-blog-categories.htm b/pages/blog-categories/page-blog-categories.htm
@@ -0,0 +1,53 @@
+---
+action: 'cmscontent:archive'
+description: 'Blog Categories'
+template: default
+protocol: all
+published: true
+name: 'Blog Categories'
+url: '/archives/:type/:category'
+---
+<section class="section-products-grid" id="products-grid-sidebar">
+    <div class="container">
+      <div class="row">
+        <div class="col-xs-12 col-md-3">
+          <div class="sidebar">
+            <div class="accordion-widget category-accordions">
+              <h2>Categories</h2>
+              {{ partial('blog-categories') }}
+            </div>
+          </div>
+        </div>
+        <div class="col-xs-12 col-md-9">
+          <div class="row">
+            <div class="col-xs-12 col-md-6">
+              <h1>{{ category }}</h1>
+            </div>
+          </div>
+
+          {% if archives | length > 0 %}
+            {% paginate archives by 5 %}
+            {% for post in pagination.items %}
+              <div>
+                <h2><a href="/blog/{{ post.guid }}">{{ post.title }}</a></h2>
+                <div>{{ post.excerpt | unescape }}</div>
+                <div><a href="/blog/{{ post.guid }}">Read More</a></div>
+              </div>
+              <hr/>
+            {% endfor %}
+            <div class="paging-holder">
+              {% navigation %}
+            </div>
+          {% endpaginate %}
+          {% else %}
+            <article>
+              <header>
+                  <h4>Not found</h4>
+                  <p>No {{ type }} posts found in category: {{ category }} {{ categoryID }}</p>
+              </header>
+            </article>
+          {% endif %}
+        </div>
+      </div>
+    </div>
+</section>
diff --git a/pages/blog-post/code-breadcrumbs.htm b/pages/blog-post/code-breadcrumbs.htm
@@ -0,0 +1,5 @@
+<ul class="breadcrumb list-inline">
+  <li><a href="/">Home</a></li>
+  <li><a href="/archives/blog">Blog</a></li>
+  <li>{{ slug }}</li>
+</ul>
diff --git a/pages/blog-post/page-blog-post.htm b/pages/blog-post/page-blog-post.htm
@@ -4,6 +4,57 @@
 protocol: all
 published: true
 name: 'Blog Post'
+<<<<<<< HEAD
+url: '/blog/:slug'
+---
+{% if featured_image %}
+  <section class="section-home-banner">
+      <div class="container">
+        <img class="lazy" src="{{ featured_image.thumbnail(1000, 'auto')|default('http://placehold.it/1000x365') }}" width="1000" alt="{{ featured_image.alt }}"/>
+      </div>
+  </section>
+{% endif %}
+
+<section class="section-blog-post-page">
+    <div class="container">
+    <div class="row">
+      <div class="single-blog-post-holder">
+        <div class="col-xs-12 col-sm-12 blog-holder">
+          <!-- BLOG -->
+          <div class="row">
+            <div class="col-xs-12 col-sm-6">
+              <h1>{{ post.title }}</h1>
+            </div>
+            <div class="col-xs-12 published-date">
+              <p><em>Published {{ post.published_on | date("F j, Y") }} In {{ post.type }}</em></p>
+            </div>
+          </div>
+          <div id="blog-content">
+            {{ post.body | unescape }}
+          </div>
+          <!-- BIO -->
+            <div class="bio-container">
+              {% if profile_image %}
+                  <img class="img-circle" src="{{ profile_image.thumbnail(252, 'auto')|default('http://placehold.it/100x100') }}" style="height: 100px; width: 100px;" alt="{{ profile_image.alt }}"/>
+              {% endif %}
+              <strong>{{ post.author_name }}</strong>
+              <ul class="social-links">
+                  {% for link in post.user.getSocialProfiles() %}
+                    <li class="{{ link.name }}">
+                      <a href="{{ link.link }}"><i class="icon icon-{{ link.name }}"></i><span>{{ link.name }}</span></a>
+                    </li>
+                  {% endfor %}
+              </ul>
+                <div class="author-bio">
+                {{ post.user.user_bio|unescape }}
+                </div>
+            </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</section>
+=======
 url: /blog/:slug
 ---
 <div class="row blog-posts">
@@ -24,4 +75,5 @@
 	        {{ post.user.user_bio|unescape }}
 		</div>
 	</div>
-</div>
+</div>
+>>>>>>> 323673364813ac849fc3de1bbd80e44aefee256e
diff --git a/pages/blog/page-blog.htm b/pages/blog/page-blog.htm
@@ -1,30 +1,46 @@
 ---
 action: 'cmscontent:archive'
+description: 'blog template'
 template: default
 protocol: all
 published: true
 name: Blog
-url: /blog
+url: '/archives/:type'
 ---
-<div class="row">
-    <div class="content twelve columns">
-        {% set publishedPosts = 0 %}
-        {% for post in archives %}
-            {% if post.status == "published" %}
+<section class="section-products-grid" id="products-grid-sidebar">
+  <div class="container">
+    <div class="row">
+      {% if archives | length > 0 or publishedPosts > 0 %}
+        {% paginate archives by 5 %}
+          {% set publishedPosts = 0 %}
+          <div class="col-xs-12 col-md-3">
+            <div class="sidebar">
+              <div class="accordion-widget category-accordions">
+                <h2>Categories</h2>
+                {{ partial('blog-categories') }}
+              </div>
+            </div>
+          </div>
+          <div class="col-xs-12 col-md-9">
+            {% for post in archives %}
+              {% if post.status == "published" %}
                 {% set publishedPosts = publishedPosts + 1 %}
-            {% endif %}
-            <div class="blog-posts">
-                <h2><a href="blog/{{ post.guid }}">{{ post.title }}</a></h2>
+              {% endif %}
+              <div>
+                <h2><a href="/blog/{{ post.guid }}">{{ post.title }}</a></h2>
                 <div>{{ post.excerpt | unescape }}</div>
-                <div><a href="blog/{{ post.guid }}">Read More</a></div>
-            </div>
-            <hr/>
-        {% endfor %}
-
-        {% if archives | length == 0 or publishedPosts == 0 %}
-            <div class="blog-posts">
-                <h2>No posts found</h2>
-            </div>
-        {% endif %}
+                <div><a href="/blog/{{ post.guid }}">Read More</a></div>
+              </div>
+              <hr/>
+            {% endfor %}
+            <div class="paging-holder">
+                        {% navigation %}
+                    </div>
+          </div>
+        {% endpaginate %}
+      {% else %}
+        <h2>No posts found</h2>
+      {% endif %}
     </div>
-</div>
+  </div>
+</section>
diff --git a/pages/contact/page-contact.htm b/pages/contact/page-contact.htm
@@ -5,7 +5,6 @@
 name: Contact
 url: /contact
 ---
-
 <div class="container-fluid about-head">
 	<div class="container">
 		<div class="row">
@@ -34,6 +33,7 @@ <h3>Need to send a message?</h3>
 					<input type="hidden" name="redirect" value="{{ site_url('/') }}"/>
 					<input type="submit" class="btn-default btn" value="Submit"/>
 					<input type="text" name="hp" value="" style="display: none"/>
+
 				</div>
 			{{ close_form() }}
 		</div>
@@ -45,4 +45,3 @@ <h3>Contact Us here</h3>
 		</div>
 	</div>
 </div>
-
diff --git a/pages/product/code-breadcrumbs.htm b/pages/product/code-breadcrumbs.htm
@@ -1,17 +1,17 @@
-{% set category = product ? product.categories[0] : null %}
-
-<div class="container-fluid product-breadcrumb text-center">
-	<h4>
-		<a href="/">Home</a>
-		<span>/</span>
-		{% if category %}
-	    {% for parent in category.listAllParents() %}
-	      <a href="/category/{{ parent.fullUrlName }}">{{ parent.name }}</a>
-	      <span>/</span>
-	    {% endfor %}
-	    <a href="/category/{{ category.fullUrlName }}">{{ category.name }}</a>
-	    <span>/</span>
-	  {% endif %}
-	  <a href="/product/{{ product.url_name }}">{{ product.name }}</a>
-	</h4>
+{% set category = product ? product.categories[0] : null %}
+
+<div class="container-fluid product-breadcrumb text-center">
+	<h4>
+		<a href="/">Home</a>
+		<span>/</span>
+		{% if category %}
+	    {% for parent in category.listAllParents() %}
+	      <a href="/category/{{ parent.fullUrlName }}">{{ parent.name }}</a>
+	      <span>/</span>
+	    {% endfor %}
+	    <a href="/category/{{ category.fullUrlName }}">{{ category.name }}</a>
+	    <span>/</span>
+	  {% endif %}
+	  <a href="/product/{{ product.url_name }}">{{ product.name }}</a>
+	</h4>
 </div>
diff --git a/pages/product/page-product.htm b/pages/product/page-product.htm
@@ -6,7 +6,6 @@
 name: Product
 url: '/product/:urlName'
 ---
-
 {{ open_form({'class': 'custom', 'onsubmit': 'return false'}) }}
 	{% if product %}
 	<div class="container-fluid" id="product-page">
@@ -16,9 +15,6 @@
 		<h2>We are sorry, the requested product was not found.</h2>
 	{% endif %}
 {{ close_form() }}
+
 {{ partial('shop-product-review-form') }}
 {{ partial('shop-product-review') }}
-
-
-
-