, containerEl.current)}
+
+
+
+
+
+
+
Configuration OBS
+
+
+
+
+
+
}
-export function CategoryContent({cat, catId, setCat}) {
+export function CategoryContent({cat, catId, setCat, menuActions}) {
const setLoading = useLoadingSwitcher()
const {sendRequest, dispatch} = useWS();
const [matches, reducer] = useReducer(MarchReducer, []);
@@ -148,7 +150,7 @@ export function CategoryContent({cat, catId, setCat}) {
return <>
{cat && }
@@ -156,7 +158,7 @@ export function CategoryContent({cat, catId, setCat}) {
}
-function AddComb({groups, setGroups, removeGroup}) {
+function AddComb({groups, setGroups, removeGroup, menuActions}) {
const {data, setData} = useRequestWS("getRegister", null)
const combDispatch = useCombsDispatch()
const {dispatch} = useWS()
@@ -190,6 +192,21 @@ function AddComb({groups, setGroups, removeGroup}) {
if (data === null)
return;
combDispatch({type: 'SET_ALL', payload: {source: "register", data: data}});
+
+ const resourceList = []
+ data.forEach(d => {
+ if (d.club_uuid) {
+ const url = `${vite_url}/api/club/${d.club_uuid}/logo`;
+ if (!resourceList.some(d => d.url === url))
+ resourceList.push({url: url, name: `club_${d.club_uuid}.png`});
+ }
+ if (d.country) {
+ const url = `/flags/svg/${d.country.toLowerCase()}.svg`;
+ if (!resourceList.some(d => d.url === url))
+ resourceList.push({url: url, name: `flag_${d.country.toLowerCase()}.svg`});
+ }
+ })
+ menuActions.current.resourceList = resourceList
}, [data]);
return <>
diff --git a/src/main/webapp/src/pages/competition/editor/PubAffWindow.jsx b/src/main/webapp/src/pages/competition/editor/PubAffWindow.jsx
index 8eac0bc..0b7273d 100644
--- a/src/main/webapp/src/pages/competition/editor/PubAffWindow.jsx
+++ b/src/main/webapp/src/pages/competition/editor/PubAffWindow.jsx
@@ -14,16 +14,16 @@ const text2Style = {fontSize: "min(1.7vw, 7vh)", fontWeight: "bold"};
export function PubAffWindow({document}) {
const chronoText = useRef(null)
- const state2 = useRef({lastColor: "white", lastTimeStr: "--:--"})
+ const state2 = useRef({lastColor: "#ffffff", lastTimeStr: "--:--"})
const state = usePubAffState();
- document.title = "A React portal window"
+ document.title = "Affichage Public";
document.body.className = "bg-dark text-white overflow-hidden";
state.timeCb = (payload) => {
- state2.current = {lastColor: payload.timeColor === "black" ? "white" : payload.timeColor, lastTimeStr: payload.timeStr}
+ state2.current = {lastColor: payload.timeColor === "#000000" ? "#ffffff" : payload.timeColor, lastTimeStr: payload.timeStr}
chronoText.current.textContent = payload.timeStr
- chronoText.current.style.color = payload.timeColor === "black" ? "white" : payload.timeColor
+ chronoText.current.style.color = payload.timeColor === "#000000" ? "#ffffff" : payload.timeColor
}
const showScore = state.showScore ?? true;
diff --git a/src/main/webapp/src/utils/Tools.js b/src/main/webapp/src/utils/Tools.js
index 5821030..a74a8e3 100644
--- a/src/main/webapp/src/utils/Tools.js
+++ b/src/main/webapp/src/utils/Tools.js
@@ -153,3 +153,31 @@ export function timePrint(time, negSign = false) {
String(min).padStart(2, '0') + ":" +
String(sec).padStart(2, '0')
}
+
+//create full hex
+function fullHex (hex) {
+ let r = hex.slice(1,2);
+ let g = hex.slice(2,3);
+ let b = hex.slice(3,4);
+
+ r = parseInt(r+r, 16);
+ g = parseInt(g+g, 16);
+ b = parseInt(b+b, 16);
+
+ // return {r, g, b}
+ return { r, g, b };
+}
+
+//convert hex to rgb
+export function hex2rgb (hex) {
+ if(hex.length === 4){
+ return fullHex(hex);
+ }
+
+ const r = parseInt(hex.slice(1, 3), 16);
+ const g = parseInt(hex.slice(3, 5), 16);
+ const b = parseInt(hex.slice(5, 7), 16);
+
+ // return {r, g, b}
+ return { r, g, b };
+}