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

Compare commits

base: Commander1024:cba3fe436636ff4f14398d8446aa50fe310d4ccb
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:20a735d2ecca17e045d9a4e567350864952d6779
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. "cba3fe436636ff4f14398d8446aa50fe310d4ccb" and "20a735d2ecca17e045d9a4e567350864952d6779" have entirely different histories.
cba3fe4366 ... 20a735d2ec

7 changed files with 25 additions and 36 deletions
Show Stats Expand all files Collapse all files

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

@ -48,7 +48,6 @@
<nav class="LP-Menu LP-Menu--sidebar"> <nav class="LP-Menu LP-Menu--sidebar">
<ul class="LP-Menu__List"> <ul class="LP-Menu__List">
<li class="LP-Menu__Item"><a href="/" class="LP-Link"><span class="LP-Link__Text">Home</span></a></li> <li class="LP-Menu__Item"><a href="/" class="LP-Link"><span class="LP-Link__Text">Home</span></a></li>
<li class="LP-Menu__Item"><a href="{% url 'codex' %}" class="LP-Link"><span class="LP-Link__Text">UrBex codex</span></a></li>
<li class="LP-Menu__Item"><a href="" class="LP-Link"><span class="LP-Link__Text">About</span></a></li> <li class="LP-Menu__Item"><a href="" class="LP-Link"><span class="LP-Link__Text">About</span></a></li>
<li class="LP-Menu__Item"><a href="" class="LP-Link"><span class="LP-Link__Text">Contact</span></a></li> <li class="LP-Menu__Item"><a href="" class="LP-Link"><span class="LP-Link__Text">Contact</span></a></li>
{% block additional_menu_items %} {% block additional_menu_items %}

10
lostplaces/lostplaces_app/templates/hello_world.html Normal file
View File

@ -0,0 +1,10 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Document</title>
</head>
<body>
{{text}}
</body>
</html>

2
lostplaces/lostplaces_app/templates/home.html
View File

@ -11,8 +11,6 @@
{% block maincontent %} {% block maincontent %}
{% include 'partials/welcome.html' %} {% include 'partials/welcome.html' %}
<article class="LP-TextSection">
</article>
{% include 'partials/osm_map.html' %} {% include 'partials/osm_map.html' %}
<div class="LP-PlaceGrid"> <div class="LP-PlaceGrid">

12
lostplaces/lostplaces_app/templates/home_unauth.html
View File

@ -5,18 +5,6 @@
{% block maincontent %} {% block maincontent %}
{% include 'partials/welcome.html' %} {% include 'partials/welcome.html' %}
<article class="LP-TextSection">
<p class="LP-Paragraph">
You can create, view and share your favorite lost places with other
members of this site. You can upload photos, place links to your
web galleries and contribute your knowledge by tagging other places or
commenting on them. You will find detailed information on where these
locations are, how to get there and what to expect from them. This might
even include information on how to overcome security measures or where
to watch for cameras or security personnel.
</p>
<p class="LP-Paragraph">{% lorem %}</p>
</article>
<div class="LP-PlaceGrid"> <div class="LP-PlaceGrid">
<h1 class="LP-Headline LP-Headline">Our latest locations</h1> <h1 class="LP-Headline LP-Headline">Our latest locations</h1>

25
lostplaces/lostplaces_app/templates/partials/welcome.html
View File

@ -1,19 +1,18 @@
<header class="LP-TextSection__Headline"> <article class="LP-TextSection">
<h1 class="LP-Headline">Start</h1> <header class="LP-TextSection__Headline">
</header> <h1 class="LP-Headline">Start</h1>
</header>
<div class="LP-TextSection__Text"> <div class="LP-TextSection__Text">
<p class="LP-Paragraph">Welcome to our Urban Exploration community catalogue, <p class="LP-Paragraph">Welcome
{% if user.is_authenticated %} {% if user.is_authenticated %}
{{ user.username }} {{ user.username }}
{% else %} {% else %}
explorer explorer
{% endif %} {% endif %}
! !</p>
</p>
<p class="LP-Paragraph"> <p class="LP-Paragraph">{% lorem %}</p>
We strictly follow our <p class="LP-Paragraph">{% lorem %}</p>
<a class="LP-Link" href="{% url 'codex' %}"><span class="LP-Link__Text">UrBex codex</span></a> </div>
and expect you to do so, too. </article>
</p>
</div>

6
lostplaces/lostplaces_app/urls.py
View File

@ -8,8 +8,7 @@ from .views import (
PlaceUpdateView, PlaceUpdateView,
PlaceDeleteView, PlaceDeleteView,
PhotoAlbumCreateView, PhotoAlbumCreateView,
PhotoAlbumDeleteView, PhotoAlbumDeleteView
CodexView
) )
urlpatterns = [ urlpatterns = [
@ -21,6 +20,5 @@ urlpatterns = [
path('photo_album/delete/<int:pk>', PhotoAlbumDeleteView.as_view(), name='photo_album_delete'), path('photo_album/delete/<int:pk>', PhotoAlbumDeleteView.as_view(), name='photo_album_delete'),
path('place/update/<int:pk>/', PlaceUpdateView.as_view(), name='place_edit'), path('place/update/<int:pk>/', PlaceUpdateView.as_view(), name='place_edit'),
path('place/delete/<int:pk>/', PlaceDeleteView.as_view(), name='place_delete'), path('place/delete/<int:pk>/', PlaceDeleteView.as_view(), name='place_delete'),
path('place/', PlaceListView.as_view(), name='place_list'), path('place/', PlaceListView.as_view(), name='place_list')
path('codex/', CodexView, name='codex')
] ]

5
lostplaces/lostplaces_app/views/views.py
View File

@ -47,7 +47,4 @@ class PhotoAlbumDeleteView(PlaceAssetDeleteView):
model = PhotoAlbum model = PhotoAlbum
pk_url_kwarg = 'pk' pk_url_kwarg = 'pk'
success_message = 'Photo Album deleted' success_message = 'Photo Album deleted'
permission_denied_messsage = 'You do not have permissions to alter this photo album' permission_denied_messsage = 'You do not have permissions to alter this photo album'
def CodexView(request):
return render(request, 'codex.html')