From bdf6b469ad4ced0379e2382826126bd8fdd4fdf9 Mon Sep 17 00:00:00 2001
From: Jan Tuomi <jans.tuomi@gmail.com>
Date: Sun, 28 Jan 2018 18:54:45 +0200
Subject: [PATCH] Move ohlhafv to its own app

---
 .gitignore                                    |  3 +-
 kaehmy/static/{ => kaehmy}/css/base.css       |  0
 kaehmy/static/{ => kaehmy}/css/footer.css     |  2 +-
 kaehmy/static/{ => kaehmy}/css/header.css     |  0
 kaehmy/static/{ => kaehmy}/css/nav.css        |  0
 kaehmy/static/{ => kaehmy}/css/readme.md      |  0
 kaehmy/templates/base.html                    | 11 ++--
 kaehmy/templates/header.html                  |  1 -
 kaehmy/templates/navigation.html              |  1 -
 ohlhafv/__init__.py                           |  0
 ohlhafv/admin.py                              |  4 ++
 ohlhafv/apps.py                               |  5 ++
 ohlhafv/forms.py                              | 18 +++++++
 ohlhafv/migrations/0001_initial.py            | 32 ++++++++++++
 ohlhafv/migrations/__init__.py                |  0
 ohlhafv/models.py                             | 44 ++++++++++++++++
 .../static/ohlhafv/css}/base.css              |  5 ++
 .../static/ohlhafv/css/footer.css             |  2 +-
 .../static/ohlhafv/css/header.css             |  8 ---
 .../static/ohlhafv/css/nav.css                |  2 +-
 .../static/ohlhafv}/img/heevi_banner.svg      |  0
 ohlhafv/tables.py                             | 10 ++++
 ohlhafv/templates/base.html                   | 28 +++++++++++
 ohlhafv/templates/footer.html                 | 25 ++++++++++
 .../ohlhafv => ohlhafv/templates}/header.html |  4 +-
 .../ohlhafv => ohlhafv/templates}/list.html   |  4 +-
 .../templates}/navigation.html                |  3 +-
 .../ohlhafv => ohlhafv/templates}/new.html    |  4 +-
 ohlhafv/tests.py                              |  3 ++
 ohlhafv/urls.py                               | 18 +++++++
 ohlhafv/views.py                              | 50 +++++++++++++++++++
 sikweb/base.py                                |  1 +
 sikweb/urls.py                                |  1 +
 webapp/admin.py                               |  2 -
 webapp/forms.py                               | 14 ------
 .../0039_delete_ohlhafvchallenge.py           | 18 +++++++
 webapp/models.py                              | 28 -----------
 webapp/static/css/kaehmy_header.css           | 37 --------------
 webapp/static/css/webapp_kaehmy.css           | 35 -------------
 webapp/tables.py                              |  7 ---
 webapp/templates/form_base.html               | 50 -------------------
 webapp/templates/ohlhafv/base.html            | 20 --------
 webapp/urls.py                                |  8 ---
 webapp/views.py                               | 36 +------------
 44 files changed, 282 insertions(+), 262 deletions(-)
 rename kaehmy/static/{ => kaehmy}/css/base.css (100%)
 rename kaehmy/static/{ => kaehmy}/css/footer.css (99%)
 rename kaehmy/static/{ => kaehmy}/css/header.css (100%)
 rename kaehmy/static/{ => kaehmy}/css/nav.css (100%)
 rename kaehmy/static/{ => kaehmy}/css/readme.md (100%)
 create mode 100644 ohlhafv/__init__.py
 create mode 100644 ohlhafv/admin.py
 create mode 100644 ohlhafv/apps.py
 create mode 100644 ohlhafv/forms.py
 create mode 100644 ohlhafv/migrations/0001_initial.py
 create mode 100644 ohlhafv/migrations/__init__.py
 create mode 100644 ohlhafv/models.py
 rename {webapp/static/css/ohlhafv => ohlhafv/static/ohlhafv/css}/base.css (93%)
 rename webapp/static/css/kaehmy_footer.css => ohlhafv/static/ohlhafv/css/footer.css (99%)
 rename webapp/static/css/ohlhafv_header.css => ohlhafv/static/ohlhafv/css/header.css (90%)
 rename webapp/static/css/kaehmy_nav.css => ohlhafv/static/ohlhafv/css/nav.css (86%)
 rename {webapp/static => ohlhafv/static/ohlhafv}/img/heevi_banner.svg (100%)
 create mode 100644 ohlhafv/tables.py
 create mode 100644 ohlhafv/templates/base.html
 create mode 100644 ohlhafv/templates/footer.html
 rename {webapp/templates/ohlhafv => ohlhafv/templates}/header.html (53%)
 rename {webapp/templates/ohlhafv => ohlhafv/templates}/list.html (77%)
 rename {webapp/templates/ohlhafv => ohlhafv/templates}/navigation.html (81%)
 rename {webapp/templates/ohlhafv => ohlhafv/templates}/new.html (87%)
 create mode 100644 ohlhafv/tests.py
 create mode 100644 ohlhafv/urls.py
 create mode 100644 ohlhafv/views.py
 create mode 100644 webapp/migrations/0039_delete_ohlhafvchallenge.py
 delete mode 100644 webapp/static/css/kaehmy_header.css
 delete mode 100644 webapp/static/css/webapp_kaehmy.css
 delete mode 100644 webapp/templates/form_base.html
 delete mode 100644 webapp/templates/ohlhafv/base.html

