diff --git a/public/img/white-dove.webp b/public/img/white-dove.webp new file mode 100644 index 0000000..6108d5e Binary files /dev/null and b/public/img/white-dove.webp differ diff --git a/src/assets/dove.webp b/src/assets/dove.webp new file mode 100644 index 0000000..e41104d Binary files /dev/null and b/src/assets/dove.webp differ diff --git a/src/assets/logo-metalico.png b/src/assets/logo-metalico.png new file mode 100644 index 0000000..3481af5 Binary files /dev/null and b/src/assets/logo-metalico.png differ diff --git a/src/assets/white-dove.webp b/src/assets/white-dove.webp new file mode 100644 index 0000000..6108d5e Binary files /dev/null and b/src/assets/white-dove.webp differ diff --git a/src/components/BoxContainer.astro b/src/components/BoxContainer.astro new file mode 100644 index 0000000..000aa21 --- /dev/null +++ b/src/components/BoxContainer.astro @@ -0,0 +1,20 @@ +--- +const { props } = Astro.props; +import { Icon } from "astro-icon/components"; +import Button from "./ui/Button.astro"; + +--- +
+ +

{props.title}

+

{props.copy}

+ + {props.hasButton && ( +
+ \ No newline at end of file diff --git a/src/components/HeroHome.astro b/src/components/HeroHome.astro index 3ab9fee..d8b755d 100644 --- a/src/components/HeroHome.astro +++ b/src/components/HeroHome.astro @@ -1,11 +1,43 @@ --- -import HeroImage from '../assets/hero-image.webp'; +import Header from './Header.astro'; --- -
-
-
- Hero Image +
+
+
+
+
+
+ Logo Metalico +
+
+

+ Dr. José Benjamín
Pérez Matos +

+
Lider Fundador
+
+
+
+
+

+ “El sueño de mi vida es ver cumplida la visión de los + profetas: un mundo de justicia y paz para el bien de + Israel y de toda la humanidad.” +

+
+ White Dove +
+
+
+
-
-
\ No newline at end of file +
diff --git a/src/components/InfoSection.astro b/src/components/InfoSection.astro new file mode 100644 index 0000000..2622440 --- /dev/null +++ b/src/components/InfoSection.astro @@ -0,0 +1,16 @@ +--- +import Button from "./ui/Button.astro"; +import { infoboxes } from "../data/content/infosection.js"; +import BoxContainer from "./BoxContainer.astro"; + +const { data } = Astro.props; +--- + +
+
+ { infoboxes.map((box) => ( + + ))} +
+ +
diff --git a/src/components/NewsCard.astro b/src/components/NewsCard.astro index 3e4705b..00489d8 100644 --- a/src/components/NewsCard.astro +++ b/src/components/NewsCard.astro @@ -4,20 +4,20 @@ import { Icon } from "astro-icon/components"; import dayjs from "dayjs"; const { data } = Astro.props; -const nicedate = dayjs(data.date).format("D MMMM YYYY"); +const nicedate = dayjs(data.data.date).format("D MMMM YYYY"); ---

- {data.city}, {data.country}
({nicedate}): + {data.data.city}, {data.data.country}
({nicedate}):

-

{data.title}

+

{data.data.title}

{data.title}
diff --git a/src/components/NewsSection.astro b/src/components/NewsSection.astro index 9d3a574..853e6c7 100644 --- a/src/components/NewsSection.astro +++ b/src/components/NewsSection.astro @@ -12,7 +12,7 @@ const newsItems = await getCollection("news");
{ newsItems.map((item) => ( - + )) }
diff --git a/src/data/content/infosection.js b/src/data/content/infosection.js new file mode 100644 index 0000000..afe6b2c --- /dev/null +++ b/src/data/content/infosection.js @@ -0,0 +1,32 @@ +export const infoboxes = [ + { + title: 'Caja 1', + copy: 'Lorem ipsum dolor sit amet', + bgColor: '#CBA16A', + titleColor: '#003421', + textColor: '#003421', + buttonBgColor: '', + buttonLabelColor: '', + buttonLabel: '', + hasButton: true, + hasInput: false + }, + // { + // title: 'Caja 2', + // copy: 'Lorem ipsum dolor sit amet', + // bg: '#003421', + // img: '' + // }, + // { + // title: 'Caja 3', + // copy: 'Lorem ipsum dolor sit amet', + // bg: '#EBE6D2' + // } +] + +// bg +// heading color +// text color +// hasButton = boolean +// hasInput = boolean +// bgImage \ No newline at end of file diff --git a/src/layouts/MainLayout.astro b/src/layouts/MainLayout.astro index d6c0551..2f2611b 100644 --- a/src/layouts/MainLayout.astro +++ b/src/layouts/MainLayout.astro @@ -9,9 +9,6 @@ const { title } = Astro.props; -
-
-
diff --git a/src/pages/index.astro b/src/pages/index.astro index 44175d0..ded7ee1 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -6,6 +6,9 @@ import HeroHome from "../components/HeroHome.astro"; import NewsSection from "../components/NewsSection.astro"; import ParticipateSection from "../components/ParticipateSection.astro"; import CarouselSection from "../components/CarouselSection.astro"; +import InfoSection from "../components/InfoSection.astro"; + +import { infoboxes } from "../data/content/infosection.js"; const carouselImages2 = [ "https://picsum.photos/1920/800?random=1&grayscale", @@ -17,9 +20,13 @@ const carouselImages2 = [ + + + + diff --git a/src/pages/news/[id].astro b/src/pages/news/[id].astro index 6a70e65..c5b9b2d 100644 --- a/src/pages/news/[id].astro +++ b/src/pages/news/[id].astro @@ -1,5 +1,7 @@ --- -import "../../styles/global.css"; +import MainLayout from "../../layouts/MainLayout.astro"; + +import CarouselSection from "../../components/CarouselSection.astro"; import { Image } from "@unpic/astro"; import { getCollection, render } from 'astro:content'; // 1. Generate a new path for every collection entry @@ -15,16 +17,7 @@ const { post } = Astro.props; const { Content } = await render(post); --- - - - - - - - - Astro - - +

Astro

{post.data.title}

{post.data.title} + { post.data.gallery && ( + + )} - - + \ No newline at end of file diff --git a/src/styles/global.css b/src/styles/global.css index a07e504..fb1b682 100644 --- a/src/styles/global.css +++ b/src/styles/global.css @@ -7,7 +7,7 @@ --color-primary: #EBE6D2; --color-secondary: #CBA16A; - --color-thirdary: #003421; + --color-tertiary: #003421; --color-link: #CBA16A; } diff --git a/src/types/BoxContainer.ts b/src/types/BoxContainer.ts new file mode 100644 index 0000000..e69de29