Merge pull request #129 from abhishekarya286/contestpage

Fix #118: Added contest page functionality (submit for review then add)

Author: tapaswenipathak

oshc/main/admin.py

@@ -3,11 +3,12 @@
 
 from django.contrib import admin
 
-from main.models import chatSession
+from main.models import chatSession, Contest
 
 
 class chatSessionAdmin(admin.ModelAdmin):
     list_display = ('title', 'start_date')
 
 
 admin.site.register(chatSession, chatSessionAdmin)
+admin.site.register(Contest)

oshc/main/migrations/0001_initial.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.2 on 2017-09-16 20:45
+# Generated by Django 1.11.2 on 2017-10-07 16:35
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -16,14 +16,38 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name='chatSession',
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('title', models.CharField(help_text='Session title', max_length=128)),
-                ('profile_name', models.CharField(help_text="The person's name", max_length=128)),
-                ('profile_url', models.URLField(help_text="The Url of the person's website")),
-                ('description', models.TextField(help_text='Session details', max_length=512)),
+                ('id', models.AutoField(auto_created=True,
+                                        primary_key=True,
+                                        serialize=False, verbose_name='ID')),
+                ('title', models.CharField(help_text='Session title',
+                                           max_length=128)),
+                ('profile_name', models.CharField(
+                    help_text="The person's name", max_length=128)),
+                ('profile_url', models.URLField(
+                    help_text="The Url of the person's website")),
+                ('description', models.TextField(
+                    help_text='Session details', max_length=512)),
                 ('start_date', models.DateTimeField()),
                 ('end_date', models.DateTimeField()),
-                ('register_url', models.URLField(help_text='URL for the event registration')),
+                ('register_url', models.URLField(
+                    help_text='URL for the event registration')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Contest',
+            fields=[
+                ('id', models.AutoField(auto_created=True,
+                                        primary_key=True,
+                                        serialize=False, verbose_name='ID')),
+                ('name', models.CharField(help_text='Contest name',
+                                          max_length=128)),
+                ('link',
+                 models.URLField(help_text="URL of the contest's website")),
+                ('description', models.TextField(
+                    help_text='Contest details', max_length=512, null=True)),
+                ('start_date', models.DateField(null=True)),
+                ('end_date', models.DateField(null=True)),
+                ('approved', models.BooleanField(default=False)),
             ],
         ),
     ]

oshc/main/models.py

@@ -15,3 +15,16 @@ class chatSession(models.Model):
 
     def __str__(self):
         return self.title
+
+
+class Contest(models.Model):
+    name = models.CharField(max_length=128, help_text="Contest name")
+    link = models.URLField(help_text="URL of the contest's website")
+    description = models.TextField(max_length=512,
+                                   help_text="Contest details", null=True)
+    start_date = models.DateField(null=True)
+    end_date = models.DateField(null=True)
+    approved = models.BooleanField(default=False)
+
+    def __str__(self):
+        return self.name

oshc/main/templates/base.html

@@ -33,6 +33,7 @@
             </ul>
           </li>
           <li><a href="https://github.com/OpenSourceHelpCommunity" target="_blank">Resources</a></li>
+            <li><a href="{% url 'contests' %}" target="_blank">Contests</a></li>
           <li><a href="mailto:[email protected]" target="_blank">Contact</a></li>
           <li><a href="https://opensourcehelp.herokuapp.com/" target="_blank">Join Us!</a></li>
         </ul>

oshc/main/templates/contest_edit.html

@@ -0,0 +1,50 @@
+{% extends 'base.html' %}
+
+{% block content %}
+
+    <form name="newContest" method="POST" class="form-horizontal" action = "{% url 'add_contest' %}">
+        {% csrf_token %}
+        <div class="form-group">
+            <label style="margin-top:70px;" for="name" class="control-label col-xs-2">Name:</label>
+            <div class="col-xs-3">
+                <input type="text" style="margin-top:70px;" class="form-control" id="name" name="name" placeholder="Contest Name" required>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label for="link" class="control-label col-xs-2">Contest's Website:</label>
+            <div class="col-xs-3">
+                <input type="url" class="form-control" id="link" name="link" placeholder="https://www.testweb.com" required>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label for="start_date" class="control-label col-xs-2">Start Date:</label>
+            <div class="col-xs-3">
+                <input type="start_date" class="form-control" id="start_date" name="start_date" placeholder="YYYY-MM-DD">
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label for="end_date" class="control-label col-xs-2">End Date:</label>
+            <div class="col-xs-3">
+                <input type="end_date" class="form-control" id="end_date" name="end_date" placeholder="YYYY-MM-DD">
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label for="desc" class="control-label col-xs-2">Description:</label>
+            <div class="col-xs-3">
+                <textarea class="form-control" id="desc" name="desc" placeholder="Tell something about it.." rows="3"></textarea>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <div class="col-xs-offset-3 col-xs-8">
+                <button type="submit" class="save btn btn-default">SUBMIT</button>
+            </div>
+        </div>
+
+    </form>
+
+{% endblock %}

