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

fixed:#1887 Event and Holiday Calendar View #2633

Open
wants to merge 34 commits into
base: develop-postgres
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 28 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
a0705d5
fixed Event and Holiday Calendar View
gurramkarthiknetha Dec 1, 2024
98d32de
fixed the inline css
gurramkarthiknetha Dec 1, 2024
d141177
changed some changes acc to bot
gurramkarthiknetha Dec 1, 2024
ba21ae5
changed acc to the bot 2
gurramkarthiknetha Dec 1, 2024
b717e05
removed unnessary changes
gurramkarthiknetha Dec 2, 2024
71ba035
changed inline css to css file
gurramkarthiknetha Dec 3, 2024
0f42c29
Merge remote-tracking branch 'upstream/develop-postgres' into issues/…
gurramkarthiknetha Dec 4, 2024
ee7dbfc
revert unwanted changed
gurramkarthiknetha Dec 4, 2024
0ca6a84
changed some changes according to bot
gurramkarthiknetha Dec 6, 2024
8e9734e
changed acc to code rabbit
gurramkarthiknetha Dec 9, 2024
455fdf9
changed
gurramkarthiknetha Dec 9, 2024
5db138d
change2
gurramkarthiknetha Dec 9, 2024
fceed25
change3
gurramkarthiknetha Dec 9, 2024
907d840
new change
gurramkarthiknetha Dec 10, 2024
0ba3ab2
change done
gurramkarthiknetha Dec 10, 2024
9af5bdb
changed acc to code rabbin
gurramkarthiknetha Dec 10, 2024
0a60bdf
c2
gurramkarthiknetha Dec 10, 2024
57b795b
changed acc to codecov
gurramkarthiknetha Dec 10, 2024
8bee50e
cfinal
gurramkarthiknetha Dec 10, 2024
65ef7d7
t1 to improve codecov
gurramkarthiknetha Dec 12, 2024
d261991
t2
gurramkarthiknetha Dec 12, 2024
d75aae2
t3
gurramkarthiknetha Dec 12, 2024
bb4892d
t4
gurramkarthiknetha Dec 12, 2024
24b20fc
t5
gurramkarthiknetha Dec 12, 2024
2d063af
ft1
gurramkarthiknetha Dec 12, 2024
307f6a4
t75
gurramkarthiknetha Dec 12, 2024
cd38a0c
t175
gurramkarthiknetha Dec 13, 2024
f4384bd
new1
gurramkarthiknetha Dec 13, 2024
9569015
new2
gurramkarthiknetha Dec 13, 2024
b9ab693
revert-my-change-to improve codecov
gurramkarthiknetha Dec 13, 2024
0baa4ad
newchange1
gurramkarthiknetha Dec 13, 2024
f1ba058
t74
gurramkarthiknetha Dec 13, 2024
96e1169
change acc code rabbin-1
gurramkarthiknetha Dec 15, 2024
c2a44f3
retrive
gurramkarthiknetha Dec 15, 2024
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
176 changes: 162 additions & 14 deletions src/components/EventCalendar/EventCalendar.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -271,14 +271,6 @@
.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 Down Expand Up @@ -316,7 +308,8 @@
flex-grow: 1;
}

@media only screen and (max-width: 700px) {
@media only screen and (max-width: var(--mobile-breakpoint)) {
/** @breakpoint --mobile-breakpoint: 768px */
.event_list {
display: none;
}
Expand All @@ -331,7 +324,7 @@
}
}

@media only screen and (max-width: 500px) {
@media only screen and (max-width: var(--small-mobile-breakpoint)) {
.btn__more {
font-size: 12px;
}
Expand All @@ -344,7 +337,22 @@
gap: 10px;
margin-top: 35px;
}
.base_card {
flex: 1;
padding: 20px;
border-radius: 10px;
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.15);
}

.holidays_card {
composes: base_card;
background-color: var(--holiday-card-bg);
}

.events_card {
composes: base_card;
background-color: #ffffff;
}
.card__holidays {
background-color: rgba(246, 242, 229, 1);
display: flex;
Expand Down Expand Up @@ -415,9 +423,149 @@
border-radius: 10px;
}

.userEvents__color {
height: 15px;
width: 40px;
background: rgba(146, 200, 141, 0.5);
.baseIndicator {
border-radius: 5px;
width: 20px;
height: 12px;
display: inline-block;
}

.holidayText {
font-size: 14px;
color: #555555;
}
gurramkarthiknetha marked this conversation as resolved.
Show resolved Hide resolved
.eventsLegend {
display: flex;
align-items: center;
gap: 8px;
}

.list_container {
padding: 5px;
width: fit-content;
display: flex;
align-items: center;
gap: var(--indicator-spacing);
}

.holidayIndicator {
composes: baseIndicator;
background-color: rgba(0, 0, 0, 0.15);
}

:root {
/* Color scheme for holiday-related elements */
--color-user-event: rgba(139, 195, 74, 1);
/* Holiday colors */
--color-holiday-indicator: rgba(0, 0, 0, 0.15);
--color-holiday-date: rgba(255, 152, 0, 1);
/* Breakpoints for responsive design */
--mobile-breakpoint: 700px;
--small-mobile-breakpoint: 480px;
--text-color-primary: rgba(51, 51, 51, 1);
--text-color-secondary: rgba(85, 85, 85, 1);
/* Card styles */
--card-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
--holiday-card-bg: #f6f2e5;
--holiday-date-color: #ea7b56;
--indicator-spacing: 8px;
/* Interactive states */
--hover-bg-color: rgba(0, 0, 0, 0.05);
}
.organizationIndicator {
composes: baseIndicator;
background-color: rgba(82, 172, 255, 0.5);
}

.legendText {
font-size: 14px;
color: #555555;
}
@media only screen and (max-width: var(--mobile-breakpoint)) {
.list_container,
.eventsLegend {
gap: 4px;
}

.holidayIndicator,
.organizationIndicator {
width: 16px;
height: 10px;
}

.holidayText,
.legendText {
font-size: 12px;
}
}
.card_title {
font-size: 16px;
font-weight: 600;
color: var(--text-color-primary);
margin-bottom: 15px;
}

.card_list {
list-style: none;
padding: 0;
margin: 0;
}

.card_list_item {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 10px;
font-size: 14px;
color: var(--text-color-secondary);
}

.holiday_date {
font-weight: 500;
color: var(--holiday-date-color);
}
.calendar_infocards {
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: flex-start;
gap: 20px;
padding: 20px;
background-color: var(--grey-bg-color);
}
.holidays_card,
.events_card {
flex: 1;
padding: 20px;
border-radius: 10px;
box-shadow: var(--card-shadow);
}

.holidays_card {
background-color: var(--holiday-card-bg);
}

.events_card {
background-color: white;
}

.legend {
display: flex;
flex-direction: column;
gap: 12px;
}

.userEvents__color {
composes: baseIndicator;
display: inline-block;
background-color: rgba(139, 195, 74, 1);
}

.card_list_item:hover {
background-color: var(--hover-bg-color);
transition: background-color 0.2s ease;
gurramkarthiknetha marked this conversation as resolved.
Show resolved Hide resolved
}
.card_list_item:focus-visible {
background-color: var(--hover-bg-color);
transition: background-color 0.2s ease;
}
Loading
Loading