punkweb-bb 0.4.3__py3-none-any.whl → 0.5.0__py3-none-any.whl

punkweb_bb/templates/punkweb_bb/profile.html

@@ -24,18 +24,21 @@
   </ul>
 </nav>
 
-<div class="pw-card fluid margin">
+<div class="pw-card fluid mb-4">
   <div class="pw-card-content">
     <div class="profile__info">
       <div class="profile__info__avatar">
-        {% if user.profile.image %}
-        <img class="pw-avatar xl" src="{{user.profile.image.url}}" />
-        {% else %}
-        <img class="pw-avatar xl" src="{% static 'punkweb_bb/img/default-profile-image.png' %}" />
-        {% endif %}
+        {% include 'punkweb_bb/components/profile_image.html' with user=user size="lg" %}
       </div>
       <div class="profile__info__details">
-        <div class="profile__info__username">{{user|styled_username}}</div>
+        <div class="profile__info__username">
+          {{user|styled_username}}
+          {% if user.profile.is_online %}
+          <div class="pw-badge xs green">Online</div>
+          {% else %}
+          <div class="pw-badge xs">Offline</div>
+          {% endif %}
+        </div>
         <div class="profile__info__stats">
           <div class="profile__info__stat">
             Date Joined:
@@ -59,7 +62,7 @@
   </div>
 </div>
 
-<div class="pw-card fluid margin">
+<div class="pw-card fluid">
   <div class="pw-card-header">
     Threads
   </div>

punkweb_bb/templates/punkweb_bb/search.html

@@ -0,0 +1,27 @@
+{% extends 'punkweb_bb/base.html' %}
+{% load static %}
+
+{% block content %}
+
+<nav>
+  <ul class="pw-breadcrumb">
+    <li class="pw-breadcrumb-item">
+      <a href="{% url 'punkweb_bb:index' %}">Home</a>
+    </li>
+    {% comment %} <li class="pw-breadcrumb-item">
+      <a href="{{thread.subcategory.category.get_absolute_url}}">{{thread.subcategory.category.name}}</a>
+    </li>
+    <li class="pw-breadcrumb-item">
+      <a href="{{thread.subcategory.get_absolute_url}}">{{thread.subcategory.name}}</a>
+    </li>
+    <li class="pw-breadcrumb-item active">
+      {{thread.title}}
+    </li> {% endcomment %}
+  </ul>
+</nav>
+
+{% for thread in threads %}
+<p>{{ thread.title }}</p>
+{% endfor %}
+
+{% endblock %}

punkweb_bb/templates/punkweb_bb/settings.html

@@ -6,7 +6,10 @@
 
 {% block extra_head %}
 {{form.media.css}}
-<link rel="stylesheet" href="{% static 'punkweb_bb/css/settings.css' %}" />
+{% endblock %}
+
+{% block extra_script %}
+{{form.media.js}}
 {% endblock %}
 
 {% block content %}
@@ -25,35 +28,10 @@
 <div class="pw-card fluid">
   <div class="pw-card-header">Settings</div>
   <div class="pw-card-content">
-    <form class="settingsForm" action="{% url 'punkweb_bb:settings' %}" enctype="multipart/form-data" method="post">
+    <form class="pw-form" action="{% url 'punkweb_bb:settings' %}" enctype="multipart/form-data" method="post">
       {% csrf_token %}
-      {% for field in form %}
-      {% if field.name == "image" %}
-      <div class="settingsForm__field">
-        <label class="pw-input-label" for="{{ field.id_for_label }}">{{ field.label }}</label>
-        {% if field.value %}
-        <img class="pw-avatar xl" src="{{ field.value.url }}" alt="{{ field.label }}">
-        <label>
-          <input type="checkbox" name="image-clear" id="image-clear_id" />
-          Remove
-        </label>
-        {% endif %}
-        <input type="file" name="image" accept="image/*" id="id_image" />
-      </div>
-      {% else %}
-      <div class="settingsForm__field">
-        <label class="pw-input-label" for="{{ field.id_for_label }}">{{ field.label }}</label>
-        {{ field }}
-      </div>
-      {% endif %}
-      {% if field.errors %}
-      {{ field.errors }}
-      {% endif %}
-      {% endfor %}
-      {% if form.non_field_errors %}
-      {{ form.non_field_errors }}
-      {% endif %}
-      <div class="settingsForm__actions">
+      {{ form }}
+      <div class="pw-form-actions end">
         <a class="pw-button default" href="{% url 'punkweb_bb:profile' request.user.id %}">Cancel</a>
         <button class="pw-button raised primary" type="submit">Save</button>
       </div>
