Skip to content

Commit

Permalink
Merge branch 'dev-barry' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
@bbrands02
bbrands02 committed Jun 28, 2021
2 parents 2c90c5a + 3ede492 commit b9ca59d
Show file tree
Hide file tree
Showing 7 changed files with 290 additions and 308 deletions.
6 changes: 1 addition & 5 deletions src/components/Logos/index.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion src/components/Payoff/index.en.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import {
StyledImage
} from './index.styles.js'
import ResponsiveImage from '../ResponsiveImage'
import couple_on_bike_near_city from '../../images/couple_on_bike_near_city.svg'

const Payoff = () => (
<StyledContainer>
Expand Down
1 change: 0 additions & 1 deletion src/components/Payoff/index.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import React from 'react'
import { StyledContainer, StyledSubParagraph, StyledTextContainer, StyledHeading, StyledParagraph, StyledIntro, StyledImage } from './index.styles.js'
import ResponsiveImage from '../ResponsiveImage'
import couple_on_bike_near_city from '../../images/couple_on_bike_near_city.svg'

const Payoff = () => (
<StyledContainer>
Expand Down
258 changes: 133 additions & 125 deletions src/pages/index.en.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,154 +16,162 @@ import Background from '../components/Background'
import Logos from '../components/Logos'
import Timeline from '../components/Timeline'

import casesImage from '../images/undraw_file_analysis_8k9b.svg'
import selectionImage from '../images/undraw_personal_settings_kihd.svg'
import authorizationImage from '../images/undraw_two_factor_authentication_namy.svg'
import dashboardImage from '../images/undraw_dashboard_nklg.svg'
import integrationImage from '../images/undraw_hologram_fjwp.svg'

const IndexPage = ({ location }) => (
<Layout>
<SEO title="Proto component commonground"/>
<Background backgroundColor="white">
<Container>
{/*<Navigation as="nav" location={location} />*/}
<Navigation as="nav" location={location}/>
<Section>
<Payoff />
<Payoff/>
</Section>
</Container>
</Background>
{/*<Background backgroundColor="#2A5587">*/}
{/* <Container>*/}
{/* <Logos />*/}
{/* <Logos/>*/}
{/* </Container>*/}
{/*</Background>*/}
<Container>
<Section id="about-demodam">
<Section id="over-demodam">
<Flex>
<Box>
<h2>Introduction</h2>
<p>With the wedding planner we develop a tool that makes planning a wedding easier
makes for future bridal couples. So that they can record location, date and wedding official digitally
can plan, just from the couch, during the weekend, without having to contact the municipality for it
need for additional explanation.
</p>
<h2>Inleiding</h2>
<p>
When planning a wedding, a notification is immediately sent, and checks are immediately made
performed on being allowed to marry. In this way, respondents immediately know whether there are any objections. It
file, including notification, is submitted for processing in the BRP and BS. Citizens becomes
better served digitally, and actions for civil servants are limited (savings).
</p> </Box>
</Flex>
</Section>

<Section>
<Flex>
<Box width={2/5}>
<ResponsiveImage src={casesImage} alt="Illustratie van persoon en document" />
Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam
rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt
explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia
consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui
dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora
incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum
exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem
vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui
dolorem eum fugiat quo voluptas nulla pariatur?
</p>
</Box>
<Box width={3/5}>
<h2>History</h2>
<p>The wedding planner project arose from a merger of projects from the
municipality of Utrecht and the covenant municipalities. These projects had such a lot of overlap and
connected that in the context of common ground and together they organize being together
gone. </p></Box>
</Flex>
</Section>

<Section>
<Flex>
<Box width={3/5}>
<h2>Who</h2>
<p>The wedding planner project is being developed in co-creation by a number of parties.
Utrecht, Almere and Hoorn are participating from the municipalities. Conduction is from the start
involved as a developing party and during the process, Eend joined as
expert on the front end.
</p> </Box>
<Box width={2/5}>
<ResponsiveImage src={selectionImage} alt="Illustratie van documenten met checklist" />
</Box>
</Flex>
</Section>
{/*<Section textAlign="center">*/}
{/* <iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/jTK-sbee2qM" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>*/}
{/*</Section>*/}

{/*<Section>*/}
{/* <Flex>*/}
{/* <Box width={2 / 5}>*/}
{/* <ResponsiveImage src={casesImage} alt="Illustratie van persoon en document"/>*/}
{/* </Box>*/}
{/* <Box width={3 / 5}>*/}
{/* <h2>Historie</h2>*/}
{/* <p>Het huwelijksplanner project is voortgekomen uit een samenvoeging van projecten van de*/}
{/* gemeente Utrecht en de convenant gemeenten. Deze projecten hadden dermate veel overlap en*/}
{/* aansluiting hadden dat in het kader van common ground en samen organiseren ze samen zijn*/}
{/* gegaan.</p>*/}
{/* </Box>*/}
{/* </Flex>*/}
{/*</Section>*/}

{/*<Section>*/}
{/* <Flex>*/}
{/* <Box width={3 / 5}>*/}
{/* <h2>Wie</h2>*/}
{/* <p>Het huwelijksplanner project wordt in co-creatie ontwikkeld door een aantal partijen.*/}
{/* Vanuit de gemeenten nemen Utrecht, Almere en Hoorn deel. Conduction is vanaf het begin*/}
{/* betrokken als ontwikkelende partij en gedurende het traject is daar Eend bij gekomen als*/}
{/* expert op de front-end.*/}
{/* </p>*/}
{/* </Box>*/}
{/* <Box width={2 / 5}>*/}
{/* <ResponsiveImage src={selectionImage} alt="Illustratie van documenten met checklist"/>*/}
{/* </Box>*/}
{/* </Flex>*/}
{/*</Section>*/}

</Container>
<Background backgroundColor="#2A5587">
<Container>
<Section>
<Heading align="center" fontSize="2rem">Roadmap</Heading>
</Section>
</Container>
</Background>
<Container>
<Timeline>
<Timeline.ContainerGreen align="left">
<Timeline.Content>
{/*<Span fontSize="0.9rem">Juni 2021</Span>*/}
<Heading as="h3" fontSize="1.5rem">Result</Heading>
<p>Mapping current results of Utrecht and the Covenant Municipalities</p>
</Timeline.Content>
</Timeline.ContainerGreen>
<Timeline.ContainerGreen align="right">
<Timeline.Content>
{/*<Span fontSize="0.9rem">Juni 2021</Span>*/}
<Heading as="h3" fontSize="1.5rem">Regroup</Heading>
<p>Who is going to do what and when</p>
</Timeline.Content>
</Timeline.ContainerGreen>
<Timeline.ContainerGreen align="left">
<Timeline.Content>
{/*<Span fontSize="0.9rem">Juni 2021</Span>*/}
<Heading as="h3" fontSize="1.5rem">BPMn developing wedding <br/> process</Heading>
{/*<p>Wie gaat wat doen en wanneer</p>*/}
</Timeline.Content>
</Timeline.ContainerGreen>
<Timeline.ContainerGreen align="right">
<Timeline.Content>
{/*<Span fontSize="0.9rem">Juni 2021</Span>*/}
<Heading as="h3" fontSize="1.5rem">Better connection to <br/> Common Ground</Heading>
{/*<p>Wie gaat wat doen en wanneer</p>*/}
</Timeline.Content>
</Timeline.ContainerGreen>
<Timeline.ContainerGreen align="left">
<Timeline.Content>
{/*<Span fontSize="0.9rem">Juni 2021</Span>*/}
<Heading as="h3" fontSize="1.5rem">User research with fidelity</Heading>
{/*<p>Wie gaat wat doen en wanneer</p>*/}
</Timeline.Content>
</Timeline.ContainerGreen>
<Timeline.ContainerGreen align="right">
<Timeline.Content>
{/*<Span fontSize="0.9rem">Juni 2021</Span>*/}
<Heading as="h3" fontSize="1.5rem">UX redesign of the customer <br/> journey</Heading>
{/*<p>Wie gaat wat doen en wanneer</p>*/}
</Timeline.Content>
</Timeline.ContainerGreen>
<Timeline.ContainerGreen align="left">
<Timeline.Content>
{/*<Span fontSize="0.9rem">Juni 2021</Span>*/}
<Heading as="h3" fontSize="1.5rem">Drawing up implementation <br/>roadmap</Heading>
{/*<p>Wie gaat wat doen en wanneer</p>*/}
</Timeline.Content>
</Timeline.ContainerGreen>
<Timeline.Container align="right">
<Timeline.Content>
{/*<Span fontSize="0.9rem">Juni 2021</Span>*/}
<Heading as="h3" fontSize="1.5rem">Development user interface <br/> “free marriage”
</Heading>
{/*<p>Wie gaat wat doen en wanneer</p>*/}
</Timeline.Content>
</Timeline.Container>
<Timeline.Container align="left">
<Timeline.Content>
{/*<Span fontSize="0.9rem">Juni 2021</Span>*/}
<Heading as="h3" fontSize="1.5rem">Implementation <br/> “free marriage”
</Heading>
{/*<p>Wie gaat wat doen en wanneer</p>*/}
</Timeline.Content>
</Timeline.Container>
</Timeline>
</Container>
<Footer location={location} />
{/*<Background backgroundColor="#2A5587">*/}
{/* <Container>*/}
{/* <Section>*/}
{/* <Heading align="center" fontSize="2rem">Roadmap</Heading>*/}
{/* </Section>*/}
{/* </Container>*/}
{/*</Background>*/}
{/*<Container>*/}
{/* <Timeline>*/}
{/*<Timeline.Container align="left">*/}
{/* <Timeline.Content>*/}
{/* <Span fontSize="0.9rem">Juni 2021</Span>*/}
{/* <Heading as="h3" fontSize="1.5rem">Kick-off Demodam</Heading>*/}
{/* <p>Lancering van Demodam</p>*/}
{/* </Timeline.Content>*/}
{/*</Timeline.Container>*/}
{/* <Timeline.ContainerGreen align="left">*/}
{/* <Timeline.Content>*/}
{/* /!*<Span fontSize="0.9rem">Juni 2021</Span>*!/*/}
{/* <Heading as="h3" fontSize="1.5rem">Resultaat</Heading>*/}
{/* <p>Huidige resultaten Utrecht en Convenant gemeenten in kaart brengen</p>*/}
{/* </Timeline.Content>*/}
{/* </Timeline.ContainerGreen>*/}
{/* <Timeline.ContainerGreen align="right">*/}
{/* <Timeline.Content>*/}
{/* /!*<Span fontSize="0.9rem">Juni 2021</Span>*!/*/}
{/* <Heading as="h3" fontSize="1.5rem">Hergroeperen</Heading>*/}
{/* <p>Wie gaat wat doen en wanneer</p>*/}
{/* </Timeline.Content>*/}
{/* </Timeline.ContainerGreen>*/}
{/* <Timeline.ContainerGreen align="left">*/}
{/* <Timeline.Content>*/}
{/* /!*<Span fontSize="0.9rem">Juni 2021</Span>*!/*/}
{/* <Heading as="h3" fontSize="1.5rem">BPMn trouwproces ontwikkelen</Heading>*/}
{/* /!*<p>Wie gaat wat doen en wanneer</p>*!/*/}
{/* </Timeline.Content>*/}
{/* </Timeline.ContainerGreen>*/}
{/* <Timeline.ContainerGreen align="right">*/}
{/* <Timeline.Content>*/}
{/* /!*<Span fontSize="0.9rem">Juni 2021</Span>*!/*/}
{/* <Heading as="h3" fontSize="1.5rem">Betere aansluiting bij <br/> Common Ground</Heading>*/}
{/* /!*<p>Wie gaat wat doen en wanneer</p>*!/*/}
{/* </Timeline.Content>*/}
{/* </Timeline.ContainerGreen>*/}
{/* <Timeline.ContainerGreen align="left">*/}
{/* <Timeline.Content>*/}
{/* /!*<Span fontSize="0.9rem">Juni 2021</Span>*!/*/}
{/* <Heading as="h3" fontSize="1.5rem">Gebruikersonderzoek met <br/> trouw stellen</Heading>*/}
{/* /!*<p>Wie gaat wat doen en wanneer</p>*!/*/}
{/* </Timeline.Content>*/}
{/* </Timeline.ContainerGreen>*/}
{/* <Timeline.ContainerGreen align="right">*/}
{/* <Timeline.Content>*/}
{/* /!*<Span fontSize="0.9rem">Juni 2021</Span>*!/*/}
{/* <Heading as="h3" fontSize="1.5rem">UX redesign van de klantreis</Heading>*/}
{/* /!*<p>Wie gaat wat doen en wanneer</p>*!/*/}
{/* </Timeline.Content>*/}
{/* </Timeline.ContainerGreen>*/}
{/* <Timeline.ContainerGreen align="left">*/}
{/* <Timeline.Content>*/}
{/* /!*<Span fontSize="0.9rem">Juni 2021</Span>*!/*/}
{/* <Heading as="h3" fontSize="1.5rem">Opstellen implementatie <br/> routekaart</Heading>*/}
{/* /!*<p>Wie gaat wat doen en wanneer</p>*!/*/}
{/* </Timeline.Content>*/}
{/* </Timeline.ContainerGreen>*/}
{/* <Timeline.Container align="right">*/}
{/* <Timeline.Content>*/}
{/* /!*<Span fontSize="0.9rem">Juni 2021</Span>*!/*/}
{/* <Heading as="h3" fontSize="1.5rem">Ontwikkeling user interface <br/>“gratis trouwen”*/}
{/* </Heading>*/}
{/* /!*<p>Wie gaat wat doen en wanneer</p>*!/*/}
{/* </Timeline.Content>*/}
{/* </Timeline.Container>*/}
{/* <Timeline.Container align="left">*/}
{/* <Timeline.Content>*/}
{/* /!*<Span fontSize="0.9rem">Juni 2021</Span>*!/*/}
{/* <Heading as="h3" fontSize="1.5rem">Implementatie <br/> “gratis trouwen”*/}
{/* </Heading>*/}
{/* /!*<p>Wie gaat wat doen en wanneer</p>*!/*/}
{/* </Timeline.Content>*/}
{/* </Timeline.Container>*/}
{/*</Timeline>*/}
{/*</Container>*/}
<Footer/>
</Layout>
)

Expand Down
6 changes: 0 additions & 6 deletions src/pages/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@ import Background from '../components/Background'
import Logos from '../components/Logos'
import Timeline from '../components/Timeline'

import casesImage from '../images/undraw_file_analysis_8k9b.svg'
import selectionImage from '../images/undraw_personal_settings_kihd.svg'
import authorizationImage from '../images/undraw_two_factor_authentication_namy.svg'
import dashboardImage from '../images/undraw_dashboard_nklg.svg'
import integrationImage from '../images/undraw_hologram_fjwp.svg'

const IndexPage = ({location}) => (
<Layout>
<SEO title="Proto component commonground"/>
Expand Down
Loading

0 comments on commit b9ca59d

Please sign in to comment.