Skip to content

Commit

Permalink
Merge branch 'main' of github.com:jazzband/website
Browse files Browse the repository at this point in the history
  • Loading branch information
jezdez committed Oct 21, 2021
2 parents 299b277 + 2e02a03 commit 590ba00
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 14 deletions.
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
repos:
- repo: https://github.com/psf/black
rev: 20.8b1
rev: 21.9b0
hooks:
- id: black
- repo: https://github.com/PyCQA/isort
rev: 5.8.0
rev: 5.9.3
hooks:
- id: isort
- repo: https://github.com/PyCQA/flake8
rev: 3.9.1
rev: 4.0.1
hooks:
- id: flake8
8 changes: 3 additions & 5 deletions jazzband/content.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,17 @@


class NewsFlatPages(FlatPages):

def __iter__(self):
pages = super().__iter__()
# Articles are pages with a publication date
articles = (p for p in pages if 'published' in p.meta)
articles = (p for p in pages if "published" in p.meta)
# Show the 10 most recent articles, most recent first.
latest = sorted(articles, reverse=True,
key=lambda page: page.meta['published'])
latest = sorted(articles, reverse=True, key=lambda page: page.meta["published"])
for page in latest:
published = page.meta.get("published", None)
if published and published.tzinfo is None:
published = pytz.utc.localize(published)
page.meta['published_date'] = published
page.meta["published_date"] = published
yield page


Expand Down
4 changes: 1 addition & 3 deletions jazzband/projects/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,7 @@ def index():
else:
criterion = nullsfirst(criterion)

projects = Project.query.filter(Project.is_active.is_(True)).order_by(
criterion
)
projects = Project.query.filter(Project.is_active.is_(True)).order_by(criterion)
return {
"projects": projects,
"sorter": sorter,
Expand Down
6 changes: 5 additions & 1 deletion jazzband/static/css/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ ul {
font-family: $headline;
padding: 0;
background-color: $white;
border: 2px solid $red;
box-shadow: 0px 0px 0px 2px $red;
text-decoration: none;
&:hover {
color: $red;
Expand Down Expand Up @@ -415,6 +415,10 @@ table.projects-detail {
width: 15%;
}
}
@media (max-width: 575px) {
display: block;
overflow-x: auto;
}
}
td.numbers,
th.numbers {
Expand Down
Binary file modified jazzband/static/favicons/favicon.ico
Binary file not shown.
1 change: 1 addition & 0 deletions jazzband/static/favicons/safari-pinned-tab.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions jazzband/templates/includes/favicons.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
<link rel="icon" type="image/png" sizes="96x96" href="{{ url_for('static', filename='favicons/favicon-96x96.png') }}">
<link rel="icon" type="image/png" sizes="16x16" href="{{ url_for('static', filename='favicons/favicon-16x16.png') }}">
<link rel="manifest" href="{{ url_for('static', filename='favicons/manifest.json') }}">
<link rel="mask-icon" href="{{ url_for('static', filename='favicons/safari-pinned-tab.svg') }}" color="#ededed">
<meta name="msapplication-config" content="{{ url_for('static', filename='favicons/browserconfig.xml') }}">
<meta name="msapplication-TileColor" content="#ededed">
<meta name="msapplication-TileImage" content="{{ url_for('static', filename='favicons/ms-icon-144x144.png') }}">
<meta name="theme-color" content="#ededed">
2 changes: 1 addition & 1 deletion jazzband/templates/macros.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
{% endmacro %}

{% macro github_corner() %}
<a href="https://github.com/jazzband" class="github-corner"><svg width="80" height="80" viewBox="0 0 250 250"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a>
<a href="https://github.com/jazzband" class="github-corner" aria-label="Github organization"><svg width="80" height="80" viewBox="0 0 250 250"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a>
{% endmacro %}


Expand Down
4 changes: 3 additions & 1 deletion tests/test_hooks.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,7 @@ def test_repo_transferred_hook(client, datadir, mocker):
response = post(client, "repository", json.loads(contents))
assert response.data
response_string = response.data.decode("utf-8")
assert response_string.startswith("Started updating the project using hook id repo-added-")
assert response_string.startswith(
"Started updating the project using hook id repo-added-"
)
mocked_schedule.assert_called_once()

0 comments on commit 590ba00

Please sign in to comment.