From 4aad28a2e585b7327ca9745c03bca162d3d11997 Mon Sep 17 00:00:00 2001 From: Luke Date: Thu, 8 Dec 2022 11:37:24 +0100 Subject: [PATCH] chore(web): remove unused settings component --- locales/al.json | 4 -- locales/cs.json | 4 -- locales/de.json | 4 -- locales/en.json | 4 -- locales/es.json | 4 -- locales/et.json | 4 -- locales/fr.json | 4 -- locales/he.json | 4 -- locales/hr.json | 4 -- locales/hu.json | 4 -- locales/it.json | 4 -- locales/lt.json | 4 -- locales/nl.json | 4 -- locales/pl.json | 4 -- locales/ru.json | 4 -- locales/sk.json | 4 -- locales/sl.json | 4 -- locales/sv.json | 4 -- locales/zh-tw.json | 4 -- web/src/App.tsx | 2 - web/src/features/dev/debug/settings.ts | 10 --- web/src/features/dev/index.tsx | 4 -- .../features/settings/components/locale.tsx | 32 ---------- web/src/features/settings/index.tsx | 62 ------------------- web/src/providers/LocaleProvider.tsx | 12 ---- 25 files changed, 198 deletions(-) delete mode 100644 web/src/features/dev/debug/settings.ts delete mode 100644 web/src/features/settings/components/locale.tsx delete mode 100644 web/src/features/settings/index.tsx diff --git a/locales/al.json b/locales/al.json index c748388..6d112ea 100644 --- a/locales/al.json +++ b/locales/al.json @@ -1,10 +1,6 @@ { "language": "Shqip", "ui": { - "settings": { - "title": "Cilësimet", - "language": "Gjuhe" - }, "cancel": "Cancel", "close": "Mbylle", "confirm": "Konfirmo" diff --git a/locales/cs.json b/locales/cs.json index 2b59347..cdf00ec 100644 --- a/locales/cs.json +++ b/locales/cs.json @@ -1,10 +1,6 @@ { "language": "Čeština", "ui": { - "settings": { - "title": "Nastavení", - "language": "Jazyk" - }, "cancel": "Zrušit", "close": "Zavřít", "confirm": "Potvrdit" diff --git a/locales/de.json b/locales/de.json index 8ef38fe..cce07fe 100644 --- a/locales/de.json +++ b/locales/de.json @@ -1,10 +1,6 @@ { "language": "Deutsch", "ui": { - "settings": { - "title": "Einstellungen", - "language": "Sprache" - }, "cancel": "Abbrechen", "close": "Schließen", "confirm": "Bestätigen" diff --git a/locales/en.json b/locales/en.json index f491193..86d7a7c 100644 --- a/locales/en.json +++ b/locales/en.json @@ -1,10 +1,6 @@ { "language": "English", "ui": { - "settings": { - "title": "Settings", - "language": "Language" - }, "cancel": "Cancel", "close": "Close", "confirm": "Confirm" diff --git a/locales/es.json b/locales/es.json index 25fbb76..760db22 100644 --- a/locales/es.json +++ b/locales/es.json @@ -1,10 +1,6 @@ { "language": "Español", "ui": { - "settings": { - "title": "Ajustes", - "language": "Idioma" - }, "cancel": "Cancelar", "close": "Cerrar", "confirm": "Confirmar" diff --git a/locales/et.json b/locales/et.json index e14500f..9164e41 100644 --- a/locales/et.json +++ b/locales/et.json @@ -1,10 +1,6 @@ { "language": "Eesti", "ui": { - "settings": { - "title": "Seaded", - "language": "Keel" - }, "cancel": "Tühista", "close": "Sulge", "confirm": "Kinnita" diff --git a/locales/fr.json b/locales/fr.json index 2f5b94c..5ac82fd 100644 --- a/locales/fr.json +++ b/locales/fr.json @@ -1,10 +1,6 @@ { "language": "Français", "ui": { - "settings": { - "title": "Réglages", - "language": "Langue" - }, "cancel": "Annuler", "close": "Fermer", "confirm": "Confirmer" diff --git a/locales/he.json b/locales/he.json index b5fd2f4..07da029 100644 --- a/locales/he.json +++ b/locales/he.json @@ -1,10 +1,6 @@ { "language": "עברית", "ui": { - "settings": { - "title": "הגדרות", - "language": "שפה" - }, "cancel": "ביטול", "close": "סגירה", "confirm": "אישור" diff --git a/locales/hr.json b/locales/hr.json index a27429a..838a9c1 100644 --- a/locales/hr.json +++ b/locales/hr.json @@ -1,10 +1,6 @@ { "language": "Hrvatski", "ui": { - "settings": { - "title": "Postavke", - "language": "Jezik" - }, "cancel": "Odustani", "close": "Zatvori", "confirm": "Potvrdi" diff --git a/locales/hu.json b/locales/hu.json index 4f5690a..c15df0c 100644 --- a/locales/hu.json +++ b/locales/hu.json @@ -1,10 +1,6 @@ { "language": "Magyar", "ui": { - "settings": { - "title": "Beállítások", - "language": "Nyelv" - }, "cancel": "Mégse", "close": "Bezárás", "confirm": "Megerősít" diff --git a/locales/it.json b/locales/it.json index a7a5e15..ccc3629 100644 --- a/locales/it.json +++ b/locales/it.json @@ -1,10 +1,6 @@ { "language": "Italiano", "ui": { - "settings": { - "title": "Impostazioni", - "language": "Lingua" - }, "cancel": "Cancel", "close": "Chiudere", "confirm": "Confermare" diff --git a/locales/lt.json b/locales/lt.json index f3544ac..e440631 100644 --- a/locales/lt.json +++ b/locales/lt.json @@ -1,10 +1,6 @@ { "language": "Lietuvių", "ui": { - "settings": { - "title": "Nustatymai", - "language": "Kalba" - }, "cancel": "Cancel", "close": "Uždaryti", "confirm": "Patvirtinti" diff --git a/locales/nl.json b/locales/nl.json index a3c1879..4e18200 100644 --- a/locales/nl.json +++ b/locales/nl.json @@ -1,10 +1,6 @@ { "language": "Nederlands", "ui": { - "settings": { - "title": "Instellingen", - "language": "Taal" - }, "cancel": "Annuleren", "close": "Sluiten", "confirm": "Bevestig" diff --git a/locales/pl.json b/locales/pl.json index 82fddaf..b7d16be 100644 --- a/locales/pl.json +++ b/locales/pl.json @@ -1,10 +1,6 @@ { "language": "Polski", "ui": { - "settings": { - "title": "Ustawienia", - "language": "Język" - }, "cancel": "Anuluj", "close": "Zamknij", "confirm": "Potwierdź" diff --git a/locales/ru.json b/locales/ru.json index 576c6c2..952b314 100644 --- a/locales/ru.json +++ b/locales/ru.json @@ -1,10 +1,6 @@ { "language": "Русский", "ui": { - "settings": { - "title": "Настройки", - "language": "Язык" - }, "cancel": "Отменить", "close": "Закрывать", "confirm": "Подтверждать" diff --git a/locales/sk.json b/locales/sk.json index db15dd3..8d81930 100644 --- a/locales/sk.json +++ b/locales/sk.json @@ -1,10 +1,6 @@ { "language": "Slovenčina", "ui": { - "settings": { - "title": "Nastavenia", - "language": "Jazyk" - }, "cancel": "Zrušiť", "close": "Zavrieť", "confirm": "Potvrdiť" diff --git a/locales/sl.json b/locales/sl.json index 3bde0ec..984c87b 100644 --- a/locales/sl.json +++ b/locales/sl.json @@ -1,10 +1,6 @@ { "language": "Slovenski", "ui": { - "settings": { - "title": "Nastavitve", - "language": "Jezik" - }, "cancel": "Cancel", "close": "Zapri", "confirm": "Potrdi" diff --git a/locales/sv.json b/locales/sv.json index 4d5fb32..d416537 100644 --- a/locales/sv.json +++ b/locales/sv.json @@ -1,10 +1,6 @@ { "language": "Svenska", "ui": { - "settings": { - "title": "Inställningar", - "language": "Språk" - }, "cancel": "Avbryt", "close": "Stäng", "confirm": "Acceptera" diff --git a/locales/zh-tw.json b/locales/zh-tw.json index d6bbf88..e48bf61 100644 --- a/locales/zh-tw.json +++ b/locales/zh-tw.json @@ -1,10 +1,6 @@ { "language": "繁體中文", "ui": { - "settings": { - "title": "設置", - "language": "語言" - }, "cancel": "取消", "close": "關閉", "confirm": "確認" diff --git a/web/src/App.tsx b/web/src/App.tsx index 3819d9c..da4dbac 100644 --- a/web/src/App.tsx +++ b/web/src/App.tsx @@ -4,7 +4,6 @@ import Progressbar from './features/progress/Progressbar'; import TextUI from './features/textui/TextUI'; import InputDialog from './features/dialog/InputDialog'; import ContextMenu from './features/menu/context/ContextMenu'; -import Settings from './features/settings'; import { useNuiEvent } from './hooks/useNuiEvent'; import { setClipboard } from './utils/setClipboard'; import { fetchNui } from './utils/fetchNui'; @@ -23,7 +22,6 @@ const App: React.FC = () => { return ( <> - diff --git a/web/src/features/dev/debug/settings.ts b/web/src/features/dev/debug/settings.ts deleted file mode 100644 index e0e67e2..0000000 --- a/web/src/features/dev/debug/settings.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { debugData } from '../../../utils/debugData'; - -export const debugSettings = () => { - debugData([ - { - action: 'openSettings', - data: true, - }, - ]); -}; diff --git a/web/src/features/dev/index.tsx b/web/src/features/dev/index.tsx index 1ed502f..f75224e 100644 --- a/web/src/features/dev/index.tsx +++ b/web/src/features/dev/index.tsx @@ -19,7 +19,6 @@ import { debugMenu } from './debug/menu'; import { debugCustomNotification, debugNotification } from './debug/notification'; import { debugCircleProgressbar, debugProgressbar } from './debug/progress'; import { debugTextUI } from './debug/textui'; -import { debugSettings } from './debug/settings'; import { debugSkillCheck } from './debug/skillcheck'; const Dev: React.FC = () => { @@ -77,9 +76,6 @@ const Dev: React.FC = () => { Activate progress circle - diff --git a/web/src/features/settings/components/locale.tsx b/web/src/features/settings/components/locale.tsx deleted file mode 100644 index c7adc6a..0000000 --- a/web/src/features/settings/components/locale.tsx +++ /dev/null @@ -1,32 +0,0 @@ -import { HStack, Text, Select, Spacer } from '@chakra-ui/react'; -import { useLocales } from '../../../providers/LocaleProvider'; -import { fetchNui } from '../../../utils/fetchNui'; - -const LocaleSetting: React.FC<{ - languages: string[]; - selectValue: string; - setSelectValue: React.Dispatch>; -}> = (props) => { - const { locale } = useLocales(); - - const handleChange = (e: React.ChangeEvent) => { - props.setSelectValue(e.target.value); - fetchNui('getLocale', e.target.value); - }; - - return ( - - {locale.ui.settings.language} - - - - ); -}; - -export default LocaleSetting; diff --git a/web/src/features/settings/index.tsx b/web/src/features/settings/index.tsx deleted file mode 100644 index 53a8e03..0000000 --- a/web/src/features/settings/index.tsx +++ /dev/null @@ -1,62 +0,0 @@ -import { - Button, - Modal, - ModalBody, - ModalContent, - ModalFooter, - ModalHeader, - ModalOverlay, - useDisclosure, -} from '@chakra-ui/react'; -import LocaleSetting from './components/locale'; -import { useState } from 'react'; -import { useNuiEvent } from '../../hooks/useNuiEvent'; -import { fetchNui } from '../../utils/fetchNui'; -import { useLocales } from '../../providers/LocaleProvider'; - -const Settings: React.FC = () => { - const { isOpen, onOpen, onClose } = useDisclosure(); - const { locale } = useLocales(); - const [languages, setLanguages] = useState(['']); - const [selectValue, setSelectValue] = useState(''); - - const closeSettings = () => { - onClose(); - fetchNui('closeSettings'); - }; - - useNuiEvent('loadLocales', (data) => setLanguages(data)); - useNuiEvent('openSettings', (data: string) => { - onOpen(); - setSelectValue(data); - }); - - return ( - <> - - - - {locale.ui.settings.title} - - - - - - - - - - ); -}; - -export default Settings; diff --git a/web/src/providers/LocaleProvider.tsx b/web/src/providers/LocaleProvider.tsx index 785e43b..dd6e102 100644 --- a/web/src/providers/LocaleProvider.tsx +++ b/web/src/providers/LocaleProvider.tsx @@ -15,10 +15,6 @@ debugData([ data: { language: 'English', ui: { - settings: { - title: 'Settings', - language: 'Language', - }, close: 'Close', confirm: 'Confirm', }, @@ -29,10 +25,6 @@ debugData([ interface Locale { language: string; ui: { - settings: { - title: string; - language: string; - }; cancel: string; close: string; confirm: string; @@ -50,10 +42,6 @@ const LocaleProvider: React.FC<{ children: React.ReactNode }> = ({ children }) = const [locale, setLocale] = useState({ language: '', ui: { - settings: { - title: '', - language: '', - }, cancel: '', close: '', confirm: '',