Skip to content

Commit

Permalink
Remove usage of deprecated specific export 'tss-react/dsfr' we can ju…
Browse files Browse the repository at this point in the history
…st use 'tss-react' now
  • Loading branch information
garronej committed Aug 12, 2024
1 parent e0153ed commit 2bf0e61
Show file tree
Hide file tree
Showing 31 changed files with 31 additions and 31 deletions.
2 changes: 1 addition & 1 deletion web/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<link rel="shortcut icon" href="%PUBLIC_URL%/dsfr/favicon/favicon.ico?v=1.12.1" type="image/x-icon" />
<link rel="manifest" href="%PUBLIC_URL%/dsfr/favicon/manifest.webmanifest?v=1.12.1" crossorigin="use-credentials" />

<link rel="stylesheet" href="%PUBLIC_URL%/dsfr/utility/icons/icons.min.css?hash=8994feca" />
<link rel="stylesheet" href="%PUBLIC_URL%/dsfr/utility/icons/icons.min.css?hash=c76e546c" />
<link rel="stylesheet" href="%PUBLIC_URL%/dsfr/dsfr.min.css?v=1.12.1" />

<%
Expand Down
2 changes: 1 addition & 1 deletion web/src/keycloak-theme/account/pages/Password.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import type { I18n } from "../i18n";
import { fr } from "@codegouvfr/react-dsfr";
import { PasswordInput } from "@codegouvfr/react-dsfr/blocks/PasswordInput";
import { Button } from "@codegouvfr/react-dsfr/Button";
import { useStyles } from "tss-react/dsfr";
import { useStyles } from "tss-react";

