Added country choice

angstromctf · Aug 26, 2016 · a04b25a · a04b25a
1 parent db5a6c1
commit a04b25a
Show file tree

Hide file tree

Showing 119 changed files with 32 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/Dockerfile b/Dockerfile
diff --git a/LICENSE.txt b/LICENSE.txt
diff --git a/README.md b/README.md
diff --git a/core/.gitignore b/core/.gitignore
diff --git a/core/__init__.py b/core/__init__.py
diff --git a/core/admin.py b/core/admin.py
diff --git a/core/context_processors.py b/core/context_processors.py
diff --git a/core/decorators.py b/core/decorators.py
diff --git a/core/forms.py b/core/forms.py
@@ -12,6 +12,8 @@
 from crispy_forms.layout import Layout, Fieldset, HTML
 from crispy_forms.bootstrap import StrictButton, InlineRadios, Field, FieldWithButtons
 
+from django_countries import countries
+
 import lob
 import requests
 
@@ -148,6 +150,7 @@ class CreateUserForm(forms.Form):
     gender = forms.ChoiceField(choices=GENDER_CHOICES, required=False)
     race = forms.ChoiceField(choices=RACE_CHOICES, required=False)
     age = forms.IntegerField(required=False)
+    country = forms.ChoiceField(choices=countries)
 
     def __init__(self, *args, **kwargs):
         captcha_enabled = settings.CONFIG['signup_captcha']['enabled']
