diff --git a/public/index.html b/public/index.html index 30b6ea6..cbfdddb 100644 --- a/public/index.html +++ b/public/index.html @@ -10,7 +10,8 @@ - + + PlanNaPlan diff --git a/src/components/Dropdown.tsx b/src/components/Dropdown.tsx index 008ebaa..1f82b1c 100644 --- a/src/components/Dropdown.tsx +++ b/src/components/Dropdown.tsx @@ -4,7 +4,7 @@ import { Course } from '../types'; import styled from 'styled-components'; const WrapperIchuj = styled.div` - max-width: 1200px; + max-width: 1400px; `; const DropdownContainer = styled.div` @@ -86,8 +86,9 @@ export const Dropdown = forwardRef(({ open, input, handleCloseDropdown }: Dropdo ); setFilteredCourses(filteredCourses); }; + console.log("filtering courses"); filterCourses(input); - }, [input, basket]); + }, [open, input, basket]); const onCourseClick = async (event: MouseEvent) => { const target = event.currentTarget; diff --git a/src/components/SchedulerRow.tsx b/src/components/SchedulerRow.tsx index e7b80f3..8c5a53b 100644 --- a/src/components/SchedulerRow.tsx +++ b/src/components/SchedulerRow.tsx @@ -47,13 +47,10 @@ const Classes = styled.div` align-items: center; z-index: 2; border-radius: 10px; - - font-size: 0.9vw; - /* background-color: rgb(100, 181, 246); */ width: ${({ cellWidth }) => (cellWidth * 2.5) / 3}px; height: ${({ cellHeight }) => (cellHeight * 2 * 3) / 4}px; - margin-right: 5px; - text-align: center; + padding-left: 10px; + text-align: left; background-color: ${({ groupType }) => (groupType === 'CLASS' ? '#FFDC61' : '#A68820')}; box-shadow: 9px 9px 8px -2px rgba(0, 0, 0, 0.59); `; @@ -98,7 +95,7 @@ export const SchedulerRow = ({ groups, indexRow, cellTop, cellWidth, cellHeight {groups.map( (group, index) => group.day === eventIndex && ( -
+ <> handlePopoverOpen(e)} onMouseLeave={handlePopoverClose} > -

- {groups[index].name} -

- {groups[index].room} -

+
+

{groups[index].name}

+ {groups[index].room} +
{groups[index].room}

-
+ ), )} diff --git a/src/components/Topbar.tsx b/src/components/Topbar.tsx index f94f8bc..28d8b1f 100644 --- a/src/components/Topbar.tsx +++ b/src/components/Topbar.tsx @@ -48,7 +48,7 @@ const FlexboxColumn = styled.div` display: flex; flex-direction: column; flex-grow: 9; - max-width: 1200px; + max-width: 1400px; `; const InputWrapper = styled.div` diff --git a/src/constants/index.ts b/src/constants/index.ts index cd6753a..12084db 100644 --- a/src/constants/index.ts +++ b/src/constants/index.ts @@ -20,3 +20,6 @@ export const hours = [ "18:00", "19:00", ]; + + +export const MONDAY_TO_FRIDAY = 5; \ No newline at end of file diff --git a/src/styles/GlobalStyles.ts b/src/styles/GlobalStyles.ts index b0ec048..91281b6 100644 --- a/src/styles/GlobalStyles.ts +++ b/src/styles/GlobalStyles.ts @@ -11,7 +11,7 @@ export const GlobalStyles = createGlobalStyle` margin: 0; padding: 0; line-height: 24px; - font-family: 'B612', sans-serif; + font-family: 'Roboto', sans-serif; } body::-webkit-scrollbar {