diff --git a/euth/users/templates/euth_users/indicator_menu.html b/euth/users/templates/euth_users/indicator_menu.html index 205922c86..75338e6aa 100644 --- a/euth/users/templates/euth_users/indicator_menu.html +++ b/euth/users/templates/euth_users/indicator_menu.html @@ -22,17 +22,6 @@ {% trans "Account Settings" %} - {% for organisation in request.user.organisations %} -
  • - {% if request.user.is_superuser %} - - {% else %} - - {% endif %} - {{ organisation.name }} - -
  • - {% endfor %}
  • {% csrf_token %} diff --git a/euth_wagtail/assets/js/app.js b/euth_wagtail/assets/js/app.js index 6906c9b77..090c6fdb8 100644 --- a/euth_wagtail/assets/js/app.js +++ b/euth_wagtail/assets/js/app.js @@ -4,29 +4,7 @@ import 'bootstrap' // load bootstrap components import './euth_wagtail' -// expose react components -import { - commentsAsync as ReactCommentsAsync, - polls as ReactPolls, - ratings as ReactRatings, - widget as ReactWidget -} from 'adhocracy4' - -import * as ReactParagraphs from '../../../euth/documents/static/documents/ParagraphBox.jsx' -import * as ReactFollows from '../../../euth/follows/static/follows/react_follows.jsx' -import * as ReactLanguageSwitch from '../../../euth/dashboard/static/language_switch/react_language_switch.jsx' -import * as ReactUserList from '../../../euth/dashboard/static/user_list/react_user_list.jsx' - function init () { - ReactWidget.initialise('a4', 'comment_async', ReactCommentsAsync.renderComment) - ReactWidget.initialise('a4', 'ratings', ReactRatings.renderRatings) - ReactWidget.initialise('a4', 'polls', ReactPolls.renderPolls) - ReactWidget.initialise('a4', 'poll-management', ReactPolls.renderPollManagement) - - ReactWidget.initialise('euth', 'document', ReactParagraphs.renderParagraphs) - ReactWidget.initialise('euth', 'follows', ReactFollows.renderFollow) - ReactWidget.initialise('euth', 'userlist', ReactUserList.renderUserList) - ReactWidget.initialise('euth', 'language-switch', ReactLanguageSwitch.renderLanguageSwitch) } document.addEventListener('DOMContentLoaded', init, false) diff --git a/home/templates/home/home_page.html b/home/templates/home/home_page.html index aa3ed327c..02292c57b 100644 --- a/home/templates/home/home_page.html +++ b/home/templates/home/home_page.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load i18n wagtailimages_tags react_comments_async %} +{% load i18n wagtailimages_tags %} {% block body_class %}template-homepage{% endblock %} diff --git a/home/templates/home/manuals_index.html b/home/templates/home/manuals_index.html index c6a6226c3..07b0a2dbc 100644 --- a/home/templates/home/manuals_index.html +++ b/home/templates/home/manuals_index.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load i18n wagtailimages_tags wagtailcore_tags react_comments_async %} +{% load i18n wagtailimages_tags wagtailcore_tags %} {% block body_class %}template-homepage{% endblock %} {% block title %}{{ page.translated_title }}{% endblock %} diff --git a/webpack.common.js b/webpack.common.js index 13c40b1a2..1646865dc 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -45,13 +45,6 @@ module.exports = { ], dependOn: 'adhocracy4' }, - user_search: { - import: [ - 'typeahead.js/dist/typeahead.jquery.min.js', - './euth/users/static/users/js/user_search.js' - ], - dependOn: 'adhocracy4' - }, flatpickr: { import: [ './euth_wagtail/assets/js/init-picker.js', @@ -59,74 +52,6 @@ module.exports = { ], dependOn: 'adhocracy4' }, - leaflet: { - import: [ - 'leaflet', - 'leaflet/dist/leaflet.css', - 'leaflet.markercluster', - 'leaflet.markercluster/dist/MarkerCluster.css' - ], - dependOn: 'adhocracy4' - }, - // A4 dependencies - we want all of them to go through webpack - a4maps_display_point: { - import: [ - 'leaflet/dist/leaflet.css', - 'maplibre-gl/dist/maplibre-gl.css', - 'adhocracy4/adhocracy4/maps/static/a4maps/a4maps_display_point.js' - ], - dependOn: 'adhocracy4' - }, - a4maps_display_points: { - import: [ - 'leaflet/dist/leaflet.css', - 'maplibre-gl/dist/maplibre-gl.css', - 'leaflet.markercluster/dist/MarkerCluster.css', - 'adhocracy4/adhocracy4/maps/static/a4maps/a4maps_display_points.js' - ], - dependOn: 'adhocracy4' - }, - a4maps_choose_point: { - import: [ - 'leaflet/dist/leaflet.css', - 'maplibre-gl/dist/maplibre-gl.css', - 'adhocracy4/adhocracy4/maps/static/a4maps/a4maps_choose_point.js' - ], - dependOn: 'adhocracy4' - }, - a4maps_choose_polygon: { - import: [ - 'leaflet/dist/leaflet.css', - 'maplibre-gl/dist/maplibre-gl.css', - 'leaflet-draw/dist/leaflet.draw.css', - 'adhocracy4/adhocracy4/maps/static/a4maps/a4maps_choose_polygon.js' - ], - dependOn: 'adhocracy4' - }, - category_formset: { - import: [ - 'adhocracy4/adhocracy4/categories/assets/category_formset.js' - ], - dependOn: 'adhocracy4' - }, - image_uploader: { - import: [ - 'adhocracy4/adhocracy4/images/assets/image_uploader.js' - ], - dependOn: 'adhocracy4' - }, - select_dropdown_init: { - import: [ - 'adhocracy4/adhocracy4/categories/assets/select_dropdown_init.js' - ], - dependOn: 'adhocracy4' - }, - fileupload_formset: { - import: [ - './euth/communitydebate/static/js/fileupload_formset.js' - ], - dependOn: 'adhocracy4' - }, popover_init: { import: [ './euth_wagtail/assets/js/popover_init.js'