From b6a35ada9e9aaa5860e3e4150822c592a7a70b1b Mon Sep 17 00:00:00 2001 From: Yathartha Goenka Date: Mon, 13 Feb 2023 13:25:07 +0530 Subject: [PATCH 01/58] deployment ports config --- Dockerfile | 4 ++-- FusionIIIT/Fusion/settings/development.py | 10 +++++----- docker-compose.yml | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6e99e98e9..168ca3ff6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,7 +27,7 @@ COPY . $FUSION_HOME # RUN cd FusionIIIT && python manage.py migrate # port where the Django app runs -EXPOSE 8000 +EXPOSE 8009 # start server -CMD ["python", "manage.py", "runserver", "0.0.0.0:8000"] +CMD ["python", "manage.py", "runserver", "0.0.0.0:8009"] diff --git a/FusionIIIT/Fusion/settings/development.py b/FusionIIIT/Fusion/settings/development.py index 5f392c443..035d4050f 100644 --- a/FusionIIIT/Fusion/settings/development.py +++ b/FusionIIIT/Fusion/settings/development.py @@ -4,15 +4,15 @@ 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': 'localhost', - 'USER': 'fusion_admin', - 'PASSWORD': 'hello123', + 'NAME': 'fusiondb', + 'HOST': os.environ.get("DB_HOST"), + 'USER': 'fusionuser', + 'PASSWORD': 'password', } } diff --git a/docker-compose.yml b/docker-compose.yml index 4b7dc6cf2..c60574aee 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,7 +9,7 @@ services: - POSTGRES_USER=fusionuser - POSTGRES_PASSWORD=password ports: - - "5432:5432" + - "5459:5459" app: build: context: . @@ -17,8 +17,8 @@ services: volumes: - .:/home/app ports: - - 8000:8000 - command: python FusionIIIT/manage.py runserver 0.0.0.0:8000 + - 8009:8009 + command: python FusionIIIT/manage.py runserver 0.0.0.0:8009 environment: - DB_HOST=db depends_on: From f62c5024aef3259561dc53f75cd698949caf7ca5 Mon Sep 17 00:00:00 2001 From: prakhar-da-gama <95561933+prakhar-da-gama@users.noreply.github.com> Date: Thu, 16 Feb 2023 23:37:25 +0530 Subject: [PATCH 02/58] gad-4: Created fileTrackingNotAllowed.html (#1082) --- FusionIIIT/templates/filetracking/fileTrackingNotAllowed.html | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 FusionIIIT/templates/filetracking/fileTrackingNotAllowed.html diff --git a/FusionIIIT/templates/filetracking/fileTrackingNotAllowed.html b/FusionIIIT/templates/filetracking/fileTrackingNotAllowed.html new file mode 100644 index 000000000..f2a8c0685 --- /dev/null +++ b/FusionIIIT/templates/filetracking/fileTrackingNotAllowed.html @@ -0,0 +1,2 @@ +

File Tracking Module is not allowed for Students. +

