Skip to content

Commit

Permalink
Add HTML formatting to pre-commit (lucyparsons#966)
Browse files Browse the repository at this point in the history 
lucyparsons#239

Added [`djLint`](https://www.djlint.com/docs/languages/jinja/) to the
`pre-commit` process and formatted files accordingly.

 - [x] This branch is up-to-date with the `develop` branch.
 - [x] `pytest` passes on my local development environment.
 - [x] `pre-commit` passes on my local development environment.

`pre-commit` output:
```console
(openoversight) xxxxxx@MacBook-Air-5 OpenOversight % make lint
pre-commit run --all-files
trim trailing whitespace.................................................Passed
check docstring is first.................................................Passed
check that executables have shebangs.....................................Passed
check json...............................................................Passed
check for case conflicts.................................................Passed
check toml...........................................(no files to check)Skipped
check for merge conflicts................................................Passed
check xml................................................................Passed
check yaml...............................................................Passed
fix end of files.........................................................Passed
check for broken symlinks............................(no files to check)Skipped
mixed line ending........................................................Passed
fix python encoding pragma...............................................Passed
pretty format json.......................................................Passed
fix requirements.txt.....................................................Passed
check blanket noqa.......................................................Passed
check for not-real mock methods..........................................Passed
check for eval().........................................................Passed
use logger.warning(......................................................Passed
Run isort to sort imports................................................Passed
Run pydocstyle...........................................................Passed
Do not use shebangs in non-executable files..............................Passed
flake8...................................................................Passed
black....................................................................Passed
djLint formatting........................................................Passed
(openoversight) xxxxxx@MacBook-Air-5 OpenOversight %
```
  • Loading branch information
@michplunkett @sea-kelp
michplunkett authored and sea-kelp committed Sep 5, 2023
1 parent a5f9d01 commit bb2a323
Show file tree
Hide file tree
Showing 80 changed files with 3,127 additions and 2,880 deletions.
11 changes: 11 additions & 0 deletions .pre-commit-config.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,3 +95,14 @@ repos:
# additional_dependencies:
# - types-click
# - types-ujson

- repo: https://github.com/Riverside-Healthcare/djLint
rev: v1.31.1
hooks:
- id: djlint-reformat
args:
- OpenOversight/app/templates
- --format-css
- --profile=jinja
- --indent=2
- --quiet
20 changes: 10 additions & 10 deletions OpenOversight/app/templates/403.html
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{% extends "base.html" %}
{% block title %}Forbidden{% endblock %}

{% block title %}
Forbidden
{% endblock title %}
{% block content %}

<div class="container theme-showcase" role="main">

<h1>Forbidden</h1>
<p>You do not have permissions to view this page. <a href="{{ url_for('main.index') }}">Return to homepage</a>.</p>

</div>
{% endblock %}
<div class="container theme-showcase" role="main">
<h1>Forbidden</h1>
<p>
You do not have permissions to view this page. <a href="{{ url_for("main.index") }}">Return to homepage</a>.
</p>
</div>
{% endblock content %}
20 changes: 10 additions & 10 deletions OpenOversight/app/templates/404.html
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{% extends "base.html" %}
{% block title %}Page Not Found{% endblock %}

{% block title %}
Page Not Found
{% endblock title %}
{% block content %}

<div class="container theme-showcase" role="main">

<h1>Page Not Found</h1>
<p>We couldn't find the page you are looking for. <a href="{{ url_for('main.index') }}">Return to homepage</a>.</p>

</div>
{% endblock %}
<div class="container theme-showcase" role="main">
<h1>Page Not Found</h1>
<p>
We couldn't find the page you are looking for. <a href="{{ url_for("main.index") }}">Return to homepage</a>.
</p>
</div>
{% endblock content %}
20 changes: 10 additions & 10 deletions OpenOversight/app/templates/413.html
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{% extends "base.html" %}
{% block title %}File Too Large{% endblock %}

{% block title %}
File Too Large
{% endblock title %}
{% block content %}

<div class="container theme-showcase" role="main">

<h1>File Too Large</h1>
<p>The file you are trying to upload is too large. <a href="{{ url_for('main.index') }}">Return to homepage</a>.</p>

</div>
{% endblock %}
<div class="container theme-showcase" role="main">
<h1>File Too Large</h1>
<p>
The file you are trying to upload is too large. <a href="{{ url_for("main.index") }}">Return to homepage</a>.
</p>
</div>
{% endblock content %}
20 changes: 10 additions & 10 deletions OpenOversight/app/templates/429.html
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{% extends "base.html" %}
{% block title %}Too Many Requests{% endblock %}

{% block title %}
Too Many Requests
{% endblock title %}
{% block content %}

<div class="container theme-showcase" role="main">

<h1>Too Many Requests</h1>
<p>You're sending requests too fast. Wait a minute and try again. <a href="{{ url_for('main.index') }}">Return to homepage</a>.</p>

</div>
{% endblock %}
<div class="container theme-showcase" role="main">
<h1>Too Many Requests</h1>
<p>
You're sending requests too fast. Wait a minute and try again. <a href="{{ url_for("main.index") }}">Return to homepage</a>.
</p>
</div>
{% endblock content %}
20 changes: 10 additions & 10 deletions OpenOversight/app/templates/500.html
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{% extends "base.html" %}
{% block title %}Internal Server Error{% endblock %}

{% block title %}
Internal Server Error
{% endblock title %}
{% block content %}

<div class="container theme-showcase" role="main">

<h1>Internal Server Error</h1>
<p>Oops! Something went wrong. <a href="{{ url_for('main.index') }}">Return to homepage</a>.</p>

</div>
{% endblock %}
<div class="container theme-showcase" role="main">
<h1>Internal Server Error</h1>
<p>
Oops! Something went wrong. <a href="{{ url_for("main.index") }}">Return to homepage</a>.
</p>
</div>
{% endblock content %}
246 changes: 107 additions & 139 deletions OpenOversight/app/templates/about.html
View file
Original file line number Diff line number Diff line change
@@ -1,156 +1,124 @@
{% extends "base.html" %}

{% block title %}About OpenOversight{% endblock %}

{% block meta %}
<meta
name="description"
content="OpenOversight is a Seattle Tech Bloc project that aims to improve law enforcement
visibility and transparency using public and crowdsourced data. We maintain databases, digital galleries, and profiles of individual law enforcement officers from departments
the so called Pacific Northwest that consolidate information including names, birthdates, mentions in news articles, salaries, and photographs."
/>
<meta name="description"
content="OpenOversight is a Seattle Tech Bloc project that aims to improve law enforcement visibility and transparency using public and crowdsourced data. We maintain databases, digital galleries, and profiles of individual law enforcement officers from departments the so called Pacific Northwest that consolidate information including names, birthdates, mentions in news articles, salaries, and photographs." />
{% endblock %}

{% block content %}

<div role="main">
<div class="hero-section no-sub">
<div class="hero">About OpenOversight</div>
</div>
<div class="vertical-padding">
<p class="lead">
<small>
OpenOversight is a <a href="https://twitter.com/TechBlocSEA" target="_blank" rel="noopener noreferrer">Seattle Tech Bloc</a> project that aims to improve law enforcement
visibility and transparency using public and crowdsourced data. We maintain databases, digital galleries, and profiles of individual law enforcement officers from departments
the so called Pacific Northwest that consolidate information including names, birthdates, mentions in news articles, salaries, and photographs.
</small>
</p>

<p class="lead">
<small>
This is an independent instance of OpenOversight hosted by Seattle
regional techbloc. For more info or reporting problems, reach out to
<a
href="http://twitter.com/TechBlocSEA"
rel="noopener noreferrer"
target="_blank"
>TechBlocSEA on Twitter</a
>
or
<a href="mailto:techblocsea@protonmail.com"
>techblocsea@protonmail.com</a
>.
</small>
</p>

<div class="text-center pb-50">
<a href="/find" class="btn btn-lg btn-info" id="try-it"> Try it </a>
<div role="main">
<div class="hero-section no-sub">
<div class="hero">About OpenOversight</div>
</div>

<div class="row font-weight-300 text-center display-flex">
<div class="col-lg-4 col-half-border">
<span class="fa fa-institution fa-2x"></span>
<p>
This project is a response to the lack of transparency and justice in
policing. The public should have the right to know which officers are
patrolling their neighborhoods and watching their communities. When
officers abuse their positions of power, they should be able to be
easily identified and held accountable.
</p>
<div class="vertical-padding">
<p class="lead">
<small>
OpenOversight is a <a href="https://twitter.com/TechBlocSEA"
target="_blank"
rel="noopener noreferrer">Seattle Tech Bloc</a> project that aims to improve law enforcement
visibility and transparency using public and crowdsourced data. We maintain databases, digital galleries, and profiles of individual law enforcement officers from departments
the so called Pacific Northwest that consolidate information including names, birthdates, mentions in news articles, salaries, and photographs.
</small>
</p>
<p class="lead">
<small>
This is an independent instance of OpenOversight hosted by Seattle
regional techbloc. For more info or reporting problems, reach out to
<a href="http://twitter.com/TechBlocSEA"
rel="noopener noreferrer"
target="_blank">TechBlocSEA on Twitter</a>
or
<a href="mailto:techblocsea@protonmail.com">techblocsea@protonmail.com</a>.
</small>
</p>
<div class="text-center pb-50">
<a href="/find" class="btn btn-lg btn-info" id="try-it">Try it</a>
</div>
<div class="col-lg-4 col-half-border">
<span class="fa fa-map-marker fa-2x"></span>
<div class="row font-weight-300 text-center display-flex">
<div class="col-lg-4 col-half-border">
<span class="fa fa-institution fa-2x"></span>
<p>
This project is a response to the lack of transparency and justice in
policing. The public should have the right to know which officers are
patrolling their neighborhoods and watching their communities. When
officers abuse their positions of power, they should be able to be
easily identified and held accountable.
</p>
</div>
<div class="col-lg-4 col-half-border">
<span class="fa fa-map-marker fa-2x"></span>
<p>
It is the first project of its kind in the United States, and was
first implemented in Chicago in October 2016. OpenOversight launched
in the East Bay of the San Francisco Bay Area in fall 2017 and in New
York City in 2018. A Baltimore instance was launched in 2019 at
<a href="https://bpdwatch.com" rel="noopener noreferrer" target="_blank">BPDWatch.com</a>. A Portland instance was launched around the same time at
<a href="https://cops.photo" rel="noopener noreferrer" target="_blank">cops.photo</a>.
</p>
</div>
<div class="col-lg-4 col-half-border">
<span class="fa fa-github fa-2x"></span>
<p>
OpenOversight is released as free and open source software so others
can launch similar law enforcement accountability projects in their
own cities. The software is available for download and collaborative
development on
<a href="https://github.com/SeattleDSA/OpenOversight"
rel="noopener noreferrer"
target="_blank">GitHub</a>.
</p>
</div>
</div>
</div>
</div>
<div class="container-fluid">
<div class="row display-flex horizontal-padding vertical-padding pb-50">
<div class="col-lg-6 col-half-no-border bg-light-blue">
<h2>Legal</h2>
<i>A note to law enforcement</i>
<p>
It is the first project of its kind in the United States, and was
first implemented in Chicago in October 2016. OpenOversight launched
in the East Bay of the San Francisco Bay Area in fall 2017 and in New
York City in 2018. A Baltimore instance was launched in 2019 at
<a
href="https://bpdwatch.com"
rel="noopener noreferrer"
target="_blank"
>BPDWatch.com</a
>. A Portland instance was launched around the same time at
<a href="https://cops.photo"
rel="noopener noreferrer"
target="_blank">cops.photo</a>.
Requests or questions regarding this project from those affiliated with
law enforcement must be directed to Lucy Parsons Labs legal representation at
<a href="mailto:legal@lucyparsonslabs.com">legal@lucyparsonslabs.com</a>.
</p>
</div>
<div class="col-lg-4 col-half-border">
<span class="fa fa-github fa-2x"></span>
<div class="col-lg-6 col-half-no-border bg-blue-gray">
<h2>Contact and media</h2>
<p>
OpenOversight is released as free and open source software so others
can launch similar law enforcement accountability projects in their
own cities. The software is available for download and collaborative
development on
<a
href="https://github.com/SeattleDSA/OpenOversight"
rel="noopener noreferrer"
target="_blank"
>GitHub</a
>.
For media inquiries about OpenOversight, please email
<a href="mailto:media@lucyparsonslabs.com">media@lucyparsonslabs.com</a>. For other inquiries about the project, this particular instance,
including collaboration, please contact
<a href="mailto:techblocsea@protonmail.com">techblocsea@protonmail.com</a>.
</p>
</div>
</div>
</div>
</div>

<div class="container-fluid">
<div class="row display-flex horizontal-padding vertical-padding pb-50">
<div class="col-lg-6 col-half-no-border bg-light-blue">
<h2>Legal</h2>
<i>A note to law enforcement</i>
<p>
Requests or questions regarding this project from those affiliated with
law enforcement must be directed to Lucy Parsons Labs legal representation at
<a href="mailto:legal@lucyparsonslabs.com">legal@lucyparsonslabs.com</a
>.
</p>
</div>
<div class="col-lg-6 col-half-no-border bg-blue-gray">
<h2>Contact and media</h2>
<p>
For media inquiries about OpenOversight, please email
<a href="mailto:media@lucyparsonslabs.com">media@lucyparsonslabs.com</a
>. For other inquiries about the project, this particular instance,
including collaboration, please contact
<a href="mailto:techblocsea@protonmail.com"
>techblocsea@protonmail.com</a
>.
</p>
</div>
</div>

<div class="pb-50">
<div class="hr-banner">
<h2>Press Release</h2>
<p class="text-left">
In support of demands for greater police accountability, Illinois
nonprofit The Lucy Parsons Labs launched OpenOversight, an interactive
web tool and accountability platform that makes it easier for the public
to identify police officers, including for the purpose of complains. We
rely on crowdsourced and public data to build a database of police
officers in a city, allowing the public to filter through the dataset to
find the name and badge number of the offending officer.
</p>

<p class="text-left">
Using OpenOversight, members of the public can search for the names and
badge numbers of police with whom they have negative interactions using
the officer's estimated age, race and gender. Using this information,
the OpenOversight web application returns a digital gallery of potential
matches and, when possible, includes pictures of officers in uniform to
assist in identification. "The deck is stacked against people harmed by
police," says Jennifer Helsby, CTO of the Lucy Parsons Labs and lead
developer on the OpenOversight project. "Police are almost never held
accountable for misconduct or crimes they commit. To file a misconduct
complaint, the burden is on the public to provide as much detailed data
about the officer as possible. OpenOversight aims to empower citizens
with tools that make it easier to identify officers and hold them
accountable."
</p>
<div class="pb-50">
<div class="hr-banner">
<h2>Press Release</h2>
<p class="text-left">
In support of demands for greater police accountability, Illinois
nonprofit The Lucy Parsons Labs launched OpenOversight, an interactive
web tool and accountability platform that makes it easier for the public
to identify police officers, including for the purpose of complains. We
rely on crowdsourced and public data to build a database of police
officers in a city, allowing the public to filter through the dataset to
find the name and badge number of the offending officer.
</p>
<p class="text-left">
Using OpenOversight, members of the public can search for the names and
badge numbers of police with whom they have negative interactions using
the officer's estimated age, race and gender. Using this information,
the OpenOversight web application returns a digital gallery of potential
matches and, when possible, includes pictures of officers in uniform to
assist in identification. "The deck is stacked against people harmed by
police," says Jennifer Helsby, CTO of the Lucy Parsons Labs and lead
developer on the OpenOversight project. "Police are almost never held
accountable for misconduct or crimes they commit. To file a misconduct
complaint, the burden is on the public to provide as much detailed data
about the officer as possible. OpenOversight aims to empower citizens
with tools that make it easier to identify officers and hold them
accountable."
</p>
</div>
</div>
</div>
</div>

{% endblock %}
Loading

0 comments on commit bb2a323

Please sign in to comment.