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: hackaton - amélioration marges dépôt d'offre + affichage localisation fiche #1507

Merged
merged 6 commits into from
Sep 16, 2024
Merged

feat: hackaton - amélioration marges dépôt d'offre + affichage localisation fiche #1507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
88c266e
feat: améliorations présentation localisation
alanlr Sep 12, 2024
7d20c69
feat: amélioration affichage localisation
alanlr Sep 12, 2024
f218b4e
feat: progress marges
alanlr Sep 12, 2024
a7b6426
feat: mt page de création
alanlr Sep 12, 2024
b57701e
feat: réduction du padding du container
alanlr Sep 12, 2024
2cf6e09
Merge branch 'main' into feat/hackaton-divers
alanlr Sep 12, 2024
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
28 changes: 16 additions & 12 deletions ui/components/ItemDetail/ItemDetailServices/ItemDetailCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,22 @@ export default function ItemDetailCard({ selectedItem }) {
</Flex>
</Box>
) : (
<Flex color="grey.700" direction="row" alignItems="center" mt={6}>
<svg width="18" height="22" viewBox="0 0 18 22" fill="none" xmlns="http://www.w3.org/2000/svg">
<path
d="M9 21.7279L2.636 15.3639C1.37734 14.1052 0.520187 12.5016 0.172928 10.7558C-0.17433 9.00995 0.00390685 7.20035 0.685099 5.55582C1.36629 3.91129 2.51984 2.50569 3.99988 1.51677C5.47992 0.527838 7.21998 0 9 0C10.78 0 12.5201 0.527838 14.0001 1.51677C15.4802 2.50569 16.6337 3.91129 17.3149 5.55582C17.9961 7.20035 18.1743 9.00995 17.8271 10.7558C17.4798 12.5016 16.6227 14.1052 15.364 15.3639L9 21.7279ZM13.95 13.9499C14.9289 12.9709 15.5955 11.7236 15.8656 10.3658C16.1356 9.00795 15.9969 7.60052 15.4671 6.32148C14.9373 5.04244 14.04 3.94923 12.8889 3.18009C11.7378 2.41095 10.3844 2.00043 9 2.00043C7.61557 2.00043 6.26222 2.41095 5.11109 3.18009C3.95996 3.94923 3.06275 5.04244 2.53292 6.32148C2.00308 7.60052 1.86442 9.00795 2.13445 10.3658C2.40449 11.7236 3.07111 12.9709 4.05 13.9499L9 18.8999L13.95 13.9499ZM9 10.9999C8.46957 10.9999 7.96086 10.7892 7.58579 10.4141C7.21072 10.0391 7 9.53035 7 8.99992C7 8.46949 7.21072 7.96078 7.58579 7.58571C7.96086 7.21064 8.46957 6.99992 9 6.99992C9.53044 6.99992 10.0391 7.21064 10.4142 7.58571C10.7893 7.96078 11 8.46949 11 8.99992C11 9.53035 10.7893 10.0391 10.4142 10.4141C10.0391 10.7892 9.53044 10.9999 9 10.9999Z"
fill="#2A2A2A"
/>
</svg>
<Text ml={1}>{selectedItem?.place?.zipCode}</Text>
<Text ml={1} mr={2}>
{selectedItem?.place?.city || selectedItem?.place?.address}
</Text>
<ItemDistanceToCenter item={selectedItem} />
<Flex color="grey.700" direction="row" mt={6}>
<Box pt={1}>
<svg width="18" height="22" viewBox="0 0 18 22" fill="none" xmlns="http://www.w3.org/2000/svg">
<path
d="M9 21.7279L2.636 15.3639C1.37734 14.1052 0.520187 12.5016 0.172928 10.7558C-0.17433 9.00995 0.00390685 7.20035 0.685099 5.55582C1.36629 3.91129 2.51984 2.50569 3.99988 1.51677C5.47992 0.527838 7.21998 0 9 0C10.78 0 12.5201 0.527838 14.0001 1.51677C15.4802 2.50569 16.6337 3.91129 17.3149 5.55582C17.9961 7.20035 18.1743 9.00995 17.8271 10.7558C17.4798 12.5016 16.6227 14.1052 15.364 15.3639L9 21.7279ZM13.95 13.9499C14.9289 12.9709 15.5955 11.7236 15.8656 10.3658C16.1356 9.00795 15.9969 7.60052 15.4671 6.32148C14.9373 5.04244 14.04 3.94923 12.8889 3.18009C11.7378 2.41095 10.3844 2.00043 9 2.00043C7.61557 2.00043 6.26222 2.41095 5.11109 3.18009C3.95996 3.94923 3.06275 5.04244 2.53292 6.32148C2.00308 7.60052 1.86442 9.00795 2.13445 10.3658C2.40449 11.7236 3.07111 12.9709 4.05 13.9499L9 18.8999L13.95 13.9499ZM9 10.9999C8.46957 10.9999 7.96086 10.7892 7.58579 10.4141C7.21072 10.0391 7 9.53035 7 8.99992C7 8.46949 7.21072 7.96078 7.58579 7.58571C7.96086 7.21064 8.46957 6.99992 9 6.99992C9.53044 6.99992 10.0391 7.21064 10.4142 7.58571C10.7893 7.96078 11 8.46949 11 8.99992C11 9.53035 10.7893 10.0391 10.4142 10.4141C10.0391 10.7892 9.53044 10.9999 9 10.9999Z"
fill="#2A2A2A"
/>
</svg>
</Box>
<Flex pl={2} alignItems="center" flexWrap="wrap">
<Text>{selectedItem?.place?.zipCode}</Text>
<Text whiteSpace="nowrap" ml={1} mr={2}>
{selectedItem?.place?.city || selectedItem?.place?.address}
</Text>
<ItemDistanceToCenter item={selectedItem} />
</Flex>
</Flex>
)

