From 477c6167029cca8bdc1984a91d40a06ba421f503 Mon Sep 17 00:00:00 2001 From: Nick Impicciche Date: Sun, 4 Dec 2016 17:47:29 +0000 Subject: [PATCH] added social media feed with instagram and tswift --- website/models.py | 15 +++++++++++++++ website/templates/website/index.html | 21 +++++++++++---------- website/views.py | 28 +++++++++++++++++++++++----- 3 files changed, 49 insertions(+), 15 deletions(-) diff --git a/website/models.py b/website/models.py index beeb308..29cdc32 100644 --- a/website/models.py +++ b/website/models.py @@ -1,2 +1,17 @@ from django.db import models +import datetime +class Post(models.Model): + POST_TYPES = ( + (1, 'Instagram'), + (2, 'Facebook'), + (3, 'Twitter') + ) + + text = models.CharField(max_length=1001, default='default post text') + url = models.CharField(max_length=250, default='https://twitter.com/berkeleyUPE') + date = models.DateField() + #img_video = models.ImageField(default='static/website/images/icons/twitter.png') + img_video = models.ImageField(default='static/website/images/icons/post1.jpg') + media = models.ImageField(default='static/website/images/icons/instagram_logo.png') + likes = models.CharField(max_length=1001, default='420') diff --git a/website/templates/website/index.html b/website/templates/website/index.html index ac33be4..da1e863 100644 --- a/website/templates/website/index.html +++ b/website/templates/website/index.html @@ -127,19 +127,20 @@

{{ event.name }}

{% endif %} +
-
Twitter
- - +
Social Media
+ {% for post in posts %} + {{ post.date }}
+ {{ post.text }}
+
+ {% if post.img_video %} +
+ {% endif %} + Likes - {{ post.likes }}

+ {% endfor %}
diff --git a/website/views.py b/website/views.py index 442c8e6..6659116 100644 --- a/website/views.py +++ b/website/views.py @@ -1,4 +1,6 @@ +from django.core.files import File from django.contrib.auth.decorators import login_required +from django.db import models from django.shortcuts import render, render_to_response from django.http import HttpResponse, HttpResponseRedirect from django.template import RequestContext, loader @@ -8,19 +10,35 @@ from django.core.serializers.json import DjangoJSONEncoder import json, re from users.models import * +from website.models import Post +from urllib import request +import os def index(request): template = loader.get_template('website/index.html') officers = UserProfile.objects.filter(user_type=3, approved=True) - - - # context = RequestContext(request, { 'officers': officers }) # return HttpResponse(template.render(context)) - return render(request, 'website/index.html', { 'officers': officers }) + posts = [Post() for i in range(5)] + post_data = open("website/posts.out","r") + post_data = json.loads( post_data.read() ) + img_path = 'static/website/images/icons/post' + for i in range(len(posts)): + posts[i].text = post_data[i][0] + posts[i].url = post_data[i][1] + posts[i].date = post_data[i][2] + posts[i].img_video = img_path+str(i)+".jpg" + posts[i].likes = post_data[i][5] + context = { + 'posts' : posts, + 'officers': officers + } + template.render(Context(context)) + + return render(request, 'website/index.html', context) def oh(request): return render(request, 'website/oh.html', {}) def ir(request): - return render(request, 'website/ir.html', {}) \ No newline at end of file + return render(request, 'website/ir.html', {})