diff --git a/.gitignore b/.gitignore
index d765d1f..3027d51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,4 +17,5 @@ requirements_henu.txt
 /collected_static/
 mydatabase
 settings.json
-.vscode/
\ No newline at end of file
+.vscode/
+.DS_Store
diff --git a/kaehmy/static/css/base.css b/kaehmy/static/kaehmy/css/base.css
similarity index 100%
rename from kaehmy/static/css/base.css
rename to kaehmy/static/kaehmy/css/base.css
diff --git a/kaehmy/static/css/footer.css b/kaehmy/static/kaehmy/css/footer.css
similarity index 99%
rename from kaehmy/static/css/footer.css
rename to kaehmy/static/kaehmy/css/footer.css
index bf63819..8c8bba8 100644
--- a/kaehmy/static/css/footer.css
+++ b/kaehmy/static/kaehmy/css/footer.css
@@ -7,7 +7,7 @@ footer {
     bottom: 0;
     width: 100%;
     height: 60px; /* Set the fixed height of the footer here */
-    /* line-height: 60px; /* Vertically center the text there */ */
+    /* line-height: 60px; /* Vertically center the text there */
     margin-top: 2rem;
     margin-bottom: 1rem;
 }
diff --git a/kaehmy/static/css/header.css b/kaehmy/static/kaehmy/css/header.css
similarity index 100%
rename from kaehmy/static/css/header.css
rename to kaehmy/static/kaehmy/css/header.css
diff --git a/kaehmy/static/css/nav.css b/kaehmy/static/kaehmy/css/nav.css
similarity index 100%
rename from kaehmy/static/css/nav.css
rename to kaehmy/static/kaehmy/css/nav.css
diff --git a/kaehmy/static/css/readme.md b/kaehmy/static/kaehmy/css/readme.md
similarity index 100%
rename from kaehmy/static/css/readme.md
rename to kaehmy/static/kaehmy/css/readme.md
diff --git a/kaehmy/templates/base.html b/kaehmy/templates/base.html
index 4e66d42..06e360b 100644
--- a/kaehmy/templates/base.html
+++ b/kaehmy/templates/base.html
@@ -4,19 +4,22 @@
 {% load i18n %}
 
 {% block styles %}
-<link rel="stylesheet" href="{% static "css/base.css" %}">
+<link rel="stylesheet" href="{% static "kaehmy/css/base.css" %}">
+<link rel="stylesheet" href="{% static "kaehmy/css/header.css" %}">
+<link rel="stylesheet" href="{% static "kaehmy/css/nav.css" %}">
+<link rel="stylesheet" href="{% static "kaehmy/css/footer.css" %}">
 {% endblock styles %}
 
 {% block body %}
 
 {% block header %}
 <div class="kaehmy_header">
-    {% include ":header.html" %}
+    {% include "kaehmy:header.html" %}
 </div>
 {% endblock header %}
 
 {% block navigation %}
-    {% include ":navigation.html" %}
+    {% include "kaehmy:navigation.html" %}
 {% endblock %}
 
 <div class="kaehmy-content">
@@ -25,7 +28,7 @@
 </div>
 <div class="footer">
     {% block footer %}
-        {% include ":footer.html" %}
+        {% include "kaehmy:footer.html" %}
     {% endblock footer %}
 </div>
 
diff --git a/kaehmy/templates/header.html b/kaehmy/templates/header.html
index 59cb76a..008555a 100644
--- a/kaehmy/templates/header.html
+++ b/kaehmy/templates/header.html
@@ -1,5 +1,4 @@
 {% load i18n %}
-<link rel="stylesheet" href="/static/css/kaehmy_header.css">
 
 <div class="kaehmy_header-content">
     <div class="kaehmy-banner logo">
diff --git a/kaehmy/templates/navigation.html b/kaehmy/templates/navigation.html
index 7655ba9..b9e8919 100644
--- a/kaehmy/templates/navigation.html
+++ b/kaehmy/templates/navigation.html
@@ -1,7 +1,6 @@
 {% load i18n %}
 {% load static %}
 
-<link rel="stylesheet" href="{% static "css/nav.css" %}">
 <div class="kaehmy_navigation">
     <nav class="navbar-border navbar navbar-toggleable-md navbar-light bg-faded">
         <div class="navbar-nav">
