From c2fa630acf4bff1f14a21c9ac4472d6bbe8000e3 Mon Sep 17 00:00:00 2001 From: MG Date: Fri, 8 Jun 2018 19:00:49 +0200 Subject: [PATCH] Cleanup --- roofis2/core/settings.py | 1 + roofis2/core/urls.py | 3 +- roofis2/roomservice/urls.py | 7 +++ roofis2/roomservice/views.py | 3 ++ roofis2/templates/base.jinja | 27 ---------- roofis2/templates/home.jinja | 19 ------- roofis2/templates/nav_macro.jinja | 88 +------------------------------ 7 files changed, 15 insertions(+), 133 deletions(-) create mode 100644 roofis2/roomservice/urls.py delete mode 100644 roofis2/templates/home.jinja diff --git a/roofis2/core/settings.py b/roofis2/core/settings.py index b851c81..c3e59da 100644 --- a/roofis2/core/settings.py +++ b/roofis2/core/settings.py @@ -38,6 +38,7 @@ INSTALLED_APPS = [ 'django.contrib.staticfiles', 'django_extensions', 'rest_framework', + 'roomservice' ] MIDDLEWARE = [ diff --git a/roofis2/core/urls.py b/roofis2/core/urls.py index 833d046..b25e30b 100644 --- a/roofis2/core/urls.py +++ b/roofis2/core/urls.py @@ -1,4 +1,4 @@ -"""respool URL Configuration +"""roofis2 URL Configuration The `urlpatterns` list routes URLs to views. For more information please see: https://docs.djangoproject.com/en/2.0/topics/http/urls/ @@ -21,6 +21,7 @@ from rest_framework.permissions import AllowAny urlpatterns = [ path('admin/', admin.site.urls), + path('', include('roomservice.urls')), # APIs # path('api/', include('respool.api.urls')), diff --git a/roofis2/roomservice/urls.py b/roofis2/roomservice/urls.py new file mode 100644 index 0000000..7901aef --- /dev/null +++ b/roofis2/roomservice/urls.py @@ -0,0 +1,7 @@ +from django.urls import path +from . import views + +app_name = 'roomservice' +urlpatterns = [ + path('', views.home, name='home'), +] diff --git a/roofis2/roomservice/views.py b/roofis2/roomservice/views.py index 91ea44a..670e72f 100644 --- a/roofis2/roomservice/views.py +++ b/roofis2/roomservice/views.py @@ -1,3 +1,6 @@ from django.shortcuts import render + # Create your views here. +def home(request): + return render(request, 'base.jinja', {}) diff --git a/roofis2/templates/base.jinja b/roofis2/templates/base.jinja index 21f7c2a..e60f4d5 100644 --- a/roofis2/templates/base.jinja +++ b/roofis2/templates/base.jinja @@ -26,33 +26,6 @@ -{#
#} -{# #} -{#
#}
{% block content %}{% endblock %}
diff --git a/roofis2/templates/home.jinja b/roofis2/templates/home.jinja deleted file mode 100644 index 6d8ee8e..0000000 --- a/roofis2/templates/home.jinja +++ /dev/null @@ -1,19 +0,0 @@ -{% extends 'base.jinja' %} -{% block content %} -
-
-

Ressourcenpool Bamberg

-

Herzlich Willkommen beim Ressourcenpool Bamberg!

-
-

Ein Anleitung zum Ausleihen finden Sie unter: Guide

-
-
-
-
- Hallo Menschen! -
-
- Hallo Androids! -
-
-{% endblock %} \ No newline at end of file diff --git a/roofis2/templates/nav_macro.jinja b/roofis2/templates/nav_macro.jinja index 1616d52..7cb7718 100644 --- a/roofis2/templates/nav_macro.jinja +++ b/roofis2/templates/nav_macro.jinja @@ -1,6 +1,6 @@ {% macro main_nav() -%} -{% endmacro %} -{% macro bottom_nav() -%} - {% endmacro %} \ No newline at end of file