apachano
/
minetestdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added Sign up

master
Austin 2017-08-04 02:41:55 -07:00
parent 2bf594dd7e
commit c6cd96c9d2
6 changed files with 191 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

216
.idea/workspace.xml
View File

@ -2,12 +2,12 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="432bb537-aef2-4548-9e40-ca3cd89d9765" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/templates/registration/login.html" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/minetestdb/forms.py" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/templates/registration/signup.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/minetestdb/urls.py" afterPath="$PROJECT_DIR$/minetestdb/urls.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/templates/users/user-widget.html" afterPath="$PROJECT_DIR$/templates/users/user-widget.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/users/urls.py" afterPath="$PROJECT_DIR$/users/urls.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/users/views.py" afterPath="$PROJECT_DIR$/users/views.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/minetestdb/views.py" afterPath="$PROJECT_DIR$/minetestdb/views.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/templates/registration/login.html" afterPath="$PROJECT_DIR$/templates/registration/login.html" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
@ -21,16 +21,6 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="450">
<file leaf-file-name="user-widget.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/templates/users/user-widget.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="10" column="50" lean-forward="true" selection-start-line="10" selection-start-column="50" selection-end-line="10" selection-end-column="50" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="urls.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/servers/urls.py">
<provider selected="true" editor-type-id="text-editor">
@ -45,7 +35,7 @@
<entry file="file://$PROJECT_DIR$/templates/users/detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100">
<caret line="4" column="4" lean-forward="false" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="23" />
<caret line="4" column="13" lean-forward="false" selection-start-line="4" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
<folding />
</state>
</provider>
@ -61,33 +51,11 @@
</provider>
</entry>
</file>
<file leaf-file-name="views.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/users/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="29" column="9" lean-forward="true" selection-start-line="29" selection-start-column="9" selection-end-line="29" selection-end-column="9" />
<folding>
<element signature="e#0#64#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/templates/servers/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="14" lean-forward="false" selection-start-line="0" selection-start-column="13" selection-end-line="0" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="urls.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/minetestdb/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450">
<caret line="18" column="19" lean-forward="true" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="19" />
<state relative-caret-position="380">
<caret line="30" column="1" lean-forward="true" selection-start-line="30" selection-start-column="1" selection-end-line="30" selection-end-column="1" />
<folding>
<element signature="e#644#685#0" expanded="true" />
</folding>
@ -95,8 +63,38 @@
</provider>
</entry>
</file>
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/templates/users/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="8" column="46" lean-forward="true" selection-start-line="8" selection-start-column="46" selection-end-line="8" selection-end-column="46" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="login.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/templates/registration/login.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="25" column="14" lean-forward="true" selection-start-line="25" selection-start-column="14" selection-end-line="25" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="nav.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/templates/minetestdb/nav.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="10" column="37" lean-forward="true" selection-start-line="10" selection-start-column="37" selection-end-line="10" selection-end-column="37" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="signup.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/templates/registration/signup.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="13" column="14" lean-forward="true" selection-start-line="13" selection-start-column="14" selection-end-line="13" selection-end-column="14" />
@ -105,23 +103,25 @@
</provider>
</entry>
</file>
<file leaf-file-name="views.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/minetestdb/views.py">
<file leaf-file-name="forms.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/minetestdb/forms.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="125">
<caret line="5" column="60" lean-forward="true" selection-start-line="5" selection-start-column="60" selection-end-line="5" selection-end-column="60" />
<folding />
<state relative-caret-position="300">
<caret line="12" column="56" lean-forward="true" selection-start-line="12" selection-start-column="56" selection-end-line="12" selection-end-column="56" />
<folding>
<element signature="e#0#24#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="urls.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/users/urls.py">
<file leaf-file-name="views.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/minetestdb/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="9" column="67" lean-forward="false" selection-start-line="9" selection-start-column="67" selection-end-line="9" selection-end-column="67" />
<state relative-caret-position="275">
<caret line="11" column="32" lean-forward="true" selection-start-line="11" selection-start-column="32" selection-end-line="11" selection-end-column="32" />
<folding>
<element signature="e#0#32#0" expanded="true" />
<element signature="e#0#51#0" expanded="true" />
</folding>
</state>
</provider>
@ -193,7 +193,6 @@
<option value="$PROJECT_DIR$/minetestdb/templates/minetestdb/base.html" />
<option value="$PROJECT_DIR$/minetestdb/settings.py" />
<option value="$PROJECT_DIR$/minetestcdb/views.py" />
<option value="$PROJECT_DIR$/minetestdb/views.py" />
<option value="$PROJECT_DIR$/templates/minetestdb/base.html" />
<option value="$PROJECT_DIR$/templates/minetestdb/index.html" />
<option value="$PROJECT_DIR$/servers/templates/servers/detail.html" />
@ -208,6 +207,9 @@
<option value="$PROJECT_DIR$/users/urls.py" />
<option value="$PROJECT_DIR$/templates/users/user-widget.html" />
<option value="$PROJECT_DIR$/minetestdb/urls.py" />
<option value="$PROJECT_DIR$/minetestdb/forms.py" />
<option value="$PROJECT_DIR$/minetestdb/views.py" />
<option value="$PROJECT_DIR$/templates/registration/signup.html" />
<option value="$PROJECT_DIR$/templates/registration/login.html" />
</list>
</option>
@ -375,7 +377,14 @@
<option name="project" value="LOCAL" />
<updated>1501791731913</updated>
</task>
<option name="localTasksCounter" value="3" />
<task id="LOCAL-00003" summary="ADded login and logout">
<created>1501838493896</created>
<option name="number" value="00003" />
<option name="presentableId" value="LOCAL-00003" />
<option name="project" value="LOCAL" />
<updated>1501838493896</updated>
</task>
<option name="localTasksCounter" value="4" />
<servers />
</component>
<component name="ToolWindowManager">
@ -413,21 +422,14 @@
<component name="VcsManagerConfiguration">
<MESSAGE value="Learning intellij git system!!!" />
<MESSAGE value="Added user functionality" />
<option name="LAST_COMMIT_MESSAGE" value="Added user functionality" />
<MESSAGE value="ADded login and logout" />
<option name="LAST_COMMIT_MESSAGE" value="ADded login and logout" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager />
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/servers/admin.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="9" column="40" lean-forward="false" selection-start-line="9" selection-start-column="40" selection-end-line="9" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/servers/static/servers/style.css" />
<entry file="file://$PROJECT_DIR$/servers/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
@ -673,14 +675,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/users/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="11" column="34" lean-forward="true" selection-start-line="11" selection-start-column="34" selection-end-line="11" selection-end-column="34" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/users/tests.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
@ -713,14 +707,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/minetestdb/nav.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="10" column="37" lean-forward="true" selection-start-line="10" selection-start-column="37" selection-end-line="10" selection-end-column="37" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/users/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
@ -749,22 +735,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/minetestdb/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="125">
<caret line="5" column="60" lean-forward="true" selection-start-line="5" selection-start-column="60" selection-end-line="5" selection-end-column="60" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/minetestdb/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100">
<caret line="4" column="8" lean-forward="false" selection-start-line="4" selection-start-column="8" selection-end-line="4" selection-end-column="8" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/users/user-widget.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
@ -783,23 +753,59 @@
</entry>
<entry file="file://$PROJECT_DIR$/minetestdb/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450">
<caret line="18" column="19" lean-forward="true" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="19" />
<state relative-caret-position="380">
<caret line="30" column="1" lean-forward="true" selection-start-line="30" selection-start-column="1" selection-end-line="30" selection-end-column="1" />
<folding>
<element signature="e#644#685#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/users/detail.html">
<entry file="file://$PROJECT_DIR$/minetestdb/forms.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="12" column="56" lean-forward="true" selection-start-line="12" selection-start-column="56" selection-end-line="12" selection-end-column="56" />
<folding>
<element signature="e#0#24#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/minetestdb/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="11" column="32" lean-forward="true" selection-start-line="11" selection-start-column="32" selection-end-line="11" selection-end-column="32" />
<folding>
<element signature="e#0#51#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/minetestdb/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100">
<caret line="4" column="4" lean-forward="false" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="23" />
<caret line="4" column="8" lean-forward="false" selection-start-line="4" selection-start-column="8" selection-end-line="4" selection-end-column="8" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/registration/login.html">
<entry file="file://$PROJECT_DIR$/templates/minetestdb/nav.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="10" column="37" lean-forward="true" selection-start-line="10" selection-start-column="37" selection-end-line="10" selection-end-column="37" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/users/detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100">
<caret line="4" column="13" lean-forward="false" selection-start-line="4" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/registration/signup.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="13" column="14" lean-forward="true" selection-start-line="13" selection-start-column="14" selection-end-line="13" selection-end-column="14" />
@ -807,5 +813,21 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/users/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="8" column="46" lean-forward="true" selection-start-line="8" selection-start-column="46" selection-end-line="8" selection-end-column="46" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/templates/registration/login.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="25" column="14" lean-forward="true" selection-start-line="25" selection-start-column="14" selection-end-line="25" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
</component>
</project>

