From 073c79bad5bccc3b549414719f22256bfce2202f Mon Sep 17 00:00:00 2001 From: DerTyp187 Date: Tue, 23 Nov 2021 18:59:31 +0100 Subject: [PATCH] g --- TealCode/TealCode/settings.py | 2 -- TealCode/TealCode/urls.py | 1 - TealCode/analytics/__init__.py | 0 TealCode/analytics/admin.py | 5 --- TealCode/analytics/apps.py | 6 ---- TealCode/analytics/migrations/0001_initial.py | 29 --------------- .../migrations/0002_auto_20211123_1415.py | 31 ---------------- .../migrations/0003_auto_20211123_1420.py | 23 ------------ TealCode/analytics/migrations/__init__.py | 0 TealCode/analytics/models.py | 35 ------------------- .../analytics/templates/analytics/index.html | 5 --- TealCode/analytics/tests.py | 3 -- TealCode/analytics/urls.py | 6 ---- TealCode/analytics/views.py | 6 ---- TealCode/main/migrations/0001_initial.py | 2 +- TealCode/main/templates/base.html | 11 ++---- TealCode/main/views.py | 14 +------- 17 files changed, 5 insertions(+), 174 deletions(-) delete mode 100644 TealCode/analytics/__init__.py delete mode 100644 TealCode/analytics/admin.py delete mode 100644 TealCode/analytics/apps.py delete mode 100644 TealCode/analytics/migrations/0001_initial.py delete mode 100644 TealCode/analytics/migrations/0002_auto_20211123_1415.py delete mode 100644 TealCode/analytics/migrations/0003_auto_20211123_1420.py delete mode 100644 TealCode/analytics/migrations/__init__.py delete mode 100644 TealCode/analytics/models.py delete mode 100644 TealCode/analytics/templates/analytics/index.html delete mode 100644 TealCode/analytics/tests.py delete mode 100644 TealCode/analytics/urls.py delete mode 100644 TealCode/analytics/views.py diff --git a/TealCode/TealCode/settings.py b/TealCode/TealCode/settings.py index ec8793c..cb59c68 100644 --- a/TealCode/TealCode/settings.py +++ b/TealCode/TealCode/settings.py @@ -41,8 +41,6 @@ INSTALLED_APPS = [ 'django.contrib.messages', 'django.contrib.staticfiles', 'main.apps.MainConfig', - 'analytics.apps.AnalyticsConfig', - 'ipware', ] MIDDLEWARE = [ diff --git a/TealCode/TealCode/urls.py b/TealCode/TealCode/urls.py index 1f36fb8..f0e7848 100644 --- a/TealCode/TealCode/urls.py +++ b/TealCode/TealCode/urls.py @@ -19,7 +19,6 @@ from django.views.generic.base import TemplateView urlpatterns = [ path('', include('main.urls')), - path('analytics/', include('analytics.urls')), path("robots.txt", TemplateView.as_view(template_name="robots.txt", content_type="text/plain")), path('AD/SDGFOLKJASDNVASDFASDFSLAKDF/', admin.site.urls), ] diff --git a/TealCode/analytics/__init__.py b/TealCode/analytics/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/TealCode/analytics/admin.py b/TealCode/analytics/admin.py deleted file mode 100644 index 4cd3091..0000000 --- a/TealCode/analytics/admin.py +++ /dev/null @@ -1,5 +0,0 @@ -from django.contrib import admin - -from analytics.models import View - -admin.site.register(View) \ No newline at end of file diff --git a/TealCode/analytics/apps.py b/TealCode/analytics/apps.py deleted file mode 100644 index 258d4dd..0000000 --- a/TealCode/analytics/apps.py +++ /dev/null @@ -1,6 +0,0 @@ -from django.apps import AppConfig - - -class AnalyticsConfig(AppConfig): - default_auto_field = 'django.db.models.BigAutoField' - name = 'analytics' diff --git a/TealCode/analytics/migrations/0001_initial.py b/TealCode/analytics/migrations/0001_initial.py deleted file mode 100644 index 95dc493..0000000 --- a/TealCode/analytics/migrations/0001_initial.py +++ /dev/null @@ -1,29 +0,0 @@ -# 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 - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('main', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='View', - fields=[ - ('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)), - ('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_auto_20211123_1415.py b/TealCode/analytics/migrations/0002_auto_20211123_1415.py deleted file mode 100644 index 348d253..0000000 --- a/TealCode/analytics/migrations/0002_auto_20211123_1415.py +++ /dev/null @@ -1,31 +0,0 @@ -# Generated by Django 3.2.9 on 2021-11-23 13:15 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('analytics', '0001_initial'), - ] - - operations = [ - migrations.RemoveField( - model_name='view', - name='admin', - ), - migrations.RemoveField( - model_name='view', - name='home', - ), - migrations.AddField( - model_name='view', - name='country', - field=models.CharField(blank=True, max_length=250), - ), - migrations.AddField( - model_name='view', - name='custom_title', - field=models.CharField(blank=True, max_length=250), - ), - ] diff --git a/TealCode/analytics/migrations/0003_auto_20211123_1420.py b/TealCode/analytics/migrations/0003_auto_20211123_1420.py deleted file mode 100644 index 59bdba7..0000000 --- a/TealCode/analytics/migrations/0003_auto_20211123_1420.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 3.2.9 on 2021-11-23 13:20 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('analytics', '0002_auto_20211123_1415'), - ] - - operations = [ - migrations.AddField( - model_name='view', - name='city', - field=models.CharField(blank=True, max_length=250), - ), - migrations.AddField( - model_name='view', - name='state', - field=models.CharField(blank=True, max_length=250), - ), - ] diff --git a/TealCode/analytics/migrations/__init__.py b/TealCode/analytics/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/TealCode/analytics/models.py b/TealCode/analytics/models.py deleted file mode 100644 index 859d184..0000000 --- a/TealCode/analytics/models.py +++ /dev/null @@ -1,35 +0,0 @@ -from django.db import models -from django.utils import timezone -from main.models import Topic, Category - - - -class View(models.Model): - ip = models.CharField(max_length=200) - date = models.DateTimeField(default=timezone.now) - country = models.CharField(max_length=250, blank=True) - state = models.CharField(max_length=250, blank=True) - city = models.CharField(max_length=250, blank=True) - topic = models.ForeignKey(Topic, on_delete=models.CASCADE, blank=True, null=True) - category = models.ForeignKey(Category, on_delete=models.CASCADE, blank=True, null=True) - custom_title = models.CharField(max_length=250, blank=True) - - - - def __str__(self): - a = self.ip - - if self.country: - a = a + " - " + self.country - - if self.topic: - a = a + " - " + self.topic.title - - if self.category: - a = a + " - " + self.category.title - - if self.custom_title: - a = a + " - " + self.custom_title - - a = a + " - " + str(self.date.day) + "." + str(self.date.month) + "." + str(self.date.year) - return a diff --git a/TealCode/analytics/templates/analytics/index.html b/TealCode/analytics/templates/analytics/index.html deleted file mode 100644 index 8373d2a..0000000 --- a/TealCode/analytics/templates/analytics/index.html +++ /dev/null @@ -1,5 +0,0 @@ -{% extends "base.html" %} -{% block content %} -

Analytics

- -{% endblock content %} \ No newline at end of file diff --git a/TealCode/analytics/tests.py b/TealCode/analytics/tests.py deleted file mode 100644 index 7ce503c..0000000 --- a/TealCode/analytics/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/TealCode/analytics/urls.py b/TealCode/analytics/urls.py deleted file mode 100644 index 64abca1..0000000 --- a/TealCode/analytics/urls.py +++ /dev/null @@ -1,6 +0,0 @@ -from django.urls import path -from . import views - -urlpatterns = [ - path('', views.index, name="analytics-index"), -] diff --git a/TealCode/analytics/views.py b/TealCode/analytics/views.py deleted file mode 100644 index 69c4b4b..0000000 --- a/TealCode/analytics/views.py +++ /dev/null @@ -1,6 +0,0 @@ -from django.shortcuts import render -from django.contrib.auth.decorators import login_required - -@login_required -def index(req): - return render(req, 'analytics/index.html') \ No newline at end of file diff --git a/TealCode/main/migrations/0001_initial.py b/TealCode/main/migrations/0001_initial.py index a09312d..b962df3 100644 --- a/TealCode/main/migrations/0001_initial.py +++ b/TealCode/main/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.2.9 on 2021-11-22 18:23 +# Generated by Django 3.2.9 on 2021-11-23 17:55 from django.db import migrations, models import django.db.models.deletion diff --git a/TealCode/main/templates/base.html b/TealCode/main/templates/base.html index a03a5c7..2b84599 100644 --- a/TealCode/main/templates/base.html +++ b/TealCode/main/templates/base.html @@ -4,14 +4,9 @@ - + + @@ -38,7 +33,7 @@ {% endif %} - +
diff --git a/TealCode/main/views.py b/TealCode/main/views.py index 9203396..14d14e1 100644 --- a/TealCode/main/views.py +++ b/TealCode/main/views.py @@ -1,11 +1,8 @@ -from django.http.response import HttpResponse, HttpResponseForbidden +from django.http.response import HttpResponse from django.shortcuts import render, redirect from .models import Category, Topic, Rating -from analytics.models import View def index(req): - view = View(ip=get_ip(req), custom_title="index") - view.save() categorys_obj = Category.objects.all() return render(req, "main/index.html", {'categorys': categorys_obj}) @@ -40,10 +37,6 @@ def topic(req, category, topic): 'notHelpful_count': notHelpful_count, 'read_more': topic_obj.read_more, } - - - view = View(ip=get_ip(req), topic=topic_obj) - view.save() return render(req, "main/topic.html", context) return redirect("main-index") @@ -57,9 +50,6 @@ def category(req, category): if category_obj: topics_obj = Topic.objects.filter(category=category_obj) - view = View(ip=get_ip(req), category=category_obj) - view.save() - context = { 'category_obj': category_obj, 'topics': topics_obj, @@ -83,8 +73,6 @@ def search(req, value): # https://django-taggit.readthedocs.io/en/latest/getting def sitemap(req): topics = Topic.objects.all() categories = Category.objects.all() - #REPLACE ALL BLANKS WITH %20 - context = { 'topics': topics,