From 88bcd4f8d3c799da99555108ddcb66036735faf4 Mon Sep 17 00:00:00 2001 From: manager Date: Fri, 15 May 2026 13:30:40 +0000 Subject: [PATCH] chore(uxc): import-sort autofix + Oswald-Bold path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Follow-ups from PR #114 review (now merged): - Mary's Issue #5: Oswald-Bold @font-face in src/styles/globals.scss pointed at /fonts/biases/Oswald-Bold (wrong directory, missing .ttf). The file lives at /fonts/Oswald-Bold.ttf. Browsers were tolerating it but the descriptor was technically broken. Fixed. - 6 simple-import-sort lint errors that pre-dated this branch (UX Core consolidation merges 445d87e / 4691c08 left them) — autofixed: - CustomModal/contentTypes/{AddQuestion,ContactUs}/*.tsx - UserProfile/UserProfile.tsx - _uxcp/CountryBiasMap/{BiasPanel,CountryList,CountryMap}/*.tsx Co-Authored-By: Claude Opus 4.7 --- src/styles/globals.scss | 2 +- .../contentTypes/AddQuestion/AddQuestion.tsx | 22 +++++++------------ .../contentTypes/ContactUs/ContactUs.tsx | 22 +++++++------------ .../components/UserProfile/UserProfile.tsx | 16 +++++--------- .../CountryBiasMap/BiasPanel/BiasPanel.tsx | 11 ++++------ .../CountryList/CountryList.tsx | 6 ++--- .../CountryBiasMap/CountryMap/CountryMap.tsx | 6 ++--- 7 files changed, 31 insertions(+), 54 deletions(-) diff --git a/src/styles/globals.scss b/src/styles/globals.scss index 5473916..e7346fa 100644 --- a/src/styles/globals.scss +++ b/src/styles/globals.scss @@ -422,7 +422,7 @@ body { @font-face { font-family: 'Oswald'; - src: url('/fonts/biases/Oswald-Bold') format('truetype'); + src: url('/fonts/Oswald-Bold.ttf') format('truetype'); font-weight: normal; font-display: swap; } diff --git a/src/uxcore/components/CustomModal/contentTypes/AddQuestion/AddQuestion.tsx b/src/uxcore/components/CustomModal/contentTypes/AddQuestion/AddQuestion.tsx index 8c178f2..eaf79b4 100644 --- a/src/uxcore/components/CustomModal/contentTypes/AddQuestion/AddQuestion.tsx +++ b/src/uxcore/components/CustomModal/contentTypes/AddQuestion/AddQuestion.tsx @@ -1,22 +1,16 @@ -import { useRouter } from 'next/router'; -import { FC, useCallback, useState } from 'react'; - -import type { TagType } from '@uxcore/local-types/data'; -import type { TRouter } from '@uxcore/local-types/global'; - -import useFormPopup from '@uxcore/hooks/useFormPopup'; -import useSpinner from '@uxcore/hooks/useSpinner'; - -import { validateEmail } from '@uxcore/lib/helpers'; - import { addQuestionRequest } from '@uxcore/api/addQuestion'; - -import addQuestionData from '@uxcore/data/addQuestion'; - import Button from '@uxcore/components/Button'; import Input from '@uxcore/components/Input'; import Tag from '@uxcore/components/Tag'; import Textarea from '@uxcore/components/Textarea'; +import addQuestionData from '@uxcore/data/addQuestion'; +import useFormPopup from '@uxcore/hooks/useFormPopup'; +import useSpinner from '@uxcore/hooks/useSpinner'; +import { validateEmail } from '@uxcore/lib/helpers'; +import type { TagType } from '@uxcore/local-types/data'; +import type { TRouter } from '@uxcore/local-types/global'; +import { useRouter } from 'next/router'; +import { FC, useCallback, useState } from 'react'; import styles from './AddQuestion.module.scss'; diff --git a/src/uxcore/components/CustomModal/contentTypes/ContactUs/ContactUs.tsx b/src/uxcore/components/CustomModal/contentTypes/ContactUs/ContactUs.tsx index 698f23e..df0fa23 100644 --- a/src/uxcore/components/CustomModal/contentTypes/ContactUs/ContactUs.tsx +++ b/src/uxcore/components/CustomModal/contentTypes/ContactUs/ContactUs.tsx @@ -1,21 +1,15 @@ -import cn from 'classnames'; -import { useRouter } from 'next/router'; -import { FC, useCallback, useState } from 'react'; - -import type { TRouter } from '@uxcore/local-types/global'; - -import useFormPopup from '@uxcore/hooks/useFormPopup'; -import useSpinner from '@uxcore/hooks/useSpinner'; - -import { validateEmail } from '@uxcore/lib/helpers'; - import { contactUsRequest } from '@uxcore/api/contactUs'; - -import contactUsData from '@uxcore/data/contactUs'; - import Button from '@uxcore/components/Button'; import Input from '@uxcore/components/Input'; import Textarea from '@uxcore/components/Textarea'; +import contactUsData from '@uxcore/data/contactUs'; +import useFormPopup from '@uxcore/hooks/useFormPopup'; +import useSpinner from '@uxcore/hooks/useSpinner'; +import { validateEmail } from '@uxcore/lib/helpers'; +import type { TRouter } from '@uxcore/local-types/global'; +import cn from 'classnames'; +import { useRouter } from 'next/router'; +import { FC, useCallback, useState } from 'react'; import styles from './ContactUs.module.scss'; diff --git a/src/uxcore/components/UserProfile/UserProfile.tsx b/src/uxcore/components/UserProfile/UserProfile.tsx index 805040a..70c3201 100644 --- a/src/uxcore/components/UserProfile/UserProfile.tsx +++ b/src/uxcore/components/UserProfile/UserProfile.tsx @@ -1,18 +1,14 @@ +import RankingInfoAndBtn from '@uxcore/components/AccountHeader/RankingInfoAndBtn'; +import Button from '@uxcore/components/Button'; +import StartTestBtn from '@uxcore/components/StartTestBtn'; +import uxcatData from '@uxcore/data/uxcat'; +import useMobile from '@uxcore/hooks/useMobile'; +import { TRouter } from '@uxcore/local-types/global'; import cn from 'classnames'; import { useRouter } from 'next/router'; import React, { FC } from 'react'; import { Tooltip as ReactTooltip } from 'react-tooltip'; -import { TRouter } from '@uxcore/local-types/global'; - -import useMobile from '@uxcore/hooks/useMobile'; - -import uxcatData from '@uxcore/data/uxcat'; - -import RankingInfoAndBtn from '@uxcore/components/AccountHeader/RankingInfoAndBtn'; -import Button from '@uxcore/components/Button'; -import StartTestBtn from '@uxcore/components/StartTestBtn'; - import styles from './UserProfile.module.scss'; type UserProfileProps = { diff --git a/src/uxcore/components/_uxcp/CountryBiasMap/BiasPanel/BiasPanel.tsx b/src/uxcore/components/_uxcp/CountryBiasMap/BiasPanel/BiasPanel.tsx index 6f6f37b..df77c66 100644 --- a/src/uxcore/components/_uxcp/CountryBiasMap/BiasPanel/BiasPanel.tsx +++ b/src/uxcore/components/_uxcp/CountryBiasMap/BiasPanel/BiasPanel.tsx @@ -1,3 +1,7 @@ +import { countryBiasByLocale, REGION_COLORS } from '@uxcore/data/countryBias'; +import { sanitizeHtml } from '@uxcore/lib/sanitizeHtml'; +import type { StrapiBiasType } from '@uxcore/local-types/data'; +import type { TRouter } from '@uxcore/local-types/global'; import Link from 'next/link'; import { useRouter } from 'next/router'; import { @@ -10,13 +14,6 @@ import { useState, } from 'react'; -import type { StrapiBiasType } from '@uxcore/local-types/data'; -import type { TRouter } from '@uxcore/local-types/global'; - -import { sanitizeHtml } from '@uxcore/lib/sanitizeHtml'; - -import { countryBiasByLocale, REGION_COLORS } from '@uxcore/data/countryBias'; - import FlagImage from '../FlagImage'; import styles from './BiasPanel.module.scss'; diff --git a/src/uxcore/components/_uxcp/CountryBiasMap/CountryList/CountryList.tsx b/src/uxcore/components/_uxcp/CountryBiasMap/CountryList/CountryList.tsx index 3dfd88c..8f9ffb5 100644 --- a/src/uxcore/components/_uxcp/CountryBiasMap/CountryList/CountryList.tsx +++ b/src/uxcore/components/_uxcp/CountryBiasMap/CountryList/CountryList.tsx @@ -1,11 +1,9 @@ +import { countryBiasByLocale, REGION_COLORS } from '@uxcore/data/countryBias'; +import type { TRouter } from '@uxcore/local-types/global'; import cn from 'classnames'; import { useRouter } from 'next/router'; import { type ChangeEvent, type FC, useMemo, useState } from 'react'; -import type { TRouter } from '@uxcore/local-types/global'; - -import { countryBiasByLocale, REGION_COLORS } from '@uxcore/data/countryBias'; - import FlagImage from '../FlagImage'; import styles from './CountryList.module.scss'; diff --git a/src/uxcore/components/_uxcp/CountryBiasMap/CountryMap/CountryMap.tsx b/src/uxcore/components/_uxcp/CountryBiasMap/CountryMap/CountryMap.tsx index 955fd09..4ac1910 100644 --- a/src/uxcore/components/_uxcp/CountryBiasMap/CountryMap/CountryMap.tsx +++ b/src/uxcore/components/_uxcp/CountryBiasMap/CountryMap/CountryMap.tsx @@ -1,3 +1,5 @@ +import { countryBiasByLocale, REGION_COLORS } from '@uxcore/data/countryBias'; +import type { TRouter } from '@uxcore/local-types/global'; import { geoGraticule10, geoNaturalEarth1, @@ -18,10 +20,6 @@ import { import { feature } from 'topojson-client'; import type { GeometryCollection, Topology } from 'topojson-specification'; -import type { TRouter } from '@uxcore/local-types/global'; - -import { countryBiasByLocale, REGION_COLORS } from '@uxcore/data/countryBias'; - import FlagImage from '../FlagImage'; import styles from './CountryMap.module.scss';