This commit is contained in:
AuroraLS3 2024-05-26 15:08:22 +00:00
parent b5e6985be1
commit 93e4e6ce36
9 changed files with 740 additions and 757 deletions

View File

@ -114,8 +114,14 @@ Data_gathering:
Geolocation_Download_URL: "https://geodb.playeranalytics.net/GeoLite2-Country.mmdb"
Ping: true
Disk_space: true
# Does not affect already gathered data
Preserve_join_address_case: false
Join_addresses:
Enabled: true
# Does not affect already gathered data
Preserve_case: false
Preserve_invalid: false
# Replaces these join addresses with unknown
Filter_out_from_data:
- "play.example.com"
# -----------------------------------------------------
# Supported time units: MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS
# -----------------------------------------------------

View File

@ -118,8 +118,14 @@ Data_gathering:
Commands:
Log_unknown: false
Log_aliases_as_main_command: true
# Does not affect already gathered data
Preserve_join_address_case: false
Join_addresses:
Enabled: true
# Does not affect already gathered data
Preserve_case: false
Preserve_invalid: false
# Replaces these join addresses with unknown
Filter_out_from_data:
- "play.example.com"
# -----------------------------------------------------
# Supported time units: MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS
# -----------------------------------------------------

View File

@ -907,7 +907,7 @@ plugin:
no: "否"
today: "'今天'"
unavailable: "不可用"
unknown: "位置"
unknown: "未知"
yes: "是"
yesterday: "'昨天'"
localeReloaded: "自定义 locale.yml 已被修改,因此已重新加载并且现在正在使用。"

View File

@ -290,8 +290,8 @@ html:
active: "Actif"
activePlaytime: "Temps Actif"
activityIndex: "Indice d'Activité"
addJoinAddressGroup: "Add address group"
addressGroup: "Address group {{n}}"
addJoinAddressGroup: "Ajouter un groupe d'adresses"
addressGroup: "Groupe d'adresses {{n}}"
afk: "AFK"
afkTime: "Temps AFK"
all: "Tout"
@ -665,8 +665,8 @@ html:
page_network_geolocations_map: "Voir la carte des géolocalisations"
page_network_geolocations_ping_per_country: "Voir le tableau Ping par pays"
page_network_join_addresses: "Voir les adresses de jointure -tab"
page_network_join_addresses_graphs: "Voir les graphiques de l'adresse de jonction"
page_network_join_addresses_graphs_time: "Voir le graphique des adresses de jointure dans le temps"
page_network_join_addresses_graphs: "Voir les graphiques des adresses de connexion"
page_network_join_addresses_graphs_time: "Voir le graphique des adresses de connexion dans le temps"
page_network_overview: "Voir Aperçu du réseau -tab"
page_network_overview_graphs: "Voir les graphiques de l'aperçu du réseau"
page_network_overview_graphs_calendar: "Voir le calendrier du réseau"
@ -684,7 +684,7 @@ html:
page_network_retention: "Voir l'onglet Rétention des joueurs"
page_network_server_list: "Voir la liste des serveurs"
page_network_sessions: "Voir l'onglet Sessions"
page_network_sessions_list: "See list of sessions"
page_network_sessions_list: "Voir la liste des sessions"
page_network_sessions_overview: "Voir les perspectives de la session"
page_network_sessions_server_pie: "Voir le graphique à secteurs du serveur"
page_network_sessions_world_pie: "Voir le graphique de la carte du monde"
@ -700,7 +700,7 @@ html:
page_server_geolocations_map: "Voir la carte des géolocalisations"
page_server_geolocations_ping_per_country: "Voir le tableau Ping par pays"
page_server_join_addresses: "Voir les adresses de jointure -tab"
page_server_join_addresses_graphs: "Voir les graphiques de l'adresse de connexion"
page_server_join_addresses_graphs: "Voir les graphiques des adresses de connexion"
page_server_join_addresses_graphs_time: "Voir le graphique des adresses de connexion dans le temps"
page_server_online_activity: "Voir l'activité en ligne -tab"
page_server_online_activity_graphs: "Voir les graphiques de l'activité en ligne"
@ -794,7 +794,7 @@ html:
generic:
are: "`sont`"
label:
editQuery: "Edit Query"
editQuery: "Modifier la requête"
from: ">de</label>"
makeAnother: "Faire une autre Requête"
servers:

View File

