Skip to content

Commit

Permalink
Merge pull request #15 from deco-sites/Andre
Browse files Browse the repository at this point in the history
Newsletter css done
  • Loading branch information
ItsAndre548 authored Oct 15, 2024
2 parents c91cdaf + 034b0db commit 8d1d567
Show file tree
Hide file tree
Showing 8 changed files with 140 additions and 113 deletions.
5 changes: 2 additions & 3 deletions .deco/blocks/Footer.json
Original file line number Diff line number Diff line change
Expand Up @@ -265,16 +265,15 @@
"placeholder": "digite seu email",
"label": "enviar",
"empty": {
"title": "Assine nossa newsletter",
"description": "Fique por dentro de nossas novidades e descontos",
"logo": "https://deco-sites-assets.s3.sa-east-1.amazonaws.com/arena-center/de41e126-fd50-480c-b899-168414e9d2a2/Group-275.png"
},
"logo": "https://deco-sites-assets.s3.sa-east-1.amazonaws.com/arena-center/de41e126-fd50-480c-b899-168414e9d2a2/Group-275.png",
"success": {
"logo": "https://deco-sites-assets.s3.sa-east-1.amazonaws.com/arena-center/de41e126-fd50-480c-b899-168414e9d2a2/Group-275.png"
},
"failed": {
"logo": "https://deco-sites-assets.s3.sa-east-1.amazonaws.com/arena-center/de41e126-fd50-480c-b899-168414e9d2a2/Group-275.png"
"logo": "https://deco-sites-assets.s3.sa-east-1.amazonaws.com/arena-center/de41e126-fd50-480c-b899-168414e9d2a2/Group-275.png",
"title": "Falha"
},
"consentText": "Ao se inscrever, você está aceitando nossa Política de Privacidade.",
"status": "success"
Expand Down
47 changes: 28 additions & 19 deletions .deco/blocks/pages-home-c4bcbfb771e9.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"image": "https://deco-sites-assets.s3.sa-east-1.amazonaws.com/arena-center/5cff0e18-d326-475b-9584-06d46d15a6cb/box.svg",
"title": "Lorem ipsum",
"subtitle": "Lorem ipsum dolor sit amet consectetur. Vulputate sed posuere consectetur lacus nibh",
"mobileImage": "https://deco-sites-assets.s3.sa-east-1.amazonaws.com/arena-center/067df0fe-8f5b-438d-8f2d-9cfcd5bc68d9/Vector-(1).png"
"mobileImage": "https://deco-sites-assets.s3.sa-east-1.amazonaws.com/arena-center/164d6f6c-ad4c-4196-800e-993aef070be3/teste.svg"
},
{
"image": "https://deco-sites-assets.s3.sa-east-1.amazonaws.com/arena-center/5701eed8-753e-4d26-bcc7-59e7d575fcb3/calendario.svg",
Expand Down Expand Up @@ -279,15 +279,15 @@
"paragraph": "Lorem ipsum dolor sit amet consectetur. Et id vitae cursus etiam vestibulum sed. Auctor ipsum pellentesque mauris aliquet tellus aliquam dictum sit egestas. Sed sapien in laoreet eget. Ac netus sagittis cursus eros arcu pharetra lobortis nunc suscipit. Non diam mi id ut.",
"title": "Arena M"
},
"title": "Arena Center",
"paragraph": "Lorem ipsum dolor sit amet consectetur. Et id vitae cursus etiam vestibulum sed. Auctor ipsum pellentesque mauris aliquet tellus aliquam dictum sit egestas. Sed sapien in laoreet eget. Ac netus sagittis cursus eros arcu pharetra lobortis nunc suscipit. Non diam mi id ut."
"paragraph": "Lorem ipsum dolor sit amet consectetur. Et id vitae cursus etiam vestibulum sed. Auctor ipsum pellentesque mauris aliquet tellus aliquam dictum sit egestas. Sed sapien in laoreet eget. Ac netus sagittis cursus eros arcu pharetra lobortis nunc suscipit. Non diam mi id ut.",
"title": "Arena Center"
},
"links": [
{
"children": [
{
"title": "Sobre o Arena Center",
"href": "#"
"href": "#",
"title": "Sobre o Arena Center"
},
{
"title": "Nossas Lojas",
Expand All @@ -302,12 +302,12 @@
"href": "#"
},
{
"title": "Trabalhe conosco",
"href": "#"
"href": "#",
"title": "Trabalhe conosco"
},
{
"title": "Sustentabilidade",
"href": "#"
"href": "#",
"title": "Sustentabilidade"
},
{
"title": "Termos de uso",
Expand Down Expand Up @@ -371,8 +371,8 @@
"href": "#"
}
],
"href": "#",
"title": "CashBack"
"title": "CashBack",
"href": "#"
},
{
"children": [
Expand Down Expand Up @@ -533,24 +533,24 @@
}
],
"newsletterProps": {
"status": "success",
"placeholder": "digite seu email",
"label": "enviar",
"empty": {
"logo": "https://deco-sites-assets.s3.sa-east-1.amazonaws.com/arena-center/de41e126-fd50-480c-b899-168414e9d2a2/Group-275.png",
"title": "Assine nossa newsletter",
"description": "Fique por dentro de nossas novidades e descontos",
"logo": "https://deco-sites-assets.s3.sa-east-1.amazonaws.com/arena-center/de41e126-fd50-480c-b899-168414e9d2a2/Group-275.png"
"description": "Fique por dentro de nossas novidades e descontos"
},
"logo": "https://deco-sites-assets.s3.sa-east-1.amazonaws.com/arena-center/de41e126-fd50-480c-b899-168414e9d2a2/Group-275.png",
"success": {
"logo": "https://deco-sites-assets.s3.sa-east-1.amazonaws.com/arena-center/de41e126-fd50-480c-b899-168414e9d2a2/Group-275.png"
},
"failed": {
"logo": "https://deco-sites-assets.s3.sa-east-1.amazonaws.com/arena-center/de41e126-fd50-480c-b899-168414e9d2a2/Group-275.png"
"logo": "https://deco-sites-assets.s3.sa-east-1.amazonaws.com/arena-center/de41e126-fd50-480c-b899-168414e9d2a2/Group-275.png",
"title": "Falha"
},
"consentText": "Ao se inscrever, você está aceitando nossa Política de Privacidade."
},
"logo": "https://deco-sites-assets.s3.sa-east-1.amazonaws.com/arena-center/47fedbc9-f224-40f9-a2f6-beb8eabe627b/tec3.svg",
"trademark": "Copyright LOREN IPSUM - 2024. Todos os direitos reservados.",
"contact": [
{
"text": "titulo",
Expand All @@ -563,7 +563,6 @@
}
],
"socialTitle": "Permaneça conectado",
"trademark": "Copyright LOREN IPSUM - 2024. Todos os direitos reservados.",
"newsletter": {
"empty": {
"title": "Assine nossa newsletter",
Expand All @@ -587,12 +586,22 @@
},
"label": "teste",
"placeholder": "placeholder"
}
},
"logo": [
{
"img": "https://deco-sites-assets.s3.sa-east-1.amazonaws.com/arena-center/b0ace67c-e6a2-42ad-a8d2-a34c6e897515/image.svg",
"href": "deco.cx"
},
{
"img": "https://deco-sites-assets.s3.sa-east-1.amazonaws.com/arena-center/85cfff4c-5123-4e46-b9e1-042ab88e4830/tec3.svg",
"href": "https://tec3commerce.com.br/"
}
]
}
],
"__resolveType": "website/pages/Page.tsx",
"path": "/",
"seo": {
"__resolveType": "website/sections/Seo/SeoV2.tsx"
}
}
}
4 changes: 4 additions & 0 deletions deco.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions sections/CategorySlider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,13 @@ function CategorySlider({ categoryItems, itemListName }: Props) {
))}
</Slider>
</div>
<div class="relative bottom-[15%] z-10 col-span-1 col-start-1 row-span-1 mt-9 row-start-1 p-2 self-center">
<div class="relative bottom-[25%] z-10 col-span-1 col-start-1 row-span-1 row-start-1 p-2 self-center">
<Slider.PrevButton class="sm:flex hidden disabled:invisible no-animation">
<Icon id="chevron-right" class="rotate-180 text-accent-content" />
</Slider.PrevButton>
</div>

