From bd4fbdc49adfd27bd83723c67ac99b39fc36eebb Mon Sep 17 00:00:00 2001 From: CDC Date: Tue, 6 Aug 2024 15:16:09 +0530 Subject: [PATCH] resolved merge conflicts --- .gitignore | 1 + CDC_Backend/APIs/adminViews.py | 1 - CDC_Backend/APIs/companyViews.py | 1 - CDC_Backend/APIs/studentViews.py | 1 + CDC_Backend/APIs/utils.py | 1 - CDC_Backend/CDC_Backend/settings.py | 8 ++++---- CDC_Backend/run_prod.sh | 0 nginx.conf | 0 setup.sh | 0 start_backend_service.sh | 0 start_email_service.sh | 2 +- 11 files changed, 7 insertions(+), 8 deletions(-) mode change 100644 => 100755 CDC_Backend/run_prod.sh mode change 100755 => 100644 nginx.conf mode change 100755 => 100644 setup.sh mode change 100644 => 100755 start_backend_service.sh mode change 100755 => 100644 start_email_service.sh diff --git a/.gitignore b/.gitignore index 2208f8f..994f5a0 100644 --- a/.gitignore +++ b/.gitignore @@ -130,6 +130,7 @@ dmypy.json /venv/ ./CDC_Backend/static +CDC_Backend/static_url* ./CDC_Backend/Storage /CDC_Backend/CDC_Backend/__pycache__/ /CDC_Backend/APIs/__pycache__/ diff --git a/CDC_Backend/APIs/adminViews.py b/CDC_Backend/APIs/adminViews.py index 5d724f5..d5dab37 100644 --- a/CDC_Backend/APIs/adminViews.py +++ b/CDC_Backend/APIs/adminViews.py @@ -784,7 +784,6 @@ def getStats(request, id, email, user_type): status=status.HTTP_200_OK) except: logger.warning("Get Stats: " + str(sys.exc_info())) - print(sys.exc_info()) return Response({'action': "Get Stats", 'message': "Something Went Wrong"}, status=status.HTTP_400_BAD_REQUEST) diff --git a/CDC_Backend/APIs/companyViews.py b/CDC_Backend/APIs/companyViews.py index c7636b7..22e3fe5 100644 --- a/CDC_Backend/APIs/companyViews.py +++ b/CDC_Backend/APIs/companyViews.py @@ -47,7 +47,6 @@ def addPlacement(request): opening.eligiblestudents = json.loads(data[ELIGIBLESTUDENTS]) else: raise ValueError('Allowed Branch must be a subset of ' + str(ELIGIBLE)) - print(opening.eligiblestudents) if data[PWD_ELIGIBLE] == 'Yes': opening.pwd_eligible = True else: diff --git a/CDC_Backend/APIs/studentViews.py b/CDC_Backend/APIs/studentViews.py index e833af2..025aebd 100644 --- a/CDC_Backend/APIs/studentViews.py +++ b/CDC_Backend/APIs/studentViews.py @@ -50,6 +50,7 @@ def refresh(request): @isAuthorized(allowed_users=[STUDENT]) def studentProfile(request, id, email, user_type): try: + studentDetails = get_object_or_404(Student, id=id) data = StudentSerializer(studentDetails).data diff --git a/CDC_Backend/APIs/utils.py b/CDC_Backend/APIs/utils.py index 9224e2c..af106ad 100644 --- a/CDC_Backend/APIs/utils.py +++ b/CDC_Backend/APIs/utils.py @@ -450,7 +450,6 @@ def internship_eligibility_filters(student, internships): @background_task.background(schedule=2) def send_opening_notifications(opening_id, opening_type=PLACEMENT): try: - # print(opening_id, opening_type) if opening_type == PLACEMENT: opening = get_object_or_404(Placement, id=opening_id) else: diff --git a/CDC_Backend/CDC_Backend/settings.py b/CDC_Backend/CDC_Backend/settings.py index ddddada..49ce6f6 100644 --- a/CDC_Backend/CDC_Backend/settings.py +++ b/CDC_Backend/CDC_Backend/settings.py @@ -30,7 +30,7 @@ DEBUG = os.environ.get('DEBUG') == "True" ALLOWED_HOSTS = ['cdc.iitdh.ac.in', 'localhost'] -ADMINS = [ ('Jaya Surya', '210020040@iitdh.ac.in')] +ADMINS = [ ('Jaya Surya', '210020051@iitdh.ac.in')] # Application definition INSTALLED_APPS = [ @@ -143,10 +143,10 @@ DEFAULT_AUTO_FIELD = 'django.db.models.AutoField' # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/2.2/howto/static-files/ -STATIC_URL = '/static/' -STATIC_ROOT = os.path.join(BASE_DIR, 'static') +STATIC_URL = '/static_url/' +STATIC_ROOT = os.path.join(BASE_DIR, 'static_url') STATICFILES_DIR = ( - os.path.join(BASE_DIR, 'static'), + os.path.join(BASE_DIR, 'static_url'), ) CORS_ORIGIN_ALLOW_ALL = False diff --git a/CDC_Backend/run_prod.sh b/CDC_Backend/run_prod.sh old mode 100644 new mode 100755 diff --git a/nginx.conf b/nginx.conf old mode 100755 new mode 100644 diff --git a/setup.sh b/setup.sh old mode 100755 new mode 100644 diff --git a/start_backend_service.sh b/start_backend_service.sh old mode 100644 new mode 100755 diff --git a/start_email_service.sh b/start_email_service.sh old mode 100755 new mode 100644 index 048b305..1a70d77 --- a/start_email_service.sh +++ b/start_email_service.sh @@ -4,4 +4,4 @@ source /home/cdc/Desktop/CDC_Web_Portal_Backend/cdc-placement-website-backend/ve cd /home/cdc/Desktop/CDC_Web_Portal_Backend/cdc-placement-website-backend/CDC_Backend -python manage.py process_tasks +python3 manage.py process_tasks