Fix conflicts

aminatadjer · Jul 4, 2020 · d614579 · d614579
2 parents 4cdcd27 + 3c8272a
commit d614579
Show file tree

Hide file tree

Showing 83 changed files with 17 additions and 1 deletion.
diff --git a/API/__pycache__/__init__.cpython-38.pyc b/API/__pycache__/__init__.cpython-38.pyc
diff --git a/API/__pycache__/settings.cpython-38.pyc b/API/__pycache__/settings.cpython-38.pyc
diff --git a/API/__pycache__/urls.cpython-38.pyc b/API/__pycache__/urls.cpython-38.pyc
diff --git a/API/__pycache__/wsgi.cpython-38.pyc b/API/__pycache__/wsgi.cpython-38.pyc
diff --git a/__pycache__/config.cpython-38.pyc b/__pycache__/config.cpython-38.pyc
diff --git a/article/__pycache__/__init__.cpython-38.pyc b/article/__pycache__/__init__.cpython-38.pyc
diff --git a/article/__pycache__/admin.cpython-38.pyc b/article/__pycache__/admin.cpython-38.pyc
diff --git a/article/__pycache__/models.cpython-38.pyc b/article/__pycache__/models.cpython-38.pyc
diff --git a/article/__pycache__/serializers.cpython-38.pyc b/article/__pycache__/serializers.cpython-38.pyc
diff --git a/article/__pycache__/urls.cpython-38.pyc b/article/__pycache__/urls.cpython-38.pyc
diff --git a/article/__pycache__/views.cpython-38.pyc b/article/__pycache__/views.cpython-38.pyc
diff --git a/article/migrations/__pycache__/0001_initial.cpython-38.pyc b/article/migrations/__pycache__/0001_initial.cpython-38.pyc
diff --git a/article/migrations/__pycache__/0002_article_owner.cpython-38.pyc b/article/migrations/__pycache__/0002_article_owner.cpython-38.pyc
diff --git a/article/migrations/__pycache__/__init__.cpython-38.pyc b/article/migrations/__pycache__/__init__.cpython-38.pyc
diff --git a/commentaire/__pycache__/__init__.cpython-38.pyc b/commentaire/__pycache__/__init__.cpython-38.pyc
diff --git a/commentaire/__pycache__/admin.cpython-38.pyc b/commentaire/__pycache__/admin.cpython-38.pyc
diff --git a/commentaire/__pycache__/models.cpython-38.pyc b/commentaire/__pycache__/models.cpython-38.pyc
diff --git a/commentaire/__pycache__/serializers.cpython-38.pyc b/commentaire/__pycache__/serializers.cpython-38.pyc
diff --git a/commentaire/__pycache__/urls.cpython-38.pyc b/commentaire/__pycache__/urls.cpython-38.pyc
diff --git a/commentaire/__pycache__/views.cpython-38.pyc b/commentaire/__pycache__/views.cpython-38.pyc
diff --git a/commentaire/migrations/__pycache__/0001_initial.cpython-38.pyc b/commentaire/migrations/__pycache__/0001_initial.cpython-38.pyc
diff --git a/commentaire/migrations/__pycache__/__init__.cpython-38.pyc b/commentaire/migrations/__pycache__/__init__.cpython-38.pyc
diff --git a/coronawatch/__pycache__/__init__.cpython-38.pyc b/coronawatch/__pycache__/__init__.cpython-38.pyc
diff --git a/coronawatch/__pycache__/admin.cpython-38.pyc b/coronawatch/__pycache__/admin.cpython-38.pyc
diff --git a/coronawatch/__pycache__/models.cpython-38.pyc b/coronawatch/__pycache__/models.cpython-38.pyc
diff --git a/coronawatch/__pycache__/serializers.cpython-38.pyc b/coronawatch/__pycache__/serializers.cpython-38.pyc
diff --git a/coronawatch/__pycache__/urls.cpython-38.pyc b/coronawatch/__pycache__/urls.cpython-38.pyc
diff --git a/coronawatch/migrations/__pycache__/0001_initial.cpython-38.pyc b/coronawatch/migrations/__pycache__/0001_initial.cpython-38.pyc
diff --git a/coronawatch/migrations/__pycache__/0002_auto_20200704_2032.cpython-38.pyc b/coronawatch/migrations/__pycache__/0002_auto_20200704_2032.cpython-38.pyc
diff --git a/coronawatch/migrations/__pycache__/__init__.cpython-38.pyc b/coronawatch/migrations/__pycache__/__init__.cpython-38.pyc
diff --git a/customauth/__pycache__/__init__.cpython-38.pyc b/customauth/__pycache__/__init__.cpython-38.pyc
diff --git a/customauth/__pycache__/admin.cpython-38.pyc b/customauth/__pycache__/admin.cpython-38.pyc
diff --git a/customauth/__pycache__/models.cpython-38.pyc b/customauth/__pycache__/models.cpython-38.pyc
diff --git a/customauth/__pycache__/serializers.cpython-38.pyc b/customauth/__pycache__/serializers.cpython-38.pyc
diff --git a/customauth/__pycache__/urls.cpython-38.pyc b/customauth/__pycache__/urls.cpython-38.pyc
diff --git a/customauth/__pycache__/views.cpython-38.pyc b/customauth/__pycache__/views.cpython-38.pyc
diff --git a/customauth/migrations/__pycache__/0001_initial.cpython-38.pyc b/customauth/migrations/__pycache__/0001_initial.cpython-38.pyc
diff --git a/customauth/migrations/__pycache__/__init__.cpython-38.pyc b/customauth/migrations/__pycache__/__init__.cpython-38.pyc
diff --git a/customauth/serializers.py b/customauth/serializers.py
@@ -41,6 +41,10 @@ class Meta:
         model = User
         fields = '__all__'
 
