From 44edd69c0621103d9ee9b410f720c5e358e61b5b Mon Sep 17 00:00:00 2001 From: fbormann Date: Wed, 31 Aug 2016 15:29:45 -0300 Subject: [PATCH] change urls --- amadeus/settings.py | 10 +++++----- amadeus/urls.py | 2 +- core/templates/create_account.html | 181 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ core/templates/index.html | 2 +- core/templates/lembrar_senha.html | 2 +- core/templates/nova_conta.html | 181 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- core/views.py | 4 ++-- users/migrations/0007_auto_20160825_1801.py | 22 ++++++++++++++++++++++ 8 files changed, 213 insertions(+), 191 deletions(-) create mode 100644 core/templates/create_account.html delete mode 100644 core/templates/nova_conta.html create mode 100644 users/migrations/0007_auto_20160825_1801.py diff --git a/amadeus/settings.py b/amadeus/settings.py index 3fc7683..a2b7c1b 100644 --- a/amadeus/settings.py +++ b/amadeus/settings.py @@ -86,12 +86,12 @@ WSGI_APPLICATION = 'amadeus.wsgi.application' DATABASES = { 'default': { - 'ENGINE': 'django.db.backends.postgresql_psycopg2', + 'ENGINE': 'django.db.backends.postgresql', 'NAME': 'amadeus', - 'USER': 'amadeus_admin', - 'PASSWORD': 'amadeus', - 'HOST': 'localhost', - 'PORT': '', + 'USER': 'postgres', + 'PASSWORD': 'felipe', + 'HOST': '127.0.0.1', + 'PORT': '5432', } } diff --git a/amadeus/urls.py b/amadeus/urls.py index 59e0380..2ad0a91 100644 --- a/amadeus/urls.py +++ b/amadeus/urls.py @@ -24,7 +24,7 @@ from core import views urlpatterns = [ url(r'^$', auth_views.login, {'template_name': 'index.html'}, name='home'), url(r'^logout/$', auth_views.logout, {'next_page': 'home'}, name='logout'), - url(r'^nova_conta/$', views.nova_conta, name='nova_conta'), + url(r'^create_account/$', views.create_account, name='create_account'), url(r'^lembrar_senha/$', views.lembrar_senha, name='lembrar_senha'), url(r'^app/', include('app.urls', namespace = 'app')), url(r'^admin/', admin.site.urls), diff --git a/core/templates/create_account.html b/core/templates/create_account.html new file mode 100644 index 0000000..761c9b0 --- /dev/null +++ b/core/templates/create_account.html @@ -0,0 +1,181 @@ + +{% load static %} + + + + + + + + + + + + + + + + Projeto Amadeus + + + + + + + + + + + + + + + + + + +
+
+
+
+
+
+
 
Entrar
+
+ + +
+
+
+ + + + + + + + +
+ + O Projeto +  |  + Grupo CCTE +
+
+

Nova conta

+
+
+ +
+
+
+ +
+
+
+
+
+ +
Nome completo
+
+
Seu nome completo
+
E-mail
+
+
Seu endereço de e-mail (exemplo@mail.com)
+
Login
+
+
Seu login
+
Senha
+
+
Sua senha (mínimo de 4 caracteres)
+
Confirmação de senha
+
+
Confirme sua senha
+
+

  • Todos os campos são de preenchimento obrigatório
+
+ + +
+
+
+ +
+ + + + + + +
+
Copyright Amadeus. Todos os direitos reservados
+
+ +
+ + \ No newline at end of file diff --git a/core/templates/index.html b/core/templates/index.html index 63e7b58..f5883e4 100644 --- a/core/templates/index.html +++ b/core/templates/index.html @@ -26,7 +26,7 @@ {% endfor %}
- +
diff --git a/core/templates/lembrar_senha.html b/core/templates/lembrar_senha.html index eee1874..1d62b63 100644 --- a/core/templates/lembrar_senha.html +++ b/core/templates/lembrar_senha.html @@ -115,7 +115,7 @@ Você deve ter recebido uma cópia da Licença Pública Geral GNU, sob o título
diff --git a/core/templates/nova_conta.html b/core/templates/nova_conta.html deleted file mode 100644 index cac89f1..0000000 --- a/core/templates/nova_conta.html +++ /dev/null @@ -1,181 +0,0 @@ - -{% load static %} - - - - - - - - - - - - - - - - Projeto Amadeus - - - - - - - - - - - - - - - - - - -
-
-
-
-
-
-
 
Entrar
-
- - -
-
-
- - - - - - - - -
- - O Projeto -  |  - Grupo CCTE -
-
-

Nova conta

-
-
- -
-
-
- -
-
-
-
-
- -
Nome completo
-
-
Seu nome completo
-
E-mail
-
-
Seu endereço de e-mail (exemplo@mail.com)
-
Login
-
-
Seu login
-
Senha
-
-
Sua senha (mínimo de 4 caracteres)
-
Confirmação de senha
-
-
Confirme sua senha
-
-

  • Todos os campos são de preenchimento obrigatório
-
- - -
-
-
- -
- - - - - - -
-
Copyright Amadeus. Todos os direitos reservados
-
- -
- - \ No newline at end of file diff --git a/core/views.py b/core/views.py index 58651fe..b587735 100644 --- a/core/views.py +++ b/core/views.py @@ -7,8 +7,8 @@ def index(request): } return render(request, "index.html", context) -def nova_conta(request): - return render(request, "nova_conta.html") +def create_account(request): + return render(request, "create_account.html") def lembrar_senha(request): return render(request, "lembrar_senha.html") \ No newline at end of file diff --git a/users/migrations/0007_auto_20160825_1801.py b/users/migrations/0007_auto_20160825_1801.py new file mode 100644 index 0000000..538adcb --- /dev/null +++ b/users/migrations/0007_auto_20160825_1801.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-08-25 21:01 +from __future__ import unicode_literals + +import django.core.validators +from django.db import migrations, models +import re + + +class Migration(migrations.Migration): + + dependencies = [ + ('users', '0006_auto_20160815_0922'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='username', + field=models.CharField(help_text='A short name that will be used to identify you in the platform and to access it', max_length=35, unique=True, validators=[django.core.validators.RegexValidator(re.compile(b'^[\\w.@+-]+$'), 'Type a valid username. This fields should only contain letters, numbers and the characteres: @/./+/-/_ .', b'invalid')], verbose_name='Login'), + ), + ] -- libgit2 0.21.2