Skip to content
Merged
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
6 changes: 1 addition & 5 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,8 @@ jobs:
- name: Setup python
uses: actions/setup-python@v2
with:
python-version: 3.10.12
python-version: 3.12.3
architecture: x64
- uses: actions/cache@v1
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}-${{ hashFiles('**/requirements_dev.txt') }}

- run: pip install -r requirements.txt
- run: pip install -r requirements_dev.txt
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,8 @@ jobs:
- name: Setup python
uses: actions/setup-python@v2
with:
python-version: 3.10.12
python-version: 3.12.3
architecture: x64
- uses: actions/cache@v1
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}-${{ hashFiles('**/requirements_dev.txt') }}

- run: pip install -r requirements.txt
- run: pip install -r requirements_dev.txt
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ $ pip install -r requirements_dev.txt

Development server
```
$ ./registry/manage.py runserver
$ DJANGO_SETTINGS_MODULE=settings.settings_dev ./registry/manage.py runserver
```

## Tests
Expand Down
31 changes: 31 additions & 0 deletions registry/settings/settings_dev.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# flake8: noqa
import os
from settings.settings import * # noqa F401, F403

DEBUG = True

ALLOWED_HOSTS = [".localhost", "127.0.0.1", "[::1]"]
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dot localhost?


LOGGING = {
"version": 1,
"disable_existing_loggers": False,
"formatters": {
"simple": {
"format": "{levelname} [{module}] {message}",
"style": "{",
},
},
"handlers": {
"console": {
"class": "logging.StreamHandler",
},
},
"loggers": {
"": {
"handlers": ["console"],
"level": os.getenv("DJANGO_LOG_LEVEL", "INFO"),
"formatter": "simple",
"propagate": True,
},
},
}
40 changes: 40 additions & 0 deletions registry/static/images/linkedin-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 8 additions & 8 deletions registry/ui/templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ <h3 class="registry-card__pub-name">
}

function noCookieConsent() {
document.cookie = "noEnhancedAnalytics=1 ;max-age=2592000 ;domain=threesixtygiving.org";
document.cookie = "noEnhancedAnalytics=1; max-age=2592000; domain=threesixtygiving.org";
}


Expand Down Expand Up @@ -307,12 +307,12 @@ <h2 class="base-card__title" id="cookie-dialog-title">Allow analytics cookies? <
<footer class="footer">
<div class="footer__row wrapper">
<div class="footer__column-2 footer__branding">
<div class="footer__logo"><img src="/images/360-giving-logo-white.svg" alt="360Giving"></div>
<div class="footer__logo"><img src="{% static "/images/360-giving-logo-white.svg" %}" alt="360Giving"></div>
<p class="footer__tagline">Open data for more effective grantmaking</p>
</div>
<div class="footer__column-1 footer__social">
<a href="https://github.com/threesixtygiving/" class="github-icon"><img src="/images/github-logo.svg" alt="Check our Github"></a>
<a href="https://twitter.com/360Giving/" class="twitter-icon"><img src="/images/twitter-logo.svg" alt="Follow us on Twitter"></a>
<a href="https://www.linkedin.com/company/360giving/" class="linkedin-icon"><img src="{% static "/images/linkedin-logo.svg" %}" alt="Find us on LinkedIn"></a>
<a href="https://github.com/threesixtygiving/" class="github-icon"><img src="{% static "/images/github-logo.svg" %}" alt="Check our Github"></a>
</div>
</div>

Expand All @@ -338,7 +338,7 @@ <h3 class="footer__heading">Explore grants data</h3>

<li><a href="https://grantnav.threesixtygiving.org/">GrantNav</a></li>

<li><a href="https://data.threesixtygiving.org/">Data Registry</a></li>
<li><a href="https://qualitydashboard.threesixtygiving.org/">Quality Dashboard</a></li>

<li><a href="https://insights.threesixtygiving.org/">360Insights</a></li>

Expand All @@ -357,13 +357,13 @@ <h3 class="footer__heading">360Giving</h3>

<div class="wrapper footer__small-print">
<!-- <a href="#" class="edit-github button button--small button--yellow">Edit on Github</a> -->
<p>© Copyright {{year_now}} 360Giving, licensed under a <a href="https://creativecommons.org/licenses/by/4.0/" >Creative Commons Attribution 4.0 International License</a>.</p>
<p>&copy; Copyright {{year_now}} 360Giving, licensed under a <a href="https://creativecommons.org/licenses/by/4.0/" >Creative Commons Attribution 4.0 International License</a>.</p>
</div>
<div class="footer__row wrapper footer__small-print">
<div class="footer__column-2">
<p>360Giving:
Company <a href="https://beta.companieshouse.gov.uk/company/09668396">09668396</a>
Charity <a href="http://beta.charitycommission.gov.uk/charity-details/?regid=1164883&subid=0">1164883</a>
Company <a href="https://find-and-update.company-information.service.gov.uk/company/09668396">09668396</a>
Charity <a href="https://register-of-charities.charitycommission.gov.uk/charity-details/?regId=1164883&subId=0">1164883</a>
</p>
</div>
<div class="footer__column-2 footer__policy-links">
Expand Down
2 changes: 1 addition & 1 deletion runtime.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
python-3.10.12
python-3.12.3