chore: update FontAwesome dependencies to v7.2.0
This commit is contained in:
+4
-4
@@ -13,10 +13,10 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@fontsource/open-sans": "^5.0.20",
|
"@fontsource/open-sans": "^5.0.20",
|
||||||
"@fontsource/permanent-marker": "^5.0.8",
|
"@fontsource/permanent-marker": "^5.0.8",
|
||||||
"@fortawesome/fontawesome-svg-core": "^6.5.1",
|
"@fortawesome/fontawesome-svg-core": "^7.2.0",
|
||||||
"@fortawesome/free-brands-svg-icons": "^6.5.1",
|
"@fortawesome/free-brands-svg-icons": "^7.2.0",
|
||||||
"@fortawesome/free-solid-svg-icons": "^6.5.1",
|
"@fortawesome/free-solid-svg-icons": "^7.2.0",
|
||||||
"@fortawesome/react-fontawesome": "^0.2.0",
|
"@fortawesome/react-fontawesome": "^3.3.0",
|
||||||
"@reduxjs/toolkit": "^2.0.1",
|
"@reduxjs/toolkit": "^2.0.1",
|
||||||
"@stylistic/eslint-plugin": "^5.10.0",
|
"@stylistic/eslint-plugin": "^5.10.0",
|
||||||
"@tanstack/match-sorter-utils": "^8.11.8",
|
"@tanstack/match-sorter-utils": "^8.11.8",
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import { alert } from '@/styled-system/recipes/alert'
|
|||||||
import { faTimes } from '@fortawesome/free-solid-svg-icons'
|
import { faTimes } from '@fortawesome/free-solid-svg-icons'
|
||||||
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
|
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
|
||||||
import { AnimatePresence, motion } from 'framer-motion'
|
import { AnimatePresence, motion } from 'framer-motion'
|
||||||
import { type FC } from 'react'
|
import type { FC } from 'react'
|
||||||
import { createPortal } from 'react-dom'
|
import { createPortal } from 'react-dom'
|
||||||
|
|
||||||
const FeedbackConsumer: FC = () => {
|
const FeedbackConsumer: FC = () => {
|
||||||
@@ -55,7 +55,7 @@ const FeedbackConsumer: FC = () => {
|
|||||||
className={alert().closeButton}
|
className={alert().closeButton}
|
||||||
onClick={() => dispatch(removeAlert(currentAlert.id))}
|
onClick={() => dispatch(removeAlert(currentAlert.id))}
|
||||||
>
|
>
|
||||||
<FontAwesomeIcon icon={faTimes} fixedWidth size="sm" />
|
<FontAwesomeIcon icon={faTimes} size="sm" />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
<Typography variant="h3" component="div">
|
<Typography variant="h3" component="div">
|
||||||
{currentAlert.title}
|
{currentAlert.title}
|
||||||
|
|||||||
+1
-1
@@ -124,7 +124,7 @@ const Hero: FC = () => {
|
|||||||
}
|
}
|
||||||
}))}
|
}))}
|
||||||
>
|
>
|
||||||
<FontAwesomeIcon icon={faArrowDown} size="lg" fixedWidth />
|
<FontAwesomeIcon icon={faArrowDown} size="lg" />
|
||||||
</a>
|
</a>
|
||||||
</section>
|
</section>
|
||||||
)
|
)
|
||||||
|
|||||||
+1
-1
@@ -84,7 +84,7 @@ const Team: FC = () => {
|
|||||||
className={iconButton()}
|
className={iconButton()}
|
||||||
href={socialNetwork.url}
|
href={socialNetwork.url}
|
||||||
>
|
>
|
||||||
<FontAwesomeIcon icon={socialNetwork.icon} fixedWidth />
|
<FontAwesomeIcon icon={socialNetwork.icon} />
|
||||||
</a>
|
</a>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
+18
-8
@@ -3,7 +3,7 @@ import { css } from '@/styled-system/css'
|
|||||||
import { Container } from '@/styled-system/jsx'
|
import { Container } from '@/styled-system/jsx'
|
||||||
import { faChevronRight } from '@fortawesome/free-solid-svg-icons'
|
import { faChevronRight } from '@fortawesome/free-solid-svg-icons'
|
||||||
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
|
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
|
||||||
import { type FC } from 'react'
|
import type { FC } from 'react'
|
||||||
|
|
||||||
const ClanesPage: FC = () => {
|
const ClanesPage: FC = () => {
|
||||||
return (
|
return (
|
||||||
@@ -22,17 +22,19 @@ const ClanesPage: FC = () => {
|
|||||||
<Typography variant="body1">La intención de EntGamers es brindar beneficios a los clanes que les permitan operar en un ambiente de comunicación y colaboración.</Typography>
|
<Typography variant="body1">La intención de EntGamers es brindar beneficios a los clanes que les permitan operar en un ambiente de comunicación y colaboración.</Typography>
|
||||||
<ul className="fa-ul">
|
<ul className="fa-ul">
|
||||||
<li>
|
<li>
|
||||||
<FontAwesomeIcon icon={faChevronRight} listItem />
|
<span className="fa-li"><FontAwesomeIcon icon={faChevronRight} /></span>
|
||||||
{' '}
|
{' '}
|
||||||
Espacio en el servidor de Discord.
|
Espacio en el servidor de Discord.
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<FontAwesomeIcon icon={faChevronRight} listItem />
|
<span className="fa-li"><FontAwesomeIcon icon={faChevronRight} /></span>
|
||||||
{' '}
|
{' '}
|
||||||
Apoyo de la administración con proyectos y eventos.
|
Apoyo de la administración con proyectos y eventos.
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<FontAwesomeIcon icon={faChevronRight} listItem />
|
<span className="fa-li">
|
||||||
|
<FontAwesomeIcon icon={faChevronRight} />
|
||||||
|
</span>
|
||||||
{' '}
|
{' '}
|
||||||
Apoyo del equipo de moderación.
|
Apoyo del equipo de moderación.
|
||||||
</li>
|
</li>
|
||||||
@@ -43,22 +45,30 @@ const ClanesPage: FC = () => {
|
|||||||
<Typography variant="body1">Todos los clanes deben cumplir con los siguientes requisitos:</Typography>
|
<Typography variant="body1">Todos los clanes deben cumplir con los siguientes requisitos:</Typography>
|
||||||
<ul className="fa-ul">
|
<ul className="fa-ul">
|
||||||
<li>
|
<li>
|
||||||
<FontAwesomeIcon icon={faChevronRight} listItem />
|
<span className="fa-li">
|
||||||
|
<FontAwesomeIcon icon={faChevronRight} />
|
||||||
|
</span>
|
||||||
{' '}
|
{' '}
|
||||||
Tener un encargado.
|
Tener un encargado.
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<FontAwesomeIcon icon={faChevronRight} listItem />
|
<span className="fa-li">
|
||||||
|
<FontAwesomeIcon icon={faChevronRight} />
|
||||||
|
</span>
|
||||||
{' '}
|
{' '}
|
||||||
Fomentar el compañerismo y la comunidad.
|
Fomentar el compañerismo y la comunidad.
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<FontAwesomeIcon icon={faChevronRight} listItem />
|
<span className="fa-li">
|
||||||
|
<FontAwesomeIcon icon={faChevronRight} />
|
||||||
|
</span>
|
||||||
{' '}
|
{' '}
|
||||||
Aportar contenido de forma periódica para la comunidad.
|
Aportar contenido de forma periódica para la comunidad.
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<FontAwesomeIcon icon={faChevronRight} listItem />
|
<span className="fa-li">
|
||||||
|
<FontAwesomeIcon icon={faChevronRight} />
|
||||||
|
</span>
|
||||||
{' '}
|
{' '}
|
||||||
Realizar al menos una actividad mensual con los integrantes.
|
Realizar al menos una actividad mensual con los integrantes.
|
||||||
</li>
|
</li>
|
||||||
|
|||||||
@@ -189,7 +189,7 @@ const ApplicationsList: FC = () => {
|
|||||||
size="small"
|
size="small"
|
||||||
onClick={header.column.getToggleSortingHandler()}
|
onClick={header.column.getToggleSortingHandler()}
|
||||||
>
|
>
|
||||||
<FontAwesomeIcon icon={header.column.getIsSorted() === 'asc' ? faSortAsc : header.column.getIsSorted() === 'desc' ? faSortDesc : faSort} size="sm" fixedWidth />
|
<FontAwesomeIcon icon={header.column.getIsSorted() === 'asc' ? faSortAsc : header.column.getIsSorted() === 'desc' ? faSortDesc : faSort} size="sm" />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
@@ -257,7 +257,7 @@ const ApplicationsList: FC = () => {
|
|||||||
onClick={() => { table.previousPage() }}
|
onClick={() => { table.previousPage() }}
|
||||||
disabled={!table.getCanPreviousPage()}
|
disabled={!table.getCanPreviousPage()}
|
||||||
>
|
>
|
||||||
<FontAwesomeIcon icon={faChevronLeft} fixedWidth />
|
<FontAwesomeIcon icon={faChevronLeft} />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
Pagina
|
Pagina
|
||||||
{' '}
|
{' '}
|
||||||
@@ -270,7 +270,7 @@ const ApplicationsList: FC = () => {
|
|||||||
onClick={() => { table.nextPage() }}
|
onClick={() => { table.nextPage() }}
|
||||||
disabled={!table.getCanNextPage()}
|
disabled={!table.getCanNextPage()}
|
||||||
>
|
>
|
||||||
<FontAwesomeIcon icon={faChevronRight} fixedWidth />
|
<FontAwesomeIcon icon={faChevronRight} />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
</div>
|
</div>
|
||||||
</>
|
</>
|
||||||
|
|||||||
@@ -272,7 +272,9 @@ const ApplyForm: FC = () => {
|
|||||||
<Typography variant="h3">Requisitos</Typography>
|
<Typography variant="h3">Requisitos</Typography>
|
||||||
<ul className="fa-ul">
|
<ul className="fa-ul">
|
||||||
<li>
|
<li>
|
||||||
<FontAwesomeIcon icon={faChevronRight as FontAwesomeIconProps['icon']} fixedWidth listItem />
|
<span className="fa-li">
|
||||||
|
<FontAwesomeIcon icon={faChevronRight as FontAwesomeIconProps['icon']} />
|
||||||
|
</span>
|
||||||
{' '}
|
{' '}
|
||||||
<strong>Imparcialidad</strong>
|
<strong>Imparcialidad</strong>
|
||||||
<br />
|
<br />
|
||||||
@@ -282,7 +284,9 @@ const ApplyForm: FC = () => {
|
|||||||
<Typography variant="h3">Beneficios</Typography>
|
<Typography variant="h3">Beneficios</Typography>
|
||||||
<ul className="fa-ul">
|
<ul className="fa-ul">
|
||||||
<li>
|
<li>
|
||||||
<FontAwesomeIcon icon={faChevronRight as FontAwesomeIconProps['icon']} fixedWidth listItem />
|
<span className="fa-li">
|
||||||
|
<FontAwesomeIcon icon={faChevronRight as FontAwesomeIconProps['icon']} />
|
||||||
|
</span>
|
||||||
{' '}
|
{' '}
|
||||||
<strong>Experiencia</strong>
|
<strong>Experiencia</strong>
|
||||||
<br />
|
<br />
|
||||||
@@ -306,7 +310,9 @@ const ApplyForm: FC = () => {
|
|||||||
<Typography variant="h3">Requisitos</Typography>
|
<Typography variant="h3">Requisitos</Typography>
|
||||||
<ul className="fa-ul">
|
<ul className="fa-ul">
|
||||||
<li>
|
<li>
|
||||||
<FontAwesomeIcon icon={faChevronRight as FontAwesomeIconProps['icon']} fixedWidth listItem />
|
<span className="fa-li">
|
||||||
|
<FontAwesomeIcon icon={faChevronRight as FontAwesomeIconProps['icon']} />
|
||||||
|
</span>
|
||||||
{' '}
|
{' '}
|
||||||
<strong>Profesionalismo</strong>
|
<strong>Profesionalismo</strong>
|
||||||
<br />
|
<br />
|
||||||
@@ -316,7 +322,9 @@ const ApplyForm: FC = () => {
|
|||||||
<Typography variant="h3">Beneficios</Typography>
|
<Typography variant="h3">Beneficios</Typography>
|
||||||
<ul className="fa-ul">
|
<ul className="fa-ul">
|
||||||
<li>
|
<li>
|
||||||
<FontAwesomeIcon icon={faChevronRight as FontAwesomeIconProps['icon']} fixedWidth listItem />
|
<span className="fa-li">
|
||||||
|
<FontAwesomeIcon icon={faChevronRight as FontAwesomeIconProps['icon']} />
|
||||||
|
</span>
|
||||||
{' '}
|
{' '}
|
||||||
<strong>Apoyo</strong>
|
<strong>Apoyo</strong>
|
||||||
<br />
|
<br />
|
||||||
@@ -340,21 +348,27 @@ const ApplyForm: FC = () => {
|
|||||||
<Typography variant="h3">Requisitos</Typography>
|
<Typography variant="h3">Requisitos</Typography>
|
||||||
<ul className="fa-ul">
|
<ul className="fa-ul">
|
||||||
<li>
|
<li>
|
||||||
<FontAwesomeIcon icon={faChevronRight as FontAwesomeIconProps['icon']} fixedWidth listItem />
|
<span className="fa-li">
|
||||||
|
<FontAwesomeIcon icon={faChevronRight as FontAwesomeIconProps['icon']} />
|
||||||
|
</span>
|
||||||
{' '}
|
{' '}
|
||||||
<strong>Profesionalismo</strong>
|
<strong>Profesionalismo</strong>
|
||||||
<br />
|
<br />
|
||||||
La comunidad siempre intenta conseguir el mayor nivel de calidad en todos sus proyectos, por lo que buscamos gente dispuesta a otorgar este nivel de profesionalismo para el disfrute de la comunidad.
|
La comunidad siempre intenta conseguir el mayor nivel de calidad en todos sus proyectos, por lo que buscamos gente dispuesta a otorgar este nivel de profesionalismo para el disfrute de la comunidad.
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<FontAwesomeIcon icon={faChevronRight as FontAwesomeIconProps['icon']} fixedWidth listItem />
|
<span className="fa-li">
|
||||||
|
<FontAwesomeIcon icon={faChevronRight as FontAwesomeIconProps['icon']} />
|
||||||
|
</span>
|
||||||
{' '}
|
{' '}
|
||||||
<strong>Constancia</strong>
|
<strong>Constancia</strong>
|
||||||
<br />
|
<br />
|
||||||
La comunidad busca gente que en sus posibilidades sea activa, que pueda estar al tanto de lo que pasa en ella.
|
La comunidad busca gente que en sus posibilidades sea activa, que pueda estar al tanto de lo que pasa en ella.
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<FontAwesomeIcon icon={faChevronRight as FontAwesomeIconProps['icon']} fixedWidth listItem />
|
<span className="fa-li">
|
||||||
|
<FontAwesomeIcon icon={faChevronRight as FontAwesomeIconProps['icon']} />
|
||||||
|
</span>
|
||||||
{' '}
|
{' '}
|
||||||
<strong>Proactividad</strong>
|
<strong>Proactividad</strong>
|
||||||
<br />
|
<br />
|
||||||
@@ -364,14 +378,18 @@ const ApplyForm: FC = () => {
|
|||||||
<Typography variant="h3">Beneficios</Typography>
|
<Typography variant="h3">Beneficios</Typography>
|
||||||
<ul className="fa-ul">
|
<ul className="fa-ul">
|
||||||
<li>
|
<li>
|
||||||
<FontAwesomeIcon icon={faChevronRight as FontAwesomeIconProps['icon']} fixedWidth listItem />
|
<span className="fa-li">
|
||||||
|
<FontAwesomeIcon icon={faChevronRight as FontAwesomeIconProps['icon']} />
|
||||||
|
</span>
|
||||||
{' '}
|
{' '}
|
||||||
<strong>Experiencia</strong>
|
<strong>Experiencia</strong>
|
||||||
<br />
|
<br />
|
||||||
Uno de los objetivos de la comunidad es brindar experiencia en gestión y desarrollo de proyectos equiparable a un entorno laboral, que sea comprobable y útil.
|
Uno de los objetivos de la comunidad es brindar experiencia en gestión y desarrollo de proyectos equiparable a un entorno laboral, que sea comprobable y útil.
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<FontAwesomeIcon icon={faChevronRight as FontAwesomeIconProps['icon']} fixedWidth listItem />
|
<span className="fa-li">
|
||||||
|
<FontAwesomeIcon icon={faChevronRight as FontAwesomeIconProps['icon']} />
|
||||||
|
</span>
|
||||||
{' '}
|
{' '}
|
||||||
<strong>Capacitación</strong>
|
<strong>Capacitación</strong>
|
||||||
<br />
|
<br />
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import { Container } from '@/styled-system/jsx'
|
|||||||
import { faChevronRight, faHeart } from '@fortawesome/free-solid-svg-icons'
|
import { faChevronRight, faHeart } from '@fortawesome/free-solid-svg-icons'
|
||||||
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
|
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
|
||||||
import NextLink from 'next/link'
|
import NextLink from 'next/link'
|
||||||
import { type FC } from 'react'
|
import type { FC } from 'react'
|
||||||
|
|
||||||
const Footer: FC = () => {
|
const Footer: FC = () => {
|
||||||
return (
|
return (
|
||||||
@@ -25,11 +25,15 @@ const Footer: FC = () => {
|
|||||||
<Typography variant="h3" component="div"> Acerca de </Typography>
|
<Typography variant="h3" component="div"> Acerca de </Typography>
|
||||||
<ul className="fa-ul">
|
<ul className="fa-ul">
|
||||||
<li>
|
<li>
|
||||||
<FontAwesomeIcon icon={faChevronRight} listItem fixedWidth />
|
<span className="fa-li">
|
||||||
|
<FontAwesomeIcon icon={faChevronRight} />
|
||||||
|
</span>
|
||||||
<NextLink href="/acerca-de"> EntGamers</NextLink>
|
<NextLink href="/acerca-de"> EntGamers</NextLink>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<FontAwesomeIcon icon={faChevronRight} listItem fixedWidth />
|
<span className="fa-li">
|
||||||
|
<FontAwesomeIcon icon={faChevronRight} />
|
||||||
|
</span>
|
||||||
<NextLink href="/clanes"> Clanes</NextLink>
|
<NextLink href="/clanes"> Clanes</NextLink>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
|
|||||||
import { ADMIN_CLAN_ID, MODERATOR_CLAN_ID } from 'entgamers-database/frontend/clanes/administrative'
|
import { ADMIN_CLAN_ID, MODERATOR_CLAN_ID } from 'entgamers-database/frontend/clanes/administrative'
|
||||||
import { logout } from 'entgamers-database/frontend/session'
|
import { logout } from 'entgamers-database/frontend/session'
|
||||||
import NextLink from 'next/link'
|
import NextLink from 'next/link'
|
||||||
import { type FC } from 'react'
|
import type { FC } from 'react'
|
||||||
|
|
||||||
const SessionButtons: FC = () => {
|
const SessionButtons: FC = () => {
|
||||||
const { session, status, clanes } = useAppSelector((state) => state.session)
|
const { session, status, clanes } = useAppSelector((state) => state.session)
|
||||||
@@ -22,7 +22,6 @@ const SessionButtons: FC = () => {
|
|||||||
|
|
||||||
if (status === 'idle' && session === undefined) {
|
if (status === 'idle' && session === undefined) {
|
||||||
return (
|
return (
|
||||||
<>
|
|
||||||
<Tooltip
|
<Tooltip
|
||||||
title="Iniciar sesión"
|
title="Iniciar sesión"
|
||||||
position="bottom"
|
position="bottom"
|
||||||
@@ -33,10 +32,9 @@ const SessionButtons: FC = () => {
|
|||||||
iconButton()
|
iconButton()
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<FontAwesomeIcon icon={faUser} fixedWidth />
|
<FontAwesomeIcon icon={faUser} />
|
||||||
</NextLink>
|
</NextLink>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
</>
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -53,10 +51,10 @@ const SessionButtons: FC = () => {
|
|||||||
iconButton()
|
iconButton()
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<FontAwesomeIcon icon={faUser} fixedWidth />
|
<FontAwesomeIcon icon={faUser} />
|
||||||
</NextLink>
|
</NextLink>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
{clanes !== undefined && clanes?.teams.some((team) => team.$id === ADMIN_CLAN_ID || team.$id === MODERATOR_CLAN_ID) && (
|
{clanes?.teams.some((team) => team.$id === ADMIN_CLAN_ID || team.$id === MODERATOR_CLAN_ID) && (
|
||||||
<Tooltip
|
<Tooltip
|
||||||
title="Panel de administración"
|
title="Panel de administración"
|
||||||
position="bottom"
|
position="bottom"
|
||||||
@@ -67,7 +65,7 @@ const SessionButtons: FC = () => {
|
|||||||
iconButton()
|
iconButton()
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<FontAwesomeIcon icon={faCogs} fixedWidth />
|
<FontAwesomeIcon icon={faCogs} />
|
||||||
</NextLink>
|
</NextLink>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
)}
|
)}
|
||||||
@@ -91,7 +89,7 @@ const SessionButtons: FC = () => {
|
|||||||
})
|
})
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<FontAwesomeIcon icon={faRightFromBracket} fixedWidth />
|
<FontAwesomeIcon icon={faRightFromBracket} />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
</>
|
</>
|
||||||
|
|||||||
@@ -109,7 +109,7 @@ const Menu: FC = () => {
|
|||||||
data-active={pathName === menuLink.href}
|
data-active={pathName === menuLink.href}
|
||||||
onClick={() => { setIsMenuOpen(false) }}
|
onClick={() => { setIsMenuOpen(false) }}
|
||||||
>
|
>
|
||||||
<FontAwesomeIcon icon={menuLink.icon} fixedWidth />
|
<FontAwesomeIcon icon={menuLink.icon} />
|
||||||
|
|
||||||
{menuLink.label}
|
{menuLink.label}
|
||||||
</NextLink>
|
</NextLink>
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
import { cx } from '@/styled-system/css'
|
import { cx } from '@/styled-system/css'
|
||||||
import { alert, type AlertVariantProps } from '@/styled-system/recipes/alert'
|
import { alert, type AlertVariantProps } from '@/styled-system/recipes/alert'
|
||||||
import { type MergeOmitting } from '@/types/utilities'
|
import type { MergeOmitting } from '@/types/utilities'
|
||||||
import { faTimes } from '@fortawesome/free-solid-svg-icons/faTimes'
|
import { faTimes } from '@fortawesome/free-solid-svg-icons/faTimes'
|
||||||
import { FontAwesomeIcon, type FontAwesomeIconProps } from '@fortawesome/react-fontawesome'
|
import { FontAwesomeIcon, type FontAwesomeIconProps } from '@fortawesome/react-fontawesome'
|
||||||
import { type DetailedHTMLProps, type FC, type HTMLAttributes, type ReactNode } from 'react'
|
import type { DetailedHTMLProps, FC, HTMLAttributes, ReactNode } from 'react'
|
||||||
import IconButton, { type IconButtonProps } from './IconButton'
|
import IconButton, { type IconButtonProps } from './IconButton'
|
||||||
|
|
||||||
type ComposedAlertProps = MergeOmitting<DetailedHTMLProps<HTMLAttributes<HTMLDivElement>, HTMLDivElement>, AlertVariantProps>
|
type ComposedAlertProps = MergeOmitting<DetailedHTMLProps<HTMLAttributes<HTMLDivElement>, HTMLDivElement>, AlertVariantProps>
|
||||||
@@ -32,7 +32,7 @@ export const AlertCloseButton: FC<ComposedAlertCloseButtonProps> = ({ children,
|
|||||||
{...allOtherAlertProps}
|
{...allOtherAlertProps}
|
||||||
>
|
>
|
||||||
{children === undefined
|
{children === undefined
|
||||||
? <FontAwesomeIcon icon={faTimes as FontAwesomeIconProps['icon']} fixedWidth size="sm" />
|
? <FontAwesomeIcon icon={faTimes as FontAwesomeIconProps['icon']} size="sm" />
|
||||||
: children}
|
: children}
|
||||||
</IconButton>
|
</IconButton>
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import IconButton from '@/components/ui/IconButton'
|
|||||||
import Tooltip from '@/components/ui/Tooltip'
|
import Tooltip from '@/components/ui/Tooltip'
|
||||||
import { css, cx } from '@/styled-system/css'
|
import { css, cx } from '@/styled-system/css'
|
||||||
import { input, type InputVariantProps } from '@/styled-system/recipes/input'
|
import { input, type InputVariantProps } from '@/styled-system/recipes/input'
|
||||||
import { type MergeOmitting } from '@/types/utilities'
|
import type { MergeOmitting } from '@/types/utilities'
|
||||||
import { faEye, faEyeSlash } from '@fortawesome/free-solid-svg-icons'
|
import { faEye, faEyeSlash } from '@fortawesome/free-solid-svg-icons'
|
||||||
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
|
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
|
||||||
import { useState, type FC, type InputHTMLAttributes } from 'react'
|
import { useState, type FC, type InputHTMLAttributes } from 'react'
|
||||||
@@ -47,7 +47,7 @@ const PasswordInput: FC<InputProps> = ({ className, ...props }) => {
|
|||||||
size="small"
|
size="small"
|
||||||
onClick={() => { setShowPassword(!showPassword) }}
|
onClick={() => { setShowPassword(!showPassword) }}
|
||||||
>
|
>
|
||||||
<FontAwesomeIcon icon={showPassword ? faEyeSlash : faEye} fixedWidth />
|
<FontAwesomeIcon icon={showPassword ? faEyeSlash : faEye} />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user