Merge branch 'revert-9f29ae9d' into 'main'

Revert "asd"

See merge request !3

imageuploader/pictures/models.py → imageuploader/posts/models.py

 from django.db import models
 from django.contrib.auth.models import User
 
-class Picture(models.Model):
+class Post(models.Model):
     title = models.CharField(max_length=75)
     body = models.TextField()
     slug = models.SlugField()

imageuploader/pictures/templates/posts/picture_new.html → imageuploader/posts/templates/posts/post_new.html

 {% extends 'layout.html' %}
 
 {% block title %}
-   New Picture
+   New Post
 {% endblock %}
 
 {% block content %}
     <section>
-        <h1>New Picture</h1>
-        <form class="form-with-validation" action="{% url 'posts:new-picture' %}" method="post" enctype="multipart/form-data">
+        <h1>New Post</h1>
+        <form class="form-with-validation" action="{% url 'posts:new-post' %}" method="post" enctype="multipart/form-data">
             {% csrf_token %} 
             {{ form }}
-            <button class="form-submit">Add Picture</button>
+            <button class="form-submit">Add Post</button>
         </form>
     </section>
 {% endblock %}
\ No newline at end of file

imageuploader/pictures/templates/posts/picture_page.html → imageuploader/posts/templates/posts/post_page.html

 {% extends 'layout.html' %}
 
 {% block title %}
-    {{ picture.title }}
+    {{ post.title }}
 {% endblock %}
 
 {% block content %}
     <section>
         <img 
             class="banner"
-            src="{{ picture.banner.url }}"
-            alt="{{ picture.title }}"
+            src="{{ post.banner.url }}"
+            alt="{{ post.title }}"
         />
         <h1>
-            {{ picture.title }}
+            {{ post.title }}
         </h1>
-        <p>{{ picture.date }}</p>
-        <p>{{ picture.body }}</p>
+        <p>{{ post.date }}</p>
+        <p>{{ post.body }}</p>
         
     </section>
 {% endblock %}
\ No newline at end of file

imageuploader/pictures/templates/posts/pictures_list.html → imageuploader/posts/templates/posts/posts_list.html

 {% extends 'layout.html' %}
 
 {% block title %}
-    Pictures
+    Posts
 {% endblock %}
 
 {% block content %}
     <section>
-    <h1>Pictures</h1>
+    <h1>Posts</h1>
 
-    {% for picture in pictures %}
+    {% for post in posts %}
         <article class="post">
             <h2>
-                <a href="{%  url 'pictures:page' slug=picture.slug %}">
-                    {{ picture.title }}
+                <a href="{%  url 'posts:page' slug=post.slug %}">
+                    {{ post.title }}
                 </a>
             </h2>
-            <p>{{ picture.date }} by {{ picture.author }}</p>
-            <p>{{ picture.body }}</p>
+            <p>{{ post.date }} by {{ post.author }}</p>
+            <p>{{ post.body }}</p>
         </article>
     {% endfor %}
 </section>

imageuploader/pictures/urls.py → imageuploader/posts/urls.py

@@ -2,10 +2,10 @@ from django.contrib import admin
 from django.urls import path
 from . import views
 
-app_name = "pictures"
+app_name = "posts"
 
 urlpatterns = [
-    path("", views.pictures_list, name="list"),
-    path('new-picture/', views.picture_new, name="new-picture"),
-    path("<slug:slug>", views.picture_page, name="page")
+    path("", views.posts_list, name="list"),
+    path('new-post/', views.post_new, name="new-post"),
+    path("<slug:slug>", views.post_page, name="page")
 ]
\ No newline at end of file

imageuploader/pictures/views.py → imageuploader/posts/views.py

@@ -5,24 +5,24 @@ from . import forms
 
 
 
-def pictures_list(request):
-    pictures = Post.objects.all().order_by('-date')
-    return render(request, 'posts/posts_list.html', {'pictures': pictures})
+def posts_list(request):
+    posts = Post.objects.all().order_by('-date')
+    return render(request, 'posts/posts_list.html', {'posts': posts})
 
 
-def picture_page(request, slug):
-    picture = Post.objects.get(slug=slug)
-    return render(request, 'pictures/picture_page.html', {'picture': picture})
+def post_page(request, slug):
+    post = Post.objects.get(slug=slug)
+    return render(request, 'posts/post_page.html', {'post': post})
 
 @login_required(login_url="/users/login/")
-def picture_new(request):
+def post_new(request):
     if request.method == 'POST': 
         form = forms.CreatePost(request.POST, request.FILES) 
         if form.is_valid():
-            newpicture = form.save(commit=False) 
-            newpicture.author = request.user 
-            newpicture.save()
-            return redirect('pictures:list')
+            newpost = form.save(commit=False) 
+            newpost.author = request.user 
+            newpost.save()
+            return redirect('posts:list')
     else:
         form = forms.CreatePost()
-    return render(request, 'pictures/picture_new.html', { 'form': form })
+    return render(request, 'posts/post_new.html', { 'form': form })
\ No newline at end of file

imageuploader/templates/layout.html

@@ -21,11 +21,11 @@
             <span role="img" aria-label="About" title="About">😀</span>
         </a> | 
         {% if user.is_authenticated %}
-            <a href="{% url 'pictures:list' %}">
-                <span role="img" aria-label="pictures" title="pictures">📰</span>
+            <a href="{% url 'posts:list' %}">
+                <span role="img" aria-label="Posts" title="Posts">📰</span>
             </a> | 
-            <a href="{% url 'pictures:new-picture' %}">
-                <span role="img" aria-label="New picture" title="New picture">🆕</span>
+            <a href="{% url 'posts:new-post' %}">
+                <span role="img" aria-label="New Post" title="New Post">🆕</span>
             </a> | 
             <form class="logout" action="{% url 'users:logout' %}" method="post">
                 {% csrf_token %}