@@ -62,7 +40,3 @@
 </div>
 
 {% endblock %}
-
-{% block extra_script %}
-{{form.media.js}}
-{% endblock %}

punkweb_bb/templates/punkweb_bb/shoutbox/shout_list.html

@@ -10,10 +10,10 @@
   {% if shout|can_delete:request.user %}
   <div class="shoutbox__shout__actions">
     <button
-      class="pw-icon-button default danger sm"
+      class="pw-icon-button default red sm"
       title="Delete"
       hx-get="{% url 'punkweb_bb:shout_delete' shout.id %}"
-      hx-target="#modal-portal"
+      hx-target="#dialog-portal"
     >
       <span class="material-symbols-outlined">delete</span>
     </button>

punkweb_bb/templates/punkweb_bb/shoutbox/shoutbox.html

@@ -1,21 +1,36 @@
-<div class="pw-card fluid">
+{% load punkweb_bb %}
+
+<div class="pw-card fluid mb-4">
   <div class="pw-card-header">
     Shoutbox
   </div>
 
-  <div class="shoutbox__shouts" id="shoutlist" hx-get="{% url 'punkweb_bb:shout_list' %}" hx-trigger="load, every 15s"
-    hx-on::after-request="shoutboxScrollToBottom(event)">
+  {% punkweb_bb "SHOUTBOX_POLLING_ENABLED" as polling_enabled %}
+  {% punkweb_bb "SHOUTBOX_POLLING_INTERVAL" as polling_interval %}
+
+  <div
+    class="shoutbox__shouts"
+    id="shoutlist"
+    hx-get="{% url 'punkweb_bb:shout_list' %}"
+    hx-trigger="load{% if polling_enabled %}, every {{ polling_interval }}s{% endif %}"
+    hx-on::after-request="shoutboxScrollToBottom(event)"
+  >
   </div>
 
   {% if request.user.is_authenticated %}
   <form
-    class="shoutbox__form"
+    class="py-2"
     hx-post="{% url 'punkweb_bb:shout_create' %}"
     hx-target="#shoutlist"
     hx-on::after-request="this.reset(); shoutboxScrollToBottom(event)"
   >
-    <input class="pw-input fluid shoutbox__input" autocomplete="off" name="content" type="text"
-      placeholder="Type your message here..." />
+    <input
+      autocomplete="off"
+      class="pw-input fluid"
+      name="content"
+      placeholder="Type your message here..." 
+      style="border: none;"
+      type="text" />
   </form>
   {% endif %}
 </div>

punkweb_bb/templates/punkweb_bb/signup.html

@@ -5,7 +5,7 @@
 {% block og_title_prefix %}Sign Up | {% endblock %}
 
 {% block extra_head %}
-<link rel="stylesheet" href="{% static 'punkweb_bb/css/login.css' %}" />
+<link rel="stylesheet" href="{% static 'punkweb_bb/css/signup.css' %}" />
 {% endblock %}
 
 {% block content %}
@@ -21,24 +21,15 @@
   </ul>
 </nav>
 
-<div class="pw-card center">
+<div class="pw-card centerPage">
   <div class="pw-card-header">Sign Up</div>
   <div class="pw-card-content">
-    <form class="loginForm" action="{% url 'punkweb_bb:signup' %}" method="post">
+    <form class="pw-form" action="{% url 'punkweb_bb:signup' %}" method="post">
       {% csrf_token %}
-      {% for field in form %}
-      <div class="loginForm__field">
-        <label class="pw-input-label" for="{{ field.id_for_label }}">{{ field.label }}</label>
-        {{ field }}
+      {{ form }}
+      <div class="pw-form-actions">
+        <button class="pw-button fluid raised primary" type="submit">Sign Up</button>
       </div>