export default function Password(
props: PageProps<Extract<KcContext, { pageId: "password.ftl" }>, I18n>
Expand Down
2 changes: 1 addition & 1 deletion web/src/keycloak-theme/login/KcApp.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { lazy, Suspense, useEffect } from "react";
import { tss } from "tss-react/dsfr";
import { tss } from "tss-react";
import { fr } from "@codegouvfr/react-dsfr";
import Fallback, { type PageProps } from "keycloakify/login";
import type { KcContext } from "./kcContext";
Expand Down
2 changes: 1 addition & 1 deletion web/src/keycloak-theme/login/Template.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import type { TemplateProps } from "keycloakify/login/TemplateProps";
import { usePrepareTemplate } from "keycloakify/lib/usePrepareTemplate";
import type { KcContext } from "./kcContext";
import type { I18n } from "./i18n";
import { tss } from "tss-react/dsfr";
import { tss } from "tss-react";
import { useGetClassName } from "keycloakify/login/lib/useGetClassName";
import Header from "@codegouvfr/react-dsfr/Header";
import { Alert } from "@codegouvfr/react-dsfr/Alert";
Expand Down
2 changes: 1 addition & 1 deletion web/src/keycloak-theme/login/pages/Login.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useState, type FormEventHandler } from "react";
import { useConstCallback } from "keycloakify/tools/useConstCallback";
import type { PageProps } from "keycloakify/login/pages/PageProps";
import { tss } from "tss-react/dsfr";
import { tss } from "tss-react";
import { fr } from "@codegouvfr/react-dsfr";
import { Button } from "@codegouvfr/react-dsfr/Button";
import { Input } from "@codegouvfr/react-dsfr/Input";
Expand Down
2 changes: 1 addition & 1 deletion web/src/keycloak-theme/login/pages/RegisterUserProfile.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useState } from "react";
import { UserProfileFormFields } from "./shared/UserProfileFormFields";
import { tss } from "tss-react/dsfr";
import { tss } from "tss-react";
import { fr } from "@codegouvfr/react-dsfr";
import type { PageProps } from "keycloakify/login/pages/PageProps";
import { useGetClassName } from "keycloakify/login/lib/useGetClassName";
Expand Down
2 changes: 1 addition & 1 deletion web/src/keycloak-theme/login/pages/Terms.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
import tos_en_url from "../assets/tos_en.md";
import tos_fr_url from "../assets/tos_fr.md";
import type { PageProps } from "keycloakify/login/pages/PageProps";
import { tss } from "tss-react/dsfr";
import { tss } from "tss-react";
import { fr } from "@codegouvfr/react-dsfr";
import { useGetClassName } from "keycloakify/login/lib/useGetClassName";
import type { KcContext } from "../kcContext";
Expand Down
2 changes: 1 addition & 1 deletion web/src/ui/App.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Suspense } from "react";
import { tss, useStyles as useCss } from "tss-react/dsfr";
import { tss, useStyles as useCss } from "tss-react";
import { useRoute } from "ui/routes";
import { Header } from "ui/shared/Header";
import { Footer } from "ui/shared/Footer";
Expand Down
2 changes: 1 addition & 1 deletion web/src/ui/pages/account/Account.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useEffect, useState, useMemo } from "react";
import { tss } from "tss-react/dsfr";
import { tss } from "tss-react";
import { fr } from "@codegouvfr/react-dsfr";
import { useTranslation, useGetOrganizationFullName, evtLang } from "ui/i18n";
import { assert } from "tsafe/assert";
Expand Down
2 changes: 1 addition & 1 deletion web/src/ui/pages/addSoftwareLanding/AddSoftwareLanding.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { tss } from "tss-react/dsfr";
import { tss } from "tss-react";
import { assert } from "tsafe/assert";
import type { Equals } from "tsafe";
import { declareComponentKeys } from "i18nifty";
Expand Down
2 changes: 1 addition & 1 deletion web/src/ui/pages/declarationForm/DeclarationForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { Evt } from "evt";
import { DeclarationFormStep1 } from "ui/pages/declarationForm/Step1";
import { DeclarationFormStep2User } from "ui/pages/declarationForm/Step2User";
import { DeclarationFormStep2Referent } from "ui/pages/declarationForm/Step2Referent";
import { tss } from "tss-react/dsfr";
import { tss } from "tss-react";
import { Breadcrumb } from "@codegouvfr/react-dsfr/Breadcrumb";
import { fr } from "@codegouvfr/react-dsfr";
import { DetailUsersAndReferents } from "ui/shared/DetailUsersAndReferents";
Expand Down
2 changes: 1 addition & 1 deletion web/src/ui/pages/home/Home.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useState } from "react";
import { tss } from "tss-react/dsfr";
import { tss } from "tss-react";
import { keyframes } from "tss-react";
import { assert } from "tsafe/assert";
import type { Equals } from "tsafe";
Expand Down
2 changes: 1 addition & 1 deletion web/src/ui/pages/instanceForm/InstanceForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { routes, session } from "ui/routes";
import CircularProgress from "@mui/material/CircularProgress";
import { InstanceFormStep1 } from "ui/pages/instanceForm/Step1";
import { InstanceFormStep2 } from "ui/pages/instanceForm/Step2";
import { tss } from "tss-react/dsfr";
import { tss } from "tss-react";
import { Button } from "@codegouvfr/react-dsfr/Button";
import { fr } from "@codegouvfr/react-dsfr";
import { useConst } from "powerhooks/useConst";
Expand Down
2 changes: 1 addition & 1 deletion web/src/ui/pages/readme/Readme.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useEffect } from "react";
import { Markdown } from "keycloakify/tools/Markdown";
import { useCoreState, useCore } from "core";
import { tss } from "tss-react/dsfr";
import { tss } from "tss-react";
import { fr } from "@codegouvfr/react-dsfr";
import type { PageRoute } from "./route";
import { useLang } from "ui/i18n";
Expand Down
2 changes: 1 addition & 1 deletion web/src/ui/pages/softwareCatalog/SoftwareCatalogCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { declareComponentKeys } from "i18nifty";
import { useTranslation, useResolveLocalizedString } from "ui/i18n";
import type { Link } from "type-route";
import { fr } from "@codegouvfr/react-dsfr";
import { tss } from "tss-react/dsfr";
import { tss } from "tss-react";
import { useFromNow } from "ui/useMoment";
import { assert } from "tsafe/assert";
import type { Equals } from "tsafe";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useRef, useLayoutEffect, useMemo } from "react";
import { tss } from "tss-react/dsfr";
import { tss } from "tss-react";
import type { State as SoftwareCatalogState } from "core/usecases/softwareCatalog";
import { assert } from "tsafe/assert";
import type { Equals } from "tsafe";
Expand Down
2 changes: 1 addition & 1 deletion web/src/ui/pages/softwareCatalog/SoftwareCatalogSearch.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useState, useId } from "react";
import { tss } from "tss-react/dsfr";
import { tss } from "tss-react";
import { SearchBar } from "@codegouvfr/react-dsfr/SearchBar";
import { Button } from "@codegouvfr/react-dsfr/Button";
import { fr } from "@codegouvfr/react-dsfr";
Expand Down
2 changes: 1 addition & 1 deletion web/src/ui/pages/softwareDetails/AlikeSoftwareTab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import type { State as softwareDetails } from "core/usecases/softwareDetails";
import { SoftwareCatalogCard } from "ui/pages/softwareCatalog/SoftwareCatalogCard";
import type { Link } from "type-route";
import { capitalize } from "tsafe/capitalize";
import { useStyles } from "tss-react/dsfr";
import { useStyles } from "tss-react";
import { exclude } from "tsafe/exclude";
import { useResolveLocalizedString } from "ui/i18n";
import { Tag } from "@codegouvfr/react-dsfr/Tag";
Expand Down
2 changes: 1 addition & 1 deletion web/src/ui/pages/softwareDetails/HeaderDetailCard.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { memo } from "react";
import { declareComponentKeys } from "i18nifty";
import { useTranslation, useLang } from "ui/i18n";
import { tss } from "tss-react/dsfr";
import { tss } from "tss-react";
import { assert } from "tsafe/assert";
import type { Equals } from "tsafe";
import { fr } from "@codegouvfr/react-dsfr";
Expand Down
2 changes: 1 addition & 1 deletion web/src/ui/pages/softwareDetails/PreviewTab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from "react";
import { declareComponentKeys } from "i18nifty";
import { useLang, useTranslation } from "ui/i18n";
import { fr } from "@codegouvfr/react-dsfr";
import { tss } from "tss-react/dsfr";
import { tss } from "tss-react";
import { shortEndMonthDate, monthDate } from "ui/useMoment";
import Tooltip from "@mui/material/Tooltip";
import { capitalize } from "tsafe/capitalize";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { declareComponentKeys } from "i18nifty";
import { useTranslation } from "ui/i18n";
import { fr } from "@codegouvfr/react-dsfr";
import { tss } from "tss-react/dsfr";
import { tss } from "tss-react";
import { Equals } from "tsafe";
import { assert } from "tsafe/assert";
import { Accordion } from "@codegouvfr/react-dsfr/Accordion";
Expand Down
2 changes: 1 addition & 1 deletion web/src/ui/pages/softwareDetails/SoftwareDetails.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useEffect } from "react";
import { useCoreState, useCore } from "core";
import { Breadcrumb } from "@codegouvfr/react-dsfr/Breadcrumb";
import { tss } from "tss-react/dsfr";
import { tss } from "tss-react";
import { fr } from "@codegouvfr/react-dsfr";
import { declareComponentKeys } from "i18nifty";
import { useTranslation } from "ui/i18n";
Expand Down
2 changes: 1 addition & 1 deletion web/src/ui/pages/softwareForm/SoftwareForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { SoftwareFormStep1 } from "ui/pages/softwareForm/Step1";
import { SoftwareFormStep2 } from "ui/pages/softwareForm/Step2";
import { SoftwareFormStep3 } from "ui/pages/softwareForm/Step3";
import { SoftwareFormStep4 } from "ui/pages/softwareForm/Step4";
import { tss } from "tss-react/dsfr";
import { tss } from "tss-react";
import { Button } from "@codegouvfr/react-dsfr/Button";
import { fr } from "@codegouvfr/react-dsfr";
import { useConst } from "powerhooks/useConst";
Expand Down
2 changes: 1 addition & 1 deletion web/src/ui/pages/softwareForm/Step2.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import type { FormData } from "core/usecases/softwareForm";
import type { ReturnType } from "tsafe";
import { declareComponentKeys } from "i18nifty";
import { useTranslation, useResolveLocalizedString } from "ui/i18n";
import { useStyles } from "tss-react/dsfr";
import { useStyles } from "tss-react";
import { ExternalDataOrigin } from "api";