@@ -177,7 +180,8 @@ def __init__(self, *args, **kwargs):
                     and will not be disclosed to any other parties for any reason.</span><br/><br/><br/>"""),
                 InlineRadios('gender'),
                 InlineRadios('race'),
-                Field('age', placeholder='Age')
+                Field('age', placeholder='Age'),
+                Field('country', placeholder='Countries')
             ),
             HTML('<br/>'),
             (HTML('<div class="g-recaptcha" data-sitekey="' + public_key + '"></div>') if captcha_enabled else HTML('')),

diff --git a/core/management/__init__.py b/core/management/__init__.py
diff --git a/core/management/commands/__init__.py b/core/management/commands/__init__.py
diff --git a/core/management/commands/clearpoints.py b/core/management/commands/clearpoints.py
diff --git a/core/management/commands/fixscores.py b/core/management/commands/fixscores.py
diff --git a/core/management/commands/resetctf.py b/core/management/commands/resetctf.py
diff --git a/core/models.py b/core/models.py
@@ -159,4 +159,12 @@ class ProblemUpdate(models.Model):
 
     # Magic methods
     def __str__(self):
-        return "%s updated at %s: %s" % (str(self.problem), str(self.time), str(self.time))
+        return "%s updated at %s: %s" % (str(self.problem), str(self.time), str(self.time))
+
+class Sponsor(models.Model):
+    """A company or organization who sponsored this competition."""
+
+    # Company information
+    name = models.CharField(max_length=256)
+    text = models.TextField()
+
diff --git a/core/static/.gitignore b/core/static/.gitignore
diff --git a/core/static/css/about.css b/core/static/css/about.css
diff --git a/core/static/css/animate.min.css b/core/static/css/animate.min.css
diff --git a/core/static/css/bootstrap.min.css b/core/static/css/bootstrap.min.css
diff --git a/core/static/css/index.css b/core/static/css/index.css
diff --git a/core/static/css/problems.css b/core/static/css/problems.css
diff --git a/core/static/css/profile.css b/core/static/css/profile.css
diff --git a/core/static/css/scoreboard.css b/core/static/css/scoreboard.css
diff --git a/core/static/css/theme.css b/core/static/css/theme.css
diff --git a/core/static/fonts/glyphicons-halflings-regular.eot b/core/static/fonts/glyphicons-halflings-regular.eot
diff --git a/core/static/fonts/glyphicons-halflings-regular.svg b/core/static/fonts/glyphicons-halflings-regular.svg
diff --git a/core/static/fonts/glyphicons-halflings-regular.ttf b/core/static/fonts/glyphicons-halflings-regular.ttf
diff --git a/core/static/fonts/glyphicons-halflings-regular.woff b/core/static/fonts/glyphicons-halflings-regular.woff
diff --git a/core/static/fonts/glyphicons-halflings-regular.woff2 b/core/static/fonts/glyphicons-halflings-regular.woff2
diff --git a/core/static/images/DO_Logo_Horizontal_Blue-a2b16fb8.png b/core/static/images/DO_Logo_Horizontal_Blue-a2b16fb8.png
diff --git a/core/static/images/DO_Proudly_Hosted_Badge_Blue-735d53ec.png b/core/static/images/DO_Proudly_Hosted_Badge_Blue-735d53ec.png
diff --git a/core/static/images/bae_systems.png b/core/static/images/bae_systems.png
diff --git a/core/static/images/email.png b/core/static/images/email.png
diff --git a/core/static/images/facebook.png b/core/static/images/facebook.png
diff --git a/core/static/images/favicon.png b/core/static/images/favicon.png
diff --git a/core/static/images/favicon_old.png b/core/static/images/favicon_old.png
diff --git a/core/static/images/github.png b/core/static/images/github.png
diff --git a/core/static/images/lock.png b/core/static/images/lock.png
diff --git a/core/static/images/logo.svg b/core/static/images/logo.svg
diff --git a/core/static/images/logrhythm.png b/core/static/images/logrhythm.png
diff --git a/core/static/images/proh.png b/core/static/images/proh.png
diff --git a/core/static/images/twitter.png b/core/static/images/twitter.png
diff --git a/core/static/js/bootstrap-notify.min.js b/core/static/js/bootstrap-notify.min.js
diff --git a/core/static/js/bootstrap.min.js b/core/static/js/bootstrap.min.js
diff --git a/core/static/js/csrf.js b/core/static/js/csrf.js
diff --git a/core/static/js/ie10-viewport-bug-workaround.js b/core/static/js/ie10-viewport-bug-workaround.js
diff --git a/core/static/js/index.js b/core/static/js/index.js
diff --git a/core/static/js/problems.js b/core/static/js/problems.js
diff --git a/core/templates/404.html b/core/templates/404.html
diff --git a/core/templates/about.html b/core/templates/about.html
diff --git a/core/templates/account.html b/core/templates/account.html
diff --git a/core/templates/activation.html b/core/templates/activation.html
diff --git a/core/templates/activation_email_template.txt b/core/templates/activation_email_template.txt
diff --git a/core/templates/base.html b/core/templates/base.html
@@ -47,7 +47,7 @@
 		<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
 
         <div id="wrapper">
-            <nav class="navbar navbar-default navbar-static-top block" id="header-nav">
+            <nav class="navbar navbar-default navbar-fixed-top block" id="header-nav">
                 <div class="container">
                     <div class="navbar-header">
                         <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">

diff --git a/core/templates/chat.html b/core/templates/chat.html
diff --git a/core/templates/denied.html b/core/templates/denied.html
diff --git a/core/templates/index.html b/core/templates/index.html
diff --git a/core/templates/login.html b/core/templates/login.html
diff --git a/core/templates/message.html b/core/templates/message.html
diff --git a/core/templates/problem.html b/core/templates/problem.html
diff --git a/core/templates/problems.html b/core/templates/problems.html
diff --git a/core/templates/profile.html b/core/templates/profile.html
diff --git a/core/templates/registration/password_reset_complete.html b/core/templates/registration/password_reset_complete.html
diff --git a/core/templates/registration/password_reset_confirm.html b/core/templates/registration/password_reset_confirm.html
diff --git a/core/templates/registration/password_reset_done.html b/core/templates/registration/password_reset_done.html
diff --git a/core/templates/registration/password_reset_email.html b/core/templates/registration/password_reset_email.html
diff --git a/core/templates/registration/password_reset_form.html b/core/templates/registration/password_reset_form.html
diff --git a/core/templates/registration/password_reset_subject.txt b/core/templates/registration/password_reset_subject.txt
diff --git a/core/templates/score.html b/core/templates/score.html
diff --git a/core/templates/scoreboard.html b/core/templates/scoreboard.html
diff --git a/core/templates/shelld.html b/core/templates/shelld.html
diff --git a/core/templates/signup.html b/core/templates/signup.html
diff --git a/core/templates/sponsors.html b/core/templates/sponsors.html
diff --git a/core/templates/unsubscribe.html b/core/templates/unsubscribe.html
diff --git a/core/templates/updates.html b/core/templates/updates.html
diff --git a/core/templatetags/__init__.py b/core/templatetags/__init__.py
diff --git a/core/templatetags/extras.py b/core/templatetags/extras.py
diff --git a/core/tests/__init__.py b/core/tests/__init__.py
diff --git a/core/tests/test_lock.py b/core/tests/test_lock.py
diff --git a/core/tests/test_submit_problem.py b/core/tests/test_submit_problem.py
diff --git a/core/tests/test_validators.py b/core/tests/test_validators.py
diff --git a/core/urls.py b/core/urls.py
diff --git a/core/utils/__init__.py b/core/utils/__init__.py
diff --git a/core/utils/globals.py b/core/utils/globals.py
diff --git a/core/utils/time.py b/core/utils/time.py
diff --git a/core/validators.py b/core/validators.py
diff --git a/core/views/__init__.py b/core/views/__init__.py
diff --git a/core/views/activation.py b/core/views/activation.py
@@ -12,7 +12,6 @@
 import hashlib
 import random
 
-
 EXPIRATION = timedelta(days=2)
 
 
@@ -47,8 +46,8 @@ def activation(request, key):
         'activation_expired': activation_expired,
         'already_active': already_active,
         'activation_success': activation_success,
-        'resend_userid': resend_userid}
-                  )
+        'resend_userid': resend_userid
+    })
 
 
 def new_activation_link(request, user_id):
@@ -81,12 +80,14 @@ def send_activation_email(user, request=None, use_https=False):
     with open('core/templates/activation_email_template.txt', 'r') as template_file:
         template = Template(template_file.read())
 
-    context = Context({'activation_key': user.profile.activation_key,
-                       'username': user.get_username(),
-                       'domain': current_site.domain,
-                       'ctf_name': ctf_name,
-                       'ctf_domain': ctf_domain,
-                       'protocol': link_protocol})
+    context = Context({
+        'activation_key': user.profile.activation_key,
+        'username': user.get_username(),
+        'domain': current_site.domain,
+        'ctf_name': ctf_name,
+        'ctf_domain': ctf_domain,
+        'protocol': link_protocol
+    })
 
     message_text = template.render(context)
 

diff --git a/core/views/index.py b/core/views/index.py
diff --git a/core/views/problems.py b/core/views/problems.py
diff --git a/core/views/team.py b/core/views/team.py
diff --git a/core/views/user.py b/core/views/user.py
diff --git a/djangoctf/.gitignore b/djangoctf/.gitignore
diff --git a/djangoctf/__init__.py b/djangoctf/__init__.py
diff --git a/djangoctf/settings.dev.example.json b/djangoctf/settings.dev.example.json
diff --git a/djangoctf/settings.prod.example.json b/djangoctf/settings.prod.example.json
diff --git a/djangoctf/settings.py b/djangoctf/settings.py
@@ -38,6 +38,7 @@
     'core',
     'learn',
     'crispy_forms',
+    'django_countries'
 )
 
 MIDDLEWARE_CLASSES = (
@@ -158,4 +159,7 @@
     EMAIL_PORT = 587
     EMAIL_USE_TLS = True
     SERVER_EMAIL = 'angstromCTF Team <[email protected]>'
-    DEFAULT_FROM_EMAIL = 'angstromCTF Team <[email protected]>'
+    DEFAULT_FROM_EMAIL = 'angstromCTF Team <[email protected]>'
+
+COUNTRIES_FIRST = ['US']
+COUNTRIES_FIRST_REPEAT = True
diff --git a/djangoctf/urls.py b/djangoctf/urls.py
diff --git a/djangoctf/wsgi.py b/djangoctf/wsgi.py
diff --git a/importer.py b/importer.py
diff --git a/learn/.gitignore b/learn/.gitignore
diff --git a/learn/__init__.py b/learn/__init__.py
diff --git a/learn/admin.py b/learn/admin.py
diff --git a/learn/apps.py b/learn/apps.py
diff --git a/learn/management/commands/__init__.py b/learn/management/commands/__init__.py
diff --git a/learn/management/commands/importmodules.py b/learn/management/commands/importmodules.py
diff --git a/learn/models.py b/learn/models.py
diff --git a/learn/static/css/learn.css b/learn/static/css/learn.css
diff --git a/learn/templates/module.html b/learn/templates/module.html
diff --git a/learn/templatetags/__init__.py b/learn/templatetags/__init__.py
diff --git a/learn/templatetags/learn_extras.py b/learn/templatetags/learn_extras.py
diff --git a/learn/tests.py b/learn/tests.py
diff --git a/learn/urls.py b/learn/urls.py
diff --git a/learn/views.py b/learn/views.py
diff --git a/manage.py b/manage.py
diff --git a/requirements.txt b/requirements.txt
@@ -3,15 +3,13 @@ django-crispy-forms==1.6.0
 django-multidb-router==0.6
 django-password-reset==0.8.2
 django-redis-sessions==0.5.0
-django-registration==2.0.4
-ecdsa==0.13
 lob==2.24
 paramiko==1.16.0
 psycopg2==2.6.1
-pycrypto==2.6.1
 redis==2.10.5
 requests==2.9.1
 sendgrid==1.5.20
 smtpapi==0.2.0
 uWSGI==2.0.13.1
-markdown2==2.3.1
+markdown2==2.3.1
+django-countries==4.0
diff --git a/uwsgi.ini b/uwsgi.ini
diff --git a/uwsgi_params b/uwsgi_params