From 298f9441ef66258b9a4df75fa9265f8b33d2981b Mon Sep 17 00:00:00 2001 From: Rushil Umaretiya Date: Sun, 16 Aug 2020 00:05:35 -0400 Subject: [PATCH] fully moved to working ckeditor instead of tinymce --- config/settings.py | 2 +- config/urls.py | 3 --- news/migrations/0001_initial.py | 27 ------------------- news/migrations/0002_article_header.py | 18 ------------- news/migrations/0003_auto_20200815_1130.py | 23 ---------------- news/migrations/0004_article_headline.py | 19 ------------- news/migrations/0005_auto_20200815_1303.py | 23 ---------------- news/migrations/0006_article_tag.py | 18 ------------- news/migrations/0007_auto_20200815_2100.py | 19 ------------- news/migrations/__init__.py | 0 news/models.py | 5 ++-- .../news/article_confirm_delete.html | 2 +- news/templates/news/article_detail.html | 2 +- news/templates/news/article_form.html | 2 ++ news/templates/news/user_article.html | 2 +- users/migrations/0010_auto_20200815_2353.py | 23 ++++++++++++++++ users/templates/users/login.html | 4 +-- 17 files changed, 34 insertions(+), 158 deletions(-) delete mode 100644 news/migrations/0001_initial.py delete mode 100644 news/migrations/0002_article_header.py delete mode 100644 news/migrations/0003_auto_20200815_1130.py delete mode 100644 news/migrations/0004_article_headline.py delete mode 100644 news/migrations/0005_auto_20200815_1303.py delete mode 100644 news/migrations/0006_article_tag.py delete mode 100644 news/migrations/0007_auto_20200815_2100.py delete mode 100644 news/migrations/__init__.py create mode 100644 users/migrations/0010_auto_20200815_2353.py diff --git a/config/settings.py b/config/settings.py index bce565f..19a356b 100644 --- a/config/settings.py +++ b/config/settings.py @@ -85,8 +85,8 @@ INSTALLED_APPS = [ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', - 'tinymce', 'social_django', + 'ckeditor' ] MIDDLEWARE = [ diff --git a/config/urls.py b/config/urls.py index 2aeab2f..f0c3811 100644 --- a/config/urls.py +++ b/config/urls.py @@ -34,9 +34,6 @@ urlpatterns = [ path('oauth/', include('social_django.urls', namespace='social')), - - path('tinymce/', include('tinymce.urls')), - path('', include('news.urls')), ] diff --git a/news/migrations/0001_initial.py b/news/migrations/0001_initial.py deleted file mode 100644 index 8d2a6fa..0000000 --- a/news/migrations/0001_initial.py +++ /dev/null @@ -1,27 +0,0 @@ -# Generated by Django 3.1 on 2020-08-15 09:24 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.CreateModel( - name='Article', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('content', models.TextField()), - ('date_published', models.DateTimeField(auto_now_add=True)), - ('likes', models.IntegerField(default=0)), - ('author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - ] diff --git a/news/migrations/0002_article_header.py b/news/migrations/0002_article_header.py deleted file mode 100644 index 5f21651..0000000 --- a/news/migrations/0002_article_header.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.1 on 2020-08-15 14:49 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('news', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='article', - name='header', - field=models.ImageField(default='default.jpg', upload_to='article-headers'), - ), - ] diff --git a/news/migrations/0003_auto_20200815_1130.py b/news/migrations/0003_auto_20200815_1130.py deleted file mode 100644 index 607f7f1..0000000 --- a/news/migrations/0003_auto_20200815_1130.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 3.1 on 2020-08-15 15:30 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('news', '0002_article_header'), - ] - - operations = [ - migrations.AddField( - model_name='article', - name='header_caption', - field=models.TextField(default=''), - ), - migrations.AlterField( - model_name='article', - name='header', - field=models.ImageField(default='default-header.jpg', upload_to='article-headers'), - ), - ] diff --git a/news/migrations/0004_article_headline.py b/news/migrations/0004_article_headline.py deleted file mode 100644 index aaaf849..0000000 --- a/news/migrations/0004_article_headline.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 3.1 on 2020-08-15 15:33 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('news', '0003_auto_20200815_1130'), - ] - - operations = [ - migrations.AddField( - model_name='article', - name='headline', - field=models.TextField(default='Headline'), - preserve_default=False, - ), - ] diff --git a/news/migrations/0005_auto_20200815_1303.py b/news/migrations/0005_auto_20200815_1303.py deleted file mode 100644 index 1c6b5aa..0000000 --- a/news/migrations/0005_auto_20200815_1303.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 3.1 on 2020-08-15 17:03 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('news', '0004_article_headline'), - ] - - operations = [ - migrations.AlterField( - model_name='article', - name='header_caption', - field=models.CharField(default='', max_length=100), - ), - migrations.AlterField( - model_name='article', - name='headline', - field=models.CharField(max_length=100), - ), - ] diff --git a/news/migrations/0006_article_tag.py b/news/migrations/0006_article_tag.py deleted file mode 100644 index c062a35..0000000 --- a/news/migrations/0006_article_tag.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.1 on 2020-08-15 23:07 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('news', '0005_auto_20200815_1303'), - ] - - operations = [ - migrations.AddField( - model_name='article', - name='tag', - field=models.CharField(choices=[('authoritarian_left', 'Authoritarian Left'), ('authoritarian_right', 'Authoritarian Right'), ('libertarian_left', 'Libertarian Left'), ('libertarian_right', 'Libertarian Right')], default='authoritarian_left', max_length=19), - ), - ] diff --git a/news/migrations/0007_auto_20200815_2100.py b/news/migrations/0007_auto_20200815_2100.py deleted file mode 100644 index 452da13..0000000 --- a/news/migrations/0007_auto_20200815_2100.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 3.1 on 2020-08-16 01:00 - -from django.db import migrations -import tinymce.models - - -class Migration(migrations.Migration): - - dependencies = [ - ('news', '0006_article_tag'), - ] - - operations = [ - migrations.AlterField( - model_name='article', - name='content', - field=tinymce.models.HTMLField(), - ), - ] diff --git a/news/migrations/__init__.py b/news/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/news/models.py b/news/models.py index fd24126..e14bb31 100644 --- a/news/models.py +++ b/news/models.py @@ -6,7 +6,7 @@ from django.urls import reverse from PIL import Image -from tinymce.models import HTMLField +from ckeditor.fields import RichTextField # Create your models here. @@ -24,7 +24,8 @@ class Article(models.Model): ] headline = models.CharField(max_length=100) - content = HTMLField() + # content = TextField() + content = RichTextField(blank=True, null=True) date_published = models.DateTimeField(auto_now_add=True) author = models.ForeignKey(User, on_delete=models.CASCADE) likes = models.IntegerField(default=0) diff --git a/news/templates/news/article_confirm_delete.html b/news/templates/news/article_confirm_delete.html index 7bfb69b..7b209b4 100644 --- a/news/templates/news/article_confirm_delete.html +++ b/news/templates/news/article_confirm_delete.html @@ -13,7 +13,7 @@ {{ object.author.get_full_name }} @{{ object.author }} · {{ object.date_published }} -

