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

Compare commits

base: Commander1024:d138c57b223da795d25d6dca00bd8dae2ba169c7
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:c20e9c866dc95e46c16334433ce7bc667d97d385
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. "d138c57b223da795d25d6dca00bd8dae2ba169c7" and "c20e9c866dc95e46c16334433ce7bc667d97d385" have entirely different histories.
d138c57b22 ... c20e9c866d

3 changed files with 11 additions and 35 deletions
Show Stats Expand all files Collapse all files

37
lostplaces/lostplaces_app/static/main.css
View File

@ -6,15 +6,6 @@
font-family: Montserrat;
src: url("fonts/Montserrat/Montserrat-Regular.otf"), url("fonts/Montserrat/Montserrat-Bold.otf"), url("fonts/Montserrat/Montserrat-Italic.otf"); }
html {
height: 100%;
margin: 0;
padding: 0; }
body {
height: 100%;
margin: 0; }
.LP-Link {
color: #565656;
text-decoration: none;
@ -262,11 +253,12 @@ body {
color: #76323F; }
.LP-Menu--sidebar {
border: none;
min-width: 60px; }
min-width: 80px; }
.LP-Menu--sidebar .LP-Menu__List {
flex-direction: column; }
.LP-Menu--sidebar .LP-Menu__List .LP-Menu__Item {
text-align: left;
border-left: 1px solid #C09F80;
margin-bottom: 10px; }
.LP-Menu--sidebar .LP-Menu__List .LP-Menu__Item:last-child {
margin-bottom: 0; }
@ -289,19 +281,19 @@ body {
display: flex;
align-items: center;
justify-content: space-between;
height: 60px;
border-bottom: 1px solid #C09F80; }
margin-bottom: 70px;
height: 60px; }
.LP-Header__Navigation {
flex-grow: 2; }
.LP-Header__Logo {
height: 45px;
height: 60px;
margin: 25px;
object-fit: cover;
max-height: 100%;
overflow: hidden;
flex-shrink: 0; }
.LP-Header__Logo .LP-Image {
height: 100%; }
height: 60px; }
.LP-Header__UserInformation {
margin-right: 3%; }
@ -314,7 +306,7 @@ body {
@media (max-width: 750px) {
.LP-Header__Logo {
width: 45px; }
width: 60px; }
.LP-Header__Logo .LP-Image {
object-position: 0 0;
object-fit: cover; } }
@ -504,18 +496,3 @@ body {
height: auto;
margin: 0;
padding: 0; } }
.LP-Main {
display: flex;
flex-direction: row-reverse;
height: calc(100% - 61px); }
.LP-Main .LP-Main__Content {
flex-grow: 1;
width: calc(100% -300px);
min-height: 1px; }
.LP-Main .LP-Main__Navigation {
flex-shrink: 0;
width: 200px;
flex-grow: 0;
height: 100%;
border-right: 1px solid #C09F80; }

5
lostplaces/lostplaces_app/templates/global.html
View File

@ -5,7 +5,6 @@
<head>
<meta charset="UTF-8">
<link rel="stylesheet" href="{% static 'main.css' %}">
<link rel="stylesheet" href="{% static 'fonts.css' %}">
<link rel="icon" type="image/png" href="{% static 'favicon.ico' %}">
<title>
{% block title %}Urban Exploration{% endblock %}
@ -23,9 +22,9 @@
<span class="LP-Paragraph">
{% if user.is_authenticated %}
Hi {{ user.username }}!
<a class="LP-Link" href="{% url 'logout' %}"><span class="LP-Link__Text">logout</span></a>
<a class="LP-Link" href="{% url 'logout' %}"><span class="LP-Link__Text">logout</span></a></p>
{% else %}
Du bist nicht eingeloggt.
<p>Du bist nicht eingeloggt.</p>
<a class="LP-Link" href="{% url 'login' %}"><span class="LP-Link__Text">login</span></a> |
<a class="LP-Link" href="{% url 'signup' %}"><span class="LP-Link__Text">signup</span></a>
{% endif %}

2
lostplaces/lostplaces_app/urls.py
View File

@ -11,7 +11,7 @@ from .views import (
urlpatterns = [
path('hello_world/', hello_world), # You know what this is :P
path('', HomeView.as_view(), name='home'),
path('/', HomeView.as_view(), name='home'),
path('signup/', SignUpView.as_view(), name='signup'),
path('place/<int:pk>/', place_detail_view, name='place_detail'),
path('place/create/', PlaceCreateView.as_view(), name='place_create'),