Skip to content

Commit b414488

Browse files
TurtIeSocksTurtIeSocks
authored
Merge pull request #978 from WatWowMap/client-restructure
Client restructure
2 parents d8105f8 + 1e23a55 commit b414488

File tree

417 files changed

+5810
-5402
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

417 files changed

+5810
-5402
lines changed

‎.eslintrc

+11-37
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
{
2-
"extends": [
3-
"airbnb",
4-
"airbnb/rules/react",
5-
"eslint:recommended",
6-
"prettier"
7-
],
2+
"extends": ["airbnb", "airbnb/rules/react", "eslint:recommended", "prettier"],
83
"parserOptions": {
94
"ecmaVersion": "latest"
105
},
@@ -74,42 +69,21 @@
7469
},
7570
"settings": {
7671
"node": {
77-
"extensions": [
78-
".mjs",
79-
".js",
80-
".jsx",
81-
".ts",
82-
".tsx"
83-
]
72+
"extensions": [".mjs", ".js", ".jsx", ".ts", ".tsx"]
8473
},
8574
"import/resolver": {
8675
"alias": {
8776
"map": [
88-
[
89-
"@components",
90-
"./src/components/"
91-
],
92-
[
93-
"@services",
94-
"./src/services/"
95-
],
96-
[
97-
"@hooks",
98-
"./src/hooks/"
99-
],
100-
[
101-
"@assets",
102-
"./src/assets/"
103-
]
77+
["@components", "./src/components/"],
78+
["@features", "./src/features/"],
79+
["@services", "./src/services/"],
80+
["@hooks", "./src/hooks/"],
81+
["@assets", "./src/assets/"],
82+
["@utils", "./src/utils/"],
83+
["@store", "./src/store/"]
10484
],
105-
"extensions": [
106-
".mjs",
107-
".js",
108-
".jsx",
109-
".ts",
110-
".tsx"
111-
]
85+
"extensions": [".mjs", ".js", ".jsx", ".ts", ".tsx"]
11286
}
11387
}
11488
}
115-
}
89+
}

‎jsconfig.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,11 @@
1212
"paths": {
1313
"@assets/*": ["./src/assets/*"],
1414
"@components/*": ["./src/components/*"],
15+
"@features/*": ["./src/features/*"],
1516
"@services/*": ["./src/services/*"],
16-
"@hooks/*": ["./src/hooks/*"]
17+
"@hooks/*": ["./src/hooks/*"],
18+
"@utils/*": ["./src/utils/*"],
19+
"@store/*": ["./src/store/*"]
1720
}
1821
},
1922
"exclude": ["node_modules", "**/node_modules/*", "dist"]

‎packages/locales/lib/generated/de.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -384,8 +384,8 @@
384384
"non_registered_human_title": "Ups, da stimmt etwas nicht!",
385385
"non_registered_human_desc": "Du bist möglicherweise nicht bei {{webhook}} registriert\nOder der Server ist derzeit nicht erreichbar",
386386
"try_again_later": "Bitte versuche es später nochmal",
387-
"selected_areas": "{{amount}} Gebiet ausgewählt",
388-
"selected_areas_plural": "{{amount}} Gebiete ausgewählt",
387+
"selected_areas_one": "{{count}} Gebiet ausgewählt",
388+
"selected_areas_other": "{{count}} Gebiete ausgewählt",
389389
"webhook_selection": "{{name}} Auswahl",
390390
"message_of_the_day": "Nachricht des Tages",
391391
"has_quest_indicator": "Alternative Farbe für Stops mit Quests",

‎packages/locales/lib/generated/es.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -367,8 +367,8 @@
367367
"non_registered_human_title": "¡Ups, algo no está bien!",
368368
"non_registered_human_desc": "Es posible que no estés registrado en {{webhook}}\nO el servidor no está disponible en este momento",
369369
"try_again_later": "Por favor, inténtalo de nuevo más tarde",
370-
"selected_areas": "{{amount}} Área Seleccionada",
371-
"selected_areas_plural": "{{amount}} Áreas Seleccionadas",
370+
"selected_areas_one": "{{count}} Área Seleccionada",
371+
"selected_areas_other": "{{count}} Áreas Seleccionadas",
372372
"webhook_selection": "Selección de {{name}}",
373373
"message_of_the_day": "Mensaje del Día",
374374
"has_quest_indicator": "Color Alternativo para Paradas con Misiones",

