From d1b38f50522388a5345f434b80405fb2d44da9cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Conde?= Date: Tue, 22 Aug 2023 17:03:45 +0200 Subject: [PATCH] latest changes --- src/App.vue | 51 ++-- src/assets/images/bg_1.jpg | Bin 0 -> 261335 bytes src/assets/images/bg_1.png | Bin 1122796 -> 0 bytes src/assets/images/coffee1.jpg | Bin 940269 -> 248762 bytes src/assets/images/footer_coffee.png | Bin 907948 -> 880357 bytes src/assets/images/grains.png | Bin 771784 -> 0 bytes src/assets/images/kid-coffee.jpg | Bin 0 -> 185931 bytes src/assets/images/kid-coffee.png | Bin 721753 -> 0 bytes src/assets/images/kids.jpg | Bin 0 -> 165546 bytes src/assets/images/kids.png | Bin 1195524 -> 0 bytes src/assets/images/mountains.jpg | Bin 0 -> 238917 bytes src/assets/images/mountains.png | Bin 1153905 -> 0 bytes src/assets/images/products.jpg | Bin 0 -> 125862 bytes src/assets/images/products.png | Bin 542254 -> 0 bytes src/assets/images/proysoc.01.jpg | Bin 0 -> 828955 bytes src/assets/images/proysoc.01.png | Bin 3275433 -> 0 bytes src/assets/images/tayrona-foods-01.png | Bin 0 -> 40184 bytes src/assets/images/tayrona-foods-white-bg.png | Bin 0 -> 55815 bytes src/assets/images/tayrona-foods-yellow.png | Bin 0 -> 36563 bytes src/components/BigCarousel.vue | 40 +++ src/components/Menu.vue | 133 ++++------ src/components/ProductBox.vue | 42 ++- src/components/ProductCarousel.vue | 3 +- src/components/ProductFlipCard.vue | 11 +- src/components/ProductTable.vue | 256 +++++++++++++++++++ src/data.js | 86 +++++-- src/router/router.js | 6 + src/views/about/About.vue | 6 +- src/views/agb/Agb.vue | 3 - src/views/contact/Contact.vue | 4 - src/views/home/Home.vue | 79 +++--- src/views/impressum/Impressum.vue | 4 - src/views/products/Products.vue | 26 +- src/views/social/Social.vue | 15 +- src/views/store/StoreView.vue | 16 ++ 35 files changed, 549 insertions(+), 232 deletions(-) create mode 100644 src/assets/images/bg_1.jpg delete mode 100644 src/assets/images/bg_1.png delete mode 100644 src/assets/images/grains.png create mode 100644 src/assets/images/kid-coffee.jpg delete mode 100644 src/assets/images/kid-coffee.png create mode 100644 src/assets/images/kids.jpg delete mode 100644 src/assets/images/kids.png create mode 100644 src/assets/images/mountains.jpg delete mode 100644 src/assets/images/mountains.png create mode 100644 src/assets/images/products.jpg delete mode 100644 src/assets/images/products.png create mode 100644 src/assets/images/proysoc.01.jpg delete mode 100644 src/assets/images/proysoc.01.png create mode 100644 src/assets/images/tayrona-foods-01.png create mode 100644 src/assets/images/tayrona-foods-white-bg.png create mode 100644 src/assets/images/tayrona-foods-yellow.png create mode 100644 src/components/BigCarousel.vue create mode 100644 src/components/ProductTable.vue create mode 100644 src/views/store/StoreView.vue diff --git a/src/App.vue b/src/App.vue index 1f627fe..b2de361 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,30 +1,42 @@ + + \ No newline at end of file diff --git a/src/components/Menu.vue b/src/components/Menu.vue index 8385204..85ba906 100644 --- a/src/components/Menu.vue +++ b/src/components/Menu.vue @@ -2,66 +2,68 @@ import LocaleSelector from './LocaleSelector.vue'; export default { - props: { - type: String, - title: String, - }, - components: { LocaleSelector }, + components: { LocaleSelector }, } \ No newline at end of file diff --git a/src/components/ProductBox.vue b/src/components/ProductBox.vue index 1c40b93..f441147 100644 --- a/src/components/ProductBox.vue +++ b/src/components/ProductBox.vue @@ -1,8 +1,8 @@ \ No newline at end of file diff --git a/src/components/ProductCarousel.vue b/src/components/ProductCarousel.vue index 23ede38..65741a9 100644 --- a/src/components/ProductCarousel.vue +++ b/src/components/ProductCarousel.vue @@ -1,6 +1,6 @@ diff --git a/src/components/ProductFlipCard.vue b/src/components/ProductFlipCard.vue index 375422d..98690ed 100644 --- a/src/components/ProductFlipCard.vue +++ b/src/components/ProductFlipCard.vue @@ -12,9 +12,6 @@ export default { toggle() { this.flipped = !this.flipped; }, - translate(val) { - console.log('Vue.$t :>> ', Vue.$t); - } } } @@ -23,9 +20,9 @@ export default {
- +
-

{{ $t(product.kind_localized)}}

+

{{ $t(product.kind.localized)}}

{{ $t(product.slogan) }}

{{ $t(product.description) }}
@@ -39,8 +36,8 @@ export default {
- -

{{ $t(product.kind_localized) }}

+ +

{{ $t(product.kind.localized) }}

{{ $t(product.slogan) }}

diff --git a/src/components/ProductTable.vue b/src/components/ProductTable.vue new file mode 100644 index 0000000..101c6d2 --- /dev/null +++ b/src/components/ProductTable.vue @@ -0,0 +1,256 @@ + + + + + \ No newline at end of file diff --git a/src/data.js b/src/data.js index 904109f..f0b06a3 100644 --- a/src/data.js +++ b/src/data.js @@ -1,11 +1,31 @@ +export const kinds = { + earth: { + name: 'earth', + localized: 'common.earth', + image: 'logo_tierra.svg' + }, + water: { + name: 'water', + localized: 'common.water', + image: 'logo_agua.svg' + }, + air: { + name: 'air', + localized: 'common.air', + image: 'logo_aire2.svg' + }, + fire: { + name: 'fire', + localized: 'common.fire', + image: 'logo_fuego.svg' + }, +}; + export const products = [ { - kind: 'earth', - kind_localized: 'common.earth', + kind: kinds.earth, name: 'products.brasil_de_andrade.name', - image: 'logo_tierra.svg', - image_product_single: 'product-brasil-single11.png', - image_product_double: 'product-brasil-double1.png', + images: ['product-brasil-single11.png', 'product-brasil-double1.png',], slogan: 'products.brasil_de_andrade.slogan', description: 'products.brasil_de_andrade.description', farm: 'products.brasil_de_andrade.farm', @@ -17,14 +37,11 @@ export const products = [ profile: 'products.brasil_de_andrade.profile', taste: 'products.brasil_de_andrade.taste', texture: 'products.brasil_de_andrade.texture' - }, + }, { - kind: 'water', - kind_localized: 'common.water', + kind: kinds.water, name: 'products.colombia_el_paseito.name', - image: 'logo_agua.svg', - image_product_single: 'product-colombia-single11.png', - image_product_double: 'product-colombia-double1.png', + images: ['product-colombia-single11.png', 'product-colombia-double1.png',], slogan: 'products.colombia_el_paseito.slogan', description: 'products.colombia_el_paseito.description', farm: 'products.colombia_el_paseito.farm', @@ -38,12 +55,9 @@ export const products = [ texture: 'products.colombia_el_paseito.texture' }, { - kind: 'air', - kind_localized: 'common.air', + kind: kinds.air, name: 'products.peru_grad_1.name', - image: 'logo_aire2.svg', - image_product_single: 'product-peru-single11.png', - image_product_double: 'product-peru-double1.png', + images: ['product-peru-single11.png', 'product-peru-double1.png',], slogan: 'products.peru_grad_1.slogan', description: 'products.peru_grad_1.description', farm: 'products.peru_grad_1.farm', @@ -57,12 +71,9 @@ export const products = [ texture: 'products.peru_grad_1.texture' }, { - kind: 'fire', - kind_localized: 'common.fire', + kind: kinds.fire, name: 'products.uganda_gnoma.name', - image: 'logo_fuego.svg', - image_product_single: 'product-uganda-single11.png', - image_product_double: 'product-uganda-double1.png', + images: ['product-uganda-single11.png', 'product-uganda-double1.png',], slogan: 'products.uganda_gnoma.slogan', description: 'products.uganda_gnoma.description', farm: 'products.uganda_gnoma.farm', @@ -75,4 +86,35 @@ export const products = [ taste: 'products.uganda_gnoma.taste', texture: 'products.uganda_gnoma.texture', }, -]; \ No newline at end of file +]; + +export const slides = { + home: [ + 'mountains.jpg', + 'coffee1.jpg', + 'products.jpg', + 'proysoc.01.jpg', + 'kids.jpg', + ], + about: [ + 'coffee1.jpg', + 'mountains.jpg', + 'products.jpg', + 'proysoc.01.jpg', + 'kids.jpg', + ], + social: [ + 'proysoc.01.jpg', + 'kids.jpg', + 'mountains.jpg', + 'coffee1.jpg', + 'products.jpg', + ], + products: [ + 'products.jpg', + 'coffee1.jpg', + 'mountains.jpg', + 'proysoc.01.jpg', + 'kids.jpg', + ], +}; \ No newline at end of file diff --git a/src/router/router.js b/src/router/router.js index 301b144..85d7de0 100644 --- a/src/router/router.js +++ b/src/router/router.js @@ -8,6 +8,7 @@ import ContactView from '../views/contact/Contact.vue'; import ImpressumView from '../views/impressum/Impressum.vue'; import DataProtectionView from '../views/dataprotection/DataProtection.vue'; import AgbView from '../views/agb/Agb.vue'; +import StoreView from '../views/store/StoreView.vue'; const router = createRouter({ history: createWebHashHistory(), @@ -52,6 +53,11 @@ const router = createRouter({ name: 'agb', component: AgbView, }, + { + path: '/store', + name: 'store', + component: StoreView, + }, ] }); diff --git a/src/views/about/About.vue b/src/views/about/About.vue index a3fa1e9..af5b247 100644 --- a/src/views/about/About.vue +++ b/src/views/about/About.vue @@ -1,10 +1,12 @@ + + \ No newline at end of file diff --git a/src/views/impressum/Impressum.vue b/src/views/impressum/Impressum.vue index 00d91f6..11888ea 100644 --- a/src/views/impressum/Impressum.vue +++ b/src/views/impressum/Impressum.vue @@ -1,6 +1,5 @@ diff --git a/src/views/products/Products.vue b/src/views/products/Products.vue index 64c49fa..fe89ec6 100644 --- a/src/views/products/Products.vue +++ b/src/views/products/Products.vue @@ -1,31 +1,22 @@