From e52a5907e91c0633cce902dc34c718826854629a Mon Sep 17 00:00:00 2001 From: prakhar-da-gama <95561933+prakhar-da-gama@users.noreply.github.com> Date: Thu, 16 Feb 2023 23:38:01 +0530 Subject: [PATCH 03/58] gad-4: new views.py to remove students from file tracking (#1104) --- FusionIIIT/applications/filetracking/views.py | 88 +++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/FusionIIIT/applications/filetracking/views.py b/FusionIIIT/applications/filetracking/views.py index ef5d8f347..a3c0a94ee 100644 --- a/FusionIIIT/applications/filetracking/views.py +++ b/FusionIIIT/applications/filetracking/views.py @@ -14,7 +14,56 @@ @login_required(login_url = "/accounts/login/") +### + +def errorCheck(request): + return render(request, 'filetracking/contactUs.html') + +#### + +def user_check(request): + """ + This function is used to check if the user is a student or not + Its return type is bool + @param: + request - contains metadata about the requested page + + @Variables: + current_user - get user from request + user_details - extract details of the user from the database + desig_id - check for designation + student - designation for a student + final_user - final designation of the request(our user) + + + """ + try: + current_user = get_object_or_404(User, username=request.user.username) + + #extra info details , user id used as main id + user_details = ExtraInfo.objects.select_related('user','department').get(user = request.user) + + des = HoldsDesignation.objects.all().select_related().filter(user = request.user).first() + print(str(des.designation)) + if str(des.designation) == "student": + return True + else: + return False + + except Exception as e: + return False + + + ################################### + + def filetracking(request): + + if user_check(request): + return render(request, 'filetracking/fileTrackingNotAllowed.html') + + + """ The function is used to create files by current user(employee). It adds the employee(uploader) and file datails to a file(table) of filetracking(model) @@ -134,7 +183,10 @@ def filetracking(request): @login_required(login_url = "/accounts/login") + def drafts(request): + if user_check(request):## + return render(request, 'filetracking/fileTrackingNotAllowed.html')## """ The function is used to get the designation of the user and renders it on draft template. @@ -146,6 +198,8 @@ def drafts(request): context - Holds data needed to make necessary changes in the template. """ + + ### designation = get_designation(request.user) context = { 'designation': designation, @@ -155,6 +209,8 @@ def drafts(request): @login_required(login_url = "/accounts/login") def fileview(request,id): + if user_check(request):## + return render(request, 'filetracking/fileTrackingNotAllowed.html')## """ This function is used to veiw all all created files by the user ordered by upload date.it collects all the created files from File object. @@ -204,6 +260,8 @@ def fileview(request,id): @login_required(login_url = "/accounts/login") def fileview1(request,id): + if user_check(request):## + return render(request, 'filetracking/fileTrackingNotAllowed.html')## """ The function is used to get all the files sent by user(employee) to other employees @@ -236,6 +294,8 @@ def fileview1(request,id): @login_required(login_url = "/accounts/login") def fileview2(request,id): + if user_check(request):## + return render(request, 'filetracking/fileTrackingNotAllowed.html')## """ The function is used to fetch the files received by the user form other employees. @@ -267,6 +327,8 @@ def fileview2(request,id): @login_required(login_url = "/accounts/login") def outward(request): + if user_check(request):## + return render(request, 'filetracking/fileTrackingNotAllowed.html')## """ This function fetches the different designations of the user and renders it on outward template @param: @@ -286,6 +348,8 @@ def outward(request): @login_required(login_url = "/accounts/login") def inward(request): + if user_check(request):## + return render(request, 'filetracking/fileTrackingNotAllowed.html')## """ This function fetches the different designations of the user and renders it on inward template @@ -306,6 +370,8 @@ def inward(request): @login_required(login_url = "/accounts/login") def confirmdelete(request,id): + if user_check(request):## + return render(request, 'filetracking/fileTrackingNotAllowed.html')## """ The function is used to confirm the deletion of a file. @@ -327,6 +393,8 @@ def confirmdelete(request,id): @login_required(login_url = "/accounts/login") def forward(request, id): + if user_check(request):## + return render(request, 'filetracking/fileTrackingNotAllowed.html')## """ The function is used to forward files received by user(employee) from other employees which are filtered from Tracking(table) objects by current user @@ -427,6 +495,8 @@ def forward(request, id): @login_required(login_url = "/accounts/login") def archive_design(request): + if user_check(request):## + return render(request, 'filetracking/fileTrackingNotAllowed.html')## designation = HoldsDesignation.objects.select_related('user','working','designation').filter(user=request.user) @@ -441,6 +511,8 @@ def archive_design(request): @login_required(login_url = "/accounts/login") def archive(request , id): + if user_check(request):## + return render(request, 'filetracking/fileTrackingNotAllowed.html')## draft = File.objects.select_related('uploader__user','uploader__department','designation').filter(is_read=True).order_by('-upload_date') @@ -470,6 +542,8 @@ def archive(request , id): @login_required(login_url = "/accounts/login") def archive_finish(request, id): + if user_check(request):## + return render(request, 'filetracking/fileTrackingNotAllowed.html')## file1 = get_object_or_404(File, id=id) ##file = get_object_or_404(File, ref_id=id) track = Tracking.objects.filter(file_id=file1) @@ -482,6 +556,8 @@ def archive_finish(request, id): @login_required(login_url = "/accounts/login") def finish_design(request): + if user_check(request):## + return render(request, 'filetracking/fileTrackingNotAllowed.html')## designation = HoldsDesignation.objects.select_related('user','working','designation').filter(user=request.user) @@ -493,6 +569,8 @@ def finish_design(request): @login_required(login_url = "/accounts/login") def finish_fileview(request, id): + if user_check(request):## + return render(request, 'filetracking/fileTrackingNotAllowed.html')## out = Tracking.objects.select_related('file_id__uploader__user','file_id__uploader__department','file_id__designation','current_id__user','current_id__department', 'current_design__user','current_design__working','current_design__designation','receiver_id','receive_design').filter(file_id__uploader=request.user.extrainfo, is_read=False).order_by('-forward_date') @@ -515,6 +593,8 @@ def finish_fileview(request, id): @login_required(login_url = "/accounts/login") def finish(request, id): + if user_check(request):## + return render(request, 'filetracking/fileTrackingNotAllowed.html')## file1 = get_object_or_404(File, id=id) ##file = get_object_or_404(File, ref_id=id) track = Tracking.objects.filter(file_id=file1) @@ -537,6 +617,8 @@ def finish(request, id): def AjaxDropdown1(request): + if user_check(request):## + return render(request, 'filetracking/fileTrackingNotAllowed.html')## """ This function returns the designation of receiver on the forward or compose file template. @@ -560,6 +642,8 @@ def AjaxDropdown1(request): def AjaxDropdown(request): + if user_check(request):## + return render(request, 'filetracking/fileTrackingNotAllowed.html')## """ This function returns the usernames of receiver on the forward or compose file template. @@ -589,6 +673,8 @@ def test(request): @login_required(login_url = "/accounts/login") def delete(request,id): + if user_check(request):## + return render(request, 'filetracking/fileTrackingNotAllowed.html')## """ The function is used the delete of a file and it returns to the drafts page. @@ -606,6 +692,8 @@ def delete(request,id): def forward_inward(request,id): + if user_check(request):## + return render(request, 'filetracking/fileTrackingNotAllowed.html')## """ This function is used forward the files which are available in the inbox of the user . From 69e97fb1e0d083643f0893d59f147e6c6a4781ed Mon Sep 17 00:00:00 2001 From: manavdesai27 Date: Thu, 23 Feb 2023 00:08:06 +0530 Subject: [PATCH 04/58] fix: reverting deployment changes --- Dockerfile | 4 ++-- FusionIIIT/Fusion/settings/development.py | 10 +++++----- docker-compose.yml | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 168ca3ff6..6e99e98e9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,7 +27,7 @@ COPY . $FUSION_HOME # RUN cd FusionIIIT && python manage.py migrate # port where the Django app runs -EXPOSE 8009 +EXPOSE 8000 # start server -CMD ["python", "manage.py", "runserver", "0.0.0.0:8009"] +CMD ["python", "manage.py", "runserver", "0.0.0.0:8000"] diff --git a/FusionIIIT/Fusion/settings/development.py b/FusionIIIT/Fusion/settings/development.py index 035d4050f..5f392c443 100644 --- a/FusionIIIT/Fusion/settings/development.py +++ b/FusionIIIT/Fusion/settings/development.py @@ -4,15 +4,15 @@ SECRET_KEY = '=&w9due426k@l^ju1=s1)fj1rnpf0ok8xvjwx+62_nc-f12-8(' -ALLOWED_HOSTS = ['*'] +ALLOWED_HOSTS = [] DATABASES = { 'default': { 'ENGINE': 'django.db.backends.postgresql_psycopg2', - 'NAME': 'fusiondb', - 'HOST': os.environ.get("DB_HOST"), - 'USER': 'fusionuser', - 'PASSWORD': 'password', + 'NAME': 'fusionlab', + 'HOST': 'localhost', + 'USER': 'fusion_admin', + 'PASSWORD': 'hello123', } } diff --git a/docker-compose.yml b/docker-compose.yml index c60574aee..4b7dc6cf2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,7 +9,7 @@ services: - POSTGRES_USER=fusionuser - POSTGRES_PASSWORD=password ports: - - "5459:5459" + - "5432:5432" app: build: context: . @@ -17,8 +17,8 @@ services: volumes: - .:/home/app ports: - - 8009:8009 - command: python FusionIIIT/manage.py runserver 0.0.0.0:8009 + - 8000:8000 + command: python FusionIIIT/manage.py runserver 0.0.0.0:8000 environment: - DB_HOST=db depends_on: From 5c61a5425b067fb33b60f6fddedb64391dedeb4d Mon Sep 17 00:00:00 2001 From: Harshvardhan Singh <73544247+Lawful2002@users.noreply.github.com> Date: Thu, 23 Feb 2023 14:32:15 +0530 Subject: [PATCH 05/58] GAD-5: Fix responsiveness (#1125) Co-authored-by: A Anunaya <76819712+Anunaya07@users.noreply.github.com> Co-authored-by: Aksh Bansal <63552235+Aksh-Bansal-dev@users.noreply.github.com> --- .../academic_procedures/academic.html | 44 +- FusionIIIT/templates/dashboard/dashboard.html | 327 ++++++------- FusionIIIT/templates/dashboard/modules.html | 447 ++++++++---------- FusionIIIT/templates/dashboard/navbar.html | 95 ++-- FusionIIIT/templates/globals/usercard.html | 101 ++-- 5 files changed, 517 insertions(+), 497 deletions(-) mode change 100755 => 100644 FusionIIIT/templates/academic_procedures/academic.html mode change 100755 => 100644 FusionIIIT/templates/dashboard/dashboard.html mode change 100755 => 100644 FusionIIIT/templates/dashboard/modules.html mode change 100755 => 100644 FusionIIIT/templates/dashboard/navbar.html mode change 100755 => 100644 FusionIIIT/templates/globals/usercard.html diff --git a/FusionIIIT/templates/academic_procedures/academic.html b/FusionIIIT/templates/academic_procedures/academic.html old mode 100755 new mode 100644 index 6b04a54fb..35eebf446 --- a/FusionIIIT/templates/academic_procedures/academic.html +++ b/FusionIIIT/templates/academic_procedures/academic.html @@ -22,6 +22,39 @@ } + + {% endblock css %} @@ -30,13 +63,12 @@ {% include 'dashboard/navbar.html' %} {% endblock %} -
+
- {% comment %}The left-margin segment!{% endcomment %} -
+ {% comment %}The left-rail segment starts here!{% endcomment %} -
+
{% comment %}The user image card starts here!{% endcomment %} {% block usercard %} {% include 'globals/usercard.html' %} @@ -46,8 +78,8 @@
{% comment %}The Tab-Menu starts here!{% endcomment %} -