Skip to content

Commit

Permalink
Implementing day view in calendar of event screen for both admin and …
Browse files Browse the repository at this point in the history
…user portal (#1447)

* Implemented logic

* Done Changes

* Added CSS

* Revert Changes to Package.json

* Fixed test file for event calender

* Changed borders to gray instead of black

* Changed colors and text style

* Requested changes added

* Added tests for the changes

* Lint fix

* Fixed failing coverage tests
  • Loading branch information
karthxk07 authored Feb 3, 2024
1 parent 13be298 commit 95d4869
Show file tree
Hide file tree
Showing 8 changed files with 689 additions and 23 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
.round {
background-color: red;
border-radius: 100%;
width: 15px;
height: 15px;
}
.line {
width: 100%;
height: 1px;
background-color: red;
margin: auto;
}
.container {
position: relative;
display: flex;
flex-direction: row;
top: -8px;
left: -9px;
}
10 changes: 10 additions & 0 deletions src/components/CurrentHourIndicator/CurrentHourIndicator.test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import React from 'react';
import { render } from '@testing-library/react';
import CurrentHourIndicator from './CurrentHourIndicator';

describe('Testing Current Hour Indicator', () => {
test('Component Should be rendered properly', async () => {
const { getByTestId } = render(<CurrentHourIndicator />);
expect(getByTestId('container')).toBeInTheDocument();
});
});
13 changes: 13 additions & 0 deletions src/components/CurrentHourIndicator/CurrentHourIndicator.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import React from 'react';
import styles from './CurrentHourIndicator.module.css';

const CurrentHourIndicator = (): JSX.Element => {
return (
<div className={styles.container} data-testid="container">
<div className={styles.round}></div>
<div className={styles.line}></div>
</div>
);
};

export default CurrentHourIndicator;
65 changes: 63 additions & 2 deletions src/components/EventCalendar/EventCalendar.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,47 @@
grid-template-columns: repeat(7, minmax(0, 1fr));
grid-template-rows: repeat(6, 1fr);
}
.calendar_hour_text_container {
display: flex;
flex-direction: row;
align-items: flex-end;
border-right: 1px solid #8d8d8d55;
width: 40px;
}
.calendar_hour_text {
top: -10px;
left: -5px;
position: relative;
color: #707070;
font-size: 12px;
}
.calendar_timezone_text {
top: -10px;
left: -11px;
position: relative;
color: #707070;
font-size: 9px;
}
.calendar_hour_block {
display: flex;
flex-direction: row;
border-bottom: 1px solid #8d8d8d55;
position: relative;
height: 50px;
border-bottom-right-radius: 5px;
}
.event_list_parent {
position: relative;
width: 100%;
}
.event_list_parent_current {
background-color: #def6e1;
position: relative;
width: 100%;
}
.dummyWidth {
width: 1px;
}
.day {
background-color: #ffffff;
padding-left: 0.3rem;
Expand All @@ -47,6 +88,7 @@
color: #4b4b4b;
font-weight: 600;
height: 8rem;
position: relative;
}
.day__outside {
background-color: #eeeded;
Expand Down Expand Up @@ -75,6 +117,11 @@
margin-left: 20px;
border: none;
}
.selectType {
padding: 16px 10px 16px 10px;
border-radius: 10px;
margin: 0px 5px 0px 5px;
}
.btn__more {
border: 0px;
font-size: 14px;
Expand All @@ -84,6 +131,7 @@
transition: all 200ms;
position: relative;
display: block;
margin: 2px;
}
.btn__more:hover {
color: #3ce080;
Expand All @@ -92,19 +140,32 @@
.expand_event_list {
display: block;
}

.list_container {
padding: 5px;
width: fit-content;
display: flex;
flex-direction: row;
}
.event_list_hour {
display: flex;
flex-direction: row;
}
.expand_list_container {
width: 200px;
max-height: 250px;
z-index: 10;
position: relative;
position: absolute;
left: auto;
right: auto;
overflow: auto;
padding: 10px 4px 0px 4px;
background-color: rgb(241, 241, 241);
border: 1px solid rgb(201, 201, 201);
border-radius: 5px;
margin: 5px;
}
.flex_grow {
flex-grow: 1;
}

@media only screen and (max-width: 700px) {
Expand Down
Loading

0 comments on commit 95d4869

Please sign in to comment.