diff --git a/scipost_django/colleges/templates/colleges/college_detail.html b/scipost_django/colleges/templates/colleges/college_detail.html
index 44aa921ece484189cb729c09f92450c04ce61138..d25dadf9162aad84691949fe1535a79aa6554caa 100644
--- a/scipost_django/colleges/templates/colleges/college_detail.html
+++ b/scipost_django/colleges/templates/colleges/college_detail.html
@@ -32,8 +32,8 @@
<div class="row">
<div class="col-md-6">
- <button class="btn btn-primary" data-bs-toggle="toggle-show" data-target="#specialties-{{ college.acad_field }}">Select by specialty</button>
- <button class="btn btn-primary" style="display: none;" data-bs-toggle="toggle-show" data-target="#specialties-{{ college.acad_field }}">Show full list of Fellows</button>
+ <button class="btn btn-primary" data-toggle="toggle-show" data-target="#specialties-{{ college.acad_field }}">Select by specialty</button>
+ <button class="btn btn-primary" style="display: none;" data-toggle="toggle-show" data-target="#specialties-{{ college.acad_field }}">Show full list of Fellows</button>
<div id="specialties-{{ college.acad_field }}" class="card bg-white border-default all-specialties mt-2" style="display: none">
<div class="card-body">
<p><em class="text-muted mt-2">Hover to highlight or click to select</em></p>
@@ -57,15 +57,13 @@
</div>
<div class="row search-contributors" data-contributors="{{ college.acad_field.slug }}">
- <div class="col-12">
- <div class="card-columns">
- {% for fellowship in college.fellowships.active %}
- <div class="card contributor mb-1">
- {% include 'scipost/_contributor_short.html' with fellowship=fellowship %}
- </div>
- {% endfor %}
+ {% for fellowship in college.fellowships.active %}
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="card contributor mb-1">
+ {% include 'scipost/_contributor_short.html' with fellowship=fellowship %}
+ </div>
</div>
- </div>
+ {% endfor %}
</div>
diff --git a/scipost_django/forums/templates/forums/forum_list.html b/scipost_django/forums/templates/forums/forum_list.html
index 3b99d279edae79bc80388e4d6756c1b566d964d2..ea4a3c325bd11e16204990027ee9fac57f4df722 100644
--- a/scipost_django/forums/templates/forums/forum_list.html
+++ b/scipost_django/forums/templates/forums/forum_list.html
@@ -25,32 +25,34 @@
</ul>
{% endif %}
- <div class="card-columns">
+ <div class="row">
{% for forum in object_list %}
- <div class="card">
- <div class="card-header">
- {% if forum.meeting %}
- {% with context_colors=forum.meeting.context_colors %}
- <span class="badge badge-{{ context_colors.bg }} mx-0 mb-2 p-2 text-{{ context_colors.text }}">{{ context_colors.message }}</span>
- {% endwith %}
- <br/>
- {% endif %}
- <span class="d-flex flex-wrap justify-content-between">
- <a href="{{ forum.get_absolute_url }}">{{ forum|truncatechars:30 }}</a>
- <span class="badge badge-primary badge-pill">{% with nr_posts=forum.nr_posts %}{{ nr_posts }} post{{ nr_posts|pluralize }}{% endwith %}</span>
- </span>
- </div>
- <div class="card-body">
- {{ forum.description|automarkup }}
- {% if forum.child_forums.all|length > 0 %}
- <hr/>
- <p>Descendants:</p>
- <ul class="list-unstyled forumList">
- {% for child in forum.child_forums.all %}
- {% include 'forums/forum_as_li.html' with forum=child %}
- {% endfor %}
- </ul>
- {% endif %}
+ <div class="col-md-6 col-lg-4">
+ <div class="card">
+ <div class="card-header">
+ {% if forum.meeting %}
+ {% with context_colors=forum.meeting.context_colors %}
+ <span class="badge badge-{{ context_colors.bg }} mx-0 mb-2 p-2 text-{{ context_colors.text }}">{{ context_colors.message }}</span>
+ {% endwith %}
+ <br/>
+ {% endif %}
+ <span class="d-flex flex-wrap justify-content-between">
+ <a href="{{ forum.get_absolute_url }}">{{ forum|truncatechars:30 }}</a>
+ <span class="badge badge-primary badge-pill">{% with nr_posts=forum.nr_posts %}{{ nr_posts }} post{{ nr_posts|pluralize }}{% endwith %}</span>
+ </span>
+ </div>
+ <div class="card-body">
+ {{ forum.description|automarkup }}
+ {% if forum.child_forums.all|length > 0 %}
+ <hr/>
+ <p>Descendants:</p>
+ <ul class="list-unstyled forumList">
+ {% for child in forum.child_forums.all %}
+ {% include 'forums/forum_as_li.html' with forum=child %}
+ {% endfor %}
+ </ul>
+ {% endif %}
+ </div>
</div>
</div>
{% empty %}
diff --git a/scipost_django/helpdesk/templates/helpdesk/helpdesk.html b/scipost_django/helpdesk/templates/helpdesk/helpdesk.html
index 6b9e6ef62671a0a59d58d89a1c00cd328c469ccd..f64507016941223f276762a553c21fd7726c1dfb 100644
--- a/scipost_django/helpdesk/templates/helpdesk/helpdesk.html
+++ b/scipost_django/helpdesk/templates/helpdesk/helpdesk.html
@@ -50,9 +50,11 @@
{% if managed_queues.all|length > 0 %}
<br class="my-4">
<h3 class="highlight">Queues for which you are in managing group</h3>
- <div class="card-columns p-2">
+ <div class="row p-2">
{% for queue in managed_queues %}
- {% include 'helpdesk/queue_card.html' with queue=queue %}
+ <div class="col-md-6 col-lg-4 mb-2">
+ {% include 'helpdesk/queue_card.html' with queue=queue %}
+ </div>
{% endfor %}
</div>
{% endif %}
@@ -60,9 +62,11 @@
{% if visible_queues.all|length > 0 %}
<br class="my-4">
<h3 class="highlight">Queues which you can view</h3>
- <div class="card-columns p-2">
+ <div class="row p-2">
{% for queue in visible_queues %}
- {% include 'helpdesk/queue_card.html' with queue=queue %}
+ <div class="col-md-6 col-lg-4 mb-2">
+ {% include 'helpdesk/queue_card.html' with queue=queue %}
+ </div>
{% endfor %}
</div>
{% endif %}
diff --git a/scipost_django/journals/templates/journals/journal_list.html b/scipost_django/journals/templates/journals/journal_list.html
index 7f7d1384a35e7a49e6ef656a5dcd6cccd2185ea5..57d1e9afd05d97040ac61f5d12b324c05c14c251 100644
--- a/scipost_django/journals/templates/journals/journal_list.html
+++ b/scipost_django/journals/templates/journals/journal_list.html
@@ -52,30 +52,33 @@
<h1 class="highlight">SciPost {% if acad_field %}{{ acad_field.name }} {% endif %}Journals</h1>
{% if acad_field %}
- <div class="card-columns">
+ <div class="row">
{% for journal in object_list %}
{% if journal.active or perms.scipost.can_view_pool %}
- <div class="card">
- <div class="card-header {{ journal.doi_label }}">
- <a href="{{ journal.get_absolute_url }}">{{ journal.name }}</a>
- {% if journal.has_DOAJ_Seal %}
- <a href="https://doaj.org" class="float-right"><img src="{% static 'scipost/images/DOAJ_Seal_logo_big.png' %}" alt="DOAJ Seal" width="20em"></a>
+ <div class="col-md-6 col-lg-4 mb-2">
+ <div class="card">
+ <div class="card-header {{ journal.doi_label }}">
+ <a href="{{ journal.get_absolute_url }}">{{ journal.name }}</a>
+ {% if journal.has_DOAJ_Seal %}
+ <a href="https://doaj.org" class="float-right"><img src="{% static 'scipost/images/DOAJ_Seal_logo_big.png' %}" alt="DOAJ Seal" width="20em"></a>
+ {% endif %}
+ </div>
+ <div class="card-body">
+ {{ journal.blurb|automarkup }}
+ </div>
+ {% if journal.series_set.all|length > 0 %}
+ <div class="card-footer">
+ Series hosted in this Journal:
+ <ul>
+ {% for series in journal.series_set.all %}
+ <li>
+ <a href="{{ series.get_absolute_url }}" target="_blank">{{ series }}</a>
+ </li>
+ {% endfor %}
+ </ul>
+ </div>
{% endif %}
</div>
- <div class="card-body">
- {{ journal.blurb|automarkup }}
- </div>
- {% if journal.series_set.all|length > 0 %}
- <div class="card-footer">
- Series hosted in this Journal:
- <ul>
- {% for series in journal.series_set.all %}
- <li>
- <a href="{{ series.get_absolute_url }}" target="_blank">{{ series }}</a>
- </li>
- {% endfor %}
- </div>
- {% endif %}
</div>
{% endif %}
{% empty %}
diff --git a/scipost_django/ontology/templates/ontology/_topic_card.html b/scipost_django/ontology/templates/ontology/_topic_card.html
index 74116fa7007ede7d75672a2da8e59beb24bffbc3..964049117a2ebd95fef7d5e7af54f795ae03964d 100644
--- a/scipost_django/ontology/templates/ontology/_topic_card.html
+++ b/scipost_django/ontology/templates/ontology/_topic_card.html
@@ -66,60 +66,66 @@
</div>
<hr/>
{% endif %}
- <div class="card-columns">
- <div class="card">
- <div class="card-header">
- Publications
- </div>
- <div class="card-body">
- <ul>
- {% for pub in topic.publications.all %}
- <li>
- <a href="{{ pub.get_absolute_url }}">{{ pub.title }}</a>
- <br>by {{ pub.author_list }},
- <br>{{ pub.citation }}
- </li>
- {% empty %}
- <li>No Publication found</li>
- {% endfor %}
- </ul>
+ <div class="row">
+ <div class="col-md-6 col-lg-4 mb-2">
+ <div class="card">
+ <div class="card-header">
+ Publications
+ </div>
+ <div class="card-body">
+ <ul>
+ {% for pub in topic.publications.all %}
+ <li>
+ <a href="{{ pub.get_absolute_url }}">{{ pub.title }}</a>
+ <br>by {{ pub.author_list }},
+ <br>{{ pub.citation }}
+ </li>
+ {% empty %}
+ <li>No Publication found</li>
+ {% endfor %}
+ </ul>
+ </div>
</div>
</div>
- <div class="card">
- <div class="card-header">
- Submissions (unpublished only)
- </div>
- <div class="card-body">
- <ul>
- {% for sub in topic.submission_set.public_newest.unpublished %}
- <li>
- <a href="{{ sub.get_absolute_url }}">{{ sub.title }}</a>
- <br>by {{ sub.author_list }}
- <br>(submitted {{ sub.submission_date|date:"Y-m-d" }} to {{ sub.submitted_to }})
- </li>
- {% empty %}
- <li>No Submission found</li>
- {% endfor %}
- </ul>
+ <div class="col-md-6 col-lg-4 mb-2">
+ <div class="card">
+ <div class="card-header">
+ Submissions (unpublished only)
+ </div>
+ <div class="card-body">
+ <ul>
+ {% for sub in topic.submission_set.public_newest.unpublished %}
+ <li>
+ <a href="{{ sub.get_absolute_url }}">{{ sub.title }}</a>
+ <br>by {{ sub.author_list }}
+ <br>(submitted {{ sub.submission_date|date:"Y-m-d" }} to {{ sub.submitted_to }})
+ </li>
+ {% empty %}
+ <li>No Submission found</li>
+ {% endfor %}
+ </ul>
+ </div>
</div>
</div>
- <div class="card">
- <div class="card-header">
- Top experts
- </div>
- <div class="card-body">
- <ul>
- {% get_profiles topic.slug as profiles %}
- {% for profile in profiles %}
- {% if profile.contributor %}
- <li><a href="{{ profile.contributor.get_absolute_url }}">{{ profile }}</a></li>
- {% else %}
- <li>{{ profile }}</li>
- {% endif %}
- {% empty %}
- <li>No Profile found</li>
- {% endfor %}
- </ul>
+ <div class="col-md-6 col-lg-4 mb-2">
+ <div class="card">
+ <div class="card-header">
+ Top experts
+ </div>
+ <div class="card-body">
+ <ul>
+ {% get_profiles topic.slug as profiles %}
+ {% for profile in profiles %}
+ {% if profile.contributor %}
+ <li><a href="{{ profile.contributor.get_absolute_url }}">{{ profile }}</a></li>
+ {% else %}
+ <li>{{ profile }}</li>
+ {% endif %}
+ {% empty %}
+ <li>No Profile found</li>
+ {% endfor %}
+ </ul>
+ </div>
</div>
</div>
</div>
diff --git a/scipost_django/profiles/templates/profiles/_profile_card.html b/scipost_django/profiles/templates/profiles/_profile_card.html
index 079e49e9ae5c84778d10751801f703cde28aa21c..e6df6b7f2ea5f7c7b04be36d1c635b85d1ec3a39 100644
--- a/scipost_django/profiles/templates/profiles/_profile_card.html
+++ b/scipost_django/profiles/templates/profiles/_profile_card.html
@@ -92,136 +92,137 @@
</div>
</div>
-<div class="card-columns">
-
- <div class="card">
- <div class="card-header">
- Publications
- </div>
- <div class="card-body">
- <ul>
- {% for pub in profile.publications.all %}
- <li><a href="{{ pub.get_absolute_url }}">{{ pub.citation }}</a></li>
- {% empty %}
- <li>No Publication found</li>
- {% endfor %}
- </ul>
- </div>
- </div>
-
- <div class="card">
- <div class="card-header">
- Comments
- </div>
- <div class="card-body">
- {% for comment in profile.comments.all %}
- <li><a href="{{ comment.get_absolute_url }}">{{ comment }}</a></li>
- {% empty %}
- <li>No Comment found</li>
- {% endfor %}
- </div>
- </div>
-
- <div class="card">
- <div class="card-header">
- Theses
- </div>
- <div class="card-body">
- {% for thesis in profile.theses.all %}
- <li><a href="{{ thesis.get_absolute_url }}">{{ thesis }}</a></li>
- {% empty %}
- <li>No Thesis found</li>
- {% endfor %}
- </div>
- </div>
-
-</div>
-
-{% if is_scipost_admin or is_ed_admin %}
- <h4 class="highlight p-2 text-danger">Admin-level info</h4>
- <div class="card-columns">
-
+<div class="row">
+ <div class="col-md-6 col-lg-4 mb-2">
<div class="card">
<div class="card-header">
- Registration invitations
+ Publications
</div>
<div class="card-body">
<ul>
- {% for reginv in profile.registrationinvitation_set.all %}
- <li>{{ reginv }}<br/>status: {{ reginv.get_status_display }}</li>
+ {% for pub in profile.publications.all %}
+ <li><a href="{{ pub.get_absolute_url }}">{{ pub.citation }}</a></li>
{% empty %}
- <li>No invitation found</li>
+ <li>No Publication found</li>
{% endfor %}
</ul>
</div>
</div>
-
+ </div>
+ <div class="col-md-6 col-lg-4 mb-2">
<div class="card">
<div class="card-header">
- Fellowships and Potential Fellowships
+ Comments
</div>
<div class="card-body">
- <h5>Fellowships</h5>
- <ul>
- {% for fellowship in profile.contributor.fellowships.all %}
- <li><a href="{{ fellowship.get_absolute_url }}">{{ fellowship }}</a></li>
- {% empty %}
- <li>No fellowships found</li>
- {% endfor %}
- </ul>
- <h5>Potential Fellowships</h5>
- <ul>
- {% for potfellowship in profile.potentialfellowship_set.all %}
- <li>{{ potfellowship }}</li>
- {% empty %}
- <li>No Potential Fellowships found</li>
- {% endfor %}
- </ul>
+ {% for comment in profile.comments.all %}
+ <li><a href="{{ comment.get_absolute_url }}">{{ comment }}</a></li>
+ {% empty %}
+ <li>No Comment found</li>
+ {% endfor %}
</div>
</div>
-
-
-
+ </div>
+ <div class="col-md-6 col-lg-4 mb-2">
<div class="card">
<div class="card-header">
- Refereeing invitations
+ Theses
</div>
<div class="card-body">
- <ul>
- {% for inv in profile.refereeinvitation_set.all %}
- <li>{{ inv.submission.title }}<br/>(invited {{ inv.date_invited }}; fulfilled: {% if inv.fulfilled %}<span class="text-success">{% include 'bi/check-square-fill.html' %}</span>{% else %}{% include 'bi/x-circle-fill.html' %}{% endif %})</li>
- {% empty %}
- <li>No refereeing invitation found</li>
- {% endfor %}
- </ul>
+ {% for thesis in profile.theses.all %}
+ <li><a href="{{ thesis.get_absolute_url }}">{{ thesis }}</a></li>
+ {% empty %}
+ <li>No Thesis found</li>
+ {% endfor %}
</div>
</div>
</div>
+</div>
- <div class="card-columns">
- <div class="card">
- <div class="card-header">
- Actions
+{% if is_scipost_admin or is_ed_admin %}
+ <h4 class="highlight p-2 text-danger">Admin-level info</h4>
+ <div class="row">
+ <div class="col-md-6 col-lg-4 mb-2">
+ <div class="card">
+ <div class="card-header">
+ Registration invitations
+ </div>
+ <div class="card-body">
+ <ul>
+ {% for reginv in profile.registrationinvitation_set.all %}
+ <li>{{ reginv }}<br/>status: {{ reginv.get_status_display }}</li>
+ {% empty %}
+ <li>No invitation found</li>
+ {% endfor %}
+ </ul>
+ </div>
</div>
- <div class="card-body">
- <ul>
- <li><a href="{% url 'profiles:profile_update' pk=profile.id %}">Update</a> this Profile</li>
- <li><a href="{% url 'profiles:profile_delete' pk=profile.id %}" class="text-danger">Delete</a> this Profile</li>
- {% if email_form %}
- <li>
- <div>
- Add an email to this Profile:
- <form class="form-inline" action="{% url 'profiles:add_profile_email' profile_id=profile.id %}" method="post">
- {% csrf_token %}
- {{ email_form|bootstrap }}
- <input class="btn btn-outline-secondary" type="submit" value="Add">
- </form>
- </div>
- </li>
- {% endif %}
- </ul>
+ </div>
+ <div class="col-md-6 col-lg-4 mb-2">
+ <div class="card">
+ <div class="card-header">
+ Fellowships and Potential Fellowships
+ </div>
+ <div class="card-body">
+ <h5>Fellowships</h5>
+ <ul>
+ {% for fellowship in profile.contributor.fellowships.all %}
+ <li><a href="{{ fellowship.get_absolute_url }}">{{ fellowship }}</a></li>
+ {% empty %}
+ <li>No fellowships found</li>
+ {% endfor %}
+ </ul>
+ <h5>Potential Fellowships</h5>
+ <ul>
+ {% for potfellowship in profile.potentialfellowship_set.all %}
+ <li>{{ potfellowship }}</li>
+ {% empty %}
+ <li>No Potential Fellowships found</li>
+ {% endfor %}
+ </ul>
+ </div>
+ </div>
+ </div>
+ <div class="col-md-6 col-lg-4 mb-2">
+ <div class="card">
+ <div class="card-header">
+ Refereeing invitations
+ </div>
+ <div class="card-body">
+ <ul>
+ {% for inv in profile.refereeinvitation_set.all %}
+ <li>{{ inv.submission.title }}<br/>(invited {{ inv.date_invited }}; fulfilled: {% if inv.fulfilled %}<span class="text-success">{% include 'bi/check-square-fill.html' %}</span>{% else %}{% include 'bi/x-circle-fill.html' %}{% endif %})</li>
+ {% empty %}
+ <li>No refereeing invitation found</li>
+ {% endfor %}
+ </ul>
+ </div>
+ </div>
+ </div>
+ <div class="col-md-6 col-lg-4 mb-2">
+ <div class="card">
+ <div class="card-header">
+ Actions
+ </div>
+ <div class="card-body">
+ <ul>
+ <li><a href="{% url 'profiles:profile_update' pk=profile.id %}">Update</a> this Profile</li>
+ <li><a href="{% url 'profiles:profile_delete' pk=profile.id %}" class="text-danger">Delete</a> this Profile</li>
+ {% if email_form %}
+ <li>
+ <div>
+ Add an email to this Profile:
+ <form class="form-inline" action="{% url 'profiles:add_profile_email' profile_id=profile.id %}" method="post">
+ {% csrf_token %}
+ {{ email_form|bootstrap }}
+ <input class="btn btn-outline-secondary" type="submit" value="Add">
+ </form>
+ </div>
+ </li>
+ {% endif %}
+ </ul>
+ </div>
</div>
</div>
-
</div>
{% endif %}
diff --git a/scipost_django/scipost/static/scipost/assets/js/base.js b/scipost_django/scipost/static/scipost/assets/js/base.js
index c4fa939aa43f25acccf218e31b4f47664967f00b..71dd737e6d6d0a7b4e4eb28af8d1f5691e8963e2 100644
--- a/scipost_django/scipost/static/scipost/assets/js/base.js
+++ b/scipost_django/scipost/static/scipost/assets/js/base.js
@@ -1,4 +1,4 @@
// Base scripts, imported for all pages
import './../css/style.scss';
-import { Navbar } from 'bootstrap';
+import { Button, Navbar, Table } from 'bootstrap';
diff --git a/scipost_django/sponsors/templates/sponsors/_sponsor_card.html b/scipost_django/sponsors/templates/sponsors/_sponsor_card.html
index 285e270ab04c54d6bee91e660492774e1e0e0379..fcc742330fcaa7ad064f8376013def0718adfd9b 100644
--- a/scipost_django/sponsors/templates/sponsors/_sponsor_card.html
+++ b/scipost_django/sponsors/templates/sponsors/_sponsor_card.html
@@ -1,4 +1,4 @@
-<div class="card text-center">
+<div class="card text-center mb-2">
{% if sponsor.logo %}
<img class="card-img-top {{ sponsor.css_class }} p-2" style="max-height: 16rem; max-width: 16rem;" src="{% if sponsor.logo %}{{ sponsor.logo.url }}{% endif %}" alt="{{ sponsor.name }} logo">
{% endif %}
diff --git a/scipost_django/sponsors/templates/sponsors/sponsors.html b/scipost_django/sponsors/templates/sponsors/sponsors.html
index 1ca2671e3fbab85de4721b3eb152a8ab04cf5dcd..bd580e6f617f880c4ce3740be9302d65ed41ebab 100644
--- a/scipost_django/sponsors/templates/sponsors/sponsors.html
+++ b/scipost_django/sponsors/templates/sponsors/sponsors.html
@@ -1,5 +1,7 @@
{% extends 'sponsors/base.html' %}
+{% load render_bundle from webpack_loader %}
+
{% block meta_description %}{{ block.super }} Sponsors{% endblock meta_description %}
{% block pagetitle %}: Sponsors{% endblock pagetitle %}
@@ -85,30 +87,38 @@
<h1 class="highlight">Our current Sponsors</h1>
<h3 class="highlight">€20k and above:</h3>
- <div class="card-columns">
+ <div class="row">
{% for sponsor in sponsors_20kplus %}
- {% include 'sponsors/_sponsor_card.html' with sponsor=sponsor %}
+ <div class="col-md-6 col-lg-4 mb-2">
+ {% include 'sponsors/_sponsor_card.html' with sponsor=sponsor %}
+ </div>
{% endfor %}
</div>
<h3 class="highlight">€10k and above:</h3>
- <div class="card-columns">
+ <div class="row">
{% for sponsor in sponsors_10kplus %}
- {% include 'sponsors/_sponsor_card.html' with sponsor=sponsor %}
+ <div class="col-md-6 col-lg-4 mb-2">
+ {% include 'sponsors/_sponsor_card.html' with sponsor=sponsor %}
+ </div>
{% endfor %}
</div>
<h3 class="highlight">€5k and above:</h3>
- <div class="card-columns">
+ <div class="row">
{% for sponsor in sponsors_5kplus %}
- {% include 'sponsors/_sponsor_card.html' with sponsor=sponsor %}
+ <div class="col-md-6 col-lg-4 mb-2">
+ {% include 'sponsors/_sponsor_card.html' with sponsor=sponsor %}
+ </div>
{% endfor %}
</div>
<h3 class="highlight">Our other current Sponsors:</h3>
- <div class="card-columns">
+ <div class="row">
{% for sponsor in current_sponsors %}
- {% include 'sponsors/_sponsor_card.html' with sponsor=sponsor %}
+ <div class="col-md-6 col-lg-4 mb-2">
+ {% include 'sponsors/_sponsor_card.html' with sponsor=sponsor %}
+ </div>
{% endfor %}
</div>
diff --git a/webpack.dev.config.js b/webpack.dev.config.js
index b571b8677474bc01c04603b35145b219d0f53139..65ddb436b7321a4b4e75a44450ad7d716d529ff4 100644
--- a/webpack.dev.config.js
+++ b/webpack.dev.config.js
@@ -1,4 +1,4 @@
-var webpack = require("webpack");
+var webpack = require('webpack');
var BundleTracker = require('webpack-bundle-tracker');
const { CleanWebpackPlugin } = require('clean-webpack-plugin');
const { VueLoaderPlugin } = require('vue-loader')
@@ -12,7 +12,7 @@ module.exports = {
base: [
// "tether",
// "bootstrap-loader",
- // "./scipost_django/scipost/static/scipost/assets/js/scripts.js",
+ "./scipost_django/scipost/static/scipost/assets/js/scripts.js",
"./scipost_django/scipost/static/scipost/assets/js/base.js",
],
// homepage: [
@@ -33,19 +33,13 @@ module.exports = {
},
module: {
rules: [
- // {
- // test: require.resolve('jquery'),
- // use: [
- // {
- // loader: 'expose-loader',
- // options: 'jQuery'
- // },
- // {
- // loader: 'expose-loader',
- // options: '$'
- // }
- // ]
- // },
+ {
+ test: require.resolve('jquery'),
+ loader: 'expose-loader',
+ options: {
+ exposes: ['$', 'jQuery'],
+ },
+ },
// {
// test: /\.css$/,
// use: [
@@ -90,10 +84,10 @@ module.exports = {
new BundleTracker({
filename: './webpack-stats.json'
}),
- // new webpack.ProvidePlugin({
- // // $: 'jquery',
- // // jQuery: 'jquery',
- // // 'window.jQuery': 'jquery',
+ new webpack.ProvidePlugin({
+ $: 'jquery',
+ jQuery: 'jquery',
+ 'window.jQuery': 'jquery',
// // Tether: 'tether',
// // 'window.Tether': 'tether',
// Popper: ['popper.js', 'default'],
@@ -108,7 +102,7 @@ module.exports = {
// Tab: "exports-loader?Tab!bootstrap/js/dist/tab",
// Tooltip: "exports-loader?Tooltip!bootstrap/js/dist/tooltip",
// Util: 'exports-loader?Util!bootstrap/js/dist/util',
- // }),
+ }),
new CleanWebpackPlugin(),
new webpack.optimize.AggressiveMergingPlugin(),
new VueLoaderPlugin()