Skip to content

Commit

Permalink
tests passing
Browse files Browse the repository at this point in the history
  • Loading branch information
silveltman committed Dec 22, 2024
2 parents 4d54710 + 115bed3 commit 1024adc
Show file tree
Hide file tree
Showing 27 changed files with 122 additions and 126 deletions.
14 changes: 6 additions & 8 deletions astro.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,10 @@ export default defineConfig({
}),
svelte(),
],
redirects: {
// '/structure/[...slug]': '/docs/components/[...slug]',
// '/segment/[...slug]': '/docs/components/[...slug]',
// '/typography/[...slug]': '/docs/components/[...slug]',
// '/base/[...slug]': '/docs/components/[...slug]',
// '/overview/theming/': '/docs/customization/',
// '/overview/[...slug]': '/docs/[...slug]',
},
// redirects: {
// '/overview/[...slug]': '/docs/[...slug]',
// '/typography/[...slug]': '/docs/components/[...slug]',
// '/structure/[...slug]': '/docs/structures/[...slug]',
// '/blocks': '/docs/blocks/banner/',
// },
})
3 changes: 2 additions & 1 deletion src/blocks/Banner.astro
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@ import Container from 'fulldev-ui/structures/Container.astro'
interface Props extends BlockSchema {}
const { as = 'header', text, ...rest } = Astro.props
const { text, ...rest } = Astro.props
---

<Element
class:list="banner"
as="header"
{...rest}
>
<Container>
Expand Down
4 changes: 3 additions & 1 deletion src/blocks/Colleagues1.astro
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import Writeup from 'fulldev-ui/structures/Writeup.astro'
interface Props extends BlockSchema {}
const { tagline, heading, paragraph, cards, ...rest } = Astro.props
const { depth = 2, tagline, heading, paragraph, cards, ...rest } = Astro.props
---

<Section
Expand All @@ -28,6 +28,7 @@ const { tagline, heading, paragraph, cards, ...rest } = Astro.props
<Heading
size="3xl"
text={heading}
{depth}
/>
<Paragraph text={paragraph} />
</Writeup>
Expand All @@ -37,6 +38,7 @@ const { tagline, heading, paragraph, cards, ...rest } = Astro.props
<Element class:list="colleagues-card">
<Image {...image} />
<Heading
depth={(depth + 1) as 3}
as="h3"
size="xl"
text={heading}
Expand Down
13 changes: 11 additions & 2 deletions src/blocks/Cta1.astro
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,16 @@ import Writeup from 'fulldev-ui/structures/Writeup.astro'
interface Props extends BlockSchema {}
const { tagline, heading, paragraph, content, button, buttons, image } =
Astro.props
const {
depth = 2,
tagline,
heading,
paragraph,
content,
button,
buttons,
image,
} = Astro.props
---

<Section class:list="cta-1">
Expand All @@ -26,6 +34,7 @@ const { tagline, heading, paragraph, content, button, buttons, image } =
size="5xl"
as="h2"
text={heading}
{depth}
/>
<Paragraph
size="xl"
Expand Down
4 changes: 3 additions & 1 deletion src/blocks/Features1.astro
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import Writeup from 'fulldev-ui/structures/Writeup.astro'
interface Props extends BlockSchema {}
const { tagline, heading, paragraph, cards, ...rest } = Astro.props
const { depth = 2, tagline, heading, paragraph, cards, ...rest } = Astro.props
---

<Section
Expand All @@ -27,6 +27,7 @@ const { tagline, heading, paragraph, cards, ...rest } = Astro.props
<Heading
size="4xl"
text={heading}
{depth}
/>
<Paragraph
size="lg"
Expand All @@ -42,6 +43,7 @@ const { tagline, heading, paragraph, cards, ...rest } = Astro.props
name={icon}
/>
<Heading
depth={(depth + 1) as 3}
as="h3"
size="xl"
text={heading}
Expand Down
4 changes: 3 additions & 1 deletion src/blocks/Features2.astro
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import Writeup from 'fulldev-ui/structures/Writeup.astro'
interface Props extends BlockSchema {}
const { tagline, heading, paragraph, cards, ...rest } = Astro.props
const { depth = 2, tagline, heading, paragraph, cards, ...rest } = Astro.props
---

