Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ecommerce dev #25

Open
wants to merge 47 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
9d193d0
Merge pull request #24 from filippoerbisti/master
filippoerbisti Sep 21, 2022
b19215a
in testing
filippoerbisti Sep 21, 2022
dd5c9f9
fix err in img undefined sanity
filippoerbisti Sep 21, 2022
dbeb886
fix height img product
filippoerbisti Sep 21, 2022
d6699e5
Merge branch 'ecommerceDev' of https://github.com/filippoerbisti/Rocc…
filippoerbisti Sep 21, 2022
8d488e2
comment blurDataEffect on Image
filippoerbisti Oct 3, 2022
72ee691
Fix style cookieButton
filippoerbisti Oct 5, 2022
5c3b768
fix margin btn event
filippoerbisti Oct 5, 2022
e87abf6
fix miss Link
filippoerbisti Oct 5, 2022
042b59f
remove de-fr
filippoerbisti Oct 5, 2022
74c72ed
change transl
filippoerbisti Oct 5, 2022
1c27069
fix mb hr
filippoerbisti Oct 5, 2022
b3dfa28
general updates
filippoerbisti Oct 5, 2022
b0f90fc
Merge branch 'ecommerceDev' of https://github.com/filippoerbisti/Rocc…
filippoerbisti Oct 5, 2022
1acfb38
remove some img & resize
filippoerbisti Oct 6, 2022
34d6a09
transl
filippoerbisti Oct 6, 2022
6db76a3
style swiper
filippoerbisti Oct 6, 2022
ec61c3c
fix style
filippoerbisti Oct 6, 2022
f2a22a1
add swiper tasting packages
filippoerbisti Oct 6, 2022
54001e4
transl
filippoerbisti Oct 6, 2022
ff8c5e2
add link to landing
filippoerbisti Oct 6, 2022
3c631b2
npm i --legacy-peer-deps
filippoerbisti Oct 6, 2022
4afba0d
sanity fix err in prod
filippoerbisti Oct 6, 2022
edcc370
add img in public
filippoerbisti Oct 6, 2022
4a50ca4
remove wine carosel in main
filippoerbisti Oct 6, 2022
fa9136c
change temp link img 360 (TODO)
filippoerbisti Oct 6, 2022
9381e9a
Fix show detail
filippoerbisti Oct 6, 2022
7c9bc54
Fix style h1 proposal tastings
filippoerbisti Oct 6, 2022
21299b3
Transl
filippoerbisti Oct 6, 2022
d421527
Transl
filippoerbisti Oct 6, 2022
dca9bc2
add sanity
filippoerbisti Oct 7, 2022
1aed45f
add detail tasting package
filippoerbisti Oct 8, 2022
01c5c3c
transl
filippoerbisti Oct 8, 2022
4a96571
remove lang de-fr in hamburgermenu
filippoerbisti Oct 8, 2022
fe6b1f6
add descr tasting package
filippoerbisti Oct 8, 2022
7826fad
transl
filippoerbisti Oct 8, 2022
2bd7892
add favicon
filippoerbisti Oct 11, 2022
5793c4f
add favicon
filippoerbisti Oct 11, 2022
0fe16bb
create _document structure
filippoerbisti Oct 11, 2022
5175d8a
export
filippoerbisti Oct 11, 2022
0060399
fix virtual tour (bad, TODO)
filippoerbisti Oct 11, 2022
ddb1784
tour
filippoerbisti Oct 11, 2022
d73ab9b
comment
filippoerbisti Oct 11, 2022
f233838
update img
filippoerbisti Oct 11, 2022
bcbba71
update img
filippoerbisti Oct 11, 2022
edcd7e4
update img
filippoerbisti Oct 11, 2022
d3f0adc
transl
filippoerbisti Oct 11, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 2 additions & 2 deletions ecommerce/components/Footer.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ const Footer = () => {
alt="loghi-bio-footer_img"
width={300}
height={100}
blurDataURL={img1}
placeholder='blur'
// blurDataURL={img1}
// placeholder='blur'
/>
</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions ecommerce/components/HamburgerMenu.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ const HamburgerMenu = () => {
{setShowMenu(!showMenu)
setChangeIconHamburgerMenu(!showMenu)}
}
blurDataURL='https://res.cloudinary.com/dl38nyo08/image/upload/v1660806591/Roccolo%20del%20Lago/logo_iidjdd.png'
placeholder='blur'
// blurDataURL='https://res.cloudinary.com/dl38nyo08/image/upload/v1660806591/Roccolo%20del%20Lago/logo_iidjdd.png'
// placeholder='blur'
/>
</Link>
<ul>
Expand Down Expand Up @@ -112,12 +112,12 @@ const HamburgerMenu = () => {
<Link href={currentRoute} locale="en">
<GB title="English" className={styles.langIcons}/>
</Link>
<Link href={currentRoute} locale="de">
{/* <Link href={currentRoute} locale="de">
<DE title="Deutsch" className={styles.langIcons}/>
</Link>
<Link href={currentRoute} locale="fr">
<FR title="Français" className={styles.langIcons}/>
</Link>
</Link> */}
</div>
<p className={styles.credit}>{t('poweredBy')} <a href="https://filippoerbisti.netlify.app" target="_blank" className={styles.poweredBy}>Filippo Erbisti</a></p>
</div>
Expand Down
97 changes: 52 additions & 45 deletions ecommerce/components/Main.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import React, { useState, useEffect } from 'react';
import Link from 'next/link';
import Image from 'next/image';
import useTranslation from 'next-translate/useTranslation';
import { client } from '../lib/client';
import { Product, Slider } from '../components';

import styles from '../styles/Main.module.css';
Expand Down Expand Up @@ -87,7 +86,7 @@ const Main = ({ products }) => {

const pWedding = `${t('weddingParagraph')}`;
const pWeddingParagraph = pWedding.replace(/xxx/gi, '\n\r');

return (
<div className={styles.mx20}>
<Slider />
Expand Down Expand Up @@ -123,7 +122,7 @@ const Main = ({ products }) => {

<hr className={styles.hr} />

<div className={styles.pb10}>
{/* <div className={styles.pb10}>
<div className={marquee['maylike-products-wrapper']}>
<h2 className={styles.title}>I NOSTRI VINI</h2>
<div className={styles.btnContainer}>
Expand All @@ -133,14 +132,14 @@ const Main = ({ products }) => {
</button>
</Link>
</div>
{/* <div className={marquee['marquee']}>
<div className={marquee['marquee']}>
<div className={`${marquee['maylike-products-container']} ${marquee.track}`}>
{products?.map((product) => (
<Product key={product._id}
product={product} />
))}
</div>
</div> */}
</div>

<Swiper
slidesPerView={size <= mobileWidth ? n : size > mobileWidth && size <= smallPcWidth ? n : n}
Expand All @@ -155,78 +154,86 @@ const Main = ({ products }) => {
className="mySwiper"
>
{products?.map((product) =>
<SwiperSlide key={product._id}>
<div className={styles.py} key={product._id}>
<Product product={product} />
</div>
</SwiperSlide>
<SwiperSlide key={product._id}>
<div className={styles.py}>
<Product key={product._id} product={product} />
</div>
</SwiperSlide>
)}
</Swiper>
</div>
</div>
</div> */}

<hr className={styles.hr} />
{/* <hr className={styles.hr} /> */}

<div className={styles.textContainerLeft}>
<div className={styles.textContainerRight}>
<div className={styles.w50mx40}>
<h1 className={styles.title}>
<Link href='/wineshop'>{t('wineshopTitle')}</Link>
<h1 className={styles.title} style={{marginTop: '10px'}}>
<Link href='/event#tasting'>{t('tastingTitle')}</Link>
</h1>
<p className={styles.paragraph}>
<ReadMore>
{pWineshopParagraph}
</ReadMore>
{/* <ReadMore>
{pTastingParagraph}
</ReadMore> */}
{pTastingParagraph} : <br />
- {t('tastingParagraphProposal1')} {t('trisWine')} ({t('whiteWine')}, {t('roseWine')}, {t('proseccoWine')}) <br />
- {t('tastingParagraphProposal2')} {t('trisWine')} ({t('whiteWine')}, {t('roseWine')}, {t('proseccoWine')}), {t('food')} <br />
- {t('tastingParagraphProposal3')} {t('trisWine')} ({t('whiteWine')}, {t('roseWine')}, {t('proseccoWine')}), {t('food')}, Dessert <br />
</p>
<div className={styles.btnContainer}>
<Link href='/wineshop'>
<Link href='https://landingroccolo.vercel.app'>
<button className={styles.btn} type='button'>
{t('wineshopButton')}
{t('tastingButton')}
</button>
</Link>
</div>
</div>
<div className={`${styles.w50mx40} ${styles.mob}`}>
<Image
src='https://res.cloudinary.com/dl38nyo08/image/upload/v1655394256/Roccolo%20del%20Lago/casual%20img/pexels-pixabay-434311_dbuhns.jpg'
alt="wineshop_img"
width={700}
height={400}
layout="responsive"
objectFit="cover"
blurDataURL='https://res.cloudinary.com/dl38nyo08/image/upload/v1655394256/Roccolo%20del%20Lago/casual%20img/pexels-pixabay-434311_dbuhns.jpg'
placeholder='blur'
/>
<div className={`${styles.w50mx40}`}>
<Swiper pagination={{clickable: true}} spaceBetween={20} modules={[Pagination]} className="mySwiper">
<SwiperSlide style={{display: 'flex', flexDirection: 'column'}}>
<h1 className='text-2xl my-5 uppercase'>{t('proposal1')}</h1>
<img src="https://res.cloudinary.com/dl38nyo08/image/upload/v1665041204/Landing%20Roccolo/tasting_package_1_dokzq3.png" alt="" />
</SwiperSlide>
<SwiperSlide className="proposal parallax-proposal-2">
<h1 className='text-2xl my-5 uppercase'>{t('proposal2')}</h1>
<img src="https://res.cloudinary.com/dl38nyo08/image/upload/v1665041204/Landing%20Roccolo/tasting_package_2_llmpyk.png" alt="" />
</SwiperSlide>
<SwiperSlide className="proposal parallax-proposal-3">
<h1 className='text-2xl my-5 uppercase'>{t('proposal3')}</h1>
<img src="https://res.cloudinary.com/dl38nyo08/image/upload/v1665041204/Landing%20Roccolo/tasting_package_3_ojd5kw.png" alt="" />
</SwiperSlide>
</Swiper>
</div>
</div>

<hr className={styles.hr} />

<div className={styles.textContainerRight}>
<div className={styles.textContainerLeft}>
<div className={`${styles.w50mx40} ${styles.mob}`}>
<Image
src='https://res.cloudinary.com/dl38nyo08/image/upload/v1655394256/Roccolo%20del%20Lago/casual%20img/pexels-ray-piedra-1545529_tv7i7l.jpg'
alt="tasting_img"
src='https://res.cloudinary.com/dl38nyo08/image/upload/v1664527652/Roccolo%20del%20Lago/wine-shop_d5qmyw.jpg'
alt="wineshop_img"
width={700}
height={400}
layout="responsive"
objectFit="cover"
blurDataURL='https://res.cloudinary.com/dl38nyo08/image/upload/v1655394256/Roccolo%20del%20Lago/casual%20img/pexels-ray-piedra-1545529_tv7i7l.jpg'
placeholder='blur'
// blurDataURL='https://res.cloudinary.com/dl38nyo08/image/upload/v1664527652/Roccolo%20del%20Lago/wine-shop_d5qmyw.jpg'
// placeholder='blur'
/>
</div>
<div className={styles.w50mx40}>
<h1 className={styles.title}>
<Link href='/event#tasting'>{t('tastingTitle')}</Link>
<Link href='/wineshop'>{t('wineshopTitle')}</Link>
</h1>
<p className={styles.paragraph}>
<ReadMore>
{pTastingParagraph}
{pWineshopParagraph}
</ReadMore>
</p>
<div className={styles.btnContainer}>
<Link href='/event#tasting'>
<Link href='/wineshop'>
<button className={styles.btn} type='button'>
{t('tastingButton')}
{t('wineshopButton')}
</button>
</Link>
</div>
Expand All @@ -235,9 +242,9 @@ const Main = ({ products }) => {

<hr className={styles.hr} />

<div className={styles.textContainerLeft}>
<div className={styles.textContainerRight}>
<div className={styles.w50mx40}>
<h1 className={styles.title}>
<h1 className={styles.title} style={{marginTop: '10px'}}>
<Link href='/event#wedding'>{t('weddingTitle')}</Link>
</h1>
<p className={styles.paragraph}>
Expand All @@ -255,14 +262,14 @@ const Main = ({ products }) => {
</div>
<div className={`${styles.w50mx40} ${styles.mob}`}>
<Image
src='https://res.cloudinary.com/dl38nyo08/image/upload/v1655394713/Roccolo%20del%20Lago/casual%20img/pexels-duan%C3%A9-viljoen-12412480_xryskx.jpg'
src='https://res.cloudinary.com/dl38nyo08/image/upload/v1665473807/Roccolo%20del%20Lago/wedding__composit-a__1_ihcpvi.jpg'
alt="wineshop_img"
width={700}
height={400}
layout="responsive"
objectFit="cover"
blurDataURL='https://res.cloudinary.com/dl38nyo08/image/upload/v1655394713/Roccolo%20del%20Lago/casual%20img/pexels-duan%C3%A9-viljoen-12412480_xryskx.jpg'
placeholder='blur'
// blurDataURL='https://res.cloudinary.com/dl38nyo08/image/upload/v1665473807/Roccolo%20del%20Lago/wedding__composit-a__1_ihcpvi.jpg'
// placeholder='blur'
/>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions ecommerce/components/Navbar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,12 @@ const Navbar = props => {
<Link href={currentRoute} locale="en">
<GB title="English" className={styles.langIcons}/>
</Link>
<Link href={currentRoute} locale="de">
{/* <Link href={currentRoute} locale="de">
<DE title="Deutsch" className={styles.langIcons}/>
</Link>
<Link href={currentRoute} locale="fr">
<FR title="Français" className={styles.langIcons}/>
</Link>
</Link> */}
</div>

{totalQuantities > 0 &&
Expand Down
14 changes: 8 additions & 6 deletions ecommerce/components/Product.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,14 @@ const Product = ({ product}) => {
>
<div className={styles.card} data-text={name}>
<div className={styles.imgBox}>
<img
src={urlFor(image && image[0])}
alt="product_img"
objectfit="cover"
className={styles['product-image']}
/>
{image != undefined &&
<img
src={urlFor(image && image[0])}
alt="product_img"
objectfit="cover"
className={styles['product-image']}
/>
}
</div>
<div className={styles.contentBox}>
<h2>{name}</h2>
Expand Down
4 changes: 2 additions & 2 deletions ecommerce/components/Slider.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ const Slider = () => {
height={700}
// objectFit="contain"
className='cursor-pointer'
blurDataURL={image.url}
placeholder='blur'
// blurDataURL={image.url}
// placeholder='blur'
/>
</a>
</SwiperSlide>
Expand Down
Loading