<div class="relative bottom-[15%] z-10 col-span-1 col-start-3 row-span-1 mt-9 row-start-1 p-2 self-center">
<div class="relative bottom-[25%] z-10 col-span-1 col-start-3 row-span-1 row-start-1 p-2 self-center">
<Slider.NextButton class="sm:flex hidden disabled:invisible no-animation">
<Icon id="chevron-right" class="text-accent-content" />
</Slider.NextButton>
Expand Down
33 changes: 24 additions & 9 deletions sections/Footer/Footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,19 @@ interface Apps {
icon: ImageWidget;
link: string;
}

interface Logos {
img: ImageWidget;
href: string;
alt: string;
}
interface Props {
aboutUs: AboutUs;
links?: Link[];
social?: Social;
apps: Apps[];
paymentMethods: PaymentMethod[];
policies?: Item[];
logo?: ImageWidget;
logo: Logos[];
trademark?: string;
newsletterProps: NewsletterProps;
}
Expand All @@ -80,9 +84,9 @@ function Footer({
}: Props) {
return (
<footer class="px-5 sm:px-0 mt-10 w-full sm:mt-11 bg-primary text-primary-content">
<div class="flex flex-col max-w-[1440px] mx-auto gap-5 sm:gap-10 py-10">
<div class="flex flex-col max-w-[1440px] mx-auto gap-5 py-10">
<Newsletter {...newsletterProps} />
<ul class="grid grid-flow-row w-full mx-auto sm:grid-flow-col sm:columns-2 gap-6 px-4">
<ul class="grid grid-flow-row lg:grid-flow-col w-full justify-around mx-auto columns-2 gap-6 px-4">
<li class="flex flex-col gap-4 col-start-1 col-end-3 w-full md:w-[180px]">
<p class="text-xs font-medium">{aboutUs.title}</p>
<p class="text-[10px]">{aboutUs.paragraph}</p>
Expand Down Expand Up @@ -116,7 +120,7 @@ function Footer({
))}
<div class="flex flex-col gap-4">
<p class="text-xs font-medium">{social?.socialTitle}</p>
<div class="flex justify-around">
<div class="flex md:justify-center lg:justify-around">
{social?.socialItems.map(({ image, href, alt }) => (
<div class="">
<a href={href}>
Expand Down Expand Up @@ -167,7 +171,7 @@ function Footer({
))}
</div>
</ul>

<div class="mx-12"> <span class="text-xs font-normal text-base-400">{trademark}</span></div>
<div class="flex flex-col sm:flex-row gap-12 justify-between items-start sm:items-center">
<ul class="flex gap-4">
</ul>
Expand All @@ -183,9 +187,20 @@ function Footer({
</a>
</li>
))}
<div class="flex flex-nowrap items-center justify-between sm:justify-center gap-4">
<span class="text-xs font-normal text-base-400">{trademark}</span>
<img loading="lazy" src={logo} />
<div class="flex flex-col flex-nowrap items-center justify-between sm:justify-center gap-4">

<div class="flex items-center justify-center gap-4">
{logo.map((item)=>(
<a href={item.href} target="_blank">
<Image
class="object-contain"
src={item.img}
width={57}
height={24}
loading="lazy" />
</a>
))}
</div>
</div>
</ul>
</div>
Expand Down
4 changes: 2 additions & 2 deletions sections/Images/Carousel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,8 @@ function Carousel({ images = [], preload, interval }: Props) {

<ul
class={clx(
"col-span-full row-start-4 z-10",
"carousel justify-center gap-3",
// "col-span-full row-start-4 z-10",
// "carousel justify-center gap-3",
)}
>
{images.map((_, index) => (
Expand Down
Loading

0 comments on commit 8d1d567

Please sign in to comment.