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

Compare commits

base: Commander1024:4a6c3b7606400d0ca63d673666e6c526da85d350
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:799644bf3194de025397e4b528928d1d7b3d1014
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. "4a6c3b7606400d0ca63d673666e6c526da85d350" and "799644bf3194de025397e4b528928d1d7b3d1014" have entirely different histories.
4a6c3b7606 ... 799644bf31

6 changed files with 129 additions and 221 deletions
Show Stats Expand all files Collapse all files

1
Pipfile
View File

@ -10,7 +10,6 @@ pylint = "*"
django = "*" django = "*"
django-thumbs-v2 = "*" django-thumbs-v2 = "*"
image = "*" image = "*"
django-widget-tweaks = "*"
# Commented out to not explicitly specify Python3 subversion. # Commented out to not explicitly specify Python3 subversion.
# [requires] # [requires]
# python_version = "3.8" # python_version = "3.8"

3
lostplaces/lostplaces/settings.py
View File

@ -41,8 +41,7 @@ INSTALLED_APPS = [
'django.contrib.sessions', 'django.contrib.sessions',
'django.contrib.messages', 'django.contrib.messages',
'django.contrib.staticfiles', 'django.contrib.staticfiles',
'django_thumbs', 'django_thumbs'
'widget_tweaks',
] ]
MIDDLEWARE = [ MIDDLEWARE = [

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

@ -62,9 +62,7 @@
font-weight: bold; } font-weight: bold; }
.LP-Button:active { .LP-Button:active {
background-color: #76323F; background-color: #76323F;
color: #f9f9f9; } color: #C09F80; }
.LP-Button--cancel {
background-color: #f9f9f9; }
.LP-Form .LP-Form__Checkbox { .LP-Form .LP-Form__Checkbox {
display: none; } display: none; }
@ -86,12 +84,11 @@
border-bottom: 1px solid #565656; border-bottom: 1px solid #565656;
padding: 8px; padding: 8px;
margin-bottom: 30px; } margin-bottom: 30px; }
.LP-Input .LP-Input__Field:focus, .LP-Input .LP-Input__Field:active, .LP-Input .LP-Input__Field:invalid { .LP-Input .LP-Input__Field:focus, .LP-Input .LP-Input__Field:active {
margin-bottom: 29px; margin-bottom: 29px;
border-bottom: 2px solid #76323F; border-bottom: 2px solid #76323F;
background-color: #f9f9f9; background-color: #f9f9f9;
border-radius: 3px 3px 0 0; border-radius: 3px 3px 0 0; }
box-shadow: none; }
.LP-Input .LP-Input__Label { .LP-Input .LP-Input__Label {
font-family: Montserrat, Helvetica, sans-serif; font-family: Montserrat, Helvetica, sans-serif;
font-size: 16px; } font-size: 16px; }
@ -102,6 +99,8 @@
padding: 3px; padding: 3px;
position: relative; position: relative;
top: -30px; } top: -30px; }
.LP-Input .LP-Input__Message:before {
content: '* '; }
.LP-Input--error .LP-Input__Field { .LP-Input--error .LP-Input__Field {
margin-bottom: 25px; margin-bottom: 25px;
border-bottom: 2px solid #76323F; border-bottom: 2px solid #76323F;
@ -123,10 +122,8 @@
color: #565656; } color: #565656; }
.LP-Image { .LP-Image {
object-fit: cover; max-width: 100%;
width: 100%; max-height: 100%; }
height: auto;
vertical-align: top; }
.LP-Logo { .LP-Logo {
max-width: 100%; max-width: 100%;
@ -134,18 +131,6 @@
width: auto; width: auto;
object-fit: contain; } object-fit: contain; }
.LP-Tag {
padding: 8px 14px;
background-color: #D7CEC7;
border-radius: 2px;
width: max-content; }
.LP-Tag .LP-Paragraph {
padding: 0;
margin: 0;
font-family: Montserrat, Helvetica, sans-serif;
font-size: 1em;
display: inline; }
.LP-Content { .LP-Content {
padding: 35px; } padding: 35px; }
@ -156,90 +141,68 @@
.LP-TextSection .LP-Text { .LP-TextSection .LP-Text {
line-height: 1.4rem; } line-height: 1.4rem; }
.LP-PlaceTeaser { .LP-Place {
width: 280px; } width: 280px; }
.LP-PlaceTeaser .LP-PlaceTeaser__Image { .LP-Place .LP-Place__Image {
height: 165px; height: 165px;
width: 280px; object-fit: fill; }
overflow: hidden; } .LP-Place .LP-Place__Meta {
.LP-PlaceTeaser .LP-PlaceTeaser__Image .LP-Image {
max-width: unset;
max-height: unset;
object-fit: cover; }
.LP-PlaceTeaser .LP-PlaceTeaser__Meta {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
padding-bottom: 10px; } padding-bottom: 10px; }
.LP-PlaceTeaser .LP-PlaceTeaser__Meta .LP-Paragraph { .LP-Place .LP-Place__Meta .LP-Paragraph {
font-family: Montserrat, Helvetica, sans-serif; font-family: Montserrat, Helvetica, sans-serif;
padding: 0; padding: 0;
margin: 0; margin: 0;
margin-top: 5px; margin-top: 5px;
font-size: 0.9rem; } font-size: 0.9rem; }
.LP-PlaceTeaser .LP-PlaceTeaser__Meta .LP-Headline { .LP-Place .LP-Place__Meta .LP-Headline {
font-family: Montserrat, Helvetica, sans-serif; font-family: Montserrat, Helvetica, sans-serif;
color: #565656; color: #565656;
font-size: 1rem; font-size: 1rem;
padding: 0px; padding: 0px;
margin: 0px; } margin: 0px; }
.LP-PlaceTeaser .LP-PlaceTeaser__Description { .LP-Place .LP-Place__Description {
font-family: Roboto, Arial, sans-serif; font-family: Roboto, Arial, sans-serif;
color: #565656; color: #565656;
display: none; } display: none; }
@media (min-width: 650px) { .LP-SecurityMeasure__List {
.LP-PlaceTeaser--extended {
display: flex;
flex-direction: row;
width: auto;
padding-right: 25px;
height: 165px; }
.LP-PlaceTeaser--extended .LP-PlaceTeaser__Meta {
margin: 0;
padding: 5px;
padding-left: 25px;
display: flex;
flex-direction: column;
justify-content: space-between;
align-items: flex-start; }
.LP-PlaceTeaser--extended .LP-PlaceTeaser__Meta .LP-PlaceTeaser__Info .LP-Headline {
font-size: 28px; }
.LP-PlaceTeaser--extended .LP-PlaceTeaser__Meta .LP-PlaceTeaser__Icons {
margin-top: auto; }
.LP-PlaceTeaser--extended .LP-PlaceTeaser__Meta .LP-PlaceTeaser__Icons ul {
padding: 0;
margin: 0; }
.LP-PlaceTeaser--extended .LP-PlaceTeaser__Description {
display: block;
max-height: 55px;
overflow: hidden; }
.LP-PlaceTeaser--extended .LP-PlaceTeaser__Image {
height: 165px;
width: 280px;
flex-shrink: 0;
flex-grow: 0; } }
.LP-TagList .LP-TagList__List {
list-style-type: none; list-style-type: none;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
padding: 0; padding: 0;
margin: 0; } margin: 0; }
.LP-TagList .LP-TagList__List .LP-TagList__Item { .LP-SecurityMeasure__List .LP-SecurityMeasure__Item {
margin: 6px; } margin: 5px 5px;
padding: 5px 8px;
background-color: #D7CEC7;
border-radius: 2px; }
.LP-SecurityMeasure__List .LP-SecurityMeasure__Item .LP-Text {
font-family: Montserrat, Helvetica, sans-serif;
font-size: 1.2rem; }
.LP-Menu .LP-Menu__List { .LP-Header {
list-style-type: none;
display: flex; display: flex;
flex-direction: row; align-items: center;
justify-content: space-between; justify-content: space-between;
padding: 0; margin-bottom: 70px; }
margin: 0; } .LP-Header__Logo {
max-width: 300px;
width: 35%;
object-fit: contain; }
.LP-Header .LP-Header__Logo {
margin: 25px; }
.LP-Menu .LP-Menu__Item { .LP-Menu__List {
padding: 15px 0; list-style-type: none;
margin: 0; display: inline-flex;
justify-content: space-around; }
.LP-Menu__Item {
padding: 10px 15px;
margin: 0 15px;
width: 100px; width: 100px;
text-align: center; text-align: center;
background-color: transparent; } background-color: transparent; }
@ -251,80 +214,72 @@
.LP-Menu .LP-Link__Text:hover { .LP-Menu .LP-Link__Text:hover {
color: #76323F; } color: #76323F; }
@media (max-width: 750px) { .LP-Introduction .LP-Headline {
.LP-Menu .LP-Menu__List { font-size: 2rem; }
display: flex;
flex-direction: row;
justify-content: flex-start; } }
@media (max-width: 450px) { .LP-Introduction .LP-Text {
.LP-Menu .LP-Menu__List { font-size: 1.3rem; }
justify-content: space-between; } }
.LP-Header { .LP-Place__Grid {
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 70px;
height: 60px; }
.LP-Header__Logo {
height: 60px;
margin: 25px;
object-fit: cover;
max-height: 100%;
overflow: hidden; }
.LP-Header__Logo .LP-Image {
height: 60px; }
@media (max-width: 750px) {
.LP-Header__Logo {
width: 60px; }
.LP-Header__Logo .LP-Image {
object-position: 0 0;
object-fit: cover; } }
@media (max-width: 450px) {
.LP-Header__Logo {
display: none; }
.LP-Header__Navigation {
width: 100%; } }
.LP-PlaceGrid .LP-PlaceGrid__Grid {
margin: 0; margin: 0;
padding: 0; padding: 0;
list-style-type: none; list-style-type: none;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
flex-wrap: wrap; } flex-wrap: wrap; }
.LP-PlaceGrid .LP-PlaceGrid__Grid .LP-PlaceGrid__Item { .LP-Place__Grid > .LP-Place__Item {
margin: 18px; } margin: 0 15px;
.LP-PlaceGrid .LP-PlaceGrid__Grid .LP-Link .LP-PlaceTeaser:hover { margin-bottom: 50px; }
box-shadow: 0 0 2px #565656; } .LP-Place__Grid .LP-Link .LP-Place__Description {
display: none; }
.LP-Place__Grid .LP-Link .LP-Place:hover {
box-shadow: 0 0 8px #565656; }
.LP-PlaceList .LP-PlaceList__List { .LP-Place__List {
list-style-type: none; } list-style-type: none; }
.LP-PlaceList .LP-PlaceList__List .LP-Link .LP-Place:hover { .LP-Place__List .LP-Link .LP-Place:hover {
color: #565656; color: #565656;
background-color: #f9f9f9; background-color: #f9f9f9;
position: relative; position: relative;
left: -2px; } left: -2px; }
.LP-PlaceList .LP-PlaceList__List .LP-Link .LP-Place:hover > .LP-Place__Image { .LP-Place__List .LP-Link .LP-Place:hover > .LP-Place__Image {
border-left: 2px #565656 solid; } border-left: 2px #565656 solid; }
.LP-PlaceList .LP-PlaceList__List .LP-PlaceList__Item { .LP-Place__List .LP-Place__Item {
max-width: 900px; max-width: 900px;
min-width: 450px; min-width: 450px;
margin: 18px 0; } margin: 18px 0; }
.LP-Place__List .LP-Place__Item .LP-Place {
display: flex;
flex-direction: row;
width: auto;
padding-right: 25px; }
.LP-Place__List .LP-Place__Item .LP-Place .LP-Place__Assets {
margin: 0;
padding: 0;
padding-left: 25px;
display: flex;
flex-direction: column;
justify-content: space-between;
align-items: flex-start; }
.LP-Place__List .LP-Place__Item .LP-Place .LP-Place__Assets .LP-Place__Info .LP-Place__Title {
font-size: 28px; }
.LP-Place__List .LP-Place__Item .LP-Place .LP-Place__Assets .LP-Icon__List {
justify-self: flex-end; }
.LP-Place__List .LP-Place__Item .LP-Place > .LP-Place__Image {
height: 168px;
width: 280px; }
.LP-LinkList__List { .LP-LinkList__List {
list-style-type: none; list-style-type: none;
display: grid; display: grid;
grid-template-columns: repeat(auto-fit, minmax(300px, 1fr)); grid-template-columns: repeat(auto-fit, 300px);
margin: 0; margin: 0;
padding: 0; } padding: 0; }
.LP-LinkList__List .LP-LinkList__Item { .LP-LinkList__List .LP-LinkList__Item {
border-left: 1px solid #C09F80; border-left: 1px solid #C09F80;
width: 100%; width: 100%;
margin-top: 12px; } margin-top: 12px;
height: 55px; }
.LP-LinkList__List .LP-LinkList__Item .LP-Link { .LP-LinkList__List .LP-LinkList__Item .LP-Link {
padding: 1em 0 1em 1em; padding: 1em 0 1em 1em;
width: calc(100% - $-link-padding); width: calc(100% - $-link-padding);
@ -375,28 +330,30 @@
.LP-Footer .LP-LinkList__List .LP-LinkList__Item .LP-Link:hover { .LP-Footer .LP-LinkList__List .LP-LinkList__Item .LP-Link:hover {
background-color: inherit; } background-color: inherit; }
.LP-Form .LP-Form__Fieldset { .LP-Form {
border: none; } max-width: 900px; }
.LP-Form .LP-Form__Fieldset .LP-Form__Legend { .LP-Form .LP-Form__Fieldset {
margin: 0; border: none; }
padding: 0; .LP-Form .LP-Form__Fieldset .LP-Form__Legend {
font-family: Montserrat, Helvetica, sans-serif; margin: 0;
font-size: 21px; } padding: 0; }
.LP-Form .LP-Form__Fieldset .LP-Form__Composition { .LP-Form .LP-Form__Fieldset .LP-Form__Composition {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: space-between; } justify-content: space-between; }
.LP-Form .LP-Form__Fieldset .LP-Form__Composition .LP-Form__Field { .LP-Form .LP-Form__Fieldset .LP-Form__Composition .LP-Form__Field {
flex: 3 1 100px; flex: 3 1 100px;
padding: 6px 15px; } padding: 6px 15px; }
.LP-Form .LP-Form__Fieldset .LP-Form__Composition .LP-Form__Field--wider { .LP-Form .LP-Form__Fieldset .LP-Form__Composition .LP-Form__Field--wider {
flex: 5 1; } flex: 5 1 200px; }
.LP-Form .LP-Form__Fieldset .LP-Form__Composition .LP-Form__Field--wide { .LP-Form .LP-Form__Fieldset .LP-Form__Composition .LP-Form__Field--wide {
flex: 4 1; } flex: 4 1 150px; }
.LP-Form .LP-Form__Fieldset .LP-Form__Composition .LP-Form__Field--narrow { .LP-Form .LP-Form__Fieldset .LP-Form__Composition .LP-Form__Field--narrow {
flex: 2 0; } flex: 2 0 50px; }
.LP-Form .LP-Form__Fieldset .LP-Form__Composition .LP-Form__Field--narrower { .LP-Form .LP-Form__Fieldset .LP-Form__Composition .LP-Form__Field--narrower {
flex: 1 0; } flex: 1 0 25px; }
.LP-Form .LP-Form__Fieldset .LP-Form__Composition .LP-Form__Field input {
width: 100%; }
@media (max-width: 650px) { @media (max-width: 650px) {
.LP-Form .LP-Form__Fieldset .LP-Form__Composition--breakable { .LP-Form .LP-Form__Fieldset .LP-Form__Composition--breakable {
@ -420,50 +377,45 @@
.LP-HorizontalLine { .LP-HorizontalLine {
color: #565656; } color: #565656; }
@media (max-width: 650px) {
.LP-MainContainer {
width: 100%; } }
.LP-PlaceOverview .LP-PlaceOverview__Info .LP-PlaceOveriew__Image { .LP-PlaceOverview .LP-PlaceOverview__Info .LP-PlaceOveriew__Image {
width: 700px; width: 700px;
height: 450px;
box-shadow: 0 0 10px #565656; box-shadow: 0 0 10px #565656;
object-fit: cover; object-fit: cover;
object-position: 0 0;
float: right; float: right;
margin-left: 35px; margin-left: 35px;
margin-bottom: 35px; margin-bottom: 35px; }
overflow: hidden; }
.LP-PlaceOverview .LP-PlaceOverview__Info .LP-PlaceOverView__Description { .LP-PlaceOverview .LP-PlaceOverview__Info .LP-PlaceOverView__Description {
padding: 0px; padding: 0px;
position: relative; position: relative;
top: -15px; } top: -15px; }
.LP-PlaceOverview .LP-PlaceOverview__Info .LP-PlaceOverView__Description .LP-Headline {
position: relative;
top: 15px; }
.LP-PlaceOverview .LP-PlaceOverView__ImageList { .LP-PlaceOverview .LP-PlaceOverView__ImageList {
list-style-type: none; list-style-type: none;
display: grid; display: grid;
grid-template-columns: repeat(auto-fit, minmax(300px, 1fr)); grid-template-columns: repeat(auto-fit, 300px);
margin: 0px; margin: 0px;
padding: 0px; } padding: 0px; }
.LP-PlaceOverview .LP-PlaceOverView__ImageList .LP-PlaceOverView__ImageItem { .LP-PlaceOverview .LP-PlaceOverView__ImageList .LP-PlaceOverView__ImageItem img {
box-shadow: 0 0 5px #565656;
height: 200px;
width: 290px;
object-fit: cover;
margin-top: 10px; } margin-top: 10px; }
.LP-PlaceOverview .LP-PlaceOverView__ImageList .LP-PlaceOverView__ImageItem .LP-Link {
overflow: hidden; }
.LP-PlaceOverview .LP-PlaceOverView__ImageList .LP-PlaceOverView__ImageItem .LP-Image {
box-shadow: 0 0 5px #565656;
height: 200px;
width: 290px;
object-fit: cover; }
@media (max-width: 1000px) { @media (max-width: 1290px) {
.LP-PlaceOverview .LP-PlaceOverview__Info .LP-TextSection { .LP-PlaceOverview .LP-PlaceOverview__Info .LP-TextSection {
margin-top: 30px; } margin-top: -100px; }
.LP-PlaceOverview .LP-PlaceOverview__Info .LP-Headline {
position: relative;
top: -400px;
margin-bottom: 100px;
width: 100vw;
display: block; }
.LP-PlaceOverview .LP-PlaceOverview__Info .LP-PlaceOveriew__Image { .LP-PlaceOverview .LP-PlaceOverview__Info .LP-PlaceOveriew__Image {
float: none; float: none;
width: 100%; width: calc(100vw - 30px);
height: auto;
margin: 0; margin: 0;
padding: 0; } } padding: 0;
margin-left: 7px; } }

16
lostplaces/lostplaces_app/templates/partials/form/inputField.html
View File

@ -1,16 +0,0 @@
{% load widget_tweaks %}
<div class="LP-Input {% if field.errors %} LP-Input--error {% endif %}">
<label for="{{field.id_for_label}}" class="LP-Input__Label">{{field.label}}</label>
{% render_field field class="LP-Input__Field"%}
<span class="LP-Input__Message">
{% if field.errors %}
{% for error in field.errors%}
{{error}}
{% endfor %}
{% elif field.help_text%}
{{ field.help_text }}
{% endif %}
</span>
</div>

1
lostplaces/lostplaces_app/urls.py
View File

@ -10,7 +10,6 @@ from .views import (
urlpatterns = [ urlpatterns = [
path('hello_world/', hello_world), # You know what this is :P path('hello_world/', hello_world), # You know what this is :P
path('voucher/', VoucherVerifyView.as_view(), name='enter_voucher'),
path('signup/', SignUpView.as_view(), name='signup'), 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('place/create/', PlaceCreateView.as_view(), name='place_create'), path('place/create/', PlaceCreateView.as_view(), name='place_create'),

35
lostplaces/templates/signup.html
View File

@ -1,40 +1,15 @@
{% extends 'global.html'%} {% extends 'global.html'%}
{% load static %} {% load static %}
{% load widget_tweaks %}
# {% block title %}Registrierung{% endblock %} # {% block title %}Registrierung{% endblock %}
{% block maincontent %} {% block maincontent %}
<form class="LP-Form" method="POST"> <h2>Registrierung</h2>
<fieldset class="LP-Form__Fieldset"> <form method="post">
<legend class="LP-Form__Legend">Registrierung</legend> {% csrf_token %}
{% csrf_token %} {{ form.as_p }}
<div class="LP-Form__Composition LP-Form__Composition--breakable"> <button type="submit">Sign up</button>
<div class="LP-Form__Field">
{% include 'partials/form/inputField.html' with field=form.username %}
</div>
<div class="LP-Form__Field">
{% include 'partials/form/inputField.html' with field=form.email %}
</div>
</div>
<div class="LP-Form__Composition">
<div class="LP-Form__Field">
{% include 'partials/form/inputField.html' with field=form.password1 %}
</div>
</div>
<div class="LP-Form__Composition">
<div class="LP-Form__Field">
{% include 'partials/form/inputField.html' with field=form.password2 %}
</div>
</div>
<div class="LP-Form__Composition">
<input type="submit" class="LP-Button" value="Registrieren"/>
</div>
</fieldset>
</form> </form>
{% endblock maincontent %} {% endblock maincontent %}