Added a journey page #201

anubhakushwaha · 2017-12-18T17:46:01Z

Checklist

My branch is up-to-date with the upstream predev branch.
I have added necessary documentation (if appropriate).

Which issue does this PR fix?: fixes #100

If relevant, please include a screenshot.

houndci-bot · 2017-12-18T17:46:12Z

oshc/main/views.py

+
+def journey(request):
+    journey_list = Journey.objects.all()
+    return render(request, 'journey.html' ,


whitespace before ','

houndci-bot · 2017-12-18T17:46:12Z

oshc/main/views.py

@@ -38,3 +38,8 @@ def add_contest(request):

 def submit_contest(request):
    return render(request, 'contest_submission.html')
+
+def journey(request):


expected 2 blank lines, found 1

houndci-bot · 2017-12-18T17:46:12Z

oshc/main/models.py

+
+    def __str__(self):
+        return self.title
+


blank line at end of file

houndci-bot · 2017-12-18T17:46:12Z

oshc/main/models.py

@@ -29,3 +29,11 @@ class Contest(models.Model):

    def __str__(self):
        return self.name
+
+class Journey(models.Model):


expected 2 blank lines, found 1

houndci-bot · 2017-12-18T17:46:12Z

oshc/main/migrations/0002_journey.py

+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(help_text='Journey title', max_length=128)),
+                ('description', models.TextField(help_text='Session details', max_length=512)),


line too long (95 > 79 characters)

houndci-bot · 2017-12-18T17:46:12Z

oshc/main/migrations/0002_journey.py

+            name='Journey',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(help_text='Journey title', max_length=128)),


line too long (87 > 79 characters)

houndci-bot · 2017-12-18T17:46:13Z

oshc/main/migrations/0002_journey.py

+        migrations.CreateModel(
+            name='Journey',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),


line too long (114 > 79 characters)

houndci-bot · 2017-12-18T17:46:13Z

oshc/main/admin.py

 admin.site.register(Contest, contestAdmin)
+


blank line at end of file

houndci-bot · 2017-12-18T17:46:13Z

oshc/main/admin.py



 class chatSessionAdmin(admin.ModelAdmin):
    list_display = ('title', 'start_date')

+class journeyAdmin(admin.ModelAdmin):


expected 2 blank lines, found 1

anubhakushwaha · 2017-12-18T17:47:28Z

@tapasweni-pathak @vaibhavsingh97 @jarifibrahim @nikhita Please review and suggestions on improving it would be great, thanks

houndci-bot · 2017-12-18T17:53:21Z

oshc/main/models.py

+    start_date = models.DateField(null=True)
+
+    def __str__(self):
+        return self.title


no newline at end of file

houndci-bot · 2017-12-18T17:53:21Z

oshc/main/migrations/0002_journey.py

