Merge pull request #15 from HackAssistant/review

Review

Author: Casassarnau

.flake8

@@ -1,4 +1,4 @@
 [flake8]
-exclude = build,.git,.tox,./django/utils/six.py,./django/conf/app_template/*,./tests/.env,./env,./app/settings.py,./*/migrations,./app/hackathon_variables.py,./venv
+exclude = build,.git,.tox,./django/utils/six.py,./django/conf/app_template/*,./tests/.env,./env,./app/settings.py,./*/migrations,./app/hackathon_variables.py,./venv,./*/apps.py
 ignore = W601,F403,W504,F405
 max-line-length = 120

app/emails.py

@@ -2,7 +2,7 @@
 from pathlib import Path
 
 from django.conf import settings
-from django.core.mail import send_mail
+from django.core.mail import EmailMultiAlternatives
 from django.template.loader import render_to_string
 from django.utils.html import strip_tags
 
@@ -12,23 +12,25 @@
 # Author Arnau Casas Saez
 class Email:
 
-    def __init__(self, name, context, list_mails) -> None:
+    def __init__(self, name, context, to, request, **kwargs) -> None:
         super().__init__()
+        self.kwargs = kwargs
         self.name = name
-        self.list_mails = list_mails
+        self.list_mails = [to, ] if isinstance(to, str) else to
+        self.request = request
         self.context = context
         self.__get_subject__()
         self.__get_content__()
 
     # Private method that renders and save the subject of the mail
     def __get_subject__(self):
         file_template = 'mails/%s.txt' % self.name
-        self.subject = render_to_string(template_name=file_template, context=self.context)
+        self.subject = render_to_string(template_name=file_template, context=self.context, request=self.request)
 
     # Private method that renders and save the HTML content of the mail
     def __get_content__(self):
         file_template = 'mails/%s.html' % self.name
-        self.html_message = render_to_string(template_name=file_template, context=self.context)
+        self.html_message = render_to_string(template_name=file_template, context=self.context, request=self.request)
         self.plain_message = strip_tags(self.html_message)
 
     # Public method that sends the mail to [list_mails] if not debug else saves the file at mails folder
@@ -48,8 +50,8 @@ def send(self):
             with open(final_path, "w", encoding='utf-8') as text_file:
                 text_file.write(self.html_message)
         else:
-            send_mail(subject=self.subject,
-                      message=self.plain_message,
-                      from_email=email_from,
-                      recipient_list=self.list_mails,
-                      html_message=self.html_message)
+            msg = EmailMultiAlternatives(subject=self.subject, body=self.plain_message, from_email=email_from,
+                                         to=self.list_mails, **self.kwargs)
+            msg.attach_alternative(self.html_message, "text/html")
+            msg.content_subtype = "html"
+            msg.send()

app/hackathon_variables.py

@@ -1,14 +1,17 @@
 HACKATHON_NAME = 'HackUPC'
 HACKATHON_DESCRIPTION = 'Join us for BarcelonaTech\'s hackathon. 36h. 29th April - 1st May.'
 HACKATHON_ORG = 'Hackers@UPC'
-HACKATHON_CONTACT_EMAIL = ''
-HACKATHON_SOCIALS = [('https://www.facebook.com/hackupc', 'bi-facebook'),
-                     ('https://www.instagram.com/hackupc/', 'bi-instagram'),
-                     ('https://twitter.com/hackupc', 'bi-twitter'),
-                     ('https://www.youtube.com/channel/UCiiRorGg59Xd5Sjj9bjIt-g', 'bi-youtube'),
-                     ('https://www.twitch.tv/hackersupc?lang=es', 'bi-twitch'),
-                     ('mailto:[email protected]', 'bi-envelope'),
-                     ('https://github.com/HackAssistant', 'bi-github'), ]
+
+HACKATHON_CONTACT_EMAIL = '[email protected]'
+HACKATHON_SOCIALS = {'Facebook': ('https://www.facebook.com/hackupc', 'bi-facebook'),
+                     'Instagram': ('https://www.instagram.com/hackupc/', 'bi-instagram'),
+                     'Twitter': ('https://twitter.com/hackupc', 'bi-twitter'),
+                     'Youtube': ('https://www.youtube.com/channel/UCiiRorGg59Xd5Sjj9bjIt-g', 'bi-youtube'),
+                     'Twitch': ('https://www.twitch.tv/hackersupc?lang=es', 'bi-twitch'),
+                     'Github': ('https://github.com/HackAssistant', 'bi-github'), }
+if HACKATHON_CONTACT_EMAIL:
+    HACKATHON_SOCIALS['Contact'] = ('mailto:' + HACKATHON_CONTACT_EMAIL, 'bi-envelope')
+
 HACKATHON_LANDING = 'https://hackupc.com'
 REGEX_HACKATHON_ORGANIZER_EMAIL = "^.*@hackupc\.com$"
 HACKATHON_ORGANIZER_EMAILS = []

app/mixins.py

@@ -14,9 +14,15 @@ def get_back_url(self):
         return None
 
     def get_context_data(self, **kwargs):
-        c = super(TabsViewMixin, self).get_context_data(**kwargs)
-        c.update({'tabs': self.get_current_tabs(), 'back': self.get_back_url()})
-        return c
+        context = super(TabsViewMixin, self).get_context_data(**kwargs)
+        tabs = self.get_current_tabs()
+        new_tabs = []
+        for tab in tabs:
+            new_tab = {'title': tab[0], 'url': tab[1], 'needs_action': tab[2] if len(tab) > 2 else None,
+                       'active': tab[3] if len(tab) > 3 else None}
+            new_tabs.append(new_tab)
+        context.update({'tabs': new_tabs, 'back': self.get_back_url()})
+        return context
 
 
 class OverwriteOnlyModelFormMixin(object):

app/settings.py

@@ -47,12 +47,15 @@
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    'django_tables2',
+    'django_filters',
     'django_jwt',
     'django_jwt.server',
     'django_bootstrap5',
     'corsheaders',
     'user',
     'application',
+    'review',
 ]
 
 MIDDLEWARE = [
@@ -79,6 +82,7 @@
                 'django.template.context_processors.request',
                 'django.contrib.auth.context_processors.auth',
                 'django.contrib.messages.context_processors.messages',
+                'django.template.context_processors.request',
                 'app.template.app_variables',
             ],
             'libraries': {
@@ -170,6 +174,8 @@
     'JWT_EXPIRATION_TIME': 14400                # Optional
 }
 
+DJANGO_TABLES2_TEMPLATE = 'django_tables2/bootstrap-responsive.html'
+
 # Toast styles
 MESSAGE_TAGS = {
     message_constants.DEBUG: 'info text-dark',

app/static/css/barrating.bars-square.css

@@ -0,0 +1,46 @@
+.br-theme-bars-square .br-widget {
+  height: 15px;
+  white-space: nowrap;
+}
+.br-theme-bars-square .br-widget a {
+  display: block;
+  width: 40px;
+  height: 40px;
+  float: left;
+  border: 2px solid;
+  margin: 2px;
+  text-decoration: none;
+  font-size: 17px;
+  line-height: 2;
+  text-align: center;
+  color: inherit;
+  font-weight: 600;
+}
+.br-theme-bars-square .br-widget a.br-active,
+.br-theme-bars-square .br-widget a.br-selected {
+  border: 2px solid;
+}
+.br-theme-bars-square .br-widget .br-current-rating {
+  clear: both;
+  width: 330px;
+  text-align: center;
+  font-weight: 600;
+  display: block;
+  padding: .5em 0;
+}
+.br-theme-bars-square .br-readonly a {
+  cursor: default;
+}
+.br-theme-bars-square .br-readonly a.br-active,
+.br-theme-bars-square .br-readonly a.br-selected {
+  border: 2px solid;
+}
+@media print {
+  .br-theme-bars-square .br-widget a {
+    border: 2px solid;
+  }
+  .br-theme-bars-square .br-widget a.br-active,
+  .br-theme-bars-square .br-widget a.br-selected {
+    border: 2px solid;
+  }
+}

app/static/css/main.css

@@ -41,6 +41,52 @@ body.light {
 .content {
     font-size: 15px;
 }
+
 footer {
     margin-top: auto;
 }
+
+.orderable > a {
+    text-decoration: none;
+}
+
+.orderable {
+    position: relative;
+}
+
+.orderable > a:before,
+.orderable > a:after {
+	border: 4px solid transparent;
+	content: "";
+	display: block;
+	height: 0;
+	right: 10px;
+	top: 50%;
+	position: absolute;
+	width: 0;
+}
+.orderable > a:before {
+	margin-top: -9px;
+    border-bottom-color: currentColor;
+}
+.orderable > a:after {
+	margin-top: 1px;
+    border-top-color: currentColor;
+}
+.orderable.desc > a:before {
+	border-bottom-color: transparent;
+}
+.orderable.asc > a:after {
+	border-top-color: transparent;
+}
+
+.table-container {
+    overflow-x: auto;
+    -webkit-overflow-scrolling: touch;
+}
+
+@media (max-width: 992px) { /* Bootstrap lg */
+    .border-lg {
+        border: 0 !important;
+    }
+}

