mvv/findtheti.me
1
0
Fork 0
mirror of https://github.com/mvvasilev/findtheti.me.git synced 2025-04-11 18:15:01 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix availability times sometimes not combining correctly

Browse source
This commit is contained in:
Miroslav Vasilev 2024-01-13 15:13:44 +02:00
parent 88f924cbb9
commit 150aebb17b
2 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
frontend/src/components/AvailabilityPicker.tsx
View file

@ -57,7 +57,7 @@ const AvailabilityPicker = (props: {
}
const deleteAvailability = (day: AvailabilityDay, time: Dayjs) => {
let existingTime = day.availableTimes.findIndex(t => utils.dayjsIsBetweenUnixExclusive(t.fromTime, time, t.toTime));
let existingTime = day.availableTimes.findIndex(t => utils.dayjsIsBetweenUnixInclusive(t.fromTime, time, t.toTime));
if (existingTime >= 0) {
day.availableTimes.splice(existingTime, 1);
@ -97,9 +97,8 @@ const AvailabilityPicker = (props: {
let newFrom = day.availableTimes[existingTimeContainingFrom].fromTime;
let newTo = day.availableTimes[existingTimeContainingTo].toTime;
day.availableTimes.splice(existingTimeContainingFrom, 1);
day.availableTimes.splice(existingTimeContainingTo, 1);
day.availableTimes = day.availableTimes.filter((_, i) => i !== existingTimeContainingFrom && i !== existingTimeContainingTo);
day.availableTimes.push({
fromTime: newFrom,
@ -113,9 +112,7 @@ const AvailabilityPicker = (props: {
let newFrom = day.availableTimes[existingTimeContainingFrom].fromTime;
day.availableTimes.splice(existingTimeContainingFrom, 1);
day.availableTimes.push({
day.availableTimes.splice(existingTimeContainingFrom, 1, {
fromTime: newFrom,
toTime: toTime
});
@ -127,9 +124,7 @@ const AvailabilityPicker = (props: {
let newTo = day.availableTimes[existingTimeContainingTo].toTime;
day.availableTimes.splice(existingTimeContainingTo, 1);
day.availableTimes.push({
day.availableTimes.splice(existingTimeContainingTo, 1, {
fromTime: fromTime,
toTime: newTo
});

2
frontend/vite.config.ts
View file

@ -9,7 +9,7 @@ export default defineConfig({
server: {
proxy: {
"/api": {
target: "https://localhost:8443",
target: "http://localhost:8080",
changeOrigin: true,
secure: false,
},