Merge branch 'devlup-labs:main' into main

Author: khushi-parikh

.idea/.gitignore

@@ -1,6 +1,7 @@
 *.log
 *.pot
 *.pyc
+.idea
 __pycache__
 db.sqlite3
 media

.idea/iitj_family_tree.iml

@@ -16,9 +16,11 @@
 from django.contrib import admin
 from django.urls import include, path
 from graphene_django.views import GraphQLView
+from student.views import upload
 
 urlpatterns = [
     path('admin/', admin.site.urls),
     path("graphql", GraphQLView.as_view(graphiql=True)),
     path('students/', include('student.urls')),
+    path('importexcel/', upload),
 ]

.idea/inspectionProfiles/profiles_settings.xml

@@ -1,5 +1,9 @@
 from django.contrib import admin
+#from student.models import Student
 
 from .models import Student
 
-admin.site.register(Student)
+class StudentAdmin(admin.ModelAdmin):
+  save_as=True
+
+admin.site.register(Student, StudentAdmin)

.idea/misc.xml

@@ -1,5 +1,9 @@
 from django.db import models
 
+class SocialMedia(models.Model):
+		facebook = models.URLField(max_length=255)
+		instagram = models.URLField(max_length=255)
+
 class Student(models.Model):
     roll_no= models.CharField(max_length=9)
     name= models.CharField(max_length=50)
@@ -8,15 +12,11 @@ class Student(models.Model):
     picture= models.URLField(max_length=200)
     homeTown= models.CharField(max_length=200)
     extraCurriculars= models.CharField(max_length=400)
-    socialMedia= models.ForeignKey('SocialMedia')
+    socialMedia= models.ForeignKey(SocialMedia, on_delete=models.CASCADE, default=None, blank=True, null=True)
     linkedIn= models.URLField(max_length=200)
     email= models.EmailField(max_length=254)
     parentId= models.CharField(max_length=400)
 
-
-class SocialMedia(models.Model):
-		facebook = models.URLField(max_length=255)
-		instagram = models.URLField(max_length=255)