diff --git a/ohlhafv/__init__.py b/ohlhafv/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/ohlhafv/admin.py b/ohlhafv/admin.py
new file mode 100644
index 0000000..791b1a9
--- /dev/null
+++ b/ohlhafv/admin.py
@@ -0,0 +1,4 @@
+from django.contrib import admin
+from ohlhafv.models import OhlhafvChallenge
+
+admin.site.register(OhlhafvChallenge)
diff --git a/ohlhafv/apps.py b/ohlhafv/apps.py
new file mode 100644
index 0000000..5ec65cf
--- /dev/null
+++ b/ohlhafv/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class OhlhafvConfig(AppConfig):
+    name = 'ohlhafv'
diff --git a/ohlhafv/forms.py b/ohlhafv/forms.py
new file mode 100644
index 0000000..45f5b96
--- /dev/null
+++ b/ohlhafv/forms.py
@@ -0,0 +1,18 @@
+"""File containing Ohlhafv forms."""
+
+from django import forms
+from django.utils.translation import ugettext_lazy as _
+from django.core.exceptions import ValidationError
+
+from ohlhafv.models import OhlhafvChallenge
+
+
+class OhlhafvForm(forms.ModelForm):
+    """Class representing Ohlhafv form."""
+
+    class Meta:
+        """Meta class for Ohlhafv form."""
+
+        model = OhlhafvChallenge
+        fields = ['challenger', 'challenger_email',
+                  'victim', 'victim_email', 'series', 'message']
diff --git a/ohlhafv/migrations/0001_initial.py b/ohlhafv/migrations/0001_initial.py
new file mode 100644
index 0000000..9b34fac
--- /dev/null
+++ b/ohlhafv/migrations/0001_initial.py
@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-01-28 15:48
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='OhlhafvChallenge',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('challenger', models.CharField(max_length=255, verbose_name='Challenger')),
+                ('victim', models.CharField(max_length=255, verbose_name='Victim')),
+                ('challenger_email', models.EmailField(max_length=254, verbose_name='Challenger email')),
+                ('victim_email', models.EmailField(max_length=254, verbose_name='Victim email')),
+                ('series', models.CharField(choices=[('0.33 L', '0.33 L'), ('0.5 L', '0.5 L'), ('1.0 L', '1.0 L'), ('Team', 'Team Challenge (1 x 0.33 L, 2 x 0.5 L, 1 x 1.0 L)')], max_length=10, verbose_name='Series')),
+                ('message', models.TextField(blank=True, verbose_name='Message')),
+            ],
+            options={
+                'verbose_name': 'Ohlhafv challenge',
+                'verbose_name_plural': 'Ohlhafv challenges',
+            },
+        ),
+    ]
diff --git a/ohlhafv/migrations/__init__.py b/ohlhafv/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/ohlhafv/models.py b/ohlhafv/models.py
new file mode 100644
index 0000000..a17288f
--- /dev/null
+++ b/ohlhafv/models.py
@@ -0,0 +1,44 @@
+"""Ohlhafv app models."""
+
+from django.db import models
+from django.utils import timezone
+from datetime import timedelta
+from django.contrib.auth.models import User
+from webapp.utils import month_from_now
+from django.utils.translation import ugettext_lazy as _
+from django.contrib.auth.models import User
+from auditlog.registry import auditlog
+from phonenumber_field.modelfields import PhoneNumberField
+from django.contrib.postgres.fields import JSONField
+
+import logging
+
+VERBOSE_NAME = _('Ohlhafv')
+
+
+class OhlhafvChallenge(models.Model):
+    """Model containing all info about ohlhafv challenge."""
+
+    class Meta:
+        verbose_name = _('Ohlhafv challenge')
+        verbose_name_plural = _('Ohlhafv challenges')
+
+    SERIES_CHOICES = (
+        ('0.33 L', '0.33 L'),
+        ('0.5 L', '0.5 L'),
+        ('1.0 L', '1.0 L'),
+        ('Team', _('Team Challenge (1 x 0.33 L, 2 x 0.5 L, 1 x 1.0 L)'))
+    )
+
+    challenger = models.CharField(_('Challenger'), max_length=255)
+    victim = models.CharField(_('Victim'), max_length=255)
+    challenger_email = models.EmailField(_('Challenger email'))
+    victim_email = models.EmailField(_('Victim email'))
+    series = models.CharField(_('Series'), choices=SERIES_CHOICES, max_length=10)
+    message = models.TextField(_('Message'), blank=True, null=False)
+
+    def __str__(self):
+        """Return model info."""
+        return _('Ohlhafv challenge: {} vs. {}').format(self.challenger, self.victim)
+
+auditlog.register(OhlhafvChallenge)
diff --git a/webapp/static/css/ohlhafv/base.css b/ohlhafv/static/ohlhafv/css/base.css
similarity index 93%
rename from webapp/static/css/ohlhafv/base.css
rename to ohlhafv/static/ohlhafv/css/base.css
index b8e837b..03a8496 100644
--- a/webapp/static/css/ohlhafv/base.css
+++ b/ohlhafv/static/ohlhafv/css/base.css
@@ -4,6 +4,8 @@ html, body {
 
 body {
   padding: 0 1rem 0;
+  max-width: 1000px;
+  margin: 0 auto 0;
 }
 
 .bg-faded, .form-control {
@@ -12,6 +14,8 @@ body {
   color: black;
 
   border-radius: 0;
+  -webkit-appearance: none;
+
   box-shadow: 10px 10px rgba(0, 0, 0, 0.5);
 }
 
@@ -84,6 +88,7 @@ h3 {
 
 .card h5 {
   color: black;
+  padding: 1rem 0 1rem;
 }
 
 .card p {
diff --git a/webapp/static/css/kaehmy_footer.css b/ohlhafv/static/ohlhafv/css/footer.css
similarity index 99%
rename from webapp/static/css/kaehmy_footer.css
rename to ohlhafv/static/ohlhafv/css/footer.css
index bf63819..8c8bba8 100644
--- a/webapp/static/css/kaehmy_footer.css
+++ b/ohlhafv/static/ohlhafv/css/footer.css
@@ -7,7 +7,7 @@ footer {
     bottom: 0;
     width: 100%;
     height: 60px; /* Set the fixed height of the footer here */
-    /* line-height: 60px; /* Vertically center the text there */ */
+    /* line-height: 60px; /* Vertically center the text there */
     margin-top: 2rem;
     margin-bottom: 1rem;
 }
diff --git a/webapp/static/css/ohlhafv_header.css b/ohlhafv/static/ohlhafv/css/header.css
similarity index 90%
rename from webapp/static/css/ohlhafv_header.css
rename to ohlhafv/static/ohlhafv/css/header.css
index 9ac33d7..a5086e0 100644
--- a/webapp/static/css/ohlhafv_header.css
+++ b/ohlhafv/static/ohlhafv/css/header.css
@@ -1,11 +1,3 @@
-.header-content {
-
-}
-
-.header-content .logo {
-
-}
-
 .header-content .logo img {
     display: block;
     height: auto;
diff --git a/webapp/static/css/kaehmy_nav.css b/ohlhafv/static/ohlhafv/css/nav.css
similarity index 86%
rename from webapp/static/css/kaehmy_nav.css
rename to ohlhafv/static/ohlhafv/css/nav.css
index ee7db33..82e804a 100644
--- a/webapp/static/css/kaehmy_nav.css
+++ b/ohlhafv/static/ohlhafv/css/nav.css
@@ -1,4 +1,4 @@
-.kaehmy_navigation {
+.ohlhafv_navigation {
     margin-bottom: 10px;
 }
 
diff --git a/webapp/static/img/heevi_banner.svg b/ohlhafv/static/ohlhafv/img/heevi_banner.svg
similarity index 100%
rename from webapp/static/img/heevi_banner.svg
rename to ohlhafv/static/ohlhafv/img/heevi_banner.svg
diff --git a/ohlhafv/tables.py b/ohlhafv/tables.py
new file mode 100644
index 0000000..8623dfc
--- /dev/null
+++ b/ohlhafv/tables.py
@@ -0,0 +1,10 @@
+import django_tables2 as tables
+from django.db.models import Count, Q
+from django.utils.translation import ugettext as _
+
+from ohlhafv.models import OhlhafvChallenge
+
+
+class OhlhafvTable(tables.Table):
+    class Meta:
+        model = OhlhafvChallenge
diff --git a/ohlhafv/templates/base.html b/ohlhafv/templates/base.html
new file mode 100644
index 0000000..40d9c72
--- /dev/null
+++ b/ohlhafv/templates/base.html
@@ -0,0 +1,28 @@
+{% extends "project.html" %}
+
+{% load static %}
+{% load i18n %}
+
+{% block styles %}
+<link rel="stylesheet" href="{% static "ohlhafv/css/base.css" %}">
+<link rel="stylesheet" href="{% static "ohlhafv/css/header.css" %}">
+<link rel="stylesheet" href="{% static "ohlhafv/css/nav.css" %}">
+{% endblock styles %}
+
+{% block body %}
+{% block header %}
+    {% include "ohlhafv:header.html" %}
+{% endblock header %}
+
+{% block navigation %}
+    {% include "ohlhafv:navigation.html" %}
+{% endblock %}
+
+{% block content %}
+{% endblock %}
+
+{% block footer %}
+    {% include "ohlhafv:footer.html" %}
+{% endblock footer %}
+
+{% endblock body %}
\ No newline at end of file
diff --git a/ohlhafv/templates/footer.html b/ohlhafv/templates/footer.html
new file mode 100644
index 0000000..6945af3
--- /dev/null
+++ b/ohlhafv/templates/footer.html
@@ -0,0 +1,25 @@
+{% load i18n %}
+{% load static %}
+{% load staticfiles %}
+<link rel="stylesheet" href="{% static "ohlhafv/css/footer.css" %}">
+
+<footer style="text-align: center">
+    <div>
+        <form class="lang-form form" action="{% url 'set_language' %}" method="post">{% csrf_token %}
+            <span>
+                <input name="next" type="hidden" value="{{ redirect_to }}" />
+                <select onchange="this.form.submit()" class="lang-select form-control" name="language">
+                    {% get_current_language as LANGUAGE_CODE %}
+                    {% get_available_languages as LANGUAGES %}
+                    {% get_language_info_list for LANGUAGES as languages %}
+                    {% for language in languages %}
+                    <option value="{{ language.code }}"{% if language.code == LANGUAGE_CODE %} selected="selected"{% endif %}>
+                        {{ language.name_local }} ({{ language.code }})
+                    </option>
+                    {% endfor %}
+                </select>
+            </span>
+        </form>
+        <span>{% trans "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" %} {% now 'Y' %}</span>
+    </div>
+</footer>
diff --git a/webapp/templates/ohlhafv/header.html b/ohlhafv/templates/header.html
similarity index 53%
rename from webapp/templates/ohlhafv/header.html
rename to ohlhafv/templates/header.html
index 5227112..be251ad 100644
--- a/webapp/templates/ohlhafv/header.html
+++ b/ohlhafv/templates/header.html
@@ -1,8 +1,8 @@
 {% load i18n %}
-<link rel="stylesheet" href="/static/css/ohlhafv_header.css">
+{% load static %}
 
 <div class="ohlhafv-header-content">
     <div class="ohlhafv-banner logo">
-        <a href="/ohlhafv"><img class="ohlhafv-banner-image" src="/static/img/heevi_banner.svg" alt="Aalto-yliopiston Sähköinsinöörikilta ry"></a>
+        <a href="/ohlhafv"><img class="ohlhafv-banner-image" src="{% static "ohlhafv/img/heevi_banner.svg" %}" alt="Aalto-yliopiston Sähköinsinöörikilta ry"></a>
     </div>
 </div>
diff --git a/webapp/templates/ohlhafv/list.html b/ohlhafv/templates/list.html
similarity index 77%
rename from webapp/templates/ohlhafv/list.html
rename to ohlhafv/templates/list.html
index 576ac75..59ff237 100644
--- a/webapp/templates/ohlhafv/list.html
+++ b/ohlhafv/templates/list.html
@@ -1,4 +1,4 @@
-{% extends "ohlhafv/base.html" %}
+{% extends "ohlhafv:base.html" %}
 
 {% load static %}
 {% load i18n %}
@@ -16,7 +16,7 @@
 <div class="card">
     <h4 class="card-header">{{ challenge.challenger }} vs. {{ challenge.victim }}</h4>            
     <div class="card-block">
-        <h5 style="padding-bottom: 1rem" class="card-subtitle mb-2 text-muted">{{ challenge.get_series_display }}</h5>
+        <h5 class="card-subtitle mb-2">{{ challenge.get_series_display }}</h5>
         <p class="card-text">{{ challenge.message|linebreaks|urlize }}</p>
     </div>
 </div>
diff --git a/webapp/templates/ohlhafv/navigation.html b/ohlhafv/templates/navigation.html
similarity index 81%
rename from webapp/templates/ohlhafv/navigation.html
rename to ohlhafv/templates/navigation.html
index 53f3da3..62a6a9d 100644
--- a/webapp/templates/ohlhafv/navigation.html
+++ b/ohlhafv/templates/navigation.html
@@ -1,6 +1,5 @@
 {% load i18n %}
-<link rel="stylesheet" href="/static/css/kaehmy_nav.css">
-<div class="kaehmy_navigation">
+<div class="ohlhafv_navigation">
     <nav class="navbar-border navbar navbar-toggleable-md navbar-light bg-faded">
         <div class="navbar-nav">
             <a class="nav-item nav-link" href="/ohlhafv">{% trans "New challenge" %} <span class="sr-only">(current)</span></a>
diff --git a/webapp/templates/ohlhafv/new.html b/ohlhafv/templates/new.html
similarity index 87%
rename from webapp/templates/ohlhafv/new.html
rename to ohlhafv/templates/new.html
index 5438757..23d6941 100644
--- a/webapp/templates/ohlhafv/new.html
+++ b/ohlhafv/templates/new.html
@@ -1,10 +1,10 @@
-{% extends ":base.html" %}
+{% extends "ohlhafv:base.html" %}
 
 {% load bootstrap3 %}
 {% load i18n %}
 
 {% block navigation %}
-    {% include ":navigation.html" %}
+    {% include "ohlhafv:navigation.html" %}
 {% endblock %}
 
 {% block content %}
diff --git a/ohlhafv/tests.py b/ohlhafv/tests.py
new file mode 100644
index 0000000..7ce503c
--- /dev/null
+++ b/ohlhafv/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/ohlhafv/urls.py b/ohlhafv/urls.py
new file mode 100644
index 0000000..db56349
--- /dev/null
+++ b/ohlhafv/urls.py
@@ -0,0 +1,18 @@
+"""Ohlhafv urls."""
+
+from django.conf.urls import url
+from django.conf import settings
+from django.utils.translation import ugettext_lazy as _
+
+from ohlhafv.views import *
+
+urlpatterns = [
+    # ohlhafv
+    url(r'^submit', ohlhafv_submit),
+    url(r'^list', ohlhafv_list),
+    url(r'^$', ohlhafv_view)
+]
+
+if settings.DEBUG:
+    from django.contrib.staticfiles.urls import staticfiles_urlpatterns
+    urlpatterns += staticfiles_urlpatterns()
diff --git a/ohlhafv/views.py b/ohlhafv/views.py
new file mode 100644
index 0000000..0c99d60
--- /dev/null
+++ b/ohlhafv/views.py
@@ -0,0 +1,50 @@
+"""Ohlhafv views."""
+
+from django.db.models import Count
+from django.shortcuts import render, redirect
+from django.contrib.auth import login, logout, authenticate
+from django.views.decorators.http import require_http_methods
+from django.views.decorators.csrf import ensure_csrf_cookie
+from django.http import HttpResponse, HttpResponseRedirect
+from django.contrib.auth.decorators import permission_required, login_required
+from django.conf import settings
+
+import logging
+import requests
+from dealer.git import git
+
+from ohlhafv.models import OhlhafvChallenge
+from ohlhafv.forms import OhlhafvForm
+from ohlhafv.tables import OhlhafvTable
+
+
+@require_http_methods(["GET"])
+def ohlhafv_view(request, *args, **kwargs):
+    """Render Ohlhafv form page."""
+    form = OhlhafvForm()
+    return render(request, 'ohlhafv:new.html', {'form': form})
+
+
+@ensure_csrf_cookie
+@require_http_methods(["POST"])
+def ohlhafv_submit(request, *args, **kwargs):
+    """Submit Ohlhafv form."""
+    form = OhlhafvForm(request.POST)
+    if form.is_valid():
+        form.save()
+    else:
+        pass
+    return HttpResponseRedirect('/ohlhafv/list/')
+
+
+@ensure_csrf_cookie
+@require_http_methods(["GET"])
+def ohlhafv_list(request, *args, **kwargs):
+    """Present Ohlhafv challenges list."""
+    challenges = OhlhafvChallenge.objects.all()
+    challenges = challenges.order_by('-id')
+    context = {
+        'challenges': challenges,
+        'challenge_count': len(challenges),
+    }
+    return render(request, 'ohlhafv:list.html', context)
diff --git a/sikweb/base.py b/sikweb/base.py
index 3272cff..2cd946a 100644
--- a/sikweb/base.py
+++ b/sikweb/base.py
@@ -80,6 +80,7 @@ INSTALLED_APPS = [
     'infoscreen',
     'coffee_scale',
     'kaehmy',
+    'ohlhafv',
     'rest_framework',
     'django_nose',
     'bootstrap3',
diff --git a/sikweb/urls.py b/sikweb/urls.py
index 17ac31f..065a7a3 100644
--- a/sikweb/urls.py
+++ b/sikweb/urls.py
@@ -34,6 +34,7 @@ urlpatterns = [
     url(r'^infoscreen/', include('infoscreen.urls')),
     url(r'^coffee/', include('coffee_scale.urls')),
     url(r'^kaehmy/', include('kaehmy.urls')),
+    url(r'^ohlhafv/', include('ohlhafv.urls')),
 
     # admin
     url(r'^admin/', admin.site.urls),
diff --git a/webapp/admin.py b/webapp/admin.py
index 55cb0cd..3443c61 100644
--- a/webapp/admin.py
+++ b/webapp/admin.py
@@ -3,7 +3,6 @@
 from django.contrib import admin
 from webapp.models import Official, Role
 from webapp.models import Feed, Tag, BaseFeed, Event, Registration
-from webapp.models import OhlhafvChallenge
 from modeltranslation.admin import TranslationAdmin
 from django.contrib.auth.models import Permission
 # this is needed so that the models get registered for translation
@@ -17,4 +16,3 @@ admin.site.register(Event, TranslationAdmin)
 admin.site.register(Registration, TranslationAdmin)
 admin.site.register(Official)
 admin.site.register(Role)
-admin.site.register(OhlhafvChallenge)
diff --git a/webapp/forms.py b/webapp/forms.py
index 70f2773..4bda047 100644
--- a/webapp/forms.py
+++ b/webapp/forms.py
@@ -3,17 +3,3 @@
 from django import forms
 from django.utils.translation import ugettext_lazy as _
 from django.core.exceptions import ValidationError
-
-from webapp.models import BaseRole
-from webapp.models import OhlhafvChallenge
-
-
-class OhlhafvForm(forms.ModelForm):
-    """Class representing Ohlhafv form."""
-
-    class Meta:
-        """Meta class for Ohlhafv form."""
-
-        model = OhlhafvChallenge
-        fields = ['challenger', 'challenger_email',
-                  'victim', 'victim_email', 'series', 'message']
diff --git a/webapp/migrations/0039_delete_ohlhafvchallenge.py b/webapp/migrations/0039_delete_ohlhafvchallenge.py
new file mode 100644
index 0000000..ba21bce
--- /dev/null
+++ b/webapp/migrations/0039_delete_ohlhafvchallenge.py
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-01-28 15:48
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('webapp', '0038_auto_20180126_0031'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='OhlhafvChallenge',
+        ),
+    ]
diff --git a/webapp/models.py b/webapp/models.py
index 75733c4..169e5a6 100644
--- a/webapp/models.py
+++ b/webapp/models.py
@@ -153,37 +153,9 @@ class Official(User):
     phone_number = PhoneNumberField(_('Phone number'))
 
 
-# Ohlhafv
-class OhlhafvChallenge(models.Model):
-    """Model containing all info about ohlhafv challenge."""
-
-    class Meta:
-        verbose_name = _('Ohlhafv challenge')
-        verbose_name_plural = _('Ohlhafv challenges')
-
-    SERIES_CHOICES = (
-        ('0.33 L', '0.33 L'),
-        ('0.5 L', '0.5 L'),
-        ('1.0 L', '1.0 L'),
-        ('Team', _('Team Challenge (1 x 0.33 L, 2 x 0.5 L, 1 x 1.0 L)'))
-    )
-
-    challenger = models.CharField(_('Challenger'), max_length=255)
-    victim = models.CharField(_('Victim'), max_length=255)
-    challenger_email = models.EmailField(_('Challenger email'))
-    victim_email = models.EmailField(_('Victim email'))
-    series = models.CharField(_('Series'), choices=SERIES_CHOICES, max_length=10)
-    message = models.TextField(_('Message'), blank=True, null=False)
-
-    def __str__(self):
-        """Return model info."""
-        return _('Ohlhafv challenge: {} vs. {}').format(self.challenger, self.victim)
-
-
 auditlog.register(Tag)
 auditlog.register(Feed)
 auditlog.register(Event)
 auditlog.register(PresetRole)
 auditlog.register(Role)
 auditlog.register(Official)
-auditlog.register(OhlhafvChallenge)
diff --git a/webapp/static/css/kaehmy_header.css b/webapp/static/css/kaehmy_header.css
deleted file mode 100644
index 4e20d7e..0000000
--- a/webapp/static/css/kaehmy_header.css
+++ /dev/null
@@ -1,37 +0,0 @@
-.header-content {
-
-}
-
-.header-content .logo {
-
-}
-
-.header-content .logo img {
-    display: block;
-    height: auto;
-    margin: auto;
-}
-
-.kaehmy-banner {
-    max-width: 1000px;
-    margin-left: auto;
-    margin-right: auto;
-}
-
-@media screen and (min-width: 1000px) {
-    .kaehmy_header-content {
-        position: absolute;
-        left: 0;
-        top: 0;
-        background-color: #052f5f;
-        width: 100%;
-    }
-
-    .kaehmy_header {
-        margin-bottom: 331px;
-    }
-}
-
-.kaehmy-banner-image {
-    width: 100%;
-}
diff --git a/webapp/static/css/webapp_kaehmy.css b/webapp/static/css/webapp_kaehmy.css
deleted file mode 100644
index 710269e..0000000
--- a/webapp/static/css/webapp_kaehmy.css
+++ /dev/null
@@ -1,35 +0,0 @@
-.page-content {
-    margin-top: 1vh;
-    width: 90%;
-    margin-left: auto;
-    margin-right: auto;
-}
-
-body {
-    max-width: 1000px;
-    margin-left: auto !important;
-    margin-right: auto !important;
-}
-
-div.tooltip-inner {
-    max-width: 25rem;
-}
-
-.tooltip {
-    margin-left: 1rem;
-}
-
-.role-filter-form {
-    max-width: 30rem;
-    width: auto;
-    margin-bottom: 1rem;
-}
-
-.kaehmy-content {
-    padding-left: 0.5rem;
-    padding-right: 0.5rem;
-}
-
-p {
-    overflow-wrap: break-word;
-}
\ No newline at end of file
diff --git a/webapp/tables.py b/webapp/tables.py
index 21c11f9..bc9d26a 100644
--- a/webapp/tables.py
+++ b/webapp/tables.py
@@ -1,10 +1,3 @@
 import django_tables2 as tables
 from django.db.models import Count, Q
 from django.utils.translation import ugettext as _
-
-from webapp.models import OhlhafvChallenge
-
-
-class OhlhafvTable(tables.Table):
-    class Meta:
-        model = OhlhafvChallenge
diff --git a/webapp/templates/form_base.html b/webapp/templates/form_base.html
deleted file mode 100644
index 8a6f883..0000000
--- a/webapp/templates/form_base.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE html>
-
-{% load i18n %}
-{% load static %}
-{% load staticfiles %}
-
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <meta name="description" content="Aalto-yliopiston Sähköinsinöörikilta ry">
-        <meta name="author" content="Aalto-yliopiston Sähköinsinöörikilta ry">
-        <link rel="stylesheet" href="/static/css/webapp_kaehmy.css">
-        <title>{% trans "Aalto-yliopiston Sähköinsinöörikilta ry" %}</title>
-
-        <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-        <script src="{% static "js/lib/jquery-3.1.0.min.js" %}"></script>
-        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" integrity="sha384-y3tfxAZXuh4HwSYylfB+J125MxIs6mR5FOHamPBG064zB+AFeWH94NdvaCBm8qnd" crossorigin="anonymous">
-        <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-        <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
-        <script src="{% static "js/lib/underscore-min.js" %}"></script>
-
-        <script>
-        $(function () {
-            $('[data-toggle="tooltip"]').tooltip()
-        })
-        </script>
-    </head>
-    <body>
-        <div class="header">
-            {% block header %}
-            {% endblock header %}
-        </div>
-        
-        <div class="navigation">
-            {% block navigation %}
-            {% endblock %}
-        </div>
-
-        <div class="content">
-            {% block content %}
-            {% endblock %}
-        </div>
-
-        <div class="footer">
-            {% block footer %}
-            {% endblock footer %}
-        </div>
-    </body>
-</html>
diff --git a/webapp/templates/ohlhafv/base.html b/webapp/templates/ohlhafv/base.html
deleted file mode 100644
index 9bd93b6..0000000
--- a/webapp/templates/ohlhafv/base.html
+++ /dev/null
@@ -1,20 +0,0 @@
-{% extends "form_base.html" %}
-
-{% load static %}
-{% load i18n %}
-
-{% block header %}
-    <link rel="stylesheet" href="/static/css/ohlhafv/base.css">
-    {% include "ohlhafv/header.html" %}
-{% endblock header %}
-
-{% block navigation %}
-    {% include "ohlhafv/navigation.html" %}
-{% endblock %}
-
-{% block content %}
-{% endblock %}
-
-{% block footer %}
-    {% include "kaehmy/footer.html" %}
-{% endblock footer %}
\ No newline at end of file
diff --git a/webapp/urls.py b/webapp/urls.py
index 23067db..8095c52 100644
--- a/webapp/urls.py
+++ b/webapp/urls.py
@@ -8,9 +8,6 @@ from webapp.views import main_index
 from webapp.views import login_view
 from webapp.views import logout_view
 from webapp.views import about_view
-from webapp.views import ohlhafv_view
-from webapp.views import ohlhafv_submit
-from webapp.views import ohlhafv_list
 from webapp.views import guild_view
 from webapp.views import freshmen_view
 from webapp.views import jobs_view
@@ -40,11 +37,6 @@ urlpatterns = [
 
     # corporate
     url(r'^jobs', jobs_view),
-
-    # ohlhafv
-    url(r'^ohlhafv/submit', ohlhafv_submit),
-    url(r'^ohlhafv/list', ohlhafv_list),
-    url(r'^ohlhafv', ohlhafv_view),
 ]
 
 
diff --git a/webapp/views.py b/webapp/views.py
index 40bcb68..3b3b7f2 100644
--- a/webapp/views.py
+++ b/webapp/views.py
@@ -13,9 +13,7 @@ import logging
 import requests
 from dealer.git import git
 
-from webapp.models import Official, OhlhafvChallenge
-from webapp.forms import OhlhafvForm
-from webapp.tables import OhlhafvTable
+from webapp.models import Official
 from members.views.utils import *
 
 
@@ -121,35 +119,3 @@ def contact_view(request, *args, **kwargs):
     context = {"kaikki": kaikki}
 
     return render(request, "contact.html", context)
-
-
-@require_http_methods(["GET"])
-def ohlhafv_view(request, *args, **kwargs):
-    """Render Ohlhafv form page."""
-    form = OhlhafvForm()
-    return render(request, 'ohlhafv/new.html', {'form': form})
-
-
-@ensure_csrf_cookie
-@require_http_methods(["POST"])
-def ohlhafv_submit(request, *args, **kwargs):
-    """Submit Ohlhafv form."""
-    form = OhlhafvForm(request.POST)
-    if form.is_valid():
-        form.save()
-    else:
-        pass
-    return HttpResponseRedirect('/ohlhafv/list/')
-
-
-@ensure_csrf_cookie
-@require_http_methods(["GET"])
-def ohlhafv_list(request, *args, **kwargs):
-    """Present Ohlhafv challenges list."""
-    challenges = OhlhafvChallenge.objects.all()
-    challenges = challenges.order_by('-id')
-    context = {
-        'challenges': challenges,
-        'challenge_count': len(challenges),
-    }
-    return render(request, 'ohlhafv/list.html', context)