Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Oct 18, 2021
1 parent 5973d85 commit 19a38d0
Show file tree
Hide file tree
Showing 67 changed files with 614 additions and 352 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -118,4 +118,4 @@ GitHub.sublime-settings
%SystemDrive%

# Mac file system
.DS_Store/
.DS_Store/
2 changes: 1 addition & 1 deletion .isort.cfg
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[isort]
profile=black
skip=migrations
skip=migrations
2 changes: 1 addition & 1 deletion .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ disable=broad-except, fixme, missing-module-docstring, missing-class-docstring,
load-plugins=pylint_django
django-settings-module=conreq.settings
[FORMAT]
max-line-length=150
max-line-length=150
2 changes: 1 addition & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
"gruntfuggly.todo-tree",
"sourcery.sourcery"
]
}
}
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@
"editor.defaultFormatter": "ms-python.python"
},
"python.pythonPath": ".venv\\Scripts\\python.exe"
}
}
2 changes: 1 addition & 1 deletion conreq/asgi.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# Fetch ASGI application before importing dependencies that require ORM models.
django_asgi_app = get_asgi_application()

# noqa: E402

# pylint: disable=wrong-import-position
from channels.auth import AuthMiddlewareStack # noqa: E402
from channels.routing import ProtocolTypeRouter, URLRouter # noqa: E402
Expand Down
1 change: 0 additions & 1 deletion conreq/internal/api/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
from rest_framework.response import Response
from rest_framework.views import APIView


from .serializers import UserSerializer


Expand Down
314 changes: 238 additions & 76 deletions conreq/internal/app_store/migrations/0001_initial.py

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion conreq/internal/base/static/css/izi_toast_1.4.0.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion conreq/internal/base/static/icons/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: 1 addition & 1 deletion conreq/internal/base/static/js/izi_toast_1.4.0.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion conreq/internal/base/templates/head/content.html
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,4 @@
<script src="{% static 'js/client_websockets.js' %}" crossorigin="anonymous"></script>
<script src="{% static 'js/events.js' %}" crossorigin="anonymous"></script>
<script src="{% static 'js/viewport.js' %}" crossorigin="anonymous"></script>
{% endcompress %}
{% endcompress %}
2 changes: 1 addition & 1 deletion conreq/internal/base/templates/head/icons.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
<link rel="icon" type="image/png" sizes="32x32" href="{% static 'icons/favicon-32x32.png' %}">
<link rel="icon" type="image/png" sizes="16x16" href="{% static 'icons/favicon-16x16.png' %}">
<link rel="mask-icon" href="{% static 'icons/safari-pinned-tab.svg' %}" color="#31b58f">
<link rel="shortcut icon" href="{% static 'icons/favicon.ico' %}">
<link rel="shortcut icon" href="{% static 'icons/favicon.ico' %}">
2 changes: 1 addition & 1 deletion conreq/internal/base/templates/loading/spinner.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<div class="spinner-border loading-animation" role="status">
<span class="sr-only">Loading...</span>
</div>
</div>
65 changes: 51 additions & 14 deletions conreq/internal/email/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -1,32 +1,69 @@
# Generated by Django 3.2.7 on 2021-09-19 07:52

import conreq.utils.fields
from django.db import migrations, models
import encrypted_fields.fields
from django.db import migrations, models

import conreq.utils.fields


class Migration(migrations.Migration):

initial = True

dependencies = [
]
dependencies = []

operations = [
migrations.CreateModel(
name='EmailConfig',
name="EmailConfig",
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('smtp_server', conreq.utils.fields.HostnameOrURLField(default='smtp.gmail.com', max_length=255)),
('smtp_port', models.PositiveIntegerField(default=587)),
('auth_encryption', models.CharField(choices=[('TLS', 'TLS (Default)'), ('SSL', 'SSL'), ('OFF', 'Off')], default='TLS', max_length=3)),
('username', encrypted_fields.fields.EncryptedCharField(blank=True, default='', max_length=255)),
('password', encrypted_fields.fields.EncryptedCharField(blank=True, default='', max_length=255)),
('sender_name', models.CharField(blank=True, default='', max_length=50)),
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
(
"smtp_server",
conreq.utils.fields.HostnameOrURLField(
default="smtp.gmail.com", max_length=255
),
),
("smtp_port", models.PositiveIntegerField(default=587)),
(
"auth_encryption",
models.CharField(
choices=[
("TLS", "TLS (Default)"),
("SSL", "SSL"),
("OFF", "Off"),
],
default="TLS",
max_length=3,
),
),
(
"username",
encrypted_fields.fields.EncryptedCharField(
blank=True, default="", max_length=255
),
),
(
"password",
encrypted_fields.fields.EncryptedCharField(
blank=True, default="", max_length=255
),
),
(
"sender_name",
models.CharField(blank=True, default="", max_length=50),
),
],
options={
'verbose_name': 'Email Settings',
'verbose_name_plural': 'Email Settings',
"verbose_name": "Email Settings",
"verbose_name_plural": "Email Settings",
},
),
]
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
class Migration(migrations.Migration):

