Remove commented code, new landing page with latest news and tweets. …

…Also paypal button fot donations
rafaelmv · Jul 3, 2017 · 8c1092d · 8c1092d
1 parent b5d670e
commit 8c1092d
Show file tree

Hide file tree

Showing 10 changed files with 130 additions and 52 deletions.
diff --git a/home/forms.py b/home/forms.py
@@ -22,6 +22,3 @@ class Meta:
         labels = {
             'text_message': 'Tu mensaje'
         }
-
-#class MessageForm(forms.Form):
-#    body_message = forms.CharField(label='Tu mensaje', max_length=160, required=False)
diff --git a/home/templates/base.html b/home/templates/base.html
@@ -16,10 +16,6 @@
     {% block content %}{% endblock content %}
   </section>
 
-  <footer class="wrapper">
-    {% if user.is_authenticated %}
-      <a href="{% url "logout" %}" class="link">Cerrar Sesión</a>
-    {% endif %}
-  </footer>
+  {% include 'footer.html' %}
 </body>
 </html>
diff --git a/home/templates/footer.html b/home/templates/footer.html
@@ -0,0 +1,5 @@
+<footer class="wrapper">
+  {% if user.is_authenticated %}
+    <a href="{% url "logout" %}" class="link">Cerrar Sesión</a>
+  {% endif %}
+</footer>
diff --git a/home/templates/home/index.html b/home/templates/home/index.html
@@ -2,46 +2,71 @@
 
 {% block title %}
   <title>
-    SMSuela 🇻🇪
+    Entérate 🇻🇪
   </title>
 {% endblock %}
 
 {% block content %}
-  <h1>
-    ¡Bienvenido! 🇻🇪
-  </h1>
-
-  {% if all_numbers %}
-
+  <h1>Entérate Venezuela</h1>
+	<h2>No todos tienen acceso a las redes sociales, informamos a los venezolanos por medios alternativos. Noticias sin censura. Venezuela.</h2>
+	<p id="why">
+		En Venezuela es difícil estar informado por culpa de los medios censurados. Resulta aún más complicado para aquellos sin acceso a internet. Queremos que las noticias lleguen a todos, sin censura. Repartimos folletos para informar y con nuestras cadenas de SMS tenemos la intención de difundir noticias del país a todos los venezolanos.
+	</p>
+
+	<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
+		<input type="hidden" name="cmd" value="_s-xclick">
+		<input type="hidden" name="hosted_button_id" value="NR9SWQZEXAJV6">
+		<input type="image" src="https://www.paypalobjects.com/es_XC/i/btn/btn_donate_LG.gif" border="0" name="submit" alt="PayPal, la forma más segura y rápida de pagar en línea.">
+		<img alt="" border="0" src="https://www.paypalobjects.com/es_XC/i/scr/pixel.gif" width="1" height="1">
+	</form>
+
+  {% if last_ten_messages %}
     <h2>
-      Enviar nuevo mensaje:
+      Últimas noticias:
     </h2>
