diff --git a/freekake_api/content/models.py b/freekake_api/content/models.py index 9b0ccd5..0864e98 100644 --- a/freekake_api/content/models.py +++ b/freekake_api/content/models.py @@ -29,6 +29,8 @@ class ContentTheme(SoftDeleteModel): upload_to="uploads/content_themes/", validators=[validate_image_size, validate_image_ext, validate_image], null=False, blank=False) + + color = models.CharField(max_length=7, null=True, blank=True) created_at = models.DateTimeField(auto_now_add=True) updated_at = models.DateTimeField(auto_now=True) @@ -84,6 +86,7 @@ class Content(SoftDeleteModel): topic = models.ForeignKey(ContentTopic, on_delete=models.CASCADE, null=False) format = models.CharField(max_length=25, choices=CONTENT_FORMAT_CHOICES) + description = models.CharField(max_length=255, null=True, blank=True) content = models.TextField(null=True) data = models.JSONField(null=True) @@ -92,6 +95,8 @@ class Content(SoftDeleteModel): point = models.IntegerField() coin = models.IntegerField() + color = models.CharField(max_length=7, null=True, blank=True) + created_at = models.DateTimeField(auto_now_add=True) updated_at = models.DateTimeField(auto_now=True) diff --git a/freekake_api/content/serializers.py b/freekake_api/content/serializers.py index 65fa280..a505f1b 100644 --- a/freekake_api/content/serializers.py +++ b/freekake_api/content/serializers.py @@ -6,7 +6,7 @@ class ContentThemeSerializer(serializers.ModelSerializer): featured_image = ImageField(max_length=255, allow_empty_file=False) class Meta: model = models.ContentTheme - fields = ['id', 'theme', 'description', 'featured_image'] + fields = ['id', 'theme', 'description', 'featured_image', 'color'] class ContentTopicSerializer(serializers.ModelSerializer): featured_image = ImageField(max_length=255, allow_empty_file=False) @@ -28,7 +28,7 @@ class ContentSerializer(serializers.ModelSerializer): class Meta: model = models.Content - fields = ['id', 'title', 'slug', 'featured_image', 'theme', 'topic', 'format', 'content', 'point', 'coin', 'data', 'grades'] + fields = ['id', 'title', 'slug', 'featured_image', 'theme', 'topic', 'format', 'description','content', 'point', 'coin', 'data', 'grades', 'color'] class ContentDetailSerializer(serializers.ModelSerializer): theme = ContentThemeSerializer(read_only=True) @@ -37,4 +37,4 @@ class ContentDetailSerializer(serializers.ModelSerializer): class Meta: model = models.Content - fields = ['id', 'title', 'slug', 'featured_image', 'theme', 'topic', 'format', 'content', 'point', 'coin', 'data', 'grades'] + fields = ['id', 'title', 'slug', 'featured_image', 'theme', 'topic', 'format', 'description','content', 'point', 'coin', 'data', 'grades', 'color']