Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions netlify.toml
Original file line number Diff line number Diff line change
Expand Up @@ -278,3 +278,11 @@
from = "/data-challenge-4844/apply/"
to = "/data-challenge-4844/"
force = true
[[redirects]]
from = "/devcon-grants/apply/"
to = "/devcon-grants/"
force = true
[[redirects]]
from = "/devcon-grants/thank-you/"
to = "/devcon-grants/"
force = true
10 changes: 6 additions & 4 deletions src/components/UI/common/BannerApplicationClosed.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ interface Props extends ChakraProps {
children?: React.ReactNode;
title?: React.ReactNode;
description?: React.ReactNode;
hideDescription?: boolean;
}

export const BannerApplicationClosed: FC<Props> = ({ children, title, description, ...props }) => {
export const BannerApplicationClosed: FC<Props> = ({ children, title, description, hideDescription, ...props }) => {
return (
<Banner
bgGradient='linear(to-br, brand.closedBanner.bgGradient.start 10%, brand.closedBanner.bgGradient.end 100%)'
Expand All @@ -20,14 +21,15 @@ export const BannerApplicationClosed: FC<Props> = ({ children, title, descriptio
borderRadius='xl'
flexDirection='column'
textAlign='center'
gap={2}
{...props}
>
<Heading fontSize='h4' fontWeight={700} mb={2}>
<Heading fontSize='h4' fontWeight={700}>
{title || 'Applications for this grant wave are closed.'}
</Heading>

<Text fontSize='paragraph' fontWeight={300}>
{description || (
{!hideDescription && (description || (
<>
If you&apos;re still interested in pursuing grants for a project, you can still go
through our{' '}
Expand All @@ -41,7 +43,7 @@ export const BannerApplicationClosed: FC<Props> = ({ children, title, descriptio
</Link>
.
</>
)}
))}
</Text>

{children}
Expand Down
2 changes: 1 addition & 1 deletion src/pages/_app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ function MyApp({ Component, pageProps }: AppProps) {
</Head>

<ChakraProvider theme={theme}>
<Banners />
{/* <Banners /> */}

<Layout
position='relative'
Expand Down
50 changes: 0 additions & 50 deletions src/pages/devcon-grants/apply.tsx

This file was deleted.

13 changes: 4 additions & 9 deletions src/pages/devcon-grants/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ import {
PageText,
PageMetadata,
OrderedList,
ReadyToApply
ReadyToApply,
BannerApplicationClosed
} from '../../components/UI';

import {
Expand All @@ -29,7 +30,6 @@ const DevconGrants: NextPage = () => {
const [ref4, inView4] = useInView({ threshold: 0.5, initialInView: false });
const [ref5, inView5] = useInView({ threshold: 0.3, initialInView: false });
const [ref6, inView6] = useInView({ threshold: 0.5, initialInView: false });
const [ref7, inView7] = useInView({ threshold: 0.5, initialInView: false });
return (
<>
<PageMetadata
Expand All @@ -50,11 +50,12 @@ const DevconGrants: NextPage = () => {
inView4,
inView5,
inView6,
inView7,
]}
/>

<Box w={{ lg: '70%' }} px={{ md: 20 }} pr={{ lg: 12 }}>
<BannerApplicationClosed mb={12} title="Applications for Destino Devconnect Support are closed." hideDescription />

<Stack mb={8} mt={{ base: 10, md: 0 }}>
<section id='description' ref={ref}>
<PageSubheading mb={8}>What is Destino Devconnect Support?</PageSubheading>
Expand Down Expand Up @@ -187,12 +188,6 @@ const DevconGrants: NextPage = () => {
.
</PageText>
</section>

<section id='apply' ref={ref7}>
<Stack mt={6}>
<ReadyToApply link={`${DEVCON_GRANTS_APPLY_URL}`} />
</Stack>
</section>
</Stack>
</Box>
</Flex>
Expand Down
59 changes: 0 additions & 59 deletions src/pages/devcon-grants/thank-you.tsx

This file was deleted.