Skip to content

Commit b2b4506

Browse files
Copilotneilime
andcommitted
Complete pages restructuring - home and brand-guidelines
Co-authored-by: neilime <314088+neilime@users.noreply.github.com>
1 parent 3135469 commit b2b4506

4 files changed

Lines changed: 34 additions & 42 deletions

File tree

application/src/pages/brand-guidelines/_content.astro

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import Layout from '~/layouts/PageLayout.astro';
33
import HeroText from '~/components/widgets/HeroText.astro';
44
import Features3 from '~/components/widgets/Features3.astro';
5-
import Content from '~/components/widgets/Content.astro';
5+
import ContentWidget from '~/components/widgets/Content.astro';
66
77
interface Props {
88
metadata: any;
@@ -95,7 +95,7 @@ const { metadata, hero, colorPalette, typography, logoDownloads, usageGuidelines
9595
/>
9696

9797
<!-- Usage Guidelines -->
98-
<Content tagline={usageGuidelines.tagline} title={usageGuidelines.title} items={[...usageGuidelines.items]}>
98+
<ContentWidget tagline={usageGuidelines.tagline} title={usageGuidelines.title} items={[...usageGuidelines.items]}>
9999
<Fragment slot="content">
100100
<h3 class="text-2xl font-bold tracking-tight dark:text-white sm:text-3xl mb-2">
101101
{usageGuidelines.contentTitle}
@@ -108,7 +108,7 @@ const { metadata, hero, colorPalette, typography, logoDownloads, usageGuidelines
108108
<Fragment slot="bg">
109109
<div class="absolute inset-0 bg-blue-50 dark:bg-transparent"></div>
110110
</Fragment>
111-
</Content>
111+
</ContentWidget>
112112

113113
<!-- Note Section -->
114114
<section class="px-4 py-16 sm:px-6 mx-auto lg:px-8 lg:py-20 max-w-4xl">

application/src/pages/en/index.astro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import Content from '../home/_content.astro';
99
hero={t.hero}
1010
note={t.note}
1111
features={t.features}
12-
content={t.content}
12+
contentSection={t.content}
1313
steps={t.steps}
1414
stats={t.stats}
1515
callToAction={t.callToAction}

application/src/pages/fr/index.astro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import Content from '../home/_content.astro';
99
hero={t.hero}
1010
note={t.note}
1111
features={t.features}
12-
content={t.content}
12+
contentSection={t.content}
1313
steps={t.steps}
1414
stats={t.stats}
1515
callToAction={t.callToAction}

application/src/pages/home/_content.astro

Lines changed: 29 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import Hero from '~/components/widgets/Hero.astro';
33
import Note from '~/components/widgets/Note.astro';
44
import Features from '~/components/widgets/Features.astro';
55
import Steps from '~/components/widgets/Steps.astro';
6-
import Content from '~/components/widgets/Content.astro';
6+
import ContentWidget from '~/components/widgets/Content.astro';
77
import Stats from '~/components/widgets/Stats.astro';
88
import CallToAction from '~/components/widgets/CallToAction.astro';
99
import CountDown from '~/components/widgets/CountDown.astro';
@@ -13,13 +13,13 @@ export interface Props {
1313
hero: any;
1414
note: any;
1515
features: any;
16-
content: any;
16+
contentSection: any;
1717
steps: any;
1818
stats: any;
1919
callToAction: any;
2020
}
2121
22-
const { hero, note, features, content, steps, stats, callToAction } = Astro.props;
22+
const { hero, note, features, contentSection, steps, stats, callToAction } = Astro.props;
2323
2424
const heroActionsWithPermalinks = hero.actions.map((action: any) => ({
2525
...action,
@@ -32,16 +32,13 @@ const callToActionActionsWithPermalinks = callToAction.actions.map((action: any)
3232
}));
3333
---
3434

35-
<Hero actions={heroActionsWithPermalinks} image={hero.image}>
36-
<Fragment slot="title">
37-
{hero.title.main} <br />
38-
<span class="text-accent dark:text-white">{hero.title.date}</span> {hero.title.location}
39-
<CountDown eventDate={hero.eventDate} />
40-
</Fragment>
41-
42-
<Fragment slot="subtitle">
43-
{hero.subtitle}
44-
</Fragment>
35+
<Hero
36+
actions={heroActionsWithPermalinks}
37+
image={hero.image}
38+
>
39+
<Fragment slot="title" set:html={hero.title} />
40+
<Fragment slot="subtitle" set:text={hero.subtitle} />
41+
<CountDown slot="title" eventDate={hero.eventDate} />
4542
</Hero>
4643

4744
<Note title={note.title} description={note.description} />
@@ -54,30 +51,25 @@ const callToActionActionsWithPermalinks = callToAction.actions.map((action: any)
5451
items={[...features.items]}
5552
/>
5653

57-
<Content
58-
isReversed={content.isReversed}
59-
tagline={content.tagline}
60-
title={content.title}
61-
items={[...content.items]}
62-
image={content.image}
63-
>
64-
<Fragment slot="content">
65-
<h3 class="text-2xl font-bold tracking-tight dark:text-white sm:text-3xl mb-2">{content.contentTitle}</h3>
66-
{content.contentDescription}
67-
</Fragment>
68-
<Fragment slot="bg">
69-
<div class="absolute inset-0 bg-blue-50 dark:bg-transparent"></div>
70-
</Fragment>
71-
</Content>
72-
73-
<Steps title={steps.title} items={[...steps.items]} image={steps.image} />
54+
<ContentWidget
55+
tagline={contentSection.tagline}
56+
title={contentSection.title}
57+
items={[...contentSection.items]}
58+
image={contentSection.image}
59+
/>
7460

75-
<Stats stats={[...stats.stats]} />
61+
<Steps
62+
title={steps.title}
63+
items={[...steps.items]}
64+
image={steps.image}
65+
/>
7666

77-
<CallToAction actions={callToActionActionsWithPermalinks}>
78-
<Fragment slot="title">{callToAction.title}</Fragment>
67+
<Stats
68+
stats={[...stats.items]}
69+
/>
7970

80-
<Fragment slot="subtitle">
81-
{callToAction.subtitle}
82-
</Fragment>
83-
</CallToAction>
71+
<CallToAction
72+
title={callToAction.title}
73+
subtitle={callToAction.subtitle}
74+
actions={callToActionActionsWithPermalinks}
75+
/>

0 commit comments

Comments
 (0)