‎packages/locales/lib/generated/fr.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -358,8 +358,8 @@
358358
"non_registered_human_title": "Oups, quelque chose n'est pas bon !",
359359
"non_registered_human_desc": "Vous n'êtes peut-être pas enregistré auprès de {{webhook}}.\nOu le serveur est actuellement inaccessible",
360360
"try_again_later": "Veuillez réessayer plus tard",
361-
"selected_areas": "{{amount}} zone sélectionnée",
362-
"selected_areas_plural": "{{amount}} zones sélectionnées",
361+
"selected_areas_one": "{{count}} zone sélectionnée",
362+
"selected_areas_other": "{{count}} zones sélectionnées",
363363
"webhook_selection": "{{name}} Sélection",
364364
"has_quest_indicator": "Couleur alternative pour afficher les Quêtes",
365365
"show_ar_badge": "Afficher les Badges RA",

‎packages/locales/lib/generated/hi.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -367,8 +367,8 @@
367367
"non_registered_human_title": "उफ़, कुछ गड़बड़ है!",
368368
"non_registered_human_desc": "शायद आप {{webhook}} के साथ पंजीकृत नहीं हैं\nया सर्वर वर्तमान में अनुपलब्ध है",
369369
"try_again_later": "कृपया बाद में पुनः प्रयास करें",
370-
"selected_areas": "{{amount}} क्षेत्र चयनित हुआ",
371-
"selected_areas_plural": "{{amount}} क्षेत्र चयनित हुए",
370+
"selected_areas_one": "{{count}} क्षेत्र चयनित हुआ",
371+
"selected_areas_other": "{{count}} क्षेत्र चयनित हुए",
372372
"webhook_selection": "{{name}} चयन",
373373
"message_of_the_day": "दिन का संदेश",
374374
"has_quest_indicator": "क्वेस्ट के साथ स्टॉप के लिए वैकल्पिक रंग",

‎packages/locales/lib/generated/id.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -367,8 +367,8 @@
367367
"non_registered_human_title": "Ups, ada yang tidak beres!",
368368
"non_registered_human_desc": "Anda mungkin belum terdaftar dengan {{webhook}}\nAtau server saat ini tidak dapat dijangkau",
369369
"try_again_later": "Silakan coba lagi nanti",
370-
"selected_areas": "{{amount}} Area Dipilih",
371-
"selected_areas_plural": "{{amount}} Area Dipilih",
370+
"selected_areas_one": "{{count}} Area Dipilih",
371+
"selected_areas_other": "{{count}} Area Dipilih",
372372
"webhook_selection": "Pilihan {{name}}",
373373
"message_of_the_day": "Pesan Hari Ini",
374374
"has_quest_indicator": "Warna Alternatif untuk Pokestop dengan Tugas",

‎packages/locales/lib/generated/it.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -367,8 +367,8 @@
367367
"non_registered_human_title": "Ops, qualcosa non va!",
368368
"non_registered_human_desc": "Potresti non essere registrato con {{webhook}}\nO il server non è al momento raggiungibile",
369369
"try_again_later": "Per favore riprova più tardi",
370-
"selected_areas": "{{amount}} Area selezionata",
371-
"selected_areas_plural": "{{amount}} Aree selezionate",
370+
"selected_areas_one": "{{count}} Area selezionata",
371+
"selected_areas_other": "{{count}} Aree selezionate",
372372
"webhook_selection": "Selezione {{name}}",
373373
"message_of_the_day": "Messaggio del giorno",
374374
"has_quest_indicator": "Colore alternativo per i Pokestop con missioni",

‎packages/locales/lib/generated/ja.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -367,8 +367,8 @@
367367
"non_registered_human_title": "{{webhook}} に登録されていない可能性があります\nまたはサーバーに現在アクセスできません",
368368
"non_registered_human_desc": "後でもう一度お試しください",
369369
"try_again_later": "{{amount}} エリアが選択されました",
370-
"selected_areas": "{{amount}} エリアが選択されました",
371-
"selected_areas_plural": "{{name}} の選択",
370+
"selected_areas_one": "{{count}} エリアが選択されました",
371+
"selected_areas_other": "{{count}} の選択",
372372
"webhook_selection": "今日のメッセージ",
373373
"message_of_the_day": "クエストがあるポケストップの代替色を表示",
374374
"has_quest_indicator": "AR バッジを表示",

