From b9c752f86deaadf634bda49a767e9e7780171c48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20K=C3=A1rolyi?= Date: Wed, 24 May 2023 21:03:42 +0200 Subject: [PATCH] More updates, forum stars locally but looks crooked still --- .eslintrc.json | 15 +- .isort.cfg | 2 - .../account/jinja2/account/settings.html | 2 +- backend/forum/base/jinja2/default/base.html | 6 +- .../default/base/comments-expansion.html | 2 +- .../default/base/topic-comment-listing.html | 2 +- .../jinja2/default/base/topic-listing.html | 2 +- backend/forum/cdn/utils/downloader.py | 2 +- frontend/src/js/skin-default/common.js | 8 +- .../js/skin-default/popover-hovercontent.js | 4 +- .../src/js/skin-default/rich-text-area.js | 8 +- frontend/src/js/skin-default/settings-page.js | 6 +- .../src/js/skin-default/time-actualizer.js | 4 +- .../js/skin-default/topic-comment-listing.js | 16 +- .../skin-default/topic-comments-expansion.js | 2 +- frontend/src/js/skin-default/topic-group.js | 12 +- frontend/src/js/skin-default/username.js | 12 +- frontend/src/scss/skin-default/base.scss | 2 +- frontend/webpack/config.dev.js | 39 +- frontend/webpack/config.prod.js | 91 +- package-lock.json | 1388 +++++++++++++++++ package.json | 6 + postcss.config.js | 5 - 23 files changed, 1513 insertions(+), 123 deletions(-) delete mode 100644 postcss.config.js diff --git a/.eslintrc.json b/.eslintrc.json index faae222..f9384a7 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,11 +1,13 @@ { "env": { "browser": true, - "node": true + "node": true, + "es6": true }, - "parser": "babel-eslint", - "extends": ["eslint:recommended", "airbnb-base"], + "parser": "@babel/eslint-parser", + "extends": ["eslint:recommended"], "rules": { + "max-classes-per-file": 0, "no-continue": [0], "no-console": [1], "semi": [2, "never"], @@ -13,13 +15,6 @@ "strict": [2, "never"], "max-len": [2, {"code": 80, "tabWidth": 4, "ignoreUrls": true}], "no-restricted-syntax": "off", - "max-classes-per-file": "off", - "import/no-extraneous-dependencies": [ - "error", - { - "devDependencies": true - } - ], "import/prefer-default-export": ["off"], "operator-linebreak": "off" }, diff --git a/.isort.cfg b/.isort.cfg index 0d6589c..73017e5 100644 --- a/.isort.cfg +++ b/.isort.cfg @@ -1,5 +1,3 @@ [settings] multi_line_output=4 -; skip=backend/ticketshop/wsgi.py -; skip-glob=*node_modules/* src_paths=backend diff --git a/backend/forum/account/jinja2/account/settings.html b/backend/forum/account/jinja2/account/settings.html index a85d08f..63bb4a8 100644 --- a/backend/forum/account/jinja2/account/settings.html +++ b/backend/forum/account/jinja2/account/settings.html @@ -3,7 +3,7 @@ {% from 'default/macros/render-messages.html' import render_messages with context %} {% block extra_scripts_head %} -{{ render_bundle('settingsPage') }} +{{ render_bundle('settingsPage', skip_common_chunks=True) }} {% endblock extra_scripts_head %} {% block main_content %} diff --git a/backend/forum/base/jinja2/default/base.html b/backend/forum/base/jinja2/default/base.html index c46d3cf..87b71d6 100644 --- a/backend/forum/base/jinja2/default/base.html +++ b/backend/forum/base/jinja2/default/base.html @@ -3,9 +3,7 @@ - {{ render_bundle('vendor') }} - {{ render_bundle('runtime') }} - {{ render_bundle('common') }} + {{ render_bundle('common', skip_common_chunks=True) }} {% block title %}{{ django_settings.SITE_NAME }}{% endblock title %} @@ -38,7 +36,7 @@ scrollSpeed: 300 }); - {{ render_bundle('username') }} + {{ render_bundle('username', skip_common_chunks=True) }}