export type Step2Props = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useEffect, useState } from "react";
import { useCore, useCoreState } from "core";
import { Breadcrumb } from "@codegouvfr/react-dsfr/Breadcrumb";
import { tss } from "tss-react/dsfr";
import { tss } from "tss-react";
import { fr } from "@codegouvfr/react-dsfr";
import { declareComponentKeys } from "i18nifty";
import { useTranslation, useGetOrganizationFullName } from "ui/i18n";
Expand Down
2 changes: 1 addition & 1 deletion web/src/ui/pages/terms/Terms.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { declareComponentKeys } from "i18nifty";
import { useCoreState, useCore } from "core";
import { Markdown } from "keycloakify/tools/Markdown";
import { useLang } from "ui/i18n";
import { tss } from "tss-react/dsfr";
import { tss } from "tss-react";
import { fr } from "@codegouvfr/react-dsfr";
import type { PageRoute } from "./route";
import { LoadingFallback } from "ui/shared/LoadingFallback";
Expand Down
2 changes: 1 addition & 1 deletion web/src/ui/pages/userProfile/UserProfile.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { declareComponentKeys } from "i18nifty";
import { useCore, useCoreState } from "core";
import type { PageRoute } from "./route";
import { LoadingFallback } from "ui/shared/LoadingFallback";
import { tss } from "tss-react/dsfr";
import { tss } from "tss-react";
import { fr } from "@codegouvfr/react-dsfr";
import { Markdown } from "keycloakify/tools/Markdown";
import { Breadcrumb } from "@codegouvfr/react-dsfr/Breadcrumb";
Expand Down
2 changes: 1 addition & 1 deletion web/src/ui/shared/ActionsFooter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { memo, ReactNode, useEffect, useRef, useState } from "react";
import { assert } from "tsafe/assert";
import type { Equals } from "tsafe";
import { fr } from "@codegouvfr/react-dsfr";
import { tss } from "tss-react/dsfr";
import { tss } from "tss-react";

