From dfa8cdea74ad86bd674507bf31709f34bec48267 Mon Sep 17 00:00:00 2001 From: Saksham-1508 Date: Sun, 13 Feb 2022 17:49:22 +0530 Subject: [PATCH 1/9] removed stash --- templates/AlumniConnect/signup.html | 116 ++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) create mode 100644 templates/AlumniConnect/signup.html diff --git a/templates/AlumniConnect/signup.html b/templates/AlumniConnect/signup.html new file mode 100644 index 00000000..912669ed --- /dev/null +++ b/templates/AlumniConnect/signup.html @@ -0,0 +1,116 @@ +{% extends 'globals/base.html' %} +{% load static %} +{% load crispy_forms_tags %} +{% block title %} +AlumniConnect - Login +{% endblock %} + +{% block body %} +{% include 'globals/navbar.html' %} +
+ +
+
+
+
+

+ +

+
+
+

+ STUDENT ALUMNI CELL +

+
+
+
+
+ +
+
+ +
+ +
+ + + +{% include 'globals/footer.html' %} +{% endblock %} \ No newline at end of file From b027f51930837fb8c9faee61481d3d2ab7642168 Mon Sep 17 00:00:00 2001 From: Saksham-1508 Date: Wed, 24 Aug 2022 14:07:18 +0530 Subject: [PATCH 2/9] fixed activation link not expiring --- AlumniConnect/decorators.py | 2 +- AlumniConnect/views.py | 17 +++++++++++++---- templates/AlumniConnect/login.html | 2 +- templates/globals/navbar.html | 2 +- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/AlumniConnect/decorators.py b/AlumniConnect/decorators.py index b5b7269a..15f2e8af 100644 --- a/AlumniConnect/decorators.py +++ b/AlumniConnect/decorators.py @@ -12,7 +12,7 @@ def wrapper(request,*args, **kwargs): user = request.user if not (user.is_authenticated): return HttpResponseRedirect('/') # case when user is not logged in - elif (not user.profile.verify) and ( user.is_authenticated == True): + elif (not user.profile.verify) and ( user.is_authenticated == True) and (request.path != '/complete_profile/'): return HttpResponseRedirect('/complete_profile/') # case when user is logged in but haven't completed profile as after completing profile only user will be able to login else: return function(request,*args,**kwargs) diff --git a/AlumniConnect/views.py b/AlumniConnect/views.py index 736de983..e1ebfab6 100644 --- a/AlumniConnect/views.py +++ b/AlumniConnect/views.py @@ -162,7 +162,7 @@ def signup(request): form = SignupForm() return render(request, "AlumniConnect/signup.html", {'form': form}) - +@custom_login_required def complete_profile(request): user = request.user @@ -173,7 +173,14 @@ def complete_profile(request): # admin does not have any profile return redirect('home') - + try: + # if profile is already completed then redirect to home + if profile.verify: + return redirect('home') + except: + pass + + #creating context for form batches = list(Batch.objects.all().order_by('batch')) context = {'edit': False, 'programmes': Constants.PROG_CHOICES,'branches': Constants.BRANCH, 'batches': batches, 'admission_years': Constants.YEAR_OF_ADDMISSION,'user_roll_no':user.username,'user_email':user.email} @@ -252,7 +259,9 @@ def reg_no_gen(degree_, spec_, year): def convert_int(number, decimals): return str(number).zfill(decimals) - +""" + This function needs to be depricated in new signup workflow. +""" def new_register(request): if request.method == 'POST': form = NewRegister(request.POST, request.FILES) @@ -318,7 +327,7 @@ def activate(request, uidb64, token): print(u) except(TypeError, ValueError, OverflowError): u = None - if u is not None and account_activation_token.check_token(u, token): + if u and account_activation_token.check_token(u, token): u.is_active = True u.save() login(request, u) diff --git a/templates/AlumniConnect/login.html b/templates/AlumniConnect/login.html index c55e74d5..c8bf71de 100644 --- a/templates/AlumniConnect/login.html +++ b/templates/AlumniConnect/login.html @@ -34,7 +34,7 @@

diff --git a/templates/AlumniConnect/resend_activation_link.html b/templates/AlumniConnect/resend_activation_link.html new file mode 100644 index 00000000..28d414b7 --- /dev/null +++ b/templates/AlumniConnect/resend_activation_link.html @@ -0,0 +1,76 @@ +{% extends 'globals/base.html' %} +{% load static %} + +{% block title %} +Alumni Connect - Login +{% endblock %} + +{% block body %} +{% include 'globals/navbar.html' %} +
+ +
+
+
+
+

+ +

+
+
+

+ ALUMNI CONNECT +

+
+
+
+
+ +
+
+ +
+ +
+{% include 'globals/footer.html' %} +{% endblock %} \ No newline at end of file