From 350bfc1c505d28f40adf15c423986c8616f3ddd2 Mon Sep 17 00:00:00 2001 From: DerTyp187 Date: Mon, 22 Nov 2021 19:33:36 +0100 Subject: [PATCH] removed taggit --- TealCode/TealCode/settings.py | 1 - TealCode/analytics/migrations/0001_initial.py | 10 ++++--- .../migrations/0002_remove_view_category.py | 17 ----------- .../migrations/0003_auto_20211118_0824.py | 30 ------------------- .../migrations/0004_auto_20211118_0826.py | 25 ---------------- .../migrations/0005_auto_20211118_0827.py | 25 ---------------- .../analytics/migrations/0006_view_home.py | 18 ----------- TealCode/main/migrations/0001_initial.py | 29 ++++++++++++++++-- .../migrations/0002_auto_20211110_0912.py | 30 ------------------- .../main/migrations/0003_topic_version.py | 18 ----------- TealCode/main/migrations/0004_topic_tags.py | 18 ----------- .../migrations/0005_category_display_name.py | 19 ------------ .../migrations/0006_auto_20211112_0855.py | 23 -------------- TealCode/main/migrations/0007_topic_output.py | 19 ------------ .../migrations/0008_alter_topic_output.py | 18 ----------- .../migrations/0009_auto_20211122_0903.py | 30 ------------------- TealCode/main/migrations/0010_topic_tags.py | 20 ------------- TealCode/main/migrations/0011_rating.py | 25 ---------------- .../0012_alter_rating_is_positive.py | 18 ----------- .../0013_alter_rating_is_positive.py | 18 ----------- TealCode/main/models.py | 3 -- TealCode/main/templates/base.html | 4 +-- 22 files changed, 35 insertions(+), 383 deletions(-) delete mode 100644 TealCode/analytics/migrations/0002_remove_view_category.py delete mode 100644 TealCode/analytics/migrations/0003_auto_20211118_0824.py delete mode 100644 TealCode/analytics/migrations/0004_auto_20211118_0826.py delete mode 100644 TealCode/analytics/migrations/0005_auto_20211118_0827.py delete mode 100644 TealCode/analytics/migrations/0006_view_home.py delete mode 100644 TealCode/main/migrations/0002_auto_20211110_0912.py delete mode 100644 TealCode/main/migrations/0003_topic_version.py delete mode 100644 TealCode/main/migrations/0004_topic_tags.py delete mode 100644 TealCode/main/migrations/0005_category_display_name.py delete mode 100644 TealCode/main/migrations/0006_auto_20211112_0855.py delete mode 100644 TealCode/main/migrations/0007_topic_output.py delete mode 100644 TealCode/main/migrations/0008_alter_topic_output.py delete mode 100644 TealCode/main/migrations/0009_auto_20211122_0903.py delete mode 100644 TealCode/main/migrations/0010_topic_tags.py delete mode 100644 TealCode/main/migrations/0011_rating.py delete mode 100644 TealCode/main/migrations/0012_alter_rating_is_positive.py delete mode 100644 TealCode/main/migrations/0013_alter_rating_is_positive.py diff --git a/TealCode/TealCode/settings.py b/TealCode/TealCode/settings.py index 8754e2d..6b45e23 100644 --- a/TealCode/TealCode/settings.py +++ b/TealCode/TealCode/settings.py @@ -42,7 +42,6 @@ INSTALLED_APPS = [ 'django.contrib.staticfiles', 'main.apps.MainConfig', 'analytics.apps.AnalyticsConfig', - 'taggit', ] MIDDLEWARE = [ diff --git a/TealCode/analytics/migrations/0001_initial.py b/TealCode/analytics/migrations/0001_initial.py index 66f2d41..95dc493 100644 --- a/TealCode/analytics/migrations/0001_initial.py +++ b/TealCode/analytics/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.2.9 on 2021-11-17 14:19 +# Generated by Django 3.2.9 on 2021-11-22 18:23 from django.db import migrations, models import django.db.models.deletion @@ -10,7 +10,7 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('main', '0008_alter_topic_output'), + ('main', '0001_initial'), ] operations = [ @@ -20,8 +20,10 @@ class Migration(migrations.Migration): ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('ip', models.CharField(max_length=200)), ('date', models.DateTimeField(default=django.utils.timezone.now)), - ('category', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='main.category')), - ('topic', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='main.topic')), + ('admin', models.BooleanField(default=False)), + ('home', models.BooleanField(default=False)), + ('category', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='main.category')), + ('topic', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='main.topic')), ], ), ] diff --git a/TealCode/analytics/migrations/0002_remove_view_category.py b/TealCode/analytics/migrations/0002_remove_view_category.py deleted file mode 100644 index 10ec19e..0000000 --- a/TealCode/analytics/migrations/0002_remove_view_category.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 3.2.9 on 2021-11-18 07:10 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('analytics', '0001_initial'), - ] - - operations = [ - migrations.RemoveField( - model_name='view', - name='category', - ), - ] diff --git a/TealCode/analytics/migrations/0003_auto_20211118_0824.py b/TealCode/analytics/migrations/0003_auto_20211118_0824.py deleted file mode 100644 index f88bc81..0000000 --- a/TealCode/analytics/migrations/0003_auto_20211118_0824.py +++ /dev/null @@ -1,30 +0,0 @@ -# Generated by Django 3.2.9 on 2021-11-18 07:24 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('main', '0008_alter_topic_output'), - ('analytics', '0002_remove_view_category'), - ] - - operations = [ - migrations.AddField( - model_name='view', - name='admin', - field=models.BooleanField(default=False), - ), - migrations.AddField( - model_name='view', - name='category', - field=models.ForeignKey(blank=True, default=None, on_delete=django.db.models.deletion.CASCADE, to='main.category'), - ), - migrations.AlterField( - model_name='view', - name='topic', - field=models.ForeignKey(blank=True, default=None, on_delete=django.db.models.deletion.CASCADE, to='main.topic'), - ), - ] diff --git a/TealCode/analytics/migrations/0004_auto_20211118_0826.py b/TealCode/analytics/migrations/0004_auto_20211118_0826.py deleted file mode 100644 index 0671363..0000000 --- a/TealCode/analytics/migrations/0004_auto_20211118_0826.py +++ /dev/null @@ -1,25 +0,0 @@ -# Generated by Django 3.2.9 on 2021-11-18 07:26 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('main', '0008_alter_topic_output'), - ('analytics', '0003_auto_20211118_0824'), - ] - - operations = [ - migrations.AlterField( - model_name='view', - name='category', - field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.CASCADE, to='main.category'), - ), - migrations.AlterField( - model_name='view', - name='topic', - field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.CASCADE, to='main.topic'), - ), - ] diff --git a/TealCode/analytics/migrations/0005_auto_20211118_0827.py b/TealCode/analytics/migrations/0005_auto_20211118_0827.py deleted file mode 100644 index 26bdc97..0000000 --- a/TealCode/analytics/migrations/0005_auto_20211118_0827.py +++ /dev/null @@ -1,25 +0,0 @@ -# Generated by Django 3.2.9 on 2021-11-18 07:27 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('main', '0008_alter_topic_output'), - ('analytics', '0004_auto_20211118_0826'), - ] - - operations = [ - migrations.AlterField( - model_name='view', - name='category', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='main.category'), - ), - migrations.AlterField( - model_name='view', - name='topic', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='main.topic'), - ), - ] diff --git a/TealCode/analytics/migrations/0006_view_home.py b/TealCode/analytics/migrations/0006_view_home.py deleted file mode 100644 index 2032c71..0000000 --- a/TealCode/analytics/migrations/0006_view_home.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.2.9 on 2021-11-18 07:33 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('analytics', '0005_auto_20211118_0827'), - ] - - operations = [ - migrations.AddField( - model_name='view', - name='home', - field=models.BooleanField(default=False), - ), - ] diff --git a/TealCode/main/migrations/0001_initial.py b/TealCode/main/migrations/0001_initial.py index 3a863d3..a09312d 100644 --- a/TealCode/main/migrations/0001_initial.py +++ b/TealCode/main/migrations/0001_initial.py @@ -1,6 +1,7 @@ -# Generated by Django 3.2.9 on 2021-11-10 07:58 +# Generated by Django 3.2.9 on 2021-11-22 18:23 from django.db import migrations, models +import django.db.models.deletion import django.utils.timezone @@ -16,8 +17,32 @@ class Migration(migrations.Migration): name='Category', fields=[ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('title', models.CharField(max_length=100)), + ('title', models.CharField(max_length=100, unique=True)), + ('display_name', models.CharField(max_length=100)), ('date_created', models.DateTimeField(default=django.utils.timezone.now)), ], ), + migrations.CreateModel( + name='Topic', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('title', models.CharField(max_length=200)), + ('code_text', models.TextField()), + ('output', models.TextField(blank=True)), + ('date_created', models.DateTimeField(default=django.utils.timezone.now)), + ('version', models.CharField(blank=True, max_length=100)), + ('read_more', models.TextField(blank=True)), + ('category', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='main.category')), + ], + ), + migrations.CreateModel( + name='Rating', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('is_positive', models.BooleanField()), + ('ip', models.CharField(max_length=90)), + ('date_created', models.DateTimeField(default=django.utils.timezone.now)), + ('topic', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='main.topic')), + ], + ), ] diff --git a/TealCode/main/migrations/0002_auto_20211110_0912.py b/TealCode/main/migrations/0002_auto_20211110_0912.py deleted file mode 100644 index 58ca11b..0000000 --- a/TealCode/main/migrations/0002_auto_20211110_0912.py +++ /dev/null @@ -1,30 +0,0 @@ -# Generated by Django 3.2.9 on 2021-11-10 08:12 - -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('main', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='category', - name='title', - field=models.CharField(max_length=100, unique=True), - ), - migrations.CreateModel( - name='Topic', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('title', models.CharField(max_length=200)), - ('code_text', models.TextField()), - ('date_created', models.DateTimeField(default=django.utils.timezone.now)), - ('category', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='main.category')), - ], - ), - ] diff --git a/TealCode/main/migrations/0003_topic_version.py b/TealCode/main/migrations/0003_topic_version.py deleted file mode 100644 index ce031a0..0000000 --- a/TealCode/main/migrations/0003_topic_version.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.2.9 on 2021-11-10 12:07 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('main', '0002_auto_20211110_0912'), - ] - - operations = [ - migrations.AddField( - model_name='topic', - name='version', - field=models.CharField(blank=True, max_length=100), - ), - ] diff --git a/TealCode/main/migrations/0004_topic_tags.py b/TealCode/main/migrations/0004_topic_tags.py deleted file mode 100644 index 7aa142c..0000000 --- a/TealCode/main/migrations/0004_topic_tags.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.2.9 on 2021-11-11 07:15 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('main', '0003_topic_version'), - ] - - operations = [ - migrations.AddField( - model_name='topic', - name='tags', - field=models.CharField(blank=True, max_length=200), - ), - ] diff --git a/TealCode/main/migrations/0005_category_display_name.py b/TealCode/main/migrations/0005_category_display_name.py deleted file mode 100644 index 70fd44e..0000000 --- a/TealCode/main/migrations/0005_category_display_name.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 3.2.9 on 2021-11-12 07:33 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('main', '0004_topic_tags'), - ] - - operations = [ - migrations.AddField( - model_name='category', - name='display_name', - field=models.CharField(default='name', max_length=100), - preserve_default=False, - ), - ] diff --git a/TealCode/main/migrations/0006_auto_20211112_0855.py b/TealCode/main/migrations/0006_auto_20211112_0855.py deleted file mode 100644 index 0a8791d..0000000 --- a/TealCode/main/migrations/0006_auto_20211112_0855.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 3.2.9 on 2021-11-12 07:55 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('main', '0005_category_display_name'), - ] - - operations = [ - migrations.AddField( - model_name='topic', - name='not_useful', - field=models.IntegerField(default=0), - ), - migrations.AddField( - model_name='topic', - name='useful', - field=models.IntegerField(default=0), - ), - ] diff --git a/TealCode/main/migrations/0007_topic_output.py b/TealCode/main/migrations/0007_topic_output.py deleted file mode 100644 index c27b2f9..0000000 --- a/TealCode/main/migrations/0007_topic_output.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 3.2.9 on 2021-11-13 15:29 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('main', '0006_auto_20211112_0855'), - ] - - operations = [ - migrations.AddField( - model_name='topic', - name='output', - field=models.TextField(default='test'), - preserve_default=False, - ), - ] diff --git a/TealCode/main/migrations/0008_alter_topic_output.py b/TealCode/main/migrations/0008_alter_topic_output.py deleted file mode 100644 index c2224f2..0000000 --- a/TealCode/main/migrations/0008_alter_topic_output.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.2.9 on 2021-11-13 15:30 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('main', '0007_topic_output'), - ] - - operations = [ - migrations.AlterField( - model_name='topic', - name='output', - field=models.TextField(blank=True), - ), - ] diff --git a/TealCode/main/migrations/0009_auto_20211122_0903.py b/TealCode/main/migrations/0009_auto_20211122_0903.py deleted file mode 100644 index 30b2d22..0000000 --- a/TealCode/main/migrations/0009_auto_20211122_0903.py +++ /dev/null @@ -1,30 +0,0 @@ -# Generated by Django 3.2.9 on 2021-11-22 08:03 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('main', '0008_alter_topic_output'), - ] - - operations = [ - migrations.RemoveField( - model_name='topic', - name='not_useful', - ), - migrations.RemoveField( - model_name='topic', - name='tags', - ), - migrations.RemoveField( - model_name='topic', - name='useful', - ), - migrations.AddField( - model_name='topic', - name='read_more', - field=models.TextField(blank=True), - ), - ] diff --git a/TealCode/main/migrations/0010_topic_tags.py b/TealCode/main/migrations/0010_topic_tags.py deleted file mode 100644 index 42ba376..0000000 --- a/TealCode/main/migrations/0010_topic_tags.py +++ /dev/null @@ -1,20 +0,0 @@ -# Generated by Django 3.2.9 on 2021-11-22 09:59 - -from django.db import migrations -import taggit.managers - - -class Migration(migrations.Migration): - - dependencies = [ - ('taggit', '0003_taggeditem_add_unique_index'), - ('main', '0009_auto_20211122_0903'), - ] - - operations = [ - migrations.AddField( - model_name='topic', - name='tags', - field=taggit.managers.TaggableManager(help_text='A comma-separated list of tags.', through='taggit.TaggedItem', to='taggit.Tag', verbose_name='Tags'), - ), - ] diff --git a/TealCode/main/migrations/0011_rating.py b/TealCode/main/migrations/0011_rating.py deleted file mode 100644 index d40972e..0000000 --- a/TealCode/main/migrations/0011_rating.py +++ /dev/null @@ -1,25 +0,0 @@ -# Generated by Django 3.2.9 on 2021-11-22 10:47 - -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('main', '0010_topic_tags'), - ] - - operations = [ - migrations.CreateModel( - name='Rating', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('is_positive', models.BooleanField()), - ('ip', models.CharField(max_length=90)), - ('date_created', models.DateTimeField(default=django.utils.timezone.now)), - ('topic', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='main.topic')), - ], - ), - ] diff --git a/TealCode/main/migrations/0012_alter_rating_is_positive.py b/TealCode/main/migrations/0012_alter_rating_is_positive.py deleted file mode 100644 index 0577756..0000000 --- a/TealCode/main/migrations/0012_alter_rating_is_positive.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.2.9 on 2021-11-22 12:30 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('main', '0011_rating'), - ] - - operations = [ - migrations.AlterField( - model_name='rating', - name='is_positive', - field=models.IntegerField(), - ), - ] diff --git a/TealCode/main/migrations/0013_alter_rating_is_positive.py b/TealCode/main/migrations/0013_alter_rating_is_positive.py deleted file mode 100644 index cdf6d68..0000000 --- a/TealCode/main/migrations/0013_alter_rating_is_positive.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.2.9 on 2021-11-22 12:30 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('main', '0012_alter_rating_is_positive'), - ] - - operations = [ - migrations.AlterField( - model_name='rating', - name='is_positive', - field=models.BooleanField(), - ), - ] diff --git a/TealCode/main/models.py b/TealCode/main/models.py index 77fc5b7..e6904ca 100644 --- a/TealCode/main/models.py +++ b/TealCode/main/models.py @@ -1,7 +1,5 @@ from django.db import models -from django.db.models.fields.related import ForeignKey from django.utils import timezone -from taggit.managers import TaggableManager class Category(models.Model): title = models.CharField(max_length=100, unique=True) @@ -20,7 +18,6 @@ class Topic(models.Model): category = models.ForeignKey(Category, on_delete=models.CASCADE) version = models.CharField(max_length=100, blank=True) read_more = models.TextField(blank=True) - tags = TaggableManager() def __str__(self): return self.category.title + " - " + self.title diff --git a/TealCode/main/templates/base.html b/TealCode/main/templates/base.html index b95a0a1..7f78ed7 100644 --- a/TealCode/main/templates/base.html +++ b/TealCode/main/templates/base.html @@ -68,10 +68,10 @@
  • C#
  • C++
    • - +