Ads.txt is now configurable

nilandev · nilandev · commit 172e08dd76f1 · 2023-10-22T22:13:33.000+01:00
diff --git a/.env.example b/.env.example
@@ -41,4 +41,8 @@ EMAIL_PORT=587
 EMAIL_HOST_USER=
 EMAIL_HOST_PASSWORD=
 EMAIL_USE_TLS=True
-DEFAULT_FROM_EMAIL=
+DEFAULT_FROM_EMAIL=
+
+
+#ads.txt file content
+MY_ADS_TXT_CONTENT=
diff --git a/bloggy/.DS_Store b/bloggy/.DS_Store
diff --git a/bloggy/forms/edit_profile_form.py b/bloggy/forms/edit_profile_form.py
@@ -22,14 +22,42 @@ class Meta:
         ]
 
         widgets = {
-            'profile_photo': NonClearableFileInput(attrs={'class': 'form-control-file'}),
-            'name': forms.TextInput(
-                attrs={'class': 'form-control', 'rows': 5, 'placeholder': 'Enter first name'}),
-            'bio': forms.Textarea(attrs={'class': 'form-control', 'rows': 3, 'placeholder': "About you"}),
-            'website': forms.TextInput(attrs={'class': 'form-control', 'rows': 5, 'placeholder': 'Your website'}),
-            'twitter': forms.TextInput(attrs={'class': 'form-control', 'rows': 5, 'placeholder': 'Your twitter'}),
-            'linkedin': forms.TextInput(attrs={'class': 'form-control', 'rows': 5, 'placeholder': 'Your linkedin'}),
-            'youtube': forms.TextInput(
-                attrs={'class': 'form-control', 'rows': 5, 'placeholder': 'Your youtube channel link'}),
-            'github': forms.TextInput(attrs={'class': 'form-control', 'rows': 5, 'placeholder': 'Your github'}),
+            'profile_photo': NonClearableFileInput(attrs={
+                'class': 'form-control-file'
+            }),
+            'name': forms.TextInput(attrs={
+                'class': 'form-control',
+                'rows': 5,
+                'placeholder': 'Enter first name'
+            }),
+            'bio': forms.Textarea(attrs={
+                'class': 'form-control',
+                'rows': 3,
+                'placeholder': "About you"
+            }),
+            'website': forms.TextInput(attrs={
+                'class': 'form-control',
+                'rows': 5,
+                'placeholder': 'Your website'
+            }),
+            'twitter': forms.TextInput(attrs={
+                'class': 'form-control',
+                'rows': 5,
+                'placeholder': 'Your twitter'
+            }),
+            'linkedin': forms.TextInput(attrs={
+                'class': 'form-control',
+                'rows': 5,
+                'placeholder': 'Your linkedin'
+            }),
+            'youtube': forms.TextInput(attrs={
+                'class': 'form-control',
+                'rows': 5,
+                'placeholder': 'Your youtube channel link'
+            }),
+            'github': forms.TextInput(attrs={
+                'class': 'form-control',
+                'rows': 5,
+                'placeholder': 'Your github'
+            }),
         }
diff --git a/bloggy/settings.py b/bloggy/settings.py
@@ -317,7 +317,6 @@
         }
     }
 
-
 # Django HitCount
 HITCOUNT_KEEP_HIT_ACTIVE = {'days': 0}
 HITCOUNT_KEEP_HIT_IN_DATABASE = {'days': 77}
@@ -329,7 +328,7 @@
 # SEO related
 PING_INDEX_NOW_POST_UPDATE = os.getenv("PING_INDEX_NOW_POST_UPDATE", True)
 PING_GOOGLE_POST_UPDATE = os.getenv("PING_GOOGLE_POST_UPDATE", True)
-INDEX_NOW_API_KEY = os.getenv("INDEX_NOW_API_KEY",)
+INDEX_NOW_API_KEY = os.getenv("INDEX_NOW_API_KEY", )
 
 # Email configs
 EMAIL_BACKEND = os.getenv('EMAIL_BACKEND')
@@ -340,3 +339,6 @@
 EMAIL_USE_TLS = os.getenv('EMAIL_USE_TLS', True)
 DEFAULT_FROM_EMAIL = os.getenv('DEFAULT_FROM_EMAIL')
 EMAIL_FILE_PATH = os.getenv('EMAIL_FILE_PATH', os.path.join(BASE_DIR, 'test-emails'))
+
+# ads.txt file content
+MY_ADS_TXT_CONTENT = os.getenv('MY_ADS_TXT_CONTENT')
diff --git a/bloggy/storage_backends.py b/bloggy/storage_backends.py
@@ -11,10 +11,6 @@ class PublicMediaStorage(S3Boto3Storage):
     location = 'media'
     default_acl = 'public-read'
     file_overwrite = False
-    # security_token = None
-
-    # def _get_security_token(self):
-    #     return None
 
 
 class PrivateMediaStorage(S3Boto3Storage):