-      {% if field.errors %}
-      {{ field.errors }}
-      {% endif %}
-      {% endfor %}
-      {% if form.non_field_errors %}
-      {{ form.non_field_errors }}
-      {% endif %}
-      <button class="pw-button fluid raised primary" type="submit">Sign Up</button>
     </form>
   </div>
 </div>

punkweb_bb/templates/punkweb_bb/subcategory.html

@@ -40,10 +40,10 @@
       {% endif %}
       {% if perms.punkweb_bb.delete_subcategory %}
       <a
-        class="pw-icon-button default rounded danger"
+        class="pw-icon-button default rounded red"
         title="Delete subcategory"
         hx-get="{% url 'punkweb_bb:subcategory_delete' subcategory.slug %}"
-        hx-target="#modal-portal"
+        hx-target="#dialog-portal"
       >
         <span class="material-symbols-outlined">delete</span>
       </a>
@@ -66,7 +66,9 @@
   {% endif %}
 </div>
 
-<div class="pw-card fluid margin">
+<div class="pw-card fluid mb-4">
+
+  {% if threads|length > 0 %}
   <div class="pw-table-container">
     <table class="pw-table">
       <colgroup>
@@ -121,11 +123,7 @@
                   </a>
                 </div>
               </div>
-              {% if thread.latest_post.user.profile.image %}
-              <img class="pw-avatar xs" src="{{thread.latest_post.user.profile.image.url}}" />
-              {% else %}
-              <img class="pw-avatar xs" src="{% static 'punkweb_bb/img/default-profile-image.png' %}" />
-              {% endif %}
+              {% include 'punkweb_bb/components/profile_image.html' with user=thread.latest_post.user %}
             </div>
             {% else %}
             No posts
@@ -136,53 +134,13 @@
       </tbody>
     </table>
   </div>
+  {% else %}
+  <div class="pw-card-content">
+    <p>No threads have been created in this subcategory yet.</p>
+  </div>
+  {% endif %}
 </div>
 
-
-{% if threads.has_other_pages %}
-<nav>
-  <ul class="pw-pagination">
-    {% if threads.has_previous %}
-    <li class="pw-pagination-item">
-      <a class="pw-pagination-link" href="{{ subcategory.get_absolute_url }}?page={{threads.previous_page_number}}">
-        Prev
-      </a>
-    </li>
-    {% else %}
-    <li class="pw-pagination-item disabled">
-      <a class="pw-pagination-link" href="#">
-        Prev
-      </a>
-    </li>
-    {% endif %}
-    {% for i in threads.paginator.page_range %}
-    {% if threads.number == i %}
-    <li class="pw-pagination-item active">
-      <a class="pw-pagination-link" href="#">
-        {{i}}
-      </a>
-    </li>
-    {% else %}
-    <li class="pw-pagination-item">
-      <a class="pw-pagination-link" href="{{ subcategory.get_absolute_url }}?page={{i}}">
-        {{i}}
-      </a>
-    </li>
-    {% endif %}
-    {% endfor %}
-    {% if threads.has_next %}
-    <li class="pw-pagination-item">
-      <a class="pw-pagination-link" href="{{ subcategory.get_absolute_url }}?page={{threads.next_page_number}}">
-        Next
-      </a>
-    </li>
-    {% else %}
-    <li class="pw-pagination-item disabled">
-      <a class="pw-pagination-link" href="#">Next</a>
-    </li>
-    {% endif %}
-  </ul>
-</nav>
-{% endif %}
+{% include 'punkweb_bb/components/pagination_controls.html' with paginator=threads %}
 
 {% endblock %}

punkweb_bb/templates/punkweb_bb/subcategory_create.html

@@ -5,7 +5,10 @@
 
 {% block extra_head %}
 {{form.media.css}}
-<link rel="stylesheet" href="{% static 'punkweb_bb/css/subcategory-form.css' %}" />
+{% endblock %}
+
+{% block extra_script %}
+{{form.media.js}}
 {% endblock %}
 
 {% block content %}
@@ -27,18 +30,10 @@
 <div class="pw-card fluid">
   <div class="pw-card-header">Create Subcategory</div>
   <div class="pw-card-content">
