style(carte): passe l'UI au DSFR

This commit is contained in:
Colin Darie 2024-02-08 17:08:45 +01:00
parent b1203faa69
commit 0bb25765d9
6 changed files with 29 additions and 37 deletions

View file

@ -1,11 +1,6 @@
@import "colors";
@import "constants";
.areas-title {
font-weight: bold;
margin-top: 5px;
margin-bottom: 5px;
}
.areas {
margin-bottom: 10px;

View file

@ -1,8 +1,8 @@
%li{ class: editing ? 'mb-1' : 'flex column mb-2', data: { controller: 'geo-area', geo_area_id_value: geo_area.id } }
%li{ class: editing ? 'fr-mb-1w' : 'flex column fr-mb-2w', data: { controller: 'geo-area', geo_area_id_value: geo_area.id } }
- if editing
= link_to '#', data: { action: 'geo-area#onClick' } do
= geo_area.label
= text_field_tag :description, geo_area.description, data: { action: 'focus->geo-area#onFocus input->geo-area#onInput', geo_area_target: 'description' }, placeholder: 'Description', class: 'no-margin', id: "geo_area_#{geo_area.id}_description"
= text_field_tag :description, geo_area.description, data: { action: 'focus->geo-area#onFocus input->geo-area#onInput', geo_area_target: 'description' }, placeholder: 'Description', class: 'fr-input', id: "geo_area_#{geo_area.id}_description"
- else
= link_to '#', data: { action: 'geo-area#onClick' } do
= geo_area.label

View file

@ -1,5 +1,5 @@
- if champ.selections_utilisateur.present?
.areas-title Sélections utilisateur
.fr-label Sélections utilisateur
.areas
%ul
- champ.selections_utilisateur.slice(0, 20).each do |geo_area|
@ -10,7 +10,7 @@
et #{champ.selections_utilisateur.size - 20} autres points, lignes ou polygones.
- if champ.cadastres.present?
.areas-title Parcelles cadastrales
.fr-label Parcelles cadastrales
.areas
%ul
- champ.cadastres.each do |geo_area|

View file

@ -19,8 +19,11 @@ export function ImportFileInput({
useImportFiles(featureCollection, { createFeatures, deleteFeatures });
return (
<div className="file-import" style={{ marginBottom: '10px' }}>
<button className="button send primary" onClick={addInputFile}>
<div className="file-import fr-mb-3w">
<button
className="fr-btn fr-btn--secondary fr-btn--icon-left fr-icon-add-circle-line"
onClick={addInputFile}
>
Ajouter un fichier GPX ou KML
</button>
<div>

View file

@ -1,7 +1,6 @@
import React, { useState, useId } from 'react';
import { fire } from '@utils';
import type { Feature } from 'geojson';
import { PlusIcon, LocationMarkerIcon } from '@heroicons/react/outline';
import CoordinateInput from 'react-coordinate-input';
export function PointInput() {
@ -27,31 +26,29 @@ export function PointInput() {
};
return (
<>
<label
className="areas-title mt-1"
htmlFor={inputId}
style={{ fontSize: '16px' }}
>
<div className="fr-input-group fr-mt-3w">
<label className="fr-label" htmlFor={inputId}>
Ajouter un point sur la carte
<span className="fr-hint-text">
Exemple : 43°48&#39;06&#34;N 006°14&#39;59&#34;E
</span>
</label>
<div className="flex align-center mt-1 mb-2">
<div className="flex flex-gap-1 fr-mt-1w">
{navigator.geolocation ? (
<button
type="button"
className="button mr-1"
className="fr-btn fr-btn--secondary fr-icon-map-pin-2-line"
onClick={getCurrentPosition}
title="Afficher votre position sur la carte"
>
<span className="sr-only">
Afficher votre position sur la carte
</span>
<LocationMarkerIcon className="icon-size-big" aria-hidden />
</button>
) : null}
<CoordinateInput
id={inputId}
className="m-0 mr-1"
className="fr-input"
value={value}
onChange={(value: string, { dd }: { dd: [number, number] }) => {
setValue(value);
@ -71,7 +68,7 @@ export function PointInput() {
/>
<button
type="button"
className="button"
className="fr-btn fr-icon-add-circle-line"
onClick={addPoint}
disabled={!feature}
title="Ajouter le point avec les coordonnées saisies sur la carte"
@ -79,9 +76,8 @@ export function PointInput() {
<span className="sr-only">
Ajouter le point avec les coordonnées saisies sur la carte
</span>
<PlusIcon className="icon-size-big" aria-hidden />
</button>
</div>
</>
</div>
);
}

View file

@ -36,8 +36,7 @@ export default function MapEditor({
return (
<>
<div>
<p style={{ marginBottom: '20px' }}>
<p className="fr-hint-text fr-mb-2w">
Besoin d&apos;aide ?&nbsp;
<a
href="https://doc.demarches-simplifiees.fr/pour-aller-plus-loin/cartographie"
@ -47,7 +46,6 @@ export default function MapEditor({
consulter les tutoriels video
</a>
</p>
</div>
{error && <FlashMessage message={error} level="alert" fixed={true} />}
<ImportFileInput featureCollection={featureCollection} {...actions} />