Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/update page usages #1673

Merged
merged 2 commits into from
Dec 13, 2023
Merged

Feat/update page usages #1673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c795b2
Update page usages
nkokla Dec 6, 2023
04d51eb
Alphabet sort for usage applications cards
nkokla Dec 6, 2023
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
5 changes: 5 additions & 0 deletions next.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ const redirection = async () => [
source: '/donnees-nationales/utilisateurs',
destination: '/donnees-nationales/usages',
permanent: true
},
{
source: '/donnees-nationales/base-usages',
destination: '/donnees-nationales/usages',
permanent: true
}
]

Expand Down
135 changes: 0 additions & 135 deletions pages/donnees-nationales/base-usages.js
View file
Open in desktop

This file was deleted.

160 changes: 115 additions & 45 deletions pages/donnees-nationales/usages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,71 +1,141 @@
import {Users, Mail} from 'react-feather'

import {useState, useMemo} from 'react'
import {Users} from 'react-feather'
import camelCase from 'lodash/camelCase'
import Page from '@/layouts/main'

import Head from '@/components/head'
import Section from '@/components/section'
import ButtonLink from '@/components/button-link'
import UsersBAN from '@/components/donnees-nationales/users-ban'
import SectionText from '@/components/section-text'
import AppCard from '@/components/donnees-nationales/app-card'
import ButtonLink from '@/components/button-link'

import appsDataSource from '@/data/partners/usecases-ban.json'

const sortByKey = key => (a, b) => ((a[key] < b[key]) && -1) || ((a[key] > b[key]) && 1) || 0

const appsData = appsDataSource.map(
appData => Object.fromEntries(
Object
.entries(appData)
.filter(([key]) => key)
.map(([key, value]) => [camelCase(key), value])
)
)

const filterCategories = [...new Set(appsData.map(({categorieApplication}) => categorieApplication))]
const filterStatuts = [...new Set(appsData.map(({statutIntegration}) => statutIntegration))]
const filterTypes = [...new Set(appsData.map(({typeIntegration}) => typeIntegration))]

function BaseUsages() {
const [categorieFilter, setCategorieFilter] = useState('')
const [statutFilter, setStatutFilter] = useState('')
const [typeFilter, setTypeFilter] = useState('')
const [searchTerm, setSearchTerm] = useState('')

import usersData from '@/data/partners/users-ban.json'
const filteredApps = useMemo(() => appsData.filter(({
categorieApplication,
statutIntegration,
typeIntegration,
nomApplication,
descriptionUtilisation,
tagsApplication,
}) =>
(categorieFilter === '' || categorieApplication === categorieFilter) &&
(statutFilter === '' || statutIntegration === statutFilter) &&
(typeFilter === '' || typeIntegration === typeFilter) &&
(searchTerm === '' ||
(
(nomApplication && nomApplication.toLowerCase().includes(searchTerm.toLowerCase())) ||
(descriptionUtilisation && descriptionUtilisation.toLowerCase().includes(searchTerm.toLowerCase())) ||
(tagsApplication && tagsApplication.split(', ').some(tag => tag.toLowerCase().includes(searchTerm.toLowerCase())))
)
)
).sort(sortByKey('nomApplication')), [categorieFilter, statutFilter, typeFilter, searchTerm])

function Reutilisateurs() {
const title = 'Usages de la BAN'
const title = 'Liste des usages de la BAN'
const description = 'Fichiers nationaux contenant les adresses du territoire.'

return (
<Page title={title} description={description}>
<Head title={title} icon={<Users size={56} alt='' aria-hidden='true' />} />

<Section title='Une donnée d’intérêt général' background='grey'>
<SectionText>
L’adresse est une donnée d’intérêt général, son utilisation est un enjeu dans de nombreux domaines :<br />services publics, services de sécurité et de secours, gestionnaires de réseaux, services de livraison, de localisation et navigation, services clients et geomarketing , assurances…
</SectionText>
</Section>
<div className='container'>

<Section title='Quelques exemples parmi les milliers d’usages réguliers de la BAN'>
<div className='re-users-section'>
<UsersBAN data={usersData} />
<div className='filters'>
<select onChange={e => setCategorieFilter(e.target.value)}>
<option value=''>Toutes les catégories</option>
{filterCategories.map(categorie => (<option key={categorie} value={categorie}>{categorie}</option>))}
</select>
<select onChange={e => setStatutFilter(e.target.value)}>
<option value=''>Tous les statuts</option>
{filterStatuts.map(statut => (<option key={statut} value={statut}>{statut}</option>))}
</select>
<select onChange={e => setTypeFilter(e.target.value)}>
<option value=''>Tous les modes</option>
{filterTypes.map(type => (<option key={type} value={type}>{type}</option>))}
</select>
<input
type='text'
placeholder='Rechercher...'
value={searchTerm}
onChange={e => setSearchTerm(e.target.value)}
className='filter-search'
/>
</div>
</Section>

<Section subtitle='Retrouvez plusieurs cas d’usages de la BAN sur notre Blog' background='grey'>
<div className='blog-button'>
<ButtonLink href='https://adresse.data.gouv.fr/blog'>
Ouvrir le Blog
</ButtonLink>
</div>
</Section>

<Section subtitle='Pour apparaître dans cette liste d’utilisateurs, contactez-nous :'>
<div className='contact-button'>
<ButtonLink href='mailto:[email protected]' isExternal>
Contactez-nous
<Mail style={{verticalAlign: 'bottom', marginLeft: '4px'}} alt='' aria-hidden='true' />
</ButtonLink>
<div className='cards'>
{filteredApps.map(appDescription => <AppCard key={appDescription.idApplication} {...appDescription} />)}
</div>
</Section>

<style jsx>{`

.re-users-section {
padding-top: 2em;
}

.contact-button {
padding-top: 2em;
text-align: center;
}
<Section title='Vous utilisez la Base Adresse Nationale ?'>
<SectionText>
<p>Faites nous part de votre usage et faites apparaître votre application sur cette page</p>
</SectionText>

.blog-button {
padding-top: 2em;
text-align: center;
}
<div className='centered'>
<ButtonLink
href='mailto:[email protected]?subject=Ajout d’un cas d’usage - Base Adresse Nationale'
isExternal
>
Ajoutez votre application
</ButtonLink>
</div>
</Section>

`}</style>
<style jsx>{`
.container {
max-width: 1300px;
margin: 0 auto;
padding: 2rem;
}
.filters {
display: flex;
width: 100%;
flex-wrap: wrap;
justify-content: start;
gap: 1rem;
margin-bottom: 2rem;
}
.filter-search {
flex: 1;
min-width: 15em;
}
.cards {
display: grid;
grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
gap: 1rem;
}
.centered {
margin: 40px auto;
display: flex;
justify-content: center;
}
`}</style>
</div>
</Page>
)
}

export default Reutilisateurs
export default BaseUsages
Loading