-
-    {% if messages %}
-      {% for message in messages %}
-        <h3{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</h3>
+    <ul>
+      {% for message in last_ten_messages %}
+        <li>
+          {{ message }}
+        </li>
       {% endfor %}
-    {% endif %}
-
-    <form method="POST" enctype="multipart/form-data">
-      {% csrf_token %}
-      {{ form.as_p }}
-      <button type="submit">Enviar</button>
-    </form>
-
+    </ul>
   {% else %}
-
-    <p>No hay números registrados aún.</p>
-
+    <h3>
+      No hay mensajes aún
+    </h3>
   {% endif %}
 
-  <a href="{% url "home:new" %}" class="link">Agregar número</a> |
-  <a href="{% url "home:number_list" %}" class="link">Números actuales</a>
-
-{% endblock content %}
-
-
-
-
-
-
+  <div id="tweetBar">
+
+    <a class="twitter-timeline"
+       data-width="600"
+       data-height="700"
+       data-theme="light"
+       data-link-color="#2B7BB9"
+       href="https://twitter.com/EnterateTw">Tweets de EnterateTw</a>
+    <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
+    <script>
+      window.twttr = (function(d, s, id) {
+        var js, fjs = d.getElementsByTagName(s)[0],
+        t = window.twttr || {};
+        if (d.getElementById(id)) return t;
+        js = d.createElement(s);
+        js.id = id;
+        js.src = "https://platform.twitter.com/widgets.js";
+        fjs.parentNode.insertBefore(js, fjs);
+        t._e = [];
+        t.ready = function(f) {
+          t._e.push(f);
+        };
+        return t;
+      }(document, "script", "twitter-wjs"));
+    </script>
+
+  </div>
+
+  {% if user.is_authenticated %}
+    <a href="{% url "home:new_message" %}" class="link">Enviar mensaje</a> |
+    <a href="{% url "home:new" %}" class="link">Agregar número</a>
+  {% endif %}
+{% endblock %}
diff --git a/home/templates/home/new_message.html b/home/templates/home/new_message.html
@@ -0,0 +1,47 @@
+{% extends '../base.html' %}
+
+{% block title %}
+  <title>
+    SMSuela 🇻🇪
+  </title>
+{% endblock %}
+
+{% block content %}
+  <h1>
+    ¡Bienvenido! 🇻🇪
+  </h1>
+
+  {% if all_numbers %}
+
+    <h2>
+      Enviar nuevo mensaje:
+    </h2>
+
+    {% if messages %}
+      {% for message in messages %}
+        <h3{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</h3>
+      {% endfor %}
+    {% endif %}
+
+    <form method="POST" enctype="multipart/form-data">
+      {% csrf_token %}
+      {{ form.as_p }}
+      <button type="submit">Enviar</button>
+    </form>
+
+  {% else %}
+
+    <p>No hay números registrados aún.</p>
+
+  {% endif %}
+
+  <a href="{% url "home:new" %}" class="link">Agregar número</a> |
+  <a href="{% url "home:number_list" %}" class="link">Números actuales</a>
+
+{% endblock content %}
+
+
+
+
+
+
diff --git a/home/templates/home/new_number.html b/home/templates/home/new_number.html
@@ -16,7 +16,7 @@ <h2>Agregar número telefónico</h2>
     <button type="submit">Agregar</button>
   </form>
 
-  <a href="{% url "home:hello" %}" class="link">Enviar mensaje</a> |
+  <a href="{% url "home:new_message" %}" class="link">Enviar mensaje</a> |
   <a href="{% url "home:number_list" %}" class="link">Números actuales</a>
 
 {% endblock content %}
diff --git a/home/templates/home/number_list.html b/home/templates/home/number_list.html
@@ -33,7 +33,7 @@ <h2>Números registrados</h2>
   {% endif %}
 
   <a href="{% url "home:new" %}" class="link">Agregar número</a> |
-  <a href="{% url "home:hello" %}" class="link">Enviar mensaje</a>
+  <a href="{% url "home:new_message" %}" class="link">Enviar mensaje</a>
 
 
 {% endblock content %}
diff --git a/home/urls.py b/home/urls.py
@@ -3,8 +3,9 @@
 
 
 urlpatterns = [
-    url(r'^$', views.index, name='hello'),
-    # url(r'^product/(?P<pk>[0-9]+)/$', views.ProductDetail.as_view(), name='detail'),
+    url(r'^$', views.home_page, name='home_page'),
+    url(r'^message/new/$', views.new_message, name='new_message'),
     url(r'^numbers/$', views.NumberList.as_view(), name="number_list"),
     url(r'^numbers/new/', views.new_number, name="new")
+    # url(r'^product/(?P<pk>[0-9]+)/$', views.ProductDetail.as_view(), name='detail'),
 ]
diff --git a/home/views.py b/home/views.py
@@ -2,8 +2,7 @@
 
 from django.shortcuts import (
     render,
-    get_object_or_404,
-    redirect
+    get_object_or_404
 )
 from django.template import loader
 from django.http import HttpResponse, HttpResponseRedirect
@@ -15,14 +14,22 @@
 
 
 from .forms import NumberForm, MessageForm
-from .models import Number
+from .models import Number, Message
 
 from twilio.rest import Client
 
 
 client = Client(settings.ACCOUNT_SID, settings.AUTH_TOKEN)
 
 
+def home_page(request):
+    last_ten_messages = Message.objects.all().order_by('created_at')[:10]
+    context = {
+        'last_ten_messages': last_ten_messages
+    }
+    return render(request, 'home/index.html', context)
+
+
 class NumberList(LoginRequiredMixin, ListView):
     login_url = '/login/'
     model = Number
@@ -33,7 +40,7 @@ def get_context_data(self, **kwargs):
 
 
 @login_required(login_url='/login')
-def index(request):
+def new_message(request):
 
     all_numbers = Number.objects.all()
 
@@ -53,15 +60,15 @@ def index(request):
                     body=str(body_message))
 
             messages.success(request, 'Mensaje enviado.')
-            return HttpResponseRedirect('/')
+            return HttpResponseRedirect('/message/new/')
     else:
         form = MessageForm()
 
     context = {
         'form': form,
         'all_numbers': all_numbers,
     }
-    return render(request, 'home/index.html', context)
+    return render(request, 'home/new_message.html', context)
 
 
 @login_required(login_url='/login')

diff --git a/smsuela/settings/common.py b/smsuela/settings/common.py
@@ -81,7 +81,7 @@
 ACCOUNT_SID = os.environ["TWILIO_SID"]
 AUTH_TOKEN = os.environ["TWILIO_TOKEN"]
 
-LOGIN_REDIRECT_URL = 'home:hello'
+LOGIN_REDIRECT_URL = 'home:login'
 
 LANGUAGE_CODE = 'en-us'