13
minetestdb/forms.py Normal file
View File

@ -0,0 +1,13 @@
from django import forms
from django.contrib.auth.forms import UserCreationForm
from django.contrib.auth.models import User
class SignUpForm(UserCreationForm):
first_name = forms.CharField(max_length=30, required=False, help_text='Optional.')
last_name = forms.CharField(max_length=30, required=False, help_text='Optional.')
email = forms.EmailField(max_length=254, help_text='Required. Inform a valid email address.')
class Meta:
model = User
fields = ('username', 'first_name', 'last_name', 'email', 'password1', 'password2', )

7
minetestdb/urls.py
View File

@ -20,11 +20,12 @@ from . import views
app_name = 'minetestdb'
urlpatterns = [
url(r'^login/', auth_views.login, name='login'),
url(r'^logout/', auth_views.logout, {'next_page': '/'}, name='logout'),
url(r'^login/$', auth_views.login, name='login'),
url(r'^logout/$', auth_views.logout, {'next_page': '/'}, name='logout'),
url(r'^signup/$', views.signup, name='signup'),
url(r'^mods/', include('mods.urls')),
url(r'^servers/', include('servers.urls')),
url(r'^users/', include('users.urls')),
url(r'^admin/', admin.site.urls),
url(r'^', views.index, name='index'),
url(r'^$', views.index, name='index'),
]