diff --git a/bloggy/templates/ads.txt b/bloggy/templates/ads.txt
diff --git a/bloggy/templates/thumbnail/template.html b/bloggy/templates/thumbnail/template.html
diff --git a/bloggy/urls.py b/bloggy/urls.py
@@ -32,6 +32,7 @@
 from .views.account import AccountActivationView
 from .views.article_views import ArticleListView, ArticleDetailsView
 from .views.login import MyLoginView
+from .views.misc_views import AdsTextView
 from .views.old_blog_redirect_view import AuthorRedirectView
 from .views.old_blog_redirect_view import OldCategoryDetailsRedirectView
 from .views.old_blog_redirect_view import OldTagArchiveRedirectView
@@ -66,29 +67,32 @@
     path('authors', AuthorsListView.as_view(), name="authors"),
     path('user/<str:username>', PublicProfileView.as_view(), name="user_profile"),
 
-    # path('profile', login_required(MyProfileView.as_view()), name="profile.view"),
     path('edit-profile', login_required(EditProfileView.as_view()), name="profile.edit_profile"),
     path('dashboard', login_required(MyProfileView.as_view()), name="profile.dashboard"),
     path('bookmarks', login_required(UserBookmarksView.as_view()), name="profile.bookmarks"),
 
     path('privacy', TemplateView.as_view(template_name="pages/static/privacy-policy.html"), name='pages.privacy'),
-    path('code-of-conduct', TemplateView.as_view(template_name="pages/static/code_of_conduct.html"), name='pages.code_of_conduct'),
+    path('code-of-conduct', TemplateView.as_view(template_name="pages/static/code_of_conduct.html"),
+         name='pages.code_of_conduct'),
     path('contribute', TemplateView.as_view(template_name="pages/static/contribute.html"), name='pages.contribute'),
     path('about', AboutPageView.as_view(), name='pages.about'),
     path('contact', TemplateView.as_view(template_name="pages/static/contact.html"), name='pages.contact'),
-    path('terms-of-service', TemplateView.as_view(template_name="pages/static/terms-of-service.html"), name='pages.terms_of_service'),
-    path('cookie-policy', TemplateView.as_view(template_name="pages/static/cookie-policy.html"), name='pages.cookie_policy'),
+    path('terms-of-service', TemplateView.as_view(template_name="pages/static/terms-of-service.html"),
+         name='pages.terms_of_service'),
+    path('cookie-policy', TemplateView.as_view(template_name="pages/static/cookie-policy.html"),
+         name='pages.cookie_policy'),
 
     path("rss/articles", ArticlesRssFeed(), name="articles_feed"),
     path("rss/courses", CoursesRssFeed(), name="courses_feed"),
     path('sitemap.xml', index, {'sitemaps': sitemaps_list}, name='django.contrib.sitemaps.views.index'),
-    path('sitemap/<str:section>.xml', sitemap, {'sitemaps': sitemaps_list}, name='django.contrib.sitemaps.views.sitemap'),
+    path('sitemap/<str:section>.xml', sitemap, {'sitemaps': sitemaps_list},
+         name='django.contrib.sitemaps.views.sitemap'),
 
     # static files for SEO or other reasons
     path('robots.txt', TemplateView.as_view(template_name="robots.txt", content_type="text/plain")),
-    path('ads.txt', TemplateView.as_view(template_name="ads.txt", content_type="text/plain")),
+    path('ads.txt', AdsTextView.as_view(), name='ads_txt'),
     path('220764bdee4b4ff297c588217aaaafa3.txt',
-         TemplateView.as_view(template_name="220764dee4b4ff297c588217aaaafa3.txt", content_type="text/plain")),
+         TemplateView.as_view(template_name="220764bdee4b4ff297c588217aaaafa3.txt", content_type="text/plain")),
 
     # redirects for old website migration
     path('author/<str:user>', AuthorRedirectView.as_view()),
diff --git a/bloggy/utils/http_utils.py b/bloggy/utils/http_utils.py
diff --git a/bloggy/views/home.py b/bloggy/views/home.py
@@ -23,21 +23,6 @@ def get_context_data(self, **kwargs):
         return context
 
 
-class GuestBookView(TemplateView):
-    template_name = "pages/static/guestbook.html"
-
-    def get_context_data(self, **kwargs):
-        context = super(GuestBookView, self).get_context_data(**kwargs)
-
-        try:
-            data = HttpUtils.read_file("/static/json/twitter-testimonials.json")
-            context['data'] = data['testimonials']
-        except Exception as e:
-            print(e)
-
-        return context
-
-
 class AboutPageView(TemplateView):
     template_name = "pages/static/about.html"
 
