Commander1024/lostplaces-backend
Commander1024/lostplaces-backend
1
0
Fork 0
Code Issues 14 Pull Requests Releases Wiki Activity

Compare commits

base: Commander1024:8e25d5dff212ebed46ef889d46c2eb9800cd171e
Branches Tags
Commander1024:master
Commander1024:develop
Commander1024:update/django-4.1.1
Commander1024:feature/50-Linktypes
Commander1024:feature/33-been-there-done-that
Commander1024:feature/30-user-profile-fields
Commander1024:27-Favorite-System
Commander1024:feature/localization
Commander1024:feature/authorized_tag
Commander1024:0.1.4
Commander1024:0.1.3
Commander1024:0.1.2
Commander1024:0.1.a2
Commander1024:0.1
..
compare: Commander1024:36769322b4b11e148f66c6ce67aa86d3f0cc1348
Branches Tags
Commander1024:develop
Commander1024:update/django-4.1.1
Commander1024:master
Commander1024:feature/50-Linktypes
Commander1024:feature/33-been-there-done-that
Commander1024:feature/30-user-profile-fields
Commander1024:27-Favorite-System
Commander1024:feature/localization
Commander1024:feature/authorized_tag
Commander1024:0.1.4
Commander1024:0.1.3
Commander1024:0.1.2
Commander1024:0.1.a2
Commander1024:0.1

No commits in common. "8e25d5dff212ebed46ef889d46c2eb9800cd171e" and "36769322b4b11e148f66c6ce67aa86d3f0cc1348" have entirely different histories.
8e25d5dff2 ... 36769322b4

10 changed files with 9 additions and 73 deletions
Show Stats Expand all files Collapse all files

6
source/lostplaces/lostplaces/settings.py
View File

@ -56,7 +56,7 @@ ROOT_URLCONF = 'lostplaces.urls'
TEMPLATES = [ TEMPLATES = [
{ {
'BACKEND': 'django.template.backends.django.DjangoTemplates', 'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [os.path.join(BASE_DIR, 'templates')], 'DIRS': [],
'APP_DIRS': True, 'APP_DIRS': True,
'OPTIONS': { 'OPTIONS': {
'context_processors': [ 'context_processors': [
@ -129,7 +129,3 @@ MEDIA_ROOT = os.path.join(BASE_DIR, 'uploads')
# Use custom user model # Use custom user model
AUTH_USER_MODEL = 'lostplaces_app.Explorer' AUTH_USER_MODEL = 'lostplaces_app.Explorer'
# Templates to use for authentication
LOGIN_REDIRECT_URL = 'home'
LOGOUT_REDIRECT_URL = 'home'

5
source/lostplaces/lostplaces/urls.py
View File

@ -16,12 +16,9 @@ Including another URLconf
from django.contrib import admin from django.contrib import admin
from django.conf import settings from django.conf import settings
from django.conf.urls.static import static from django.conf.urls.static import static
from django.urls import path, include from django.urls import path, include
from django.views.generic.base import TemplateView
urlpatterns = [ urlpatterns = [
path('', TemplateView.as_view(template_name='home.html'), name='home'),
path('admin/', admin.site.urls), path('admin/', admin.site.urls),
path('explorers/', include('django.contrib.auth.urls')),
path('', include('lostplaces_app.urls')), path('', include('lostplaces_app.urls')),
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

6
source/lostplaces/lostplaces_app/templates/global.html
View File

@ -7,7 +7,11 @@
<link rel="stylesheet" href="{% static 'main.css' %}"> <link rel="stylesheet" href="{% static 'main.css' %}">
<link rel="icon" type="image/png" href="{% static 'favicon.ico' %}"> <link rel="icon" type="image/png" href="{% static 'favicon.ico' %}">
<title> <title>
{% block title %}Urban Exploration{% endblock %} {% if title%}
{{title}}|UrbEx
{% else %}
Urban Exploration
{% endif %}
</title> </title>
</head> </head>
<body> <body>

2
source/lostplaces/lostplaces_app/templates/placeList.html
View File

@ -1,8 +1,6 @@
{% extends 'global.html'%} {% extends 'global.html'%}
{% load static %} {% load static %}
{% block title %}Lost Places{% endblock %}
{% block maincontent %} {% block maincontent %}
<ul class="LP-Place__List"> <ul class="LP-Place__List">
{% for place in place_list %} {% for place in place_list %}

2
source/lostplaces/lostplaces_app/templates/placeOverview.html
View File

@ -1,8 +1,6 @@
{% extends 'global.html'%} {% extends 'global.html'%}
{% load static %} {% load static %}
{% block title %}{{place.name}}{% endblock %}
{% block maincontent %} {% block maincontent %}

5
source/lostplaces/lostplaces_app/urls.py
View File

@ -1,9 +1,8 @@
from django.urls import path 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 = [ urlpatterns = [
path('hello_world/', hello_world), # You know what this is :P path('hello_world/', hello_world),
path('signup/', SignUpView.as_view(), name='signup'),
path('place/<int:pk>/', place_detail_view, name='place_detail'), path('place/<int:pk>/', place_detail_view, name='place_detail'),
path('places/', place_list_view) path('places/', place_list_view)
] ]

9
source/lostplaces/lostplaces_app/views.py
View File

@ -1,17 +1,8 @@
from django.shortcuts import render 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 from .models import Place
# Create your views here. # Create your views here.
class SignUpView(CreateView):
form_class = ExplorerCreationForm
success_url = reverse_lazy('login')
template_name = 'signup.html'
def place_list_view(request,): def place_list_view(request,):
return render(request, 'placeList.html', {'place_list':Place.objects.all()}) return render(request, 'placeList.html', {'place_list':Place.objects.all()})

17
source/lostplaces/templates/home.html
View File

@ -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 %}

15
source/lostplaces/templates/registration/login.html
View File

@ -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 %}

15
source/lostplaces/templates/signup.html
View File

@ -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 %}