21
minetestdb/views.py
View File

@ -1,6 +1,23 @@
from django.shortcuts import render
from django.contrib.auth import login, authenticate
from minetestdb.forms import SignUpForm
from django.shortcuts import render, redirect
def index(request):
context = {}
return render(request, 'minetestdb/index.html', context)
return render(request, 'minetestdb/index.html', context)
def signup(request):
if request.method == 'POST':
form = SignUpForm(request.POST)
if form.is_valid():
form.save()
username = form.cleaned_data.get('username')
raw_password = form.cleaned_data.get('password1')
user = authenticate(username=username, password=raw_password)
login(request, user)
return redirect('home')
else:
form = SignUpForm()
return render(request, 'registration/signup.html', {'form': form})

26
templates/registration/login.html
View File

@ -4,11 +4,25 @@
{% block content %}
<div class="container">
<h2>Login</h2>
<form method="post">
{% csrf_token %}
{{ form.as_p }}
<button type="submit">Login</button>
</form>
<div class="row">
<div class="col-sm-6">
<div class="panel panel-default">
<div class="panel-heading">Login</div>
<div class="panel-body">
<form method="post">
{% csrf_token %}
{{ form.as_p }}
<button type="submit">Login</button>
</form>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="panel panel-default">
<div class="panel-heading">New?</div>
<div class="panel-body"><a href="/signup/">Sign up</a></div>
</div>
</div>
</div>
</div>
{% endblock %}

16
templates/registration/signup.html Normal file
View File

@ -0,0 +1,16 @@
{% extends 'minetestdb/base.html' %}
{% block content %}
<div class="container">
<div class="panel panel-default">
<div class="panel-heading">Sign up</div>
<div class="panel-body">
<form method="post">
{% csrf_token %}
{{ form.as_p }}
<button type="submit">Sign up</button>
</form>
</div>
</div>
</div>
{% endblock %}