Revert " merged sa-3 into new branch gk (#1433)" (#1434)

This reverts commit b3fbfbc.
FusionIIIT · Apr 11, 2024 · d229068 · d229068
1 parent b3fbfbc
commit d229068
Show file tree

Hide file tree

Showing 45 changed files with 4,680 additions and 5,583 deletions.
diff --git a/.gitignore b/.gitignore
@@ -72,9 +72,5 @@ node_modules/
 
 FusionIIIT/static/
 package-lock.json
-<<<<<<< HEAD
 
 
-=======
-# **/**/migrations/*
->>>>>>> sa-3
diff --git a/FusionIIIT/Fusion/settings/development.py b/FusionIIIT/Fusion/settings/development.py
@@ -4,15 +4,15 @@
 TEMPLATE_DEBUG = True 
 SECRET_KEY = '=&w9due426k@l^ju1=s1)fj1rnpf0ok8xvjwx+62_nc-f12-8('
 
-ALLOWED_HOSTS = ["*"]
+ALLOWED_HOSTS = ['*']
 
 DATABASES = {
-    "default": {
-        "ENGINE": "django.db.backends.postgresql_psycopg2",
-        "NAME": "fusionlab",
-        "HOST": os.environ.get("DB_HOST", default="localhost"),
-        "USER": "fusion_admin",
-        "PASSWORD": "hello123",
+     'default': {
+        'ENGINE': 'django.db.backends.postgresql_psycopg2',
+        'NAME': 'fusionlab',
+        'HOST': os.environ.get("DB_HOST", default='localhost'),
+        'USER': 'fusion_admin',
+        'PASSWORD': 'hello123',
     }
 }
 
@@ -22,22 +22,27 @@
         'rest_framework.authentication.TokenAuthentication',
         'rest_framework.authentication.SessionAuthentication',
     ),
-    "DEFAULT_PERMISSION_CLASSES": ("rest_framework.permissions.IsAuthenticated",),
+    'DEFAULT_PERMISSION_CLASSES': (
+        'rest_framework.permissions.IsAuthenticated',
+    )
 }
 
 if DEBUG:
-    MIDDLEWARE += ("debug_toolbar.middleware.DebugToolbarMiddleware",)
+    MIDDLEWARE += (
+        'debug_toolbar.middleware.DebugToolbarMiddleware',
+    )
 
     INSTALLED_APPS += (
-        "debug_toolbar",
-        "django_extensions",
-    )
+        'debug_toolbar',
+        'django_extensions',
+        )
+
 
     ###############################
     # DJANGO_EXTENSIONS SETTINGS: #
     ###############################
     INTERNAL_IPS = [
-        "127.0.0.1",
+        '127.0.0.1',
     ]
 
     ###############################
