diff --git a/home/forms.py b/home/forms.py index 2f14db0..fc0d171 100644 --- 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 index 36e901b..0a879f6 100644 --- a/home/templates/base.html +++ b/home/templates/base.html @@ -16,10 +16,6 @@ {% block content %}{% endblock content %} - + {% include 'footer.html' %} \ No newline at end of file diff --git a/home/templates/footer.html b/home/templates/footer.html new file mode 100644 index 0000000..8bc38de --- /dev/null +++ b/home/templates/footer.html @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/home/templates/home/index.html b/home/templates/home/index.html index 34ea586..a1cf1af 100644 --- a/home/templates/home/index.html +++ b/home/templates/home/index.html @@ -2,46 +2,71 @@ {% block title %} - SMSuela 🇻🇪 + Entérate 🇻🇪 {% endblock %} {% block content %} -

- ¡Bienvenido! 🇻🇪 -

- - {% if all_numbers %} - +

Entérate Venezuela

+

No todos tienen acceso a las redes sociales, informamos a los venezolanos por medios alternativos. Noticias sin censura. Venezuela.

+

+ 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. +

+ +
+ + + + +
+ + {% if last_ten_messages %}

- Enviar nuevo mensaje: + Últimas noticias:

- - {% if messages %} - {% for message in messages %} - {{ message }} + {% else %} - -

No hay números registrados aún.

- +

+ No hay mensajes aún +

{% endif %} - Agregar número | - Números actuales - -{% endblock content %} - - - - - - +
+ + + + + +
+ + {% if user.is_authenticated %} + Enviar mensaje | + Agregar número + {% endif %} +{% endblock %} \ No newline at end of file diff --git a/home/templates/home/new_message.html b/home/templates/home/new_message.html new file mode 100644 index 0000000..34ea586 --- /dev/null +++ b/home/templates/home/new_message.html @@ -0,0 +1,47 @@ +{% extends '../base.html' %} + +{% block title %} + + SMSuela 🇻🇪 + +{% endblock %} + +{% block content %} +

+ ¡Bienvenido! 🇻🇪 +

+ + {% if all_numbers %} + +

+ Enviar nuevo mensaje: +

+ + {% if messages %} + {% for message in messages %} + {{ message }} + {% endfor %} + {% endif %} + +
+ {% csrf_token %} + {{ form.as_p }} + +
+ + {% else %} + +

No hay números registrados aún.

+ + {% endif %} + + Agregar número | + Números actuales + +{% endblock content %} + + + + + + diff --git a/home/templates/home/new_number.html b/home/templates/home/new_number.html index 3374bc9..99017e6 100644 --- a/home/templates/home/new_number.html +++ b/home/templates/home/new_number.html @@ -16,7 +16,7 @@

Agregar número telefónico

- Enviar mensaje | + Enviar mensaje | Números actuales {% endblock content %} diff --git a/home/templates/home/number_list.html b/home/templates/home/number_list.html index ccd6b25..69aacc2 100644 --- a/home/templates/home/number_list.html +++ b/home/templates/home/number_list.html @@ -33,7 +33,7 @@

Números registrados

{% endif %} Agregar número | - Enviar mensaje + Enviar mensaje {% endblock content %} \ No newline at end of file diff --git a/home/urls.py b/home/urls.py index a1e4b39..89be00a 100644 --- a/home/urls.py +++ b/home/urls.py @@ -3,8 +3,9 @@ urlpatterns = [ - url(r'^$', views.index, name='hello'), - # url(r'^product/(?P[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[0-9]+)/$', views.ProductDetail.as_view(), name='detail'), ] diff --git a/home/views.py b/home/views.py index fc2b0a8..50093f7 100644 --- 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,7 +14,7 @@ from .forms import NumberForm, MessageForm -from .models import Number +from .models import Number, Message from twilio.rest import Client @@ -23,6 +22,14 @@ 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,7 +60,7 @@ def index(request): body=str(body_message)) messages.success(request, 'Mensaje enviado.') - return HttpResponseRedirect('/') + return HttpResponseRedirect('/message/new/') else: form = MessageForm() @@ -61,7 +68,7 @@ def index(request): '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 index 30453a6..5380aa4 100644 --- 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'