Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Doing login #30

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions maoaberta/contributors/views.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
from django.views.generic import TemplateView
from django.contrib.auth import logout
from django.shortcuts import redirect


class LoginView(TemplateView):

template_name = 'contributors/login.html'
def logout_view(request):
logout(request)
return redirect('home')


class ContributorView(TemplateView):
Expand Down
Binary file added maoaberta/maoaberta.sqlite
Binary file not shown.
14 changes: 14 additions & 0 deletions maoaberta/maoaberta/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,13 @@
import os

from dj_database_url import parse as parse_db_url
from django.core.urlresolvers import reverse_lazy
from prettyconf import config

BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))

SITE_ID = 1


# Quick-start development settings - unsuitable for production
# See https://docs.djangoproject.com/en/1.8/howto/deployment/checklist/
Expand All @@ -34,11 +37,17 @@
INSTALLED_APPS = (
'django.contrib.admin',
'django.contrib.auth',
# Documentation: https://github.com/pennersr/django-allauth
'django.contrib.sites',
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles',

'allauth',
'allauth.account',
'allauth.socialaccount',

'contributors',
'organizations',
'projects'
Expand Down Expand Up @@ -117,3 +126,8 @@

MEDIA_URL = '/media/'
MEDIA_ROOT = os.path.join(BASE_DIR, 'media')


# Login
LOGIN_REDIRECT_URL = reverse_lazy('home')
LOGIN_URL = 'login'
9 changes: 5 additions & 4 deletions maoaberta/maoaberta/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,15 @@
"""
from django.conf.urls import include, url
from django.contrib import admin

from contributors.views import LoginView
from contributors.views import ContributorView
from allauth.account.views import LoginView
from contributors.views import ContributorView, logout_view
from organizations.views import HomePageView

urlpatterns = [
url(r'^admin/', include(admin.site.urls)),
url(r'^$', HomePageView.as_view(), name='home'),
url(r'^contributor/$', ContributorView.as_view(), name='contributor'),
url(r'^login/$', LoginView.as_view(), name='login'),
url(r'^contributor/$', ContributorView.as_view(), name='contributor')
url(r'^signout/$', LoginView.as_view(), name='account_signup'),
url(r'^logout/$', logout_view, name='logout'),
]
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,12 @@

<h3 class="text-center">/mãoaberta</h3>

<form class="form-signin" class="form-horizontal">
<label class=""> Usuário </label>

<input type="text" class="form-control" placeholder="" required autofocus>

<label class=""> Senha </label>
<input type="password" class="form-control" placeholder="" required>

<form class="form-signin" class="form-horizontal" method="post">
{{ form.as_p }}
{% csrf_token %}
<button class="btn btn-lg btn-primary btn-block" type="submit">
Entrar
</button>

<p class="text-center">Ainda não tenho, conta! Quero <a href="#">criar</a> agora mesmo!</p>
</form>
</div><!--space-top-->
</div><!--col-sm-12-->
Expand Down
6 changes: 5 additions & 1 deletion maoaberta/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,11 @@
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav navbar-right">
<li>
<a href="{% url 'login' %}">Login</a>
{% if user.is_authenticated %}
<a href="{% url 'logout' %}">Logout</a>
{% else %}
<a href="{% url 'login' %}">Login</a>
{% endif %}
</li>
</ul>
</div><!-- /.navbar-collapse -->
Expand Down
1 change: 1 addition & 0 deletions requirements/production.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ prettyconf==1.2.3
Django==1.10
Pillow==3.3.0
dj-static==0.0.6
django-allauth==0.26.1
dj-database-url==0.4.1