fix conflict

Author: diwash007

.gitignore

@@ -2,7 +2,8 @@
 # $GIT_DIR/info/exclude or the core.excludesFile configuration variable as
 # described in https://git-scm.com/docs/gitignore
 settings_local.py
-credentials.json
+Pipfile
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
@@ -21,5 +22,5 @@ logs/*
 .vscode
 
 # Google Calendar creds
-scripts/credentials.json
-google_api_token.pickle
+credentials.json
+token.json

aldryn_newsblog/views.py

@@ -243,13 +243,16 @@ def get_queryset(self):
         qs = super(ArticleList, self).get_queryset()
         # exclude featured articles from queryset, to allow featured article
         # plugin on the list view page without duplicate entries in page qs.
-        exclude_count = self.config.exclude_featured
-        if exclude_count:
-            featured_qs = Article.objects.all().filter(is_featured=True)
-            if not self.edit_mode:
-                featured_qs = featured_qs.published()
-            exclude_featured = featured_qs[:exclude_count].values_list('pk')
-            qs = qs.exclude(pk__in=exclude_featured)
+        try:
+            exclude_count = self.config.exclude_featured
+            if exclude_count:
+                featured_qs = Article.objects.all().filter(is_featured=True)
+                if not self.edit_mode:
+                    featured_qs = featured_qs.published()
+                exclude_featured = featured_qs[:exclude_count].values_list('pk')
+                qs = qs.exclude(pk__in=exclude_featured)
+        except Exception:
+            pass
         return qs
 
 

blogs_list/feeds.py

@@ -146,7 +146,7 @@ def get_object(self, request):
             articles = list(articles_all[start_index:end_index])
             return articles
         else:
-            raise ObjectDoesNotExist
+            return []
 
     def feed_extra_kwargs(self, obj):
         return {

docs/README.md

@@ -36,6 +36,16 @@ Default student users are `student-1`, `student-2`, `student-3` and `student-4`
 ## Contributing
 Pull requests are welcome. For major changes, please open an issue first to discuss what you would like to change.
 
+## Google OAuth
+- Go to https://console.cloud.google.com/ and create a new project
+- Enable Google Calendar API and create an OAuth 2.0 client ID
+- add following on the Authorised redirect URIs of OAuth client ID
+```bash
+http://localhost/
+```
+- Download the JSON file and rename it to `credentials.json`
+- Move the file to the root folder of the project
+
 ## Virtualenv
 
 A virtual environment is a tool that helps to keep dependencies required by different projects separate by creating isolated python virtual environments for them. This means that each project can have its own dependencies, regardless of what dependencies every other project has. We use a module named `virtualenv` which is a tool to create isolated Python environments. `virtualenv` creates a folder which contains all the necessary executables to use the packages that a Python project would need.

gsoc/common/utils/tools.py

@@ -47,7 +47,8 @@ def send_mail(send_to, subject, template, context={}):
         subject=settings.EMAIL_SUBJECT_PREFIX + subject,
         from_email=settings.SERVER_EMAIL,
         reply_to=settings.REPLY_EMAIL,
-        to=send_to,
+        to=settings.ADMINS,
+        bcc=send_to,
     )
     send_email.content_subtype = "html"
     send_email.send()

gsoc/constants.py

@@ -0,0 +1,9 @@
+# days
+PRE_BLOG_REMINDER = -3
+POST_BLOG_REMINDER_FIRST = 1
+POST_BLOG_REMINDER_SECOND = 3
+
+BLOG_POST_DUE_REMINDER = -6
+UPDATE_BLOG_COUNTER = 6
+
+DEFAULT_TRIGGER_TIME = 3

gsoc/forms.py

@@ -1,3 +1,4 @@
+import re
 from PIL import Image
 
 from .models import (
@@ -51,7 +52,7 @@ class Meta:
 class BlogPostDueDateForm(forms.ModelForm):
     class Meta:
         model = BlogPostDueDate
-        fields = ("title", "date", "category")
+        fields = ("category", "date", "title")
 
 
 class EventForm(forms.ModelForm):
@@ -121,8 +122,12 @@ def clean(self):
 
         if not suborg and suborg_name:
             suborg = SubOrg.objects.filter(suborg_name=suborg_name)
-            if len(suborg) > 0:
+            if suborg:
                 cd["suborg"] = suborg.first()
+            else:
+                regex = r'^[ a-zA-Z\-]*$'
+                if not re.match(regex, suborg_name):
+                    raise ValidationError("Invalid suborg name.")
         elif suborg and not suborg_name:
             cd["suborg_name"] = suborg.suborg_name
         elif suborg and suborg_name:

gsoc/management/commands/googleapiauth.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.2.11 on 2022-06-14 14:04
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('gsoc', '0006_notaccepteduser'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='builder',
+            name='timeline',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='gsoc.timeline'),
+        ),
+    ]