Expand Down
2 changes: 1 addition & 1 deletion ui/components/ItemDetail/ItemDetailServices/ItemDistanceToCenter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default function ItemDistanceToCenter({ item }: { item: ILbaItemFormation
const { formValues } = useContext(DisplayContext)

return formValues?.location?.value && (item?.place?.distance ?? -1) >= 0 ? (
<Text color="grey.425" fontSize={14}>
<Text color="grey.425" whiteSpace="nowrap" fontSize={14}>
{item?.place?.distance} km(s) du lieu de recherche
</Text>
) : (
Expand Down
2 changes: 1 addition & 1 deletion ui/components/espace_pro/Authentification/CreationCompte.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ export default function CreationCompte({ type, isWidget = false, origin = "lba"
<AuthentificationLayout>
<AnimationContainer>
{bandeau && <Bandeau {...bandeau} />}
<SimpleGrid columns={[1, 1, 1, 2]} spacing={[0, 0, 0, "75px"]} mt={wid.isWidget ? 0 : 12}>
<SimpleGrid columns={[1, 1, 1, 2]} spacing={[0, 0, 0, "75px"]} mt={wid.isWidget ? 0 : { base: 4, md: 12 }}>
<Box>
{wid.isWidget && (
<Text textTransform="uppercase" fontSize="20px" color="#666666">
Expand Down
12 changes: 7 additions & 5 deletions ui/components/espace_pro/AuthentificationLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ export default function AuthentificationLayout(props) {
}

return (
<Container maxW="container.xl" px={4} py={4}>
<Container maxW="container.xl" py={4}>
<InfoBanner showInfo={true} />
<Flex direction="column" px={[0, 4]}>
<Flex direction="column">
<Flex justifyContent="space-between" align="center" justify="center" mb={["4", "0"]}>
<Link href="/" aria-label="Retour à la page d'accueil">
<Flex direction="row" align="center" px={[0, 4]}>
<Image src="/images/espace_pro/logo.svg" alt="marianne" />
<Flex direction="row" align="center">
<Image src="/images/espace_pro/logo.svg" aria-hidden={true} alt="" />
<LbaNew ml={4} w="143px" h="37px" />
</Flex>
</Link>
Expand All @@ -48,7 +48,9 @@ export default function AuthentificationLayout(props) {
{props.fromDashboard ? "fermer" : "Retour à l'accueil"}
</Button>
</Flex>
<Container maxW="full">{props.children}</Container>
<Container px={1} maxW="full">
{props.children}
</Container>
</Flex>
</Container>
)
Expand Down
2 changes: 1 addition & 1 deletion ui/components/espace_pro/Layout/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export default function Layout({
{adminPage && <NavigationAdmin currentPage={adminPage} />}
</Box>
)}
<Container as="main" maxW="container.xl" flexGrow="1">
<Container as="main" p={0} maxW="container.xl" flexGrow="1">
{children}
</Container>
{!widget && footer && <Footer />}
Expand Down
2 changes: 1 addition & 1 deletion ui/theme/components/logos_pro/LbaNew.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Icon } from "@chakra-ui/react"

export function LbaNew(props) {
return (
<Icon width="179px" height="66px" viewBox="0 0 352 91" {...props}>
<Icon aria-hidden={true} width="179px" height="66px" viewBox="0 0 352 91" {...props}>
<path
d="M41.4 90.36C64.2646 90.36 82.8 82.7847 82.8 73.44C82.8 64.0954 64.2646 56.52 41.4 56.52C18.5354 56.52 0 64.0954 0 73.44C0 82.7847 18.5354 90.36 41.4 90.36Z"
fill="#A558A0"
Expand Down
Loading