-    <form class="subcategoryForm" action="{% url 'punkweb_bb:subcategory_create' category.slug %}" method="post">
+    <form class="pw-form" action="{% url 'punkweb_bb:subcategory_create' category.slug %}" method="post">
       {% csrf_token %}
-      {% for field in form %}
-      <div class="subcategoryForm__field">
-        <label class="pw-input-label" for="{{ field.id_for_label }}">{{ field.label }}</label>
-        {{ field }}
-      </div>
-      {% endfor %}
-      {% if form.non_field_errors %}
-      {{ form.non_field_errors }}
-      {% endif %}
-      <div class="subcategoryForm__actions">
+      {{ form }}
+      <div class="pw-form-actions end">
         <a class="pw-button default" href="{% url 'punkweb_bb:index' %}" type="submit">Cancel</a>
         <button class="pw-button raised primary" type="submit">Create</button>
       </div>
@@ -46,8 +41,4 @@
   </div>
 </div>
 
-{% endblock %}
-
-{% block extra_script %}
-{{form.media.js}}
 {% endblock %}

punkweb_bb/templates/punkweb_bb/subcategory_update.html

@@ -5,7 +5,10 @@
 
 {% block extra_head %}
 {{form.media.css}}
-<link rel="stylesheet" href="{% static 'punkweb_bb/css/subcategory-form.css' %}" />
+{% endblock %}
+
+{% block extra_script %}
+{{form.media.js}}
 {% endblock %}
 
 {% block content %}
@@ -30,18 +33,10 @@
 <div class="pw-card fluid">
   <div class="pw-card-header">Edit Subcategory</div>
   <div class="pw-card-content">
-    <form class="subcategoryForm" action="{% url 'punkweb_bb:subcategory_update' subcategory.slug %}" method="post">
+    <form class="pw-form" action="{% url 'punkweb_bb:subcategory_update' subcategory.slug %}" method="post">
       {% csrf_token %}
-      {% for field in form %}
-      <div class="subcategoryForm__field">
-        <label class="pw-input-label" for="{{ field.id_for_label }}">{{ field.label }}</label>
-        {{ field }}
-      </div>
-      {% endfor %}
-      {% if form.non_field_errors %}
-      {{ form.non_field_errors }}
-      {% endif %}
-      <div class="subcategoryForm__actions">
+      {{ form }}
+      <div class="pw-form-actions end">
         <a class="pw-button default" href="{{subcategory.get_absolute_url}}">Cancel</a>
         <button class="pw-button raised primary" type="submit">Save</button>
       </div>
@@ -49,8 +44,4 @@
   </div>
 </div>
 
-{% endblock %}
-
-{% block extra_script %}
-{{form.media.js}}
 {% endblock %}

punkweb_bb/templates/punkweb_bb/thread.html

@@ -7,9 +7,7 @@
 {% block extra_head %}
 <meta name="description" content="{{thread.content|render|striptags|truncatechars:120}}" />
 <meta property="og:description" content="{{thread.content|render|striptags|truncatechars:120}}" />
-<link rel="stylesheet" href="{% static 'punkweb_bb/css/post-form.css' %}" />
 <link rel="stylesheet" href="{% static 'punkweb_bb/css/thread.css' %}" />
-<link rel="stylesheet" href="{% static 'punkweb_bb/css/thread-form.css' %}" />
 {{post_form.media.css}}
 {% endblock %}
 
@@ -39,7 +37,7 @@
 {% if posts.number == 1 %}
 <h1>{{thread.title}}</h1>
 
-<div class="pw-card fluid margin">
+<div class="pw-card fluid mb-4">
   <div class="pw-card-header">
     <div class="thread__date">
       <time datetime="{{thread.created_at|date:'c'}}">{{thread.created_at | date:'M j, Y'}}</time>
@@ -49,19 +47,15 @@
     <div class="thread__user">
       <div class="thread__user__info">
         <div class="thread__user__image">
