Compare commits
No commits in common. "8e25d5dff212ebed46ef889d46c2eb9800cd171e" and "36769322b4b11e148f66c6ce67aa86d3f0cc1348" have entirely different histories.
8e25d5dff2
...
36769322b4
@ -56,7 +56,7 @@ ROOT_URLCONF = 'lostplaces.urls'
|
||||
TEMPLATES = [
|
||||
{
|
||||
'BACKEND': 'django.template.backends.django.DjangoTemplates',
|
||||
'DIRS': [os.path.join(BASE_DIR, 'templates')],
|
||||
'DIRS': [],
|
||||
'APP_DIRS': True,
|
||||
'OPTIONS': {
|
||||
'context_processors': [
|
||||
@ -129,7 +129,3 @@ MEDIA_ROOT = os.path.join(BASE_DIR, 'uploads')
|
||||
|
||||
# Use custom user model
|
||||
AUTH_USER_MODEL = 'lostplaces_app.Explorer'
|
||||
|
||||
# Templates to use for authentication
|
||||
LOGIN_REDIRECT_URL = 'home'
|
||||
LOGOUT_REDIRECT_URL = 'home'
|
||||
|
@ -17,11 +17,8 @@ from django.contrib import admin
|
||||
from django.conf import settings
|
||||
from django.conf.urls.static import static
|
||||
from django.urls import path, include
|
||||
from django.views.generic.base import TemplateView
|
||||
|
||||
urlpatterns = [
|
||||
path('', TemplateView.as_view(template_name='home.html'), name='home'),
|
||||
path('admin/', admin.site.urls),
|
||||
path('explorers/', include('django.contrib.auth.urls')),
|
||||
path('', include('lostplaces_app.urls')),
|
||||
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
|
||||
|
@ -7,7 +7,11 @@
|
||||
<link rel="stylesheet" href="{% static 'main.css' %}">
|
||||
<link rel="icon" type="image/png" href="{% static 'favicon.ico' %}">
|
||||
<title>
|
||||
{% block title %}Urban Exploration{% endblock %}
|
||||
{% if title%}
|
||||
{{title}}|UrbEx
|
||||
{% else %}
|
||||
Urban Exploration
|
||||
{% endif %}
|
||||
</title>
|
||||
</head>
|
||||
<body>
|
||||
|
@ -1,8 +1,6 @@
|
||||
{% extends 'global.html'%}
|
||||
{% load static %}
|
||||
|
||||
{% block title %}Lost Places{% endblock %}
|
||||
|
||||
{% block maincontent %}
|
||||
<ul class="LP-Place__List">
|
||||
{% for place in place_list %}
|
||||
|
@ -1,8 +1,6 @@
|
||||
{% extends 'global.html'%}
|
||||
{% load static %}
|
||||
|
||||
{% block title %}{{place.name}}{% endblock %}
|
||||
|
||||
{% block maincontent %}
|
||||
|
||||
|
||||
|
@ -1,9 +1,8 @@
|
||||
from django.urls import path
|
||||
from .views import hello_world, place_detail_view, place_list_view, SignUpView
|
||||
from .views import hello_world, place_detail_view, place_list_view
|
||||
|
||||
urlpatterns = [
|
||||
path('hello_world/', hello_world), # You know what this is :P
|
||||
path('signup/', SignUpView.as_view(), name='signup'),
|
||||
path('hello_world/', hello_world),
|
||||
path('place/<int:pk>/', place_detail_view, name='place_detail'),
|
||||
path('places/', place_list_view)
|
||||
]
|
@ -1,17 +1,8 @@
|
||||
from django.shortcuts import render
|
||||
from django.urls import reverse_lazy
|
||||
from django.views.generic.edit import CreateView
|
||||
|
||||
from .forms import ExplorerCreationForm
|
||||
from .models import Place
|
||||
|
||||
# Create your views here.
|
||||
|
||||
class SignUpView(CreateView):
|
||||
form_class = ExplorerCreationForm
|
||||
success_url = reverse_lazy('login')
|
||||
template_name = 'signup.html'
|
||||
|
||||
def place_list_view(request,):
|
||||
return render(request, 'placeList.html', {'place_list':Place.objects.all()})
|
||||
|
||||
|
@ -1,17 +0,0 @@
|
||||
{% extends 'global.html'%}
|
||||
{% load static %}
|
||||
|
||||
# {% block title %}Start{% endblock %}
|
||||
|
||||
{% block maincontent %}
|
||||
|
||||
{% if user.is_authenticated %}
|
||||
Hi {{ user.username }}!
|
||||
<p><a href="{% url 'logout' %}">logout</a></p>
|
||||
{% else %}
|
||||
<p>Du bist nicht eingeloggt.</p>
|
||||
<a href="{% url 'login' %}">login</a> |
|
||||
<a href="{% url 'signup' %}">signup</a>
|
||||
{% endif %}
|
||||
|
||||
{% endblock maincontent %}
|
@ -1,15 +0,0 @@
|
||||
{% extends 'global.html'%}
|
||||
{% load static %}
|
||||
|
||||
# {% block title %}Login{% endblock %}
|
||||
|
||||
{% block maincontent %}
|
||||
|
||||
<h2>Login</h2>
|
||||
<form method="post">
|
||||
{% csrf_token %}
|
||||
{{ form.as_p }}
|
||||
<button type="submit">Login</button>
|
||||
</form>
|
||||
|
||||
{% endblock maincontent %}
|
@ -1,15 +0,0 @@
|
||||
{% extends 'global.html'%}
|
||||
{% load static %}
|
||||
|
||||
# {% block title %}Registrierung{% endblock %}
|
||||
|
||||
{% block maincontent %}
|
||||
|
||||
<h2>Registrierung</h2>
|
||||
<form method="post">
|
||||
{% csrf_token %}
|
||||
{{ form.as_p }}
|
||||
<button type="submit">Sign up</button>
|
||||
</form>
|
||||
|
||||
{% endblock maincontent %}
|
Loading…
Reference in New Issue
Block a user