Phase2 ------- partial 7

zubhub_backend/zubhub/creators/__init__.py

@@ -0,0 +1 @@
+default_app_config = 'creators.apps.CreatorsConfig'

zubhub_backend/zubhub/creators/apps.py

@@ -3,3 +3,6 @@
 
 class CreatorsConfig(AppConfig):
     name = 'creators'
+
+    def ready(self):
+        import creators.signals

zubhub_backend/zubhub/creators/models.py

@@ -7,9 +7,9 @@
 from django.utils.text import slugify
 from django.contrib.auth.models import AbstractUser
 from django.db import models, transaction
+from django.dispatch import Signal
 from .managers import PhoneNumberManager
 from .utils import user_phone
-from . import signals
 
 try:
     from allauth.account import app_settings as allauth_settings
@@ -51,7 +51,8 @@ class Creator(AbstractUser):
     projects_count = models.IntegerField(blank=True, default=0)
 
     def save(self, *args, **kwargs):
-        self.avatar = 'https://robohash.org/{0}'.format(self.username)
+        if not self.avatar:
+            self.avatar = 'https://robohash.org/{0}'.format(self.username)
         self.followers_count = self.followers.count()
         self.following_count = self.following.count()
         self.projects_count = self.projects.count()
@@ -152,7 +153,7 @@ def confirm(self, request):
         if not self.phone_number.verified:
             phone_number = self.phone_number
             get_adapter(request).confirm_phone(request, phone_number)