-          {% if thread.user.profile.image %}
-          <img class="pw-avatar" src="{{thread.user.profile.image.url}}" alt="{{thread.user.username}}" />
-          {% else %}
-          <img class="pw-avatar" src="{% static 'punkweb_bb/img/default-profile-image.png' %}" alt="{{thread.user.username}}" />
-          {% endif %}
+          {% include 'punkweb_bb/components/profile_image.html' with user=thread.user size="md" %}
         </div>
         <div class="thread__user__username">
-          {% if thread.user.profile.is_online %}
-          <div class="onlineIndicator"></div>
-          {% endif %}
           <a href="{% url 'punkweb_bb:profile' thread.user.id %}">
             {{thread.user|styled_username}}
           </a>
+          {% if thread.user.profile.is_online %}
+          <div class="onlineIndicator"></div>
+          {% endif %}
         </div>
         <div class="thread__user__group">
           {% if thread.user.profile.priority_group %}
@@ -95,7 +89,7 @@
           class="pw-icon-button default rounded"
           title="Move"
           hx-get="{% url 'punkweb_bb:thread_move' thread.id %}"
-          hx-target="#modal-portal"
+          hx-target="#dialog-portal"
         >
           <span class="material-symbols-outlined">move_item</span>
         </a>
@@ -139,10 +133,10 @@
         {% endif %}
         {% if thread|can_delete:request.user %}
         <a
-          class="pw-icon-button default rounded danger"
+          class="pw-icon-button default rounded red"
           title="Delete"
           hx-get="{% url 'punkweb_bb:thread_delete' thread.id %}"
-          hx-target="#modal-portal"
+          hx-target="#dialog-portal"
         >
           <span class="material-symbols-outlined">delete</span>
         </a>
@@ -160,7 +154,7 @@
 {% endif %}
 
 {% for post in posts %}
-<div id="post-{{post.id}}" class="pw-card fluid margin">
+<div id="post-{{post.id}}" class="pw-card fluid mb-4">
   <div class="pw-card-header thread__header">
     <div class="thread__date">
       <time datetime="{{post.created_at|date:'c'}}">{{post.created_at | date:'M j, Y'}}</time>
@@ -171,23 +165,15 @@
     <div class="thread__user">
       <div class="thread__user__info">
         <div class="thread__user__image">
-          {% if post.user.profile.image %}
-          <div class="thread__user__image">
-            <img class="pw-avatar" src="{{post.user.profile.image.url}}" alt="{{post.user.username}}" />
-          </div>
-          {% else %}
-          <div class="thread__user__image">
-            <img class="pw-avatar" src="{% static 'punkweb_bb/img/default-profile-image.png' %}" alt="{{post.user.username}}" />
-          </div>
-          {% endif %}
+          {% include 'punkweb_bb/components/profile_image.html' with user=post.user size="md" %}
         </div>
         <div class="thread__user__username">
-          {% if post.user.profile.is_online %}
-          <div class="onlineIndicator"></div>
-          {% endif %}
           <a href="{% url 'punkweb_bb:profile' post.user.id %}">
             {{post.user|styled_username}}
           </a>
+          {% if post.user.profile.is_online %}
+          <div class="onlineIndicator"></div>
+          {% endif %}
         </div>
         <div class="thread__user__group">
           {% if post.user.profile.priority_group %}
@@ -221,17 +207,17 @@
           class="pw-icon-button default rounded"
           title="Edit"
           hx-get="{% url 'punkweb_bb:post_update' post.id %}"
-          hx-target="#modal-portal"
+          hx-target="#dialog-portal"
         >
           <span class="material-symbols-outlined">edit</span>
         </a>
         {% endif %}
         {% if post|can_delete:request.user %}
         <a
-          class="pw-icon-button default rounded danger"
+          class="pw-icon-button default rounded red"
           title="Delete"
           hx-get="{% url 'punkweb_bb:post_delete' post.id %}"
-          hx-target="#modal-portal"
+          hx-target="#dialog-portal"
         >
           <span class="material-symbols-outlined">delete</span>
         </a>
@@ -248,68 +234,17 @@
 </div>
 {% endfor %}
 
