From 0023066e32dfd0d29eb7218cd7bce3782e801367 Mon Sep 17 00:00:00 2001 From: MathieuG-P <40181755+Zagrios@users.noreply.github.com> Date: Tue, 10 Jan 2023 20:21:00 +0100 Subject: [PATCH] add text when no maps found --- assets/jsons/translations/en.json | 3 ++- assets/jsons/translations/es.json | 3 ++- assets/jsons/translations/fr.json | 3 ++- .../modal/modal-types/download-maps-modal.component.tsx | 9 ++++++--- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/assets/jsons/translations/en.json b/assets/jsons/translations/en.json index 53eb5935..72ef61de 100644 --- a/assets/jsons/translations/en.json +++ b/assets/jsons/translations/en.json @@ -505,7 +505,8 @@ }, "download-maps": { "search-btn": "Search", - "loading-maps": "Loading maps..." + "loading-maps": "Loading maps...", + "no-maps-found": "No maps found" }, "mods-disclaimer":{ "title": "disclaimer", diff --git a/assets/jsons/translations/es.json b/assets/jsons/translations/es.json index 60f93ecf..0c92f3ca 100644 --- a/assets/jsons/translations/es.json +++ b/assets/jsons/translations/es.json @@ -505,7 +505,8 @@ }, "download-maps": { "search-btn": "buscar", - "loading-maps": "Cargando mapas..." + "loading-maps": "Cargando mapas...", + "no-maps-found": "No se encontraron mapas" }, "mods-disclaimer":{ "title": "descargo de responsabilidad", diff --git a/assets/jsons/translations/fr.json b/assets/jsons/translations/fr.json index ec8339ff..f75399c9 100644 --- a/assets/jsons/translations/fr.json +++ b/assets/jsons/translations/fr.json @@ -505,7 +505,8 @@ }, "download-maps": { "search-btn": "Rechercher", - "loading-maps": "Chargement des maps..." + "loading-maps": "Chargement des maps...", + "no-maps-found": "Aucune map trouvée" }, "mods-disclaimer":{ "title": "avis de non-responsabilité", diff --git a/src/renderer/components/modal/modal-types/download-maps-modal.component.tsx b/src/renderer/components/modal/modal-types/download-maps-modal.component.tsx index ad0d6b7d..7be7db42 100644 --- a/src/renderer/components/modal/modal-types/download-maps-modal.component.tsx +++ b/src/renderer/components/modal/modal-types/download-maps-modal.component.tsx @@ -14,6 +14,7 @@ import { ModalComponent } from "renderer/services/modale.service"; import { BSVersion } from "shared/bs-version.interface"; import { BsvMapCharacteristic, BsvMapDetail, MapFilter, SearchOrder, SearchParams } from "shared/models/maps/beat-saver.model"; import BeatWaitingImg from "../../../../../assets/images/apngs/beat-waiting.png"; +import BeatConflictImg from "../../../../../assets/images/apngs/beat-conflict.png"; import equal from "fast-deep-equal/es6"; import { ProgressBarService } from "renderer/services/progress-bar.service"; import { useTranslation } from "renderer/hooks/use-translation.hook"; @@ -34,6 +35,7 @@ export const DownloadMapsModal: ModalComponent = ({data}) => { const [maps, setMaps] = useState([]); const [sortOrder, setSortOrder] = useState(BSV_SORT_ORDER.at(0)); const [ownedMapHashs, setOwnedMapHashs] = useState([]); + const [loading, setLoading] = useState(false); const [searchParams, setSearchParams] = useState({ sortOrder, filter, @@ -73,7 +75,8 @@ export const DownloadMapsModal: ModalComponent = ({data}) => { }, []) const loadMaps = (params: SearchParams) => { - beatSaver.searchMaps(params).then((maps => setMaps(prev => [...prev, ...maps]))); + setLoading(() => true); + beatSaver.searchMaps(params).then((maps => setMaps(prev => [...prev, ...maps]))).finally(() => setLoading(() => false)); } const extractMapDiffs = (map: BsvMapDetail): Map => { @@ -167,8 +170,8 @@ export const DownloadMapsModal: ModalComponent = ({data}) => {
    {maps.length === 0 ? (
    -  - {t("modals.download-maps.loading-maps")} +  + {t(loading ? "modals.download-maps.loading-maps" : "modals.download-maps.no-maps-found")}
    ) : ( <>