Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Indicate non-bookable dates #98

Merged
merged 4 commits into from
Jan 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions frontend/.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
BROWSER=none
PORT=3001
2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"web-vitals": "^1.0.1"
},
"scripts": {
"start": "BROWSER=none PORT=3001 react-scripts start",
"start": "react-scripts start",
"build": "react-scripts build",
"eject": "react-scripts eject"
},
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/use-cases/home/home.translations.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"event_edited": ["The event has been edited", "Bokningen har redigeras"]
"event_edited": ["The event has been edited", "Bokningen har redigerats"],
"out_of_range": ["Outside of booking range", "Utanför bokningsperiod"]
}
51 changes: 27 additions & 24 deletions frontend/src/use-cases/home/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ import { getIllegalSlots } from "../../api/backend.api";
import { useContext, useCallback, useState } from "react";
import UserContext from "../../common/contexts/user-context";
import { overlap } from "../../utils/utils";
import transitions from "./home.translations.json";
import translations from "./home.translations.json";

const style = document.querySelector("#room-styles");

const getClassName = rooms => {
let name = "event";
for (const i in rooms) {
name += "-" + rooms[i].toLowerCase();
}
name += rooms.length;
for (const i in rooms) {
name += "-" + rooms[i].toLowerCase();
}
name += rooms.length;
if (!style.innerHTML.includes(name)) {
style.innerHTML += `.${name}{background: repeating-linear-gradient(45deg,`;
let px = 0;
Expand Down Expand Up @@ -58,7 +58,7 @@ const Home = () => {
});
const isMobile = useMobileQuery();
const [filters, setFilters] = useState(ROOMS.map(r => r.value));
const [texts, activeLanguage] = useDigitTranslations(transitions);
const [texts, activeLanguage] = useDigitTranslations(translations);
const [openToast] = useDigitToast({
duration: 7000,
actionText: "Ok",
Expand All @@ -74,30 +74,33 @@ const Home = () => {
return [
...events
.filter(e => overlap(e.room, filters))
.map(e => {
return {
...e,
className: getClassName(e.room.sort()),
start: new Date(Number(e.start)),
end: new Date(Number(e.end)),
editable: user.groups.includes(e.booked_as) || user.is_admin,
durationEditable: false,
room: e.room.sort(),
};
}),
...illegalSlots.map(e => {
return {
backgroundColor: "#EF9A9A",
.map(e => ({
...e,
className: getClassName(e.room.sort()),
start: new Date(Number(e.start)),
end: new Date(Number(e.end)),
display: "background",
title: e.title + (e.description ? ` - ` + e.description : ""),
};
}),
editable: user.groups.includes(e.booked_as) || user.is_admin,
durationEditable: false,
room: e.room.sort(),
})),
...illegalSlots.map(e => ({
backgroundColor: "#EF9A9A",
start: new Date(Number(e.start)),
end: new Date(Number(e.end)),
display: "background",
title: e.title + (e.description ? ` - ` + e.description : ""),
})),
{
backgroundColor: "#AAAAAA",
startRecur: new Date(new Date(Date.now() + 5443200000).toDateString()),
display: "background",
title: texts.out_of_range,
},
];
};

const getCalendarEventsCallback = useCallback(getCalendarEvents, [
texts,
filters,
user,
]);
Expand Down
Loading