{{ article.content }}

+

{{ article.content|safe }}

diff --git a/news/templates/news/article_detail.html b/news/templates/news/article_detail.html index 425190f..9d2fd36 100644 --- a/news/templates/news/article_detail.html +++ b/news/templates/news/article_detail.html @@ -16,7 +16,7 @@ -

{{ article.content }}

+

{{ article.content|safe }}

{% endblock content %} diff --git a/news/templates/news/article_form.html b/news/templates/news/article_form.html index 41f5398..78e2892 100644 --- a/news/templates/news/article_form.html +++ b/news/templates/news/article_form.html @@ -5,6 +5,8 @@
{% csrf_token %}
+ + {{ form.media }} {{ form | crispy}}
diff --git a/news/templates/news/user_article.html b/news/templates/news/user_article.html index a279c41..0973366 100644 --- a/news/templates/news/user_article.html +++ b/news/templates/news/user_article.html @@ -9,7 +9,7 @@ {{ article.author.get_full_name }} @{{ article.author }} · {{ article.date_published }}
-

{{ article.content }}

+

{{ article.content|safe }}

{% endfor %} diff --git a/users/migrations/0010_auto_20200815_2353.py b/users/migrations/0010_auto_20200815_2353.py new file mode 100644 index 0000000..b22458f --- /dev/null +++ b/users/migrations/0010_auto_20200815_2353.py @@ -0,0 +1,23 @@ +# Generated by Django 3.1 on 2020-08-16 03:53 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('users', '0009_auto_20200815_2308'), + ] + + operations = [ + migrations.AlterField( + model_name='profile', + name='economicScore', + field=models.IntegerField(blank=True, default=True), + ), + migrations.AlterField( + model_name='profile', + name='socialScore', + field=models.IntegerField(blank=True, default=True), + ), + ] diff --git a/users/templates/users/login.html b/users/templates/users/login.html index 87a0338..9148a8c 100644 --- a/users/templates/users/login.html +++ b/users/templates/users/login.html @@ -23,7 +23,7 @@
- + Sign in with Google @@ -35,7 +35,7 @@ Sign in with Facebook - +
{% endblock content %}