punkweb-bb 0.1.4__tar.gz → 0.2.1__tar.gz

{punkweb_bb-0.1.4 → punkweb_bb-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: punkweb_bb
-Version: 0.1.4
+Version: 0.2.1
 Summary: Django application that provides a simple and modern forum board software for your Django website.
 Home-page: https://github.com/Punkweb/PunkwebBB
 Author: Punkweb
@@ -22,7 +22,7 @@ PunkwebBB is a Django application that provides a simple and modern forum board
 
 This is the successor to [punkweb-boards](https://github.com/Punkweb/punkweb-boards).
 
-Check out [punkweb.net](https://punkweb.net/board/) for a live demo and more information!
+Check out [punkweb.net](https://punkweb.net/board/) for documentation, support and a live demonstration of the software.
 
 ## Built with
 

{punkweb_bb-0.1.4 → punkweb_bb-0.2.1}/README.md

@@ -4,7 +4,7 @@ PunkwebBB is a Django application that provides a simple and modern forum board
 
 This is the successor to [punkweb-boards](https://github.com/Punkweb/punkweb-boards).
 
-Check out [punkweb.net](https://punkweb.net/board/) for a live demo and more information!
+Check out [punkweb.net](https://punkweb.net/board/) for documentation, support and a live demonstration of the software.
 
 ## Built with
 

{punkweb_bb-0.1.4 → punkweb_bb-0.2.1}/punkweb_bb/forms.py

@@ -1,7 +1,7 @@
 from django import forms
 from django.contrib.auth.forms import AuthenticationForm, UserCreationForm
 
-from punkweb_bb.models import BoardProfile, Post, Shout, Thread
+from punkweb_bb.models import BoardProfile, Category, Post, Shout, Subcategory, Thread
 from punkweb_bb.widgets import BBCodeEditorWidget
 
 
@@ -43,6 +43,21 @@ class BoardProfileModelForm(forms.ModelForm):
         }
 
 
+class CategoryModelForm(forms.ModelForm):
+    class Meta:
+        model = Category
+        fields = (
+            "name",
+            "order",
+        )
+        widgets = {
+            "name": forms.TextInput(attrs={"autofocus": True, "class": "pw-input"}),
+            "order": forms.TextInput(
+                attrs={"class": "pw-input", "min": "0", "type": "number"}
+            ),
+        }
+
+
 class PostModelForm(forms.ModelForm):
     class Meta:
         model = Post
@@ -55,6 +70,30 @@ class PostModelForm(forms.ModelForm):
         }
 
 
+class ShoutModelForm(forms.ModelForm):
+    class Meta:
+        model = Shout
+        fields = ("content",)
+
+
+class SubcategoryModelForm(forms.ModelForm):
+    class Meta:
+        model = Subcategory
+        fields = (
+            "name",
+            "description",
+            "order",
+            "staff_post_only",
+        )
+        widgets = {
+            "name": forms.TextInput(attrs={"autofocus": True, "class": "pw-input"}),
+            "description": BBCodeEditorWidget(),
+            "order": forms.TextInput(
+                attrs={"class": "pw-input", "min": "0", "type": "number"}
+            ),
+        }
+
+
 class ThreadModelForm(forms.ModelForm):
     class Meta:
         model = Thread
@@ -66,9 +105,3 @@ class ThreadModelForm(forms.ModelForm):
             "title": forms.TextInput(attrs={"autofocus": True, "class": "pw-input"}),
             "content": BBCodeEditorWidget(),
         }
-
-
-class ShoutModelForm(forms.ModelForm):
-    class Meta:
-        model = Shout
-        fields = ("content",)

punkweb_bb-0.2.1/punkweb_bb/migrations/0003_alter_thread_options.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.11 on 2024-05-29 01:03
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("punkweb_bb", "0002_thread_view_count"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="thread",
+            options={
+                "ordering": ("subcategory", "-is_pinned", "-last_post_created_at"),
+                "permissions": (
+                    ("pin_thread", "Can pin thread"),
+                    ("close_thread", "Can close thread"),
+                ),
+            },
+        ),
+    ]

{punkweb_bb-0.1.4 → punkweb_bb-0.2.1}/punkweb_bb/models.py

@@ -79,6 +79,9 @@ class Subcategory(UUIDPrimaryKeyMixin, TimestampMixin):
             "order",
         )
 
+    def can_post(self, user):
+        return not self.staff_post_only or user.is_staff
+
     @property
     def thread_count(self):
         return self.threads.count()
@@ -116,10 +119,23 @@ class Thread(UUIDPrimaryKeyMixin, TimestampMixin):
             "-is_pinned",
             "-last_post_created_at",
         )
+        permissions = (
+            ("pin_thread", "Can pin thread"),
+            ("close_thread", "Can close thread"),
+        )
 
     def __str__(self):
         return f"{self.title}"
 
+    def can_edit(self, user):
+        return user == self.user or user.has_perm("punkweb_bb.change_thread")
+
+    def can_delete(self, user):
+        return user == self.user or user.has_perm("punkweb_bb.delete_thread")
+
+    def can_post(self, user):
+        return not self.is_closed
+
     @property
     def post_count(self):
         return self.posts.count()
@@ -143,6 +159,12 @@ class Post(UUIDPrimaryKeyMixin, TimestampMixin):
     def __str__(self):
         return f"{self.thread} > {self.user} > {self.created_at}"
 
+    def can_edit(self, user):
+        return user == self.user or user.has_perm("punkweb_bb.change_post")
+
+    def can_delete(self, user):
+        return user == self.user or user.has_perm("punkweb_bb.delete_post")
+
     @property
     def index(self):
         # Returns the index of the post in the thread, starting with 1
@@ -180,3 +202,6 @@ class Shout(UUIDPrimaryKeyMixin, TimestampMixin):
 
     def __str__(self):
         return f"{self.user} > {self.created_at}"
+
+    def can_delete(self, user):
+        return user == self.user or user.has_perm("punkweb_bb.delete_shout")

{punkweb_bb-0.1.4 → punkweb_bb-0.2.1}/punkweb_bb/settings.py

@@ -5,6 +5,7 @@ PUNKWEB_BB = getattr(settings, "PUNKWEB_BB", {})
 SITE_NAME = PUNKWEB_BB.get("SITE_NAME", "PUNKWEB")
 SITE_TITLE = PUNKWEB_BB.get("SITE_TITLE", "PunkwebBB")
 FAVICON = PUNKWEB_BB.get("FAVICON", "punkweb_bb/favicon.ico")
+OG_IMAGE = PUNKWEB_BB.get("OG_IMAGE", None)
 SHOUTBOX_ENABLED = PUNKWEB_BB.get("SHOUTBOX_ENABLED", True)
 DISCORD_WIDGET_ENABLED = PUNKWEB_BB.get("DISCORD_WIDGET_ENABLED", False)
 DISCORD_WIDGET_THEME = PUNKWEB_BB.get("DISCORD_WIDGET_THEME", "dark")

punkweb_bb-0.2.1/punkweb_bb/static/punkweb_bb/css/category-form.css

@@ -0,0 +1,24 @@
+.categoryForm {
+  display: flex;
+  flex-direction: column;
+  gap: 1rem;
+}
+
+.categoryForm__field {
+  align-items: start;
+  display: flex;
+  flex-direction: column;
+  gap: 0.5rem;
+}
+
+.categoryForm .errorlist {
+  color: var(--oc-red-9);
+  margin: 0;
+}
+
+.categoryForm__actions {
+  align-items: center;
+  display: flex;
+  justify-content: flex-end;
+  gap: 1rem;
+}

{punkweb_bb-0.1.4 → punkweb_bb-0.2.1}/punkweb_bb/static/punkweb_bb/css/index.css

@@ -7,6 +7,12 @@
   flex: 1;
 }
 