‎packages/locales/lib/generated/ko.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -366,9 +366,9 @@
366366
"slider_none": "죄송합니다, 뭔가 잘못되었습니다!",
367367
"non_registered_human_title": "{{webhook}}에 등록되지 않았을 수 있습니다\n또는 서버에 접속할 수 없습니다",
368368
"non_registered_human_desc": "나중에 다시 시도해주세요",
369-
"try_again_later": "{{amount}}개 지역 선택됨",
370-
"selected_areas": "{{amount}}개 지역 선택됨",
371-
"selected_areas_plural": "{{name}} 선택",
369+
"try_again_later": "개 지역 선택됨",
370+
"selected_areas_one": "{{count}}개 지역 선택됨",
371+
"selected_areas_other": "{{count}} 선택",
372372
"webhook_selection": "오늘의 메시지",
373373
"message_of_the_day": "퀘스트가 있는 스탑을 위한 대체 색상 표시",
374374
"has_quest_indicator": "AR 뱃지 표시",

‎packages/locales/lib/generated/nl.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -344,8 +344,8 @@
344344
"non_registered_human_title": "Oeps, er klopt iets niet!",
345345
"non_registered_human_desc": "You may not be registered with {{webhook}}\nOr the server is currently unreachable",
346346
"try_again_later": "Probeer het later opnieuw",
347-
"selected_areas": "{{amount}} Area Selected",
348-
"selected_areas_plural": "{{amount}} Areas Selected",
347+
"selected_areas_one": "{{count}} Area Selected",
348+
"selected_areas_other": "{{count}} Areas Selected",
349349
"webhook_selection": "{{name}} Selectie",
350350
"message_of_the_day": "Bericht van de dag",
351351
"has_quest_indicator": "Alternatieve kleur voor Stops met Quests",

‎packages/locales/lib/generated/pl.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -374,8 +374,8 @@
374374
"non_registered_human_title": "Ups, coś poszło nie tak!",
375375
"non_registered_human_desc": "Nie możesz być zarejestrowany w {{webhook}}\n\nLub serwer jest obecnie niedostępny",
376376
"try_again_later": "Spróbuj ponownie później",
377-
"selected_areas": "{{amount}} wybrany obszar",
378-
"selected_areas_plural": "{{amount}} wybrane obszary",
377+
"selected_areas_one": "{{count}} wybrany obszar",
378+
"selected_areas_other": "{{count}} wybrane obszary",
379379
"webhook_selection": "{{name}} wybór",
380380
"server_dev_error_0": "{{variable_0}}",
381381
"navigation_controls": "Sterowanie nawigacją",

‎packages/locales/lib/generated/pt-br.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -367,8 +367,8 @@
367367
"non_registered_human_title": "Ops, algo não está certo!",
368368
"non_registered_human_desc": "Você pode não estar registrado com {{webhook}}\nOu o servidor está inacessível no momento",
369369
"try_again_later": "Por favor, tente novamente mais tarde",
370-
"selected_areas": "Área Selecionada",
371-
"selected_areas_plural": "{{amount}} Áreas Selecionadas",
370+
"selected_areas_one": "{{count}} Área Selecionada",
371+
"selected_areas_other": "{{count}} Áreas Selecionadas",
372372
"webhook_selection": "Seleção de {{name}}",
373373
"message_of_the_day": "Mensagem do Dia",
374374
"has_quest_indicator": "Cor Alternativa para PokéStops com Tarefas",

‎packages/locales/lib/generated/ru.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -367,8 +367,8 @@
367367
"non_registered_human_title": "Упс, что-то не так!",
368368
"non_registered_human_desc": "Возможно, вы не зарегистрированы в {{webhook}}\nИли сервер в данный момент недоступен",
369369
"try_again_later": "Пожалуйста, попробуйте позже",
370-
"selected_areas": "Выбрано {{amount}} область",
371-
"selected_areas_plural": "Выбрано {{amount}} области",
370+
"selected_areas_one": "Выбрано {{count}} область",
371+
"selected_areas_other": "Выбрано {{count}} области",
372372
"webhook_selection": "Выбор {{name}}",
373373
"message_of_the_day": "Сообщение дня",
374374
"has_quest_indicator": "Альтернативный цвет для покестопов с заданиями",

‎packages/locales/lib/generated/sv.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -367,8 +367,8 @@
367367
"non_registered_human_title": "Hoppsan, något är inte rätt!",
368368
"non_registered_human_desc": "Du kanske inte är registrerad med {{webhook}}\nEller servern är för närvarande otillgänglig",
369369
"try_again_later": "Försök igen senare",
370-
"selected_areas": "{{amount}} område valt",
371-
"selected_areas_plural": "{{amount}} områden valda",
370+
"selected_areas_one": "{{count}} område valt",
371+
"selected_areas_other": "{{count}} områden valda",
372372
"webhook_selection": "{{name}} Val",
373373
"message_of_the_day": "Dagens meddelande",
374374
"has_quest_indicator": "Alternativ färg för stops med uppdrag",

