Skip to content

Commit

Permalink
remove more unused stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
goapunk committed Sep 12, 2024
1 parent 273f7f2 commit 12f92b2
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 110 deletions.
11 changes: 0 additions & 11 deletions euth/users/templates/euth_users/indicator_menu.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,6 @@
<a href="{% url 'account-profile' %}" class="dropdown-item"><i class="fa fa-cog"></i><span class="dropdown-text">{% trans "Account Settings" %}</span></a>
</li>

{% for organisation in request.user.organisations %}
<li>
{% if request.user.is_superuser %}
<a href="{% url 'a4dashboard:project-list' organisation_slug=organisation.slug %}" class="dropdown-item">
{% else %}
<a href="{% url 'a4dashboard:organisation-edit' organisation_slug=organisation.slug %}" class="dropdown-item">
{% endif %}
<img src="{{ organisation.logo|thumbnail_url:'org_avatar_small' }}" alt="" width="20"><span class="dropdown-text">{{ organisation.name }}</span>
</a>
</li>
{% endfor %}
<li class="p-0">
<form class="logout-button-form" action="{% url 'account_logout' %}" method="post" >
{% csrf_token %}
Expand Down
22 changes: 0 additions & 22 deletions euth_wagtail/assets/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion home/templates/home/home_page.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends "base.html" %}
{% load i18n wagtailimages_tags react_comments_async %}
{% load i18n wagtailimages_tags %}

{% block body_class %}template-homepage{% endblock %}

Expand Down
2 changes: 1 addition & 1 deletion home/templates/home/manuals_index.html
Original file line number Diff line number Diff line change
@@ -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 %}
Expand Down
75 changes: 0 additions & 75 deletions webpack.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,88 +45,13 @@ 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',
'datepicker/css/datepicker.min.css'
],
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'
Expand Down

0 comments on commit 12f92b2

Please sign in to comment.