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.

Sign up for GitHub

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

✨ #184 - Implement inbox. #67

Merged
merged 11 commits into from
Dec 27, 2021
Merged

✨ #184 - Implement inbox. #67

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2d842f0
:sparkles: #184 - Implement inbox.
svenvandescheur Dec 24, 2021
7b8bc76
:sparkles: add lookaround variable to pagination
annashamray Dec 27, 2021
f169c8a
:bug: fix pagination lookaround
annashamray Dec 27, 2021
2dd88bb
:recycle: remove paginator css component
annashamray Dec 27, 2021
af80916
:ok_hand: - Looks like this method is never used.
svenvandescheur Dec 27, 2021
071b646
:ok_hand: - this tag and querystring tag are doing basically the same…
svenvandescheur Dec 27, 2021
766244e
:ok_hand: - should max-width be also added here? For now even if pagi…
svenvandescheur Dec 27, 2021
82a15ac
:ok_hand: - I think some padding on the left for conversations would …
svenvandescheur Dec 27, 2021
a555053
:recycle: - Remove unused code.
svenvandescheur Dec 27, 2021
513c22d
:bug: - Fix new query format.
svenvandescheur Dec 27, 2021
2c491c8
:shirt: - Run black.
svenvandescheur Dec 27, 2021
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
46 changes: 26 additions & 20 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion requirements/base.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ python-dotenv # environment variables for secrets
python-decouple # processing of envvar configs
geopy # geo decoder
glom # processing nested data
furl # processing urls

# Framework libraries
django < 4.0
Expand Down Expand Up @@ -57,4 +58,4 @@ python3-saml
pyopenssl

