Skip to content

Commit

Permalink
ajustes de next.config (URL). Placeholder banner
Browse files Browse the repository at this point in the history
  • Loading branch information
clara7227 committed Oct 11, 2024
1 parent 26fd9a3 commit 4c0bf15
Show file tree
Hide file tree
Showing 16 changed files with 62 additions and 47 deletions.
24 changes: 16 additions & 8 deletions app/about/page.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,27 +55,35 @@ export default function About() {
{t("about.Goals.sectionTitle")}
</Heading>

<div className=" flex items-center sm:items-strech sm:justify-stretch flex-col sm:grid sm:grid-cols-3 gap-4 md:gap-6 mb-20">
<CustomCard className="flex flex-col justify-start gap-4 xs:w-3/4 shadow-md shadow-primary/15 rounded text-center padding_card_highlight">
<FigmaLogoIcon className="mx-auto p-3 h-12 w-12 rounded-full bg-primary-300 text-primary" />
<div className=" flex items-center sm:items-strech sm:justify-stretch flex-col sm:grid sm:grid-cols-2 md:grid-cols-3 gap-4 md:gap-6 mb-20">
<CustomCard className="h-full w-full flex flex-col justify-start gap-4 xs:w-3/4 sm:w-full shadow-md shadow-primary/15 rounded text-center padding_card_highlight">
<div className="mx-auto h-12 w-12 rounded-full flex bg-primary-300 justify-center items-center">
<FigmaLogoIcon className="m-auto h-7 w-7 text-primary" />
</div>
<CardTitle level="h4">{t("about.Goals.Goal1.GoalTitle")}</CardTitle>
<CardDescription>{t("about.Goals.Goal1.GoalBody")}</CardDescription>
</CustomCard>

<CustomCard className="flex flex-col justify-start gap-4 xs:w-3/4 shadow-md shadow-primary/15 rounded text-center padding_card_highlight">
<ScissorsIcon className="mx-auto p-3 h-12 w-12 rounded-full bg-primary-300 text-primary"/>
<CustomCard className="h-full w-full flex flex-col justify-start gap-4 xs:w-3/4 sm:w-full shadow-md shadow-primary/15 rounded text-center padding_card_highlight">
<div className="mx-auto h-12 w-12 rounded-full flex bg-primary-300 justify-center items-center">
<ScissorsIcon className="m-auto h-7 w-7 text-primary"/>
</div>
<CardTitle level="h4">{t("about.Goals.Goal2.GoalTitle")}</CardTitle>
<CardDescription>{t("about.Goals.Goal2.GoalBody")}</CardDescription>
</CustomCard>

<CustomCard className="h-full w-full flex flex-col justify-start gap-4 xs:w-3/4 sm:w-full shadow-md shadow-primary/15 rounded text-center padding_card_highlight">
<HeartIcon className="mx-auto p-3 h-12 w-12 rounded-full bg-primary-300 text-primary" />
<div className="mx-auto h-12 w-12 rounded-full flex bg-primary-300 justify-center items-center">
<HeartIcon className="m-auto h-7 w-7 text-primary" />
</div>
<CardTitle level="h4">{t("about.Goals.Goal3.GoalTitle")}</CardTitle>
<CardDescription>{t("about.Goals.Goal3.GoalBody")}</CardDescription>
</CustomCard>

<CustomCard className="flex flex-col justify-start gap-4 xs:w-3/4 shadow-md shadow-primary/15 rounded text-center padding_card_highlight">
<FigmaLogoIcon className="mx-auto p-3 h-12 w-12 rounded-full bg-primary-300 text-primary"/>
<CustomCard className="h-full w-full flex flex-col justify-start gap-4 xs:w-3/4 sm:w-full shadow-md shadow-primary/15 rounded text-center padding_card_highlight">
<div className="mx-auto h-12 w-12 rounded-full flex bg-primary-300 justify-center items-center">
<FigmaLogoIcon className="m-auto h-7 w-7 text-primary"/>
</div>
{/* <span className="divider_auto" /> */}
<CardTitle level="h4">Título de la card</CardTitle>
<CardDescription>
Expand Down
2 changes: 1 addition & 1 deletion app/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@tailwind utilities;

* {
border: 1px solid salmon
/* border: 1px solid salmon */
}

/*TYPE*/
Expand Down
3 changes: 1 addition & 2 deletions app/layout.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ export default function RootLayout({ children }) {

return (
<Router>

<html className={` ${sourceSans.variable} ${inter.variable} `}>
<title>Boiler</title>
<body className="bg-background">
Expand All @@ -38,7 +37,7 @@ export default function RootLayout({ children }) {
<div>
<Routes>
{routes.map((route, page, index) => (
<Route path={route.route} element={route.page} className={console.log(route.page)}/>
<Route path={route.route} element={route.page}/>
))}
</Routes>
</div>
Expand Down
11 changes: 5 additions & 6 deletions app/page.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@ export default function Page() {

return (
<main>
<title>Amazing Page</title>
{/* <Banner>
<Banner>
<BannerContent className={"w-full"}>
<BannerTitle className={"text-white"}>{t("front.title")}</BannerTitle>
<BannerDescription className="h-full text-balance">
Expand All @@ -66,17 +65,17 @@ export default function Page() {
{t("front.action-button")} <ArrowRightIcon className=" h-4 w-4" />
</Button>
</BannerContent>
<Image
<BannerImg
src="placeholder.jpg"
alt="Descripción de la imagen"
fit="contain"
hasBadge={true}
badgeVariant=""
badgeSize=""
// className={"hidden"}
/>
</Banner> */}

<BannerPum></BannerPum>
</Banner>
{/* <BannerPum></BannerPum> */}

<section className="standard_padding">
<Heading level="h3">{t("front.section1Title")}</Heading>
Expand Down
4 changes: 3 additions & 1 deletion components/bannerPum.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import Text from "@/components/ui/Text";

export default function BannerPum(props) {
const { t } = useTranslation();
return (
return (<>
<div className="bg-gradient-to-r from-black to-white p-20">
<div className="flex flex-col justify-end absolute right-10 top-28">

Expand All @@ -23,5 +23,7 @@ export default function BannerPum(props) {
este es un degradado
</div>
</div>

</>
)
}
4 changes: 2 additions & 2 deletions components/core/Banner.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ const BannerButton = React.forwardRef(({ className, ...props }, ref) => (
BannerButton.displayName = "BannerButton";

const BannerImg = React.forwardRef(({ className, ...props }, ref) => (
<div ref={ref} className={cn("hidden md:block", className)}>
<div ref={ref} className={cn("hidden md:block relative w-full h-full overflow-hidden", className)}>
<img
className="object-contain"
className="w-full h-full flex items-center justify-center object-contain"
src="placeholder.jpg"
alt="icon"
/>
Expand Down
2 changes: 1 addition & 1 deletion components/core/Cards.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import {
import Link from "next/link";

const CardVariants = cva(
"border border-primary min-w-20 p-4 inline-flex flex-col gap-4 items-center justify-between whitespace-nowrap rounded-md font-body text-sm text-text drop-shadow-md hover:scale-[101%] transition-all overflow-hidden",
"border min-w-20 p-4 inline-flex flex-col gap-4 items-center justify-between whitespace-nowrap rounded-md font-body text-sm text-text drop-shadow-md hover:scale-[101%] transition-all overflow-hidden",
{
variants: {
direction: {
Expand Down
10 changes: 5 additions & 5 deletions components/core/Footer.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import React from "react";
import clsx from "clsx";
import Link from "next/link";
import { NavLink } from "react-router-dom";
import { useTranslation } from "react-i18next";
import { activeRoutes } from "@/constants/routes";
import { EnvelopeClosedIcon } from "@radix-ui/react-icons";
Expand Down Expand Up @@ -59,13 +59,13 @@ export default function Footer(props) {
key={index}
className={
route.route === props.route
? "li-selected text-left mb-1 lg:mb-1.5"
: "text-left mb-1 lg:mb-1.5"
? "li-selected text-left mb-1 lg:mb-1.5 hover:underline"
: "text-left mb-1 lg:mb-1.5 hover:underline"
}
>
<Link className="text-base" href={route.route}>
<NavLink className="text-base" to={route.route}>
{t(route.key)}
</Link>
</NavLink>
</li>
))}
</ul>
Expand Down
4 changes: 2 additions & 2 deletions components/core/Header.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ export default function Header(props) {

const menuItems = clsx(
"flex flex-col justify-end items-center md:flex-row",
"gap-0 md:gap-4",
"gap-1 md:gap-4",

);

const menuItemClasses = clsx(
"w-full py-2 px-4 text-center md:p-0 md:w-fit",
"w-full px-4 text-center md:p-0 md:w-fit",
"text-lg md:text-base",
"hover:underline"
);
Expand Down
4 changes: 2 additions & 2 deletions components/ui/customCard.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import Heading from "@/components/ui/Heading"
const CustomCard = React.forwardRef(({ className, ...props }, ref) => (
<article
ref={ref}
className={cn("p-2 h-full w-3/4 sm:w-full rounded-xl border flex flex-col justify-start gap-4 shadow bg-primary-200 text-primary-800", className)}
className={cn("p-2 h-full xs:w-3/4 md:w-full rounded-xl border flex flex-col justify-start gap-4 shadow bg-primary-200/70 text-primary-800", className)}
{...props} />
))
CustomCard.displayName = "CustomCard"
Expand All @@ -30,7 +30,7 @@ const CardTitle = React.forwardRef(({ className, ...props }, ref) => (
<Heading
ref={ref}
level="h3"
className={cn("font-semibold leading-5 tracking-tight", className)}
className={cn("font-semibold leading-6 tracking-tight", className)}
{...props}
/>
))
Expand Down
2 changes: 1 addition & 1 deletion next.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const nextConfig = {
* Environment variables
*/
env: {
PUBLIC_URL: isProd ? "https://fun4date.github.io/" : "",
PUBLIC_URL: isProd ? "https://ging.github.io/boiler/" : "",
BASE_PATH: isProd ? "" : ""
}
};
Expand Down
Binary file added public/assets/fondos/background_banner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/assets/fondos/eunomia_fondo_default.png
Binary file not shown.
Loading

0 comments on commit 4c0bf15

Please sign in to comment.