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.

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

(PC-31593)[PRO] refactor: Remove titles component and replace occurre… #13921

Merged
merged 2 commits into from
Sep 3, 2024
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
6 changes: 6 additions & 0 deletions pro/src/pages/Desk/Desk.module.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
@use "styles/mixins/_fonts.scss" as fonts;
@use "styles/mixins/_rem.scss" as rem;

.title {
@include fonts.title1;

margin-bottom: rem.torem(32px);
}

.desk-form {
border-radius: rem.torem(8px);
box-shadow: 0 0 rem.torem(5px) var(--color-large-shadow);
Expand Down
3 changes: 1 addition & 2 deletions pro/src/pages/Desk/Desk.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import { AppLayout } from 'app/AppLayout'
import { Callout } from 'components/Callout/Callout'
import { Button } from 'ui-kit/Button/Button'
import { TextInput } from 'ui-kit/form/TextInput/TextInput'
import { Titles } from 'ui-kit/Titles/Titles'

import { BookingDetails } from './BookingDetails'
import { ButtonInvalidateToken } from './ButtonInvalidateToken'
Expand Down Expand Up @@ -142,7 +141,7 @@ export const Desk = (): JSX.Element => {

return (
<AppLayout>
<Titles title="Guichet" />
<h1 className={styles['title']}>Guichet</h1>
<p className={styles.advice}>
Saisissez les contremarques présentées par les bénéficiaires afin de les
valider ou de les invalider.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ export const CollectiveOffersTable = ({
)

return (
<div aria-busy={isLoading} aria-live="polite" className="section">
<div aria-busy={isLoading} aria-live="polite">
{isLoading ? (
<Spinner className={styles['loading-spinner']} />
) : (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export const IndividualOffersTable = ({
)

return (
<div aria-busy={isLoading} aria-live="polite" className="section">
<div aria-busy={isLoading} aria-live="polite">
{isLoading ? (
<Spinner className={styles['loading-spinner']} />
) : (
Expand Down
8 changes: 8 additions & 0 deletions pro/src/screens/Bookings/Bookings.module.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
@use "styles/mixins/_fonts.scss" as fonts;
@use "styles/mixins/_rem.scss" as rem;

.title {
@include fonts.title1;

margin-bottom: rem.torem(32px);
}
6 changes: 3 additions & 3 deletions pro/src/screens/Bookings/Bookings.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import isEqual from 'lodash.isequal'
import React, { useEffect, useState } from 'react'
import { useEffect, useState } from 'react'
import { useSelector } from 'react-redux'
import { useLocation, useNavigate } from 'react-router-dom'
import useSWR from 'swr'
Expand Down Expand Up @@ -32,10 +32,10 @@ import { formatAndOrderVenues } from 'repository/venuesService'
import { selectCurrentOffererId } from 'store/user/selectors'
import { Spinner } from 'ui-kit/Spinner/Spinner'
import { Tabs } from 'ui-kit/Tabs/Tabs'
import { Titles } from 'ui-kit/Titles/Titles'

import { stringify } from '../../utils/query-string'

import styles from './Bookings.module.scss'
import { BookingsRecapTable } from './BookingsRecapTable/BookingsRecapTable'
import { PreFilters } from './PreFilters/PreFilters'

Expand Down Expand Up @@ -230,7 +230,7 @@ export const BookingsScreen = <

return (
<div className="bookings-page">
<Titles title={title} />
<h1 className={styles['title']}>{title}</h1>
{!isNewInterfaceActive && (
<Tabs
nav="Réservations individuelles et collectives"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@
align-items: flex-start;
}

.title {
@include fonts.title1;

margin-bottom: rem.torem(32px);
}

.sub-title {
@include fonts.title4;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import { RadioButton } from 'ui-kit/form/RadioButton/RadioButton'
import { TextInput } from 'ui-kit/form/TextInput/TextInput'
import { SvgIcon } from 'ui-kit/SvgIcon/SvgIcon'
import { Thumb } from 'ui-kit/Thumb/Thumb'
import { Titles } from 'ui-kit/Titles/Titles'
import { pluralize } from 'utils/pluralize'

import styles from './CollectiveOfferSelectionDuplication.module.scss'
Expand Down Expand Up @@ -125,7 +124,7 @@ export const CollectiveOfferSelectionDuplication = (): JSX.Element => {
return (
<AppLayout layout={'sticky-actions'}>
<div className="container">
<Titles title="Créer une offre réservable" />
<h1 className={styles['title']}>Créer une offre réservable</h1>
<h2 className={styles['sub-title']} id="search-filter">
Rechercher l’offre vitrine à dupliquer
</h2>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
@use "styles/mixins/_rem.scss" as rem;
@use "styles/mixins/_fonts.scss" as fonts;

.title {
@include fonts.title1;

margin-bottom: rem.torem(32px);
}

.banner {
margin-bottom: rem.torem(16px);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import { SelectOption } from 'custom_types/form'
import { CollectiveOffersActionsBar } from 'pages/Offers/OffersTable/CollectiveOffersTable/CollectiveOffersActionsBar/CollectiveOffersActionsBar'
import { CollectiveOffersTable } from 'pages/Offers/OffersTable/CollectiveOffersTable/CollectiveOffersTable'
import { isSameOffer } from 'pages/Offers/utils/isSameOffer'
import { Titles } from 'ui-kit/Titles/Titles'

import styles from './CollectiveOffersScreen.module.scss'
import { CollectiveOffersSearchFilters } from './CollectiveOffersSearchFilters/CollectiveOffersSearchFilters'
Expand Down Expand Up @@ -158,7 +157,7 @@ export const CollectiveOffersScreen = ({

return (
<div>
<Titles title="Offres collectives" />
<h1 className={styles['title']}>Offres collectives</h1>
<CollectiveOffersSearchFilters
applyFilters={applyFilters}
categories={categories}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
@use "styles/mixins/_rem.scss" as rem;
@use "styles/mixins/_fonts.scss" as fonts;

.title-container {
display: flex;
align-items: center;
margin-bottom: rem.torem(32px);
gap: rem.torem(8px);
flex-wrap: wrap;
}

.title {
@include fonts.title1;

flex-grow: 1;
}
27 changes: 13 additions & 14 deletions pro/src/screens/IndividualOffersScreen/IndividualOffersScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ import { selectCurrentOffererId } from 'store/user/selectors'
import { ButtonLink } from 'ui-kit/Button/ButtonLink'
import { ButtonVariant } from 'ui-kit/Button/types'
import { Tabs } from 'ui-kit/Tabs/Tabs'
import { Titles } from 'ui-kit/Titles/Titles'

import styles from './IndividualOffersScreen.module.scss'
import { IndividualOffersSearchFilters } from './IndividualOffersSearchFilters/IndividualOffersSearchFilters'

export type IndividualOffersScreenProps = {
Expand Down Expand Up @@ -108,16 +108,6 @@ export const IndividualOffersScreen = ({
const displayCreateOfferButton =
!isNewSideBarNavigation && !isAdmin && isOffererValidated

const actionLink = displayCreateOfferButton ? (
<ButtonLink
variant={ButtonVariant.PRIMARY}
to={`/offre/creation${selectedOffererId ? `?structure=${selectedOffererId}` : ''}`}
icon={fullPlusIcon}
>
Créer une offre
</ButtonLink>
) : undefined

const areAllOffersSelected =
selectedOffers.length > 0 && selectedOffers.length === offers.length

Expand Down Expand Up @@ -198,7 +188,18 @@ export const IndividualOffersScreen = ({

return (
<div>
<Titles action={actionLink} title={title} />
<div className={styles['title-container']}>
<h1 className={styles['title']}>{title}</h1>
{displayCreateOfferButton && (
<ButtonLink
variant={ButtonVariant.PRIMARY}
to={`/offre/creation${selectedOffererId ? `?structure=${selectedOffererId}` : ''}`}
icon={fullPlusIcon}
>
Créer une offre
</ButtonLink>
)}
</div>
{!isNewSideBarNavigation && (
<Tabs
nav="Offres individuelles et collectives"
Expand Down Expand Up @@ -227,7 +228,6 @@ export const IndividualOffersScreen = ({
]}
/>
)}

<IndividualOffersSearchFilters
applyFilters={applyFilters}
categories={categories}
Expand All @@ -240,7 +240,6 @@ export const IndividualOffersScreen = ({
venues={venues}
isRestrictedAsAdmin={isRestrictedAsAdmin}
/>

{userHasNoOffers ? (
<NoData page="offers" />
) : (
Expand Down
7 changes: 7 additions & 0 deletions pro/src/screens/OffererStats/OffererStatsScreen.module.scss
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
@use "styles/mixins/_rem.scss" as rem;
@use "styles/mixins/_fonts.scss" as fonts;

.dashboard-iframe {
width: 100%;
height: 100%;
border: none;
}

.title {
@include fonts.title1;

margin-bottom: rem.torem(32px);
}

.offerer-stats {
&-description {
margin-bottom: rem.torem(32px);
Expand Down
3 changes: 1 addition & 2 deletions pro/src/screens/OffererStats/OffererStatsScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import { useIsNewInterfaceActive } from 'hooks/useIsNewInterfaceActive'
import { selectCurrentOffererId } from 'store/user/selectors'
import { SelectInput } from 'ui-kit/form/Select/SelectInput'
import { FieldLayout } from 'ui-kit/form/shared/FieldLayout/FieldLayout'
import { Titles } from 'ui-kit/Titles/Titles'
import { sortByLabel } from 'utils/strings'

import styles from './OffererStatsScreen.module.scss'
Expand Down Expand Up @@ -102,7 +101,7 @@ export const OffererStatsScreen = ({

return (
<div className={styles['offerer-stats']}>
<Titles title="Statistiques" />
<h1 className={styles['title']}>Statistiques</h1>
<p className={styles['offerer-stats-description']}>
Vos statistiques sont calculées et mises à jour quotidiennement dans la
nuit.
Expand Down
33 changes: 0 additions & 33 deletions pro/src/styles/global/_page.scss

This file was deleted.

1 change: 0 additions & 1 deletion pro/src/styles/global/index.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import "font_faces";
@import "forms";
@import "layout";
@import "page";
55 changes: 0 additions & 55 deletions pro/src/ui-kit/Titles/Titles.module.scss

This file was deleted.

30 changes: 0 additions & 30 deletions pro/src/ui-kit/Titles/Titles.tsx

This file was deleted.

Loading
Loading