Skip to content
Open
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 0 additions & 3 deletions .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,20 +37,17 @@ jobs:
"tests/finding_extended_test.py",
"tests/finding_group_test.py",
"tests/finding_test.py",
"tests/group_test.py",
"tests/login_test.py",
"tests/metrics_extended_test.py",
"tests/note_type_test.py",
"tests/notes_test.py",
"tests/notification_webhook_test.py",
"tests/notifications_test.py",
"tests/object_test.py",
"tests/product_group_test.py",
"tests/product_member_test.py",
"tests/product_metadata_test.py",
"tests/product_tag_metrics_test.py",
"tests/product_test.py",
"tests/product_type_group_test.py",
"tests/product_type_member_test.py",
"tests/product_type_test.py",
"tests/questionnaire_advanced_test.py",
Expand Down
2 changes: 2 additions & 0 deletions Dockerfile.nginx-alpine
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ RUN \
yarn
COPY manage.py ./
COPY dojo/ ./dojo/
# Build Tailwind CSS
RUN cd components && yarn build:css
# always collect static for debug toolbar as we can't make it dependant on env variables or build arguments without breaking docker layer caching
RUN env DD_SECRET_KEY='.' DD_DJANGO_DEBUG_TOOLBAR_ENABLED=True python3 manage.py collectstatic --noinput --verbosity=2 && true

Expand Down
Empty file removed components/node_modules/.gitkeep
Empty file.
18 changes: 17 additions & 1 deletion components/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
{
"name": "defectdojo",
"version": "2.59.0-dev",
"license" : "BSD-3-Clause",
"license": "BSD-3-Clause",
"private": true,
"dependencies": {
"@fontsource-variable/work-sans": "^5.1",
"JUMFlot": "jumjum123/JUMFlot#*",
"alpinejs": "^3.14",
"bootstrap": "^3.4.1",
"bootstrap-select": "^1.13.18",
"bootstrap-social": "^4.0.0",
"bootstrap-wysiwyg": "^2.0.0",
"chart.js": "^4.4",
"chartjs-adapter-moment": "^1.0",
"chosen-bootstrap": "https://github.com/dbtek/chosen-bootstrap",
"chosen-js": "^1.8.7",
"clipboard": "^2.0.11",
Expand All @@ -18,10 +22,12 @@
"drmonty-datatables-plugins": "^1.0.0",
"drmonty-datatables-responsive": "^1.0.0",
"easymde": "^2.21.0",
"flatpickr": "^4.6",
"flot": "flot/flot#~0.8.3",
"font-awesome": "^4.0.0",
"fullcalendar": "^3.10.2",
"google-code-prettify": "^1.0.0",
"htmx.org": "^2.0",
"jquery": "^3.7.1",
"jquery-highlight": "3.5.0",
"jquery-ui": "1.14.2",
Expand All @@ -36,6 +42,16 @@
"pdfmake": "^0.3.7",
"startbootstrap-sb-admin-2": "1.0.7"
},
"devDependencies": {
"@tailwindcss/cli": "^4.1",
"@tailwindcss/forms": "^0.5",
"tailwindcss": "^4.1"
},
"scripts": {
"copy:fonts": "mkdir -p ../dojo/static/dojo/css/files && cp node_modules/@fontsource-variable/work-sans/files/work-sans-*-wght-normal.woff2 ../dojo/static/dojo/css/files/",
"build:css": "npm run copy:fonts && npx @tailwindcss/cli -i tailwind.css -o ../dojo/static/dojo/css/tailwind-out.css --minify",
"watch:css": "npm run copy:fonts && npx @tailwindcss/cli -i tailwind.css -o ../dojo/static/dojo/css/tailwind-out.css --watch"
},
"engines": {
"yarn": ">= 1.0.0"
}
Expand Down
Loading
Loading