+.index__category__title {
+  align-items: center;
+  display: flex;
+  gap: 0.5rem;
+}
+
 .index__sidebar {
   flex: 0 0 20rem;
 }

{punkweb_bb-0.1.4 → punkweb_bb-0.2.1}/punkweb_bb/static/punkweb_bb/css/punkweb.css

@@ -390,12 +390,13 @@ blockquote cite {
 /** Icon Button **/
 
 .pw-icon-button {
+  align-items: center;
   border-radius: 0.25rem;
   cursor: pointer;
-  display: inline-block;
+  display: flex;
+  justify-content: center;
   font-weight: 500;
   transition: all 0.15s ease;
-  text-align: center;
 
   height: 2rem;
   line-height: 2rem;
@@ -406,6 +407,67 @@ blockquote cite {
   width: 2rem;
 }
 
+.pw-icon-button .material-symbols-outlined {
+  display: block;
+  font-size: 1.125rem;
+}
+
+.pw-icon-button.xs {
+  height: 1rem;
+  line-height: 1rem;
+  max-height: 1rem;
+  max-width: 1rem;
+  min-height: 1rem;
+  min-width: 1rem;
+  width: 1rem;
+}
+
+.pw-icon-button.xs .material-symbols-outlined {
+  font-size: 0.875rem;
+}
+
+.pw-icon-button.sm {
+  height: 1.5rem;
+  line-height: 1.5rem;
+  max-height: 1.5rem;
+  max-width: 1.5rem;
+  min-height: 1.5rem;
+  min-width: 1.5rem;
+  width: 1.5rem;
+}
+
+.pw-icon-button.sm .material-symbols-outlined {
+  font-size: 1rem;
+}
+
+.pw-icon-button.lg {
+  height: 2.5rem;
+  line-height: 2.5rem;
+  max-height: 2.5rem;
+  max-width: 2.5rem;
+  min-height: 2.5rem;
+  min-width: 2.5rem;
+  width: 2.5rem;
+}
+
+.pw-icon-button.lg .material-symbols-outlined {
+  font-size: 1.25rem;
+}
+
+.pw-icon-button.xl {
+  height: 3rem;
+  line-height: 3rem;
+  max-height: 3rem;
+  max-width: 3rem;
+  min-height: 3rem;
+  min-width: 3rem;
+  width: 3rem;
+}
+
+.pw-icon-button.xl .material-symbols-outlined {
+  font-size: 1.5rem;
+}
+
 .pw-icon-button:disabled {
   background-color: var(--oc-gray-5) !important;
   border-color: var(--oc-gray-5) !important;
@@ -413,11 +475,6 @@ blockquote cite {
   cursor: not-allowed;
 }
 
-.pw-icon-button .material-symbols-outlined {
-  display: block;
-  font-size: 1.125rem;
-}
-
 .pw-icon-button.rounded {
   border-radius: 100%;
 }
@@ -436,6 +493,30 @@ blockquote cite {
   background-color: var(--oc-gray-1);
 }
 
+.pw-icon-button.default.primary {
+  color: var(--primary-9);
+}
+
+.pw-icon-button.default.primary:hover {
+  background-color: var(--primary-0);
+}
+
+.pw-icon-button.default.primary:active {
+  background-color: var(--primary-1);
+}
+
+.pw-icon-button.default.danger {
+  color: var(--oc-red-9);
+}
+
+.pw-icon-button.default.danger:hover {
+  background-color: var(--oc-red-0);
+}
+
+.pw-icon-button.default.danger:active {
+  background-color: var(--oc-red-1);
+}
+
 /* Outlined */
 
 .pw-icon-button.outlined {
@@ -451,7 +532,33 @@ blockquote cite {
   background-color: var(--oc-gray-1);
 }
 
-/* Outlined */
+.pw-icon-button.outlined.primary {
+  border-color: var(--primary-9);
+  color: var(--primary-9);
+}
+
+.pw-icon-button.outlined.primary:hover {
+  background-color: var(--primary-0);
+}
+
+.pw-icon-button.outlined.primary:active {
+  background-color: var(--primary-1);
+}
+
+.pw-icon-button.outlined.danger {
+  border-color: var(--oc-red-9);
+  color: var(--oc-red-9);
+}
+
+.pw-icon-button.outlined.danger:hover {
+  background-color: var(--oc-red-0);
+}
+
+.pw-icon-button.outlined.danger:active {
+  background-color: var(--oc-red-1);
+}
+
+/* Ghost */
 
 .pw-icon-button.ghost {
   border: 1px solid var(--oc-gray-9);
@@ -469,6 +576,38 @@ blockquote cite {
   color: white;
 }
 
+.pw-icon-button.ghost.primary {
+  border: 1px solid var(--primary-9);
+  color: var(--primary-9);
+}
+
+.pw-icon-button.ghost.primary:not(:disabled):hover {
+  background-color: var(--primary-9);
+  color: white;
+}
+
+.pw-icon-button.ghost.primary:not(:disabled):active {
+  background-color: var(--primary-9);
+  box-shadow: 0 0.125rem 0.25rem 0 rgba(0, 0, 0, 0.25);
+  color: white;
+}
+
+.pw-icon-button.ghost.danger {
+  border: 1px solid var(--oc-red-9);
+  color: var(--oc-red-9);
+}
+
+.pw-icon-button.ghost.danger:not(:disabled):hover {
+  background-color: var(--oc-red-9);
+  color: white;
+}
+
+.pw-icon-button.ghost.danger:not(:disabled):active {
+  background-color: var(--oc-red-9);
+  box-shadow: 0 0.125rem 0.25rem 0 rgba(0, 0, 0, 0.25);
+  color: white;
+}
+
 /* Raised */
 
 .pw-icon-button.raised {
@@ -477,6 +616,14 @@ blockquote cite {
   color: white;
 }
 
+.pw-icon-button.raised.primary {
+  background-color: var(--primary-9);
+}
+
+.pw-icon-button.raised.danger {
+  background-color: var(--oc-red-9);
+}
+
 .pw-icon-button.raised:not(:disabled):hover {
   box-shadow: 0 0.125rem 0.25rem 0 rgba(0, 0, 0, 0.25);
 }

{punkweb_bb-0.1.4 → punkweb_bb-0.2.1}/punkweb_bb/static/punkweb_bb/css/shoutbox.css

@@ -3,16 +3,27 @@
   display: flex;
   flex-direction: column;
   height: 12rem;
-  gap: 0.25rem;
   overflow-y: auto;
-  padding: 1rem;
 }
 
 .shoutbox__shout {
+  align-items: center;
+  display: flex;
+  justify-content: space-between;
   font-size: 0.75rem;
+  padding: 0.25rem 1rem;
   white-space: wrap;
 }
 
+.shoutbox__shout:hover {
+  background-color: var(--oc-gray-1);
+}
+
+.shoutbox__shout__actions {
+  align-items: center;
+  display: flex;
+}
+
 .shoutbox__form {
   padding: 0.5rem 0;
 }

punkweb_bb-0.2.1/punkweb_bb/static/punkweb_bb/css/subcategory-form.css

@@ -0,0 +1,24 @@
+.subcategoryForm {
+  display: flex;
+  flex-direction: column;
+  gap: 1rem;
+}
+
+.subcategoryForm__field {
+  align-items: start;
+  display: flex;
+  flex-direction: column;
+  gap: 0.5rem;
+}
+
+.subcategoryForm .errorlist {
+  color: var(--oc-red-9);
+  margin: 0;
+}
+
+.subcategoryForm__actions {
+  align-items: center;
+  display: flex;
+  justify-content: flex-end;
+  gap: 1rem;
+}

{punkweb_bb-0.1.4 → punkweb_bb-0.2.1}/punkweb_bb/static/punkweb_bb/css/subcategory.css

@@ -5,6 +5,18 @@
   margin: 2rem 0;
 }
 
+.subcategory__header__name {
+  align-items: center;
+  display: flex;
+  gap: 1rem;
+}
+
+.subcategory__header__actions {
+  align-items: center;
+  display: flex;
+  gap: 0.5rem;
+}
+
 .thread__title {
   align-items: center;
   display: flex;

{punkweb_bb-0.1.4 → punkweb_bb-0.2.1}/punkweb_bb/static/punkweb_bb/css/thread.css

@@ -55,6 +55,25 @@
   color: var(--body-fg);
 }
 
+.thread__user__groups {
+  display: flex;
+  flex-direction: column;
+  gap: 0.5rem;
+  width: 100%;
+}
+
+.thread__user__group {
+  background-color: var(--primary-8);
+  border: 1px solid var(--primary-9);
+  border-radius: 0.25rem;
+  color: var(--text-on-primary);
+  display: flex;
+  font-size: 0.875rem;
+  justify-content: center;
+  padding: 0.5rem;
+  width: 100%;
+}
+
 .thread__main {
   display: flex;
   flex-direction: column;
@@ -75,7 +94,7 @@
   align-items: center;
   display: flex;
   justify-content: flex-end;
-  gap: 1rem;
+  gap: 0.25rem;
   padding: 1rem;
 }
 

{punkweb_bb-0.1.4 → punkweb_bb-0.2.1}/punkweb_bb/static/punkweb_bb/css/variables.css

@@ -12,6 +12,7 @@
 
   --text-dark: var(--oc-gray-9);
   --text-light: var(--oc-gray-0);
+  --text-on-primary: var(--oc-gray-0);
 
   --body-bg: var(--oc-white);
   --body-fg: var(--text-dark);

{punkweb_bb-0.1.4 → punkweb_bb-0.2.1}/punkweb_bb/static/punkweb_bb/editor/bbcode-editor.js

@@ -2,7 +2,7 @@ $(function () {
   $(document).ready(function () {
     $(".bbcode-editor").sceditor({
       emoticonsCompat: true,
-      emoticonsEnabled: true,
+      emoticonsEnabled: false,
       emoticonsRoot: "/media/precise_bbcode/smilies/",
       emoticons: {
         dropdown: {},

{punkweb_bb-0.1.4 → punkweb_bb-0.2.1}/punkweb_bb/templates/punkweb_bb/base.html

@@ -6,6 +6,12 @@
   <meta charset="UTF-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>{% block title_prefix %}{% endblock %}{{ punkweb_bb.settings.SITE_TITLE|default:"PunkwebBB" }}</title>
+  <meta property="og:title" content="{% block og_title_prefix %}{% endblock %}{{ punkweb_bb.settings.SITE_TITLE|default:"PunkwebBB" }}" />
+  <meta property="og:type" content="website" />
+  <meta property="og:url" content="{{ request.build_absolute_uri }}" />
+  {% if punkweb_bb.settings.OG_IMAGE %}
+  <meta property="og:image" content="{{ punkweb_bb.settings.OG_IMAGE }}" />
+  {% endif %}
   <link rel="icon" href="{% static punkweb_bb.settings.FAVICON %}" />
   <link rel="stylesheet" href="{% static 'punkweb_bb/vendor/open-color.css' %}" />
   <link rel="stylesheet" href="{% static 'punkweb_bb/vendor/prism.css' %}" />

punkweb_bb-0.2.1/punkweb_bb/templates/punkweb_bb/category_create.html

@@ -0,0 +1,50 @@
+{% extends 'punkweb_bb/base.html' %}
+{% load static %}
+
+{% block title_prefix %}Create Category | {% endblock %}
+
+{% block extra_head %}
+{{form.media.css}}
+<link rel="stylesheet" href="{% static 'punkweb_bb/css/category-form.css' %}" />
+{% endblock %}
+
+{% block content %}
+
+<nav>
+  <ul class="pw-breadcrumb">
+    <li class="pw-breadcrumb-item">
+      <a href="{% url 'punkweb_bb:index' %}">Home</a>
+    </li>
+    <li class="pw-breadcrumb-item active">
+      Create Category
+    </li>
+  </ul>
+</nav>
+
+<div class="pw-card fluid">
+  <div class="pw-card-header">Create Category</div>
+  <div class="pw-card-content">
+    <form class="categoryForm" action="{% url 'punkweb_bb:category_create' %}" method="post">
+      {% csrf_token %}
+      {% for field in form %}
+      <div class="categoryForm__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="categoryForm__actions">
+        <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>
+    </form>
+  </div>
+</div>
+
+{% endblock %}
+
+{% block extra_script %}
+{{form.media.js}}
+{% endblock %}