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

feat: enable custom content for month events #6

Merged
merged 2 commits into from
Dec 28, 2023
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
31 changes: 29 additions & 2 deletions cypress/e2e/002-custom-events.cy.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,41 @@
describe('Custom events test', () => {
import { createCalendarHeaderPageObject } from '@schedule-x/e2e-testing'

const calendarHeader = createCalendarHeaderPageObject()

describe('Custom events test on desktop', () => {
beforeEach(() => {
cy.visit('/cypress/pages/002-custom-events/002-custom-events.html')
})

it('should render custom events', () => {
it('should render custom events in week view', () => {
cy.contains('Event 1').should('exist')
cy.contains('Event 2').should('exist')
cy.contains('Event 3').should('exist')
cy.contains('Event 4').should('exist')
cy.contains('Title: Event 5').should('exist')
cy.contains('Id: 5').should('exist')
})

it('should render custom events in month view', () => {
calendarHeader.openViewByLabel('Month')
cy.contains('Event 1').should('exist')
cy.contains('Event 2').should('exist')
cy.contains('Event 3').should('exist')
cy.contains('Event 4').should('exist')
cy.contains('Event 5').should('exist')
})
})

describe('Custom events test on mobile', () => {
beforeEach(() => {
cy.visit('/cypress/pages/002-custom-events/002-custom-events.html')
cy.viewport('iphone-6')
})

it('should render custom events in month agenda view', () => {
calendarHeader.openViewByLabel('Month')
cy.contains('Event 1').should('exist')
cy.contains('Event 2').should('exist')
cy.contains('Event 5').should('exist')
})
})
37 changes: 35 additions & 2 deletions cypress/pages/002-custom-events/002-custom-events-App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,19 @@
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
import { ScheduleXCalendar } from '../../..'
import { createCalendar, viewDay, viewWeek } from '@schedule-x/calendar'
import {
createCalendar,
viewDay,
viewMonthAgenda,
viewMonthGrid,
viewWeek,
} from '@schedule-x/calendar'
import '@schedule-x/theme-default/dist/index.css'
import CustomDateGridEvent from '../../../development/components/CustomDateGridEvent.vue'
import CustomTimeGridEvent from '../../../development/components/CustomTimeGridEvent.vue'

const calendarApp = createCalendar({
views: [viewWeek, viewDay],
views: [viewWeek, viewDay, viewMonthAgenda, viewMonthGrid],
selectedDate: '2023-12-18',
events: [
{
Expand Down Expand Up @@ -68,6 +74,33 @@ const customComponents = {
<div>{{ calendarEvent.title }}</div>
</div>
</template>

<template #monthAgendaEvent="{ calendarEvent }">
<div
:style="{
backgroundColor: 'cornflowerblue',
color: '#fff',
height: '80px',
width: '100%',
}"
>
<div>{{ calendarEvent.title }}</div>
</div>
</template>

<template #monthGridEvent="{ calendarEvent, hasStartDate }">
<div
:style="{
backgroundColor: 'green',
color: '#fff',
height: '100%',
width: '100%',
borderLeft: hasStartDate ? '5px solid lightgreen' : 'none',
}"
>
<span :style="{ paddingLeft: '4px' }">{{ calendarEvent.title }}</span>
</div>
</template>
</ScheduleXCalendar>
</div>
</template>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div class="custom-time-grid-event">
<input type="checkbox">
<input type="checkbox" />
<div>Id: {{ calendarEvent.id }}</div>
<div>Title: {{ calendarEvent.title }}</div>
</div>
Expand Down
42 changes: 32 additions & 10 deletions development/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,7 @@ const customComponents: CustomComponents = {

<template>
<div class="app">
<Calendar
:calendar-app="calendarApp"
:custom-components="customComponents"
>
<Calendar :calendar-app="calendarApp" :custom-components="customComponents">
<template #timeGridEvent="{ calendarEvent }">
<div
:style="{ backgroundColor: 'green', color: '#fff', height: '100%' }"
Expand All @@ -66,16 +63,41 @@ const customComponents: CustomComponents = {
<!-- <div>{{ calendarEvent.title }}</div>-->
<!-- </div>-->
<!-- </template>-->

<template #monthAgendaEvent="{ calendarEvent }">
<div
:style="{
backgroundColor: 'cornflowerblue',
color: '#fff',
height: '80px',
width: '100%',
}"
>
<div>{{ calendarEvent.title }}</div>
<div>Counter: {{ counter }}</div>
</div>
</template>

<template #monthGridEvent="{ calendarEvent, hasStartDate }">
<div
:style="{
backgroundColor: 'green',
color: '#fff',
height: '100%',
width: '100%',
borderLeft: hasStartDate ? '5px solid lightgreen' : 'none',
}"
>
<span :style="{ paddingLeft: '4px' }">{{ calendarEvent.title }}</span>
&#8226;
<span>{{ counter }}</span>
</div>
</template>
</Calendar>

<button @click="addEvent">add event</button>

<button
class="button"
@click="incrementCounter"
>
increment counter
</button>
<button class="button" @click="incrementCounter">increment counter</button>

<div>{{ counter }}</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion development/components/CustomTimeGridEvent.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div class="custom-time-grid-event">
<input type="checkbox">
<input type="checkbox" />
<div>Id: {{ calendarEvent.id }}</div>
<div>Title: {{ calendarEvent.title }}</div>
</div>
Expand Down
12 changes: 6 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"build:publish": "npm run build && npm publish"
},
"peerDependencies": {
"@schedule-x/calendar": "^0.5.0",
"@schedule-x/calendar": "^0.6.0",
"vue": "^3"
},
"devDependencies": {
Expand Down
2 changes: 2 additions & 0 deletions src/types/custom-components.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import { Component } from 'vue'
export type CustomComponents = {
timeGridEvent?: Component
dateGridEvent?: Component
monthGridEvent?: Component
monthAgendaEvent?: Component
}
export type CustomComponentMeta = {
Component: Component
Expand Down