From 5d8fbc93632e59d5124a71635b007dddc7ca9506 Mon Sep 17 00:00:00 2001 From: Antonio De Lucreziis Date: Wed, 14 Sep 2022 13:31:17 +0200 Subject: [PATCH] Missing conflicts --- src/components/HamburgerMenu.jsx | 56 +++--- src/main.jsx | 335 ++++++++++++++----------------- 2 files changed, 181 insertions(+), 210 deletions(-) diff --git a/src/components/HamburgerMenu.jsx b/src/components/HamburgerMenu.jsx index e3df2d2..fc8a077 100644 --- a/src/components/HamburgerMenu.jsx +++ b/src/components/HamburgerMenu.jsx @@ -4,25 +4,25 @@ import { Help } from './Help.jsx' import { Icon } from './Icon.jsx' export const HamburgerMenu = ({ onClose, mode, setMode, source, setSource, theme, setTheme }) => { - return ( -
-
-
- - -
- -
- {/*
+ return ( +
+
+
+ + +
+ +
+ {/*
Gruppo Corsi
*/} -
-

- - Guida -

- -
-
- ) +
+

+ + Guida +

+ +
+
+ ) } diff --git a/src/main.jsx b/src/main.jsx index 590696f..1706fc8 100644 --- a/src/main.jsx +++ b/src/main.jsx @@ -15,215 +15,186 @@ window._ = _ window.dataBuffer = {} const CALENDAR_IDS = { - 'anno-1': ['6308cfcb1df5cb026699ce32'], - 'anno-2': ['6308e2dc09352a0208fefdd9'], - 'anno-3': ['6308e42a1df5cb026699ced4'], - 'magistrale': ['6308e8ea0c34e703bb1f7e85'], - 'tutti': [ - '6308cfcb1df5cb026699ce32', - '6308e2dc09352a0208fefdd9', - '6308e42a1df5cb026699ced4', - '6308e8ea0c34e703bb1f7e85', - ], + 'anno-1': ['6308cfcb1df5cb026699ce32'], + 'anno-2': ['6308e2dc09352a0208fefdd9'], + 'anno-3': ['6308e42a1df5cb026699ced4'], + 'magistrale': ['6308e8ea0c34e703bb1f7e85'], + 'tutti': [ + '6308cfcb1df5cb026699ce32', + '6308e2dc09352a0208fefdd9', + '6308e42a1df5cb026699ced4', + '6308e8ea0c34e703bb1f7e85', + ], } async function loadEventi(ids) { - const calendari = await Promise.all( - ids.map(async id => { - // Almost directly copy-pasted from Chrome Dev Tools - const req = await fetch( - 'https://apache.prod.up.cineca.it/api/Impegni/getImpegniCalendarioPubblico', - { - headers: { - 'content-type': 'application/json;charset=UTF-8', - 'sec-fetch-dest': 'empty', - 'sec-fetch-mode': 'cors', - 'sec-fetch-site': 'same-site', - }, - body: JSON.stringify({ - mostraImpegniAnnullati: true, - mostraIndisponibilitaTotali: false, - linkCalendarioId: id, - clienteId: '628de8b9b63679f193b87046', - pianificazioneTemplate: false, - dataInizio: '2022-10-02T22:00:00.000Z', - dataFine: '2022-10-07T22:00:00.000Z', - }), - method: 'POST', - mode: 'cors', - credentials: 'omit', - } - ) - - return await req.json() - }) - ) - -<<<<<<< HEAD + const calendari = await Promise.all( + ids.map(async id => { + // Almost directly copy-pasted from Chrome Dev Tools + const req = await fetch( + 'https://apache.prod.up.cineca.it/api/Impegni/getImpegniCalendarioPubblico', + { + headers: { + 'content-type': 'application/json;charset=UTF-8', + 'sec-fetch-dest': 'empty', + 'sec-fetch-mode': 'cors', + 'sec-fetch-site': 'same-site', + }, + body: JSON.stringify({ + mostraImpegniAnnullati: true, + mostraIndisponibilitaTotali: false, + linkCalendarioId: id, + clienteId: '628de8b9b63679f193b87046', + pianificazioneTemplate: false, + dataInizio: '2022-10-02T22:00:00.000Z', + dataFine: '2022-10-07T22:00:00.000Z', + }), + method: 'POST', + mode: 'cors', + credentials: 'omit', + } + ) + + return await req.json() + }) + ) + if (ids.length === 1) { return calendari[0] } -======= - // console.log(calendari) - - if (ids.length === 1) { - return calendari[0] - } ->>>>>>> 41195462f176b27e142a78d7a63c072144135c5a - return _.uniqBy(_.concat(...calendari), 'id') + return _.uniqBy(_.concat(...calendari), 'id') } const App = ({}) => { -<<<<<<< HEAD // Data Sources const [source, setSource] = useState('magistrale') const [eventi, setEventi] = useState([]) // View Modes const [mode, setMode] = useState(MODE_COURSE) -======= - // Data Sources - const [source, setSource] = useState('anno-1') - const [eventi, setEventi] = useState([]) - // View Modes - const [mode, setMode] = useState(MODE_WORKWEEK_GRID) ->>>>>>> 41195462f176b27e142a78d7a63c072144135c5a + // Selection + const [selectedCourses, setSelectedCourses] = useState([]) + const [hideOtherCourses, setHideOtherCourses] = useState(false) - // Selection - const [selectedCourses, setSelectedCourses] = useState([]) - const [hideOtherCourses, setHideOtherCourses] = useState(false) + // Menus + const [helpVisible, setHelpVisible] = useState(false) + const [showMobileMenu, setShowMobileMenu] = useState(false) - // Menus - const [helpVisible, setHelpVisible] = useState(false) - const [showMobileMenu, setShowMobileMenu] = useState(false) - -<<<<<<< HEAD useEffect(async () => { const eventi = await loadEventi(CALENDAR_IDS[source]) -======= - useEffect(async () => { - console.log('source changed') - const eventi = await loadEventi(CALENDAR_IDS[source]) ->>>>>>> 41195462f176b27e142a78d7a63c072144135c5a - window.dataBuffer[source] = eventi + window.dataBuffer[source] = eventi - setEventi(eventi) - }, [source]) + setEventi(eventi) + }, [source]) - const groupIds = new Set(eventi.map(e => e.nome)) - const toolOverlayVisible = - selectedCourses.length > 0 && selectedCourses.filter(id => groupIds.has(id)).length > 0 + const groupIds = new Set(eventi.map(e => e.nome)) + const toolOverlayVisible = + selectedCourses.length > 0 && selectedCourses.filter(id => groupIds.has(id)).length > 0 -<<<<<<< HEAD useEffect(() => { const groupIds = new Set(eventi.map(e => e.nome)) -======= - useEffect(() => { - console.log('course length changed') - const groupIds = new Set(eventi.map(e => e.nome)) ->>>>>>> 41195462f176b27e142a78d7a63c072144135c5a - - if ( - selectedCourses.length === 0 || - selectedCourses.filter(id => groupIds.has(id)).length === 0 - ) { - setHideOtherCourses(false) - } - }, [eventi, selectedCourses.length]) - - const [theme, setTheme] = useState( - localStorage.getItem('theme') ?? - (window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light') - ) - - document.body.classList.toggle('dark-mode', theme === 'dark') - localStorage.setItem('theme', theme) - - return ( - <> - setShowMobileMenu(true), - onHelp: () => setHelpVisible(true), - theme, - setTheme, - }} - /> - setHelpVisible(true), - }} - /> - ({ - id: nome, - name: _.split(nome, '-', 1)[0].trim(), - start: new Date(dataInizio), - end: new Date(dataFine), - docenti: docenti.map(({ nome, cognome }) => - _.startCase(_.lowerCase(nome) + ' ' + _.lowerCase(cognome)) - ), - aula: _.startCase(aule[0].codice.toLowerCase()).replace( - /([A-Z]) ([1-9])/, - '$1$2' - ), - }))} - /> - {toolOverlayVisible && ( - setHideOtherCourses(s => !s)} - onClose={() => { - setSelectedCourses([]) - setHideOtherCourses(false) - }} - /> - )} - {showMobileMenu && ( - { - setShowMobileMenu(false) - }, - }} - /> - )} - {helpVisible && ( - - Guida - - } - onClose={() => setHelpVisible(false)} - > - - - )} - - ) + + if ( + selectedCourses.length === 0 || + selectedCourses.filter(id => groupIds.has(id)).length === 0 + ) { + setHideOtherCourses(false) + } + }, [eventi, selectedCourses.length]) + + const [theme, setTheme] = useState( + localStorage.getItem('theme') ?? + (window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light') + ) + + document.body.classList.toggle('dark-mode', theme === 'dark') + localStorage.setItem('theme', theme) + + return ( + <> + setShowMobileMenu(true), + onHelp: () => setHelpVisible(true), + theme, + setTheme, + }} + /> + setHelpVisible(true), + }} + /> + ({ + id: nome, + name: _.split(nome, '-', 1)[0].trim(), + start: new Date(dataInizio), + end: new Date(dataFine), + docenti: docenti.map(({ nome, cognome }) => + _.startCase(_.lowerCase(nome) + ' ' + _.lowerCase(cognome)) + ), + aula: _.startCase(aule[0].codice.toLowerCase()).replace( + /([A-Z]) ([1-9])/, + '$1$2' + ), + }))} + /> + {toolOverlayVisible && ( + setHideOtherCourses(s => !s)} + onClose={() => { + setSelectedCourses([]) + setHideOtherCourses(false) + }} + /> + )} + {showMobileMenu && ( + { + setShowMobileMenu(false) + }, + }} + /> + )} + {helpVisible && ( + + Guida + + } + onClose={() => setHelpVisible(false)} + > + + + )} + + ) } render(, document.body)