Merge branch 'rama_carmen' of https://gitea.gairacalabs.site/arhuako/tayronafoods-web into rama_carmen

src/assets/images/shoppingcart.svg

@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path  d="M6.01855 20C5.46855 20 4.99755 19.804 4.60555 19.412C4.21355 19.02 4.01789 18.5493 4.01855 18C4.01855 17.45 4.21455 16.979 4.60655 16.587C4.99855 16.195 5.46922 15.9993 6.01855 16C6.56855 16 7.03955 16.196 7.43155 16.588C7.82355 16.98 8.01922 17.4507 8.01855 18C8.01855 18.55 7.82255 19.021 7.43055 19.413C7.03855 19.805 6.56789 20.0007 6.01855 20ZM16.0186 20C15.4686 20 14.9976 19.804 14.6056 19.412C14.2136 19.02 14.0179 18.5493 14.0186 18C14.0186 17.45 14.2146 16.979 14.6066 16.587C14.9986 16.195 15.4692 15.9993 16.0186 16C16.5686 16 17.0396 16.196 17.4316 16.588C17.8236 16.98 18.0192 17.4507 18.0186 18C18.0186 18.55 17.8226 19.021 17.4306 19.413C17.0386 19.805 16.5679 20.0007 16.0186 20ZM5.16855 4L7.56855 9H14.5686L17.3186 4H5.16855ZM4.21855 2H18.9686C19.3519 2 19.6436 2.171 19.8436 2.513C20.0436 2.855 20.0519 3.20067 19.8686 3.55L16.3186 9.95C16.1352 10.2833 15.8892 10.5417 15.5806 10.725C15.2719 10.9083 14.9346 11 14.5686 11H7.11856L6.01855 13H18.0186V15H6.01855C5.26855 15 4.70189 14.6707 4.31855 14.012C3.93522 13.3533 3.91855 12.6993 4.26855 12.05L5.61855 9.6L2.01855 2H0.0185547V0H3.26855L4.21855 2Z" fill="white"/>
+</svg>

src/components/Certifications.vue