@@ -48,7 +53,7 @@
     SHELL_PLUS_PRINT_SQL = True
 
     DEBUG_TOOLBAR_CONFIG = {
-        "INTERCEPT_REDIRECTS": False,
+        'INTERCEPT_REDIRECTS': False,
     }
 
 CRONJOBS = [

diff --git a/FusionIIIT/Fusion/urls.py b/FusionIIIT/Fusion/urls.py
@@ -24,38 +24,40 @@
 
 
 urlpatterns = [
-    url(r"^", include("applications.globals.urls")),
-    url(r"^feeds/", include("applications.feeds.urls")),
-    url(r"^admin/", admin.site.urls),
-    url(r"^academic-procedures/", include("applications.academic_procedures.urls")),
-    url(r"^aims/", include("applications.academic_information.urls")),
-    url(r"^notifications/", include("applications.notifications_extension.urls")),
-    url(r"^estate/", include("applications.estate_module.urls")),
-    url(r"^dep/", include("applications.department.urls")),
-    url(r"^programme_curriculum/", include("applications.programme_curriculum.urls")),
-    url(r"^iwdModuleV2/", include("applications.iwdModuleV2.urls")),
-    url(r"^__debug__/", include(debug_toolbar.urls)),
-    url(r"^research_procedures/", include("applications.research_procedures.urls")),
-    url(r"^accounts/", include("allauth.urls")),
-    url(r"^eis/", include("applications.eis.urls")),
-    url(r"^mess/", include("applications.central_mess.urls")),
-    url(r"^complaint/", include("applications.complaint_system.urls")),
-    url(r"^healthcenter/", include("applications.health_center.urls")),
-    url(r"^leave/", include("applications.leave.urls")),
-    url(r"^placement/", include("applications.placement_cell.urls")),
-    url(r"^filetracking/", include("applications.filetracking.urls")),
-    url(r"^spacs/", include("applications.scholarships.urls")),
-    url(r"^visitorhostel/", include("applications.visitor_hostel.urls")),
-    url(r"^office/", include("applications.office_module.urls")),
-    url(r"^finance/", include("applications.finance_accounts.urls")),
-    url(r"^purchase-and-store/", include("applications.ps1.urls")),
-    url(r"^gymkhana/", include("applications.gymkhana.urls")),
-    url(r"^library/", include("applications.library.urls")),
-    url(r"^establishment/", include("applications.establishment.urls")),
-    url(r"^ocms/", include("applications.online_cms.urls")),
-    url(r"^counselling/", include("applications.counselling_cell.urls")),
-    url(r"^hostelmanagement/", include("applications.hostel_management.urls")),
-    url(r"^income-expenditure/", include("applications.income_expenditure.urls")),
-    url(r"^hr2/", include("applications.hr2.urls")),
-    url(r"^recruitment/", include("applications.recruitment.urls")),
+    url(r'^', include('applications.globals.urls')),
+    url(r'^feeds/', include('applications.feeds.urls')),
+    url(r'^admin/', admin.site.urls),
+    url(r'^academic-procedures/', include('applications.academic_procedures.urls')),
+    url(r'^aims/', include('applications.academic_information.urls')),
+    url(r'^notifications/', include('applications.notifications_extension.urls')),
+    url(r'^estate/', include('applications.estate_module.urls')),
+    url(r'^dep/', include('applications.department.urls')),
+    url(r'^programme_curriculum/',include('applications.programme_curriculum.urls')),
+    url(r'^iwdModuleV2/', include('applications.iwdModuleV2.urls')),
+    url(r'^__debug__/', include(debug_toolbar.urls)),
+    url(r'^research_procedures/', include('applications.research_procedures.urls')),
+    url(r'^accounts/', include('allauth.urls')),
+
+
+    url(r'^eis/', include('applications.eis.urls')),
+    url(r'^mess/', include('applications.central_mess.urls')),
+    url(r'^complaint/', include('applications.complaint_system.urls')),
+    url(r'^healthcenter/', include('applications.health_center.urls')),
+    url(r'^leave/', include('applications.leave.urls')),
+    url(r'^placement/', include('applications.placement_cell.urls')),
+    url(r'^filetracking/', include('applications.filetracking.urls')),
+    url(r'^spacs/', include('applications.scholarships.urls')),
+    url(r'^visitorhostel/', include('applications.visitor_hostel.urls')),
+    url(r'^office/', include('applications.office_module.urls')),
+    url(r'^finance/', include('applications.finance_accounts.urls')),
+    url(r'^purchase-and-store/', include('applications.ps1.urls')),
+    url(r'^gymkhana/', include('applications.gymkhana.urls')),
+    url(r'^library/', include('applications.library.urls')),
+    url(r'^establishment/', include('applications.establishment.urls')),
+    url(r'^ocms/', include('applications.online_cms.urls')),
+    url(r'^counselling/', include('applications.counselling_cell.urls')),
+    url(r'^hostelmanagement/', include('applications.hostel_management.urls')),
+    url(r'^income-expenditure/', include('applications.income_expenditure.urls')),
+    url(r'^hr2/', include('applications.hr2.urls')),
+    url(r'^recruitment/', include('applications.recruitment.urls')),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
diff --git a/FusionIIIT/applications/gymkhana/api/serializers.py b/FusionIIIT/applications/gymkhana/api/serializers.py
@@ -2,14 +2,9 @@
 from django.contrib.auth import get_user_model
 from rest_framework.authtoken.models import Token
 from rest_framework import serializers
-from applications.gymkhana.models import Club_info,Session_info,Event_info, Voting_choices
+from applications.gymkhana.models import Club_info,Session_info,Event_info
 from applications.gymkhana.models import Club_member,Core_team,Club_budget,Club_report,Fest_budget,Registration_form,Voting_polls
 
-class Voting_choicesSerializer(serializers.ModelSerializer):
-    class Meta:
-        model = Voting_choices
-        fields = ['poll_event', 'title', 'description', 'votes']
-
 class Club_infoSerializer(serializers.ModelSerializer):
 
     class Meta:
@@ -30,7 +25,7 @@ class Core_teamSerializer(serializers.ModelSerializer):
 
     class Meta:
         model=Core_team
-        fields=('all')
+        fields=('_all_')
 
 class Club_DetailsSerializer(serializers.ModelSerializer):
     class Meta:
@@ -40,18 +35,13 @@ class Meta:
 class Session_infoSerializer(serializers.ModelSerializer):
     class Meta:
         model = Session_info
-        fields = [ 'venue', 'date', 'start_time', 'end_time', 'details','status']
-
-class Club_memberSerializer(serializers.ModelSerializer):
-    class Meta:
-        model = Club_member
-        fields = ['member','club','description', 'status','remarks']
+        fields= ['venue','date','start_time','details']
 
 class event_infoserializer(serializers.ModelSerializer):
 
     class Meta:
         model=Event_info
-        fields=['club','event_name','incharge','date','venue','start_time','end_time','details']
+        fields=['club','event_name','incharge','date']
 
 class club_budgetserializer(serializers.ModelSerializer):
 
@@ -78,8 +68,3 @@ class Voting_pollSerializer(serializers.ModelSerializer):
     class Meta:
         model=Voting_polls
         fields=['title','pub_date','exp_date','created_by','groups']
-
-class NewClubSerializer(serializers.ModelSerializer):
-    class Meta:
-        model=Club_info
-        fields='__all__'