app/static/lib/jquery.barrating.min.js

@@ -5,23 +5,19 @@
 
 
 def get_main_nav(request):
+    nav = []
     if not request.user.is_authenticated:
-        return []
+        if getattr(settings, 'HACKATHON_LANDING', None) is not None:
+            nav.append(('Landing page', getattr(settings, 'HACKATHON_LANDING')))
+        return nav
     if not request.user.is_organizer():
-        nav = []
         if getattr(settings, 'HACKATHON_LANDING', None) is not None:
             nav.append(('Landing page', getattr(settings, 'HACKATHON_LANDING')))
         return nav
-    return [
-        ('Hacker', reverse('home')),
-        ('Event', [
-            ('Activities', '/'),
-            ('Meals', '/'),
-            ('HardwareLab', '/'),
-            ('Baggage', '/'),
-            ('CheckIn', '/'), ]
-         )
-    ]
+    if request.user.is_staff:
+        nav.append(('Admin', reverse('admin:index')))
+    nav.extend([('Review', reverse('application_review')), ])
+    return nav
 
 
 def app_variables(request):
@@ -32,6 +28,7 @@ def app_variables(request):
         'app_author': getattr(settings, 'HACKATHON_ORG'),
         'app_name': getattr(settings, 'APP_NAME'),
         'app_socials': getattr(settings, 'HACKATHON_SOCIALS', []),
+        'app_contact': getattr(settings, 'HACKATHON_CONTACT_EMAIL', ''),
         'app_theme': getattr(settings, 'THEME') == 'both',
         'app_landing': getattr(settings, 'HACKATHON_LANDING'),
         'theme': get_theme(request),

app/template.py

@@ -16,7 +16,7 @@
         {% include 'components/favicon.html' %}
     </head>
     <body class="{{ theme }}" style="min-height: 100%">
-        <div class="background" style="display: flex; flex-direction: column;">
+        <div class="background" style="display: flex; flex-direction: column; width: 100%">
             {% block navbar %}
                 <nav class="navbar navbar-default navbar-fixed-top navbar-expand-xl bg-{{ theme }} navbar-{{ theme }}">
                     <div class="container-lg">