From fa1e7cf9320d8124efe70a9f4ab093d314acf178 Mon Sep 17 00:00:00 2001 From: Prathamesh Date: Wed, 27 Dec 2023 14:44:20 +0530 Subject: Change UI --- .gitignore | 1 + website/cgen/generator.py | 2 +- website/cgen/models.py | 9 +- website/cgen/templates/base.html | 157 ++++++++++++++++++++----------- website/cgen/templates/download.html | 53 ++++++----- website/cgen/templates/index.html | 90 ++++++++++++++++++ website/cgen/templates/verification.html | 55 ++++++----- website/cgen/verification.py | 3 +- website/cgen/views.py | 10 +- website/website/settings.py | 5 + 10 files changed, 274 insertions(+), 111 deletions(-) mode change 100755 => 100644 website/cgen/templates/base.html create mode 100644 website/cgen/templates/index.html diff --git a/.gitignore b/.gitignore index a0c9ca2..c1036fe 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ __pycache__ local.py *.pyc *.swp +certificates diff --git a/website/cgen/generator.py b/website/cgen/generator.py index cd55f7f..b894c93 100644 --- a/website/cgen/generator.py +++ b/website/cgen/generator.py @@ -36,7 +36,7 @@ def get_details(certificate_id, email): info['serial_key'] = key info['qr_code'] = f'{DOMAIN}/certificates/verify/{key}/' certificate_details['info'] = info - path = f'{settings.BASE_DIR}/{certificate.id}' + path = f'{settings.BASE_DIR}/certificates/{certificate.id}' certificate_details['path'] = path if not os.path.exists(f"path/{{Makefile}}"): shutil.copy2(f'{settings.BASE_DIR}/Makefile', path) diff --git a/website/cgen/models.py b/website/cgen/models.py index 30bb762..e367ae3 100644 --- a/website/cgen/models.py +++ b/website/cgen/models.py @@ -1,6 +1,7 @@ from django.db import models, IntegrityError from django.utils import timezone from django.contrib.auth.models import User +from django.conf import settings import os import hashlib @@ -11,13 +12,13 @@ types = ( ) # Create your models here. - - def get_file_dir(instance, filename): - return os.sep.join((str(instance.id), filename)) + if not os.path.exists(settings.CERTIFICATES_PATH): + os.mkdir(settings.CERTIFICATES_PATH) + return os.sep.join(('certificates', str(instance.id), filename)) def get_certificate_dir(instance, filename): - return os.sep.join((str(instance.participant.certificate.id), str(instance.id), filename)) + return os.sep.join(('certificates', str(instance.participant.certificate.id), str(instance.id), filename)) class Event(models.Model): """ diff --git a/website/cgen/templates/base.html b/website/cgen/templates/base.html old mode 100755 new mode 100644 index 69190e8..4e6bd11 --- a/website/cgen/templates/base.html +++ b/website/cgen/templates/base.html @@ -1,57 +1,104 @@ - - - - - - {% block title %} - Certificates - {% endblock %} - - {% block css %} - - {% endblock %} - {% block js %} - - - {% endblock %} - {% block javascript %} - + + + + + + + + + + + + + {% block title %} + Certificates {% endblock %} - </head> - <body> - <div class="container-full"> -<nav class="navbar navbar-dark bg-dark"> - <a class="navbar-brand" href="{% url 'events' %}">Events</a> -</nav> - <div class="row"> - - <div class="col-lg-12 text-center v-center"> - {% block header%} - - {% endblock %} - {% block content %} - {% endblock %} - </div> - - </div>  - <hr> - <br> - <div id="footer-wrapper" class="container"> - <div id="footer-inner" class="col-lg-12 col-md-12 col-sm-12"> - <div class="pull-left"> -  - <span style="-moz-transform: scaleX(-1); -o-transform: scaleX(-1); -webkit-transform: scaleX(-1); transform: scaleX(-1); display: inline-block;"> -  - </span> -  -  - </div> - <div class="pull-right"> - Developed at IIT Bombay - </div> - </div>  - </div>  - </div>  - </body> -</html> + + + + {% block css %} + + {% endblock %} + {% block js %} + + + + + {% endblock %} + {% block javascript %} + + {% endblock %} + + {% block head %} + {% endblock %} + + + + +

About

Cgen is a certificate generator.
It allows you to download your certificates.

Contact

Email me

+ +

{% block header %} {% endblock %}

{% block header_content %} {% endblock %}

+ +

+ {% block content %} + {% endblock %} +

+ + +