‎packages/locales/lib/generated/th.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -364,10 +364,10 @@
364364
"add_new_profile": "อุ๊ปส์ มีบางอย่างผิดพลาด!",
365365
"slider_none": "คุณอาจไม่ได้ลงทะเบียนกับ {{webhook}}\nหรือเซิร์ฟเวอร์ไม่สามารถเชื่อมต่อได้ในขณะนี้",
366366
"non_registered_human_title": "โปรดลองอีกครั้งในภายหลัง",
367-
"non_registered_human_desc": "เลือกพื้นที่ {{amount}}",
368-
"try_again_later": "เลือกพื้นที่ {{amount}} แห่ง",
369-
"selected_areas": "การเลือก {{name}}",
370-
"selected_areas_plural": "ข้อความของวันนี้",
367+
"non_registered_human_desc": "เลือกพื้นที่ {{count}}",
368+
"try_again_later": "เลือกพื้นที่ {{count}} แห่ง",
369+
"selected_areas_one": "การเลือก {{name}}",
370+
"selected_areas_other": "ข้อความของวันนี้",
371371
"webhook_selection": "สีทางเลือกสำหรับสถานีที่มีเควส",
372372
"message_of_the_day": "แสดงป้ายชื่อ AR",
373373
"has_quest_indicator": "สนามกีฬาทั้งหมด",

‎packages/locales/lib/generated/tr.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -367,8 +367,8 @@
367367
"non_registered_human_title": "Muhtemelen {{webhook}} ile kayıtlı değilsiniz\nVeya sunucu şu anda erişilemez durumda",
368368
"non_registered_human_desc": "Lütfen daha sonra tekrar deneyin",
369369
"try_again_later": "{{amount}} Alan Seçildi",
370-
"selected_areas": "{{amount}} Alanlar Seçildi",
371-
"selected_areas_plural": "{{name}} Seçimi",
370+
"selected_areas_one": "{{count}} Alanlar Seçildi",
371+
"selected_areas_other": "{{count}} Seçimi",
372372
"webhook_selection": "Günün Mesajı",
373373
"message_of_the_day": "Görevleri Olan Duraklar İçin Alternatif Renk Göster",
374374
"has_quest_indicator": "AR Rozeti Göster",

‎packages/locales/lib/generated/zh-tw.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -367,8 +367,8 @@
367367
"non_registered_human_title": "哎呀，出了點問題！",
368368
"non_registered_human_desc": "您可能未在{{webhook}}上註冊\n或服務器目前無法訪問",
369369
"try_again_later": "請稍後再試",
370-
"selected_areas": "{{amount}}個區域已選擇",
371-
"selected_areas_plural": "已選擇{{amount}}個區域",
370+
"selected_areas_one": "{{count}}個區域已選擇",
371+
"selected_areas_other": "已選擇{{count}}個區域",
372372
"webhook_selection": "{{name}}選擇",
373373
"message_of_the_day": "每日消息",
374374
"has_quest_indicator": "具有任務的 PokéStop 的替代顏色",

‎packages/locales/lib/human/de.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -384,8 +384,8 @@
384384
"non_registered_human_title": "Ups, da stimmt etwas nicht!",
385385
"non_registered_human_desc": "Du bist möglicherweise nicht bei {{webhook}} registriert\nOder der Server ist derzeit nicht erreichbar",
386386
"try_again_later": "Bitte versuche es später nochmal",
387-
"selected_areas": "{{amount}} Gebiet ausgewählt",
388-
"selected_areas_plural": "{{amount}} Gebiete ausgewählt",
387+
"selected_areas_one": "{{count}} Gebiet ausgewählt",
388+
"selected_areas_other": "{{count}} Gebiete ausgewählt",
389389
"webhook_selection": "{{name}} Auswahl",
390390
"message_of_the_day": "Nachricht des Tages",
391391
"has_quest_indicator": "Alternative Farbe für Stops mit Quests",

‎packages/locales/lib/human/en.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -399,8 +399,8 @@
399399
"non_registered_human_title": "Oops, something is not right!",
400400
"non_registered_human_desc": "You may not be registered with {{webhook}}\nOr the server is currently unreachable",
401401
"try_again_later": "Please try again later",
402-
"selected_areas": "{{amount}} Area Selected",
403-
"selected_areas_plural": "{{amount}} Areas Selected",
402+
"selected_areas_one": "{{count}} Area Selected",
403+
"selected_areas_other": "{{count}} Areas Selected",
404404
"webhook_selection": "{{name}} Selection",
405405
"message_of_the_day": "Message of the Day",
406406
"has_quest_indicator": "Alternative Color for Stops with Quests",