diff --git a/bloggy/views/misc_views.py b/bloggy/views/misc_views.py
@@ -0,0 +1,8 @@
+from django.conf import settings
+from django.http import HttpResponse
+from django.views.generic import View
+
+
+class AdsTextView(View):
+    def get(self, request, *args, **kwargs):
+        return HttpResponse(settings.MY_ADS_TXT_CONTENT, content_type='text/plain')
diff --git a/bloggy/views/search_view.py b/bloggy/views/search_view.py
@@ -22,19 +22,9 @@ def get_context_data(self, **kwargs):
                 Article.objects.filter(title__icontains=search_query, excerpt__icontains=search_query, publish_status="LIVE"),
             )
 
-            # paginator = Paginator(results, self.paginate_by)
-            # page = self.request.GET.get('page')
-            # try:
-            #     results = paginator.page(page)
-            # except PageNotAnInteger:
-            #     results = paginator.page(1)
-            # except EmptyPage:
-            #     results = paginator.page(paginator.num_pages)
-
             context['articles'] = results
             context['categories'] = categories
             context['search_query'] = search_query
-
             context['seo_title'] = "Search result for {}".format(search_query)
             context['seo_description'] = "Search courses, tutorials, topics and quizzes on stacktips.com"
 
diff --git a/bloggy/views/user.py b/bloggy/views/user.py
@@ -105,36 +105,6 @@ def get_context_data(self, *args, **kwargs):
         context['seo_title'] = "My Profile"
         context['seo_description'] = "My profile. Access your profile, account settings My Profile. You need a StackTips account to sign in and view your profile."
         if user.profile_photo:
-            context['seo_image'] = "https://media.stacktips.com/static/media/logo.png"
+            context['seo_image'] = settings.SITE_LOGO
 
         return context
-
-# def add_follow(self, request):
-#     user = self.get_object()
-#     user.profile.followed_by.add(request.user.profile)
-# def get_context_data(self, *args, **kwargs):
-#     # //username = self.kwargs.get("username")
-#
-#
-#     # user = User.all().fi
-#
-#     profile = get_object_or_404(Profile, user_id=self.request.user.id)
-#     print(profile)
-#     context['profile'] = profile
-#     return context
-#
-# # def get_context_data(self, *args, **kwargs):
-# #     context = super(Profile, self).get_context_data(*args, **kwargs)
-# #     user = self.get_object()
-# #     context.update({
-# #         'startups': user.startups.all()  # .filter(created_date__lte=timezone.now()).order_by(' -created_date')
-# #     })
-# #     return context
-#
-# # def get_context_data(self, request, **kwargs):
-# #     user_form = UserForm(request.user)
-# #     profile_form = ProfileForm(request.user.profile)
-# #     context['user'] = request.user
-# #     context['user_form'] = user_form
-# #     context['profile_form'] = profile_form
-# #     return context
diff --git a/bloggy/views/user_collections.py b/bloggy/views/user_collections.py
@@ -4,21 +4,6 @@
 from bloggy.models import MyUser, Article
 
 
-# class UserDashboardView(TemplateView):
-#     template_name = "profile/user_dashboard.html"
-#
-#     def get_context_data(self, *args, **kwargs):
-#         context = super(UserDashboardView, self).get_context_data(*args, **kwargs)
-#         username = self.request.user.username
-#         user = get_object_or_404(MyUser, username=username)
-#         context.update({
-#             'articles': Article.objects.filter(author_id=user.id).order_by("-published_date").all(),
-#             'userProfile': user,
-#             'userType': "self",
-#         })
-#         return context
-
-
 class UserBookmarksView(TemplateView):
     template_name = "profile/user_bookmarks.html"
 
diff --git a/bloggy_api/serializers.py b/bloggy_api/serializers.py
@@ -114,15 +114,12 @@ class Meta:
         fields = [
             'id',
             'title',
-            # 'quizquestion_set',
             'excerpt',
             'content',
             'duration',
             'difficulty',
             'is_featured',
             'post_type',
-            # 'thumbnail',
-            # 'category',
             'display_order',
             'updated_date',
             'published_date',
diff --git a/bloggy_api/service/recaptcha.py b/bloggy_api/service/recaptcha.py
@@ -3,10 +3,10 @@
 from bloggy import settings
 
 
-def recaptcha_verify(recaptchaResponse):
+def recaptcha_verify(recaptcha_response):
     data = {
         'secret': settings.GOOGLE_RECAPTHCA_SECRET_KEY,
-        'response': recaptchaResponse
+        'response': recaptcha_response
     }
 
     req = request.Request(settings.GOOGLE_RECAPTHCA_TOKEN_VERIFY_URL, data=data)
diff --git a/bloggy_api/tests.py b/bloggy_api/tests.py
diff --git a/bloggy_api/views/bookmark_api.py b/bloggy_api/views/bookmark_api.py
@@ -55,9 +55,7 @@ def post(self, request):
 
         return HttpResponse(
             json.dumps({
-                # "result": created,
                 "userBookmarkCount": Bookmarks.objects.filter(user=user, post_id=post_id, post_type=post_type).count(),
-                # "totalBookmarks": self.model.objects.filter(post_id=post_id, post_type=post_type).count()
             }),
 
             content_type="application/json"
