From fc8cee82a095fb040e822b9034cc7c566b2a26a3 Mon Sep 17 00:00:00 2001
From: Tapasweni Pathak <tapasweni@mapbox.com>
Date: Sun, 26 Nov 2017 09:44:58 +0530
Subject: [PATCH 1/3] list all chat sessions

---
 oshc/main/migrations/0002_video.py | 22 ++++++++++++++++++++++
 oshc/main/models.py                |  7 +++++++
 oshc/main/templates/template.html  | 12 ++++++++++++
 oshc/main/views.py                 |  5 +++++
 4 files changed, 46 insertions(+)
 create mode 100644 oshc/main/migrations/0002_video.py
 create mode 100644 oshc/main/templates/template.html

diff --git a/oshc/main/migrations/0002_video.py b/oshc/main/migrations/0002_video.py
new file mode 100644
index 0000000..5110d63
--- /dev/null
+++ b/oshc/main/migrations/0002_video.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.6 on 2017-11-26 04:14
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='video',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('link', models.URLField()),
+            ],
+        ),
+    ]
diff --git a/oshc/main/models.py b/oshc/main/models.py
index 6a7b78a..d4707c8 100644
--- a/oshc/main/models.py
+++ b/oshc/main/models.py
@@ -29,3 +29,10 @@ class Contest(models.Model):
 
     def __str__(self):
         return self.name
+
+
+class video(models.Model):
+    link = models.URLField()
+
+    def __unicode__(self):
+        return self.link
diff --git a/oshc/main/templates/template.html b/oshc/main/templates/template.html
new file mode 100644
index 0000000..9c72ab2
--- /dev/null
+++ b/oshc/main/templates/template.html
@@ -0,0 +1,12 @@
+<h1>Open Source Contributors Chat Sessions</h1>
+{% if all_sessions %}
+    <ul>
+    {% for video in all_sessions %}
+        <li>
+<iframe width="560" height="345" src="{{ video.link }}?rel=0" frameborder="0" allowfullscreen></iframe>
+        </li>
+    {% endfor %}
+    </ul>
+{% else %}
+    <p>Not able to retrive sessions at the moment.</p>
+{% endif %}
diff --git a/oshc/main/views.py b/oshc/main/views.py
index f1f2977..d403cfb 100644
--- a/oshc/main/views.py
+++ b/oshc/main/views.py
@@ -42,6 +42,11 @@ def submit_contest(request):
     return render(request, 'contest_submission.html')
 
 
+def sessions(request):
+    all_sessions = video.objects.all()
+    return render_to_response('sessions.html', {'all_sessions' : all_sessions})
+
+
 def handler404(request):
     response = render_to_response('404.html', {},
                                   context_instance=RequestContext(request))

From 1120b65f967f0a5b71bd4643259b534a21cce597 Mon Sep 17 00:00:00 2001
From: Tapasweni Pathak <tapasweni@mapbox.com>
Date: Sun, 26 Nov 2017 09:59:42 +0530
Subject: [PATCH 2/3] migration and fixes

---
 oshc/main/templates/{template.html => sessions.html} | 3 +++
 oshc/main/views.py                                   | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)
 rename oshc/main/templates/{template.html => sessions.html} (81%)

diff --git a/oshc/main/templates/template.html b/oshc/main/templates/sessions.html
similarity index 81%
rename from oshc/main/templates/template.html
rename to oshc/main/templates/sessions.html
index 9c72ab2..bee0167 100644
--- a/oshc/main/templates/template.html
+++ b/oshc/main/templates/sessions.html
@@ -1,3 +1,5 @@
+{% extends 'base.html' %} {% load static %}
+{% block content %}
 <h1>Open Source Contributors Chat Sessions</h1>
 {% if all_sessions %}
     <ul>
@@ -10,3 +12,4 @@ <h1>Open Source Contributors Chat Sessions</h1>
 {% else %}
     <p>Not able to retrive sessions at the moment.</p>
 {% endif %}