oshc/main/templates/contest_submission.html

@@ -0,0 +1,16 @@
+{% extends 'base.html' %}
+{% load static %}
+{% block content %}
+
+<div class="jumbotron text-xs-center">
+  <div class="container text-center">
+      <h1 class="display-3">Thank You!</h1>
+      <p class="lead"><strong>Your contest has been submitted for review.</strong></p>
+      <hr>
+      <p class="lead">
+        <a class="btn btn-primary btn-sm" href="{% url 'home' %}" role="button">Continue to homepage</a>
+      </p>
+  </div>
+</div>
+
+{% endblock %}

oshc/main/templates/contests.html

@@ -0,0 +1,39 @@
+{% extends 'base.html' %}
+{% load static %}
+{% block content %}
+<style>
+h3 {
+    text-align: center;
+}
+span
+{
+    display: block;
+}
+</style>
+<section class="main-section">
+	<div class="container">
+            <h3>List of Upcoming Contests</h3>
+            <div class="container-fluid">
+                <div class="row">
+                    {% for contest in contest_list %}
+                        {% if contest.approved %}
+                            <div class="col-lg-4">
+                                <div class="panel panel-default">
+                                    <div class="panel-heading" style="background-color: #0275d8;color:white">{{contest.name}}</div>
+                                    <div class="panel-body">
+                                        <span><span class="glyphicon glyphicon-globe"></span> <a href="{{contest.link}}">{{contest.link}}</a></span>
+                                        <span><span class="glyphicon glyphicon-time"></span> {{contest.start_date}}-{{contest.end_date}}</span>
+                                        <span><span class="glyphicon glyphicon-info-sign"></span> {{contest.description}}</span>
+                                    </div>
+                                </div>
+                            </div>
+                        {% endif %}
+                    {% endfor %}
+                </div>
+            </div>
+            <div class="Button" align="center" style="margin-bottom:70px; margin-top:20px;">
+                <a href="{% url 'contest_new' %}" class="btn btn-default" style="background-color:#0275d8;color:white;">Submit a New Contest</a>
+            </div>
+	</div>
+</section>
+{% endblock %}

oshc/main/urls.py

@@ -3,5 +3,9 @@
 
 urlpatterns = [
     url(r'^$', views.home, name="home"),
-    url(r'^session/', views.request_session, name="request_session")
+    url(r'^session/', views.request_session, name="request_session"),
+    url(r'^contests/', views.contests, name="contests"),
+    url(r'^contest_new/', views.contest_new, name="contest_new"),
+    url(r'^add_contest/', views.add_contest, name="add_contest"),
+    url(r'^submit_contest/', views.submit_contest, name="submit_contest"),
 ]

oshc/main/views.py

@@ -1,11 +1,10 @@
 from django.shortcuts import render
-
+from django.http import HttpResponseRedirect
+from main.models import chatSession, Contest
+from datetime import datetime
 from django.shortcuts import render_to_response
-
 from django.template import RequestContext
 
-from main.models import chatSession
-
 
 def home(request):
     session_list = chatSession.objects.order_by('start_date')[:3]
@@ -17,6 +16,33 @@ def request_session(request):
     return render(request, 'session.html')
 
 
+def contests(request):
+    contest_list = Contest.objects.all()
+    return render(request, 'contests.html',
+                  context={'contest_list': contest_list})
+
+
+def contest_new(request):
+    return render(request, 'contest_edit.html')
+
+
+def add_contest(request):
+    contest = Contest()
+    contest.name = request.POST.get("name", "null")
+    contest.link = request.POST.get("link", "null")
+    start_date = request.POST.get("start_date", "null")
+    end_date = request.POST.get("end_date", "null")
+    contest.description = request.POST.get("desc", "null")
+    contest.end_date = datetime.strptime(end_date, '%Y-%m-%d').date()
+    contest.start_date = datetime.strptime(start_date, '%Y-%m-%d').date()
+    contest.save()
+    return HttpResponseRedirect("/submit_contest/")
+
+
+def submit_contest(request):
+    return render(request, 'contest_submission.html')
+
+
 def handler404(request):
     response = render_to_response('404.html', {},
                                   context_instance=RequestContext(request))