Skip to content

Commit 0c77cbe

Browse files
Merge pull request #5786 from uktrade/feature/TET-878-drf-bootstrap-3-replacement
Add package drf-redesign which styles the rest framework browsable API
2 parents 8b331fd + ecd458a commit 0c77cbe

22 files changed

+3946
-7
lines changed

.circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ job_defaults: &job_defaults
9696

9797
- run:
9898
name: Run collectstatic
99-
command: python manage.py collectstatic --noinput
99+
command: python manage.py collectstatic --noinput --ignore rest_framework/css/* --ignore rest_framework/js/bootstrap.min.js --ignore rest_framework/js/prettify-min.js --ignore rest_framework/js/default.js
100100

101101
- run:
102102
name: Run tests

.copilot/image_build_run.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ export ES_APM_SERVER_URL="http://localhost:8200"
4242
export ES_APM_ENVIRONMENT="circleci"
4343
export REDIS_BASE_URL="redis://localhost:6379"
4444

45-
python manage.py collectstatic --noinput
45+
python manage.py collectstatic --noinput --ignore rest_framework/css/* --ignore rest_framework/js/bootstrap.min.js --ignore rest_framework/js/prettify-min.js --ignore rest_framework/js/default.js

config/settings/common.py

+2
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@
7777

7878
THIRD_PARTY_APPS = [
7979
*_ES_APM_APP,
80+
'datahub.drf_browsable_api', # not third party but must be before drf_redesign
81+
'drf_redesign', # must be before rest_framework
8082
'rest_framework',
8183
'django_extensions',
8284
'reversion',

datahub/drf_browsable_api/__init__.py

Whitespace-only changes.

datahub/drf_browsable_api/static/drf_browsable_api/css/a11y-dark.min.css

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

datahub/drf_browsable_api/static/drf_browsable_api/css/a11y-light.min.css

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

datahub/drf_browsable_api/static/drf_browsable_api/css/bootstrap.min.css

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

datahub/drf_browsable_api/static/drf_browsable_api/css/bootstrap.min.css.map

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

datahub/drf_browsable_api/static/drf_browsable_api/fonts/bootstrap-icons.css

+2,078
Large diffs are not rendered by default.
Binary file not shown.
Binary file not shown.

datahub/drf_browsable_api/static/drf_browsable_api/js/bootstrap.bundle.min.js

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

datahub/drf_browsable_api/static/drf_browsable_api/js/bootstrap.bundle.min.js.map

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

datahub/drf_browsable_api/static/drf_browsable_api/js/highlight.min.js

+1,213
Large diffs are not rendered by default.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
/*! `http` grammar compiled for Highlight.js 11.9.0 */
2+
(()=>{var e=(()=>{"use strict";return e=>{const n="HTTP/([32]|1\\.[01])",a={
3+
className:"attribute",
4+
begin:e.regex.concat("^",/[A-Za-z][A-Za-z0-9-]*/,"(?=\\:\\s)"),starts:{
5+
contains:[{className:"punctuation",begin:/: /,relevance:0,starts:{end:"$",
6+
relevance:0}}]}},s=[a,{begin:"\\n\\n",starts:{subLanguage:[],endsWithParent:!0}
7+
}];return{name:"HTTP",aliases:["https"],illegal:/\S/,contains:[{
8+
begin:"^(?="+n+" \\d{3})",end:/$/,contains:[{className:"meta",begin:n},{
9+
className:"number",begin:"\\b\\d{3}\\b"}],starts:{end:/\b\B/,illegal:/\S/,
10+
contains:s}},{begin:"(?=^[A-Z]+ (.*?) "+n+"$)",end:/$/,contains:[{
11+
className:"string",begin:" ",end:" ",excludeBegin:!0,excludeEnd:!0},{
12+
className:"meta",begin:n},{className:"keyword",begin:"[A-Z]+"}],starts:{
13+
end:/\b\B/,illegal:/\S/,contains:s}},e.inherit(a,{relevance:0})]}}})()
14+
;hljs.registerLanguage("http",e)})();

0 commit comments

Comments
 (0)