@@ -24,11 +24,12 @@ h2 {
   color: #fff;
   text-align: center;  
   padding-bottom: 26px !important;
+  font-size: 28px !important;
 }
 
 .image {
-  height: 270px;
+  height: 200px;
-  widows: 270px;;
+  widows: 200px;;
 }
 
 .certifications {

src/components/DifferentBox.vue

@@ -17,29 +17,29 @@ export default {
 
 <style lang="scss" scoped>
 .different-box {
-  width: 280px;
+  width: 200px;
-  height: 276px;
+  height: 210px;
   background: #E2CAAA;
   text-align: center;
-  padding: 36px 24px 0;
+  padding: 36px 16px;
 }
 .image {
-  width: 70px;
+  width: 50px;
-  height: 70px;
+  height: 50px;
 }
 .title {
   margin-top: 16px;
   color: #603809;
   font-weight: 700;
-  font-size: 20px;
+  font-size: 16px;
-  height: 48px;
+  text-transform: uppercase;
 }
 
 .description {
   margin-top: 12px;
-  font-style: 400;
+  font-style: italic;
-  font-weight: 400;
+  font-weight: 200;
-  font-size: 16px;
+  font-size: 15px;
   line-height: 24px;
   color: #1E1E1E;
   text-align: center;

src/components/Footer.vue

@@ -91,7 +91,6 @@
 
   .contact-info {
     text-align: center;;
-    display: flex;
     flex-direction: column;
     font-size: 20px;
     font-weight: 500;

src/components/ProductBox.vue

@@ -8,6 +8,9 @@
         <h2>{{ $t(product.name) }}</h2>
         <h3>{{ $t(product.farm) }} &bull; {{ $t(product.strain) }}</h3>
       </div>
+      <div class="shopping-cart">
+        <a :href="product.url" target="_blank"><img src="@images/shoppingcart.svg"></a>
+      </div>
     </div>
     <div class="product-box-image">
       <img :src="$helper.getImage(product.images[0])" alt="" />
@@ -31,6 +34,12 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+
+.shopping-cart {
+  img {
+    opacity: 0.5;
+  }
+}
 .product-box {
   width: 330px;
   height: 450px;
@@ -50,7 +59,7 @@ export default {
     align-self: stretch;
     width: 100%;
     display: grid;
-    grid-template-columns: 40px auto;
+    grid-template-columns: 40px auto 30px;
 
     .kind-image {
       align-self: start;
@@ -62,13 +71,13 @@ export default {
     h2 {
       padding: 0px;
       font-weight: 500;
-      font-size: 24px;
+      font-size: 20px;
       text-align: left;
       line-height: 32px;
     }
 
     h3 {
-      font-size: 14px;
+      font-size: 12px;
       font-weight: 400;
       text-align: left;
     }

src/components/ProductTable.vue

@@ -108,6 +108,7 @@ export default {
   width: 100%;
 
   &-data {
+    min-height: 127px;
     display: grid;
     grid-template-columns: 20% 80%;
     border-style: solid;
@@ -182,13 +183,6 @@ export default {
       flex-basis: 0px;
       flex-grow: 1;
 
-      .text-overflow {
-        // width: 98%;
-        // text-overflow: ellipsis;
-        // overflow: hidden;
-        // white-space: nowrap;
-      }
-
       &:last-child {
         border-right: none;
       }

src/data.js

@@ -36,7 +36,8 @@ export const products = [
     harvest: 'products.brasil_de_andrade.harvest',
     profile: 'products.brasil_de_andrade.profile',
     taste: 'products.brasil_de_andrade.taste',
-    texture: 'products.brasil_de_andrade.texture'
+    texture: 'products.brasil_de_andrade.texture',
+    url: 'https://tayronafoods.myshopify.com/products/brasil-de-andrade',
   },
   {
     kind: kinds.water,
@@ -52,7 +53,8 @@ export const products = [
     harvest: 'products.colombia_el_paseito.harvest',
     profile: 'products.colombia_el_paseito.profile',
     taste: 'products.colombia_el_paseito.taste',
-    texture: 'products.colombia_el_paseito.texture'
+    texture: 'products.colombia_el_paseito.texture',
+    url: 'https://tayronafoods.myshopify.com/products/colombia-el-pastelito',
   },
   {
     kind: kinds.air,
@@ -68,7 +70,8 @@ export const products = [
     harvest: 'products.peru_grad_1.harvest',
     profile: 'products.peru_grad_1.profile',
     taste: 'products.peru_grad_1.taste',
-    texture: 'products.peru_grad_1.texture'
+    texture: 'products.peru_grad_1.texture',
+    url: 'https://tayronafoods.myshopify.com/products/peru-grad-1',
   },
   {
     kind: kinds.fire,
@@ -85,6 +88,24 @@ export const products = [
     profile: 'products.uganda_gnoma.profile',
     taste: 'products.uganda_gnoma.taste',
     texture: 'products.uganda_gnoma.texture',
+    url: 'https://tayronafoods.myshopify.com/products/uganda-ngoma',
+  },
+  {
+    kind: kinds.earth,
+    name: 'products.uganda_gnoma.name',
+    images: ['product-uganda-single11.png', 'product-uganda-double1.png',],
+    slogan: 'products.uganda_gnoma.slogan',
+    description: 'products.uganda_gnoma.description',
+    farm: 'products.uganda_gnoma.farm',
+    strain: 'products.uganda_gnoma.strain',
+    country: 'products.uganda_gnoma.country',
+    height: 'products.uganda_gnoma.height',
+    revision: 'products.uganda_gnoma.revision',
+    harvest: 'products.uganda_gnoma.harvest',
+    profile: 'products.uganda_gnoma.profile',
+    taste: 'products.uganda_gnoma.taste',
+    texture: 'products.uganda_gnoma.texture',
+    url: 'https://tayronafoods.myshopify.com/products/uganda-ngoma',
   },
 ];
 

src/views/products/Products.vue

@@ -38,7 +38,7 @@
 
     <h6 class="text-centered">{{ $t('products_page.download')}}</h6>
     <div class="buttons text-centered">
-      <button class="mt-5" @click.prevent.stop="download">{{ $t('common.download') }}</button>
+      <button class="mt-2" @click.prevent.stop="download">{{ $t('common.download') }}</button>
     </div>
   </section>
 </template>
@@ -46,8 +46,9 @@
 <style lang="scss" scoped>
 .product-section.content {
   h6 {
+      margin-top: 64px;
       font-weight: 200;
-      font-size: 52px;
+      font-size: 36px;
       text-align: left;
       line-height: 60px;
   }

src/views/social/Social.vue

@@ -5,9 +5,9 @@
     <p>{{ $t('social.paragraph1') }}</p>
     <p>{{ $t('social.paragraph2') }}</p>
   </section>
-  <section class="social-bottom">
+  <section class="social-bottom content">
     <img src="@images/proyect-soc-new.jpg">
-    <p>{{ $t('social.paragraph3') }}<br><br>{{ $t('social.paragraph4') }}</p>
+    <p>Creemos en el poder {{ $t('social.paragraph3') }}<br><br>{{ $t('social.paragraph4') }}</p>
   </section>
 </template>
 
@@ -18,25 +18,18 @@ import { slides } from '../../data';
 
 <style lang="scss" scoped>
   .social-bottom {
-    padding: 0px 72px;
+    padding: 0 72px 72px;
     background-position: top left;
-    // display: grid;
+    overflow: hidden;
-    // grid-template-columns: 1fr 1fr;
+   
-    .left {
-      padding: 0 32px 0 0
-    }
 
     img {
-      float: right;
+      float: left;
-      width: 50%;
+      width: 300px;
       padding: 16px
     }
     p {
-      font-weight: 500;
+      padding-top: 70px;
-      color: #603809;
-      font-size: 24px;
-      line-height: 40px;
-
     }
   }