@ -12,36 +12,36 @@
"@fortawesome/free-brands-svg-icons": "^6.5.2",
"@fortawesome/free-regular-svg-icons": "^6.5.2",
"@fortawesome/free-solid-svg-icons": "^6.5.2",
"@fortawesome/react-fontawesome": "^0.2.0",
"@fortawesome/react-fontawesome": "^0.2.2",
"@fullcalendar/bootstrap": "^6.1.11",
"@fullcalendar/core": "^6.1.11",
"@fullcalendar/core": "^6.1.13",
"@fullcalendar/daygrid": "^6.1.11",
"@fullcalendar/interaction": "^6.1.11",
"@fullcalendar/react": "^6.1.11",
"@highcharts/map-collection": "^2.1.0",
"@testing-library/jest-dom": "^6.4.2",
"@testing-library/react": "^15.0.2",
"@testing-library/jest-dom": "^6.4.5",
"@testing-library/react": "^15.0.7",
"@testing-library/user-event": "^14.5.2",
"axios": "^1.6.8",
"axios": "^1.7.2",
"bootstrap": "^5.3.3",
"export-to-csv": "^1.2.4",
"highcharts": "^10.3.3",
"i18next": "^23.11.2",
"export-to-csv": "^1.3.0",
"highcharts": "^11.4.3",
"i18next": "^23.11.5",
"i18next-chained-backend": "^4.6.2",
"i18next-http-backend": "^2.5.1",
"i18next-http-backend": "^2.5.2",
"i18next-localstorage-backend": "^4.2.0",
"masonry-layout": "^4.2.2",
"moment": "^2.30.1",
"react": "^18.2.0",
"react": "^18.3.1",
"react-bootstrap": "^2.10.2",
"react-bootstrap-range-slider": "^3.0.8",
"react-dom": "^18.2.0",
"react-i18next": "^14.1.0",
"react-dom": "^18.3.1",
"react-i18next": "^14.1.2",
"react-mcjsonchat": "^1.0.0",
"react-router-dom": "6",
"sass": "^1.75.0",
"react-router-dom": "^6.23.1",
"sass": "^1.77.2",
"source-map-explorer": "^2.5.2",
"swagger-ui": "^5.16.1",
"swagger-ui": "^5.17.12",
"web-vitals": "^3.0.2"
},
"scripts": {
@ -68,7 +68,7 @@
]
},
"devDependencies": {
"@vitejs/plugin-react": "^4.2.1",
"vite": "^5.2.9"
"@vitejs/plugin-react": "^4.3.0",
"vite": "^5.2.11"
}
}

View File

@ -12,6 +12,7 @@ const PunchCard = ({series}) => {
const punchCard = {
name: t('html.label.relativeJoinActivity'),
color: nightModeEnabled ? withReducedSaturation('#222') : '#222',
type: 'scatter',
data: series
};
Accessibility(Highcharts);

View File

@ -32,7 +32,7 @@ const InnerItem = ({href, icon, name, nameShort, color, external, collapseSideba
if (external) {
return (
<a href={href} className="collapse-item nav-button">
<Fa icon={icon} className={color ? "col-" + color : undefined}/>
<Fa icon={icon} className={color ? "col-" + color : ""}/>
<span>{nameShort ? nameShort : name}</span>
</a>
)
@ -41,7 +41,7 @@ const InnerItem = ({href, icon, name, nameShort, color, external, collapseSideba
return <NavLink to={href} onClick={collapseSidebar} className={({isActive}) => {
return isActive ? "collapse-item nav-button active" : "collapse-item nav-button"
}}>
<Fa icon={icon} className={color ? "col-" + color : undefined}/> <span>{nameShort ? nameShort : name}</span>
<Fa icon={icon} className={color ? "col-" + color : ""}/> <span>{nameShort ? nameShort : name}</span>
</NavLink>
}
@ -65,7 +65,7 @@ export const Item = ({item, inner, collapseSidebar}) => {
return (
<li className={"nav-item nav-button"}>
<a href={baseAddress + href} className="nav-link">
<Fa icon={icon} className={color ? "col-" + color : undefined}/>
<Fa icon={icon} className={color ? "col-" + color : ""}/>
<span>{t(nameShort ? nameShort : name)}</span>
</a>
</li>
@ -77,7 +77,7 @@ export const Item = ({item, inner, collapseSidebar}) => {
<NavLink to={href} onClick={collapseSidebar} className={({isActive}) => {
return isActive ? "nav-link active" : "nav-link"
}}>
<Fa icon={icon} className={color ? "col-" + color : undefined}/> <span>{t(name)}</span>
<Fa icon={icon} className={color ? "col-" + color : ""}/> <span>{t(name)}</span>
</NavLink>
</li>
);
@ -142,7 +142,7 @@ const SidebarCollapse = ({item, open, setOpen, collapseSidebar}) => {
aria-expanded={open}
data-bs-toggle="collapse"
>
<Fa icon={item.icon} className={item?.color ? "col-" + item?.color : undefined}/>
<Fa icon={item.icon} className={item?.color ? "col-" + item?.color : ""}/>
<span>{t(item.name)}</span>
</button>
<Collapse in={open}>

View File

@ -51,6 +51,7 @@ export const GroupEditContextProvider = ({groupName, children}) => {
const [allPermissions, setAllPermissions] = useState([]);
useEffect(() => {
// TODO Make this only happen once when opening groups page
fetchAvailablePermissions().then(response => {
setAllPermissions(response?.data?.permissions);
});

File diff suppressed because it is too large Load Diff