c0ntroller/infoscreen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix token problem

Browse Source
This commit is contained in:
Daniel Kluge 2022-07-28 23:51:47 +02:00
parent b5f7f5d43f
commit 2b2b121751
5 changed files with 16 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/components/Calendar.tsx
View File

@ -26,10 +26,11 @@ interface EventList {
}
const Calendar = ({ secrets }: { secrets: SecretsCalendar }) => {
const [token, setToken] = React.useState("")
const [calendarToken, setToken] = React.useState("")
const [events, setEvents] = React.useState<EventList>({})
const mergeEvents = (currentList: EventList, toAdd: Event[], ownerIdx: number = 0) => {
if (!toAdd || toAdd.length === 0) return;
for(const event of toAdd) {
const startDate = new Date(event.start.date ? event.start.date : event.start.dateTime)
const startDateString = startDate.toDateString()
@ -103,45 +104,6 @@ const Calendar = ({ secrets }: { secrets: SecretsCalendar }) => {
}
}
/*let lastDate = "";
let i = 0;
for (const event of events) {
const startDate = new Date(event.start.date ? event.start.date : event.start.dateTime)
const startDateString = `${startDate.getFullYear()}${startDate.getMonth()}${startDate.getDate()}`
if (startDateString !== lastDate) {
lastDate = startDateString;
const dayDiff = daysDifference(new Date(), startDate);
let dayDiffString: string;
switch (dayDiff) {
case 0: dayDiffString = "Heute"
break;
case 1: dayDiffString = "Morgen"
break;
default: dayDiffString = `${dayDiff} Tage`;
break;
}
eventTable.push(
<tr key={startDateString}><td colSpan={2} className={styles.calendarDateHeader}>
{dowToString(startDate.getDay())}, {startDate.getDate()}. {startDate.getMonth() + 1}
<span className={styles.calendarDateHeaderSub}>({dayDiffString})</span>
</td></tr>
);
}
if (event.start.date) {
eventTable.push(
<tr key={++i} className={styles.calendarEntry}><td colSpan={2}>{event.summary}</td></tr>
);
} else {
eventTable.push(
<tr key={++i} className={styles.calendarEntry}>
<td>{event.summary}</td>
<td className={styles.entryTime}>{startDate.getHours()}:{startDate.getMinutes().toString().padStart(2, "0")}</td>
</tr>
)
}
}*/
return eventTable;
}
@ -160,8 +122,8 @@ const Calendar = ({ secrets }: { secrets: SecretsCalendar }) => {
return token.access_token;
}
const pullCalendar = async (provToken?: string, calendarIndex: number = 0) => {
const correctToken = provToken || token;
const pullCalendar = async (calendarToken: string, calendarIndex: number = 0) => {
const correctToken = calendarToken;
if (!correctToken || correctToken === "") return;
const timeMin = new Date();
@ -183,7 +145,7 @@ const Calendar = ({ secrets }: { secrets: SecretsCalendar }) => {
//setEvents([...processEventData(events.items)]);
}
const pullAll = async (provToken?: string) => {
const pullAll = async (provToken: string) => {
const eventList: EventList = {}
for(let i = 0; i < secrets.calendarIds.length; i++) {
const events = await pullCalendar(provToken, i);
@ -194,8 +156,13 @@ const Calendar = ({ secrets }: { secrets: SecretsCalendar }) => {
React.useEffect(() => {
requestToken().then(pullAll)
const calendarInterval = setInterval(pullAll, CALENDAR_REFRESH_INTERVAL);
const calendarTokenInterval = setInterval(requestToken, CALENDAR_TOKEN_REFRESH_INTERVAL);
const calendarInterval = setInterval(() => {
setToken(token => {
pullAll(token);
return token;
})
}, CALENDAR_REFRESH_INTERVAL);
const calendarTokenInterval = setInterval(requestToken.bind(this), CALENDAR_TOKEN_REFRESH_INTERVAL);
return () => {
clearInterval(calendarInterval);

2
src/components/DVB.tsx
View File

@ -54,7 +54,7 @@ const DVB = ({ stopId }: { stopId: number }) => {
React.useEffect(() => {
pullDepartures();
const dvbInterval = setInterval(pullDepartures, DVB_REFRESH_INTERVAL);
const dvbInterval = setInterval(pullDepartures.bind(this), DVB_REFRESH_INTERVAL);
return () => clearInterval(dvbInterval);
}, [])

2
src/components/News.tsx
View File

@ -54,7 +54,7 @@ const News = () => {
React.useEffect(() => {
pullNews()
const newsInterval = setInterval(pullNews, NEWS_REFRESH_INTERVAL);
const newsInterval = setInterval(pullNews.bind(this), NEWS_REFRESH_INTERVAL);
return () => clearInterval(newsInterval);
}, [])

2
src/components/PlantState.tsx
View File

@ -29,7 +29,7 @@ const PlantState = ({ hassUrl, token, plants }: { hassUrl: string, token: string
React.useEffect(() => {
pullPlants()
const plantInterval = setInterval(pullPlants, PLANT_REFRESH_INTERVAL);
const plantInterval = setInterval(pullPlants.bind(this), PLANT_REFRESH_INTERVAL);
return () => clearInterval(plantInterval);
}, [])

2
src/components/WeatherAndTime.tsx
View File

@ -67,7 +67,7 @@ const WeatherAndTime = ({ secrets }: { secrets: SecretsWeather }) => {
}, 1000);
pullWeather()
const weatherInterval = setInterval(pullWeather, WEATHER_REFRESH_INTERVAL);
const weatherInterval = setInterval(pullWeather.bind(this), WEATHER_REFRESH_INTERVAL);
return () => {
clearInterval(dateInterval);