Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
#184 - Implement inbox. (#67)
Browse files Browse the repository at this point in the history
* ✨ #184 - Implement inbox.

* ✨ add lookaround variable to pagination

* 🐛 fix pagination lookaround

* ♻️ remove paginator css component

* 👌 - Looks like this method is never used.

* 👌 - this tag and querystring tag are doing basically the same. Can you move them in one file?

* 👌 - should max-width be also added here? For now even if pagination lookaround = 1, the sidebar (conversations) can be too wide and overlap with the messages

* 👌 - I think some padding on the left for conversations would be nice and closer to the design

* ♻️ - Remove unused code.

* 🐛 - Fix new query format.

* 👕 - Run black.

Co-authored-by: Anna Shamray <[email protected]>
svenvandescheur and annashamray authored Dec 27, 2021

Verified

This commit was signed with the committer’s verified signature.
macmv Neil Macneale V
1 parent accf4d0 commit 972e00b
Showing 73 changed files with 2,067 additions and 177 deletions.
46 changes: 26 additions & 20 deletions package-lock.json

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
Original file line number Diff line number Diff line change
@@ -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
@@ -57,4 +58,4 @@ python3-saml
pyopenssl

# Common Ground integration
zgw-consumers
zgw-consumers
20 changes: 13 additions & 7 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
Original file line number Diff line number Diff line change
@@ -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
@@ -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
@@ -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
@@ -538,7 +550,9 @@ six==1.16.0
# django-choices
# django-elasticsearch-dsl
# elasticsearch-dsl
# furl
# isodate
# orderedmultidict
# pyopenssl
# python-dateutil
# qrcode
@@ -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
Original file line number Diff line number Diff line change
@@ -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
@@ -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
@@ -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
@@ -625,7 +637,9 @@ six==1.16.0
# django-choices
# django-elasticsearch-dsl
# elasticsearch-dsl
# furl
# isodate
# orderedmultidict
# pyopenssl
# python-dateutil
# qrcode
@@ -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
10 changes: 7 additions & 3 deletions src/open_inwoner/accounts/admin.py
Original file line number Diff line number Diff line change
@@ -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)
@@ -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

0 comments on commit 972e00b

Please sign in to comment.