diff --git a/files/assets/css/main.css b/files/assets/css/main.css index bde466c8e..2558b0464 100644 --- a/files/assets/css/main.css +++ b/files/assets/css/main.css @@ -4625,13 +4625,6 @@ span.green { .patron[style="background-color:#FFFFFF;"] { color: black !important; } -.post--category-tag { - padding: 2px 5px 3px 5px; - border-radius: 5px; - font-size: 12px; - font-weight: 700; - margin-right: 0.25rem; -} .container, .container-fluid { background-color: var(--background) !important; } @@ -5684,19 +5677,6 @@ g { border-radius:.35rem; } -.category--tag-button { - display: inline-block; - cursor: pointer; -} - -#submit-categories input { - display: none; -} - -#submit-categories input:checked + label { - border: 5px var(--black) double; -} - /* ------- Font Awesome ------- */ @font-face{ font-family:"Font Awesome 6 Pro"; @@ -6070,7 +6050,7 @@ g { } @media (max-width: 767.98px) { - .pronouns, .patron, .post--category-tag, .mod { + .pronouns, .patron, .mod { padding: 2px 5px !important; } } diff --git a/files/assets/js/category_modal.js b/files/assets/js/category_modal.js deleted file mode 100644 index b5d82acb5..000000000 --- a/files/assets/js/category_modal.js +++ /dev/null @@ -1,41 +0,0 @@ -function category_modal(id, title, sub) { - document.getElementById("category-modal-title").innerHTML = `Category: ${title}`; - - xhrCategories = new XMLHttpRequest(); - xhrCategories.open("GET", "/categories.json"); - xhrCategories.onload = function () { - let data; - try { - data = JSON.parse(xhrCategories.response); - } catch(e) { console.log(e) } - - categories = [{id: '', name: 'None', sub: sub, color_text: '#000', color_bg: '#FFF'}]; - categories = [].concat(categories, data[sub]); - - document.getElementById("category-modal-body").innerHTML = ''; - categories.forEach(function (c) { - document.getElementById("category-modal-body").innerHTML += - `
`; - }); - - document.querySelectorAll('.category--tag-button').forEach(tag => - tag.addEventListener('click', function (e) { - reqBody = new FormData(); - reqBody.append('formkey', formkey()); - reqBody.append('post_id', id); - reqBody.append('category_id', tag.dataset.category); - - xhrSubmit = new XMLHttpRequest(); - xhrSubmit.open('POST', `/post_recategorize`); - xhrSubmit.onload = function () { - window.location.reload(); - } - xhrSubmit.send(reqBody); - }) - ); - } - xhrCategories.send(); -} diff --git a/files/assets/js/submit.js b/files/assets/js/submit.js index e8845a091..ef0bc80b3 100644 --- a/files/assets/js/submit.js +++ b/files/assets/js/submit.js @@ -180,32 +180,6 @@ function checkRepost() { } } -function updateCategories() { - if (document.getElementById("submit-categories") == null) { - return; - } - sub = document.getElementById("sub").value; - - xhrCategories = new XMLHttpRequest(); - xhrCategories.open("GET", "/categories.json"); - xhrCategories.onload = function () { - let data; - try { - data = JSON.parse(xhrCategories.response); - } catch(e) { console.log(e) } - - document.getElementById("submit-categories").innerHTML = ''; - data[sub].forEach(function (c) { - document.getElementById("submit-categories").innerHTML += - `` + - ``; - }); - } - xhrCategories.send(); -} - document.addEventListener('keydown', (e) => { if(!((e.ctrlKey || e.metaKey) && e.key === "Enter")) return; @@ -215,5 +189,4 @@ document.addEventListener('keydown', (e) => { submitButton.click(); }); -checkRepost(); -updateCategories(); +checkRepost(); \ No newline at end of file diff --git a/files/classes/__init__.py b/files/classes/__init__.py index 887b1b8e1..7e8f93c05 100644 --- a/files/classes/__init__.py +++ b/files/classes/__init__.py @@ -8,7 +8,6 @@ from .badges import * from .userblock import * from .submission import * from .votes import * -from .category import * from .domains import * from .subscriptions import * from files.__main__ import app diff --git a/files/classes/category.py b/files/classes/category.py deleted file mode 100644 index c601bb125..000000000 --- a/files/classes/category.py +++ /dev/null @@ -1,31 +0,0 @@ -from sqlalchemy import * -from sqlalchemy.orm import relationship -from files.__main__ import Base -import time - -class Category(Base): - __tablename__ = "category" - - id = Column(Integer, primary_key=True, nullable=False) - name = Column(String(128), nullable=False) - sub = Column(String(20), ForeignKey("subs.name")) - color_text = Column(String(6)) - color_bg = Column(String(6)) - created_utc = Column(Integer) - - def __init__(self, *args, **kwargs): - if "created_utc" not in kwargs: kwargs["created_utc"] = int(time.time()) - super().__init__(*args, **kwargs) - - def __repr__(self): - return f"Hi ")
-@admin_level_required(PERMS['ADMIN_CATEGORIES_MANAGE'])
-def admin_categories_update(v, cid):
- if not FEATURES['CATEGORIES']:
- abort(404)
-
- cat_name = request.values.get("name").strip()
- cat_color_text = request.values.get("color_text").strip().strip('#').lower()
- cat_color_bg = request.values.get("color_bg").strip().strip('#').lower()
-
- try:
- cat_id = int(cid)
- except:
- abort(400)
-
- cat = g.db.query(Category).filter(Category.id == cat_id).one_or_none()
- if not cat:
- abort(400)
-
- cat.name = cat_name
- cat.color_text = cat_color_text
- cat.color_bg = cat_color_bg
-
- g.db.add(cat)
- g.db.commit()
-
- return redirect("/admin/categories")
-
-@app.post("/admin/categories/delete/
{% if v.admin_level > 2 %}
diff --git a/files/templates/admin/categories.html b/files/templates/admin/categories.html
deleted file mode 100644
index e279f581c..000000000
--- a/files/templates/admin/categories.html
+++ /dev/null
@@ -1,51 +0,0 @@
-{% extends "default.html" %}
-
-{% block title %}
-
-
-
-{% endblock %}
diff --git a/files/templates/category_modal.html b/files/templates/category_modal.html
deleted file mode 100644
index 85a91878b..000000000
--- a/files/templates/category_modal.html
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
diff --git a/files/templates/comments.html b/files/templates/comments.html
index 1bb01ba3a..6ca262425 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -756,9 +756,6 @@
{% include "emoji_modal.html" %}
{% if v.admin_level > 1 %}
{% include "ban_modal.html" %}
- {% if FEATURES['CATEGORIES'] -%}
- {% include "category_modal.html" %}
- {%- endif %}
{% endif %}
-
-
-
- {% for category in categories %}
- Category
- {{ HOLE_NAME | capitalize }}
- Name
- Text Color
- Background Color
- Actions
-
-
-
- {% endfor %}
-
- {{help.submission_category_tag(category.name, category.color_text, category.color_bg)}}
- {{category.sub if category.sub else '—'|safe}}
-
-
-
-
-
-