diff --git a/package.json b/package.json new file mode 100644 index 0000000..082b994 --- /dev/null +++ b/package.json @@ -0,0 +1,27 @@ +{ + "name": "agenda", + "version": "1.0.0", + "directories": { + "test": "tests" + }, + "repository": { + "type": "git", + "url": "https://git.4angle.com/edward/agenda.git" + }, + "license": "ISC", + "devDependencies": { + "copy-webpack-plugin": "^12.0.2", + "webpack": "^5.91.0", + "webpack-cli": "^5.1.4" + }, + "dependencies": { + "@fullcalendar/core": "^6.1.11", + "@fullcalendar/daygrid": "^6.1.11", + "@fullcalendar/list": "^6.1.11", + "@fullcalendar/timegrid": "^6.1.11", + "bootstrap": "^5.3.3", + "es-module-shims": "^1.8.3", + "leaflet": "^1.9.4", + "leaflet.geodesic": "^2.7.1" + } +} diff --git a/templates/base.html b/templates/base.html index 08ccfb7..c89cf90 100644 --- a/templates/base.html +++ b/templates/base.html @@ -7,11 +7,7 @@ {% block title %}{% endblock %} - {% if config.USE_CDN %} - - {% else %} - - {% endif %} + {% block style %} {% endblock %} @@ -22,10 +18,6 @@ {% block nav %}{{ navbar() }}{% endblock %} {% block content %}{% endblock %} {% block scripts %}{% endblock %} - {% if config.USE_CDN %} - - {% else %} - - {% endif %} + diff --git a/templates/index.html b/templates/index.html index 4034a2f..720520a 100644 --- a/templates/index.html +++ b/templates/index.html @@ -4,10 +4,10 @@ Agenda - + - + + diff --git a/templates/trip_list.html b/templates/trip_list.html index 22f2f56..83525ee 100644 --- a/templates/trip_list.html +++ b/templates/trip_list.html @@ -6,9 +6,7 @@ {% block style %} - + {% set conference_column_count = 7 %} {% set accommodation_column_count = 7 %} @@ -112,11 +110,9 @@ {% block scripts %} - + - + - - + + diff --git a/webpack.config.js b/webpack.config.js new file mode 100644 index 0000000..67d98db --- /dev/null +++ b/webpack.config.js @@ -0,0 +1,18 @@ +const path = require('path'); +const CopyPlugin = require('copy-webpack-plugin'); + +module.exports = { + mode: 'development', + entry: './frontend/index.js', // Ensure this entry point exists and is valid. + plugins: [ + new CopyPlugin({ + patterns: [ + // Copy Bootstrap's CSS and JS from node_modules to your desired location + { from: 'node_modules/bootstrap/dist', to: path.resolve(__dirname, 'static/bootstrap5') }, + { from: 'node_modules/leaflet/dist', to: path.resolve(__dirname, 'static/leaflet') }, + { from: 'node_modules/leaflet.geodesic/dist', to: path.resolve(__dirname, 'static/leaflet-geodesic'), }, + { from: 'node_modules/es-module-shims/dist', to: path.resolve(__dirname, 'static/es-module-shims') } + ], + }), + ] +};