export type Props = {
className?: string;
Expand Down
2 changes: 1 addition & 1 deletion web/src/ui/shared/DetailUsersAndReferents.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { declareComponentKeys } from "i18nifty";
import { fr } from "@codegouvfr/react-dsfr";
import type { Link } from "type-route";
import { useTranslation } from "ui/i18n";
import { tss } from "tss-react/dsfr";
import { tss } from "tss-react";
import { assert } from "tsafe/assert";
import { Equals } from "tsafe";

Expand Down
2 changes: 1 addition & 1 deletion web/src/ui/shared/LoadingFallback.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useEffect, useReducer } from "react";
import MuiCircularProgress from "@mui/material/CircularProgress";
import { useStyles } from "tss-react/dsfr";
import { useStyles } from "tss-react";

type Props = {
className?: string;
Expand Down
2 changes: 1 addition & 1 deletion web/src/ui/shared/SmartLogo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { useDomRect } from "powerhooks/useDomRect";
import softwareLogoPlaceholder from "ui/assets/software_logo_placeholder.png";
import { declareComponentKeys } from "i18nifty";
import { useTranslation } from "ui/i18n";
import { tss } from "tss-react/dsfr";
import { tss } from "tss-react";
import { fr } from "@codegouvfr/react-dsfr/fr";

type Props = {
Expand Down

0 comments on commit 2bf0e61

Please sign in to comment.