# Common Ground integration
zgw-consumers
zgw-consumers
20 changes: 13 additions & 7 deletions requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,11 @@
asgiref==3.4.1
# via django
attrs==21.2.0
# via jsonschema
beautifulsoup4==4.10.0
# via -r requirements/base.in
# via
# glom
# jsonschema
beautifulsoup4==4.10.0
# via -r requirements/base.in
boltons==21.0.0
# via
# face
Expand Down Expand Up @@ -175,15 +174,18 @@ face==20.1.1
# via glom
faker==9.9.0
# via zgw-consumers
furl==2.1.3
# via -r requirements/base.in
gemma-zds-client==1.0.1
# via zgw-consumers
geographiclib==1.52
# via geopy
geopy==2.2.0
# via -r requirements/base.in
humanfriendly==10.0
glom==20.11.0
# via -r requirements/base.in
humanfriendly==10.0
# via -r requirements/base.in
idna==3.2
# via requests
importlib-metadata==4.8.2
Expand All @@ -210,6 +212,8 @@ odfpy==1.4.1
# via tablib
openpyxl==3.0.9
# via tablib
orderedmultidict==1.0.1
# via furl
phonenumbers==8.12.33
# via -r requirements/base.in
pillow==8.3.2
Expand Down Expand Up @@ -277,13 +281,15 @@ six==1.16.0
# django-choices
# django-elasticsearch-dsl
# elasticsearch-dsl
# furl
# isodate
# orderedmultidict
# pyopenssl
# python-dateutil
# qrcode
# requests-mock
soupsieve==2.3.1
# via beautifulsoup4
# requests-mock
sqlparse==0.4.2
# via django
tablib[html,ods,xls,xlsx,yaml]==3.1.0
Expand All @@ -308,7 +314,7 @@ xlwt==1.3.0
# via tablib
xmlsec==1.3.12
# via python3-saml
zipp==3.6.0
# via importlib-metadata
zgw-consumers==0.16.0
# via -r requirements/base.in
zipp==3.6.0
# via importlib-metadata
22 changes: 18 additions & 4 deletions requirements/ci.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,10 @@ faker==9.9.0
# zgw-consumers
freezegun==1.1.0
# via -r requirements/test-tools.in
furl==2.1.3
# via
# -c requirements/base.txt
# -r requirements/base.txt
gemma-zds-client==1.0.1
# via
# -c requirements/base.txt
Expand All @@ -335,11 +339,14 @@ geopy==2.2.0
# via
# -c requirements/base.txt
# -r requirements/base.txt
humanfriendly==10.0
glom==20.11.0
# via
# -c requirements/base.txt
# -r requirements/base.txt
humanfriendly==10.0
# via
# -c requirements/base.txt
# -r requirements/base.txt
idna==3.2
# via
# -c requirements/base.txt
Expand Down Expand Up @@ -406,6 +413,11 @@ openpyxl==3.0.9
# -c requirements/base.txt
# -r requirements/base.txt
# tablib
orderedmultidict==1.0.1
# via
# -c requirements/base.txt
# -r requirements/base.txt
# furl
pep8==1.7.1
# via -r requirements/test-tools.in
phonenumbers==8.12.33
Expand Down Expand Up @@ -538,7 +550,9 @@ six==1.16.0
# django-choices
# django-elasticsearch-dsl
# elasticsearch-dsl
# furl
# isodate
# orderedmultidict
# pyopenssl
# python-dateutil
# qrcode
Expand Down Expand Up @@ -616,15 +630,15 @@ xmlsec==1.3.12
# -c requirements/base.txt
# -r requirements/base.txt
# python3-saml
zipp==3.6.0
zgw-consumers==0.16.0
# via
# -c requirements/base.txt
# -r requirements/base.txt
# importlib-metadata
zgw-consumers==0.16.0
zipp==3.6.0
# via
# -c requirements/base.txt
# -r requirements/base.txt
# importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# setuptools
22 changes: 18 additions & 4 deletions requirements/dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,10 @@ freezegun==1.1.0
# via
# -c requirements/ci.txt
# -r requirements/ci.txt
furl==2.1.3
# via
# -c requirements/ci.txt
# -r requirements/ci.txt
gemma-zds-client==1.0.1
# via
# -c requirements/ci.txt
Expand All @@ -374,11 +378,14 @@ geopy==2.2.0
# via
# -c requirements/ci.txt
# -r requirements/ci.txt
humanfriendly==10.0
glom==20.11.0
# via
# -c requirements/ci.txt
# -r requirements/ci.txt
humanfriendly==10.0
# via
# -c requirements/ci.txt
# -r requirements/ci.txt
idna==3.2
# via
# -c requirements/ci.txt
Expand Down Expand Up @@ -464,6 +471,11 @@ openpyxl==3.0.9
# -c requirements/ci.txt
# -r requirements/ci.txt
# tablib
orderedmultidict==1.0.1
# via
# -c requirements/ci.txt
# -r requirements/ci.txt
# furl
packaging==21.0
# via sphinx
pathspec==0.9.0
Expand Down Expand Up @@ -625,7 +637,9 @@ six==1.16.0
# django-choices
# django-elasticsearch-dsl
# elasticsearch-dsl
# furl
# isodate
# orderedmultidict
# pyopenssl
# python-dateutil
# qrcode
Expand Down Expand Up @@ -750,15 +764,15 @@ xmlsec==1.3.12
# -c requirements/ci.txt
# -r requirements/ci.txt
# python3-saml
zipp==3.6.0
zgw-consumers==0.16.0
# via
# -c requirements/ci.txt
# -r requirements/ci.txt
# importlib-metadata
zgw-consumers==0.16.0
zipp==3.6.0
# via
# -c requirements/ci.txt
# -r requirements/ci.txt
# importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# pip
Expand Down
10 changes: 7 additions & 3 deletions src/open_inwoner/accounts/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
from django.urls import reverse_lazy
from django.utils.translation import ugettext_lazy as _

from hijack.contrib.admin import HijackUserAdminMixin

from .models import Action, Appointment, Contact, Document, User
from .models import Action, Appointment, Contact, Document, Message, User


@admin.register(User)
Expand Down Expand Up @@ -84,3 +82,9 @@ class DocumentAdmin(admin.ModelAdmin):
class AppointmentAdmin(admin.ModelAdmin):
list_display = ("name", "datetime", "created_on", "created_by")
list_filter = ("created_by",)


@admin.register(Message)
class MessageAdmin(admin.ModelAdmin):
list_display = ("sender", "receiver", "created_on")
list_filter = ("sender", "receiver")
Loading