Merge branch 'guntherweissenbaeck/issue47'

app/bird/urls.py

@@ -7,8 +7,6 @@ from .views import (
     bird_help,
     bird_help_single,
     bird_inactive,
-    bird_recover,
-    bird_recover_all,
     bird_single,
 )
 
@@ -19,7 +17,5 @@ urlpatterns = [
     path("delete/<id>", bird_delete, name="bird_delete"),
     path("help/", bird_help, name="bird_help"),
     path("help/<id>", bird_help_single, name="bird_help_single"),
-    path("recover/<id>", bird_recover, name="bird_recover"),
-    path("recover/all", bird_recover_all, name="bird_recover_all"),
     path("<id>/", bird_single, name="bird_single"),
 ]

app/bird/views.py

@@ -79,11 +79,6 @@ def bird_inactive(request):
     return render(request, "bird/bird_inactive.html", context)
 
 
-@login_required(login_url="account_login")
-def bird_recover_all(request):
-    return HttpResponse("Show all recovered Birds")
-
-
 @login_required(login_url="account_login")
 def bird_single(request, id):
     bird = FallenBird.objects.get(id=id)
@@ -107,8 +102,3 @@ def bird_delete(request, id):
         return redirect("bird_all")
     context = {"bird": bird}
     return render(request, "bird/bird_delete.html", context)
-
-
-@login_required(login_url="account_login")
-def bird_recover(request, id):
-    return HttpResponse(f"Show recover with ID {id}")

app/core/settings.py

@@ -75,7 +75,6 @@ INSTALLED_APPS = [
     "costs",
     "export",
     "rescuer",
-    "sites",
 ]
 
 MIDDLEWARE = [

app/sites/admin.py

@@ -1,3 +0,0 @@
-from django.contrib import admin
-
-# Register your models here.

app/sites/apps.py

@@ -1,6 +0,0 @@
-from django.apps import AppConfig
-
-
-class SitesConfig(AppConfig):
-    default_auto_field = 'django.db.models.BigAutoField'
-    name = 'sites'

app/sites/models.py

@@ -1,3 +0,0 @@
-from django.db import models
-
-# Create your models here.

app/sites/templates/sites/index.html

@@ -1,10 +0,0 @@
-{% extends 'base.html' %} 
-{% block content %}
-<div class="row" style="text-align: center;">
-    <div>
-        <h1 style="margin-bottom: 5px;">FallenBirdy</h1>
-        <img src="../../../static/img/wvhLogo12001200300x.png" alt="Logo Wildvogelhilfe Jena" class="logowvh">
-        <a href="{% url 'account_login' %}" id="loginMain">Einloggen</a>
-    </div>
-</div>
-{% endblock content %}

app/sites/tests.py

@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.

app/sites/urls.py

@@ -1,9 +0,0 @@
-from .views import index, privacy, impress
-from django.urls import path
-
-
-urlpatterns = [
-    path("", index, name="index"),
-    path("privacy/", privacy, name="privacy"),
-    path("impress/", impress, name="impress"),
-]

app/sites/views.py

@@ -1,13 +0,0 @@
-from django.shortcuts import redirect, render
-
-
-def index(request):
-    return render(request, "sites/index.html")
-
-
-def privacy(request):
-    return render(request, "sites/privacy.html")
-
-
-def impress(request):
-    return render(request, "sites/impress.html")

app/templates/partials/_footer.html

@@ -4,7 +4,7 @@
         <p class="col-md-4 mb-0 text-muted">Version: 1.0 © 2023 fbf </p>
         <ul class="nav col-md-5 justify-content-end">
             <li class="nav-item">
-                <a class="nav-link px-2 text-muted" href="{% url 'rescuer_all' %}">Home</a>
+                <a class="nav-link px-2 text-muted" href="{% url 'bird_all' %}">Home</a>
             </li>
             <li class="nav-item">
                 <a class="nav-link px-2 text-muted" href="https://www.nabu-jena.de/j/privacy">Datenschutzerklärung</a>