-            signals.phone_confirmed.send(
+            Signal().send(
                 sender=self.__class__,
                 request=request,
                 phone_number=phone_number,
@@ -161,7 +162,7 @@ def confirm(self, request):
 
     def send(self, request=None, signup=False):
         get_adapter(request).send_confirmation_text(request, self, signup)
-        signals.phone_confirmation_sent.send(
+        Signal().send(
             sender=self.__class__,
             request=request,
             confirmation=self,

zubhub_backend/zubhub/creators/serializers.py

@@ -70,6 +70,7 @@ def validate_phone(self, phone):
         return phone
 
     def update(self, user, validated_data):
+        print("update was called")
         creator = super().update(user, validated_data)
         phone_number = PhoneNumber.objects.filter(user=creator)
         email_address = EmailAddress.objects.filter(user=creator)

zubhub_backend/zubhub/creators/signals.py

@@ -1,6 +1,15 @@
-from django.dispatch import Signal
-
+from django.db.models.signals import pre_delete
+from django.dispatch import Signal, receiver
+from .models import Creator
+# from django.contrib.auth import get_user_model
+from projects.tasks import delete_image_from_DO_space
 # Provides the arguments "request", "phone_number"
 phone_confirmed = Signal()
 # Provides the arguments "request", "confirmation", "signup"
 phone_confirmation_sent = Signal()
+
+
+@receiver(pre_delete, sender=Creator)
+def creator_to_be_deleted(sender, instance, **kwargs):
+    delete_image_from_DO_space.delay(
+        "zubhub", instance.avatar.split(".com/")[1])

zubhub_backend/zubhub/creators/tasks.py

@@ -1,6 +1,9 @@
 from celery import shared_task
 from random import uniform
-
+import boto3
+import requests
+from django.conf import settings
+# from django.contrib.auth import get_user_model
 try:
     from allauth.account.adapter import get_adapter
 except ImportError:
@@ -14,3 +17,32 @@ def send_text(self, phone, template_name, ctx):
     except Exception as e:
         raise self.retry(exc=e, countdown=int(
             uniform(2, 4) ** self.request.retries))
+
+
+@shared_task(name="creators.tasks.upload_image_to_DO_space", bind=True, acks_late=True, max_retries=10)
+def upload_image_to_DO_space(self, bucket, key, user_id):
+    from creators.models import Creator
+
+    creator = Creator.objects.filter(id=user_id)
+
+    session = boto3.session.Session()
+    client = session.client('s3',
+                            region_name=settings.DOSPACE_REGION,
+                            endpoint_url=settings.DOSPACE_ENDPOINT_URL,
+                            aws_access_key_id=settings.DOSPACE_ACCESS_KEY_ID,
+                            aws_secret_access_key=settings.DOSPACE_ACCESS_SECRET_KEY)
+
+    try:
+        res = requests.get(creator[0].avatar)
+        res = client.put_object(Bucket=bucket, Key=key,
+                                Body=res.content, ContentType=res.headers["Content-Type"], ACL="public-read")
+        if res.get("ResponseMetadata") and res["ResponseMetadata"]["HTTPStatusCode"] == 200:
+
+            avatar = 'https://{0}.{1}/{2}'.format(
+                bucket, settings.DOSPACE_ENDPOINT_URL.split("https://")[1], key)
+
+            creator.update(avatar=avatar)
+
+    except Exception as e:
+        raise self.retry(exc=e, countdown=int(
+            uniform(2, 4) ** self.request.retries))

zubhub_backend/zubhub/creators/utils.py

@@ -7,6 +7,8 @@
 from django.utils.encoding import force_str
 from django.utils.http import base36_to_int, int_to_base36, urlencode
 from django.contrib.auth import get_user_model
+from projects.tasks import delete_image_from_DO_space
+from creators.tasks import upload_image_to_DO_space
 
 
 try:
@@ -144,6 +146,28 @@ def send_phone_confirmation(request, user, signup=False, phone=None):
             assert phone_number
 
 
+def process_avatar(oldInstance, newInstance):
+
+    key = 'avatar/{0}'.format(newInstance.username)
+
+    if oldInstance and oldInstance.username != newInstance.username:
+        newInstance.avatar = 'https://robohash.org/{0}'.format(
+            newInstance.username)
+        newInstance.save()
+
+        if(oldInstance.avatar.find(".com") > 0):
+
+            delete_image_from_DO_space.delay(
+                "zubhub", oldInstance.avatar.split(".com/")[1])
+
+        upload_image_to_DO_space.delay(
+            'zubhub', key, newInstance.id)
+
+    elif not oldInstance:
+
+        upload_image_to_DO_space.delay(
+            'zubhub', key, newInstance.id)
+
 # def sync_user_email_addresses(user):
 #     """
 #     Keep user.email in sync with user.emailaddress_set.

zubhub_backend/zubhub/creators/views.py

@@ -16,7 +16,7 @@
 from .permissions import IsOwner
 from .models import Location
 from .pagination import CreatorNumberPagination
-from .utils import perform_send_phone_confirmation, perform_send_email_confirmation
+from .utils import perform_send_phone_confirmation, perform_send_email_confirmation, process_avatar
 
 from .models import PhoneConfirmationHMAC
 
@@ -36,14 +36,13 @@ class UserProfileAPIView(RetrieveAPIView):
     lookup_field = "username"
     permission_classes = [AllowAny]
 
-    # perform_send_phone_confirmation
-
 
 class RegisterCreatorAPIView(RegisterView):
     serializer_class = CustomRegisterSerializer
 
     def perform_create(self, serializer):
         creator = super().perform_create(serializer)
+        process_avatar(None, creator)
         perform_send_phone_confirmation(
             self.request._request, creator, signup=True)
         return creator
@@ -87,6 +86,7 @@ def perform_update(self, serializer):
 
             perform_send_email_confirmation(
                 self.request._request, creator[0], signup=True)
+        process_avatar(self.request.user, creator[0])
         return response
 
     def get_object(self):

zubhub_backend/zubhub/projects/serializers.py

@@ -11,8 +11,7 @@
 
 class CommentSerializer(serializers.ModelSerializer):
     id = serializers.UUIDField(read_only=True)
-    creator = serializers.SlugRelatedField(
-        slug_field='username', read_only=True)
+    creator = CreatorSerializer(read_only=True)
     created_on = serializers.DateTimeField(read_only=True)
 
     class Meta:

zubhub_frontend/zubhub/public/locales/en/translation.json

@@ -20,10 +20,11 @@
       "login": "Login",
       "signup": "Sign Up",
       "createProject": "Create Project",
-      "projects": "Projects",
+      "profile": "My Profile",
+      "projects": "My Projects",
       "followers": "Followers",
       "following": "Following",
-      "savedProjects": "Saved Projects",
+      "savedProjects": "Bookmarks",
       "logout": "Logout"
     },
     "errors": {
@@ -259,7 +260,7 @@
       },
       "video": {
         "label": "Let's add a video",
-        "topHelperText": "It's ok if you don't have them",
+        "topHelperText": "It's ok if you don't have them, add images instead",
         "bottomHelperText": "YouTube, Vimeo, Google Drive links are supported",
         "errors": {
           "shouldBeVideoUrl": "you are required to submit a video url here",
@@ -374,10 +375,10 @@
     "followingCount": "Following",
     "about": {
       "label": "About Me",
-      "placeholder": "You will be able to change this next month 😀!"
+      "placeholder": "tell us more about you by clicking on the edit button at the top of the page 😀!"
     },
     "projects": {
-      "label": "Latest projects of",
+      "label": "Latest projects",
       "viewAll": "View all >>"
     },
     "tooltips": {
@@ -416,14 +417,14 @@
       },
       "email": {
         "label": "Email",
-        "disabledHelperText": "to edit this field mail admin@unstrucutred.studio",
+        "disabledHelperText": "to edit this field mail admin@unstructured.studio",
         "errors": {
           "invalid": "invalid email"
         }
       },
       "phone": {
         "label": "Phone",
-        "disabledHelperText": "to edit this field mail admin@unstrucutred.studio",
+        "disabledHelperText": "to edit this field mail admin@unstructured.studio",
         "errors": {
           "invalid": "Phone number must be entered in the format: '+999999999'. Up to 15 digits allowed."
         }

zubhub_frontend/zubhub/public/locales/hi/translation.json

@@ -20,10 +20,11 @@
       "login": "लॉग इन करें",
       "signup": "साइन अप करें",
       "createProject": "प्रोजेक्ट बनाएं",
-      "savedProjects": "बचाए गए प्रोजेक्ट",
-      "projects": "परियोजनाओं",
+      "profile": "मेरी प्रोफाइल",
+      "projects": "मेरे प्रोजेक्ट्स",
       "followers": "अनुयायियों",
       "following": "निम्नलिखित",
+      "savedProjects": "बुकमार्क",
       "logout": "लॉग आउट"
     },
     "errors": {
@@ -259,7 +260,7 @@
       },
       "video": {
         "label": "आइए एक वीडियो जोड़ें",
-        "topHelperText": "यह ठीक है अगर आपके पास उन्हें नहीं है",
+        "topHelperText": "यह ठीक है अगर आपके पास उन्हें नहीं है, इसके बजाय चित्र जोड़ें",
         "bottomHelperText": "YouTube, Vimeo, Google Drive लिंक समर्थित हैं",
         "errors": {
           "shouldBeVideoUrl": "आपको यहां एक वीडियो url प्रस्तुत करना आवश्यक है",
@@ -374,10 +375,10 @@
     "followingCount": "निम्नलिखित",
     "about": {
       "label": "मेरे बारे में",
-      "placeholder": "आप इसे अगले महीने बदल पाएंगे 😀!"
+      "placeholder": "पृष्ठ के शीर्ष पर स्थित संपादित करें बटन पर क्लिक करके हमें अपने बारे में और बताएं 😀!"
     },
     "projects": {
-      "label": "की नवीनतम परियोजनाएँ",
+      "label": "नयी परियोजनाएं",
       "viewAll": "सभी देखें >>"
     },
     "tooltips": {
@@ -416,14 +417,14 @@
       },
       "email": {
         "label": "ईमेल",
-        "disabledHelperText": "इस फ़ील्ड मेल को संपादित करने के लिए admin@unstrucutred.studio",
+        "disabledHelperText": "इस फ़ील्ड मेल को संपादित करने के लिए admin@unstructured.studio",
         "errors": {
           "invalid": "अमान्य ईमेल"
         }
       },
       "phone": {
         "label": "फ़ोन",
-        "disabledHelperText": "इस फ़ील्ड मेल को संपादित करने के लिए admin@unstrucutred.studio",
+        "disabledHelperText": "इस फ़ील्ड मेल को संपादित करने के लिए admin@unstructured.studio",
         "errors": {
           "invalid": "फ़ोन नंबर प्रारूप में दर्ज किया जाना चाहिए: '+999999999'। 15 अंकों तक की अनुमति।"
         }

zubhub_frontend/zubhub/src/assets/js/styles/components/button/buttonStyles.js

@@ -1,14 +1,14 @@
 const styles = theme => ({
   primaryButtonStyle: {
     backgroundColor: '#00B8C4',
-    borderRadius: 15,
+    borderRadius: 30,
     color: 'white',
     '&:hover': {
       backgroundColor: '#03848C',
     },
   },
   secondaryButtonStyle: {
-    borderRadius: 15,
+    borderRadius: 30,
     backgroundColor: 'white',
     color: '#00B8C4',
     '&:hover': {
@@ -17,7 +17,7 @@ const styles = theme => ({
     },
   },
   dangerButtonStyle: {
-    borderRadius: 15,
+    borderRadius: 30,
     backgroundColor: 'rgb(220, 0, 78)',
     color: 'white',
     '&:hover': {
@@ -35,6 +35,11 @@ const styles = theme => ({
       },
     },
   },
+  customButtonStyle: {
+    [theme.breakpoints.up('1600')]: {
+      fontSize: '1.5rem',
+    },
+  },
   fullWidth: {
     width: '100%',
   },

zubhub_frontend/zubhub/src/assets/js/styles/components/project/projectStyles.js

@@ -30,7 +30,6 @@ const styles = theme => ({
     filter:
       "progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffcc00', endColorstr='#ffffff', GradientType=0 )",
     alignItems: 'center',
-    flexDirection: 'column',
     justifyContent: 'center',
   },
   mediaBoxStyle: {
@@ -84,10 +83,14 @@ const styles = theme => ({
     fontSize: '1.3rem',
   },
   descriptionStyle: {
-    whiteSpace: 'nowrap',
-    overflow: 'hidden',
-    textOverflow: 'ellipsis',
     flexGrow: 1,
+    '& p': {
+      overflow: 'hidden',
+      textOverflow: 'ellipsis',
+      display: '-webkit-box',
+      WebkitLineClamp: 2,
+      WebkitBoxOrient: 'vertical',
+    },
   },
   creatorBoxStyle: {
     marginTop: '0.5em',