<Section
Expand All @@ -27,6 +27,7 @@ const { tagline, heading, paragraph, cards, ...rest } = Astro.props
<Heading
size="4xl"
text={heading}
{depth}
/>
<Paragraph
size="lg"
Expand All @@ -42,6 +43,7 @@ const { tagline, heading, paragraph, cards, ...rest } = Astro.props
name={icon}
/>
<Heading
depth={(depth + 1) as 3}
as="h3"
text={heading}
/>
Expand Down
5 changes: 1 addition & 4 deletions src/blocks/Header.astro
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,7 @@ const { logo, links, menus, socials, search, themer, button } = Astro.props
size="sm"
>
<Container>
<Menus
menu={{ links }}
{menus}
/>
<Menus {menus} />
</Container>
</Drawer>
</Element>
Expand Down
3 changes: 2 additions & 1 deletion src/blocks/Hero1.astro
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import Section from 'fulldev-ui/structures/Section.astro'
interface Props extends BlockSchema {}
const {
depth = 2,
chip,
tagline,
heading,
Expand Down Expand Up @@ -43,9 +44,9 @@ const {
text={tagline}
/>
<Heading
as="h1"
size="6xl"
text={heading}
{depth}
/>
<Paragraph
class="text-balance"
Expand Down
3 changes: 2 additions & 1 deletion src/blocks/Intro1.astro
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import Writeup from 'fulldev-ui/structures/Writeup.astro'
interface Props extends BlockSchema {}
const {
depth = 2,
tagline,
heading,
paragraph,
Expand All @@ -35,9 +36,9 @@ const {
text={tagline}
/>
<Heading
as="h1"
size="3xl"
text={heading}
{depth}
/>
<Paragraph text={paragraph} />
<Fragment set:html={content} />
Expand Down
11 changes: 6 additions & 5 deletions src/blocks/JobCategories1.astro
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@ import Container from 'fulldev-ui/structures/Container.astro'
import Matrix from 'fulldev-ui/structures/Matrix.astro'
import Section from 'fulldev-ui/structures/Section.astro'
import Writeup from 'fulldev-ui/structures/Writeup.astro'
import { getHref } from 'fulldev-ui/utils/getHref'
interface Props extends BlockSchema {}
const { heading, button, pages, ...rest } = Astro.props
const { depth = 2, heading, button, cards, ...rest } = Astro.props
---

<Section
Expand All @@ -26,6 +25,7 @@ const { heading, button, pages, ...rest } = Astro.props
<Heading
size="3xl"
text={heading}
{depth}
/>
<Button
size="sm"
Expand All @@ -35,17 +35,18 @@ const { heading, button, pages, ...rest } = Astro.props
</Element>
<Matrix>
{
pages?.map(({ slug, data: { title, list, image } }) => (
cards?.map(({ href, heading, list, image }) => (
<Card
class="p-0"
href={getHref(slug)}
{href}
>
<Image {...image} />
<Writeup class="p-4">
<Heading
depth={(depth + 1) as 3}
as="h2"
size="lg"
text={title}
text={heading}
/>
<List
size="sm"
Expand Down
9 changes: 7 additions & 2 deletions src/blocks/JobCategory1.astro
Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@
---
import type { CollectionEntry } from 'astro:content'
import { getCollection } from 'astro:content'
import Heading from 'fulldev-ui/components/Heading.astro'
import Image from 'fulldev-ui/components/Image.astro'
import List from 'fulldev-ui/components/List.astro'
import Paragraph from 'fulldev-ui/components/Paragraph.astro'
import type { BlockSchema } from 'fulldev-ui/schemas/block'
import Card from 'fulldev-ui/structures/Card.astro'
import Container from 'fulldev-ui/structures/Container.astro'
import Matrix from 'fulldev-ui/structures/Matrix.astro'
import Prose from 'fulldev-ui/structures/Prose.astro'
import Section from 'fulldev-ui/structures/Section.astro'
import { getHref } from 'fulldev-ui/utils/getHref'
interface Props extends BlockSchema {}
interface Props {
slug?: CollectionEntry<'pages'>['slug']
heading?: string | undefined
paragraph?: string | undefined
pages?: CollectionEntry<'pages'>[]
}
const { slug, heading, paragraph, pages, ...rest } = Astro.props
Expand Down
11 changes: 6 additions & 5 deletions src/blocks/Jobs1.astro
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@ import Card from 'fulldev-ui/structures/Card.astro'
import Container from 'fulldev-ui/structures/Container.astro'
import Matrix from 'fulldev-ui/structures/Matrix.astro'
import Section from 'fulldev-ui/structures/Section.astro'
import { getHref } from 'fulldev-ui/utils/getHref'
interface Props extends BlockSchema {}
const { heading, button, pages, ...rest } = Astro.props
const { depth = 2, heading, button, cards, ...rest } = Astro.props
---

<Section
Expand All @@ -24,6 +23,7 @@ const { heading, button, pages, ...rest } = Astro.props
<Heading
size="3xl"
text={heading}
{depth}
/>
<Button
size="sm"
Expand All @@ -33,15 +33,16 @@ const { heading, button, pages, ...rest } = Astro.props
</Element>
<Matrix>
{
pages?.map(({ slug, data: { title, list } }) => (
cards?.map(({ href, heading, list }) => (
<Card
class="jobs-1-card"
href={getHref(slug)}
{href}
>
<Heading
depth={(depth + 1) as 3}
as="h2"
size="lg"
text={title}
text={heading}
/>
<List
size="sm"
Expand Down
3 changes: 2 additions & 1 deletion src/blocks/Logos1.astro
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import Writeup from 'fulldev-ui/structures/Writeup.astro'
interface Props extends BlockSchema {}
const { tagline, heading, paragraph, images, ...rest } = Astro.props
const { depth = 2, tagline, heading, paragraph, images, ...rest } = Astro.props
---

<Section
Expand All @@ -22,6 +22,7 @@ const { tagline, heading, paragraph, images, ...rest } = Astro.props
<Heading
size="xl"
text={heading}
{depth}
/>
<Paragraph
size="sm"
Expand Down
61 changes: 34 additions & 27 deletions src/blocks/Pages1.astro
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,18 @@ import Group from 'fulldev-ui/structures/Group.astro'
import Prose from 'fulldev-ui/structures/Prose.astro'
import Section from 'fulldev-ui/structures/Section.astro'
import Split from 'fulldev-ui/structures/Split.astro'
import { getHref } from 'fulldev-ui/utils/getHref'
interface Props extends BlockSchema {}
const { tagline, heading, paragraph, buttons, content, pages } = Astro.props
const {
depth = 2,
tagline,
heading,
paragraph,
buttons,
content,
cards,
} = Astro.props
---

<Section class="pages-1">
Expand All @@ -29,6 +36,7 @@ const { tagline, heading, paragraph, buttons, content, pages } = Astro.props
as="h2"
size="4xl"
text={heading}
{depth}
/>
<Paragraph
muted
Expand All @@ -45,32 +53,31 @@ const { tagline, heading, paragraph, buttons, content, pages } = Astro.props
</Prose>
<Element class="flex flex-col gap-8">
{
pages?.map(
({ slug, data: { href, image, badges, heading, paragraph } }) => (
<Element
as="a"
href={href || getHref(slug)}
class="flex flex-col gap-2"
>
<Image
class="mb-4"
{...image}
cards?.map(({ href, image, badges, heading, paragraph }) => (
<Element
as="a"
class="flex flex-col gap-2"
{href}
>
<Image
class="mb-4"
{...image}
/>
<Group>
<Badges
size="sm"
{badges}
/>
<Group>
<Badges
size="sm"
{badges}
/>
</Group>
<Heading
as="h3"
size="xl"
text={heading}
/>
<Paragraph text={paragraph} />
</Element>
)
)
</Group>
<Heading
depth={(depth + 1) as 3}
as="h3"
size="xl"
text={heading}
/>
<Paragraph text={paragraph} />
</Element>
))
}
</Element>
</Split>
Expand Down
Loading

0 comments on commit 1024adc

Please sign in to comment.