dependencies = [
('email', '0001_initial'),
("email", "0001_initial"),
]

operations = [
migrations.AlterField(
model_name='emailconfig',
name='smtp_server',
field=models.CharField(default='smtp.gmail.com', max_length=255),
model_name="emailconfig",
name="smtp_server",
field=models.CharField(default="smtp.gmail.com", max_length=255),
),
]
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@
<!-- Local JS -->
{% compress js %}
<script src="{% static 'js/initialization.js' %}" crossorigin="anonymous"></script>
{% endcompress %}
{% endcompress %}
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ <h2>Create your admin account</h2>
</div>
</body>

</html>
</html>
2 changes: 1 addition & 1 deletion conreq/internal/home/templates/homepage/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@
</main>
</body>

</html>
</html>
2 changes: 1 addition & 1 deletion conreq/internal/home/templates/homepage/navbar.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
<div class="navbar-brand ellipsis">
{% server_name %}
</div>
</div>
</div>
2 changes: 1 addition & 1 deletion conreq/internal/home/templates/homepage/sidebar.html
Original file line number Diff line number Diff line change
Expand Up @@ -107,4 +107,4 @@
</div>
{% endif %}
</div>
</nav>
</nav>
2 changes: 1 addition & 1 deletion conreq/internal/home/templates/modal/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
<div id="modal-dialog" class="modal-dialog modal-dialog-centered modal-lg" role="document">
{% include app_config.loading_animation_template %}
</div>
</div>
</div>
24 changes: 19 additions & 5 deletions conreq/internal/manage_users/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Generated by Django 3.1.7 on 2021-04-03 01:45

import django.db.models.deletion
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):
Expand All @@ -15,11 +15,25 @@ class Migration(migrations.Migration):

operations = [
migrations.CreateModel(
name='Profile',
name="Profile",
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('language', models.CharField(default='en-US', max_length=30)),
('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
(
"id",
models.AutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("language", models.CharField(default="en-US", max_length=30)),
(
"user",
models.OneToOneField(
on_delete=django.db.models.deletion.CASCADE,
to=settings.AUTH_USER_MODEL,
),
),
],
),
]
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
class Migration(migrations.Migration):

dependencies = [
('manage_users', '0001_initial'),
("manage_users", "0001_initial"),
]

operations = [
migrations.AddField(
model_name='profile',
name='http_header_auth_user',
model_name="profile",
name="http_header_auth_user",
field=models.BooleanField(default=False),
),
]
10 changes: 6 additions & 4 deletions conreq/internal/manage_users/migrations/0003_alter_profile_id.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@
class Migration(migrations.Migration):

dependencies = [
('manage_users', '0002_profile_http_header_auth_user'),
("manage_users", "0002_profile_http_header_auth_user"),
]

operations = [
migrations.AlterField(
model_name='profile',
name='id',
field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
model_name="profile",
name="id",
field=models.BigAutoField(
auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
),
),
]
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
class Migration(migrations.Migration):

dependencies = [
('manage_users', '0003_alter_profile_id'),
("manage_users", "0003_alter_profile_id"),
]

operations = [
migrations.RenameField(
model_name='profile',
old_name='http_header_auth_user',
new_name='externally_authenticated',
model_name="profile",
old_name="http_header_auth_user",
new_name="externally_authenticated",
),
]
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,4 @@
SAVE
</div>
</div>
</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ <h2 class="table-title">User Management</h2>
</table>

</div>
</div>
</div>
2 changes: 1 addition & 1 deletion conreq/internal/pwa/templates/head/offline.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@
<!-- Local JS -->
{% compress js %}
<script src="{% static 'js/offline.js' %}" crossorigin="anonymous"></script>
{% endcompress %}
{% endcompress %}
2 changes: 1 addition & 1 deletion conreq/internal/pwa/templates/offline.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@
</div>
</body>

</html>
</html>
2 changes: 1 addition & 1 deletion conreq/internal/pwa/templates/pwa.html
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@
{% endif %}
});
}
</script>
</script>
Loading

0 comments on commit 19a38d0

Please sign in to comment.