‎packages/locales/lib/human/es.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -367,8 +367,8 @@
367367
"non_registered_human_title": "¡Ups, algo no está bien!",
368368
"non_registered_human_desc": "Es posible que no estés registrado en {{webhook}}\nO el servidor no está disponible en este momento",
369369
"try_again_later": "Por favor, inténtalo de nuevo más tarde",
370-
"selected_areas": "{{amount}} Área Seleccionada",
371-
"selected_areas_plural": "{{amount}} Áreas Seleccionadas",
370+
"selected_areas_one": "{{count}} Área Seleccionada",
371+
"selected_areas_other": "{{count}} Áreas Seleccionadas",
372372
"webhook_selection": "Selección de {{name}}",
373373
"message_of_the_day": "Mensaje del Día",
374374
"has_quest_indicator": "Color Alternativo para Paradas con Misiones",
@@ -616,4 +616,4 @@
616616
"hide_editor": "Ocultar Editor",
617617
"reported_error": "Este error ha sido reportado al servidor con el identificador",
618618
"dark_mode": "Modo Oscuro"
619-
}
619+
}

‎packages/locales/lib/human/fr.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -358,8 +358,8 @@
358358
"non_registered_human_title": "Oups, quelque chose n'est pas bon !",
359359
"non_registered_human_desc": "Vous n'êtes peut-être pas enregistré auprès de {{webhook}}.\nOu le serveur est actuellement inaccessible",
360360
"try_again_later": "Veuillez réessayer plus tard",
361-
"selected_areas": "{{amount}} zone sélectionnée",
362-
"selected_areas_plural": "{{amount}} zones sélectionnées",
361+
"selected_areas_one": "{{count}} zone sélectionnée",
362+
"selected_areas_other": "{{count}} zones sélectionnées",
363363
"webhook_selection": "{{name}} Sélection",
364364
"has_quest_indicator": "Couleur alternative pour afficher les Quêtes",
365365
"show_ar_badge": "Afficher les Badges RA",

‎packages/types/lib/augmentations.d.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
import { ButtonProps } from '@mui/material'
1+
import { Request } from 'express'
2+
import type { ButtonProps } from '@mui/material'
3+
24
import { Config, GetSafeConfig } from './config'
35
import { ExpressUser, Permissions } from './server'
4-
import { Request } from 'express'
56

67
declare module 'config' {
78
interface IConfig extends Config {

‎packages/types/lib/client.d.ts

+38-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
import * as React from 'react'
2-
import { Config } from './config'
3-
import UAssets from '@services/Icons'
4-
import { ButtonProps, SxProps, Theme } from '@mui/material'
2+
import type { ButtonProps, SxProps, Theme } from '@mui/material'
53
import { SystemStyleObject } from '@mui/system'
64

5+
import { UAssets } from '@services/Assets'
6+
import { Config } from './config'
7+
import { AdvCategories, Permissions } from '@rm/types'
8+
79
declare global {
810
declare const CONFIG: Config<true>
911

@@ -19,6 +21,16 @@ export interface CustomI extends React.HTMLProps<HTMLLIElement> {
1921

2022
export type TimesOfDay = 'day' | 'night' | 'dawn' | 'dusk'
2123

24+
export type Theme = 'light' | 'dark'
25+
26+
export type TileLayer = {
27+
name: string
28+
style: import('@rm/types').Theme
29+
attribution?: string
30+
url?: string
31+
background?: string
32+
} & { [key in TimesOfDay]?: string }
33+
2234
export type MarginProps = {
2335
[Key in
2436
| 'm'
@@ -51,3 +63,26 @@ export interface MultiSelectorProps<V> {
5163
newValue: V,
5264
) => (e?: React.MouseEvent<HTMLButtonElement, MouseEvent>) => void
5365
}
66+
67+
export interface FilterObj {
68+
name: string
69+
perms: (keyof Permissions)[]
70+
webhookOnly?: boolean
71+
searchMeta?: string
72+
category?: AdvCategories
73+
pokedexId?: number
74+
formId?: number
75+
defaultFormId?: number
76+
pokeName?: string
77+
formName?: string
78+
formTypes?: string[]
79+
rarity?: string
80+
historic?: string
81+
legendary?: boolean
82+
mythical?: boolean
83+
ultraBeast?: boolean
84+
genId?: string
85+
family?: number
86+
}
87+
88+
export type ClientFilterObj = Record<string, Record<string, FilterObj>>

0 commit comments

Comments
 (0)