+class EmailSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = User
+        fields = ['email']
 
 class UserPasswordSerializer(serializers.ModelSerializer):
     password = serializers.CharField(

diff --git a/customauth/views.py b/customauth/views.py
@@ -1,7 +1,7 @@
 from django.shortcuts import render
 from rest_framework.decorators import action
 
-from .serializers import MyTokenObtainPairSerializer, UserCreateSerializer, UserSerializer, UserPasswordSerializer
+from .serializers import MyTokenObtainPairSerializer, UserCreateSerializer, UserSerializer, UserPasswordSerializer, EmailSerializer
 from rest_framework.views import APIView
 from rest_framework import status, permissions, viewsets
 from rest_framework.response import Response
@@ -45,3 +45,15 @@ def resetPassword(self, request, pk=None):
             serializer.save()
             return Response(serializer.data)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+
+    @action(methods=['put'], detail=True)
+    def resetEmail(self, request, pk=None):
+        try:
+            user = User.objects.get(pk=pk)
+        except User.DoesNotExist:
+            return Response(status=status.HTTP_404_NOT_FOUND)
+        serializer = EmailSerializer(user, data=request.data)
+        if serializer.is_valid():
+            serializer.save()
+            return Response(serializer.data)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
diff --git a/map/__pycache__/__init__.cpython-38.pyc b/map/__pycache__/__init__.cpython-38.pyc
diff --git a/map/__pycache__/admin.cpython-38.pyc b/map/__pycache__/admin.cpython-38.pyc
diff --git a/map/__pycache__/models.cpython-38.pyc b/map/__pycache__/models.cpython-38.pyc
diff --git a/map/__pycache__/serializers.cpython-38.pyc b/map/__pycache__/serializers.cpython-38.pyc
diff --git a/map/__pycache__/urls.cpython-38.pyc b/map/__pycache__/urls.cpython-38.pyc
diff --git a/map/__pycache__/views.cpython-38.pyc b/map/__pycache__/views.cpython-38.pyc
diff --git a/map/migrations/__pycache__/0001_initial.cpython-38.pyc b/map/migrations/__pycache__/0001_initial.cpython-38.pyc
diff --git a/map/migrations/__pycache__/__init__.cpython-38.pyc b/map/migrations/__pycache__/__init__.cpython-38.pyc
diff --git a/report/__pycache__/__init__.cpython-38.pyc b/report/__pycache__/__init__.cpython-38.pyc
diff --git a/report/__pycache__/admin.cpython-38.pyc b/report/__pycache__/admin.cpython-38.pyc
diff --git a/report/__pycache__/models.cpython-38.pyc b/report/__pycache__/models.cpython-38.pyc
diff --git a/report/__pycache__/serializers.cpython-38.pyc b/report/__pycache__/serializers.cpython-38.pyc
diff --git a/report/__pycache__/urls.cpython-38.pyc b/report/__pycache__/urls.cpython-38.pyc
diff --git a/report/__pycache__/views.cpython-38.pyc b/report/__pycache__/views.cpython-38.pyc
diff --git a/report/migrations/__pycache__/0001_initial.cpython-38.pyc b/report/migrations/__pycache__/0001_initial.cpython-38.pyc
diff --git a/report/migrations/__pycache__/0002_auto_20200704_2119.cpython-38.pyc b/report/migrations/__pycache__/0002_auto_20200704_2119.cpython-38.pyc
diff --git a/report/migrations/__pycache__/__init__.cpython-38.pyc b/report/migrations/__pycache__/__init__.cpython-38.pyc
diff --git a/robot/__pycache__/__init__.cpython-38.pyc b/robot/__pycache__/__init__.cpython-38.pyc
diff --git a/robot/__pycache__/admin.cpython-38.pyc b/robot/__pycache__/admin.cpython-38.pyc
diff --git a/robot/__pycache__/apps.cpython-38.pyc b/robot/__pycache__/apps.cpython-38.pyc
diff --git a/robot/__pycache__/models.cpython-38.pyc b/robot/__pycache__/models.cpython-38.pyc
diff --git a/robot/__pycache__/serializers.cpython-38.pyc b/robot/__pycache__/serializers.cpython-38.pyc
diff --git a/robot/__pycache__/urls.cpython-38.pyc b/robot/__pycache__/urls.cpython-38.pyc
diff --git a/robot/__pycache__/views.cpython-38.pyc b/robot/__pycache__/views.cpython-38.pyc
diff --git a/robot/migrations/__pycache__/0001_initial.cpython-38.pyc b/robot/migrations/__pycache__/0001_initial.cpython-38.pyc
diff --git a/robot/migrations/__pycache__/__init__.cpython-38.pyc b/robot/migrations/__pycache__/__init__.cpython-38.pyc
diff --git a/scraper/__pycache__/__init__.cpython-38.pyc b/scraper/__pycache__/__init__.cpython-38.pyc
diff --git a/scraper/__pycache__/googleSearchScrapping.cpython-38.pyc b/scraper/__pycache__/googleSearchScrapping.cpython-38.pyc
diff --git a/scraper/__pycache__/twitterScrapping.cpython-38.pyc b/scraper/__pycache__/twitterScrapping.cpython-38.pyc
diff --git a/scraper/__pycache__/updater.cpython-38.pyc b/scraper/__pycache__/updater.cpython-38.pyc
diff --git a/scraper/__pycache__/youtubeScraper.cpython-38.pyc b/scraper/__pycache__/youtubeScraper.cpython-38.pyc
diff --git a/sendMail/__pycache__/__init__.cpython-38.pyc b/sendMail/__pycache__/__init__.cpython-38.pyc
diff --git a/sendMail/__pycache__/admin.cpython-38.pyc b/sendMail/__pycache__/admin.cpython-38.pyc
diff --git a/sendMail/__pycache__/models.cpython-38.pyc b/sendMail/__pycache__/models.cpython-38.pyc
diff --git a/sendMail/__pycache__/views.cpython-38.pyc b/sendMail/__pycache__/views.cpython-38.pyc
diff --git a/videos/__pycache__/__init__.cpython-38.pyc b/videos/__pycache__/__init__.cpython-38.pyc
diff --git a/videos/__pycache__/admin.cpython-38.pyc b/videos/__pycache__/admin.cpython-38.pyc
diff --git a/videos/__pycache__/models.cpython-38.pyc b/videos/__pycache__/models.cpython-38.pyc
diff --git a/videos/__pycache__/serializers.cpython-38.pyc b/videos/__pycache__/serializers.cpython-38.pyc
diff --git a/videos/__pycache__/urls.cpython-38.pyc b/videos/__pycache__/urls.cpython-38.pyc
diff --git a/videos/__pycache__/views.cpython-38.pyc b/videos/__pycache__/views.cpython-38.pyc
diff --git a/videos/migrations/__pycache__/0001_initial.cpython-38.pyc b/videos/migrations/__pycache__/0001_initial.cpython-38.pyc
diff --git a/videos/migrations/__pycache__/__init__.cpython-38.pyc b/videos/migrations/__pycache__/__init__.cpython-38.pyc