Cleanup

roofis2/core/settings.py

@@ -38,6 +38,7 @@ INSTALLED_APPS = [
     'django.contrib.staticfiles',
     'django_extensions',
     'rest_framework',
+    'roomservice'
 ]
 
 MIDDLEWARE = [

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')),
 

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'),
+]

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', {})

roofis2/templates/base.jinja

@@ -26,33 +26,6 @@
         </h1>
     </div>
 </div>
-{#<div class="nav">#}
-{#    <ul class="header">#}
-{#        <li class="navigationlist"><a href="home">Home</a></li>#}
-{#        <li class="navigationlist"><a href="guide">Guide</a></li>#}
-{#        <li class="navigationlist"><a href="shoppingcart">Warenkorb</a></li>#}
-{#        <li class="navigationlist"><a>Suche</a>#}
-{#            <ul class="dropdown">#}
-{#                <li><a href="categorybasedsearch">Suche nach Kategorien</a></li>#}
-{#                <li><a href="locationbasedsearch">Suche auf der Karte</a></li>#}
-{#            </ul>#}
-{#        </li>#}
-{#        <li class="navigationlist"><a>Meine Ressourcen</a>#}
-{#            <ul class="dropdown">#}
-{#                <li><a href="myresources">Liste</a></li>#}
-{#                <li><a href="uploadpage">Ressourcen hochladen</a></li>#}
-{#            </ul>#}
-{#        </li>#}
-{#        <li class="navigationlist"><a href="impressum">Impressum</a></li>#}
-{#        <li class="navigationlist"><a href="loginpage">Login</a></li>#}
-{#        <li class="navigationlist"><a>Account</a>#}
-{#            <ul class="dropdown">#}
-{#                <li><a href="myprofile">Profil</a></li>#}
-{#                <li><a href="logoutpage">Logout</a></li>#}
-{#            </ul>#}
-{#        </li>#}
-{#    </ul>#}
-{#</div>#}
 <div id="content" class="row">
     {% block content %}{% endblock %}
 </div>

roofis2/templates/home.jinja

@@ -1,19 +0,0 @@
-{% extends 'base.jinja' %}
-{% block content %}
-    <div class="row">
-        <div class="col-12">
-            <h1>Ressourcenpool Bamberg</h1>
-            <h2>Herzlich Willkommen beim Ressourcenpool Bamberg! </h2>
-            <br>
-            <h2> Ein Anleitung zum Ausleihen finden Sie unter: <a href="guide">Guide</a></h2>
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-12 col-md-8 bg-dark">
-            Hallo Menschen!
-        </div>
-        <div class="col-12 col-md-4 bg-primary">
-            Hallo Androids!
-        </div>
-    </div>
-{% endblock %}

roofis2/templates/nav_macro.jinja

@@ -1,6 +1,6 @@
 {% macro main_nav() -%}
     <nav class="navbar navbar-expand-lg navbar-light bg-light">
-        <a class="navbar-brand" href="{{ url('respool:home') }}">Respool</a>
+        <a class="navbar-brand" href="{{ url('roomservice:home') }}">Respool</a>
         <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent"
                 aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
             <span class="navbar-toggler-icon"></span>
@@ -9,98 +9,14 @@
         <div class="collapse navbar-collapse" id="navbarSupportedContent">
             <ul class="navbar-nav mr-auto">
                 <li class="nav-item active">
-                    <a class="nav-link" href="{{ url('respool:home') }}">Home <span class="sr-only">(current)</span></a>
+                    <a class="nav-link" href="{{ url('roomservice:home') }}">Home <span class="sr-only">(current)</span></a>
                 </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="{{ url('respool:map') }}">Map</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="{{ url('respool:items') }}">Items</a>
-                </li>
-                <li class="nav-item dropdown">
-                    <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button"
-                       data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                        Dropdown
-                    </a>
-                    <div class="dropdown-menu" aria-labelledby="navbarDropdown">
-                        <a class="dropdown-item" href="#">Action</a>
-                        <a class="dropdown-item" href="#">Another action</a>
-                        <div class="dropdown-divider"></div>
-                        <a class="dropdown-item" href="#">Something else here</a>
-                    </div>
-                </li>
-
             </ul>
             <form class="form-inline my-2 my-lg-0">
                 <input class="form-control mr-sm-2" type="search" placeholder="Search" aria-label="Search">
                 <button class="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button>
             </form>
-            {#            <ul class="nav justify-content-end">#}
-            {#                <li id="account-dropdown" class="nav-item">#}
-            {#                    <a class="nav-link dropdown-toggle" href="#" id="accountDropdown" role="button"#}
-            {#                       data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">#}
-            {#                        Account#}
-            {#                    </a>#}
-            {#                    <div class="dropdown-menu right" aria-labelledby="accountDropdown">#}
-            {#                        <a class="dropdown-item" href="#">Verleiher</a>#}
-            {#                        <a class="dropdown-item" href="#">Leiher</a>#}
-            {#                        <div class="dropdown-divider"></div>#}
-            {#                        <a class="dropdown-item" href="#">Einkaufswagen</a>#}
-            {#                    </div>#}
-            {#                </li>#}
-            {#            </ul>#}
-        </div>
-    </nav>
-{% endmacro %}
 
-{% macro bottom_nav() -%}
-    <nav class="navbar navbar-expand-lg navbar-light bg-light">
-        <a class="navbar-brand" href="{{ url('respool:home') }}">Respool</a>
-        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent"
-                aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
-            <span class="navbar-toggler-icon"></span>
-        </button>
-
-        <div class="collapse navbar-collapse" id="navbarSupportedContent">
-            <ul class="navbar-nav mr-auto">
-                <li class="nav-item active">
-                    <a class="nav-link" href="{{ url('respool:home') }}">Home <span class="sr-only">(current)</span></a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="{{ url('respool:map') }}">Map</a>
-                </li>
-                <li class="nav-item dropdown">
-                    <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button"
-                       data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                        Dropdown
-                    </a>
-                    <div class="dropdown-menu" aria-labelledby="navbarDropdown">
-                        <a class="dropdown-item" href="#">Action</a>
-                        <a class="dropdown-item" href="#">Another action</a>
-                        <div class="dropdown-divider"></div>
-                        <a class="dropdown-item" href="#">Something else here</a>
-                    </div>
-                </li>
-
-            </ul>
-            <form class="form-inline my-2 my-lg-0">
-                <input class="form-control mr-sm-2" type="search" placeholder="Search" aria-label="Search">
-                <button class="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button>
-            </form>
-            <ul class="nav justify-content-end">
-                <li id="account-dropdown" class="nav-item">
-                    <a class="nav-link dropdown-toggle" href="#" id="accountDropdown" role="button"
-                       data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                        Account
-                    </a>
-                    <div class="dropdown-menu right" aria-labelledby="accountDropdown">
-                        <a class="dropdown-item" href="#">Verleiher</a>
-                        <a class="dropdown-item" href="#">Leiher</a>
-                        <div class="dropdown-divider"></div>
-                        <a class="dropdown-item" href="#">Einkaufswagen</a>
-                    </div>
-                </li>
-            </ul>
         </div>
     </nav>
 {% endmacro %}