+ + + + + + + + diff --git a/website/cgen/templates/download.html b/website/cgen/templates/download.html index 11f3c2a..afa8117 100644 --- a/website/cgen/templates/download.html +++ b/website/cgen/templates/download.html @@ -1,30 +1,39 @@ {% extends 'base.html' %} {% block header%} -

{{ certificate.event.name }} Certificates

+ {{ certificate.event.name }} Certificates {% endblock %} {% block content %} -

- + {% endblock %} {% block javascript %} @@ -34,7 +43,7 @@ email = "" error = "{{ error }}" if(error == "True"){ - $("#invalidModal").modal(); + $("#invalidModal").show(); } if(value == "paper"){ $('#A').prop('checked', true) @@ -43,7 +52,7 @@ $('#email').val(email); notreg = "{{ notregistered }}"; if(notreg == "1"){ - $("#invalidModal").modal(); + $("#invalidModal").show(); } $("[name=type]").change(function(){ $("#paper").remove(); diff --git a/website/cgen/templates/index.html b/website/cgen/templates/index.html new file mode 100644 index 0000000..5dfdbf7 --- /dev/null +++ b/website/cgen/templates/index.html @@ -0,0 +1,90 @@ +{% extends 'base.html' %} + {% block head %} + + + {% endblock %} + +{% block header %} + Certificates available for download. +{% endblock %} + +{% block header_content %} + Certificates for the following events and courses are available. +{% endblock %} + +{% block content %} +

+ {% for event in events %} +

+ + +

+ {% for certificate in event.certificate_set.all %} +

{{ certificate.description }} +

+ Download + Verify +

+ 9 Downloads + {% endfor %} +

+ {% endfor %} +

+{% endblock %} diff --git a/website/cgen/templates/verification.html b/website/cgen/templates/verification.html index df33779..ad834a1 100755 --- a/website/cgen/templates/verification.html +++ b/website/cgen/templates/verification.html @@ -1,54 +1,57 @@ {% extends 'base.html' %} {% block header%} -

Certificate Verification

+ Certificate Verification {% endblock %} {% block content %} -

- +
+
Enter the alphanumeric characters below the QR code
OR
Enter the serial number you received while scanning the QR code on certificate
+ {% csrf_token %} -
+

-
{% if has_details %} +

- - + +
Details Following are the details
{% for key, value in details.items %} - + {% endfor %}

{{ key }} {{ key | title }} {{ value }}

-
< Back
-
- -
+
{{ description | safe }} +

+ {% endif %} -
- +
{% endblock %} @@ -58,7 +61,7 @@ invalid_serial = {{ invalidserial }} $( document ).ready(function() { if(invalid_serial == 1) { - $("#invalidModal").modal(); + $("#invalidModal").show(); } }); diff --git a/website/cgen/verification.py b/website/cgen/verification.py index 2cf026d..bc35078 100644 --- a/website/cgen/verification.py +++ b/website/cgen/verification.py @@ -4,7 +4,8 @@ from cgen.models import CertificateManager def verify(key): - details = OrderedDict() + details = OrderedDict() + description = None try: cm = CertificateManager.objects.get(serial_key_short=key) details['Authentic'] = True diff --git a/website/cgen/views.py b/website/cgen/views.py index f988e80..1343312 100644 --- a/website/cgen/views.py +++ b/website/cgen/views.py @@ -13,7 +13,7 @@ import csv def events(request): events = Event.objects.filter(is_published=True) context = {'events': events} - return render(request, 'events.html', context) + return render(request, 'index.html', context) # Create your views here. def certificate_download(request, certificate_id): @@ -36,13 +36,19 @@ def certificate_download(request, certificate_id): def verify(request, key=None): context = {} + if key is None and request.method == 'GET': + return render(request, 'verification.html', context) if key is not None: skey = key elif request.method == 'POST': skey = request.POST.get('key').strip() + details, description = verification.verify(skey) + if not details['Authentic']: + context['invalidserial'] = 1 + return render(request, 'verification.html', context) + context['details'] = details - context['has_details'] = True context['has_details'] = details['Authentic'] context['description'] = description return render(request, 'verification.html', context) diff --git a/website/website/settings.py b/website/website/settings.py index 1976128..d54ca4d 100644 --- a/website/website/settings.py +++ b/website/website/settings.py @@ -124,3 +124,8 @@ TIME_OUT = 15 # https://docs.djangoproject.com/en/3.0/howto/static-files/ STATIC_URL = '/static/' + +LOGO = "https://www.cep.iitb.ac.in/assets/img/IIT-Logo.png" + +CERTIFICATES_PATH = f"settings.BASE_DIR/certificates" + -- cgit