+{% endblock %}
diff --git a/oshc/main/views.py b/oshc/main/views.py
index d403cfb..df01970 100644
--- a/oshc/main/views.py
+++ b/oshc/main/views.py
@@ -1,6 +1,6 @@
 from django.shortcuts import render
 from django.http import HttpResponseRedirect
-from main.models import chatSession, Contest
+from main.models import chatSession, Contest, video
 from django.shortcuts import render_to_response
 from django.template import RequestContext
 from .forms import ContestForm
@@ -44,7 +44,7 @@ def submit_contest(request):
 
 def sessions(request):
     all_sessions = video.objects.all()
-    return render_to_response('sessions.html', {'all_sessions' : all_sessions})
+    return render_to_response('sessions.html', {'all_sessions': all_sessions})
 
 
 def handler404(request):

From 2c859ba09a151d7665d5642db5badc64ca35d60a Mon Sep 17 00:00:00 2001
From: Tapasweni Pathak <tapasweni@mapbox.com>
Date: Mon, 27 Nov 2017 07:21:35 +0530
Subject: [PATCH 3/3] aah migrations issues

---
 .DS_Store                             | Bin 0 -> 6148 bytes
 oshc/main/admin.py                    |   2 +-
 oshc/main/migrations/0001_initial.py  |  37 ++++++++++++--------------
 oshc/main/migrations/0002_video.py    |  22 ---------------
 oshc/main/models.py                   |  14 +++-------
 oshc/main/templates/base.html         |   2 +-
 oshc/main/templates/chatsessions.html |  36 +++++++++++++++++++++++++
 oshc/main/templates/sessions.html     |  15 -----------
 oshc/main/urls.py                     |   1 +
 oshc/main/views.py                    |  15 ++++++-----
 oshc/oshc/settings.py                 |   2 +-
 11 files changed, 69 insertions(+), 77 deletions(-)
 create mode 100644 .DS_Store
 delete mode 100644 oshc/main/migrations/0002_video.py
 create mode 100644 oshc/main/templates/chatsessions.html
 delete mode 100644 oshc/main/templates/sessions.html

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..e9226e17151de435f97c2a57524465084b574fe2
GIT binary patch
literal 6148
zcmeHK(TdYR6uq;XbyGzwBGkvc2tJghrGga^y4_YN=(^ZdA5^+YQ@4RMS(~&~Yo#y#
z!}<ySiGSdS_yKzE%(x`&?wg3nT)1=YOzyqYoSEF|5Rqt3{3=nAh-@gMbs5b$!p~XP
zWJ8Z!0ScL;-3jBq7slS2uNg257zX}52Kd|EqCMKDU3yH}@0Ux$edz6<Qshs+4$mjl
zqBiw_57BaeA0y9T9nubs$j{UO&hd36hebZc)TboxCrT@R+w_P!$l6B!?&>cSpI5vs
z<V<Kt{gtdgF7oqc$%(F1-@KDBNYYB>yV%&Ywk~bkg@RqUYQOFd<5@R#(@D~F$1i0s
z@CTl@592sIvt93bFqrj<H}>Kvb%SUy&bYsN5k!7GYsQnvPh_40Hyt8YPSh)w=JQ(Z
zPT8qf7G-B%uT{&=-Fx-L!nRAdst-CxqxT=?9~Yla@h%X7S}Wz6#^3M-#u*RO?l=nL
z=on+{Z_@#dCGT%2ppXW6o;F<gWLLUCPr>{yRu;SB+;!!>ahlm1MdTmQTbdw0TO(*h
zDOP0%?K?{IGs=CDjkjnjBc^#jxi7MQnAXT2VL<OAn`?j(!+>GHFpy<{>w^PjY-n66
zl%)fWyaE6%3`>E{hd#$R8XFpy3h@LYR47n|3Vp>8DjegE_G@TdDpcVl^yNe7nT5Wg
z2su0QJJOv*L!oI61BQV-1DmQ_<nzCM@%=v^WO{}H!@z&VfUsKKRuiwJ&(^h<<FnR*
s9zj{yZ>dm*pwY*%H25gK36+9p4jaIR#-&1xK+GQjNrPz&1Amo)U$w}??f?J)

literal 0
HcmV?d00001

diff --git a/oshc/main/admin.py b/oshc/main/admin.py
index 83ff580..7f70883 100644
--- a/oshc/main/admin.py
+++ b/oshc/main/admin.py
@@ -7,7 +7,7 @@
 
 
 class chatSessionAdmin(admin.ModelAdmin):
-    list_display = ('title', 'start_date')
+    list_display = ('name', 'start_date')
 
 
 class contestAdmin(admin.ModelAdmin):
diff --git a/oshc/main/migrations/0001_initial.py b/oshc/main/migrations/0001_initial.py
index e737783..887556b 100644
--- a/oshc/main/migrations/0001_initial.py
+++ b/oshc/main/migrations/0001_initial.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.2 on 2017-10-09 13:36
+# Generated by Django 1.11.6 on 2017-11-26 12:05
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -16,35 +16,32 @@ 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')),
+                ('name', 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')),
+                ('link', models.URLField(help_text='Chat session URL')),
             ],
         ),
         migrations.CreateModel(
             name='Contest',
             fields=[
-                ('id', models.AutoField(auto_created=True,
-                                        primary_key=True,
+                ('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)),
+                ('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)),
diff --git a/oshc/main/migrations/0002_video.py b/oshc/main/migrations/0002_video.py
deleted file mode 100644
index 5110d63..0000000
--- a/oshc/main/migrations/0002_video.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.6 on 2017-11-26 04:14
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('main', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='video',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('link', models.URLField()),
-            ],
-        ),
-    ]
diff --git a/oshc/main/models.py b/oshc/main/models.py
index d4707c8..1b01b3a 100644
--- a/oshc/main/models.py
+++ b/oshc/main/models.py
@@ -5,17 +5,18 @@
 
 
 class chatSession(models.Model):
-    title = models.CharField(max_length=128, help_text="Session title")
+    name = models.CharField(max_length=128, help_text="Session title")
+    link = models.URLField(help_text="Chat session URL")
     profile_name = models.CharField(max_length=128,
                                     help_text="The person's name")
     profile_url = models.URLField(help_text="The Url of the person's website")
     description = models.TextField(max_length=512, help_text="Session details")
     start_date = models.DateTimeField()
     end_date = models.DateTimeField()
-    register_url = models.URLField(help_text="URL for the event registration")
+    link = models.URLField(help_text="Chat session URL")
 
     def __str__(self):
-        return self.title
+        return self.name
 
 
 class Contest(models.Model):
@@ -29,10 +30,3 @@ class Contest(models.Model):
 
     def __str__(self):
         return self.name
-
-
-class video(models.Model):
-    link = models.URLField()
-
-    def __unicode__(self):
-        return self.link
diff --git a/oshc/main/templates/base.html b/oshc/main/templates/base.html
index 0229935..0d054e4 100644
--- a/oshc/main/templates/base.html
+++ b/oshc/main/templates/base.html
@@ -28,7 +28,7 @@
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Sessions <span class="caret"></span></a>
             <ul class="dropdown-menu" role="menu">
-              <li><a href="https://www.youtube.com/channel/UC1_IAby-9me3iICtxuiDL5Q" target="_blank">View Session</a></li>
+							<li><a href="{% url 'chat_sessions' %}" target="_blank">View Session</a></li>
               <li><a href="{% url 'request_session' %}" target="_blank">Request a Session</a></li>
             </ul>
           </li>
diff --git a/oshc/main/templates/chatsessions.html b/oshc/main/templates/chatsessions.html
new file mode 100644
index 0000000..cf137d9
--- /dev/null
+++ b/oshc/main/templates/chatsessions.html
@@ -0,0 +1,36 @@
+{% extends 'base.html' %}
+{% load static %}
+{% block content %}
+<style>
+h3 {
+    text-align: center;
+}
+span
+{
+    display: block;
+}
+</style>
+<section class="main-section">
+	<div class="container">
+            <h3>Open Source Contributors Chat Sessions</h3>
+            <div class="container-fluid">
+                <div class="row">
+                    {% for chat_session in chat_session_list %}
+                        {% if chat_session.approved %}
+                            <div class="col-lg-4">
+                                <div class="panel panel-default">
+                                    <div class="panel-heading" style="background-color: #0275d8;color:white">{{chat_session.name}}</div>
+                                    <div class="panel-body">
+																			<span><i class="fa fa-youtube"></i> <a href="{{chat_session.link}}">{{chat_session.link}}</a></span>
+                                        <span><i class="fa fa-clock-o"></i> {{chat_session.start_date}}</span>
+                                        <span><i class="fa fa-info-circle"></i> {{chat_session.description}}</span>
+                                    </div>
+                                </div>
+                            </div>
+                        {% endif %}
+                    {% endfor %}
+                </div>
+            </div>
+	</div>
+</section>
+{% endblock %}
diff --git a/oshc/main/templates/sessions.html b/oshc/main/templates/sessions.html
deleted file mode 100644
index bee0167..0000000
--- a/oshc/main/templates/sessions.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{% extends 'base.html' %} {% load static %}
-{% block content %}
-<h1>Open Source Contributors Chat Sessions</h1>
-{% if all_sessions %}
-    <ul>
-    {% for video in all_sessions %}
-        <li>
-<iframe width="560" height="345" src="{{ video.link }}?rel=0" frameborder="0" allowfullscreen></iframe>
-        </li>
-    {% endfor %}
-    </ul>
-{% else %}
-    <p>Not able to retrive sessions at the moment.</p>
-{% endif %}
-{% endblock %}
diff --git a/oshc/main/urls.py b/oshc/main/urls.py
index 197285d..9893104 100644
--- a/oshc/main/urls.py
+++ b/oshc/main/urls.py
@@ -8,4 +8,5 @@
     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"),
+    url(r'^chatsessions/', views.chat_sessions, name="chat_sessions"),
 ]
diff --git a/oshc/main/views.py b/oshc/main/views.py
index df01970..5bf4b11 100644
--- a/oshc/main/views.py
+++ b/oshc/main/views.py
@@ -1,15 +1,15 @@
 from django.shortcuts import render
 from django.http import HttpResponseRedirect
-from main.models import chatSession, Contest, video
+from main.models import chatSession, Contest
 from django.shortcuts import render_to_response
 from django.template import RequestContext
 from .forms import ContestForm
 
 
 def home(request):
-    session_list = chatSession.objects.order_by('start_date')[:3]
-    context_dict = {'chatSession': session_list}
-    return render(request, 'index.html', context=context_dict)
+    # chat_session_list = chatSessions.objects.order_by('start_date')[:3]
+    # context_dict = {'chatSessions': chat_session_list}
+    return render(request, 'index.html')
 
 
 def request_session(request):
@@ -42,9 +42,10 @@ def submit_contest(request):
     return render(request, 'contest_submission.html')
 
 
-def sessions(request):
-    all_sessions = video.objects.all()
-    return render_to_response('sessions.html', {'all_sessions': all_sessions})
+def chat_sessions(request):
+    chat_session_list = chatSession.objects.all()
+    return render(request, 'chatsessions.html',
+                  context={'chat_session_list': chat_session_list})
 
 
 def handler404(request):
diff --git a/oshc/oshc/settings.py b/oshc/oshc/settings.py
index 0279327..055c6db 100644
--- a/oshc/oshc/settings.py
+++ b/oshc/oshc/settings.py
@@ -21,7 +21,7 @@
 SECRET_KEY = 'x1-pogt0-b5owbgq0=ui02-4v)bba!bg&1m8_$)8-&13(907qf'
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = os.getenv("DEBUG", False)
+DEBUG = os.getenv("DEBUG", True)
 
 ALLOWED_HOSTS = ['*']