1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122
|
Description: use system css and js
instead of using vendored versions for css & javascript libs, use the ones
provided by the appropriate Debian packages instead.
Author: Joseph Nahmias <joe@nahmias.net>
Origin: vendor
Forwarded: not-needed
Last-Update: 2022-09-11
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/app/Console/CssCommand.php
+++ b/app/Console/CssCommand.php
@@ -87,11 +87,19 @@ class CssCommand extends BaseCommand
];
private $vendorFiles = [
- self::CSS_VENDOR_PATH.'jquery-ui/jquery-ui.min.css',
- self::CSS_VENDOR_PATH.'jqueryui-timepicker-addon/jquery-ui-timepicker-addon.min.css',
- self::CSS_VENDOR_PATH.'select2/css/select2.min.css',
- self::CSS_VENDOR_PATH.'font-awesome/css/font-awesome.min.css',
- self::CSS_VENDOR_PATH.'c3/c3.min.css',
+ '/usr/share/javascript/jquery-ui/themes/base/autocomplete.min.css',
+ '/usr/share/javascript/jquery-ui/themes/base/core.min.css',
+ '/usr/share/javascript/jquery-ui/themes/base/datepicker.min.css',
+ '/usr/share/javascript/jquery-ui/themes/base/draggable.min.css',
+ '/usr/share/javascript/jquery-ui/themes/base/menu.min.css',
+ '/usr/share/javascript/jquery-ui/themes/base/resizable.min.css',
+ '/usr/share/javascript/jquery-ui/themes/base/selectable.min.css',
+ '/usr/share/javascript/jquery-ui/themes/base/sortable.min.css',
+ '/usr/share/javascript/jquery-ui/themes/base/theme.min.css',
+ '/usr/share/javascript/jquery-timepicker/jquery-ui-timepicker-addon.min.css',
+ '/usr/share/javascript/select2.js/select2.min.css',
+ '/usr/share/fonts-font-awesome/css/font-awesome.min.css',
+ '/usr/share/javascript/c3/c3.min.css',
];
protected function configure()
--- a/app/Console/JsCommand.php
+++ b/app/Console/JsCommand.php
@@ -28,7 +28,7 @@ class JsCommand extends BaseCommand
const CSS_DIST_PATH = 'assets/js/';
private $appFiles = [
- 'assets/vendor/text-caret/index.js',
+ '/usr/share/nodejs/textarea-caret/index.js',
'assets/js/polyfills/*.js',
'assets/js/core/base.js',
'assets/js/core/dom.js',
@@ -56,17 +56,17 @@ class JsCommand extends BaseCommand
];
private $vendorFiles = [
- 'assets/vendor/jquery/jquery-3.6.1.min.js',
- 'assets/vendor/jquery-ui/jquery-ui.min.js',
- 'assets/vendor/jquery-ui/i18n/datepicker-*.js',
- 'assets/vendor/jqueryui-timepicker-addon/jquery-ui-timepicker-addon.min.js',
- 'assets/vendor/jqueryui-timepicker-addon/i18n/jquery-ui-timepicker-addon-i18n.min.js',
- 'assets/vendor/jqueryui-touch-punch/jquery.ui.touch-punch.min.js',
- 'assets/vendor/select2/js/select2.min.js',
- 'assets/vendor/select2/js/i18n/*.js',
- 'assets/vendor/d3/d3.min.js',
- 'assets/vendor/c3/c3.min.js',
- 'assets/vendor/isMobile/isMobile.min.js',
+ '/usr/share/javascript/jquery/jquery.min.js',
+ '/usr/share/javascript/jquery-ui/jquery-ui.min.js',
+ '/usr/share/javascript/jquery-ui/ui/i18n/datepicker-*.min.js',
+ '/usr/share/javascript/jquery-timepicker/jquery-ui-timepicker-addon.min.js',
+ '/usr/share/doc/libjs-jquery-timepicker/html/jquery-ui-timepicker-addon-i18n.min.js',
+ '/usr/share/javascript/jquery-ui-touch-punch/jquery.ui.touch-punch.min.js',
+ '/usr/share/javascript/select2.js/select2.min.js',
+ '/usr/share/javascript/select2.js/i18n/*.js',
+ '/usr/share/javascript/d3/d3.min.js',
+ '/usr/share/javascript/c3/c3.min.js',
+ '/usr/share/javascript/ismobilejs/isMobile.min.js',
];
protected function configure()
--- a/composer.json
+++ b/composer.json
@@ -27,9 +27,16 @@
"ext-filter": "*",
"ext-session": "*",
"christian-riesen/otp": "1.4.3",
+ "composer/composer": "*",
+ "eluceo/ical": "*",
+ "erusev/parsedown": "1.7.4",
+ "gregwar/captcha": "*",
+ "matthiasmullie/minify": "*",
"pimple/pimple": "3.5.0",
"psr/log": "1.1.4",
+ "swiftmailer/swiftmailer": "*",
"symfony/console": "5.4.41",
+ "symfony/event-dispatcher": "5.4.21",
"symfony/event-dispatcher-contracts": "^2",
"symfony/finder": "5.4.45",
"symfony/service-contracts": "2.5.4",
@@ -43,23 +50,16 @@
"psr-4": {
"Kanboard\\": "app/",
"KanboardTests\\": "tests/",
- "MatthiasMullie\\Minify\\": "libs/minify/src/",
- "MatthiasMullie\\PathConverter\\": "libs/path-converter/src/",
- "Gregwar\\Captcha\\": "libs/Captcha",
- "Eluceo\\iCal\\": "libs/ical",
"SimpleQueue\\": "libs/SimpleQueue",
- "SimpleValidator\\": "libs/SimpleValidator",
- "Symfony\\Component\\EventDispatcher\\": "libs/event-dispatcher"
+ "SimpleValidator\\": "libs/SimpleValidator"
},
"psr-0": {
"JsonRPC": "libs/jsonrpc/src",
"PHPQRCode": "libs/phpqrcode/lib",
- "PicoDb": "libs/picodb/lib",
- "Parsedown": "libs/erusev/parsedown/"
+ "PicoDb": "libs/picodb/lib"
},
"files": [
- "app/functions.php",
- "libs/swiftmailer/swift_required.php"
+ "app/functions.php"
]
},
"require-dev": {
|