Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
55fd8db
basic setup to prepare for bootstrap5 and fullcalendar 6.1.15
lenadax Nov 18, 2024
2d5648f
WIP: migrate fullcalendar to v6.1.15
lenadax Nov 19, 2024
705b277
include bootstrap5 theme. Improve views on mobile devices
lenadax Nov 20, 2024
bd04716
include bootstrap5 theme. Improve views on mobile devices
lenadax Nov 20, 2024
f5a7724
remove old resources
lenadax Nov 20, 2024
b17f51a
render calendar in card
lenadax Nov 29, 2024
1a55be6
implement destroy method
lenadax Mar 6, 2025
f3de40e
minor rename
rnixx Mar 18, 2025
ff5640d
update tests
lenadax Mar 18, 2025
a9965e4
fix tests
rnixx Mar 18, 2025
26df69b
remove unneeded condition
rnixx Mar 18, 2025
bc6f38a
Merge pull request #4 from conestack/memory
rnixx Mar 18, 2025
8e1df51
calendar menu styles
lenadax Jun 3, 2025
7941d49
close menu on outside click. determine menu alignment based on availa…
lenadax Jun 3, 2025
ab2ab2e
remove contextmenu wrapper duplicates
lenadax Jun 20, 2025
176628a
fix destroy issue
lenadax Jun 20, 2025
a0c76fd
update branches
lenadax Jun 23, 2025
4109fc6
fix calendar not reloading. fix incorrect timezone. fix date clicked …
lenadax Jun 24, 2025
8ad3b91
on sidebar_resize, more responsiveness
lenadax Jun 26, 2025
c1ddc32
branches
lenadax Oct 7, 2025
679cf06
refactor package layout for bs5 version
lenadax Nov 10, 2025
6aa8011
merge refactor-package-layout
lenadax Nov 11, 2025
f073113
remove obsolete lines in pyproject.toml
lenadax Nov 13, 2025
f1b3dbb
Merge branch 'master' into refactor-package-layout-bs5
rnixx Dec 1, 2025
3002721
Merge branch 'master' into 2.0
rnixx Dec 5, 2025
bf2743f
version madness
rnixx Dec 5, 2025
7a4875d
update branches
lenadax Dec 15, 2025
b21b39e
merge master
rnixx Feb 3, 2026
58444f2
add js test suite
lenadax Feb 5, 2026
c26edce
Merge branch '2.0' of github.com:conestack/cone.calendar into 2.0
lenadax Feb 5, 2026
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
25 changes: 25 additions & 0 deletions .github/workflows/test_js.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: JS Tests

on: [push]

jobs:
test:
name: Test

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Corepack
run: |
npm install --global corepack@latest
corepack enable

- name: Install
run: |
corepack enable
make nodejs

- name: Run tests
run: make wtr
File renamed without changes.
4 changes: 2 additions & 2 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Changes
=======

1.1.1 (unreleased)
2.0.0 (unreleased)
------------------

- Nothing changed yet.
- Bootstrap 5 Styles.


1.1.0 (2026-02-03)
Expand Down
23 changes: 23 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#: i18n.lingua
#: js.nodejs
#: js.rollup
#: js.wtr
#: qa.coverage
#: qa.test
#
Expand Down Expand Up @@ -82,6 +83,16 @@ NODEJS_OPT_PACKAGES?=
# No default value.
NODEJS_INSTALL_OPTS?=

## js.wtr

# Web test runner config file.
# Default: wtr.config.mjs
WTR_CONFIG?=js/wtr.config.mjs

# Web test runner additional command line options.
# Default: --coverage
WTR_OPTIONS?=--coverage

## js.rollup

# Rollup config file.
Expand Down Expand Up @@ -313,6 +324,18 @@ INSTALL_TARGETS+=nodejs
DIRTY_TARGETS+=nodejs-dirty
CLEAN_TARGETS+=nodejs-clean

##############################################################################
# web test runner
##############################################################################

NODEJS_DEV_PACKAGES+=\
@web/test-runner \
@web/dev-server-import-maps

.PHONY: wtr
wtr: $(NODEJS_TARGET)
@web-test-runner $(WTR_OPTIONS) --config $(WTR_CONFIG)

##############################################################################
# rollup
##############################################################################
Expand Down
69 changes: 62 additions & 7 deletions js/rollup.conf.js
Original file line number Diff line number Diff line change
@@ -1,42 +1,97 @@
import cleanup from 'rollup-plugin-cleanup';
import terser from '@rollup/plugin-terser';
import postcss from 'rollup-plugin-postcss';
import resolve from '@rollup/plugin-node-resolve';

const out_dir = 'src/cone/calendar/browser/static/calendar';
const out_dir_fullcalendar = 'src/cone/calendar/browser/static/fullcalendar';

export default args => {
let conf = {
let conf = [];

////////////////////////////////////////////////////////////////////////////
// BOOTSTRAP5
////////////////////////////////////////////////////////////////////////////

let bundle_bs5 = {
input: 'js/src/bundle.js',
plugins: [
cleanup()
],
output: [{
file: `${out_dir}/cone.calendar.js`,
name: 'cone_calendar',
file: `${out_dir}/cone.calendar.js`,
format: 'iife',
globals: {
jquery: 'jQuery'
},
interop: 'default',
sourcemap: false
interop: 'default'
}],
external: [
'jquery'
]
};
if (args.configDebug !== true) {
conf.output.push({
file: `${out_dir}/cone.calendar.min.js`,
bundle_bs5.output.push({
name: 'cone_calendar',
file: `${out_dir}/cone.calendar.min.js`,
format: 'iife',
plugins: [
terser()
],
globals: {
jquery: 'jQuery'
},
interop: 'default'
});
}
conf.push(bundle_bs5);

let scss_bs5 = {
input: ['scss/styles.scss'],
output: [{
file: `${out_dir}/cone.calendar.css`,
format: 'es',
plugins: [terser()],
}],
plugins: [
postcss({
extract: true,
minimize: true,
use: [
['sass', { outputStyle: 'compressed' }],
],
}),
],
};
conf.push(scss_bs5);

let bundle_fullcalendar = {
input: 'js/src/fullcalendar.js',
plugins: [
resolve(),
cleanup()
],
output: [{
file: `${out_dir_fullcalendar}/fullcalendar.js`,
name: 'fullcalendar',
format: 'iife',
plugins: [
// terser()
],
globals: {
'@fullcalendar/core': 'FullCalendar',
'@fullcalendar/daygrid': 'FullCalendarDayGrid',
'@fullcalendar/timegrid': 'FullCalendarTimeGrid',
'@fullcalendar/list': 'FullCalendarList',
'@fullcalendar/interaction': 'FullCalendarInteraction',
'@fullcalendar/bootstrap5': 'FullCalendarBootstrap5',
},
interop: 'default',
sourcemap: false
});
}]
}
conf.push(bundle_fullcalendar);

return conf;
};
Loading