-{% if posts.has_other_pages %}
-<nav>
-  <ul class="pw-pagination">
-    {% if posts.has_previous %}
-    <li class="pw-pagination-item">
-      <a class="pw-pagination-link" href="{{ post.thread.get_absolute_url }}?page={{posts.previous_page_number}}">
-        Prev
-      </a>
-    </li>
-    {% else %}
-    <li class="pw-pagination-item disabled">
-      <a class="pw-pagination-link" href="#">
-        Prev
-      </a>
-    </li>
-    {% endif %}
-    {% for i in posts.paginator.page_range %}
-    {% if posts.number == i %}
-    <li class="pw-pagination-item active">
-      <a class="pw-pagination-link" href="#">
-        {{i}}
-      </a>
-    </li>
-    {% else %}
-    <li class="pw-pagination-item">
-      <a class="pw-pagination-link" href="{{ post.thread.get_absolute_url }}?page={{i}}">
-        {{i}}
-      </a>
-    </li>
-    {% endif %}
-    {% endfor %}
-    {% if posts.has_next %}
-    <li class="pw-pagination-item">
-      <a class="pw-pagination-link" href="{{ post.thread.get_absolute_url }}?page={{posts.next_page_number}}">
-        Next
-      </a>
-    </li>
-    {% else %}
-    <li class="pw-pagination-item disabled">
-      <a class="pw-pagination-link" href="#">Next</a>
-    </li>
-    {% endif %}
-  </ul>
-</nav>
-{% endif %}
+{% include 'punkweb_bb/components/pagination_controls.html' with paginator=posts %}
 
 {% if thread|can_post:request.user %}
-<div class="pw-card fluid margin">
+<div class="pw-card fluid mt-4">
   <div class="pw-card-header">Reply to thread</div>
   <div class="pw-card-content">
     <div class="thread__reply__content">
-      <form class="postForm" action="{% url 'punkweb_bb:post_create' thread.id %}" method="post">
+      <form class="pw-form" action="{% url 'punkweb_bb:post_create' thread.id %}" method="post">
         {% csrf_token %}
-        {% for field in post_form %}
-        <div class="postForm__field">
-          {{ field }}
-        </div>
-        {% endfor %}
-        {% if post_form.non_field_errors %}
-        {{ post_form.non_field_errors }}
-        {% endif %}
-        <div class="postForm__actions">
+        {{ post_form }}
+        <div class="pw-form-actions end">
           <button class="pw-button raised primary" type="submit">Post reply</button>
         </div>
       </form>
@@ -317,7 +252,7 @@
   </div>
 </div>
 {% else %}
-<div class="pw-card fluid margin">
+<div class="pw-card fluid mt-4">
   <div class="pw-card-header">Thread closed</div>
   <div class="pw-card-content">
     <div>This thread is closed and you cannot reply to it.</div>

punkweb_bb/templates/punkweb_bb/thread_create.html

@@ -6,7 +6,10 @@
 
 {% block extra_head %}
 {{form.media.css}}
-<link rel="stylesheet" href="{% static 'punkweb_bb/css/thread-form.css' %}" />
+{% endblock %}
+
+{% block extra_script %}
+{{form.media.js}}
 {% endblock %}
 
 {% block content %}
@@ -31,18 +34,10 @@
 <div class="pw-card fluid">
   <div class="pw-card-header">Create Thread</div>
   <div class="pw-card-content">
-    <form class="threadForm" action="{% url 'punkweb_bb:thread_create' subcategory.slug %}" method="post">
+    <form class="pw-form" action="{% url 'punkweb_bb:thread_create' subcategory.slug %}" method="post">
       {% csrf_token %}
-      {% for field in form %}
-      <div class="threadForm__field">
-        <label class="pw-input-label" for="{{ field.id_for_label }}">{{ field.label }}</label>
-        {{ field }}
-      </div>
-      {% endfor %}
-      {% if form.non_field_errors %}
-      {{ form.non_field_errors }}
-      {% endif %}
-      <div class="threadForm__actions">
+      {{ form }}
+      <div class="pw-form-actions end">
         <a class="pw-button default" href="{{subcategory.get_absolute_url}}" type="submit">Cancel</a>
         <button class="pw-button raised primary" type="submit">Create Thread</button>
       </div>
@@ -50,8 +45,4 @@
   </div>
 </div>
 
-{% endblock %}
-
-{% block extra_script %}
-{{form.media.js}}
 {% endblock %}