kleinhenzes60188/social_media_platform
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: kleinhenzes60188:b4415af0b8c34feee0d7084a4b1ed785160edb6d
Branches Tags
kleinhenzes60188:master
kleinhenzes60188:newsletter
..
compare: kleinhenzes60188:666b5e909abf4d95877fe7512a250fcf50988e42
Branches Tags
kleinhenzes60188:master
kleinhenzes60188:newsletter

No commits in common. "b4415af0b8c34feee0d7084a4b1ed785160edb6d" and "666b5e909abf4d95877fe7512a250fcf50988e42" have entirely different histories.
b4415af0b8 ... 666b5e909a

11 changed files with 15 additions and 63 deletions
Show Stats Expand all files Collapse all files

2
application/admin.py
View File

@ -1,5 +1,3 @@
from django.contrib import admin
from .models import Post
admin.site.register(Post)
# Register your models here.

20
application/migrations/0002_post_tags.py
View File

@ -1,20 +0,0 @@
# Generated by Django 2.0.6 on 2018-07-15 12:30
from django.db import migrations
import taggit.managers
class Migration(migrations.Migration):
dependencies = [
('taggit', '0002_auto_20150616_2121'),
('application', '0001_initial'),
]
operations = [
migrations.AddField(
model_name='post',
name='tags',
field=taggit.managers.TaggableManager(help_text='A comma-separated list of tags.', through='taggit.TaggedItem', to='taggit.Tag', verbose_name='Tags'),
),
]

20
application/templates/base.html
View File

@ -6,10 +6,8 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<title> {% block title %}Seitenname{% endblock %}</title>
<link href="{% static 'css/application.css' %}" rel="stylesheet">
<link href="{% static 'css/mysite.css' %}" rel="stylesheet">
<link href="{% static 'bootstrap/css/bootstrap.css' %}" rel="stylesheet">
<link href="{% static 'css/signin.css' %}" rel="stylesheet">
</head>
<body>
@ -33,13 +31,8 @@
<li class="nav-item">
<a class="nav-link" href="{% url 'admin:index' %}">Administration</a>
</li>
{% elif user.is_staff %}
{% endif %} {% if user.is_staff %}
<li class="nav-item">
<a class="nav-link" href="{% url 'logout' %}">Administration</a>
</li>
{% else %}
<li class="nav-item">
<a class="nav-link" href="{% url 'student_page' %}">My Page</a>
</li>
{% endif %}
</ul>
@ -83,13 +76,8 @@
</div>
</nav>
<div class="content container">
<div class="row">
<div class="col-md-8">
{% block content %} {% endblock %}
</div>
</div>
</div>
{% block content %} {% endblock %}
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
<script src="{% static 'bootstrap/js/bootstrap.bundle.js' %}"></script>
</body>

10
application/templates/post_detail.html
View File

@ -5,13 +5,13 @@
{{ post.published_date }}
</div>
{% else %}
<a class="btn btn-outline-dark" href="{% url 'post_publish' pk=post.pk %}">Publish</a>
<a class="btn btn-default" href="{% url 'post_publish' pk=post.pk %}">Publish</a>
{% endif %}
<a class="btn btn-outline-dark" href="{% url 'post_edit' pk=post.pk %}">
<span class="glyphicon glyphicon-pencil">Edit</span>
<a class="btn btn-default" href="{% url 'post_edit' pk=post.pk %}">
<span class="glyphicon glyphicon-pencil"></span>
</a>
<a class="btn btn-outline-dark" href="{% url 'post_remove' pk=post.pk %}">
<span class="glyphicon glyphicon-remove">Remove</span>
<a class="btn btn-default" href="{% url 'post_remove' pk=post.pk %}">
<span class="glyphicon glyphicon-remove"></span>
</a>
<h1>{{ post.title }}</h1>
<p>{{ post.text|linebreaksbr }}</p>

2
application/templates/post_edit.html
View File

@ -4,6 +4,6 @@
<h1>New post</h1>
<form method="POST" class="post-form">{% csrf_token %}
{{ form.as_p }}
<button type="submit" class="save btn btn-outline-dark">Save</button>
<button type="submit" class="save btn btn-default">Save</button>
</form>
{% endblock %}

2
application/templates/registration/login.html
View File

@ -24,7 +24,7 @@
</div>
<div>
<input type="submit" value="login" class="btn btn-lg btn-primary"/>
<input type="submit" value="login" />
<input type="hidden" name="next" value="{{ next }}" />
</div>
</form>

3
application/templates/student_page.html
View File

@ -1,3 +0,0 @@
{% extends "base.html" %}
{% block content %}
{% endblock %}

1
application/urls.py
View File

@ -3,7 +3,6 @@ from . import views
urlpatterns = [
url(r'^$', views.post_list, name='post_list'),
url(r'^student/', views.student_page, name='student_page'),
url(r'^post/(?P<pk>\d+)/$', views.post_detail, name='post_detail'),
url(r'^post/new/$', views.post_new, name='post_new'),
url(r'^post/(?P<pk>\d+)/edit/$', views.post_edit, name='post_edit'),

14
application/views.py
View File

@ -4,7 +4,6 @@ from .models import Post
from .forms import PostForm
from django.shortcuts import redirect
from django.contrib.auth.decorators import login_required
from django.contrib.admin.views.decorators import staff_member_required
from django.contrib.auth import authenticate, login, logout
import logging
import mysite.settings
@ -36,19 +35,18 @@ def navlogin(request):
context = {'error': error}
return render(request, 'index.html', context)
@login_required
def post_list(request):
posts = Post.objects.filter(
published_date__lte=timezone.now()).order_by('published_date')
return render(request, 'post_list.html', {'posts': posts})
@login_required
def post_detail(request, pk):
post = get_object_or_404(Post, pk=pk)
return render(request, 'post_detail.html', {'post': post})
@login_required
@staff_member_required
def post_new(request):
if request.method == "POST":
form = PostForm(request.POST)
@ -62,7 +60,6 @@ def post_new(request):
return render(request, 'post_edit.html', {'form': form})
@login_required
@staff_member_required
def post_edit(request, pk):
post = get_object_or_404(Post, pk=pk)
if request.method == "POST":
@ -77,26 +74,19 @@ def post_edit(request, pk):
return render(request, 'post_edit.html', {'form': form})
@login_required
@staff_member_required
def post_draft_list(request):
posts = Post.objects.filter(
published_date__isnull=True).order_by('created_date')
return render(request, 'post_draft_list.html', {'posts': posts})
@login_required
@staff_member_required
def post_publish(request, pk):
post = get_object_or_404(Post, pk=pk)
post.publish()
return redirect('post_detail', pk=pk)
@login_required
@staff_member_required
def post_remove(request, pk):
post = get_object_or_404(Post, pk=pk)
post.delete()
return redirect('post_list')
@login_required
def student_page(request):
return render(request, 'student_page.html', {})

2
mysite/settings.py
View File

@ -43,8 +43,8 @@ INSTALLED_APPS = [
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles',
'application',
'taggit',
'application',
]
MIDDLEWARE = [

2
mysite/urls.py
View File

@ -23,8 +23,8 @@ import application.views
urlpatterns = [
url(r'^$', TemplateView.as_view(template_name="index.html")),
url(r'^admin/', admin.site.urls),
url(r'^navlogin/', application.views.navlogin, name='navlogin'),
url(r'^accounts/', include('django.contrib.auth.urls')),
url(r'', include('application.urls'))
]