Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mw/dqt 2024 #117

Draft
wants to merge 27 commits into
base: main
Choose a base branch
from
Draft
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"root": true,
"env": {
"browser": true,
"es2021": true,
"jquery": true
},
"plugins": [
"html"
],
"parserOptions": {
"ecmaVersion": "latest"
},
"extends": [
"eslint-config-semistandard"
],
"globals": {
"URI": "readonly"
},
"rules": {
"comma-dangle": "error",
}
}
4 changes: 4 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,7 @@ jobs:
${{ runner.os }}-pip-
- run: pip install -r requirements_dev.txt
- run: flake8

- run: npm install
- run: ./node_modules/eslint/bin/eslint.js --ext .js --ext .html cove/cove_360/templates/**
- run: ./node_modules/eslint/bin/eslint.js --ext .js --ext .html cove/cove_360/static/dataexplore/js/**
2 changes: 1 addition & 1 deletion 360-ds
Submodule 360-ds updated 36 files
+3,214 −5,009 package-lock.json
+3 −1 src/components/02-elements/anchors/anchors.scss
+12 −0 src/components/02-elements/buttons/buttons.njk
+61 −12 src/components/02-elements/buttons/buttons.scss
+1 −1 src/components/02-elements/cookie-consent/cookie-consent.njk
+0 −1 src/components/02-elements/page-title/page-title.scss
+0 −9 src/components/02-elements/typography/typography.scss
+3 −3 src/components/03-components/bar-chart/bar-chart.njk
+2 −4 src/components/03-components/bar-chart/bar-chart.scss
+26 −0 src/components/03-components/form/form.config.yml
+168 −0 src/components/03-components/form/form.njk
+276 −0 src/components/03-components/form/form.scss
+1 −1 src/components/03-components/search-summary/search-summary.scss
+2 −2 src/components/04-modules/chart-card/chart-card.njk
+2 −2 src/components/04-modules/footer/footer--compact.njk
+2 −2 src/components/04-modules/footer/footer--left.njk
+2 −2 src/components/04-modules/footer/footer.njk
+1 −3 src/components/04-modules/footer/footer.scss
+13 −0 src/components/04-modules/grid/grid.scss
+1 −1 src/components/04-modules/media-card/media-card.scss
+0 −2 src/components/04-modules/prose/prose.scss
+4 −0 src/components/04-modules/search-block/search-block.scss
+1 −0 src/components/04-modules/sort-filter-bar/sort-filter-bar.njk
+6 −0 src/components/04-modules/sort-filter-bar/sort-filter-bar.scss
+0 −1 src/components/04-modules/top-bar/top-bar.scss
+1 −0 src/components/06-prototypes/grant-nav/grant-nav.scss
+1 −1 src/project-styles/360-ds/360-ds.scss
+17 −0 src/project-styles/360-ds/custom.scss
+1 −0 src/project-styles/360-ds/main.scss
+67 −1 src/project-styles/grantnav/custom.scss
+1 −1 src/project-styles/grantnav/grantnav.scss
+1 −0 src/project-styles/grantnav/main.scss
+11 −0 src/project-styles/grantnav/widgets.scss
+7 −6 src/project-styles/insights/custom.scss
+0 −3 src/scss/pre/_reset.scss
+11 −0 src/scss/pre/_utils.scss
1 change: 1 addition & 0 deletions cove/cove_360/context_processors.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ def additional_context(request):
return {
"DATA_SUBMISSION_ENABLED": settings.DATA_SUBMISSION_ENABLED,
"DEBUG": settings.DEBUG,
"DISABLE_COOKIE_POPUP": settings.DISABLE_COOKIE_POPUP,
}
27 changes: 27 additions & 0 deletions cove/cove_360/fixtures/additional_fields.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"grants": [
{
"id": "360G-sampletrust-105177/Z/14/Z",
"awardDate": "2024-12-30",
"amountAwarded": 10,
"url": "http://example.com",
"title": "test",
"currency": "GBP",
"description": "test",
"AdditionalField": "2",
"CheckMicOne": "two",
"recipientOrganization": [
{
"id": "GB-323242-test",
"name": "Example Project Limited"
}
],
"fundingOrganization": [
{
"id": "GB-323242-test",
"name": "Example Project Limited"
}
]
}
]
}
25 changes: 25 additions & 0 deletions cove/cove_360/fixtures/duration_usefulness.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"grants": [
{
"id": "360G-sampletrust-105177/Z/14/Z",
"awardDate": "2024-12-30",
"amountAwarded": 10,
"url": "http://example.com",
"title": "test",
"currency": "GBP",
"description": "test",
"recipientOrganization": [
{
"id": "GB-323242-test",
"name": "Example Project Limited"
}
],
"fundingOrganization": [
{
"id": "GB-323242-test",
"name": "Example Project Limited"
}
]
}
]
}
57 changes: 57 additions & 0 deletions cove/cove_360/fixtures/multiple_funder_names_org_ids.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{
"grants": [
{
"id": "360G-sampletrust-105177/Z/14/Z",
"awardDate": "2024-12-30",
"amountAwarded": 10,
"url": "http://example.com",
"title": "test",
"currency": "GBP",
"description": "test",
"plannedDates": [
{
"duration": 30
}
],
"recipientOrganization": [
{
"id": "GB-323242-test",
"name": "Example Project Limited"
}
],
"fundingOrganization": [
{
"id": "GB-12345-test",
"name": "Example Funder Limited"
}
]
},
{
"id": "360G-sampletrust-123452",
"awardDate": "2024-12-30",
"amountAwarded": 10,
"url": "http://example.com",
"title": "test two",
"currency": "GBP",
"description": "test two",
"plannedDates": [
{
"duration": 30
}
],
"recipientOrganization": [
{
"id": "GB-323242-test",
"name": "Example Project Limited"
}
],
"fundingOrganization": [
{
"id": "GB-12345-test",
"name": "Example Funder"
}
]
}

]
}
3 changes: 2 additions & 1 deletion cove/cove_360/fixtures/publishers.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
"self_publish": {
"enabled": true,
"authorised_domains": [
"test-data.360dev1.vs.mythic-beasts.com"
"test-data.360dev1.vs.mythic-beasts.com",
"www.threesixtygiving.org"
]
}
}
Expand Down
Loading
Loading