From 2e7a306279b0564a8ae6512eea8e50a14f45a0c3 Mon Sep 17 00:00:00 2001 From: Alexander Laevens Date: Wed, 30 Nov 2022 14:47:23 -0700 Subject: [PATCH] fix daphne deployment --- one_trip/lib/api/consts.dart | 7 ++++--- one_trip/lib/api/models/simpleuser.dart | 5 ++++- one_trip/lib/api/models/user.dart | 5 ++++- one_trip_api/one_trip_api/asgi.py | 3 +++ one_trip_api/requirements.txt | 25 +++++++++++++++++++++++++ one_trip_api/users/serializers.py | 4 ++++ 6 files changed, 44 insertions(+), 5 deletions(-) diff --git a/one_trip/lib/api/consts.dart b/one_trip/lib/api/consts.dart index eaec0e1..9f175b2 100644 --- a/one_trip/lib/api/consts.dart +++ b/one_trip/lib/api/consts.dart @@ -1,5 +1,6 @@ -// const String baseURL = "https://groceries.alaevens.ca"; -const String baseURL = "http://192.168.0.16:8000"; -const String baseWsURL = "ws://192.168.0.16:8000"; +const String baseURL = "https://groceries.alaevens.ca"; +const String baseWsURL = "wss://groceries.alaevens.ca"; +// const String baseURL = "http://192.168.0.16:8000"; +// const String baseWsURL = "ws://192.168.0.16:8000"; const int resultsPerPage = 4; diff --git a/one_trip/lib/api/models/simpleuser.dart b/one_trip/lib/api/models/simpleuser.dart index 8db949a..65efb25 100644 --- a/one_trip/lib/api/models/simpleuser.dart +++ b/one_trip/lib/api/models/simpleuser.dart @@ -29,12 +29,15 @@ class SimpleUser { }); factory SimpleUser.fromJson(Map json) { + String? imagePath = json["image"] as String?; + String? imageUrl = imagePath != null ? "$baseURL/media/$imagePath" : null; + return SimpleUser( id: json["id"] as int, username: json["username"] as String, firstName: json["first_name"] as String, lastName: json["last_name"] as String, - imageUrl: json["image"] as String?, + imageUrl: imageUrl, ); } diff --git a/one_trip/lib/api/models/user.dart b/one_trip/lib/api/models/user.dart index 89a17d3..fc9e1df 100644 --- a/one_trip/lib/api/models/user.dart +++ b/one_trip/lib/api/models/user.dart @@ -28,13 +28,16 @@ class User { List invitesDynamic = json["homegroup_invites"]; List invites = invitesDynamic.map((e) => e as int).toList(); + String? imagePath = json["image"] as String?; + String? imageUrl = imagePath != null ? "$baseURL/media/$imagePath" : null; + return User( id: json["id"] as int, username: json["username"] as String, firstName: json["first_name"] as String, lastName: json["last_name"] as String, homegroup: json["homegroup"] as int?, - imageUrl: json["image"] as String?, + imageUrl: imageUrl, homegroupInvites: invites, ); } diff --git a/one_trip_api/one_trip_api/asgi.py b/one_trip_api/one_trip_api/asgi.py index 6218732..bfe38b5 100644 --- a/one_trip_api/one_trip_api/asgi.py +++ b/one_trip_api/one_trip_api/asgi.py @@ -8,6 +8,9 @@ https://docs.djangoproject.com/en/4.1/howto/deployment/asgi/ """ import os +import django + +django.setup() from django.core.asgi import get_asgi_application from channels.routing import ProtocolTypeRouter, URLRouter diff --git a/one_trip_api/requirements.txt b/one_trip_api/requirements.txt index 76ed5d4..c8b7df3 100644 --- a/one_trip_api/requirements.txt +++ b/one_trip_api/requirements.txt @@ -1,6 +1,16 @@ asgiref==3.5.2 +async-timeout==4.0.2 +attrs==22.1.0 +autobahn==22.7.1 +Automat==22.10.0 certifi==2022.9.24 +cffi==1.15.1 +channels==4.0.0 +channels-redis==4.0.0 charset-normalizer==2.1.1 +constantly==15.1.0 +cryptography==38.0.4 +daphne==4.0.0 Django==4.1.3 django-cors-headers==3.13.0 django-filter==22.1 @@ -8,14 +18,29 @@ django-nested-admin==4.0.2 djangorestframework==3.14.0 docopt==0.6.2 gunicorn==20.1.0 +hyperlink==21.0.0 idna==3.4 +incremental==22.10.0 Markdown==3.4.1 +msgpack==1.0.4 +packaging==21.3 Pillow==9.3.0 pipreqs==0.4.11 +pyasn1==0.4.8 +pyasn1-modules==0.2.8 +pycparser==2.21 +pyOpenSSL==22.1.0 +pyparsing==3.0.9 python-monkey-business==1.0.0 pytz==2022.6 +redis==4.3.5 requests==2.28.1 +service-identity==21.1.0 six==1.16.0 sqlparse==0.4.3 +Twisted==22.10.0 +txaio==22.2.1 +typing_extensions==4.4.0 urllib3==1.26.13 yarg==0.1.9 +zope.interface==5.5.2 diff --git a/one_trip_api/users/serializers.py b/one_trip_api/users/serializers.py index 759fd99..ba9a706 100644 --- a/one_trip_api/users/serializers.py +++ b/one_trip_api/users/serializers.py @@ -21,6 +21,10 @@ class UserSerializer(serializers.ModelSerializer): # https://stackoverflow.com/ return super().update(instance, validated_data) + image = serializers.ImageField( + max_length=None, use_url=False + ) + class Meta: model = User fields = ("id", "username", "first_name", "last_name", "password", "image", "homegroup", "homegroup_invites")