+                ('id', models.AutoField(auto_created=True, 
+                    primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(help_text='Journey title', 
+                    max_length=128)),


continuation line under-indented for visual indent

houndci-bot · 2017-12-18T17:53:21Z

oshc/main/migrations/0002_journey.py

+            fields=[
+                ('id', models.AutoField(auto_created=True, 
+                    primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(help_text='Journey title', 


trailing whitespace

houndci-bot · 2017-12-18T17:53:21Z

oshc/main/migrations/0002_journey.py

+            name='Journey',
+            fields=[
+                ('id', models.AutoField(auto_created=True, 
+                    primary_key=True, serialize=False, verbose_name='ID')),


continuation line under-indented for visual indent

houndci-bot · 2017-12-18T17:53:21Z

oshc/main/migrations/0002_journey.py

+        migrations.CreateModel(
+            name='Journey',
+            fields=[
+                ('id', models.AutoField(auto_created=True, 


trailing whitespace

houndci-bot · 2017-12-18T17:53:21Z

oshc/main/admin.py

@@ -26,4 +30,5 @@ def approve_contest(self, request, queryset):


 admin.site.register(chatSession, chatSessionAdmin)
-admin.site.register(Contest, contestAdmin)
+admin.site.register(Journey, journeyAdmin)
+admin.site.register(Contest, contestAdmin)


no newline at end of file

houndci-bot · 2017-12-18T17:56:42Z

oshc/main/models.py

+
+    def __str__(self):
+        return self.title
+


blank line at end of file
blank line contains whitespace

jarifibrahim · 2017-12-18T18:13:20Z

oshc/main/models.py

+class Journey(models.Model):
+    title = models.CharField(max_length=128, help_text="Journey title")
+    start_date = models.DateField(null=True)
+


Can we add a description field too?

We are good w/ these two.

jarifibrahim · 2017-12-18T18:23:48Z

oshc/main/views.py

+def journey(request):
+    journey_list = Journey.objects.all()
+    return render(request, 'journey.html',
+                  context={'Journey': journey_list})


You might want to sort the journey_list by the start_date before sending it to the HTML page. This ensures that the data we send out of the view is chronologically ordered.
You can use Managers[0] to achieve this or you could do something like Journey.objects.all().filteryBy('start_date')

[0] - https://docs.djangoproject.com/en/2.0/topics/db/managers/

fixed w/ Journey.objects.order_by('start_date').

jarifibrahim · 2017-12-18T18:25:01Z

oshc/main/templates/base.html

@@ -33,7 +33,8 @@
            </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="{% url 'contests' %}" target="_blank">Contests</a></li>
+          <li><a href="{% url 'journey' %}" target="_blank">Journey</a></li>


I don't think we should put target="_blank" here. The Journey page is part of the OSHC page.

These needs to be removed for quite a few.

jarifibrahim · 2017-12-18T18:32:34Z

@anubhakushwaha Is there any way we could make the timeline responsive?

anubhakushwaha · 2017-12-19T07:58:53Z

@jarifibrahim Hey thanks for reviewing will do the changes, responsive as in? The current behavior allows new events to be added via the admin. Please help me understand this better.

jarifibrahim · 2017-12-19T17:00:36Z

@anubhakushwaha By responsive I meant is the timeline mobile device friendly? As far as I know, the OSHC website is mobile friendly, so it would be great if we could make the timeline mobile friendly as well.

vaibhavsingh97 · 2017-12-20T09:42:49Z

@anubhakushwaha Can we have live demo link please

anubhakushwaha · 2017-12-23T19:26:33Z

@vaibhavsingh97 Live demo for?

tapaswenipathak

Thanks for sending this through @anubhakushwaha! 🎉

I have fixed few minor reviews that you have got till now. We need to make this work even on a mobile sized/small screens.

tapaswenipathak · 2017-12-24T05:48:49Z

This is merged after few fixes w/ 7922fee, live here.

anubhakushwaha · 2017-12-24T10:38:00Z

@tapasweni-pathak Thank you for doing the changes.

We need to make this work even on a mobile sized/small screens.

I will update you on this.

houndci-bot reviewed Dec 18, 2017

View reviewed changes

Added journey page

ef57ce9

houndci-bot reviewed Dec 18, 2017

View reviewed changes

oshc/main/models.py

def __str__(self):

return self.title

Copy link

houndci-bot Dec 18, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

blank line at end of file
blank line contains whitespace

anubhakushwaha requested review from tapaswenipathak, vaibhavsingh97, jarifibrahim and nikhita December 18, 2017 17:59

anubhakushwaha added this to the Go live with essential features [user account specific + proper error handling] milestone Dec 18, 2017

jarifibrahim reviewed Dec 18, 2017

View reviewed changes

tapaswenipathak requested changes Dec 24, 2017

View reviewed changes

tapaswenipathak closed this Dec 24, 2017

anubhakushwaha deleted the predev branch December 27, 2017 10:38

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added a journey page #201

Added a journey page #201

anubhakushwaha commented Dec 18, 2017 •

edited

Loading

houndci-bot Dec 18, 2017

houndci-bot Dec 18, 2017

houndci-bot Dec 18, 2017

houndci-bot Dec 18, 2017

houndci-bot Dec 18, 2017

houndci-bot Dec 18, 2017

houndci-bot Dec 18, 2017

houndci-bot Dec 18, 2017

houndci-bot Dec 18, 2017

anubhakushwaha commented Dec 18, 2017

houndci-bot Dec 18, 2017

houndci-bot Dec 18, 2017

houndci-bot Dec 18, 2017

houndci-bot Dec 18, 2017

houndci-bot Dec 18, 2017

houndci-bot Dec 18, 2017

houndci-bot Dec 18, 2017

jarifibrahim Dec 18, 2017

tapaswenipathak Dec 24, 2017

jarifibrahim Dec 18, 2017 •

edited

Loading

tapaswenipathak Dec 24, 2017

jarifibrahim Dec 18, 2017

tapaswenipathak Dec 24, 2017 •

edited

Loading

jarifibrahim commented Dec 18, 2017

anubhakushwaha commented Dec 19, 2017

jarifibrahim commented Dec 19, 2017

vaibhavsingh97 commented Dec 20, 2017

anubhakushwaha commented Dec 23, 2017

tapaswenipathak left a comment •

edited

Loading

tapaswenipathak commented Dec 24, 2017 •

edited

Loading

anubhakushwaha commented Dec 24, 2017

Added a journey page #201

Added a journey page #201

Conversation

anubhakushwaha commented Dec 18, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

anubhakushwaha commented Dec 18, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jarifibrahim Dec 18, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tapaswenipathak Dec 24, 2017 • edited Loading

Choose a reason for hiding this comment

jarifibrahim commented Dec 18, 2017

anubhakushwaha commented Dec 19, 2017

jarifibrahim commented Dec 19, 2017

vaibhavsingh97 commented Dec 20, 2017

anubhakushwaha commented Dec 23, 2017

tapaswenipathak left a comment • edited Loading

Choose a reason for hiding this comment

tapaswenipathak commented Dec 24, 2017 • edited Loading

anubhakushwaha commented Dec 24, 2017

anubhakushwaha commented Dec 18, 2017 •

edited

Loading

jarifibrahim Dec 18, 2017 •

edited

Loading

tapaswenipathak Dec 24, 2017 •

edited

Loading

tapaswenipathak left a comment •

edited

Loading

tapaswenipathak commented Dec 24, 2017 •

edited

Loading